From bc4c499554dca67f5ea3c7c92eca0ab6e7189fa5 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期四, 23 十月 2025 20:13:52 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/基础资料/公用基础资料/Gy_Warehouse.html | 2 +-
WebTM/views/基础资料/公用基础资料/Gy_DepartmentList.html | 4 +++-
WebTM/views/基础资料/销售基础资料/Gy_Customer.html | 2 +-
WebTM/layuiadmin/Scripts/webConfig.js | 2 +-
WebTM/views/基础资料/公用基础资料/Gy_Material.html | 8 ++++++--
WebTM/views/基础资料/采购基础资料/Gy_Supplier.html | 3 ++-
6 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index cc4b0be..c58aea3 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -11,7 +11,7 @@
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄤ箰鏈湴閰嶇疆
//var WEBURL = "http://47.96.97.237/API/"; //鏅轰簯鏈嶅姟鍣�
/* var WEBURL = "http://localhost:8082/LuBaoAPI/"; //浣欐�濇澃鏈湴閰嶇疆*/
- /* var WEBURL = "http://localhost:81/API/"; // 闄堥晲鍝叉湰鍦伴厤缃�*/
+ var WEBURL = "http://localhost:81/API/"; // 闄堥晲鍝叉湰鍦伴厤缃�*/
// var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉庢灄淇婃湰鍦伴厤缃�
//var WEBURL = "http://localhost:8088/ARAPI/"; //浣欐�濇澃鏈湴閰嶇疆(瀹夌憺)
//var WEBURL = "http://61.164.86.218:8099/ABAPI/"; //濂ラ偊
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DepartmentList.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DepartmentList.html"
index 1f287b8..b1150a1 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DepartmentList.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DepartmentList.html"
@@ -622,11 +622,12 @@
//閲嶆柊鍚屾鎸夐挳
function set_ResCnz() {
+ var wait = layer.load()
var HNumber2 = $('#HNumber2').val();
$.ajax({
url: GetWEBURL() + '/Gy_Department/Gy_DepartmentViewApi',
type: "GET",
- data: { "Number": HNumber2, "Type": 'BM' },
+ data: { "Number": HNumber2, "Type": 'BM', HUseOrgID: sessionStorage["OrganizationID"] },
success: function (result) {
if (result.count == 1) {
layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
@@ -641,6 +642,7 @@
} else {
layer.alert(result.code + result.Message, { icon: 5 });
}
+ layer.close(wait);
}, error: function () {
layer.close(wait);
layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Material.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Material.html"
index cdd2936..7c40f4e 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Material.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Material.html"
@@ -935,14 +935,16 @@
//閲嶆柊鍚屾鎸夐挳
function set_ResCnz() {
+ var wait = layer.load();//閬僵
var HNumber2 = $('#HNumber2').val();
$.ajax({
url: GetWEBURL() + '/Gy_Material/Gy_MaterialViewApi',
type: "GET",
- data: { "Number": HNumber2, "Type": 'WL' },
+ data: { "Number": HNumber2, "Type": 'WL', HUseOrgID: sessionStorage["OrganizationID"]},
success: function (result) {
if (result.count == 1) {
layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+
// 寰楀埌frame绱㈠紩
var index = layer.getFrameIndex(window.name);
//鍏抽棴褰撳墠frame
@@ -954,10 +956,12 @@
} else {
layer.alert(result.code + result.Message, { icon: 5 });
}
+
+ layer.close(wait);
}, error: function () {
layer.close(wait);
layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
- }
+ },
});
}
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Warehouse.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Warehouse.html"
index 5467a62..20c38b6 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Warehouse.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Warehouse.html"
@@ -662,7 +662,7 @@
$.ajax({
url: GetWEBURL() + '/Gy_Warehouse/Gy_WarehouseViewApi',
type: "GET",
- data: { "Number": HNumber2, "Type": 'CK' },
+ data: { "Number": HNumber2, "Type": 'CK', HUseOrgID: sessionStorage["OrganizationID"] },
success: function (result) {
if (result.count == 1) {
layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\207\207\350\264\255\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\207\207\350\264\255\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier.html"
index 15a1d90..181f7e8 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\207\207\350\264\255\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\207\207\350\264\255\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier.html"
@@ -800,11 +800,12 @@
//閲嶆柊鍚屾鎸夐挳
function set_ResCnz() {
+ var wait = layer.load();//閬僵
var HNumber2 = $('#HNumber2').val();
$.ajax({
url: GetWEBURL() + '/Gy_Supplier/Gy_SupplierViewApi',
type: "GET",
- data: { "Number": HNumber2, "Type": 'GYS' },
+ data: { "Number": HNumber2, "Type": 'GYS', HUseOrgID: sessionStorage["OrganizationID"] },
success: function (result) {
if (result.count == 1) {
layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\224\200\345\224\256\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Customer.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\224\200\345\224\256\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Customer.html"
index 2257483..b3a524f 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\224\200\345\224\256\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Customer.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\224\200\345\224\256\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Customer.html"
@@ -1101,7 +1101,7 @@
$.ajax({
url: GetWEBURL() + '/Gy_Customer/Gy_CustomerViewApi',
type: "GET",
- data: { "Number": HNumber2, "Type": 'KH' },
+ data: { "Number": HNumber2, "Type": 'KH', HUseOrgID: sessionStorage["OrganizationID"] },
success: function (result) {
if (result.count == 1) {
layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
--
Gitblit v1.9.1