From d8a5d0b75b85dd8f56264b5aef7d7dfc0f16caca Mon Sep 17 00:00:00 2001
From: qq_41295110 <qq_41295110@noreply.gitcode.com>
Date: 星期五, 16 一月 2026 14:43:34 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-VUEUI
---
.env.development | 6 ++-
src/permission.js | 1
src/views/warehouse/barcodeMaster/Gy_BarCodeBillList.vue | 6 +++
src/main.js | 18 +++++----
src/views/logistics/transportGPS/WL_YayBill.vue | 8 ++--
.env.production | 8 ++--
src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue | 8 ++--
src/utils/healthCheck.js | 6 +-
src/views/warehouse/barcodeMaster/Gy_BarCodeBill_JinLong_AutoLogin.vue | 8 +++
src/router/index.js | 9 ++++
10 files changed, 52 insertions(+), 26 deletions(-)
diff --git a/.env.development b/.env.development
index 0ddc9b3..8f619ba 100644
--- a/.env.development
+++ b/.env.development
@@ -5,14 +5,16 @@
ENV = 'development'
# 鏅轰簯杩堟�滾-MOM绠＄悊绯荤粺/寮�鍙戠幆澧�
-VUE_APP_BASE_API = http://localhost:81/API/
+# VUE_APP_BASE_API = http://localhost:81/API/
# VUE_APP_BASE_API = 'http://47.96.97.237/API/'
# 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 = http://61.174.29.234:8880/API/
#鏉滆春
# VUE_APP_BASE_API = http://localhost:8082/API/
# 鍐呯綉鍦板潃娴嬭瘯
-VUE_APP_BASE_API_INNER = http://192.168.1.11/API/
+# VUE_APP_BASE_API_INNER = http://192.168.1.11/API/
# 璺敱鎳掑姞杞�
VUE_CLI_BABEL_TRANSPILE_MODULES = true
diff --git a/.env.production b/.env.production
index a3eceac..88d9951 100644
--- a/.env.production
+++ b/.env.production
@@ -4,12 +4,12 @@
# 鐢熶骇鐜閰嶇疆
ENV = 'production'
-# 瀹佹尝 鍥涚淮灏� 鍐呭缃�
-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.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 = http://61.174.29.234:8880/API/
# 鏅轰簯杩堟�滾-MOM绠＄悊绯荤粺/鐢熶骇鐜
# VUE_APP_BASE_API = http://47.96.97.237/API/
#鏉滆春
diff --git a/src/main.js b/src/main.js
index 1412138..68ecebe 100644
--- a/src/main.js
+++ b/src/main.js
@@ -74,14 +74,16 @@
const initAPP = async () => {
console.log("寮�濮嬫墽琛屾湇鍔″仴搴锋鏌�...");
// 鍋ュ悍妫�鏌ワ細鑾峰彇鍙敤鐨勬湇鍔″湴鍧�
- let availableBaseUrl = await findAvailableService()
- // const sessionUrl = sessionStorage["cacheUrl"]
- // if(sessionUrl){
- // availableBaseUrl = sessionUrl
- // }else {
- // sessionUrl = await findAvailableService();
- // sessionStorage["cacheUrl"] = sessionUrl
- // }
+ let availableBaseUrl = ""
+ let sessionUrl = sessionStorage.getItem("cacheUrl")
+ if(sessionUrl){
+ console.log("浣跨敤缂撳瓨鐨勫湴鍧�: ", sessionUrl)
+ availableBaseUrl = sessionUrl
+ }else {
+ sessionUrl = await findAvailableService();
+ sessionStorage.setItem("cacheUrl", sessionUrl)
+ availableBaseUrl = sessionUrl
+ }
// 娉ㄥ叆 Axios 鍏ㄥ眬 baseURL
setAxiosBaseUrl(availableBaseUrl);
diff --git a/src/permission.js b/src/permission.js
index 5b0d97e..ca0f2b5 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -24,6 +24,7 @@
"/FbStepFoldOutBillList",
"/warehouse/barcodeMaster/Gy_BarCodeBill_JinLong",
"/warehouse/barcodeMaster/Gy_BarCodeBill_JinLong_AutoLogin",
+ "/warehouse/barcodeMaster/Gy_BarCodeBillList_JinLong_AutoLogin"
]; // no redirect whitelist
const isWhiteList = (path) => {
diff --git a/src/router/index.js b/src/router/index.js
index 5934fcc..45714ed 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -196,6 +196,15 @@
],
},
//#endregion
+
+ //#region 鏉＄爜涓绘。_閿﹂殕_鑷姩鐧诲綍
+ {
+ path: "/warehouse/barcodeMaster/Gy_BarCodeBillList_JinLong_AutoLogin",
+ component: () => import("@/views/warehouse/barcodeMaster/Gy_BarCodeBillList.vue"),
+ hidden: true,
+ },
+ //#endregion
+
//#endregion
//#region 浠撳瓨绠＄悊
diff --git a/src/utils/healthCheck.js b/src/utils/healthCheck.js
index 0acd4a0..93285a7 100644
--- a/src/utils/healthCheck.js
+++ b/src/utils/healthCheck.js
@@ -6,7 +6,7 @@
healthPath: "/Health",
},
{
- name: "API_INNER",
+ name: "API_OUTER",
baseUrl: process.env.VUE_APP_BASE_API, // 澶栫綉鍦板潃
healthPath: "/Health",
},
@@ -53,8 +53,8 @@
const healthCheckPromises = serviceList.map((item) => {
return checkServiceHealth(item)
});
- const healthResult = await Promise.race(healthCheckPromises); // 绔為�熸ā寮忥紝妫�娴嬪埌鍋ュ悍鐨勯摼鎺ュ氨绔嬪埢杩斿洖
- // 绛涢�夊彲鐢ㄧ殑 baseUrl锛堝彇绗竴涓湁鏁堝湴鍧�锛�
+ const healthResult = await Promise.any(healthCheckPromises); // 妫�娴嬪埌鍋ュ悍鐨勯摼鎺ュ氨绔嬪埢杩斿洖
+ // 绛涢�夊彲鐢ㄧ殑 baseUrl
const availableBaseUrl = healthResult
if (availableBaseUrl) {
diff --git a/src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue b/src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue
index dd99f79..49f5425 100644
--- a/src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue
+++ b/src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue
@@ -1334,7 +1334,7 @@
return;
}
- const response = await axios.get(this.baseURL + '/WLYayBillController/GetMesByOrginBill', {
+ const response = await axios.get(this.$baseUrl + '/WLYayBillController/GetMesByOrginBill', {
params: {
"ListMaterial": ListMaterial
},
@@ -1443,7 +1443,7 @@
//鏀逛负寮傛鏂规硶锛岃繑鍥濸romise
async getPushSeOutStockBillInit(HSourceInterID, HSourceEntryID) {
try {
- const response = await axios.get(this.baseURL + '/Kf_SellOutBill/loadXs_SeOutStockBill_Push', {
+ const response = await axios.get(this.$baseUrl + '/Kf_SellOutBill/loadXs_SeOutStockBill_Push', {
params: {
"HInterID": HSourceInterID,
"HSubID": HSourceEntryID
@@ -1810,7 +1810,7 @@
formData.append('HRemark', '');
formData.append('HUserName', sessionStorage["HUserName"]);
// 璁剧疆涓婁紶URL
- this.uploadUrl = this.baseURL + '/Gy_QCVerificationBillMain/UploadFile_Gy_QCVerification';
+ this.uploadUrl = this.$baseUrl + '/Gy_QCVerificationBillMain/UploadFile_Gy_QCVerification';
// 鍙戦�佷笂浼犺姹�
axios.post(this.uploadUrl, formData, {
headers: {
@@ -1858,7 +1858,7 @@
formData.append('HUserName', sessionStorage.getItem('HUserName') || '');
// 璁剧疆涓婁紶URL
- this.uploadUrl = this.baseURL + '/Gy_QCVerificationBillMain/UploadFile_Gy_QCVerification';
+ this.uploadUrl = this.$baseUrl + '/Gy_QCVerificationBillMain/UploadFile_Gy_QCVerification';
// 鍙戦�佷笂浼犺姹�
axios.post(this.uploadUrl, formData, {
diff --git a/src/views/logistics/transportGPS/WL_YayBill.vue b/src/views/logistics/transportGPS/WL_YayBill.vue
index 31ccd13..98d73f9 100644
--- a/src/views/logistics/transportGPS/WL_YayBill.vue
+++ b/src/views/logistics/transportGPS/WL_YayBill.vue
@@ -708,7 +708,7 @@
}
this.$modal.confirm(confirmMes).then(() => {
- axios.get(this.baseURL + "/WLYayBillController/ConfrimBillNo", {
+ axios.get(this.$baseUrl + "/WLYayBillController/ConfrimBillNo", {
params: { 'HInterID': this.rowForm.HInterID.toString(), "IsAudit": 0, 'CurUserName': sessionStorage["HUserName"] }
}).then(response => {
let result = response.data
@@ -744,7 +744,7 @@
confirmMes = "鏄惁纭鎵胯繍鍟嗙‘璁ゆ椂闂�?"
}
this.$modal.confirm(confirmMes).then(() => {
- axios.get(this.baseURL + "/WLYayBillController/ConfrimOtherBillNo", {
+ axios.get(this.$baseUrl + "/WLYayBillController/ConfrimOtherBillNo", {
params: { 'HInterID': this.rowForm.HInterID.toString(), "IsAudit": nums, 'CurUserName': sessionStorage["HUserName"] }
}).then(response => {
let result = response.data
@@ -775,7 +775,7 @@
//#region 缁存姢闆跺崟鍗犵敤浣撶Н閲嶇疆
handleVolume(form) {
this.resetVolume()
- axios.get(this.baseURL + "/WLYayBillController/WL_YayBillDetail", {
+ axios.get(this.$baseUrl + "/WLYayBillController/WL_YayBillDetail", {
params: { 'HID': form.HInterID }
}).then(response => {
console.log(response.data.data.h_v_WL_YayBillEdit)
@@ -791,7 +791,7 @@
},
//#region 缁存姢闆跺崟鍗犵敤浣撶Н鎻愪氦
set_HScatteredVolumeList() {
- axios.get(this.baseURL + "/WLYayBillController/updateBillMEs", {
+ axios.get(this.$baseUrl + "/WLYayBillController/updateBillMEs", {
params: {
'HInterID': this.formVolume.HInterID.toString(),
"HEntryID": this.formVolume.HEntryID.toString(),
diff --git a/src/views/warehouse/barcodeMaster/Gy_BarCodeBillList.vue b/src/views/warehouse/barcodeMaster/Gy_BarCodeBillList.vue
index afde8e2..d8caad1 100644
--- a/src/views/warehouse/barcodeMaster/Gy_BarCodeBillList.vue
+++ b/src/views/warehouse/barcodeMaster/Gy_BarCodeBillList.vue
@@ -474,6 +474,12 @@
if (this.queryParams.HOrgID) {
this.sWhere += " and HStockOrgID = ''" + this.queryParams.HOrgID + "''";
}
+
+ //濡傛灉鏄嚜鍔ㄧ櫥褰曪紝鍒欏彧鑳芥煡鐪嬩緵搴斿晢鑷繁鐨勬潯鐮併��
+ if (sessionStorage["HAutoLogin"] == "1") {
+ this.sWhere += " and 渚涘簲鍟� = ''" + sessionStorage["HUserName"] + "''";
+ }
+
this.getList()
},
//#endregion
diff --git a/src/views/warehouse/barcodeMaster/Gy_BarCodeBill_JinLong_AutoLogin.vue b/src/views/warehouse/barcodeMaster/Gy_BarCodeBill_JinLong_AutoLogin.vue
index 25c56a3..25fc7de 100644
--- a/src/views/warehouse/barcodeMaster/Gy_BarCodeBill_JinLong_AutoLogin.vue
+++ b/src/views/warehouse/barcodeMaster/Gy_BarCodeBill_JinLong_AutoLogin.vue
@@ -3,7 +3,7 @@
<div style=" margin-bottom: 10px; border-bottom: 1px solid #f6f6f6;">
<el-button type="primary" @click="onClickMethod_BarCodeProduce" :disabled="disabledFlag_BarCodeProduce">鐢熸垚</el-button>
<el-button type="primary" @click="get_PrintReport">鎵撳嵃</el-button>
- <!-- <el-button type="primary" @click="close">閫� 鍑�</el-button> -->
+ <el-button type="primary" @click="get_BarCodeBillList">鏉＄爜妗ｆ</el-button>
</div>
<div style="margin: 10px; font-size: 28px; font-weight: bold; text-align: center;">鏉＄爜鐢熸垚</div>
<el-form :model="initMainData" label-width="80px">
@@ -562,6 +562,12 @@
},
//#endregion
+ //#region 鏉＄爜妗ｆ鎸夐挳鐐瑰嚮浜嬩欢
+ get_BarCodeBillList(){
+ this.$router.push({ path: "/warehouse/barcodeMaster/Gy_BarCodeBillList_JinLong_AutoLogin" }).catch(() => { });
+ },
+ //#endregion
+
//#region 鏉＄爜鍒楄〃澶嶉�夋閫夋嫨鐘舵�佸彉鏇寸洃鍚簨浠�
onSelectionChange_BarCode(selection){
this.selectedData_BarCode = selection;
--
Gitblit v1.9.1