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

src/views/aftersales/aftersalesWorkOrder.vue

@@ -581,7 +581,7 @@
                           :rows="2"
                         />
                       </div>
-
+                      
                       <div class="sk_input" v-if="item.state == 1"></div>
 
                      
@@ -1452,7 +1452,7 @@ const ButtonPermissions = computed(() => {
         assignment: false, //工单指派
         applyArbitration: false, //客服介入
         DingTalkNumber: false, //钉钉号填写
-        batchFinish: UserPermissions.value != '仓库客服', //批量完结
+        batchFinish:false, //批量完结
         appeal: false, //申诉
         ManagerConfirmed: false, //处理完毕下面的客服经理批量确定
         ArbitrationDetermination: false, //批量仲裁确定
@@ -4065,6 +4065,7 @@ const CompletedSubmission = () => {
   // 初始化data数组，其结构对应于details.selectionList的长度
   let data = details.selectionList.map(() => ({
     id:details.selectionList[0].id,
+    reasonArbitration:Reasonarbitration.value,
     completionRecipientEntities: [],
     completionRecordEntities: [],
   }));
@@ -4081,7 +4082,7 @@ const CompletedSubmission = () => {
           money: Number(party.num),
           reasonArbitration: Reasonarbitration.value,
           warehouseId: party.warehouseId, //仓库
-          personResponsibleName: party.personResponsibleName,
+          compensationPersonnel: party.personResponsibleName,//责任人
           workOrderId: selection.id, //工单id
         };
         // 将赔款方信息添加到对应的completionRecordEntities数组中

src/views/aftersales/aftersalesWorkOrderInfo.vue

@@ -589,7 +589,7 @@
 
         <!-- 仲裁原因 -->
         <!-- v-if="routerState == 'end'" -->
-        <div class="arbitrate" v-if="UserPermissions != '仓库客服'">
+        <div class="arbitrate">
           <el-tabs type="border-card" class="demo-tabs">
             <el-tab-pane>
               <template #label>
@@ -1417,6 +1417,7 @@ const onLoad = () => {
             compensationPersonnel: item.compensationPersonnel, //责任人
           });
         });
+
       }
     });
   

vite.config.js

@@ -14,7 +14,7 @@ export default ({ mode, command }) => {
         '/api': {
           // target: 'http://192.168.10.126:8889',
           // hy
-          // target: 'http://192.168.10.48:13000',
+          // target: 'http://192.168.3.12:13000',
           // lmy
           // target: 'http://192.168.10.123:8889',
           // target: 'http://192.168.10.101:8888',
@@ -23,13 +23,13 @@ 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',//CYZ
           // target: 'http://192.168.10.57:13000',
           // target: 'http://192.168.10.200:13000',
           // target: 'http://192.168.10.29:13000',
-          // target: 'http://192.168.3.5:13000',//？
+          target: 'http://192.168.3.5:13000',//？
           // target: 'http://h5uapi.huitongys.com',
           // target: 'http://test.api.huo5you.com',