From cbc2fe74fb54aad814695982c2987e064696f540 Mon Sep 17 00:00:00 2001
From: qq_41295110 <qq_41295110@noreply.gitcode.com>
Date: 星期五, 16 一月 2026 10:49:49 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-VUEUI

---
 src/views/gyWarehouse/index.vue |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/views/gyWarehouse/index.vue b/src/views/gyWarehouse/index.vue
index abf14a1..176335a 100644
--- a/src/views/gyWarehouse/index.vue
+++ b/src/views/gyWarehouse/index.vue
@@ -641,7 +641,7 @@
     // 浠撳簱鍚屾
     async handleSync() {
       try {
-        let res = await axios.get(this.baseURL + "/Gy_Warehouse/Gy_WarehouseViewApi", {
+        let res = await axios.get(this.$baseUrl + "/Gy_Warehouse/Gy_WarehouseViewApi", {
           params: {
             Number: this.queryParams.HSyncNumber,
             Type: "CK",
@@ -691,7 +691,7 @@
     defaintOperationByCompanyName() {
       var result = false;
       axios
-        .get(this.baseURL + "/Xt_getInfo/getCompanyName")
+        .get(this.$baseUrl + "/Xt_getInfo/getCompanyName")
         .then((response) => {
           var data1 = response.data;
           if (data1.count == 1) {
@@ -782,7 +782,7 @@
           this.queryParams.HOrgID = data.HUSEORGID;
           this.user = data.Czymc;
           axios
-            .get(this.baseURL + "/Web/GetOrganizations", {})
+            .get(this.$baseUrl + "/Web/GetOrganizations", {})
             .then((response) => {
               if (response.data.count == 1) {
                 this.organizationList = response.data.data; //缁勭粐鍒楄〃
@@ -807,7 +807,7 @@
       this.sWhere += "";
       //鐢熶骇璧勬枡鍒楄〃
       axios
-        .get(this.baseURL + "/Gy_WareHouse/listpage", {
+        .get(this.$baseUrl + "/Gy_WareHouse/listpage", {
           params: {
             sWhere: `${this.sWhere}`,
             user: this.user,
@@ -910,7 +910,7 @@
     DisPlay_HideColumn(HModName, user, option, dataOption) {
       this.totalNameList = [];
       axios
-        .get(this.baseURL + "/Xt_grdAlignment_WMES/grdAlignmentWMESList", {
+        .get(this.$baseUrl + "/Xt_grdAlignment_WMES/grdAlignmentWMESList", {
           params: {
             HModName: HModName,
             user: user,
@@ -1186,7 +1186,7 @@
     getOrgIDByUser() {
       var res = "";
       axios
-        .get(this.baseURL + "/Xt_User/getOrgIDListByUser", {
+        .get(this.$baseUrl + "/Xt_User/getOrgIDListByUser", {
           params: {
             HModName: this.HModName,
             user: this.user,
@@ -1270,7 +1270,7 @@
         .then(() => {
           if (!this.rowForm.瀹℃牳浜�) {
             axios
-              .get(this.baseURL + "/DeltetGy_Warehouse", {
+              .get(this.$baseUrl + "/DeltetGy_Warehouse", {
                 params: { HItemID: this.rowForm.HItemID.toString(), user: this.user },
               })
               .then((response) => {
@@ -1295,7 +1295,7 @@
       var InterID = form.HItemID || form.HInterID;
       //閫昏緫瀹℃牳鏂规硶
       axios
-        .get(this.baseURL + "/Gy_Warehouse/AuditGy_Warehouse", {
+        .get(this.$baseUrl + "/Gy_Warehouse/AuditGy_Warehouse", {
           params: { HInterID: InterID, IsAudit: num, CurUserName: this.user },
         })
         .then((response) => {
@@ -1316,7 +1316,7 @@
       var InterID = form.HItemID || form.HInterID;
       //閫昏緫瀹℃牳鏂规硶
       axios
-        .get(this.baseURL + "/Gy_Warehouse/StopGy_Warehouse", {
+        .get(this.$baseUrl + "/Gy_Warehouse/StopGy_Warehouse", {
           params: { HInterID: InterID, IsStop: num, CurUserName: this.user },
         })
         .then((response) => {
@@ -1386,7 +1386,7 @@
       var sMainSub = sSubStr + "&鍜�" + this.user;
       axios({
         method: "post",
-        url: this.baseURL + "/Gy_Warehouse/Gy_Process_Excel",
+        url: this.$baseUrl + "/Gy_Warehouse/Gy_Process_Excel",
         data: {
           sMainSub: sMainSub,
         },

--
Gitblit v1.9.1