From 624edef0ecd026761c0b104dc698f76bf6f42f44 Mon Sep 17 00:00:00 2001
From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com>
Date: Wed, 19 Jun 2024 16:47:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=A2=86=E6=96=99=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7=E9=A1=B5=E9=9D=A2=E5=AD=97=E6=AE=B5=E5=9B=9E=E6=98=BE?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sgzb-ui/src/permission.js                           |  2 +-
 .../claimAndreturn/picking/apply/component/home.vue | 13 +++++++++----
 sgzb-ui/vue.config.js                               |  4 ++--
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/sgzb-ui/src/permission.js b/sgzb-ui/src/permission.js
index 5e01d400..fbc55f9c 100644
--- a/sgzb-ui/src/permission.js
+++ b/sgzb-ui/src/permission.js
@@ -8,7 +8,7 @@ import { isRelogin } from '@/utils/request'
 
 NProgress.configure({ showSpinner: false })
 
-const whiteList = ['/login', '/register', '/auth/sendCode', '/qrCode/qrCodePage', '/demo']
+const whiteList = ['/login', '/register', '/auth/sendCode', '/qrCode/qrCodePage']
 
 router.beforeEach((to, from, next) => {
   NProgress.start()
diff --git a/sgzb-ui/src/views/claimAndreturn/picking/apply/component/home.vue b/sgzb-ui/src/views/claimAndreturn/picking/apply/component/home.vue
index c2c2b784..f2fdeb11 100644
--- a/sgzb-ui/src/views/claimAndreturn/picking/apply/component/home.vue
+++ b/sgzb-ui/src/views/claimAndreturn/picking/apply/component/home.vue
@@ -198,7 +198,7 @@
             <el-table-column
                 label="领料申请人"
                 align="center"
-                prop="applyFor"
+                prop="nickName"
                 :show-overflow-tooltip="true"
             />
             <el-table-column
@@ -445,7 +445,7 @@ export default {
                 id: this.queryParams.proId,
             }
             const res = await getUnitData(params)
-            res.data = res.data.filter(item => item != null)
+            res.data = res.data.filter((item) => item != null)
             this.unitList = res.data
         },
         // 获取 工程名称 列表数据
@@ -454,7 +454,7 @@ export default {
                 id: this.queryParams.unitId,
             }
             const res = await getProData(params)
-            res.data = res.data.filter(item => item != null)
+            res.data = res.data.filter((item) => item != null)
             this.proList = res.data
         },
 
@@ -547,7 +547,12 @@ export default {
             //         isBack: true,
             //     },
             // })
-            this.$emit('editPicking', row.taskId, this.queryParams, row.taskStatus)
+            this.$emit(
+                'editPicking',
+                row.taskId,
+                this.queryParams,
+                row.taskStatus,
+            )
         },
         /** 删除按钮操作 */
         async handleDelete(row) {
diff --git a/sgzb-ui/vue.config.js b/sgzb-ui/vue.config.js
index 0e86ee3a..b3665771 100644
--- a/sgzb-ui/vue.config.js
+++ b/sgzb-ui/vue.config.js
@@ -46,8 +46,8 @@ module.exports = {
         // target: `http://10.40.92.60:28080`, //超
         // target: `http://10.40.92.81:8080`, //韩/
         // target: `http://10.40.92.74:8080`,//旭/
-        target: `http://10.40.92.140:28080`, //帅
-        // target: `http://10.40.92.253:28080`, //福
+        // target: `http://10.40.92.140:28080`, //帅
+        target: `http://10.40.92.253:28080`, //福
 
         //******** 注意事项  ********* */
         //1.全局替换qrUrl二维码扫码提供的网址-发布服务器的地址target;