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

diff --git a/src/views/basic/gyCurrency/gyCurrency.vue b/src/views/basic/gyCurrency/gyCurrency.vue
index d386a36..69f30aa 100644
--- a/src/views/basic/gyCurrency/gyCurrency.vue
+++ b/src/views/basic/gyCurrency/gyCurrency.vue
@@ -808,7 +808,7 @@
     defaintOperationByCompanyName() {
       var result = false;
       axios
-        .get(this.baseURL + "/Xt_getInfo/getCompanyName")
+        .get(this.$baseUrl + "/Xt_getInfo/getCompanyName")
         .then((res) => {
           var data1 = res.data;
           if (data1.count == 1) {
@@ -905,7 +905,7 @@
       }
     
       try {
-        let res = await axios.get(this.baseURL + "/Gy_Currency/list1", {
+        let res = await axios.get(this.$baseUrl + "/Gy_Currency/list1", {
           params: {
             sWhere: this.sWhere,
             user: sessionStorage["HUserName"],
@@ -1009,7 +1009,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,
@@ -1314,7 +1314,7 @@
     getOrgIDByUser() {
       var res = "";
       axios
-        .get(this.baseURL + "/Xt_User/getOrgIDListByUser", {
+        .get(this.$baseUrl + "/Xt_User/getOrgIDListByUser", {
           params: {
             HModName: this.HModName,
             user: sessionStorage["HUserName"],
@@ -1399,7 +1399,7 @@
         .then(() => {
           if (!this.rowForm.瀹℃牳浜�) {
             axios
-              .get(this.baseURL + "DeltetGy_Currency", {
+              .get(this.$baseUrl + "DeltetGy_Currency", {
                 params: {
                   HInterID: this.rowForm.hmainid.toString(),
                   user: sessionStorage["HUserName"],
@@ -1427,7 +1427,7 @@
       var InterID = form.HItemID || form.HInterID || form.hmainid;
       //閫昏緫瀹℃牳鏂规硶
       axios
-        .get(this.baseURL + "Gy_Currency/AuditGy_Currency", {
+        .get(this.$baseUrl + "Gy_Currency/AuditGy_Currency", {
           params: {
             HInterID: InterID,
             IsAudit: num,
@@ -1453,7 +1453,7 @@
       try {
         let res = await axios
         .get(
-          this.baseURL + "/Gy_Currency/StopGy_Currency",
+          this.$baseUrl + "/Gy_Currency/StopGy_Currency",
           {
             params: {
               HInterID: HInterID,
@@ -1479,7 +1479,7 @@
     //   let HInterID = form.HItemID || form.HInterID || form.hmainid;
     //   try {
     //     let res = await axios.get(
-    //       `${this.baseURL}/Cg_POInStockBill/CloseCg_POInStockBill`,
+    //       `${this.$baseUrl}/Cg_POInStockBill/CloseCg_POInStockBill`,
     //       {
     //         params: {
     //           HInterID: HInterID,
@@ -1506,7 +1506,7 @@
     //   let HEntryID = form.HEntryID || form.hsubid;
     //   try {
     //     let res = await axios.get(
-    //       `${this.baseURL}/Cg_POInStockBill/CloseRowCg_POInStockBill`,
+    //       `${this.$baseUrl}/Cg_POInStockBill/CloseRowCg_POInStockBill`,
     //       {
     //         params: {
     //           HInterID: HInterID,
@@ -1533,7 +1533,7 @@
     //   let HInterID = form.HItemID || form.HInterID || form.hmainid;
     //   try {
     //     let res = await axios.get(
-    //       `${this.baseURL}/Cg_POInStockBill/DropCg_POInStockBill`,
+    //       `${this.$baseUrl}/Cg_POInStockBill/DropCg_POInStockBill`,
     //       {
     //         params: {
     //           HInterID: HInterID,
@@ -1559,7 +1559,7 @@
       var InterID = form.HItemID || form.HInterID;
       //閫昏緫瀹℃牳鏂规硶
       axios
-        .get(this.baseURL + "/Gy_Employee/StopGy_Employee", {
+        .get(this.$baseUrl + "/Gy_Employee/StopGy_Employee", {
           params: {
             HInterID: InterID,
             IsStop: num,
@@ -1633,7 +1633,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