From 2f55e014a562ca2625e6ba3e3cc999c7d08c59c1 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期三, 20 三月 2024 08:46:35 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/质量管理/巡检记录单/QC_Add_Edit_PatrolProcCheckBill.html | 164 +++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 130 insertions(+), 34 deletions(-)
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_Add_Edit_PatrolProcCheckBill.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_Add_Edit_PatrolProcCheckBill.html"
index 68cee56..16a5f0b 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_Add_Edit_PatrolProcCheckBill.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_Add_Edit_PatrolProcCheckBill.html"
@@ -593,7 +593,7 @@
shift: 2,
area: ['90%', '90%'],
maxmin: true,
- content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_BadReasonList.html', 'yes'],
+ content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_BadReason.html', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
@@ -607,8 +607,8 @@
//鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
obj.update({
HBadReasonID: checkStatus.data[0].HItemID
- , HBadReasonNumber: checkStatus.data[0].HNumber
- , HBadReasonName: checkStatus.data[0].HName
+ , HBadReasonNumber: checkStatus.data[0].涓嶈壇鍘熷洜浠ｇ爜
+ , HBadReasonName: checkStatus.data[0].涓嶈壇鍘熷洜鍚嶇О
});
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
@@ -631,7 +631,7 @@
shift: 2,
area: ['90%', '90%'],
maxmin: true,
- content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html', 'yes'],
+ content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
@@ -645,8 +645,8 @@
//鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
obj.update({
HEmpID: checkStatus.data[0].HItemID
- , HEmpNumber: checkStatus.data[0].HNumber
- , HEmpName: checkStatus.data[0].HName
+ , HEmpNumber: checkStatus.data[0].鑱屽憳浠ｇ爜
+ , HEmpName: checkStatus.data[0].鑱屽憳鍚嶇О
});
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
@@ -707,7 +707,7 @@
shift: 2,
area: ['90%', '90%'],
maxmin: true,
- content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html', 'yes'],
+ content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
@@ -721,8 +721,8 @@
//鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
obj.update({
HCheckEmpID: checkStatus.data[0].HItemID
- , HCheckEmpNumber: checkStatus.data[0].HNumber
- , HCheckEmpName: checkStatus.data[0].HName
+ , HCheckEmpNumber: checkStatus.data[0].鑱屽憳浠ｇ爜
+ , HCheckEmpName: checkStatus.data[0].鑱屽憳鍚嶇О
});
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
@@ -745,7 +745,7 @@
shift: 2,
area: ['90%', '90%'],
maxmin: true,
- content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_MaterialList.html', 'yes'],
+ content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
@@ -759,9 +759,9 @@
//鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
obj.update({
HMaterID: checkStatus.data[0].HItemID
- , HMaterNumber: checkStatus.data[0].HNumber
- , HMaterName: checkStatus.data[0].HName
- , HMaterModel: checkStatus.data[0].HModel
+ , HMaterNumber: checkStatus.data[0].鐗╂枡浠ｇ爜
+ , HMaterName: checkStatus.data[0].鐗╂枡鍚嶇О
+ , HMaterModel: checkStatus.data[0].瑙勬牸鍨嬪彿
});
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
@@ -809,14 +809,31 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_BadReasonList.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_BadReason.html', 'yes']
, resize: false
- , end: function () {
+ , 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("璇烽�夋嫨涓�鏉℃暟鎹�");
+ }
+
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
_obj.update({
- HWasterReasonName: HReasonName
- , HBadReasonID: ReasonID
+ HWasterReasonName: checkStatus.data[0].涓嶈壇鍘熷洜鍚嶇О
+ , HBadReasonID: checkStatus.data[0].HItemID
});
+ layer.close(index);//鍏抽棴寮圭獥
}
+ //, end: function () {
+ // _obj.update({
+ // HWasterReasonName: HReasonName
+ // , HBadReasonID: ReasonID
+ // });
+ //}
})
console.log("瀛楁璧嬪��" + data.HWasterReasonName);
console.log("琛屽彿锛�" + rowIndex);
@@ -835,13 +852,29 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HKeeper', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html', 'yes']
, resize: false
- , end: function () {
+ , 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("璇烽�夋嫨涓�鏉℃暟鎹�");
+ }
+
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
_obj.update({
- HEmpName: EmpName
+ HEmpName: checkStatus.data[0].鑱屽憳鍚嶇О
});
+ layer.close(index);//鍏抽棴寮圭獥
}
+ //, end: function () {
+ // _obj.update({
+ // HEmpName: EmpName
+ // });
+ //}
})
console.log("瀛楁璧嬪��" + data.HEmpName);
console.log("琛屽彿锛�" + rowIndex);
@@ -860,14 +893,32 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Process.html', 'yes']
, resize: false
- , end: function () {
+ , 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("璇烽�夋嫨涓�鏉℃暟鎹�");
+ }
+
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
_obj.update({
- HSQProcName: SQProcName
- , HProcID: ProcID
+
+ HSQProcName: checkStatus.data[0].宸ュ簭鍚嶇О
+ , HProcID: checkStatus.data[0].HItemID
});
+ layer.close(index);//鍏抽棴寮圭獥
}
+ //, end: function () {
+ // _obj.update({
+ // HSQProcName: SQProcName
+ // , HProcID: ProcID
+ // });
+ //}
})
console.log("瀛楁璧嬪��" + data.HSQProcName);
console.log("琛屽彿锛�" + rowIndex);
@@ -886,13 +937,31 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html?Type=HZR', 'yes']
+ , content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Process.html', 'yes']
, resize: false
- , end: function () {
+ , 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("璇烽�夋嫨涓�鏉℃暟鎹�");
+ }
+
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
_obj.update({
- HZRProcName: ZRProcName
+
+ HZRProcName: checkStatus.data[0].宸ュ簭鍚嶇О
+
});
+ layer.close(index);//鍏抽棴寮圭獥
}
+ //, end: function () {
+ // _obj.update({
+ // HZRProcName: ZRProcName
+ // });
+ //}
})
console.log("瀛楁璧嬪��" + data.HZRProcName);
console.log("琛屽彿锛�" + rowIndex);
@@ -927,13 +996,32 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HWorker', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html', 'yes']
, resize: false
- , end: function () {
+ , 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("璇烽�夋嫨涓�鏉℃暟鎹�");
+ }
+
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
_obj.update({
- HPSProcName: QRName
+
+ HPSProcName: checkStatus.data[0].鑱屽憳鍚嶇О
+
});
+ layer.close(index);//鍏抽棴寮圭獥
}
+ //, end: function () {
+ // _obj.update({
+ // HPSProcName: QRName
+ // });
+ // }
+ //}
})
console.log("瀛楁璧嬪��" + data.HPSProcName);
console.log("琛屽彿锛�" + rowIndex);
@@ -1190,11 +1278,19 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HKeeper', 'yes']
- , resize: false
- , cancel: function () {
- //$(".layui-btn").removeClass("layui-btn-disabled");
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html', 'yes']
+ , btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HEmpName").val(checkStatus.data[0].鑱屽憳鍚嶇О);
+ $("#HFirstCheckEmp").val(checkStatus.data[0].HItemID);
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
+ , btn2: function (index, layero) { }
})
});
--
Gitblit v1.9.1