From 89ceabaec369ebf9efaf9f36cdc5100e7ca6011e Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期二, 13 五月 2025 09:23:50 +0800
Subject: [PATCH] 完成 日计划工单列表 添加下推 工序流转卡功能，完成 工序流转卡(生产日计划的改造)
---
WebTM/views/生产管理/日计划基础资料/Gy_WorkWarehouseBill_Add.html | 67 +++++++++++++++++++++++++--------
1 files changed, 51 insertions(+), 16 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 237b48a..5d70606 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"
@@ -103,6 +103,7 @@
<script>
+ var HDataEmp = {};
layui.config({
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
@@ -169,15 +170,16 @@
, limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
, cellMinWidth: 120
, height: 'full-170'
+ , totalRow: true
, cols: [[ //琛ㄥご
{ type: 'checkbox', totalRowText: '鍚堣琛�' }
, { type: 'numbers', title: '搴忓彿', totalRow: true }
- , { field: 'HWorkShopID', title: 'HWorkShopID', hide: true }
- , { field: 'HWorkShopNumber', title: '鐢熶骇杞﹂棿', edit: 'text', event: "HWorkShopID" }
- , { field: 'HWorkShopName', title: '杞﹂棿鍚嶇О' }
- , { field: 'HWHID', title: 'HWHID', hide: true }
- , { field: 'HWHNumber', title: '浠撳簱', edit: 'text', event: "HWHID" }
- , { field: 'HWHName', title: '浠撳簱鍚嶇О' }
+ , { field: 'HWorkShopID', title: 'HWorkShopID<label style="color:red"> * </label>', hide: true }
+ , { field: 'HWorkShopNumber', title: '鐢熶骇杞﹂棿<label style="color:red"> * </label>', edit: 'text', event: "HWorkShopID" }
+ , { field: 'HWorkShopName', title: '杞﹂棿鍚嶇О<label style="color:red"> * </label>' }
+ , { field: 'HWHID', title: 'HWHID<label style="color:red"> * </label>', hide: true }
+ , { field: 'HWHNumber', title: '浠撳簱<label style="color:red"> * </label>', edit: 'text', event: "HWHID" }
+ , { field: 'HWHName', title: '浠撳簱鍚嶇О<label style="color:red"> * </label>' }
, { field: 'HRemark', title: '澶囨敞', edit: 'text' }
, { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
]]
@@ -239,11 +241,14 @@
//閫�鍑�
form.on('submit(Cancel)', function () {
- if ((OperationType == 1) || OperationType == 3) {
- Pub_Close(1);
- } else {
- Pub_Close(2);
- }
+ //閫昏緫鍒犻櫎鏂规硶
+ layer.confirm("閫�鍑哄墠璇风‘淇濇暟鎹凡淇濆瓨锛屾槸鍚︾户缁��鍑猴紵", { title: "閫�鍑虹‘璁�" }, function (index) {
+ if((OperationType == 1) || OperationType == 3) {
+ Pub_Close(1);
+ } else {
+ Pub_Close(2);
+ }
+ })
})
//淇濆瓨鎻愪氦
@@ -338,7 +343,7 @@
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["90%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ["../../Baseset/鍩虹璧勬枡/Gy_DepartmentList.html", "yes"]
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
//鎸夐挳涓� 鐨勫洖璋�
@@ -351,10 +356,20 @@
//鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
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);//鍏抽棴寮圭獥
+ }, end: function () {
+ if (typeof (HDataEmp.HItemID) != "undefined") {
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ obj.update({
+ "HWorkShopID": HDataEmp.HItemID
+ , "HWorkShopNumber": HDataEmp.閮ㄩ棬浠ｇ爜
+ , "HWorkShopName": HDataEmp.閮ㄩ棬鍚嶇О
+ })
+ HDataEmp = {};
+ }
}
})
}
@@ -369,7 +384,7 @@
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["90%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ["../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Warehouse.html", "yes"]
+ , content: ["../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Warehouse.html?type=HWHSub", "yes"]
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
//鎸夐挳涓� 鐨勫洖璋�
@@ -400,7 +415,7 @@
//鍦ㄤ笅鏂规坊鍔犳柊鐨勮〃鏍兼暟鎹�
for (var i = 0; i < num; i++) {
option.data.push({
- "HWorkShopID": "", "HWorkShopNumber": "", "HWorkShopName": "", "HWHID": NumData[j]["HWHID"], "HWHNumber": NumData[j]["浠撳簱浠ｇ爜"], "HWHName": NumData[j]["浠撳簱鍚嶇О"], "HRemark": ""
+ "HWorkShopID": "", "HWorkShopNumber": "", "HWorkShopName": "", "HWHID": NumData[j]["HItemID"], "HWHNumber": NumData[j]["浠撳簱浠ｇ爜"], "HWHName": NumData[j]["浠撳簱鍚嶇О"], "HRemark": ""
})
j++;
}
@@ -417,6 +432,17 @@
table.render(option);
layer.close(index);//鍏抽棴寮圭獥
+ }
+ , end: function () {
+ if (typeof (HDataEmp.HItemID) != "undefined") {
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ obj.update({
+ "HWHID": HDataEmp.HItemID
+ , "HWHNumber": HDataEmp.浠撳簱浠ｇ爜
+ , "HWHName": HDataEmp.浠撳簱鍚嶇О
+ })
+ HDataEmp = {};
+ }
}
})
}
@@ -526,6 +552,15 @@
});
+ function GetHDeptNameValue(obj) //杩斿洖鐢熶骇杞﹂棿
+ {
+ HDataEmp = obj[0];
+ }
+
+ //鍙屽嚮杩斿洖浠撳簱
+ function GetHWHSubValue(data) {
+ HDataEmp = data[0]
+ }
</script>
</body>
--
Gitblit v1.9.1