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 | 210 +++++++++++++++++++++++++++++++++++++---------------
1 files changed, 150 insertions(+), 60 deletions(-)
diff --git a/WebTM/views/IpadIndex.html b/WebTM/views/IpadIndex.html
index 7fdb583..08080c2 100644
--- a/WebTM/views/IpadIndex.html
+++ b/WebTM/views/IpadIndex.html
@@ -30,6 +30,7 @@
var HSourceID1 = ""; //鐢熶骇璧勬簮ID1
var HSourceName1 = ""; //鐢熶骇璧勬簮1
var HSourceInterID = ""; //婧愬崟涓诲唴鐮�
+ var HProcExchInterID = ""; //娴佽浆鍗d
var HSourceEntryID = ""; //婧愬崟瀛愬唴鐮�
var HSourceBillNo = ""; //婧愬崟鍗曞彿
var HSourceBillType = ""; //婧愬崟绫诲瀷
@@ -100,8 +101,32 @@
html1 += '<h1><span>鐢熶骇鐝粍锛�</span><span id="HGroupName' + i + '">' + LoadData[i - 1].GroupName + '</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="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>';
+ switch (LoadData[i - 1].HStatus) {
+ case "绌洪棽":
+ html1 += '<h1><span>褰撳墠鐘舵�侊細</span><span class="gj_icon color_border6"></span><span>' + LoadData[i - 1].HStatus + '</span></h1>';
+ break;
+ case "寮�鏈�":
+ html1 += '<h1><span>褰撳墠鐘舵�侊細</span><span class="gj_icon color_border4"></span><span>' + LoadData[i - 1].HStatus + '</span></h1>';
+ break;
+ case "鍋滄満":
+ html1 += '<h1><span>褰撳墠鐘舵�侊細</span><span class="gj_icon color_border3"></span><span>' + LoadData[i - 1].HStatus + '</span></h1>';
+ break;
+ case "鐢熶骇":
+ html1 += '<h1><span>褰撳墠鐘舵�侊細</span><span class="gj_icon color_border2"></span><span>' + LoadData[i - 1].HStatus + '</span></h1>';
+ break;
+ case "缁翠慨杩涜涓�":
+ html1 += '<h1><span>褰撳墠鐘舵�侊細</span><span class="gj_icon color_border5"></span><span>' + LoadData[i - 1].HStatus + '</span></h1>';
+ break;
+ case "缁翠慨缁撴潫":
+ html1 += '<h1><span>褰撳墠鐘舵�侊細</span><span class="gj_icon color_border1"></span><span>' + LoadData[i - 1].HStatus + '</span></h1>';
+ break;
+ case "缁翠慨缁堟":
+ html1 += '<h1><span>褰撳墠鐘舵�侊細</span><span class="gj_icon color_border1"></span><span>' + LoadData[i - 1].HStatus + '</span></h1>';
+ break;
+ default:
+ }
html1 += '<h1 hidden> <span id="HGroupID' + i + '">' + LoadData[i - 1].HGroupID + '</span></h1>';
html1 += '<h1 hidden> <span id="HManagerID' + i + '">' + LoadData[i - 1].HManagerID + '</span></h1>';
html1 += '</dd>';
@@ -206,6 +231,7 @@
html1 += '<h1 style="display:none;"><span>鍗曟嵁绫诲瀷锛�</span><span id="ty' + (i + 1) + '">' + LoadData1[i].HBillType + '</span></h1>';
//HSourceInterID瀹為檯鍙栧�硷細Sc_ICMOBillStatus_Tmp HInterID锛堝崟鎹富ID锛�
html1 += '<h1 style="display:none;"><span>婧愬崟涓诲唴鐮侊細</span><span id="sm' + (i + 1) + '">' + LoadData1[i].HSourceInterID + '</span></h1>';
+ html1 += '<h1 style="display:none;"><span>娴佽浆鍗′富ID锛�</span><span id="lzk' + (i + 1) + '">' + LoadData1[i].HProcExchInterID + '</span></h1>';
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>';
@@ -231,8 +257,7 @@
break;
case "瀹屽伐":
html1 += '<h1><span>褰撳墠鐘舵�侊細</span><span class="gj_icon color_border4"></span><span>' + LoadData1[i].HICMOStatus + '</span><span style="margin-left:5px;">棰嗘枡鐘舵�侊細</span><span>' + LoadData1[i].棰嗘枡鐘舵�� + '</span></h1>';
- break;
- default:
+ break;
}
html1 += '<span class="prs">鐢熶骇杩涘害锛�</span>';
html1 += '<div class="layui-progress layui-progress-big" lay-showPercent="yes">';
@@ -263,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>';
@@ -372,6 +403,7 @@
return false;
}
else {
+ layer.close(index);
layer.alert(data.Message, { icon: 5 });
return false;
@@ -439,6 +471,7 @@
workcode = $("#wk" + i + "").html(); //閫氳繃鏍峰紡ID鑾峰彇html鍐呭(宸ュ崟鍙�)
HBillType = $("#ty" + i + "").html(); //閫氳繃鏍峰紡ID鑾峰彇html鍐呭(鍗曟嵁绫诲瀷)
HSourceInterID = $("#sm" + i + "").html(); //閫氳繃鏍峰紡ID鑾峰彇html鍐呭(婧愬崟涓诲唴鐮�)
+ HProcExchInterID = $("#lzk" + i + "").html(); //娴佽浆鍗D
HSourceEntryID = $("#sb" + i + "").html(); //閫氳繃鏍峰紡ID鑾峰彇html鍐呭(婧愬崟瀛愬唴鍚�)
HSourceBillNo = $("#sw" + i + "").html(); //閫氳繃鏍峰紡ID鑾峰彇html鍐呭(婧愬崟鍗曞彿)
HSourceBillType = $("#st" + i + "").html(); //閫氳繃鏍峰紡ID鑾峰彇html鍐呭(婧愬崟绫诲瀷)
@@ -955,7 +988,7 @@
, shade: 0.6
, maxmin: false
, anim: 0
- , content: ['璐ㄩ噺绠＄悊/棣栦欢妫�楠屽崟/QC_Add_Edit_FirstPieceCheckBill.html?OperationType=2&linterid=' + HSourceInterID + '&HSouceBillType=' + HBillType + '&HICMOEntryID=' + HICMOEntryID, 'yes']
+ , content: ['璐ㄩ噺绠＄悊/棣栦欢妫�楠屽崟/QC_Add_Edit_FirstPieceCheckBill.html?OperationType=2&linterid=' + HProcExchInterID + '&HSouceBillType=' + HBillType + '&HICMOEntryID=' + HICMOEntryID + '&HSourceEntryID=' + HSourceEntryID+'', 'yes']
, resize: false
, cancel: function () {
}
@@ -978,7 +1011,7 @@
, shade: 0.6
, maxmin: false
, anim: 0
- , content: ['璐ㄩ噺绠＄悊/宸ュ簭妫�楠屽崟/QC_ProcessCheckBill.html?OperationType=2&linterid=' + HSourceInterID + '&HSouceBillType=' + HBillType + '&HICMOEntryID=' + HICMOEntryID, 'yes']
+ , content: ['璐ㄩ噺绠＄悊/宸℃璁板綍鍗�/QC_Add_Edit_PatrolProcCheckOtherill.html?OperationType=2&linterid=' + HProcExchInterID + '&HSouceBillType=' + HBillType + '&HICMOEntryID=' + HICMOEntryID+ '&HSourceEntryID=' + HSourceEntryID+'', 'yes']
, resize: false
, cancel: function () {
@@ -1071,7 +1104,7 @@
layer.alert("璇烽�夋嫨宸ュ崟鍒楄〃", { icon: 5 });
return false;
}
- if (WorkStaus(HSourceID1, workcode, HSourceInterID, "姹囨姤")) {
+ if (WorkStaus(HSourceID1, workcode, HSourceInterID, "鏂帿灏旀眹鎶�")) {
layer.alert("鍗曟嵁鐘舵�佷笉婊¤冻姹囨姤鏉′欢!", { icon: 5 });
return false;
}
@@ -1286,6 +1319,51 @@
});
}
+ //寮傚父绛惧埌澶勭悊鐐瑰嚮浜嬩欢
+ function SingErrMsg(event, obj) {
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '鏂板寮傚父绛惧埌澶勭悊鍗�',
+ closeBtn: 1,
+ shift: 2,
+ area: ['100%', '100%'],
+ maxmin: true,
+ content: '鐢熶骇绠＄悊/寮傚父鍙嶉鍗�/OA_ErrMsgBackSignBill_BrushCard.html?OperationType=2',
+ end: function () {
+
+ }
+ });
+ }
+
+ //寮傚父楠屾敹鐐瑰嚮浜嬩欢
+ function ErrMsgBackCheck(event, obj) {
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '鏂板寮傚父鍙嶉楠屾敹鍗�',
+ closeBtn: 1,
+ shift: 2,
+ area: ['100%', '100%'],
+ maxmin: true,
+ 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);
+ }
+ });
+ }
+
//閫�鍑�
function Esc(event, obj) {
parent.location.href = "index.html"
@@ -1296,53 +1374,51 @@
function WorkStaus(HSourceID1, workcode, HSourceInterID, btn) {
var flag = false;
var sWhere = "";
- sWhere = {
- HSourceID: HSourceID1
- , HICMOBillNo: workcode
- , HInterID: HSourceInterID
- , type: btn
+ switch (btn) {
+ case "寮�宸�":
+ sWhere = " where HSourceID='" + HSourceID1 + "' and HICMOBillNo='" + workcode + "' and HInterID='" + HSourceInterID + "' and hicmostatus not in('0','2')"; //鏄惁鏈変笉涓哄紑宸ュ紑宸ョ姸鎬併�佸仠宸ョ姸鎬�
+ break;
+ case "瀹屽伐":
+ sWhere = " where HSourceID='" + HSourceID1 + "' and HICMOBillNo='" + workcode + "' and HInterID='" + HSourceInterID + "' and hicmostatus not in('1','2')"; //鏄惁鏈変笉涓哄紑宸ャ�佸畬宸ョ姸鎬�
+ break;
+ case "鍋滃伐":
+ sWhere = " where HSourceID='" + HSourceID1 + "' and HICMOBillNo='" + workcode + "' and HInterID='" + HSourceInterID + "' and hicmostatus not in('1')"; //鏄惁鏈変笉涓哄仠宸ユ寕璧风姸鎬�
+ break;
+ case "姹囨姤":
+ sWhere = " where HSourceID='" + HSourceID1 + "' and HICMOBillNo='" + workcode + "' and HInterID='" + HSourceInterID + "' and hicmostatus not in('1','2')"; //鏄惁鏈変笉涓哄紑宸ャ�佸仠宸ユ寕璧风姸鎬�
+ break;
+ case "鏂帿灏旀眹鎶�":
+ sWhere = " where HSourceID='" + HSourceID1 + "' and HSourceBillNo='" + workcode + "' and HInterID='" + HSourceInterID + "' and hicmostatus not in('1','2')"; //鏄惁鏈変笉涓哄紑宸ャ�佸仠宸ユ寕璧风姸鎬�
+ break;
+ case "鎶ユ鐢宠":
+
+ // break;
+ // default:
+ //}
+
+ $.ajax({
+ url: GetWEBURL() + "/Sc_MESBeginWorkBill/GetMESBeginWorkBillStaus",
+ type: "GET",
+ data: { "sWhere": JSON.stringify(sWhere) },
+ dataType: "json",//鏁版嵁绫诲瀷鍙互涓� text xml json script jsonp
+ async: false,
+ success: function (data) {
+
+ if (data.count > 0) {
+ flag = true;
+
+ }
+ else {
+ flag = false;
+ }
+ },
+ error: function (err) {
+ flag = false;
+ }
+ });
+
+ return flag;
}
- //switch (btn) {
- // case "寮�宸�":
- // sWhere = " where HSourceID='" + HSourceID1 + "' and HICMOBillNo='" + workcode + "' and HInterID='" + HSourceInterID + "' and hicmostatus not in('0','2')"; //鏄惁鏈変笉涓哄紑宸ュ紑宸ョ姸鎬併�佸仠宸ョ姸鎬�
- // break;
- // case "瀹屽伐":
- // sWhere = " where HSourceID='" + HSourceID1 + "' and HICMOBillNo='" + workcode + "' and HInterID='" + HSourceInterID + "' and hicmostatus not in('1','2')"; //鏄惁鏈変笉涓哄紑宸ャ�佸畬宸ョ姸鎬�
- // break;
- // case "鍋滃伐":
- // sWhere = " where HSourceID='" + HSourceID1 + "' and HICMOBillNo='" + workcode + "' and HInterID='" + HSourceInterID + "' and hicmostatus not in('1')"; //鏄惁鏈変笉涓哄仠宸ユ寕璧风姸鎬�
- // break;
- // case "姹囨姤":
- // sWhere = " where HSourceID='" + HSourceID1 + "' and HICMOBillNo='" + workcode + "' and HInterID='" + HSourceInterID + "' and hicmostatus not in('1','2')"; //鏄惁鏈変笉涓哄紑宸ャ�佸仠宸ユ寕璧风姸鎬�
- // break;
- // case "鎶ユ鐢宠":
-
- // break;
- // default:
- //}
-
- $.ajax({
- url: GetWEBURL() + "/Sc_MESBeginWorkBill/GetMESBeginWorkBillStaus",
- type: "GET",
- data: { "sWhere": JSON.stringify(sWhere) },
- dataType: "json",//鏁版嵁绫诲瀷鍙互涓� text xml json script jsonp
- async: false,
- success: function (data) {
-
- if (data.count > 0) {
- flag = true;
-
- }
- else {
- flag = false;
- }
- },
- error: function (err) {
- flag = false;
- }
- });
-
- return flag;
}
</script>
</head>
@@ -1454,16 +1530,16 @@
<span class="imgtitle">棣栨</span>
</div>
</div>
- <div class="layui-col-sm12 layui-col-md4">
- <div class="cnt bottomright" style="pointer-events:none; background-color:rgb(0 0 0 / 10%);display:none;">
+ <div class="layui-col-sm12 layui-col-md4" onclick="OpenProcess(event,this)">
+ <div class="cnt bottomright">
<span class="layui-icon layui-icon-search imgicon"></span>
<span class="imgtitle">宸℃</span>
</div>
</div>
- <div class="layui-col-sm12 layui-col-md4" onclick="OpenProcess(event,this)">
- <div class="cnt bottomright">
+ <div class="layui-col-sm12 layui-col-md4">
+ <div class="cnt bottomright" style="pointer-events:none; background-color:rgb(0 0 0 / 10%);display:none;">
<span class="layui-icon layui-icon-search imgicon"></span>
- <span class="imgtitle">杩囩▼妫�楠�</span>
+ <span class="imgtitle">鏈</span>
</div>
</div>
</div>
@@ -1497,7 +1573,7 @@
<div class="layui-col-sm12 layui-col-md4" onclick="Abnormal(event,this)">
<div class="cnt bottomright">
<span class="layui-icon layui-icon-unlink imgicon"></span>
- <span class="imgtitle">寮傚父</span>
+ <span class="imgtitle">寮傚父鐢宠</span>
</div>
</div>
<div class="layui-col-sm12 layui-col-md4" onclick="Esc(event,this)">
@@ -1547,7 +1623,21 @@
</div>
</div>
</div>
-
+ <div class="layui-row layui-col-space10">
+ <div class="layui-col-sm12 layui-col-md4" onclick="SingErrMsg(event,this)">
+ <div class="cnt bottomright">
+ <span class="layui-icon layui-icon-layer imgicon"></span>
+ <span class="imgtitle">寮傚父绛惧埌澶勭悊</span>
+ </div>
+ </div>
+ <div class="layui-col-sm12 layui-col-md4" onclick="ErrMsgBackCheck(event,this)">
+ <div class="cnt bottomright">
+ <span class="layui-icon layui-icon-layer imgicon"></span>
+ <span class="imgtitle">寮傚父楠屾敹</span>
+ </div>
+ </div>
+ </div>
+
</div>
</fieldset>
</div>
--
Gitblit v1.9.1