From 2bb2ec7bb9d2989bbb3b7d6de2d1228c3c4af609 Mon Sep 17 00:00:00 2001
From: ch <37327@LLOOCCY>
Date: 星期三, 25 八月 2021 08:55:23 +0800
Subject: [PATCH] 合并
---
WebTM/views/IpadIndex.html | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/WebTM/views/IpadIndex.html b/WebTM/views/IpadIndex.html
index 4beb4a7..c2d8933 100644
--- a/WebTM/views/IpadIndex.html
+++ b/WebTM/views/IpadIndex.html
@@ -83,6 +83,8 @@
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="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>';
html1 += '<h1><span>璐熻矗浜猴細</span><span id="us' + i + '">' + LoadData[i - 1].HEmpName + '</span></h1>';
html1 += '</dd>';
html1 += '</dl>';
@@ -171,6 +173,8 @@
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>';
+ html1 += '<h1><span>浜у搧鍨嬪彿锛�</span><span id="pts' + (i + 1) + '">' + LoadData1[i].HModel + '</span></h1>';
switch (LoadData1[i].HICMOStatus) {
case "寰呯敓浜�":
html1 += '<h1><span>褰撳墠鐘舵�侊細</span><span class="gj_icon color_border3"></span><span>' + LoadData1[i].HICMOStatus + '</span></h1>';
@@ -262,7 +266,7 @@
{
return false;
}
- var HUserName = "Admin";
+ var HUserName = sessionStorage["HUserName"];
var HSourceID = body.find("#HSourceID").val();
var HSourceCode = body.find("#HSourceCode").val();
var HSourceName = body.find("#HSourceName").val();
@@ -554,7 +558,7 @@
shift: 2,
area: ['100%', '100%'],
maxmin: true,
- content: '鐢熶骇绠＄悊/鐢熶骇寮�宸ュ崟/Sc_Add_MESBeginWorkBillList.html?hID=&Type=2',
+ content: '鐢熶骇绠＄悊/鐢熶骇寮�宸ュ崟/Sc_Add_MESBeginWorkBillList.html?OperationType=2&linterid=&HSouceBillType=',
end: function () {
},
@@ -594,7 +598,7 @@
shift: 2,
area: ['100%', '100%'],
maxmin: true,
- content: '鐢熶骇绠＄悊/浜ч噺姹囨姤鍗�/Sc_Add_ProductReportBillList.html?hID=&Type=2',
+ content: '鐢熶骇绠＄悊/浜ч噺姹囨姤鍗�/Sc_Add_ProductReportBillList.html?OperationType=2&linterid=&HSouceBillType=',
end: function () {
},
@@ -634,7 +638,7 @@
shift: 2,
area: ['100%', '100%'],
maxmin: true,
- content: '鐢熶骇绠＄悊/鐢熶骇瀹屽伐鍗�/Sc_Add_MESEndWorkBillList.html?hID=&Type=2',
+ content: '鐢熶骇绠＄悊/鐢熶骇瀹屽伐鍗�/Sc_Add_MESEndWorkBillList.html?OperationType=2&linterid=&HSouceBillType=',
end: function () {
},
@@ -674,7 +678,7 @@
shift: 2,
area: ['100%', '100%'],
maxmin: true,
- content: '鐢熶骇绠＄悊/鐢熶骇鍋滃伐鍗�/Sc_Add_MESStopWorkBillList.html?hID=&Type=2',
+ content: '鐢熶骇绠＄悊/鐢熶骇鍋滃伐鍗�/Sc_Add_MESStopWorkBillList.html?OperationType=2&linterid=&HSouceBillType=',
end: function () {
},
@@ -710,7 +714,7 @@
shift: 2,
area: ['100%', '100%'],
maxmin: true,
- content: '鐢熶骇绠＄悊/浜ч噺姹囨姤鍗�/Sc_ProductReportBillList.html?hID=&Type=2',
+ content: '鐢熶骇绠＄悊/浜ч噺姹囨姤鍗�/Sc_ProductReportBillList.html?OperationType=2&linterid=&HSouceBillType=',
end: function () {
},
@@ -723,6 +727,7 @@
"HICMOInterID": HICMOInterID,
"HICMOEntryID": HICMOEntryID,
"HMaker": sessionStorage["HUserName"], //sessionStorage["HUserName"]
+ "Czybm": sessionStorage["Czybm"],
//"HEmpID": "0", //sessionStorage["HEmpID"]
"HSourceBillType": HSourceBillType
});
--
Gitblit v1.9.1