From e6e6b63430a6460668107abdb213e2c0009b533a Mon Sep 17 00:00:00 2001
From: xzg <4727863@qq.com>
Date: Wed, 28 Feb 2024 10:53:24 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=9C=8D=E6=9D=83=E9=99=90=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/aftersales/aftersalesWorkOrder.vue          | 4 ++--
 src/views/warehouse/warehouseStock/warehouseStock.vue | 4 ++--
 vite.config.js                                        | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/views/aftersales/aftersalesWorkOrder.vue b/src/views/aftersales/aftersalesWorkOrder.vue
index 96038098..5ea23b4d 100644
--- a/src/views/aftersales/aftersalesWorkOrder.vue
+++ b/src/views/aftersales/aftersalesWorkOrder.vue
@@ -268,7 +268,7 @@
 
                         <!-- 仲裁中确定结束仲裁按钮 -->
                         <el-button
-                          v-if="TabPermissions == '5'"
+                          v-if="TabPermissions == '5' && UserPermissions != '仓库客服'"
                           @click="EndArbitration(slotProps.scope)"
                           >确定</el-button
                         >
@@ -1538,7 +1538,7 @@ const ButtonPermissions = computed(() => {
         DingTalkNumber: false, //钉钉号填写
         Batchdetermination: false, //批量确定
         ManagerConfirmed: false, //处理完毕下面的客服经理批量确定
-        ArbitrationDetermination: true, //批量仲裁确定
+        ArbitrationDetermination: UserPermissions.value != '仓库客服', //批量仲裁确定
         Financial_accounting: false, //财务入账
         defaultassignments: false, //默认指派
         export_Report: true, //导出报表
diff --git a/src/views/warehouse/warehouseStock/warehouseStock.vue b/src/views/warehouse/warehouseStock/warehouseStock.vue
index 043353df..d7ed75be 100644
--- a/src/views/warehouse/warehouseStock/warehouseStock.vue
+++ b/src/views/warehouse/warehouseStock/warehouseStock.vue
@@ -312,7 +312,7 @@ export default {
       // 是否显示查询
       search: true,
       // 加载中
-      loading: true,
+      loading: false,
       // 是否为查看模式
       view: false,
       // 查询信息
@@ -335,7 +335,7 @@ export default {
   },
   mounted() {
     this.init();
-    this.onLoad(this.page);
+    // this.onLoad(this.page);
     /**
      * 初始化获取本地缓存的编辑隐藏的列表
      *  固定搭配，不能更改
diff --git a/vite.config.js b/vite.config.js
index 8ad784e1..ef6e8282 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -23,7 +23,7 @@ export default ({ mode, command }) => {
           // 新zyc
           // target: 'http://192.168.6.116:8777',
           // target: 'http://192.168.6.122:8777',
-          // target: 'http://192.168.3.14:13000',
+          target: 'http://192.168.3.14:13000',
           // target: 'http://192.168.10.25:2888',
           // target: 'http://192.168.6.161:9777',//CY
           // target: 'http://192.168.10.57:13000',
@@ -31,7 +31,7 @@ export default ({ mode, command }) => {
           // target: 'http://192.168.10.29:13000',
           // target: 'http://192.168.3.5:13000',//？
           // target: 'http://h5uapi.huitongys.com',
-          target: 'http://test.api.huo5you.com',
+          // target: 'http://test.api.huo5you.com',
 
           changeOrigin: true,
           rewrite: path => path.replace(/^\/api/, ''),