From 7ec20d7301fbe11cf1471cf7c6b9c267d6bb403e Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期二, 30 五月 2023 17:16:47 +0800
Subject: [PATCH] 投产计划查询报表不显示生产订单结案状态的数据，列表增加个状态的过滤框，默认开工 车间仓库对照表 多选
---
WebTM/views/生产管理/日计划基础资料/Gy_WorkWarehouseBill_Add.html | 70 +++++++++++++++++++++++++++++------
WebTM/views/车间管理/报表分析/ProductionPlanReportList.html | 13 ++++++
2 files changed, 71 insertions(+), 12 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 989d883..237b48a 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"
@@ -313,9 +313,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);
}
});
@@ -368,23 +369,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]["HWHID"], "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);//鍏抽棴寮圭獥
}
})
@@ -473,6 +504,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;
}
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/ProductionPlanReportList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/ProductionPlanReportList.html"
index 30d99ed..23b4cf7 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/ProductionPlanReportList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/ProductionPlanReportList.html"
@@ -43,6 +43,7 @@
</select>
</div>
</div>
+
<div class="layui-inline">
<label class="layui-form-label">涓嬭揪鏃ユ湡</label>
<div class="layui-input-block">
@@ -101,6 +102,16 @@
<label class="layui-form-label">鎵瑰彿</label>
<div class="layui-input-block">
<input type="text" class="layui-input" id="HICMOBillNo" style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鐢熶骇璁㈠崟鐘舵��</label>
+ <div class="layui-input-block" style="margin-left: 120px;width: 184px;">
+ <select name="HSTATUS" lay-verify="HSTATUS" id="HSTATUS">
+ <option value="0" >鍏ㄩ儴</option>
+ <option value="4" selected="selected">寮�宸�</option>
+ <option value="6">缁撴</option>
+ </select>
</div>
</div>
</div>
@@ -330,6 +341,7 @@
var F_BSV_WYID = $("#F_BSV_WYID").val();//鍞竴ID
var HMaterNumber = $("#HMaterNumber").val();//鐗╂枡浠ｇ爜
var HState = $("#HState").val();//鐘舵��
+ var HSTATUS = $("#HSTATUS").val();//鐢熶骇璁㈠崟鐘舵��
var HOrgID = sessionStorage["OrganizationID"];
var checkWRuku = $("input[name='checkWRuku']").prop("checked");//澶嶉�夋
@@ -350,6 +362,7 @@
, HBillNo: HBillNo
, IsTrue: checkWRuku
, HState: HState
+ , HSTATUS: HSTATUS
}
get_Display(JSON.stringify(sWhere));
--
Gitblit v1.9.1