From 262cee2e43059f55330b5efda849fcd1d445efd2 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期二, 28 五月 2024 10:16:21 +0800
Subject: [PATCH] 染厂产量报表：增加客户字段、增加根据用户关联客户过滤
---
WebTM/views/生产管理/日计划基础资料/Gy_WorkWarehouseBill_Add.html | 78 +++++++++++++++++++++++++++++++-------
1 files changed, 63 insertions(+), 15 deletions(-)
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkWarehouseBill_Add.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkWarehouseBill_Add.html"
index d81f4b0..3ee1081 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkWarehouseBill_Add.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkWarehouseBill_Add.html"
@@ -169,6 +169,7 @@
, limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
, cellMinWidth: 120
, height: 'full-170'
+ , totalRow: true
, cols: [[ //琛ㄥご
{ type: 'checkbox', totalRowText: '鍚堣琛�' }
, { type: 'numbers', title: '搴忓彿', totalRow: true }
@@ -283,6 +284,7 @@
Organization += '<option style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
}
$("#HPRDORGID").append(Organization);
+ $("#HPRDORGID").val(sessionStorage["OrganizationID"]);
form.render('select');
}
layer.closeAll("loading");
@@ -312,9 +314,10 @@
if (rowIndex === '0') {
layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
} else {
- obj.del();
- option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
- table.reload(option);
+ var oldData = table.cache["mainTable"];
+ oldData.splice(obj.tr.data('index'), 1)
+ option.data = oldData;//灏嗘暟鎹粦瀹氬埌data涓�
+ table.render(option);
layer.close(index);
}
});
@@ -336,7 +339,7 @@
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["90%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ["../../Baseset/鍩虹璧勬枡/Gy_DepartmentList.html", "yes"]
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
//鎸夐挳涓� 鐨勫洖璋�
@@ -349,8 +352,8 @@
//鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
obj.update({
"HWorkShopID": checkStatus.data[0].HItemID
- , "HWorkShopNumber": checkStatus.data[0].HNumber
- , "HWorkShopName": checkStatus.data[0].HName
+ , "HWorkShopNumber": checkStatus.data[0].閮ㄩ棬浠ｇ爜
+ , "HWorkShopName": checkStatus.data[0].閮ㄩ棬鍚嶇О
})
layer.close(index);//鍏抽棴寮圭獥
}
@@ -367,23 +370,53 @@
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["90%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ["../../Baseset/鍩虹璧勬枡/Gy_WarehouseList.html", "yes"]
+ , content: ["../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Warehouse.html", "yes"]
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
//鎸夐挳涓� 鐨勫洖璋�
var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
- if (checkStatus.data.length != 1) {
- return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+ if (checkStatus.data.length == 0) {
+ return layer.msg("璇烽�夋嫨鏁版嵁");
}
+ //鑾峰彇鏁版嵁
+ var NumData = checkStatus.data;
+ //鑾峰彇褰撳墠浣嶇疆鎵�鍦ㄨ鏁�
+ var NowNum = obj.tr.data('index') + 1;
- //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
- obj.update({
- "HWHID": checkStatus.data[0].HItemID
- , "HWHNumber": checkStatus.data[0].HNumber
- , "HWHName": checkStatus.data[0].HName
- })
+ //鍒ゆ柇閫夋嫨鐨勬暟鎹�绘暟 鏄惁澶т簬琛ㄦ牸鐜版湁鐨勬暟鎹�
+ if (NumData.length > option.data.length - (NowNum - 1)) {
+ //鑾峰彇琛ㄦ牸鍓╀綑琛屾暟閲�
+ var num = NumData.length - option.data.length + (NowNum - 1);
+ //寰幆璧嬪�� 鍦ㄥ凡鏈夌殑琛ㄦ牸璧嬪��
+ var j = 0;
+ for (var i = (NowNum - 1); i < option.data.length; i++) {
+ option.data[i]["HWHID"] = NumData[j]["HItemID"];
+ option.data[i]["HWHNumber"] = NumData[j]["浠撳簱浠ｇ爜"];
+ option.data[i]["HWHName"] = NumData[j]["浠撳簱鍚嶇О"];
+ j++;
+ }
+
+ //鍦ㄤ笅鏂规坊鍔犳柊鐨勮〃鏍兼暟鎹�
+ for (var i = 0; i < num; i++) {
+ option.data.push({
+ "HWorkShopID": "", "HWorkShopNumber": "", "HWorkShopName": "", "HWHID": NumData[j]["HItemID"], "HWHNumber": NumData[j]["浠撳簱浠ｇ爜"], "HWHName": NumData[j]["浠撳簱鍚嶇О"], "HRemark": ""
+ })
+ j++;
+ }
+ } else {
+ //寰幆璧嬪�� 鍦ㄥ凡鏈夌殑琛ㄦ牸璧嬪��
+ var j = 0;
+ for (var i = (NowNum - 1); i < (NowNum - 1) + NumData.length; i++) {
+ option.data[i]["HWHID"] = NumData[j]["HItemID"];
+ option.data[i]["HWHNumber"] = NumData[j]["浠撳簱浠ｇ爜"];
+ option.data[i]["HWHName"] = NumData[j]["浠撳簱鍚嶇О"];
+ j++;
+ }
+ }
+ table.render(option);
+
layer.close(index);//鍏抽棴寮圭獥
}
})
@@ -472,6 +505,21 @@
layer.msg("缁勭粐娌℃湁閫夋嫨");
return false;
}
+
+ for (var i = 0; i < option.data.length; i++) {
+ //鐢熶骇杞﹂棿
+ if (option.data[i]["HWorkShopID"] == "") {
+ layer.msg("绗�" + (i + 1) + "琛�:鐢熶骇杞﹂棿涓嶈兘涓虹┖!");
+ return false;
+ }
+
+ //浠撳簱
+ if (option.data[i]["HWHID"] == "0") {
+ layer.msg("绗�" + (i + 1) + "琛�:浠撳簱涓嶈兘涓虹┖!");
+ return false;
+ }
+ }
+
return true;
}
--
Gitblit v1.9.1