From 5503d91087c16312da33bbc6e9d3c70921813297 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期二, 28 五月 2024 15:44:53 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI

---
 WebTM/views/IpadIndex.html |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/WebTM/views/IpadIndex.html b/WebTM/views/IpadIndex.html
index 2038586..26dd9af 100644
--- a/WebTM/views/IpadIndex.html
+++ b/WebTM/views/IpadIndex.html
@@ -44,6 +44,7 @@
         var HEmpName = "";      //鎿嶄綔鍛�
         var HManagerName = "";      //璐熻矗浜�
         var HGroupName = "";      //鐝粍
+        var HProcID = 0;      //宸ュ簭
 
         //娉ㄦ剰锛氶�夐」鍗� 渚濊禆 element 妯″潡锛屽惁鍒欐棤娉曡繘琛屽姛鑳芥�ф搷浣�
         layui.config({
@@ -166,7 +167,7 @@
             HManagerName = $("#" + us + "").html(); //閫氳繃鏍峰紡ID鑾峰彇html鍐呭(璧勬簮ID)
             HGroupName = $("#" + gro + "").html(); //閫氳繃鏍峰紡ID鑾峰彇html鍐呭(璧勬簮ID)
             HManagerID = "HManagerID" + i;
-            HGroupID= "HGroupID" + i;
+            HGroupID = "HGroupID" + i;
             HManagerID = $("#" + HManagerID + "").html();
             HGroupID = $("#" + HGroupID + "").html();
 
@@ -211,6 +212,7 @@
 
                                 html1 += '<h1><span>宸ュ崟鍙凤細</span><span id="wk' + (i + 1) + '">' + LoadData1[i].HICMOBillNo + '</span><span style="margin-left:25px;">鏃ユ湡锛�</span><span>' + LoadData1[i].璁″垝鏃ユ湡 + '</span></h1>';
                                 html1 += '<h1 style="display:none;"><span>浜у搧ID锛�</span><span id="materid' + (i + 1) + '">' + LoadData1[i].HMaterID + '</span></h1>';
+                                html1 += '<h1 style="display:none;"><span>宸ュ簭ID锛�</span><span id="procid' + (i + 1) + '">' + LoadData1[i].HProcID + '</span></h1>';
                                 html1 += '<h1><span>浜у搧鍚嶇О锛�</span><span id="ptn' + (i + 1) + '">[' + LoadData1[i].HMaterNumber + ']-[' + LoadData1[i].HMaterName + ']</span></h1>';
                                 html1 += '<h1><span>浜у搧鍨嬪彿锛�</span><span id="pts' + (i + 1) + '">' + LoadData1[i].HModel + '</span></h1>';
                                 html1 += '<h1><span>璁″垝鏁伴噺锛�</span><span>' + LoadData1[i].HDatePlanQty + '</span><span style="margin-left:20px;">姹囨姤鎬绘暟锛�</span><span>' + LoadData1[i].HDateFinishQty + '</span></h1>';
@@ -405,7 +407,7 @@
                 $.ajax({
                     url: GetWEBURL() + "/ReportPlatForm/DeleteGetLineBindBillList",
                     type: "GET",
-                    data: { "HSourceID": HSourceID ,"user": sessionStorage["HUserName"]},
+                    data: { "HSourceID": HSourceID, "user": sessionStorage["HUserName"] },
                     dataType: "json",//鏁版嵁绫诲瀷鍙互涓� text xml json  script  jsonp
                     success: function (data) {
                         if (data.count > 0) {
@@ -441,6 +443,7 @@
             HICMOBillNo = $("#wk" + i + "").html();     //鐢熶骇璁㈠崟鍙�
             HMaterName = $("#ptn" + i + "").html();     //浜у搧鍚嶇О
             HMaterID = $("#materid" + i + "").html();     //浜у搧ID
+            HProcID = $("#procid" + i + "").html();     //宸ュ簭ID
 
             if (workcode != "" && workcode != null) {
                 $('.cns').removeClass('check1');  //鍒犻櫎涓嶅悓鐖剁骇clss鏍峰紡鐩稿悓鐨勬墍鏈夊厓绱�
@@ -705,7 +708,7 @@
                 shift: 2,
                 area: ['95%', '95%'],
                 maxmin: true,
-                content: '鐢熶骇绠$悊/浣滀笟鎸囧涔�/Gy_SOPBill_Video.html?OperationType=5&HMaterID=' + HMaterID + '&HSourceNo=' + workcode + '&HSourceEntryID=' + HSourceEntryID,
+                content: '鐢熶骇绠$悊/浣滀笟鎸囧涔�/Gy_SOPBill_Video.html?OperationType=5&HMaterID=' + HMaterID + '&HSourceNo=' + workcode + '&HSourceEntryID=' + HSourceEntryID + '&HProcID=' + HProcID,
                 end: function () {
 
                 },

--
Gitblit v1.9.1