From d4a4a6bbb6fc55e21ab6db1319edaf23541bdc2f Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期二, 15 十月 2024 16:40:48 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/IpadIndex.html | 111 ++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 84 insertions(+), 27 deletions(-)
diff --git a/WebTM/views/IpadIndex.html b/WebTM/views/IpadIndex.html
index 6b74ae3..85e3499 100644
--- a/WebTM/views/IpadIndex.html
+++ b/WebTM/views/IpadIndex.html
@@ -995,6 +995,10 @@
layer.alert("璇烽�夋嫨宸ュ崟鍒楄〃", { icon: 5 });
return false;
}
+ if (WorkStaus(HSourceID1, workcode, HSourceInterID, "涓嶈壇閲囬泦")) {
+ layer.alert("鍗曟嵁鐘舵�佷笉婊¤冻涓嶈壇閲囬泦鏉′欢!", { icon: 5 });
+ return false;
+ }
layer.open({
type: 2
, area: ['100%', '100%']
@@ -1248,6 +1252,10 @@
layer.alert("璇烽�夋嫨宸ュ崟鍒楄〃", { icon: 5 });
return false;
}
+ if (WorkStaus(HSourceID1, workcode, HSourceInterID, "宸ヨ壓鍙傛暟鐐规")) {
+ layer.alert("鍗曟嵁鐘舵�佷笉婊¤冻宸ヨ壓鍙傛暟鐐规鏉′欢!", { icon: 5 });
+ return false;
+ }
layer.open({
type: 2,
skin: 'layui-layer-rim', //鍔犱笂杈规
@@ -1275,6 +1283,40 @@
//璋冪敤iframe寮瑰嚭灞傚唴鐨勬柟娉�
iframe.edit(data);
},
+ });
+ }
+
+ //寮傚父绛惧埌澶勭悊鐐瑰嚮浜嬩欢
+ 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 () {
+
+ }
});
}
@@ -1306,32 +1348,33 @@
break;
case "鎶ユ鐢宠":
- break;
- default:
+ // 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;
}
-
- $.ajax({
- url: GetWEBURL() + "/Sc_MESBeginWorkBill/GetMESBeginWorkBillStaus",
- type: "GET",
- data: { "sWhere": 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>
@@ -1486,7 +1529,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)">
@@ -1536,7 +1579,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