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_MouldFile.vue |   24 ++++++++++++------------
 1 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/views/scMould/basicModeling/Gy_MouldFile.vue b/src/views/scMould/basicModeling/Gy_MouldFile.vue
index 2a04a5d..03b5789 100644
--- a/src/views/scMould/basicModeling/Gy_MouldFile.vue
+++ b/src/views/scMould/basicModeling/Gy_MouldFile.vue
@@ -655,7 +655,7 @@
         var dataArray = [];
         for (var i = 0; i < data.length; i++) {
           // this.getPushSourceBillInit(data[i].hmainid, data[i].hsubid);
-          axios.get(this.baseURL + '/Xs_SeOrderBill/loadXs_SeOrderBill_Push', {
+          axios.get(this.$baseUrl + '/Xs_SeOrderBill/loadXs_SeOrderBill_Push', {
             params: {
               "HInterID": data[i].hmainid
               , "HSubID": data[i].hsubid
@@ -774,7 +774,7 @@
     },
     //鏍规嵁涓诲唴鐮佷笌瀛愬唴鐮佽幏鍙栨簮鍗曢攢鍞鍗曟暟鎹�
     getPushSourceBillInit(HSourceInterID, HSourceEntryID) {
-      axios.get(this.baseURL + '/Xs_SeOrderBill/loadXs_SeOrderBill_Push', {
+      axios.get(this.$baseUrl + '/Xs_SeOrderBill/loadXs_SeOrderBill_Push', {
         params: {
           "HInterID": HSourceInterID
           , "HSubID": HSourceEntryID
@@ -910,7 +910,7 @@
     },
     //鏍规嵁鐢ㄦ埛鑾峰彇瀵瑰簲鑱屽憳銆侀儴闂ㄣ�侀攢鍞富绠�
     getCzyglByUser() {
-      axios.get(this.baseURL + '/Xs_SeOrderBill/getCzyglByUser', {
+      axios.get(this.$baseUrl + '/Xs_SeOrderBill/getCzyglByUser', {
         params: { "CurUserName": sessionStorage["HUserName"] }
       }).then(response => {
         let dataForm = response.data.data[0]
@@ -1028,7 +1028,7 @@
       })
     },
     getHBillNo() {
-      axios.get(this.baseURL + "/Web/GetMAXNum", {
+      axios.get(this.$baseUrl + "/Web/GetMAXNum", {
         params: {
           HBillType: '3899'
         }
@@ -1042,7 +1042,7 @@
     },
     //鑾峰彇瀵瑰簲鐨勬潯鐮佹槑缁�
     getBarCodeNoteBySellOutBill(rowHmainid) {
-      axios.get(this.baseURL + '/Kf_SellOutBill/BarCodeNote', {
+      axios.get(this.$baseUrl + '/Kf_SellOutBill/BarCodeNote', {
         params: { "HInterID": rowHmainid }
       }).then(response => {
         if (response.data.count == 1) {
@@ -1057,7 +1057,7 @@
     },
     //#region 鏍规嵁瀹㈡埛鑾峰彇瀹㈡埛浣欓
     getCustomerBalance(HCusID) {
-      axios.get(this.baseURL + '/Xs_CusRatingChangeBill/getCustomerBalance', {
+      axios.get(this.$baseUrl + '/Xs_CusRatingChangeBill/getCustomerBalance', {
         params: { "HCusID": HCusID, 'CurUserName': sessionStorage["HUserName"] }
       }).then(response => {
         var data = response.data.data[0];
@@ -1072,7 +1072,7 @@
     handleUpdate() {
       this.reset()
       let rowHmainid = this.linterid
-      axios.get(this.baseURL + "/Gy_Mould_Edit/xg", {
+      axios.get(this.$baseUrl + "/Gy_Mould_Edit/xg", {
         params: { 'HInterID': rowHmainid }
       }).then(response => {
         console.log(response.data)
@@ -1179,7 +1179,7 @@
       }).catch(error => {
         this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
       });
-      axios.get(this.baseURL + "/Gy_MouldFileMain/Gy_MouldFileSubDetai", {
+      axios.get(this.$baseUrl + "/Gy_MouldFileMain/Gy_MouldFileSubDetai", {
         params: { 'HInterID': rowHmainid }
       }).then(response => {
         if (response.data.code == 1) {
@@ -1223,7 +1223,7 @@
     },
     //#region 璁$畻-涓嬫淇濆吇/鏍℃鏃ユ湡
     calculateHNextMainDate(HInterID, HCycleUnit, HCheckCycle) {
-      axios.get(this.baseURL + "/Gy_Mould_Edit/calculateHNextMainDate", {
+      axios.get(this.$baseUrl + "/Gy_Mould_Edit/calculateHNextMainDate", {
         params: { 'HInterID': HInterID }
       }).then(response => {
         let d = response.data
@@ -1257,7 +1257,7 @@
     },
     //鏍规嵁瀹㈡埛甯﹀嚭鑱旂郴浜恒�佽仈绯荤數璇�
     getCustomerByCusID(HCusID) {
-      axios.get(this.baseURL + "/Xs_SeOrderBill/getCustomerByCusID", {
+      axios.get(this.$baseUrl + "/Xs_SeOrderBill/getCustomerByCusID", {
         params: {
           HCusID: HCusID
         }
@@ -1433,7 +1433,7 @@
       var sql = `exec h_p_Xt_GetMaxBillNo_SubType '1205','${this.form.HDate}',0,0,0,'${Type}','${this.form.HDeptID}'`;
       axios({
         method: 'get',
-        url: this.baseURL + "/CommonModel/searchMethod",
+        url: this.$baseUrl + "/CommonModel/searchMethod",
         params: { "sql": sql, "user": sessionStorage["HUserName"], "ModRightNameCheck": "" },
       }).then(response => {
         if (response.data.count == 1) {
@@ -1480,7 +1480,7 @@
           console.log(oMain)
           axios({
             method: 'post',
-            url: this.baseURL + url,
+            url: this.$baseUrl + url,
             data: {
               'oMain': oMain
             },

--
Gitblit v1.9.1