From 42aee5b9502267881fe29584ce32898f83206eb5 Mon Sep 17 00:00:00 2001
From: zgq <519541279@qq.com>
Date: 星期三, 21 七月 2021 18:21:09 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI
---
WebTM/views/IpadIndex.html | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/WebTM/views/IpadIndex.html b/WebTM/views/IpadIndex.html
index 7585cad..975644c 100644
--- a/WebTM/views/IpadIndex.html
+++ b/WebTM/views/IpadIndex.html
@@ -63,7 +63,7 @@
});
function TSLoad() {
$("#topleft").html("");
- var HUserName = sessionStorage["HUserName"]; //榛樿褰撳墠鐧诲綍浜哄憳
+ var HUserName = "Admin"; //sessionStorage["HUserName"]; //榛樿褰撳墠鐧诲綍浜哄憳
$.ajax({
url: GetWEBURL() + "/ReportPlatForm/SearchGetLineBindBillList",
type: "GET",
@@ -161,6 +161,8 @@
html1 += '<h1 style="display:none;"><span>婧愬崟瀛愬唴鐮侊細</span><span id="sb' + (i + 1) + '">' + LoadData1[i].HSourceEntryID + '</span></h1>';
html1 += '<h1 style="display:none;"><span>婧愬崟鍗曞彿锛�</span><span id="sw' + (i + 1) + '">' + LoadData1[i].HSourceBillNo + '</span></h1>';
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><span>宸ュ崟鍙凤細</span><span id="wk' + (i + 1) + '">' + LoadData1[i].HICMOBillNo + '</span></h1>';
@@ -364,7 +366,9 @@
HSourceEntryID = $("#sb" + i + "").html(); //閫氳繃鏍峰紡ID鑾峰彇html鍐呭(婧愬崟瀛愬唴鍚�)
HSourceBillNo = $("#sw" + i + "").html(); //閫氳繃鏍峰紡ID鑾峰彇html鍐呭(婧愬崟鍗曞彿)
HSourceBillType = $("#st" + i + "").html(); //閫氳繃鏍峰紡ID鑾峰彇html鍐呭(婧愬崟绫诲瀷)
-
+ HICMOInterID = $("#df" + i + "").html(); //鐢熶骇璁㈠崟涓诲唴鐮�
+ HICMOEntryID = $("#ds" + i + "").html(); //鐢熶骇璁㈠崟瀛愬唴鐮�
+
if (workcode != "" && workcode != null) {
$('.cns').removeClass('check1'); //鍒犻櫎涓嶅悓鐖剁骇clss鏍峰紡鐩稿悓鐨勬墍鏈夊厓绱�
@@ -710,7 +714,10 @@
data.push({
"workcode": workcode,
"HSourceID": HSourceID1,
- "HSourceName": HSourceName1
+ "HSourceName": HSourceName1,
+ "HICMOInterID": HICMOInterID,
+ "HICMOEntryID": HICMOEntryID,
+ "HMaker": "Admin" //sessionStorage["HUserName"]
});
//閫氳繃绱㈠紩鑾峰彇鍒板綋鍓峣frame寮瑰嚭灞�
@@ -892,7 +899,7 @@
</div>
</div>
<div class="layui-col-sm12 layui-col-md4">
- <div class="cnt bottomright">
+ <div class="cnt bottomright" style="pointer-events:none; background-color:rgb(0 0 0 / 10%)">
<span class="layui-icon layui-icon-chart imgicon"></span>
<span class="imgtitle">涓嶈壇閲囬泦</span>
</div>
@@ -912,7 +919,7 @@
</div>
</div>
<div class="layui-col-sm12 layui-col-md4">
- <div class="cnt bottomright">
+ <div class="cnt bottomright" style="pointer-events:none; background-color:rgb(0 0 0 / 10%)">
<span class="layui-icon layui-icon-close imgicon"></span>
<span class="imgtitle">閫�鍑�</span>
</div>
--
Gitblit v1.9.1