From 09e81aece101eee54a5964503259cdbeafe91b5f Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期四, 05 九月 2024 13:48:11 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/IpadIndex.html | 39 ++++++++++++++++++---------------------
1 files changed, 18 insertions(+), 21 deletions(-)
diff --git a/WebTM/views/IpadIndex.html b/WebTM/views/IpadIndex.html
index 8e45e25..1089c80 100644
--- a/WebTM/views/IpadIndex.html
+++ b/WebTM/views/IpadIndex.html
@@ -1071,7 +1071,7 @@
layer.alert("璇烽�夋嫨宸ュ崟鍒楄〃", { icon: 5 });
return false;
}
- if (WorkStaus(HSourceID1, workcode, HSourceInterID, "姹囨姤")) {
+ if (WorkStaus(HSourceID1, workcode, HSourceInterID, "鏂帿灏旀眹鎶�")) {
layer.alert("鍗曟嵁鐘舵�佷笉婊¤冻姹囨姤鏉′欢!", { icon: 5 });
return false;
}
@@ -1330,26 +1330,23 @@
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 "鎶ユ鐢宠":
+ 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:
--
Gitblit v1.9.1