From 037659692de714787b029e25753e1293195a778f Mon Sep 17 00:00:00 2001
From: xzg <4727863@qq.com>
Date: Mon, 8 Jan 2024 13:49:58 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=9C=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../aftersales/aftersalesWorkOrderAdd.vue     | 15 +++-
 .../aftersales/aftersalesWorkOrderInfo.vue    | 20 +++---
 .../aftersales/aftersalesWorkOrderend.vue     | 71 +++++++++++++------
 3 files changed, 73 insertions(+), 33 deletions(-)

diff --git a/src/views/aftersales/aftersalesWorkOrderAdd.vue b/src/views/aftersales/aftersalesWorkOrderAdd.vue
index 5666aecc..9f12f9ac 100644
--- a/src/views/aftersales/aftersalesWorkOrderAdd.vue
+++ b/src/views/aftersales/aftersalesWorkOrderAdd.vue
@@ -328,7 +328,6 @@
 
               <div class="maxBox">
                 <el-form-item label="责任人"> 
-              
                 <el-select
                   v-if="groundlineType != 1"
                   v-model="item.personResponsibleName"
@@ -1126,9 +1125,23 @@ const ConfirmForm = () => {
         workOrderId: Indexform.value.workOrderNumber? Indexform.value.workOrderNumber:null,
       };
       console.log(DataSubmit.surveyRecordDTO, '调查经过');
+      // 环节责任方填写校验
+      // 对在库环节,配送环节,安装环节进行责任人填写校验
+      if(groundlineType.value == 5 || groundlineType.value == 4 || groundlineType.value == 7){
+        const Humanverification = FangAddList.value.every(item => item.businessName !== "");
+        if(!Humanverification){
+          ElMessage({
+          message: '请填写责任人',
+          type: 'warning',
+          })
+          return
+          }
+      }
       // 新责任方处理
       // FangAddList.value
       // 不是提货环节
