From 6235fa7c1cc6a5a11dbdd2a3003f1085fc65acc8 Mon Sep 17 00:00:00 2001
From: qq_41295110 <qq_41295110@noreply.gitcode.com>
Date: 星期三, 21 一月 2026 11:24:01 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-VUEUI
---
.env.development | 2
src/views/warehouse/barcodeMaster/Gy_BarCodeBillList.vue | 2
src/views/scMould/warehouse/Sc_MouldMoveStockRequestBillEdit.vue | 12 +++---
.env.production | 8 ++--
src/views/scMould/warehouse/Sc_MouldInRequestBillEdit.vue | 12 +++---
src/views/warehouse/barcodeMaster/Gy_BarCodeBill_JinLong_AutoLogin.vue | 68 +++++++++++++++++++---------------
6 files changed, 56 insertions(+), 48 deletions(-)
diff --git a/.env.development b/.env.development
index 8f619ba..74294f0 100644
--- a/.env.development
+++ b/.env.development
@@ -10,7 +10,7 @@
# VUE_APP_BASE_API = 'http://220.189.218.155:9010/API/'
# VUE_APP_BASE_API = 'http://localhost:8082/LuBaoAPI/'
#閿﹂殕
-# VUE_APP_BASE_API = 'http://192.168.1.11/API/'
+VUE_APP_BASE_API_INNER = 'http://192.168.1.11/API/'
VUE_APP_BASE_API = http://61.174.29.234:8880/API/
#鏉滆春
# VUE_APP_BASE_API = http://localhost:8082/API/
diff --git a/.env.production b/.env.production
index 88d9951..6b9d2a0 100644
--- a/.env.production
+++ b/.env.production
@@ -5,11 +5,11 @@
ENV = 'production'
# 瀹佹尝 鍥涚淮灏�
-# VUE_APP_BASE_API = http://192.168.0.236:9010/API/
-# VUE_APP_BASE_API = http://220.189.218.155:9010/API/
+VUE_APP_BASE_API_INNER = http://192.168.0.236:9010/API/
+VUE_APP_BASE_API = http://220.189.218.155:9010/API/
# 浣欏 閿﹂殕 鏅鸿兘瀹跺眳
-# VUE_APP_BASE_API = http://192.168.1.11/API/
-VUE_APP_BASE_API = http://61.174.29.234:8880/API/
+# VUE_APP_BASE_API_INNER = http://192.168.1.11/API/
+# VUE_APP_BASE_API = http://61.174.29.234:8880/API/
# 鏅轰簯杩堟�滾-MOM绠＄悊绯荤粺/鐢熶骇鐜
# VUE_APP_BASE_API = http://47.96.97.237/API/
#鏉滆春
diff --git a/src/views/scMould/warehouse/Sc_MouldInRequestBillEdit.vue b/src/views/scMould/warehouse/Sc_MouldInRequestBillEdit.vue
index 70d9def..d80ed35 100644
--- a/src/views/scMould/warehouse/Sc_MouldInRequestBillEdit.vue
+++ b/src/views/scMould/warehouse/Sc_MouldInRequestBillEdit.vue
@@ -560,14 +560,14 @@
HWHName:'',
HWHNumber:'',
HWHID:0,
- HEmpName:'',
- HEmpID:0,
+ HEmpName:sessionStorage["HSellMan"],
+ HEmpID:sessionStorage["HSellManID"],
HMangerName:'',
HMangerID:0,
- HSecManagerName:'',
- HSecManagerID:0,
- HKeeperName:'',
- HKeeperID:0,
+ HSecManagerName:sessionStorage["HCheckEmpName"],
+ HSecManagerID:sessionStorage["HCheckEmpID"],
+ HKeeperName:sessionStorage["HKeeper"],
+ HKeeperID:sessionStorage["HKeeperID"],
HExplanation:'',
HRemark:'',
diff --git a/src/views/scMould/warehouse/Sc_MouldMoveStockRequestBillEdit.vue b/src/views/scMould/warehouse/Sc_MouldMoveStockRequestBillEdit.vue
index 855a371..83dc5d9 100644
--- a/src/views/scMould/warehouse/Sc_MouldMoveStockRequestBillEdit.vue
+++ b/src/views/scMould/warehouse/Sc_MouldMoveStockRequestBillEdit.vue
@@ -630,14 +630,14 @@
HSCWHName:'',
HSCWHNumber:'',
HSCWHID:0,
- HEmpName:'',
- HEmpID:0,
+ HEmpName:sessionStorage["HSellMan"],
+ HEmpID:sessionStorage["HSellManID"],
HMangerName:'',
HMangerID:0,
- HSecManagerName:'',
- HSecManagerID:0,
- HKeeperName:'',
- HKeeperID:0,
+ HSecManagerName:sessionStorage["HCheckEmpName"],
+ HSecManagerID:sessionStorage["HCheckEmpID"],
+ HKeeperName:sessionStorage["HKeeper"],
+ HKeeperID:sessionStorage["HKeeperID"],
HExplanation:'',
HRemark:'',
diff --git a/src/views/warehouse/barcodeMaster/Gy_BarCodeBillList.vue b/src/views/warehouse/barcodeMaster/Gy_BarCodeBillList.vue
index 36ee0f7..f4535ed 100644
--- a/src/views/warehouse/barcodeMaster/Gy_BarCodeBillList.vue
+++ b/src/views/warehouse/barcodeMaster/Gy_BarCodeBillList.vue
@@ -470,7 +470,7 @@
if (this.queryParams.HBarCode) {
this.sWhere += " and 鏉＄爜缂栧彿 like ''%" + this.queryParams.HBarCode + "%''";
}
- if (this.queryParams.HSupName) {
+ if (this.queryParams.HSourceBillNo) {
this.sWhere += " and 婧愬崟鍗曞彿 like ''%" + this.queryParams.HSourceBillNo + "%''";
}
if (this.queryParams.HMaterNumber) {
diff --git a/src/views/warehouse/barcodeMaster/Gy_BarCodeBill_JinLong_AutoLogin.vue b/src/views/warehouse/barcodeMaster/Gy_BarCodeBill_JinLong_AutoLogin.vue
index 25fc7de..8f75d67 100644
--- a/src/views/warehouse/barcodeMaster/Gy_BarCodeBill_JinLong_AutoLogin.vue
+++ b/src/views/warehouse/barcodeMaster/Gy_BarCodeBill_JinLong_AutoLogin.vue
@@ -291,13 +291,13 @@
},
async created() {
await this.loging(); //鑷姩鐧诲綍
- this.judgeIsLoging(); //鍒ゆ柇鏄惁鐧诲綍锛屾湭鐧诲綍鍒欒烦杞洖鐧诲綍椤甸潰
+ await this.judgeIsLoging(); //鍒ゆ柇鏄惁鐧诲綍锛屾湭鐧诲綍鍒欒烦杞洖鐧诲綍椤甸潰
await this.get_OrganizationList(); //椤甸潰鍒濆鍖� 鑾峰彇缁勭粐涓嬫媺鍒楄〃鏁版嵁
await this.initPageData(); //椤甸潰鍒濆鍖�
},
methods: {
//#region 鍒ゆ柇鏄惁鐧诲綍锛屾湭鐧诲綍鍒欒烦杞洖鐧诲綍椤甸潰
- judgeIsLoging(){
+ async judgeIsLoging(){
if (sessionStorage["login"] != "login") {
this.$modal.msgError("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛侊紒");
this.$router.push({ path: "/" }).catch(() => { })
@@ -306,7 +306,7 @@
//#endregion
//#region 椤甸潰鍒濆鍖�
- initPageData(){
+ async initPageData(){
var params = this.get_UrlVars();
var OperationType = params[params[0]]; //鎿嶄綔绫诲瀷
@@ -726,7 +726,8 @@
var HPwdWord = params[params[6]]; //鐧诲綍瀵嗙爜
var HOrgID = params[params[7]]; //缁勭粐id
var HOrgName = "";
-
+ console.log("HOrgID", HOrgID);
+
if (HOrgID == 0) {
//鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
if (sessionStorage.login != "login") {
@@ -738,44 +739,50 @@
var sql_getHOrgName = "select HName from Xt_Organizations where HItemID = " + HOrgID;
var ModRightNameCheck = "";
- axios.get(this.$baseUrl + "/CommonModel/searchMethod", {
+ try{
+ let response = await axios.get(this.$baseUrl + "/CommonModel/searchMethod", {
params: {
"sql": sql_getHOrgName
, "user": HUserName
, "ModRightNameCheck": ModRightNameCheck
}
- }).then(response => {
- var data1 = response.data
- if (data1.count == 1) {
- if (data1.data.length > 0) {
- HOrgName = data1.data[0]["HName"];
- } else {
- this.$modal.msgError("鐧诲綍澶辫触锛侊紒缁勭粐涓嶅瓨鍦紝璇烽噸鏂扮櫥褰曪紒锛�");
- this.$router.push({ path: "/" }).catch(() => { })
- }
- }
- else {
- this.$modal.msgError(data1.code + data1.Message);
+ })
+
+ var data1 = response.data
+ if (data1.count == 1) {
+ if (data1.data.length > 0) {
+ HOrgName = data1.data[0]["HName"];
+ } else {
+ this.$modal.msgError("鐧诲綍澶辫触锛侊紒缁勭粐涓嶅瓨鍦紝璇烽噸鏂扮櫥褰曪紒锛�");
this.$router.push({ path: "/" }).catch(() => { })
}
- }).catch(error => {
+ }
+ else {
+ this.$modal.msgError(data1.code + data1.Message);
+ this.$router.push({ path: "/" }).catch(() => { })
+ }
+ }catch(error){
this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
this.$router.push({ path: "/" }).catch(() => { })
- });
+ };
+
+ // 鍐欏叆sessionStorage 闇�瑕佹椂闂达紝鍚庣画鎿嶄綔闇�瑕佺瓑寰� 鍐欏叆sessionStorage瀹屾垚鍚庡啀鎵ц
var sql_login = "select * from h_v_Gy_Czygl_Login where Czymc = '" + HUserName + "'";
- axios.get(this.$baseUrl + "/CommonModel/searchMethod", {
- params: {
- "sql": sql_login
- , "user": HUserName
- , "ModRightNameCheck": ""
- }
- }).then(response => {
- var data1 = response.data
+ try{
+ let res = await axios.get(this.$baseUrl + "/CommonModel/searchMethod", {
+ params: {
+ "sql": sql_login
+ , "user": HUserName
+ , "ModRightNameCheck": ""
+ }
+ })
+
+
+ var data1 = res.data
if (data1.count == 1) {
if (data1.data.length > 0) {
HUserName = data1.data[0]["Czybm"];
-
var result = data1;
sessionStorage["HCloudUserName"] = result.data[0].HCloudUserName;//閲戣澏浜戣处鍙�
sessionStorage["HCloudUserPsd"] = result.data[0].HCloudUserPsd;
@@ -819,6 +826,7 @@
sessionStorage["Organization"] = HOrgName;
sessionStorage["HTranSlate"] = "1";
sessionStorage["HAutoLogin"] = "1";
+
} else {
this.$modal.msgError("鍔犺浇澶辫触锛侊紒璐﹀彿涓嶅瓨鍦紝璇疯仈绯荤鐞嗗憳缁存姢璐﹀彿淇℃伅锛侊紒");
this.$router.push({ path: "/" }).catch(() => { });
@@ -827,10 +835,10 @@
this.$modal.msgError("鐧诲綍澶辫触!!"+result.Message);
this.$router.push({ path: "/" }).catch(() => { })
}
- }).catch(error => {
+ }catch(error){
this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
this.$router.push({ path: "/" }).catch(() => { })
- });
+ };
},
//#endregion
}
--
Gitblit v1.9.1