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

src/views/aftersales/aftersalesWorkOrder.vue

@@ -2395,25 +2395,37 @@ const tabChenge = val => {
     console.log('全部');
   } else if (val == 1) {
     // 处理中
-    ProcessingPartyState.value = false; //关闭处理方
+    if (UserPermissions.value == '职能客服') {
+      data.workOrderStatus = 40;
+      details.query.workOrderStatus = 40;
+    } else {
       data.workOrderStatus = 20;
       details.query.workOrderStatus = 20;
+    }
+    ProcessingPartyState.value = false; //关闭处理方
+
     ArbitrationStatus.value = true; //可以申请仲裁
     Tableheaderswitching(columnList);
     empty();
     IndexTable(data);
   } else if (val == 2) {
-    // 处理完毕
-    ProcessingPartyState.value = false; //关闭处理方
+    if (UserPermissions.value == '职能客服') {
+      data.workOrderStatus = 50;
+      details.query.workOrderStatus = 50;
+    } else {
       data.workOrderStatus = 30;
       details.query.workOrderStatus = 30;
+    }
+    // 处理完毕
+    ProcessingPartyState.value = false; //关闭处理方
+
     ArbitrationStatus.value = false; //不可以申请仲裁
     Tableheaderswitching(columnList);
     empty();
     IndexTable(data);
   } else if (val == 3) {
-    console.log(JSON.parse(localStorage.getItem('TWMS-userInfo')).content.role_name,'当前身份');
-    if (JSON.parse(localStorage.getItem('TWMS-userInfo')).content.role_name == '客服经理') {
+    console.log(UserPermissions.value, '当前身份');
+    if (UserPermissions.value == '客服经理') {
       data.workOrderStatus = 10;
       ArbitrationStatus.value = true; //可以申请仲裁
       Tableheaderswitching(columnList);

src/views/aftersales/aftersalesWorkOrderInfo.vue

@@ -407,7 +407,7 @@
             </div>
           </div>
           <div class="Proportion">
-            <span class="title">公司占比:{{ companyProportion }}</span>
+            <span class="title">公司占比:{{ companyProportion }}%</span>
           </div>
         </div>
       </el-tab-pane>
@@ -440,7 +440,7 @@
 
     <div class="foot_btn">
       <el-button type="primary" @click="addireply">回复</el-button>
-      <el-button type="primary" @click="addingRecord">处理完结</el-button>
+      <el-button type="primary" @click="addingRecord">处理结果</el-button>
       <el-button type="primary" @click="EndJump">完结 </el-button>
       <el-button type="primary" @click="BatchReturn">打回 </el-button>
       <el-button type="primary" @click="CustomerServiceCompleted">客服仲裁完结 </el-button>
@@ -1088,6 +1088,7 @@ const CustomerServiceCompleted = () => {
       warehouseId: $route.query.warehouseId,
       workOrderNumber: $route.query.workOrderNumber,
       RouterState: 'Kfend',
+      index: '1',
     },
   });
 };

src/views/aftersales/aftersalesWorkOrderend.vue

@@ -368,7 +368,7 @@
                       <!-- <el-input v-model="item.explain" placeholder="请填写说明" /> -->
                     </div>
                     <div class="el_cwBtn">
-                      <el-button type="primary" v-if="item.state == 0"> 财务处理 </el-button>
+                      <el-button type="primary" v-if="item.state == 0 && UserPermissions!='职能客服'"> 财务处理 </el-button>
                       <el-button type="primary" @click="payremove(item.state, index)">
                         移除
                       </el-button>
@@ -709,7 +709,7 @@
                   />
                 </div>
                 <div class="msgHf">
-                  <el-button type="primary" @click="replyMessage()"> 回复 </el-button>
+                  <el-button type="primary" @click="replyMessage()" :disabled="$route.query.index!='0'"> 回复 </el-button>
                 </div>
               </div>
             </div>
@@ -1218,6 +1218,8 @@ const Chathistory = () => {
         container.scrollTop = container.scrollHeight;
       }
     }, 0);
+  }).catch(res=>{
+    Msgloading.value = false; //关闭加载效果
   });
 };