From e5be4b7dbb489ff4bbf846bd0a293fda8dee2a12 Mon Sep 17 00:00:00 2001
From: yxj <yxj@hz-kingdee.com>
Date: 星期五, 04 十月 2024 16:22:40 +0800
Subject: [PATCH] 考勤汇报单、工资结算单（个人、集体）编辑模块列设置功能修正
---
WebTM/views/IpadStepIndex.html | 366 +++++++++++++++++++++++++--------------------------
1 files changed, 178 insertions(+), 188 deletions(-)
diff --git a/WebTM/views/IpadStepIndex.html b/WebTM/views/IpadStepIndex.html
index 6758333..e1ddb06 100644
--- a/WebTM/views/IpadStepIndex.html
+++ b/WebTM/views/IpadStepIndex.html
@@ -35,6 +35,7 @@
var HSourceBillType = ""; //婧愬崟绫诲瀷
var HICMOInterID = ""; //鐢熶骇璁㈠崟涓诲唴鐮�
var HICMOEntryID = ""; //鐢熶骇璁㈠崟瀛愬唴鐮�
+ var HProcID = ""; //宸ュ簭ID
var HICMOBillNo = ""; //浠诲姟鍗曞彿
//娉ㄦ剰锛氶�夐」鍗� 渚濊禆 element 妯″潡锛屽惁鍒欐棤娉曡繘琛屽姛鑳芥�ф搷浣�
layui.config({
@@ -82,6 +83,9 @@
html1 += '<dd>';
html1 += '<h1 style="display:none;"><span>璧勬簮ID锛�</span><span id="eqpid' + i + '">' + LoadData[i - 1].HSourceID + '</span></h1>';
html1 += '<h1><span>璁惧缂栧彿锛�</span><span id="eqp' + i + '">' + LoadData[i - 1].HSourceName + '</span></h1>';
+ html1 += '<h1><span>璁惧浠ｇ爜锛�</span><span id="eqp' + i + '">' + LoadData[i - 1].HSourceNumber + '</span></h1>';
+ html1 += '<h1><span>鎿嶄綔鍛橈細</span><span id="eqp' + i + '">' + LoadData[i - 1].HUserName + '</span></h1>';
+ html1 += '<h1><span>鐢熶骇鐝粍锛�</span><span id="eqp' + i + '">' + LoadData[i - 1].GroupName + '</span></h1>';
//html1 += '<h1><span>褰撳墠宸ュ崟锛�</span><span id="po' + i + '">' + (LoadData[i - 1].HSourceBillNo == null ? '' : LoadData[i - 1].HSourceBillNo) + '</span></h1>';
//html1 += '<h1><span>浜у搧鍚嶇О锛�</span><span id="ptn' + i + '">' + (LoadData[i - 1].HName == null ? '' : LoadData[i - 1].HName) + '</span></h1>';
//html1 += '<h1><span>浜у搧瑙勬牸锛�</span><span id="pts' + i + '">' + (LoadData[i - 1].HModel == null ? '' : LoadData[i - 1].HModel) + '</span></h1>';
@@ -171,7 +175,7 @@
html1 += '<h1 style="display:none;"><span>婧愬崟绫诲瀷锛�</span><span id="st' + (i + 1) + '">' + LoadData1[i].HSourceBillType + '</span></h1>';
html1 += '<h1 style="display:none;"><span>鐢熶骇璁㈠崟鍙蜂富ID锛�</span><span id="df' + (i + 1) + '">' + LoadData1[i].HICMOInterID + '</span></h1>';
html1 += '<h1 style="display:none;"><span>鐢熶骇璁㈠崟瀛怚D锛�</span><span id="ds' + (i + 1) + '">' + LoadData1[i].HICMOEntryID + '</span></h1>';
-
+ html1 += '<h1 style="display:none;"><span>宸ュ簭ID锛�</span><span id="ps' + (i + 1) + '">' + LoadData1[i].HProcID + '</span></h1>';
html1 += '<h1><span>宸ュ崟鍙凤細</span><span id="wk' + (i + 1) + '">' + LoadData1[i].HICMOBillNo + '</span></h1>';
html1 += '<h1><span>浜у搧鍚嶇О锛�</span><span id="ptn' + (i + 1) + '">' + LoadData1[i].HMaterName + '</span></h1>';
@@ -179,23 +183,23 @@
html1 += '<h1><span>璁″垝鏁伴噺锛�</span><span>' + LoadData1[i].HDatePlanQty + '</span><span style="margin-left:20px;">姹囨姤鎬绘暟锛�</span><span>' + LoadData1[i].HDateFinishQty+'</span></h1>';
switch (LoadData1[i].HICMOStatus) {
case "寰呯敓浜�":
- html1 += '<h1><span>褰撳墠鐘舵�侊細</span><span class="gj_icon color_border3"></span><span>' + LoadData1[i].HICMOStatus + '</span></h1>';
+ html1 += '<h1><span>褰撳墠鐘舵�侊細</span><span class="gj_icon color_border3"></span><span>' + LoadData1[i].HICMOStatus + '</span><span style="margin-left:20px;">宸ュ簭锛�</span><span>' + LoadData1[i].HProcName +'</span></h1>';
break;
case "鐢熶骇涓�":
- html1 += '<h1><span>褰撳墠鐘舵�侊細</span><span class="gj_icon color_border2"></span><span>' + LoadData1[i].HICMOStatus + '</span></h1>';
+ html1 += '<h1><span>褰撳墠鐘舵�侊細</span><span class="gj_icon color_border2"></span><span>' + LoadData1[i].HICMOStatus + '</span><span style="margin-left:20px;">宸ュ簭锛�</span><span>' + LoadData1[i].HProcName +'</span></h1>';
break;
case "鎸傝捣":
- html1 += '<h1><span>褰撳墠鐘舵�侊細</span><span class="gj_icon color_border1"></span><span>' + LoadData1[i].HICMOStatus + '</span></h1>';
+ html1 += '<h1><span>褰撳墠鐘舵�侊細</span><span class="gj_icon color_border1"></span><span>' + LoadData1[i].HICMOStatus + '</span><span style="margin-left:20px;">宸ュ簭锛�</span><span>' + LoadData1[i].HProcName +'</span></h1>';
break;
case "瀹屽伐":
- html1 += '<h1><span>褰撳墠鐘舵�侊細</span><span class="gj_icon color_border4"></span><span>' + LoadData1[i].HICMOStatus + '</span></h1>';
+ html1 += '<h1><span>褰撳墠鐘舵�侊細</span><span class="gj_icon color_border4"></span><span>' + LoadData1[i].HICMOStatus + '</span><span style="margin-left:20px;">宸ュ簭锛�</span><span>' + LoadData1[i].HProcName +'</span></h1>';
break;
default:
}
html1 += '<span class="prs">鐢熶骇杩涘害锛�</span>';
html1 += '<div class="layui-progress layui-progress-big" lay-showPercent="yes">';
- html1 += '<div class="layui-progress-bar" lay-percent="' + (LoadData1[i].HDateFinishQty / LoadData1[i].HDatePlanQty)*100 + '%" style="width:' + (LoadData1[i].HDateFinishQty / LoadData1[i].HDatePlanQty)*100 + '%;">';
- html1 += '<span class="layui-progress-text">' + (LoadData1[i].HDateFinishQty / LoadData1[i].HDatePlanQty)*100 + '%</span>';
+ html1 += '<div class="layui-progress-bar" lay-percent="' + ((LoadData1[i].HDateFinishQty / LoadData1[i].HDatePlanQty) * 100).toFixed(2) + '%" style="width:' + ((LoadData1[i].HDateFinishQty / LoadData1[i].HDatePlanQty) * 100).toFixed(2) + '%;">';
+ html1 += '<span class="layui-progress-text">' + ((LoadData1[i].HDateFinishQty / LoadData1[i].HDatePlanQty) * 100).toFixed(2) + '%</span>';
html1 += '</div > ';
html1 += '</div>';
html1 += '</dd>';
@@ -224,10 +228,11 @@
html1 += '<h1><span>杩涘害锛�</span><span>0%</span></h1>';
}
else {
- html1 += '<h1><span>杩涘害锛�</span><span>' + (LoadData2[i].HRelationQty / LoadData2[i].HPlanQty) * 100 + '%</span></h1>';
+ html1 += '<h1><span>杩涘害锛�</span><span>' + ((LoadData2[i].HRelationQty / LoadData2[i].HPlanQty) * 100).toFixed(2) + '%</span></h1>';
}
html1 += '<h1><span>鏈崟杩愯鏃堕棿锛�</span><span>' + getSeconds(LoadData2[i].HSumTimes) + '</span></h1>';
- html1 += '<h1><span>鏈祫婧愯繍琛屾椂闂达細</span><span>' + getSeconds(LoadData2[i].HSourceWorkTime) + '</span></h1>';
+ html1 += '<h1><span>褰撳墠宸ュ簭锛�</span><span>' + LoadData2[i].HProcName + '</span></h1>';
+ /*html1 += '<h1><span>鏈祫婧愯繍琛屾椂闂达細</span><span>' + getSeconds(LoadData2[i].HSourceWorkTime) + '</span></h1>';*/
html1 += '</dd>';
html1 += '</dl>';
html1 += '</div>';
@@ -373,6 +378,7 @@
HSourceBillType = $("#st" + i + "").html(); //閫氳繃鏍峰紡ID鑾峰彇html鍐呭(婧愬崟绫诲瀷)
HICMOInterID = $("#df" + i + "").html(); //鐢熶骇璁㈠崟涓诲唴鐮�
HICMOEntryID = $("#ds" + i + "").html(); //鐢熶骇璁㈠崟瀛愬唴鐮�
+ HProcID = $("#ps" + i + "").html(); //宸ュ簭ID
if (workcode != "" && workcode != null) {
@@ -551,25 +557,25 @@
shift: 2,
area: ['100%', '100%'],
maxmin: true,
- content: '鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/寮�宸�/Sc_Add_MESBeginStepWorkBillList.html?OperationType=2&linterid=&HSouceBillType=',
+ content: '鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/寮�宸�/Sc_Add_MESBeginStepWorkBillList.html?OperationType=2&linterid=&HSouceBillType=&HBillType=' + HBillType + '&HSourceInterID=' + HSourceInterID + '&HSourceEntryID=' + HSourceEntryID + '&HSourceBillNo=' + HSourceBillNo + '&HSourceBillType=' + HSourceBillType+'',
end: function () {
},
- success: function (dom, index) {
- var data = [];
- data.push({
- "HBillType": HBillType,
- "HSourceInterID": HSourceInterID,
- "HSourceEntryID": HSourceEntryID,
- "HSourceBillNo": HSourceBillNo,
- "HSourceBillType": HSourceBillType
- });
+ //success: function (dom, index) {
+ // var data = [];
+ // data.push({
+ // "HBillType": HBillType,
+ // "HSourceInterID": HSourceInterID,
+ // "HSourceEntryID": HSourceEntryID,
+ // "HSourceBillNo": HSourceBillNo,
+ // "HSourceBillType": HSourceBillType
+ // });
- //閫氳繃绱㈠紩鑾峰彇鍒板綋鍓峣frame寮瑰嚭灞�
- var iframe = window['layui-layer-iframe' + index];
- //璋冪敤iframe寮瑰嚭灞傚唴鐨勬柟娉�
- iframe.edit(data);
- },
+ // //閫氳繃绱㈠紩鑾峰彇鍒板綋鍓峣frame寮瑰嚭灞�
+ // var iframe = window['layui-layer-iframe' + index];
+ // //璋冪敤iframe寮瑰嚭灞傚唴鐨勬柟娉�
+ // iframe.edit(data);
+ //},
});
}
@@ -591,25 +597,26 @@
shift: 2,
area: ['100%', '100%'],
maxmin: true,
- content: '鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/浜ч噺姹囨姤/Sc_Add_ProductReportStepBillList.html?OperationType=2&linterid=&HSouceBillType=',
+ content: '鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/浜ч噺姹囨姤/Sc_Add_ProductReportStepBillList.html?OperationType=2&linterid=&HSouceBillType=&HBillType=' + HBillType + '&HSourceInterID=' + HSourceInterID + '&HSourceEntryID=' + HSourceEntryID + '&HSourceBillNo=' + HSourceBillNo + '&HSourceBillType=' + HSourceBillType + '',
+ //content: '鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/浜ч噺姹囨姤/Sc_Add_ProductReportStepBillList.html?OperationType=2&linterid=&HSouceBillType=',
end: function () {
},
- success: function (dom, index) {
- var data = [];
- data.push({
- "HBillType": HBillType,
- "HSourceInterID": HSourceInterID,
- "HSourceEntryID": HSourceEntryID,
- "HSourceBillNo": HSourceBillNo,
- "HSourceBillType": HSourceBillType
- });
+ //success: function (dom, index) {
+ // var data = [];
+ // data.push({
+ // "HBillType": HBillType,
+ // "HSourceInterID": HSourceInterID,
+ // "HSourceEntryID": HSourceEntryID,
+ // "HSourceBillNo": HSourceBillNo,
+ // "HSourceBillType": HSourceBillType
+ // });
- //閫氳繃绱㈠紩鑾峰彇鍒板綋鍓峣frame寮瑰嚭灞�
- var iframe = window['layui-layer-iframe' + index];
- //璋冪敤iframe寮瑰嚭灞傚唴鐨勬柟娉�
- iframe.edit(data);
- },
+ // //閫氳繃绱㈠紩鑾峰彇鍒板綋鍓峣frame寮瑰嚭灞�
+ // var iframe = window['layui-layer-iframe' + index];
+ // //璋冪敤iframe寮瑰嚭灞傚唴鐨勬柟娉�
+ // iframe.edit(data);
+ //},
});
}
@@ -631,25 +638,26 @@
shift: 2,
area: ['100%', '100%'],
maxmin: true,
- content: '鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/瀹屽伐/Sc_Add_MESEndStepWorkBillList.html?OperationType=2&linterid=&HSouceBillType=',
+ content: '鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/瀹屽伐/Sc_Add_MESEndStepWorkBillList.html?OperationType=2&linterid=&HSouceBillType=&HBillType=' + HBillType + '&HSourceInterID=' + HSourceInterID + '&HSourceEntryID=' + HSourceEntryID + '&HSourceBillNo=' + HSourceBillNo + '&HSourceBillType=' + HSourceBillType + '',
+ //content: '鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/瀹屽伐/Sc_Add_MESEndStepWorkBillList.html?OperationType=2&linterid=&HSouceBillType=',
end: function () {
},
- success: function (dom, index) {
- var data = [];
- data.push({
- "HBillType": HBillType,
- "HSourceInterID": HSourceInterID,
- "HSourceEntryID": HSourceEntryID,
- "HSourceBillNo": HSourceBillNo,
- "HSourceBillType": HSourceBillType
- });
+ //success: function (dom, index) {
+ // var data = [];
+ // data.push({
+ // "HBillType": HBillType,
+ // "HSourceInterID": HSourceInterID,
+ // "HSourceEntryID": HSourceEntryID,
+ // "HSourceBillNo": HSourceBillNo,
+ // "HSourceBillType": HSourceBillType
+ // });
- //閫氳繃绱㈠紩鑾峰彇鍒板綋鍓峣frame寮瑰嚭灞�
- var iframe = window['layui-layer-iframe' + index];
- //璋冪敤iframe寮瑰嚭灞傚唴鐨勬柟娉�
- iframe.edit(data);
- },
+ // //閫氳繃绱㈠紩鑾峰彇鍒板綋鍓峣frame寮瑰嚭灞�
+ // var iframe = window['layui-layer-iframe' + index];
+ // //璋冪敤iframe寮瑰嚭灞傚唴鐨勬柟娉�
+ // iframe.edit(data);
+ //},
});
}
@@ -671,25 +679,26 @@
shift: 2,
area: ['100%', '100%'],
maxmin: true,
- content: '鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/鍋滃伐/Sc_Add_MESStopStepWorkBillList.html?OperationType=2&linterid=&HSouceBillType=',
+ content: '鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/鍋滃伐/Sc_Add_MESStopStepWorkBillList.html?OperationType=2&linterid=&HSouceBillType=&HBillType=' + HBillType + '&HSourceInterID=' + HSourceInterID + '&HSourceEntryID=' + HSourceEntryID + '&HSourceBillNo=' + HSourceBillNo + '&HSourceBillType=' + HSourceBillType + '',
+ //content: '鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/鍋滃伐/Sc_Add_MESStopStepWorkBillList.html?OperationType=2&linterid=&HSouceBillType=',
end: function () {
},
- success: function (dom, index) {
- var data = [];
- data.push({
- "HBillType": HBillType,
- "HSourceInterID": HSourceInterID,
- "HSourceEntryID": HSourceEntryID,
- "HSourceBillNo": HSourceBillNo,
- "HSourceBillType": HSourceBillType
- });
+ //success: function (dom, index) {
+ // var data = [];
+ // data.push({
+ // "HBillType": HBillType,
+ // "HSourceInterID": HSourceInterID,
+ // "HSourceEntryID": HSourceEntryID,
+ // "HSourceBillNo": HSourceBillNo,
+ // "HSourceBillType": HSourceBillType
+ // });
- //閫氳繃绱㈠紩鑾峰彇鍒板綋鍓峣frame寮瑰嚭灞�
- var iframe = window['layui-layer-iframe' + index];
- //璋冪敤iframe寮瑰嚭灞傚唴鐨勬柟娉�
- iframe.edit(data);
- },
+ // //閫氳繃绱㈠紩鑾峰彇鍒板綋鍓峣frame寮瑰嚭灞�
+ // var iframe = window['layui-layer-iframe' + index];
+ // //璋冪敤iframe寮瑰嚭灞傚唴鐨勬柟娉�
+ // iframe.edit(data);
+ //},
});
}
@@ -707,29 +716,71 @@
shift: 2,
area: ['100%', '100%'],
maxmin: true,
- content: '鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/浜ч噺姹囨姤/Sc_ProductReportStepBillList.html?OperationType=2&linterid=&HSouceBillType=',
+ content: '鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/浜ч噺姹囨姤/Sc_ProductReportStepBillList.html?OperationType=2&linterid=&HSouceBillType=&workcode=' + workcode + '&HSourceID=' + HSourceID1 + '&HSourceName=' + HSourceName1 + '&HICMOInterID=' + HICMOInterID + '&HICMOEntryID=' + HICMOEntryID + '&HMaker=' + sessionStorage["HUserName"] + '&Czybm=' + sessionStorage["Czybm"] + '&HSourceInterID=' + HSourceInterID + '&HSourceBillType=' + HSourceBillType + '&HProcID=' + HProcID+'',
+ //content: '鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/浜ч噺姹囨姤/Sc_ProductReportStepBillList.html?OperationType=2&linterid=&HSouceBillType=',
end: function () {
},
- success: function (dom, index) {
- var data = [];
- data.push({
- "workcode": workcode,
- "HSourceID": HSourceID1,
- "HSourceName": HSourceName1,
- "HICMOInterID": HICMOInterID,
- "HICMOEntryID": HICMOEntryID,
- "HMaker": sessionStorage["HUserName"], //sessionStorage["HUserName"]
- "Czybm": sessionStorage["Czybm"],
- //"HEmpID": "0", //sessionStorage["HEmpID"]
- "HSourceBillType": HSourceBillType
- });
+ //success: function (dom, index) {
+ // //閫氳繃绱㈠紩鑾峰彇鍒板綋鍓峣frame寮瑰嚭灞�
+ // var iframe = window['layui-layer-iframe' + index];
+ // var data = [];
+ // data.push({
+ // "workcode": workcode,
+ // "HSourceID": HSourceID1,
+ // "HSourceName": HSourceName1,
+ // "HICMOInterID": HICMOInterID,
+ // "HICMOEntryID": HICMOEntryID,
+ // "HMaker": sessionStorage["HUserName"], //sessionStorage["HUserName"]
+ // "Czybm": sessionStorage["Czybm"],
+ // //"HEmpID": "0", //sessionStorage["HEmpID"]
+ // "HSourceInterID": HSourceInterID,
+ // "HSourceBillType": HSourceBillType,
+ // "HProcID": HProcID
+ // });
+ // //璋冪敤iframe寮瑰嚭灞傚唴鐨勬柟娉�
+ // iframe.edit(data);
+ //},
+ });
+ }
- //閫氳繃绱㈠紩鑾峰彇鍒板綋鍓峣frame寮瑰嚭灞�
- var iframe = window['layui-layer-iframe' + index];
- //璋冪敤iframe寮瑰嚭灞傚唴鐨勬柟娉�
- iframe.edit(data);
+ //杩斿伐鐢宠鍗曟寜閽偣鍑讳簨浠�
+ function OpenReturn(event, obj) {
+ if (wktag == 0) {
+ layer.alert("璇烽�夋嫨宸ュ崟鍒楄〃", { icon: 5 });
+ return false;
+ }
+ if (WorkStaus(HSourceID1, workcode, HSourceInterID, "杩斿伐")) {
+ layer.alert("鍗曟嵁鐘舵�佷笉婊¤冻杩斿伐鏉′欢!", { icon: 5 });
+ return false;
+ }
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '鏂板杩斿伐鍗�',
+ closeBtn: 1,
+ shift: 2,
+ area: ['100%', '100%'],
+ maxmin: true,
+ content: '鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/杩斿伐/Sc_Add_MESReturnStepWorkBillList.html?OperationType=2&linterid=&HSouceBillType=&HBillType=' + HBillType + '&HSourceInterID=' + HSourceInterID + '&HSourceEntryID=' + HSourceEntryID + '&HSourceBillNo=' + HSourceBillNo + '&HSourceBillType=' + HSourceBillType + '',
+ //content: '鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/杩斿伐/Sc_Add_MESReturnStepWorkBillList.html?OperationType=2&linterid=&HSouceBillType=',
+ end: function () {
+
},
+ //success: function (dom, index) {
+ // //閫氳繃绱㈠紩鑾峰彇鍒板綋鍓峣frame寮瑰嚭灞�
+ // var iframe = window['layui-layer-iframe' + index];
+ // var data = [];
+ // data.push({
+ // "HBillType": HBillType,
+ // "HSourceInterID": HSourceInterID,
+ // "HSourceEntryID": HSourceEntryID,
+ // "HSourceBillNo": HSourceBillNo,
+ // "HSourceBillType": HSourceBillType
+ // });
+ // //璋冪敤iframe寮瑰嚭灞傚唴鐨勬柟娉�
+ // iframe.edit(data);
+ //},
});
}
@@ -747,74 +798,29 @@
shift: 2,
area: ['100%', '100%'],
maxmin: true,
- content: '鐢熶骇绠＄悊/涓婃枡闃查敊鍗�/Sc_Add_MaterToSourceBillList.html?OperationType=2&linterid=&HSouceBillType=',
+ content: '鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/闃查敊/Sc_Add_MaterToSourceStepBillList.html?OperationType=2&linterid=&HSouceBillType=&HBillType=' + HBillType + '&HSourceInterID=' + HSourceInterID + '&HSourceEntryID=' + HSourceEntryID + '&HSourceBillNo=' + HSourceBillNo + '&HSourceBillType=' + HSourceBillType + '',
+ //content: '鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/闃查敊/Sc_Add_MaterToSourceStepBillList.html?OperationType=2&linterid=&HSouceBillType=',
end: function () {
},
- success: function (dom, index) {
- var data = [];
- data.push({
- "HBillType": HBillType,
- "HSourceInterID": HSourceInterID,
- "HSourceEntryID": HSourceEntryID,
- "HSourceBillNo": HSourceBillNo,
- "HSourceBillType": HSourceBillType
- });
+ //success: function (dom, index) {
+ // var data = [];
+ // data.push({
+ // "HBillType": HBillType,
+ // "HSourceInterID": HSourceInterID,
+ // "HSourceEntryID": HSourceEntryID,
+ // "HSourceBillNo": HSourceBillNo,
+ // "HSourceBillType": HSourceBillType
+ // });
- //閫氳繃绱㈠紩鑾峰彇鍒板綋鍓峣frame寮瑰嚭灞�
- var iframe = window['layui-layer-iframe' + index];
- //璋冪敤iframe寮瑰嚭灞傚唴鐨勬柟娉�
- iframe.edit(data);
- },
+ // //閫氳繃绱㈠紩鑾峰彇鍒板綋鍓峣frame寮瑰嚭灞�
+ // var iframe = window['layui-layer-iframe' + index];
+ // //璋冪敤iframe寮瑰嚭灞傚唴鐨勬柟娉�
+ // iframe.edit(data);
+ //},
});
}
- //棣栨妫�楠�
- function OpenFistCheck(event, obj) {
- if (wktag == 0) {
- layer.alert("璇烽�夋嫨宸ュ崟鍒楄〃", { icon: 5 });
- return false;
- }
- layer.open({
- type: 2
- , area: ['100%', '100%']
- , title: '棣栦欢妫�楠屽崟-缂栬緫'
- , shade: 0.6
- , maxmin: false
- , anim: 0
- , content: ['璐ㄩ噺绠＄悊/棣栦欢妫�楠屽崟/QC_Add_Edit_FirstPieceCheckBill.html?OperationType=2&linterid=' + HSourceInterID + '&HSouceBillType=' + HBillType + '&HICMOEntryID=' + HSourceEntryID, 'yes']
- , resize: false
- , cancel: function () {
- }
- , end: function () {
-
- }
- })
- }
-
- //杩囩▼妫�楠�
- function OpenProcess(event, obj) {
- if (wktag == 0) {
- layer.alert("璇烽�夋嫨宸ュ崟鍒楄〃", { icon: 5 });
- return false;
- }
- layer.open({
- type: 2
- , area: ['100%', '100%']
- , title: '宸ュ簭妫�楠屽崟-缂栬緫'
- , shade: 0.6
- , maxmin: false
- , anim: 0
- , content: ['璐ㄩ噺绠＄悊/宸ュ簭妫�楠屽崟/QC_ProcessCheckBill.html?OperationType=2&linterid=' + HSourceInterID + '&HSouceBillType=' + HBillType + '&HICMOEntryID=' + HSourceEntryID, 'yes']
- , resize: false
- , cancel: function () {
-
- }
- , end: function () {
-
- }
- })
- }
//涓嶈壇閲囬泦
function BadGather() {
@@ -829,7 +835,7 @@
, shade: 0.6
, maxmin: false
, anim: 0
- , content: ['鐢熶骇绠＄悊/璐ㄩ噺姹囨姤鍗�/Sc_QualityReportBill.html?OperationType=2&linterid=' + HSourceInterID + '&HSouceBillType=' + HBillType + '&HICMOEntryID=' + HSourceEntryID, 'yes']
+ , content: ['鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/涓嶈壇閲囬泦/Sc_QualityReportStepBill.html?OperationType=2&linterid=' + HSourceInterID + '&HSouceBillType=' + HBillType + '&HICMOEntryID=' + HSourceEntryID, 'yes']
, resize: false
, cancel: function () {
@@ -855,25 +861,26 @@
shift: 2,
area: ['100%', '100%'],
maxmin: true,
- content: '鐢熶骇绠＄悊/寮傚父鍙嶉鍗�/Sc_Add_MESExecptFeedBackBillList.html?OperationType=2&linterid=&HSouceBillType=',
+ content: '鐢熶骇绠＄悊/寮傚父鍙嶉鍗�/Sc_Add_MESExecptFeedBackBillList.html?OperationType=2&linterid=&HSouceBillType=&HBillType=' + HBillType + '&HSourceInterID=' + HSourceInterID + '&HSourceEntryID=' + HSourceEntryID + '&HSourceBillNo=' + HSourceBillNo + '&HSourceBillType=' + HSourceBillType + '',
+ //content: '鐢熶骇绠＄悊/寮傚父鍙嶉鍗�/Sc_Add_MESExecptFeedBackBillList.html?OperationType=2&linterid=&HSouceBillType=',
end: function () {
},
- success: function (dom, index) {
- var data = [];
- data.push({
- "HBillType": HBillType,
- "HSourceInterID": HSourceInterID,
- "HSourceEntryID": HSourceEntryID,
- "HSourceBillNo": HSourceBillNo,
- "HSourceBillType": HSourceBillType
- });
+ //success: function (dom, index) {
+ // var data = [];
+ // data.push({
+ // "HBillType": HBillType,
+ // "HSourceInterID": HSourceInterID,
+ // "HSourceEntryID": HSourceEntryID,
+ // "HSourceBillNo": HSourceBillNo,
+ // "HSourceBillType": HSourceBillType
+ // });
- //閫氳繃绱㈠紩鑾峰彇鍒板綋鍓峣frame寮瑰嚭灞�
- var iframe = window['layui-layer-iframe' + index];
- //璋冪敤iframe寮瑰嚭灞傚唴鐨勬柟娉�
- iframe.edit(data);
- },
+ // //閫氳繃绱㈠紩鑾峰彇鍒板綋鍓峣frame寮瑰嚭灞�
+ // var iframe = window['layui-layer-iframe' + index];
+ // //璋冪敤iframe寮瑰嚭灞傚唴鐨勬柟娉�
+ // iframe.edit(data);
+ //},
});
}
@@ -886,7 +893,7 @@
//鍗曟嵁鐘舵�侀獙璇�
function WorkStaus(HSourceID1, workcode, HSourceInterID, btn) {
var flag = false;
- var sWhere = "";
+ var sWhere = ""; //浠诲姟鍗曠姸鎬�(0寰呯敓浜э紝1鐢熶骇涓紝2鎸傝捣锛�3宸插畬宸�)
switch (btn) {
case "寮�宸�":
sWhere = " where HSourceID='" + HSourceID1 + "' and HICMOBillNo='" + workcode + "' and HInterID='" + HSourceInterID + "' and hicmostatus not in('0','2')"; //鏄惁鏈変笉涓哄紑宸ュ紑宸ョ姸鎬併�佸仠宸ョ姸鎬�
@@ -902,6 +909,9 @@
break;
case "鎶ユ鐢宠":
+ break;
+ case "杩斿伐":
+ sWhere = " where HSourceID='" + HSourceID1 + "' and HICMOBillNo='" + workcode + "' and HInterID='" + HSourceInterID + "' and hicmostatus not in('0','2')"; //鏄惁鏈変笉涓哄紑宸ャ�佸仠宸ユ寕璧风姸鎬�
break;
default:
}
@@ -1024,32 +1034,12 @@
</div>
</div>
<div class="layui-row layui-col-space10">
- <div class="layui-col-sm12 layui-col-md3" onclick="">
+ <div class="layui-col-sm12 layui-col-md3" onclick="OpenReturn(event,this)">
<div class="cnt bottomright">
<span class="layui-icon layui-icon-return imgicon"></span>
<span class="imgtitle">杩斿伐鐢宠</span>
</div>
</div>
- <div class="layui-col-sm12 layui-col-md3" onclick="OpenFistCheck(event,this)">
- <div class="cnt bottomright">
- <span class="layui-icon layui-icon-search imgicon"></span>
- <span class="imgtitle">棣栨</span>
- </div>
- </div>
- <div class="layui-col-sm12 layui-col-md3">
- <div class="cnt bottomright" style="pointer-events:none; background-color:rgb(0 0 0 / 10%)">
- <span class="layui-icon layui-icon-search imgicon"></span>
- <span class="imgtitle">宸℃</span>
- </div>
- </div>
- <div class="layui-col-sm12 layui-col-md3" onclick="OpenProcess(event,this)">
- <div class="cnt bottomright">
- <span class="layui-icon layui-icon-search imgicon"></span>
- <span class="imgtitle">杩囩▼妫�楠�</span>
- </div>
- </div>
- </div>
- <div class="layui-row layui-col-space10">
<div class="layui-col-sm12 layui-col-md3" onclick="OpenInSpection(event,this)">
<div class="cnt bottomright">
<span class="layui-icon layui-icon-release imgicon"></span>
@@ -1068,14 +1058,14 @@
<span class="imgtitle">涓嶈壇閲囬泦</span>
</div>
</div>
+ </div>
+ <div class="layui-row layui-col-space10">
<div class="layui-col-sm12 layui-col-md3" onclick="ExceFeedback(event,this)">
<div class="cnt bottomright">
<span class="layui-icon layui-icon-unlink imgicon"></span>
<span class="imgtitle">寮傚父</span>
</div>
</div>
- </div>
- <div class="layui-row layui-col-space10">
<div class="layui-col-sm12 layui-col-md3" onclick="Esc(event,this)">
<div class="cnt bottomright">
<span class="layui-icon layui-icon-close imgicon"></span>
--
Gitblit v1.9.1