From 70a0ddfff13ca0cf225a636d21164714bff5f0af Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期五, 16 一月 2026 14:24:01 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-VUEUI

---
 src/views/component/SettleStyleDialog/index.vue |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/views/component/SettleStyleDialog/index.vue b/src/views/component/SettleStyleDialog/index.vue
index e5a7467..5eaaa8a 100644
--- a/src/views/component/SettleStyleDialog/index.vue
+++ b/src/views/component/SettleStyleDialog/index.vue
@@ -374,7 +374,7 @@
       }
       //this.sWhere += " and HUSEORGID = '" + this.queryParams.HOrgID + "'"
       //鐢熶骇璧勬枡鍒楄〃
-      axios.get(this.baseURL + '/Gy_SettleStyle/SettleStyleList', {
+      axios.get(this.$baseUrl + '/Gy_SettleStyle/SettleStyleList', {
         params: {
           "sWhere": this.sWhere,
           "user": sessionStorage["HUserName"],
@@ -444,7 +444,7 @@
     },
     DisPlay_HideColumn(HModName, user, option, dataOption) {
       this.totalNameList = []
-      axios.get(this.baseURL + '/Xt_grdAlignment_WMES/grdAlignmentWMESList', {
+      axios.get(this.$baseUrl + '/Xt_grdAlignment_WMES/grdAlignmentWMESList', {
         params: {
           "HModName": HModName,
           "user": user,
@@ -721,7 +721,7 @@
     //鏍规嵁鐢ㄦ埛鑾峰彇鐢ㄦ埛鍏宠仈缁勭粐鐨勮繃婊ゆ潯浠�
     getOrgIDByUser() {
       var res = "";
-      axios.get(this.baseURL + '/Xt_User/getOrgIDListByUser', {
+      axios.get(this.$baseUrl + '/Xt_User/getOrgIDListByUser', {
         params: {
           HModName: this.HModName,
           user: sessionStorage["HUserName"],
@@ -802,7 +802,7 @@
     handleDelete() {
       this.$modal.confirm('纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠').then(() => {
         if (!this.rowForm.瀹℃牳浜�) {
-          axios.get(this.baseURL + "DeltetGy_Department", {
+          axios.get(this.$baseUrl + "DeltetGy_Department", {
             params: { 'HItemID': this.rowForm.HItemID, 'user': sessionStorage["HUserName"] }
           }).then(response => {
             if (response.data.count == 1) {
@@ -823,7 +823,7 @@
     set_CheckBill(num, form) {
       var InterID = form.HItemID || form.HInterID
       //閫昏緫瀹℃牳鏂规硶
-      axios.get(this.baseURL + "/Gy_Department/AuditGy_Department", {
+      axios.get(this.$baseUrl + "/Gy_Department/AuditGy_Department", {
         params: { "HInterID": InterID, "IsAudit": num, "CurUserName": sessionStorage["HUserName"] }
       }).then(response => {
         let result = response.data
@@ -843,7 +843,7 @@
     set_De_Stop(num, form) {
       var InterID = form.HItemID.toString() || form.HInterID.toString()
       //閫昏緫瀹℃牳鏂规硶
-      axios.get(this.baseURL + "/Gy_Department/StopGy_Department", {
+      axios.get(this.$baseUrl + "/Gy_Department/StopGy_Department", {
         params: { "HInterID": InterID, "IsStop": num, "CurUserName": sessionStorage["HUserName"] }
       }).then(response => {
         let result = response.data
@@ -908,7 +908,7 @@
       var sMainSub = sSubStr + '&鍜�' + sessionStorage["HUserName"];
       axios({
         method: 'post',
-        url: this.baseURL + "/Gy_Source/Gy_Source_btnSave",
+        url: this.$baseUrl + "/Gy_Source/Gy_Source_btnSave",
         data: {
           'sMainSub': sMainSub
         },

--
Gitblit v1.9.1