From 9ba6c13880174c1c80b38b089beeb20de354df47 Mon Sep 17 00:00:00 2001
From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com>
Date: Wed, 17 Jul 2024 10:59:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=A4=A7=E5=B1=8F=E7=9A=84?=
 =?UTF-8?q?=E6=89=93=E5=8C=85=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../return/apply/component/addReturn1.vue            | 12 +++++++++---
 sgzb-ui/src/views/dashboard.vue                      |  4 ++--
 sgzb-ui/vue.config.js                                |  4 ++--
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/sgzb-ui/src/views/claimAndreturn/return/apply/component/addReturn1.vue b/sgzb-ui/src/views/claimAndreturn/return/apply/component/addReturn1.vue
index 381f0def..775b0477 100644
--- a/sgzb-ui/src/views/claimAndreturn/return/apply/component/addReturn1.vue
+++ b/sgzb-ui/src/views/claimAndreturn/return/apply/component/addReturn1.vue
@@ -476,7 +476,7 @@ export default {
             },
             companyId: '',
             createBy: '',
-            isEdit: 'true',
+            // isEdit: 'true',
             rowId: '',
         }
     },
@@ -493,7 +493,10 @@ export default {
         // }
         if (this.rejectId) {
             this.rowId = this.rejectId
-            this.GetViewByApply({ id: this.rejectId, agreementId: this.agreementId})
+            this.GetViewByApply({
+                id: this.rejectId,
+                agreementId: this.agreementId,
+            })
         }
         getInfo().then((res) => {
             this.companyId = res.user.companyId
@@ -559,7 +562,10 @@ export default {
 
         // 获取 任务详情数据
         async GetViewByApply(params) {
-            const res = await materialReturnNoteByApply({ id: params.id, agreementId: params.agreementId})
+            const res = await materialReturnNoteByApply({
+                id: params.id,
+                agreementId: params.agreementId,
+            })
             const data = res.data[0]
             // console.log(data)
             // this.queryParams.taskId = data.taskId
diff --git a/sgzb-ui/src/views/dashboard.vue b/sgzb-ui/src/views/dashboard.vue
index 37f5a8f0..4d77a856 100644
--- a/sgzb-ui/src/views/dashboard.vue
+++ b/sgzb-ui/src/views/dashboard.vue
@@ -4,6 +4,7 @@
 </template>
 
 <script>
+import { getToken } from '@/utils/auth'
 export default {
     data() {
         return {
@@ -24,8 +25,7 @@ export default {
     methods: {
         openNewWindow() {
             window.open(
-                `${this.jumpUrl}/bigScrap/index01.html?token=` +
-                    localStorage.getItem('token'),
+                `${this.jumpUrl}/bigScrap/Home/index?token=${getToken()}`,
                 '_blank',
             )
         },
diff --git a/sgzb-ui/vue.config.js b/sgzb-ui/vue.config.js
index 7ad73a50..afc476aa 100644
--- a/sgzb-ui/vue.config.js
+++ b/sgzb-ui/vue.config.js
@@ -42,9 +42,9 @@ module.exports = {
         // target: `https://test-cc.zhgkxt.com`,//线上环境-南网
         // target: `https://z.csgmall.com.cn`,
 
-        target: `http://192.168.2.76:28080`, //超
+        // target: `http://192.168.2.76:28080`, //超
         // target: `http://10.40.92.81:8080`, //韩/
-        // target: `http://10.40.92.74:8080`,//旭/
+        target: `http://192.168.2.76:28080`,//旭/
         //target: `http://192.168.2.248:28080`, //帅
         // target: `http://10.40.92.253:28080`, //福