From da19f4f42dddbff9e32e463b142b3ed263d79921 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期五, 20 六月 2025 08:47:23 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI

---
 WebTM/views/IpadStepIndex.html |  283 +++++++++++++++++++++++++++++++++-----------------------
 1 files changed, 168 insertions(+), 115 deletions(-)

diff --git a/WebTM/views/IpadStepIndex.html b/WebTM/views/IpadStepIndex.html
index fd8544f..e1ddb06 100644
--- a/WebTM/views/IpadStepIndex.html
+++ b/WebTM/views/IpadStepIndex.html
@@ -83,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>璁惧浠g爜锛�</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>';
@@ -195,8 +198,8 @@
                                 }
                                 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>';
@@ -225,7 +228,7 @@
                                     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>' + LoadData2[i].HProcName + '</span></h1>';
@@ -376,7 +379,7 @@
             HICMOInterID = $("#df" + i + "").html();     //鐢熶骇璁㈠崟涓诲唴鐮�
             HICMOEntryID = $("#ds" + i + "").html();     //鐢熶骇璁㈠崟瀛愬唴鐮�
             HProcID = $("#ps" + i + "").html();          //宸ュ簭ID
-            console.log(HProcID);
+
 
             if (workcode != "" && workcode != null) {
                 $('.cns').removeClass('check1');  //鍒犻櫎涓嶅悓鐖剁骇clss鏍峰紡鐩稿悓鐨勬墍鏈夊厓绱�
@@ -554,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);
+                //},
             });
         }
 
@@ -594,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);
+                //},
             });
         }
 
@@ -634,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);
+                //},
             });
         }
 
@@ -674,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);
+                //},
             });
         }
 
@@ -710,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);
+                //},
             });
         }
 
@@ -750,25 +798,26 @@
                 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);
+                //},
             });
         }
 
@@ -786,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 () {
 
@@ -812,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);
+                //},
             });
         }
 
@@ -843,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')";   //鏄惁鏈変笉涓哄紑宸ュ紑宸ョ姸鎬併�佸仠宸ョ姸鎬�
@@ -859,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:
             }
@@ -981,7 +1034,7 @@
                             </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>

--
Gitblit v1.9.1