From 5531f195f7170bce54145c5b07689a32bb63b093 Mon Sep 17 00:00:00 2001
From: qq_41295110 <qq_41295110@noreply.gitcode.com>
Date: 星期五, 05 十二月 2025 13:36:20 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-VUEUI
---
src/views/GyCustomer/index.vue | 13 +++++++++----
src/views/ICMO/ScICMOBillList.vue | 5 +++--
src/views/component/material/index.vue | 3 ++-
3 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/src/views/GyCustomer/index.vue b/src/views/GyCustomer/index.vue
index e14f775..da1288c 100644
--- a/src/views/GyCustomer/index.vue
+++ b/src/views/GyCustomer/index.vue
@@ -351,7 +351,7 @@
title: "瀵煎叆",
isUploading: false,
updateSupport: 0,
- url: "http://47.96.97.237/API/Gy_Customer/Gy_Customer_Excel",
+ url: "",
},
uploadData: [],
uploadTableLoading: false,
@@ -366,14 +366,19 @@
}
},
created() {
+ this.upload.url = this.baseURL + "Gy_Customer/Gy_Customer_Excel";
this.fetchData();
},
methods: {
fetchData() {
axios
- .get(
- "http://47.96.97.237/API/Web/GetUser?UserName=001&PassWord=123456&HOrgName=100038"
- )
+ .get(this.baseURL + "Web/GetUser", {
+ params: {
+ UserName: sessionStorage.getItem("UserName") || "admin",
+ PassWord: "123456",
+ HOrgName: sessionStorage.getItem("OrganizationID") || "100038"
+ }
+ })
.then((response) => {
let data = response.data.data[0];
this.user = data.Czymc;
diff --git a/src/views/ICMO/ScICMOBillList.vue b/src/views/ICMO/ScICMOBillList.vue
index aea3c5b..cc7ad56 100644
--- a/src/views/ICMO/ScICMOBillList.vue
+++ b/src/views/ICMO/ScICMOBillList.vue
@@ -884,8 +884,7 @@
updateSupport: 0,
// 璁剧疆涓婁紶鐨勮姹傚ご閮�
// headers: { Authorization: "Bearer " + getToken() },
- // 涓婁紶鐨勫湴鍧�
- url: "http://47.96.97.237/API/Gy_Source/Gy_Source_Excel",
+ url: "",
},
uploadData: [],
alluploadList: [],
@@ -902,6 +901,8 @@
};
},
created() {
+ // set upload URL from configured baseURL
+ this.upload.url = this.baseURL + "Gy_Source/Gy_Source_Excel";
this.riqiChange();
this.get_HProjectList();
this.get_HDeptNameList();
diff --git a/src/views/component/material/index.vue b/src/views/component/material/index.vue
index 30493fd..a15c0c9 100644
--- a/src/views/component/material/index.vue
+++ b/src/views/component/material/index.vue
@@ -26,7 +26,8 @@
subDisabled: false,//缂栬緫椤甸潰淇濆瓨鎸夐挳鏄惁绂佺敤(true绂佺敤锛宖alse鍙敤)
OperationType: null,//淇濆瓨绫诲瀷锛堟柊澧�1淇敼3锛�
HInterID: null,
- baseURL: 'http://47.96.97.237/API',
+ //baseURL: 'http://47.96.97.237/API',
+ baseURL: process.env.VUE_APP_BASE_API,
user: 'admin',
currentRow: [],
lastSelectedRowIndex: null, // 鐢ㄤ簬璁板綍涓婃鐐瑰嚮鐨勮绱㈠紩
--
Gitblit v1.9.1