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/scMould/basicModeling/Gy_MouldFileList.vue |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/views/scMould/basicModeling/Gy_MouldFileList.vue b/src/views/scMould/basicModeling/Gy_MouldFileList.vue
index 01eddec..56dc319 100644
--- a/src/views/scMould/basicModeling/Gy_MouldFileList.vue
+++ b/src/views/scMould/basicModeling/Gy_MouldFileList.vue
@@ -406,7 +406,7 @@
       this.getList()
     },
     getTreeselect() {
-      axios.get(this.baseURL + '/Gy_Mould/TreeList', {
+      axios.get(this.$baseUrl + '/Gy_Mould/TreeList', {
         params: {
           "sWhere": this.sWhere,
           "user": sessionStorage["HUserName"],
@@ -483,7 +483,7 @@
       }
       this.sWhere += " and HUSEORGID = '" + this.queryParams.HUSEORGID + "'"
       //鐢熶骇璧勬枡鍒楄〃
-      axios.get(this.baseURL + '/Gy_Mould/page', {
+      axios.get(this.$baseUrl + '/Gy_Mould/page', {
         params: {
           "sWhere": this.sWhere,
           "ModRightNameSelect": this.HModName,
@@ -597,7 +597,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,
@@ -876,7 +876,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"],
@@ -951,7 +951,7 @@
       this.$modal.confirm('纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠').then(() => {
         var ModRightNameDelete = 'Gy_MouldFile_Delete'
         if (!this.rowForm.瀹℃牳浜�) {
-          axios.get(this.baseURL + "/Gy_Mould_Edit/Delete_Json", {
+          axios.get(this.$baseUrl + "/Gy_Mould_Edit/Delete_Json", {
             params: { 'HItemID': this.rowForm.hmainid.toString(), "ModRightNameDelete": ModRightNameDelete, 'user': sessionStorage["HUserName"] }
           }).then(response => {
             if (response.data.count == 1) {
@@ -975,7 +975,7 @@
       if (form.HBillStatus == 0 && num == 1) {
         this.$modal.msgSuccess('鍗曟嵁宸蹭负鏈鏍哥姸鎬�,鏃犻渶鍙嶅鏍革紒');
       } else {
-        axios.get(this.baseURL + "/Gy_Mould/AuditProcessReportList", {
+        axios.get(this.$baseUrl + "/Gy_Mould/AuditProcessReportList", {
           params: { "HInterID": InterID, "IsAudit": num, "CurUserName": sessionStorage["HUserName"] }
         }).then(response => {
           let result = response.data
@@ -996,7 +996,7 @@
     set_De_Stop(num, form) {
       var InterID = form.hmainid || form.HInterID
       //閫昏緫瀹℃牳鏂规硶
-      axios.get(this.baseURL + "/Gy_Source/StopGy_Source", {
+      axios.get(this.$baseUrl + "/Gy_Source/StopGy_Source", {
         params: { "HInterID": InterID, "IsStop": num, "CurUserName": sessionStorage["HUserName"] }
       }).then(response => {
         let result = response.data
@@ -1060,7 +1060,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