From f65fe092c04cb3d18b7cb1cd511c19d408d59370 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期三, 25 十二月 2024 09:31:12 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/IpadIndex.html | 20 +++++++++++++++++++-
1 files changed, 19 insertions(+), 1 deletions(-)
diff --git a/WebTM/views/IpadIndex.html b/WebTM/views/IpadIndex.html
index d05528c..08080c2 100644
--- a/WebTM/views/IpadIndex.html
+++ b/WebTM/views/IpadIndex.html
@@ -288,12 +288,18 @@
html1 += '<h1><span>褰撳墠璁㈠崟锛�</span><span>' + LoadData2[i].HSourceBillNo + '</span><div style="margin-left:25px;float:right"><span >宸℃娆℃暟锛�</span><span>' + LoadData2[i].宸℃娆℃暟 + '</span></div></h1>';
html1 += '<h1><span>鐗╂枡鍚嶇О锛�</span><span>' + LoadData2[i].HMaterName + '</span><div style="margin-left:25px;float:right"><span >杩囩▼妫�娆℃暟锛�</span><span>' + LoadData2[i].杩囩▼妫�娆℃暟 + '</span></div></h1>';
html1 += '<h1><span>璁″垝鏁伴噺锛�</span><span>' + LoadData2[i].HPlanQty + '</span><div style="margin-left:25px;float:right"><span >褰撴棩鐐规鏃堕棿锛�</span><span>' + LoadData2[i].褰撴棩鐐规鏃堕棿 + '</span></div></h1>';
- html1 += '<h1><span>宸叉眹鎶ユ暟閲忥細</span><span>' + LoadData2[i].HRelationQty + '</span><div style="margin-left:25px;float:right"><span >鏈�鍚庝繚鍏绘椂闂达細</span><span>' + LoadData2[i].鏈�鍚庝繚鍏绘椂闂� + '</span></div></h1>';
+ html1 += '<h1><span>宸叉眹鎶ユ暟閲忥細</span><span>' + LoadData2[i].HRelationQty + '</span><div style="margin-left:25px;float:right"><span >鏈�鍚庝繚鍏绘椂闂达細</span><span>' + LoadData2[i].鏈�鍚庝繚鍏绘椂闂� + '</span></div></h1>';
if (LoadData2[i].HRelationQty == 0 || LoadData2[i].HRelationQty == null) {
html1 += '<h1><span>杩涘害锛�</span><span>0%</span><div style="margin-left:25px;float:right"><span >鐐规瀹屾垚鎯呭喌锛�</span><span>' + LoadData2[i].褰撴棩鐐规瀹屾垚鎯呭喌 + '</span></div></h1>';
}
else {
html1 += '<h1><span>杩涘害锛�</span><span>' + ((LoadData2[i].HRelationQty / LoadData2[i].HPlanQty) * 100).toFixed(2) + '%</span><div style="margin-left:25px;float:right"><span >鐐规瀹屾垚鎯呭喌锛�</span><span>' + LoadData2[i].褰撴棩鐐规瀹屾垚鎯呭喌 + '</span></div></h1>';
+ }
+ if (LoadData2[i].瀹夌伅鏈獙鏀舵暟閲� == 0 || LoadData2[i].瀹夌伅鏈獙鏀舵暟閲� == null) {
+ html1 += '<h1><span>寮傚父鍙嶉鏈獙鏀讹細</span><span class="gj_icon color_border4"></span><span>' + LoadData2[i].瀹夌伅鏈獙鏀舵暟閲� + '</span></h1>';
+ }
+ else {
+ html1 += '<h1><span>寮傚父鍙嶉鏈獙鏀讹細</span><span class="gj_icon color_border5"></span><span>' + LoadData2[i].瀹夌伅鏈獙鏀舵暟閲� + '</span></h1>';
}
html1 += '<h1><span>鏈崟杩愯鏃堕棿锛�</span><span>' + getSeconds(LoadData2[i].HSumTimes) + '</span></h1>';
html1 += '<h1><span>鏈祫婧愯繍琛屾椂闂达細</span><span>' + getSeconds(LoadData2[i].HSourceWorkTime) + '</span></h1>';
@@ -397,6 +403,7 @@
return false;
}
else {
+ layer.close(index);
layer.alert(data.Message, { icon: 5 });
return false;
@@ -1342,6 +1349,17 @@
content: '璐ㄩ噺绠＄悊/寮傚父鍙嶉/OA_ErrMsgBackSelfQuery_BGT.html?OperationType=2',
end: function () {
+ },
+ success: function (dom, index) {
+ var data = [];
+ data.push({
+ "HSourceID": HSourceID1,
+ "HSourceName": HSourceName1
+ });
+ //閫氳繃绱㈠紩鑾峰彇鍒板綋鍓峣frame寮瑰嚭灞�
+ var iframe = window['layui-layer-iframe' + index];
+ //璋冪敤iframe寮瑰嚭灞傚唴鐨勬柟娉�
+ iframe.edit(data);
}
});
}
--
Gitblit v1.9.1