From ce1589a2b50d3a76ff270de7bead75c38959dfc7 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期一, 01 十二月 2025 13:33:15 +0800
Subject: [PATCH] 状态变更优化
---
WebTM/views/模治具管理/模治具管理/KF_BarCodeStatusChangeBillList.html | 2 +-
WebTM/views/模治具管理/模治具管理/KF_BarCodeStatusChangeBill.html | 16 ++++++++++------
WebTM/layuiadmin/Scripts/webConfig.js | 2 +-
3 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index 2cf588d..d793402 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -11,7 +11,7 @@
var WEBURL = "http://localhost:81/API/" //缈佹稕娑涙湰鍦伴厤缃�
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄤ箰鏈湴閰嶇疆
//var WEBURL = "http://47.96.97.237/API/"; //鏅轰簯鏈嶅姟鍣�
- var WEBURL = "http://localhost:8082/LuBaoAPI/"; //浣欐�濇澃鏈湴閰嶇疆
+ /*var WEBURL = "http://localhost:8082/LuBaoAPI/";*/ //浣欐�濇澃鏈湴閰嶇疆
//var WEBURL = "http://localhost:81/API/"; // 闄堥晲鍝叉湰鍦伴厤缃�*/
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉庢灄淇婃湰鍦伴厤缃�
//var WEBURL = "http://localhost:8088/ARAPI/"; //浣欐�濇澃鏈湴閰嶇疆(瀹夌憺)
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/KF_BarCodeStatusChangeBill.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/KF_BarCodeStatusChangeBill.html"
index 5479b50..9684df7 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/KF_BarCodeStatusChangeBill.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/KF_BarCodeStatusChangeBill.html"
@@ -608,9 +608,9 @@
if (num[j].HBarCodeStatus_New != HBarCodeStatusVal[j]) {
num[j].HBarCodeStatus_Old = HBarCodeStatusVal[j]
}
- JudgeBarCodeIsExist(num[j].HBarCode);
+ JudgeBarCodeIsExist(num[j]);
if (!ExistBarCode) {
- layer.msg('璇ユ潯鐮佸湪鏉＄爜涓绘。涓笉瀛樺湪');
+ layer.msg((j+1)+'琛岋紝璇ユ潯鐮佸湪鏉＄爜涓绘。涓笉瀛樺湪');
retrun ;
}
}
@@ -645,17 +645,21 @@
}
});
}
- function JudgeBarCodeIsExist(HbarCode) {
+ function JudgeBarCodeIsExist(data) {
$.ajax({
url: GetWEBURL() + "/Gy_Material/findMaterialByNumber",
type: "GET",
async: false,
- data: { "HbarCode": HbarCode, "HSTOCKORGID": sessionStorage["OrganizationID"] },
+ data: { "HbarCode": data.HBarCode, "HSTOCKORGID": sessionStorage["OrganizationID"] },
success: function (d) {
- if (d.count === 1)
+ if (d.count === 1) {
ExistBarCode = 1;
- else
+ data.HBarCodeStatus_Old = d.data[0]["HBarCodeStatus"];
+ }
+ else {
ExistBarCode = 0;
+ }
+
}
})
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/KF_BarCodeStatusChangeBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/KF_BarCodeStatusChangeBillList.html"
index 5be91df..7f3936b 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/KF_BarCodeStatusChangeBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/KF_BarCodeStatusChangeBillList.html"
@@ -349,7 +349,7 @@
//鍗曟嵁鍙疯秴閾炬帴
if (obj.event == '鍗曟嵁鍙�') { //妫�鏌� obj.event 鏄惁绛変簬瀛楃涓� '鍗曟嵁鍙�'銆傚鏋滅瓑浜庯紝鍒欐墽琛宨f寰幆
- var linterid = data.hmainid.toString(); //澹版槑鍙橀噺linterid 涓� data.hmainid
+ var linterid = data.HMainID.toString(); //澹版槑鍙橀噺linterid 涓� data.hmainid
//if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
layer.open({ //浣跨敤 layer鐨刼pen鎵撳紑寮瑰嚭 灞�
type: 2 //琛ㄧず寮瑰嚭灞傜殑鍐呭鏄竴涓� iframe
--
Gitblit v1.9.1