+
+    
       if (groundlineType.value != 1) {
         if (FangAddList.value.length) {
           // 如果存在责任方
diff --git a/src/views/aftersales/aftersalesWorkOrderInfo.vue b/src/views/aftersales/aftersalesWorkOrderInfo.vue
index 46ca23d5..14756049 100644
--- a/src/views/aftersales/aftersalesWorkOrderInfo.vue
+++ b/src/views/aftersales/aftersalesWorkOrderInfo.vue
@@ -441,13 +441,12 @@
       v-if="PermissionButton.repulse"
       v-if="PermissionButton.arbitration_completed"
       v-if="PermissionButton.information_editing" -->
-
-      <el-button v-if="ButtonPermissions.reply" type="primary" @click="addireply">回复</el-button>
-      <el-button v-if="ButtonPermissions.ProcessingResults" type="primary" @click="addingRecord">处理结果</el-button>
-      <el-button v-if="ButtonPermissions.end" type="primary" @click="EndJump">完结 </el-button>
-      <el-button v-if="ButtonPermissions.repulse" type="primary" @click="BatchReturn">打回 </el-button>
-      <el-button v-if="ButtonPermissions.ArbitrationCompleted" type="primary" @click="CustomerServiceCompleted">客服仲裁完结 </el-button>
-      <el-button v-if="ButtonPermissions.edit" type="primary" @click="EditInformation">信息编辑</el-button>
+      <el-button  type="primary" @click="addireply">回复</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>
+      <el-button  @click="EditInformation">信息编辑</el-button>
     </div>
   </el-card>
   <!-- 批量打回弹窗 -->
@@ -908,7 +907,8 @@ const onLoad = () => {
       .map(item => {
         return { businessName: item.businessId };
       });
-
+    console.log(FangAddList.value,'责任方回显问题');
+   
     // 公司占比回显计算
     let sum = 0;
     res.data.data.personResponsibleVOS.forEach(item => {
@@ -922,6 +922,7 @@ const onLoad = () => {
         description: res.description, //说明
       };
     });
+    console.log(FangAddList.value,'责任方回显问题');
     res.data.data.processorVOList.forEach(item => {
         if (item) {
           if (item.typesOf == 2) {
@@ -930,9 +931,6 @@ const onLoad = () => {
           }
         }
       });
-    // let a=['张三','李四']
-    // let b=['张三']
-    // let result = b.some(item => a.includes(item));
     companyProportion.value = 100 - sum;
     ProcessingRecordsName.value = ProcessingRecords.value.filter(item =>
       warehouseData.value.includes(item.value)
diff --git a/src/views/aftersales/aftersalesWorkOrderend.vue b/src/views/aftersales/aftersalesWorkOrderend.vue
index 5ff85eca..61d0a7b0 100644
--- a/src/views/aftersales/aftersalesWorkOrderend.vue
+++ b/src/views/aftersales/aftersalesWorkOrderend.vue
@@ -373,13 +373,13 @@
 
                 <div class="el-ckbtn">
                   <el-button type="primary" @click="AddCompensation">添加赔款方</el-button>
-                  <el-button type="primary" @click="AddPayee">添加收款方</el-button>
+                  <el-button type="primary" @click="AddPayee">添加受款方</el-button>
                 </div>
 
                 <div class="payanindemnity" v-for="(item, index) in CompensationParty" :key="index">
                   <div class="el_pklab">
                     <span class="title" :style="{ color: item.state != 0 ? '#000' : '#F56C6C' }"
-                      >{{ item.state == 0 ? '赔款方' : '收款方' }}{{ item.cld }}</span
+                      >{{ item.state == 0 ? '赔款方' : '受款方' }}{{ item.cld }}</span
                     >
                   </div>
 
@@ -387,7 +387,7 @@
                     <div class="sk_input">
                       <el-input
                         v-model="item.name"
-                        :placeholder="item.state == 0 ? '请填写赔款方' : '请填写收款方'"
+                        :placeholder="item.state == 0 ? '请填写赔款方' : '请填写受款方'"
                       />
                     </div>
                     <div class="sk_input">
@@ -401,6 +401,33 @@
                         placeholder="金额"
                       />
                     </div>
+                    <!-- 赔款方是那个仓库的 -->
+                    <div class="sk_input"   v-if="item.state == 0">
+                      <el-select
+                        v-model="item.warehouseId"
+                        filterable
+                        disabled
+                        placeholder="请选择仓库"
+                      >
+                        <el-option
+                          v-for="item in warehouseData"
+                          :key="item.value"
+                          :label="item.label"
+                          :value="item.value"
+                        />
+                      </el-select>
+
+                    </div>
+
+                    <div class="sk_input"   v-if="item.state == 0">
+                      <el-input
+                        v-model="item.personResponsibleList"
+                        placeholder="请填写责任人"
+                        clearable
+                        :rows="2"
+                        disabled
+                      />
+                    </div>
 
                     <!-- <div class="sk_input" v-if="item.state == 0">
                       <el-input v-model="item.explains" placeholder="请填写说明" />
@@ -883,9 +910,9 @@ const VideoPreviewStatus = ref(false); //视频预览状态
 const warehouseData = ref([]); //处理方
 const MessageContent = ref([]);
 const CompensationParty = ref([
-  { name: '', state: 0, num: null, reason: '', cld: 1 }, //赔款方
+  { name: '', state: 0, num: null, reason: '', cld: 1,warehouseId:null,personResponsibleList:'' }, //赔款方
   // explains: ''
-  { name: '', state: 1, num: null, reason: '', cld: 1 }, //收款方
+  { name: '', state: 1, num: null, reason: '', cld: 1 ,warehouseId:null,personResponsibleList:''}, //受款方
   // explains: ''
 ]); //收/赔
 const ProcessingList = ref([]); //处理结果已经选择的列表
@@ -1118,7 +1145,7 @@ const onLoad = () => {
       endFrom.value.resultDescription = res.data.data.processingResultsVO.resultDescription;
 
       // 完结信息回显
-      // 收款方
+      // 受款方
 
       if (res.data.data.completionRecipientEntityList.length > 0) {
         CompensationParty.value = [];
@@ -1127,9 +1154,9 @@ const onLoad = () => {
           CompensationParty.value.push({
             state: 1, //状态
             num: item.money, //金额
-            name: item.recipient, //收款方名字
-            reason: item.reasonReceivingPayment, //收款方原因
-            // explains: item.explains, //收款方说明
+            name: item.recipient, //受款方名字
+            reason: item.reasonReceivingPayment, //受款方原因
+            // explains: item.explains, //受款方说明
             cld: index + 1,
             id: item.id,
           });
@@ -1142,9 +1169,9 @@ const onLoad = () => {
           CompensationParty.value.push({
             state: 0, //状态
             num: item.money, //金额
-            name: item.indemnitor, //收款方名字
-            reason: item.reason, //收款方原因
-            // explains: item.explains, //收款方说明
+            name: item.indemnitor, //受款方名字
+            reason: item.reason, //受款方原因
+            // explains: item.explains, //受款方说明
             cld: index + 1,
             id: item.id,
             accounting: item.accounting ? item.accounting : '',
@@ -1405,10 +1432,10 @@ const AddCompensation = () => {
       som++;
     }
   });
-  CompensationParty.value.push({ name: '', state: 0, num: 0, reason: '', cld: som });
+  CompensationParty.value.push({ name: '', state: 0, num: 0, reason: '', cld: som ,personResponsibleList:'',warehouseId:''});
   // explains: ''
 };
-// 添加收款方
+// 添加受款方
 const AddPayee = () => {
   let som = 1;
   CompensationParty.value.forEach(item => {
@@ -1416,7 +1443,7 @@ const AddPayee = () => {
       som++;
     }
   });
-  CompensationParty.value.push({ name: '', state: 1, num: 0, reason: '', cld: som });
+  CompensationParty.value.push({ name: '', state: 1, num: 0, reason: '', cld: som,personResponsibleList:'',warehouseId:'' });
   // explains: ''
 };
 // 理赔总金额计算
@@ -1501,7 +1528,7 @@ const amountMoney = () => {
         _num
       ).result;
     }
-    // 统计收款方金额【1】
+    // 统计受款方金额【1】
     if (item.state == 1) {
       TotalamountReceived.value = computeNumber(TotalamountReceived.value, '+', _num).result;
     }
@@ -1701,7 +1728,7 @@ const submit = () => {
     let data = [
       {
         id: $route.query.id,
-        completionRecipientEntities: [], //收款方
+        completionRecipientEntities: [], //受款方
         completionRecordEntities: [], //赔款方
         reasonArbitration: endFrom.value.arbitrate, //仲裁原因
         ...info,
@@ -1720,13 +1747,15 @@ const submit = () => {
           money: Number(item.num), //金额
           reasonArbitration: item.reason, //说明
           workOrderId: info.id, //异常工单
-          warehouseId: info.warehouseId, //仓库ID
+          // warehouseId: info.warehouseId, //仓库ID
+          personResponsibleList:item.personResponsibleList,//责任人（手动填写）
+          warehouseId:item.warehouseId,//赔款方是那个仓库（传入ID）
         });
       } else {
-        // 收款方
+        // 受款方
         data[0]['completionRecipientEntities'].push({
-          recipient: item.name, //收款方
-          reasonReceivingPayment: item.reason, //收款原因
+          recipient: item.name, //受款方
+          reasonReceivingPayment: item.reason, //受款原因
           money: Number(item.num), //金额
           responsibleParty: FangAddList.value
             .map(aItem =>