From 48b564781aa3d20e0d644b5d026067fd8bfc8c99 Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期五, 17 十二月 2021 17:55:01 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI
---
WebTM/views/IpadIndex.html | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/WebTM/views/IpadIndex.html b/WebTM/views/IpadIndex.html
index 21547a0..d459605 100644
--- a/WebTM/views/IpadIndex.html
+++ b/WebTM/views/IpadIndex.html
@@ -82,9 +82,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>褰撳墠宸ュ崟锛�</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="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>';
@@ -131,6 +131,7 @@
//閫変腑璧勬簮
function Check(obj, i) {
+ wktag = 0;
$("#btomleft").html("");
$("#topright").html("");
var partid = $(obj).parent().attr("id"); //鑾峰彇鐖剁骇id
@@ -175,6 +176,7 @@
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>';
+ html1 += '<h1><span>璁″垝鏁伴噺锛�</span><span>' + LoadData1[i].HDatePlanQty + '</span><span style="margin-left:20px;">姹囨姤鎬绘暟锛�</span><span>' + LoadData1[i].HDateFinishQty+'</span></h1>';
switch (LoadData1[i].HICMOStatus) {
case "寰呯敓浜�":
html1 += '<h1><span>褰撳墠鐘舵�侊細</span><span class="gj_icon color_border3"></span><span>' + LoadData1[i].HICMOStatus + '</span></h1>';
@@ -192,8 +194,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 + '%" style="width:' + LoadData1[i].HDateFinishQty / LoadData1[i].HDatePlanQty + '%;">';
- html1 += '<span class="layui-progress-text">' + LoadData1[i].HDateFinishQty / LoadData1[i].HDatePlanQty + '%</span>';
+ 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 > ';
html1 += '</div>';
html1 += '</dd>';
@@ -778,7 +780,7 @@
, shade: 0.6
, maxmin: false
, anim: 0
- , content: ['璐ㄩ噺绠＄悊/棣栦欢妫�楠屽崟/QC_Add_Edit_FirstPieceCheckBill.html?OperationType=2&linterid=' + HSourceInterID + '&HSouceBillType=' + HBillType + '&HICMOEntryID=' + HSourceEntryID, 'yes']
+ , content: ['璐ㄩ噺绠＄悊/棣栦欢妫�楠屽崟/QC_Add_Edit_FirstPieceCheckBill.html?OperationType=2&linterid=' + HSourceInterID + '&HSouceBillType=' + HBillType + '&HICMOEntryID=' + HICMOEntryID, 'yes']
, resize: false
, cancel: function () {
}
@@ -801,7 +803,7 @@
, shade: 0.6
, maxmin: false
, anim: 0
- , content: ['璐ㄩ噺绠＄悊/宸ュ簭妫�楠屽崟/QC_ProcessCheckBill.html?OperationType=2&linterid=' + HSourceInterID + '&HSouceBillType=' + HBillType + '&HICMOEntryID=' + HSourceEntryID, 'yes']
+ , content: ['璐ㄩ噺绠＄悊/宸ュ簭妫�楠屽崟/QC_ProcessCheckBill.html?OperationType=2&linterid=' + HSourceInterID + '&HSouceBillType=' + HBillType + '&HICMOEntryID=' + HICMOEntryID, 'yes']
, resize: false
, cancel: function () {
@@ -1004,13 +1006,13 @@
</div>
</div>
<div class="layui-col-sm12 layui-col-md4" onclick="OpenMaterToSource(event,this)">
- <div class="cnt bottomright" style="pointer-events:none; background-color:rgb(0 0 0 / 10%)">
+ <div class="cnt bottomright">
<span class="layui-icon layui-icon-engine imgicon"></span>
<span class="imgtitle">涓婃枡闃插憜</span>
</div>
</div>
<div class="layui-col-sm12 layui-col-md4" onclick="BadGather(event,this)">
- <div class="cnt bottomright" style="pointer-events:none; background-color:rgb(0 0 0 / 10%)">
+ <div class="cnt bottomright">
<span class="layui-icon layui-icon-chart imgicon"></span>
<span class="imgtitle">涓嶈壇閲囬泦</span>
</div>
--
Gitblit v1.9.1