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/basic/gyProperty/gyPropertyList.vue |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/views/basic/gyProperty/gyPropertyList.vue b/src/views/basic/gyProperty/gyPropertyList.vue
index 0a01a5e..4537454 100644
--- a/src/views/basic/gyProperty/gyPropertyList.vue
+++ b/src/views/basic/gyProperty/gyPropertyList.vue
@@ -632,7 +632,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",
@@ -682,7 +682,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) {
@@ -771,7 +771,7 @@
       this.sWhere += "";
       //鐢熶骇璧勬枡鍒楄〃
       axios
-        .get(this.baseURL + "/Gy_Property/listPage", {
+        .get(this.$baseUrl + "/Gy_Property/listPage", {
           params: {
             sWhere: `${this.sWhere}`,
             user: sessionStorage["HUserName"],
@@ -878,7 +878,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,
@@ -1187,7 +1187,7 @@
     getOrgIDByUser() {
       var res = "";
       axios
-        .get(this.baseURL + "/Xt_User/getOrgIDListByUser", {
+        .get(this.$baseUrl + "/Xt_User/getOrgIDListByUser", {
           params: {
             HModName: this.HModName,
             user: sessionStorage["HUserName"],
@@ -1273,7 +1273,7 @@
         .then(() => {
           if (!this.rowForm.瀹℃牳浜�) {
             axios
-              .get(this.baseURL + "/DeltetGy_Warehouse", {
+              .get(this.$baseUrl + "/DeltetGy_Warehouse", {
                 params: {
                   HItemID: this.rowForm.HItemID.toString(),
                   user: sessionStorage["HUserName"],
@@ -1301,7 +1301,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,
@@ -1326,7 +1326,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,
@@ -1400,7 +1400,7 @@
       var sMainSub = sSubStr + "&鍜�" + sessionStorage["HUserName"];
       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