From fc69a1e9655df3e8a01dc36ea2742c99f4a651ed Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期三, 17 一月 2024 13:22:08 +0800
Subject: [PATCH] 特批申请单：数据校验 销售订单：维护页面增加字段 销售出库关联数量、销售出库未关联数量、生产关联数量、生产未关联数量
---
WebTM/views/销售管理/销售订单/Xs_SeOrderBillList.html | 219 +++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 183 insertions(+), 36 deletions(-)
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Xs_SeOrderBillList.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Xs_SeOrderBillList.html"
index fd07400..ed3d4d7 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Xs_SeOrderBillList.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Xs_SeOrderBillList.html"
@@ -131,7 +131,9 @@
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-PushSeOrderChangeBill" id="btn-PushSeOrderChangeBill"><i class="layui-icon layui-icon-delete"></i>涓嬫帹(閿�鍞鍗曞彉鏇村崟)</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-PushExceptiveCheckRequestBill" id="btn-PushExceptiveCheckRequestBill"><i class="layui-icon layui-icon-delete"></i>涓嬫帹(鐗规壒鐢宠鍗�)</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-PushICMOBill" id="btn-PushICMOBill"><i class="layui-icon layui-icon-delete"></i>涓嬫帹(鐢熶骇璁㈠崟)</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-PushICStockBills" id="btn-PushICStockBills"><i class="layui-icon layui-icon-delete"></i>澶氳涓嬫帹(閿�鍞嚭搴撳崟)</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get_Refresh" id="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get_LookDown" id="get_LookDown"><i class="layui-icon layui-icon-refresh-3"></i>涓嬫煡</button>
<!--<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-print" id="btn-print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃</button>-->
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_CheckBill" id="CheckBill"><i class="layui-icon layui-icon-form"></i>瀹℃牳</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_AbandonCheck" id="AbandonCheck"><i class="layui-icon layui-icon-form"></i>鍙嶅鏍�</button>
@@ -235,6 +237,14 @@
//涓嬫帹(鐢熶骇璁㈠崟)
case 'btn-PushICMOBill':
set_PushICMOBill();
+ break;
+ //澶氳涓嬫帹(閿�鍞嚭搴撳崟)
+ case 'btn-PushICStockBills':
+ set_PushICStockBills();
+ break;
+ //涓嬫煡
+ case 'get_LookDown':
+ set_LookDown();
break;
//鍒锋柊
case 'get_Refresh': get_Refresh();
@@ -356,6 +366,7 @@
, toolbar: '#toolbarDemo'
, height: 'full-50'
, page: true
+ , totalRow: true
, cellMinWidth: 90
, limit: 50
, limits: [50, 500, 5000, 20000]
@@ -364,50 +375,33 @@
,{ field: 'hmainid', title: 'hmainid', sort: true, hide: true }
, { field: '鏃ユ湡', title: '鏃ユ湡', width: 125, sort: true }
, { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 125, sort: true }
- , { field: '鐘舵��', title: '鐘舵��', width: 125, sort: true }
- , { field: 'HBillType', title: 'HBillType', hide: true, sort: true }
- , { field: 'HCusID', title: 'HCusID', hide: true, sort: true }
- , { field: '瀹㈡埛浠ｇ爜', title: '瀹㈡埛浠ｇ爜', width: 125, sort: true }
- , { field: '瀹㈡埛', title: '瀹㈡埛', sort: true }
- , { field: '浜よ揣鍦板潃', title: '浜よ揣鍦板潃', width: 125, sort: true }
- , { field: 'HSSID', title: 'HSSID', hide: true, sort: true }
- , { field: '缁撶畻鏂瑰紡浠ｇ爜', title: '缁撶畻鏂瑰紡浠ｇ爜', width: 125, sort: true }
- , { field: '缁撶畻鏂瑰紡', title: '缁撶畻鏂瑰紡', width: 125, sort: true }
- , { field: '缁撶畻鏃ユ湡', title: '缁撶畻鏃ユ湡', width: 170, sort: true }
- , { field: 'HCurID', title: 'HCurID', hide: true, sort: true }
- , { field: '甯佸埆浠ｇ爜', title: '甯佸埆浠ｇ爜', sort: true }
- , { field: '甯佸埆', title: '甯佸埆', sort: true }
- , { field: '姹囩巼', title: '姹囩巼', sort: true }
- , { field: 'HDeptID', title: 'HDeptID', hide: true, sort: true }
- , { field: '閮ㄩ棬浠ｇ爜', title: '閮ㄩ棬浠ｇ爜', width: 125, sort: true }
- , { field: '閮ㄩ棬', title: '閮ㄩ棬', width: 125, sort: true }
- , { field: '閿�鍞柟寮�', title: '閿�鍞柟寮�', sort: true }
- , { field: 'HManagerID', title: 'HManagerID', hide: true, sort: true }
- , { field: '涓荤浠ｇ爜', title: '涓荤浠ｇ爜', sort: true }
- , { field: '涓荤', title: '涓荤', sort: true }
- , { field: 'HEmpID', title: 'HEmpID', hide: true, sort: true }
- , { field: '涓氬姟鍛樹唬鐮�', title: '涓氬姟鍛樹唬鐮�', sort: true }
- , { field: '涓氬姟鍛�', title: '涓氬姟鍛�', sort: true }
- , { field: '鎽樿', title: '鎽樿', sort: true }
- , { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞', sort: true }
, { field: 'hsubid', title: 'hsubid', hide: true, sort: true }
+ , { field: '鐘舵��', title: '鐘舵��', width: 125, sort: true }
+ , { field: '鏄惁涓嬫帹鐢熶骇璁㈠崟', title: '鏄惁涓嬫帹鐢熶骇璁㈠崟', width: 125, sort: true }
, { field: 'HMaterID', title: 'HMaterID', hide: true, sort: true }
, { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', sort: true }
, { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', sort: true }
, { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', sort: true }
- , { field: '鎵瑰彿', title: '鎵瑰彿', sort: true }
+ , { field: '鏁伴噺', title: '鏁伴噺', sort: true, totalRow: true }
, { field: 'HUnitID', title: 'HUnitID', hide: true, sort: true }
- , { field: '璁￠噺鍗曚綅浠ｇ爜', title: '璁￠噺鍗曚綅浠ｇ爜', sort: true }
+ //, { field: '璁￠噺鍗曚綅浠ｇ爜', title: '璁￠噺鍗曚綅浠ｇ爜', sort: true }
, { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅', sort: true }
- , { field: '鏁伴噺', title: '鏁伴噺', sort: true }
+ , { field: 'HCusID', title: 'HCusID', hide: true, sort: true }
+ //, { field: '瀹㈡埛浠ｇ爜', title: '瀹㈡埛浠ｇ爜', width: 125, sort: true }
+ , { field: '瀹㈡埛', title: '瀹㈡埛', sort: true }
+ , { field: 'HEmpID', title: 'HEmpID', hide: true, sort: true }
+ //, { field: '涓氬姟鍛樹唬鐮�', title: '涓氬姟鍛樹唬鐮�', sort: true }
+ , { field: '涓氬姟鍛�', title: '涓氬姟鍛�', sort: true }
, { field: '鍗曚环', title: '鍗曚环', sort: true }
- , { field: '閲戦', title: '閲戦', sort: true }
, { field: '绋庣巼', title: '绋庣巼', sort: true }
- , { field: '绋庨', title: '绋庨', sort: true }
- , { field: '浠风◣鍚堣', title: '浠风◣鍚堣', sort: true }
- , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', sort: true }
- , { field: '璁″垝璺熻釜鍙�', title: '璁″垝璺熻釜鍙�', sort: true }
- , { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞', sort: true }
+ , { field: '鍚◣鍗曚环', title: '鍚◣鍗曚环', sort: true }
+ , { field: '閲戦', title: '閲戦', sort: true, totalRow: true }
+ , { field: '浠风◣鍚堣', title: '浠风◣鍚堣', sort: true, totalRow: true }
+ , { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞', sort: true }
+ , { field: '鍏宠仈鏁伴噺', title: '閿�鍞嚭搴撳叧鑱旀暟閲�', sort: true, totalRow: true }
+ , { field: '鏈叧鑱旀暟閲�', title: '閿�鍞嚭搴撴湭鍏宠仈鏁伴噺', sort: true, totalRow: true }
+ , { field: '鐢熶骇鍏宠仈鏁伴噺', title: '鐢熶骇鍏宠仈鏁伴噺', sort: true, totalRow: true }
+ , { field: '鐢熶骇鏈叧鑱旀暟閲�', title: '鐢熶骇鏈叧鑱旀暟閲�', sort: true, totalRow: true }
, { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 125, sort: true }
, { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 200, templet: "<div>{{d.鍒跺崟鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍒跺崟鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>", sort: true }
, { field: '瀹℃牳浜�', title: '瀹℃牳浜�', width: 125, sort: true }
@@ -419,6 +413,30 @@
, { field: '浣滃簾浜�', title: '浣滃簾浜�', width: 125, sort: true }
, { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡', width: 200, templet: "<div>{{d.浣滃簾鏃ユ湡 ==null ?'':layui.util.toDateString(d.浣滃簾鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>", sort: true }
+
+ //, { field: 'HBillType', title: 'HBillType', hide: true, sort: true }
+ //, { field: '浜よ揣鍦板潃', title: '浜よ揣鍦板潃', width: 125, sort: true }
+ //, { field: 'HSSID', title: 'HSSID', hide: true, sort: true }
+ //, { field: '缁撶畻鏂瑰紡浠ｇ爜', title: '缁撶畻鏂瑰紡浠ｇ爜', width: 125, sort: true }
+ //, { field: '缁撶畻鏂瑰紡', title: '缁撶畻鏂瑰紡', width: 125, sort: true }
+ //, { field: '缁撶畻鏃ユ湡', title: '缁撶畻鏃ユ湡', width: 170, sort: true }
+ //, { field: 'HCurID', title: 'HCurID', hide: true, sort: true }
+ //, { field: '甯佸埆浠ｇ爜', title: '甯佸埆浠ｇ爜', sort: true }
+ //, { field: '甯佸埆', title: '甯佸埆', sort: true }
+ //, { field: '姹囩巼', title: '姹囩巼', sort: true }
+ //, { field: 'HDeptID', title: 'HDeptID', hide: true, sort: true }
+ //, { field: '閮ㄩ棬浠ｇ爜', title: '閮ㄩ棬浠ｇ爜', width: 125, sort: true }
+ //, { field: '閮ㄩ棬', title: '閮ㄩ棬', width: 125, sort: true }
+ //, { field: '閿�鍞柟寮�', title: '閿�鍞柟寮�', sort: true }
+ //, { field: 'HManagerID', title: 'HManagerID', hide: true, sort: true }
+ //, { field: '涓荤浠ｇ爜', title: '涓荤浠ｇ爜', sort: true }
+ //, { field: '涓荤', title: '涓荤', sort: true }
+ //, { field: '鎽樿', title: '鎽樿', sort: true }
+ //, { field: '鎵瑰彿', title: '鎵瑰彿', sort: true }
+ //, { field: '绋庨', title: '绋庨', sort: true }
+ //, { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', sort: true }
+ //, { field: '璁″垝璺熻釜鍙�', title: '璁″垝璺熻釜鍙�', sort: true }
+ //, { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞', sort: true }
]]
, done: function () {
soulTable.render(this);
@@ -440,7 +458,32 @@
data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
success: function (data1) {
if (data1.count == 1) {
- option.data = data1.data;
+
+
+ //璁剧疆鍒楄〃鍚屼竴涓崟鎹彧鏈夌涓�鏉℃暟鎹樉绀轰富琛ㄤ俊鎭紝鍏跺畠璁板綍鍙樉绀哄瓙琛ㄤ俊鎭�
+ //鑾峰彇瀛愯〃鍒楁暟鎹�
+ var colList = [];
+ for (var i = 0; i < option.cols[0].length; i++) {
+ colList.push(option.cols[0][i].field);
+ }
+ //璁剧疆鏁版嵁
+ var result = data1.data;
+ var temp = "";
+ for (var i = 0; i < result.length; i++) {
+ if (temp != result[i]["hmainid"]) {
+ temp = result[i]["hmainid"];
+ } else {
+ var initIndex = $.inArray("hmainid", colList);
+ var lastIndex = $.inArray("hsubid", colList);
+ for (var j = initIndex + 1; j < lastIndex; j++) {
+ var fieldName = colList[j];
+ result[i][fieldName] = "";
+ }
+ }
+ }
+
+
+ option.data = result;
table.render(option);
layer.close(ajaxLoad);
@@ -697,6 +740,12 @@
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
if (checkStatus.data.length === 1) {
+
+ if (data[0].鐘舵�� != "宸插鏍�") {
+ layer.alert("涓嬫帹澶辫触!鍘熷洜锛氬崟鎹姸鎬佷笉涓�'宸插鏍�'鐘舵��!!", { icon: 5 });
+ return;
+ }
+
var hID = data[0].hmainid.toString();
layer.open({
type: 2
@@ -728,6 +777,12 @@
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
if (checkStatus.data.length === 1) {
+ if (data[0].鐘舵�� != "鍒涘缓") {
+ layer.alert("涓嬫帹澶辫触!鍘熷洜锛氬崟鎹姸鎬佷笉涓�'鍒涘缓'鐘舵��!!", { icon: 5 });
+ return;
+ }
+
+
var hID = data[0].hmainid.toString();
layer.open({
type: 2
@@ -759,6 +814,12 @@
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
if (checkStatus.data.length === 1) {
+
+ if (data[0].鐘舵�� != "宸插鏍�") {
+ layer.alert("涓嬫帹澶辫触!鍘熷洜锛氬崟鎹姸鎬佷笉涓�'宸插鏍�'鐘舵��!!", { icon: 5 });
+ return;
+ }
+
var hID = data[0].hmainid.toString();
var hsubid = data[0].hsubid.toString();
layer.open({
@@ -780,6 +841,86 @@
}
})
+ } else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+ }
+ }
+ //#endregion
+
+ //#region 澶氳涓嬫帹锛堥攢鍞嚭搴撳崟锛�
+ function set_PushICStockBills() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (data.length > 0) {
+ var dataArray = [];
+ var HCusName = data[0].瀹㈡埛;
+ for (var i = 0; i < data.length; i++) {
+ var temp = {
+ "hmainid": data[i].hmainid
+ , "hsubid": data[i].hsubid
+ , "HBillStatus": data[i].鐘舵��
+ , "HSourceBillType": "1401"
+ }
+ dataArray.push(temp);
+ if (data[i].鐘舵�� != "宸插鏍�") {
+ layer.msg("涓嬫帹澶辫触!鍗曟嵁鍙枫��" + data[i].鍗曟嵁鍙� + "銆戝崟鎹姸鎬佷笉涓哄凡瀹℃牳鐘舵��!");
+ return;
+ }
+ if (data[i].瀹㈡埛 != HCusName) {
+ layer.msg("涓嬫帹澶辫触!宸茬粡閫変腑鐨勮褰曚腑瀛樺湪涓嶅悓瀹㈡埛!");
+ return;
+ }
+ }
+
+ var datajson = {
+ "data": dataArray
+ };
+
+ var url = encodeURI('../../棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBill.html?OperationType=4&linterid=0&HSouceBillType=1401&res=' + JSON.stringify(datajson));
+
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '閿�鍞鍗�-澶氳涓嬫帹閿�鍞嚭搴撳崟'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: url
+ , btn: ['纭畾'],
+ // 鎸夐挳1 鐨勫洖璋�
+ end: function (index, layero, that) {
+ //鍒锋柊椤甸潰
+ $("#btnSearch").trigger('click');
+ }
+ })
+ } else {
+ layer.msg('璇烽�夋嫨鏁版嵁涓嬫帹锛�');
+ }
+ }
+ //#endregion
+
+ //#region 涓嬫煡
+ function set_LookDown() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var hID = data[0].hmainid.toString();
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '涓嬫煡鍗曟嵁'
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../../閿�鍞鐞�/閿�鍞鍗�/Xs_SeOrderBill_LookDown.html?linterid=' + hID + '&HSouceBillType=1401&closeType=1'
+ , resize: false,
+ end: function () {
+ //鍒锋柊椤甸潰,
+ /* $("#btnSearch").trigger('click');*/
+ }
+ , cancel: function () {
+
+ }
+ })
} else {
layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
}
@@ -905,6 +1046,12 @@
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
if (checkStatus.data.length === 1) {
+
+ if (data[0].鐘舵�� != "宸插鏍�") {
+ layer.alert("鎵撳嵃澶辫触!鍘熷洜锛氬崟鎹姸鎬佷笉涓�'宸插鏍�'鐘舵��!!", { icon: 5 });
+ return;
+ }
+
layer.open({
type: 2
, area: ['50%', '50%']
--
Gitblit v1.9.1