From e73352ec1211ec700717f025d4e54baec0f7e949 Mon Sep 17 00:00:00 2001
From: zrg <z1873@LAPTOP-EAVL132E>
Date: 星期一, 09 六月 2025 12:00:59 +0800
Subject: [PATCH] 作业指导书增加编辑按钮，优化生产质量报表
---
WebTM/views/生产管理/报工台工序/开工/Sc_Add_MESBeginStepWorkBillList.html | 36 ++++++++++++++++++++----------------
1 files changed, 20 insertions(+), 16 deletions(-)
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\274\200\345\267\245/Sc_Add_MESBeginStepWorkBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\274\200\345\267\245/Sc_Add_MESBeginStepWorkBillList.html"
index 07be9b5..0f4011d 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\274\200\345\267\245/Sc_Add_MESBeginStepWorkBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\274\200\345\267\245/Sc_Add_MESBeginStepWorkBillList.html"
@@ -707,18 +707,22 @@
//瀛愯〃 璧嬪��
var rowdata = [];
- for (var i = 0; i < tableSub.length; i++) {
- rowdata.push(
- {
- "HRelationBillInterID": tableSub[i].HRelationBillInterID, "HRelationBillEntryID": tableSub[i].HRelationBillEntryID, "HRelationBillNo": tableSub[i].HRelationBillNo, "HRelationBillType": tableSub[i].HRelationBillType,
- "HICMOInterID": tableSub[i].鐢熶骇璁㈠崟鍐呯爜, "HICMOEntryID": tableSub[i].鐢熶骇璁㈠崟瀛愬唴鐮�, "HICMOBillNo": tableSub[i].鐢熶骇璁㈠崟, "HRemark": tableSub[i].澶囨敞,
- "HProcExchInterID": tableSub[i].HProcExchInterID, "HProcExchEntryID": tableSub[i].HProcExchEntryID, "HProcExchBillNo": tableSub[i].HProcExchBillNo,
- "HMaterID": tableSub[i].HMaterID, "HMaterName": tableSub[i].浜у搧鍚嶇О, "HProcID": tableSub[i].HProcID, "HProcName": tableSub[i].宸ュ簭鍚嶇О,
- }
- )
+ if (tableSub[0].HRelationBillInterID!=null) {
+ for (var i = 0; i < tableSub.length; i++) {
+ rowdata.push(
+ {
+ "HRelationBillInterID": tableSub[i].HRelationBillInterID, "HRelationBillEntryID": tableSub[i].HRelationBillEntryID, "HRelationBillNo": tableSub[i].HRelationBillNo, "HRelationBillType": tableSub[i].HRelationBillType,
+ "HICMOInterID": tableSub[i].鐢熶骇璁㈠崟鍐呯爜, "HICMOEntryID": tableSub[i].鐢熶骇璁㈠崟瀛愬唴鐮�, "HICMOBillNo": tableSub[i].鐢熶骇璁㈠崟, "HRemark": tableSub[i].澶囨敞,
+ "HProcExchInterID": tableSub[i].HProcExchInterID, "HProcExchEntryID": tableSub[i].HProcExchEntryID, "HProcExchBillNo": tableSub[i].HProcExchBillNo,
+ "HMaterID": tableSub[i].HMaterID, "HMaterName": tableSub[i].浜у搧鍚嶇О, "HProcID": tableSub[i].HProcID, "HProcName": tableSub[i].宸ュ簭鍚嶇О,
+ }
+ )
+ }
+
}
option.data = rowdata;
table.render(option);
+
} else {
layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
}
@@ -932,7 +936,7 @@
shift: 2,
area: ['80%', '80%'],
maxmin: true,
- content: ['../../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html', 'yes'],
+ content: ['../../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html?openType=2', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
@@ -972,7 +976,7 @@
shift: 2,
area: ['80%', '80%'],
maxmin: true,
- content: ['../../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Source.html', 'yes'],
+ content: ['../../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Source.html?Htype=&openType=2', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
@@ -1010,7 +1014,7 @@
shift: 2,
area: ['80%', '80%'],
maxmin: true,
- content: ['../../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?type=HEmp', 'yes'],
+ content: ['../../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HEmp', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
@@ -1050,7 +1054,7 @@
shift: 2,
area: ['80%', '80%'],
maxmin: true,
- content: ['../../../鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Gy_Group.html?type=HGroup', 'yes'],
+ content: ['../../../鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Gy_Group.html?Type=HGroup&openType=2', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
@@ -1088,7 +1092,7 @@
shift: 2,
area: ['80%', '80%'],
maxmin: true,
- content: ['../../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html', 'yes'],
+ content: ['../../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html?openType=2&HOrgName=' + sessionStorage["Organization"], 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
@@ -1289,7 +1293,7 @@
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["90%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Sc_ProcessExchangeBillListView.html', 'yes']
+ , content: ['../../../Baseset/鍩虹璧勬枡/Sc_ProcessExchangeBillListView.html', 'yes']
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
//鎸夐挳涓� 鐨勫洖璋�
@@ -1367,7 +1371,7 @@
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["90%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ['../../../views/鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Process.html', 'yes']
+ , content: ['../../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Process.html?openType=2', 'yes']
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
//鎸夐挳涓� 鐨勫洖璋�
--
Gitblit v1.9.1