Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev

src/views/aftersales/aftersalesWorkOrderend.vue

@@ -1280,12 +1280,9 @@ const Completedsubmission = () => {
     return true;
   }
   // // 否则只能总部客服和经理展示
-  // if (
-  //   UserPermissions.value == Useridentity.Headquarters_customer_service ||
-  //   UserPermissions.value == Useridentity.Headquarters_Manager
-  // ) {
-  //   return true;
-  // }
+  if ((UserPermissions.value == Useridentity.Headquarters_customer_service || UserPermissions.value == Useridentity.Headquarters_Manager)&& ['30','70'].includes($route.query.workOrderStatus)) {
+    return true;
+  }
   return false;
 };
 

vite.config.js

@@ -18,7 +18,7 @@ export default ({ mode, command }) => {
           // longge
           // target: 'http://192.168.3.16:13000',
           // xiaohei
-            //  target:'http://192.168.3.65:13000',       
+            //  target:'http://192.168.3.65:13000' ,       
           // target: 'http://192.168.3.65:13000',
           // lmy
           // target: 'http://192.168.10.123:8889',
@@ -32,15 +32,15 @@ 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',
           // target: 'http://192.168.10.200:13000',
           // target: 'http://192.168.3.16:13000',
           // target: 'http://192.168.3.73:13000', //
-          // target: 'http://h5uapi.huitongys.com',
-          // target: 'http://test.api.huo5u.com', 
+          // target: 'http://api.huo5u.com/',  
+          target: 'http://test.api.huo5u.com', 
           changeOrigin: true,
           rewrite: path => path.replace(/^\/api/, ''),
         },