From 6029d9cca9e132c4ba7a64cefe3db5eeaaecdf74 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期五, 07 十一月 2025 09:24:53 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/IpadIndex.html | 178 +++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 131 insertions(+), 47 deletions(-)
diff --git a/WebTM/views/IpadIndex.html b/WebTM/views/IpadIndex.html
index b5782ea..4e3112e 100644
--- a/WebTM/views/IpadIndex.html
+++ b/WebTM/views/IpadIndex.html
@@ -926,10 +926,31 @@
end: function () {
},
- });
-
- /* window.open("../../../views/鐢熶骇绠＄悊/浣滀笟鎸囧涔�/Gy_SOPBill_Video.html?OperationType=5&HMaterID=" + HMaterID + "&HSourceNo=" + workcode + "&HSourceEntryID=" + HSourceEntryID);*/
+ });
}
+
+ //SIP 浣滀笟鎸囧涔�
+ function SIP(event, obj) {
+ if (wktag == 0) {
+ layer.alert("璇烽�夋嫨宸ュ崟鍒楄〃", { icon: 5 });
+ return false;
+ }
+ var HTypes = "SIP";
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '浣滀笟鎸囧涔�',
+ closeBtn: 1,
+ shift: 2,
+ area: ['95%', '95%'],
+ maxmin: true,
+ content: '鐢熶骇绠＄悊/浣滀笟鎸囧涔�/Gy_SOPBill_Video.html?OperationType=5&HMaterID=' + HMaterID + '&HSourceNo=' + workcode + '&HSourceEntryID=' + HSourceEntryID + '&HProcID=' + HProcID + '&HTypes=' + HTypes,
+ end: function () {
+
+ }
+ });
+ }
+
//姹囨姤鎸夐挳鐐瑰嚮浜嬩欢
function OpenReport(event, obj) {
@@ -1152,6 +1173,47 @@
});
}
+
+ // 鍋滃伐鎭㈠鍗�
+ function OpenMESStopRestoreWorkBill() {
+ if (wktag == 0) {
+ 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', //鍔犱笂杈规
+ title: '鏂板鍋滃伐鎭㈠鍗�',
+ closeBtn: 1,
+ shift: 2,
+ area: ['100%', '100%'],
+ maxmin: true,
+ content: '鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/鍋滃伐鎭㈠鍗�/Sc_MESStopRestoreWorkBill.html?OperationType=2&linterid=&HSouceBillType=',
+ end: function () {
+
+ },
+ success: function (dom, index) {
+ var data = [];
+ data.push({
+ "HBillType": HBillType,
+ "HSourceInterID": HSourceInterID,
+ "HSourceEntryID": HSourceEntryID,
+ "HSourceBillNo": HSourceBillNo,
+ "HSourceBillType": HSourceBillType
+ });
+
+ //閫氳繃绱㈠紩鑾峰彇鍒板綋鍓峣frame寮瑰嚭灞�
+ var iframe = window['layui-layer-iframe' + index];
+ //璋冪敤iframe寮瑰嚭灞傚唴鐨勬柟娉�
+ iframe.edit(data);
+ },
+ });
+ }
+
//棣栨妫�楠�
function OpenFistCheck(event, obj) {
if (wktag == 0) {
@@ -1184,11 +1246,34 @@
layer.open({
type: 2
, area: ['100%', '100%']
- , title: '宸ュ簭妫�楠屽崟-缂栬緫'
+ , title: '宸℃妫�楠屽崟-缂栬緫'
, shade: 0.6
, maxmin: false
, anim: 0
, content: ['璐ㄩ噺绠＄悊/宸℃璁板綍鍗�/QC_Add_Edit_PatrolProcCheckOtherill.html?OperationType=2&linterid=' + HProcExchInterID + '&HSouceBillType=' + HBillType + '&HICMOEntryID=' + HICMOEntryID + '&HSourceEntryID=' + HSourceEntryID + '', 'yes']
+ , resize: false
+ , cancel: function () {
+
+ }
+ , end: function () {
+
+ }
+ })
+ }
+ //鏈
+ function ProcessCheck(event, obj) {
+ if (wktag == 0) {
+ layer.alert("璇烽�夋嫨宸ュ崟鍒楄〃", { icon: 5 });
+ return false;
+ }
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '宸ュ簭妫�楠屽崟-缂栬緫'
+ , shade: 0.6
+ , maxmin: false
+ , anim: 0
+ , content: ['璐ㄩ噺绠＄悊/宸ュ簭妫�楠屽崟/QC_ProcessCheckBill.html?OperationType=2&linterid=' + HProcExchInterID + '&HSouceBillType=' + HBillType + '&HICMOEntryID=' + HICMOEntryID + '&HSourceEntryID=' + HSourceEntryID + '', 'yes']
, resize: false
, cancel: function () {
@@ -1579,52 +1664,51 @@
//鍗曟嵁鐘舵�侀獙璇�
function WorkStaus(HSourceID1, workcode, HSourceInterID, btn) {
var flag = false;
- var sWhere = "";
- 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 "鎶ユ鐢宠":
+ var sWhere = ""; //鍚庣画鍦ㄥ瓨鍌ㄨ繃绋嬪姞鎺у埗 鏂规硶鏄� h_p_IpadIndexButton
+ //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 in('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;
+ //}
- // 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) {
- $.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;
- if (data.count > 0) {
- flag = true;
+ }
+ else {
+ flag = false;
+ }
+ },
+ error: function (err) {
+ flag = false;
+ }
+ });
- }
- else {
- flag = false;
- }
- },
- error: function (err) {
- flag = false;
- }
- });
+ return flag;
- return flag;
- }
}
</script>
</head>
@@ -1742,8 +1826,8 @@
<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="ProcessCheck(event,this)">
+ <div class="cnt bottomright">
<span class="layui-icon layui-icon-search imgicon"></span>
<span class="imgtitle">鏈</span>
</div>
--
Gitblit v1.9.1