From 4b0352527a099d65e2ab8afdeb285d4a28e9c493 Mon Sep 17 00:00:00 2001
From: xzg <4727863@qq.com>
Date: Mon, 27 May 2024 18:42:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81=E7=BB=93?=
 =?UTF-8?q?=E6=9E=84=EF=BC=8C=E4=BF=AE=E5=A4=8D=E5=B7=B2=E7=9F=A5bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/option/aftersales/vueTvemp.js             |   4 +-
 src/views/aftersales/DataSynchronization.vue  |  35 +-
 .../aftersales/aftersalesWorkOrderAdd.vue     | 109 +++---
 .../aftersales/aftersalesWorkOrderInfo.vue    |  26 +-
 .../aftersales/aftersalesWorkOrderend.vue     |  46 ++-
 .../aftersalesWorkOrdermodifyTemp.vue         | 311 ++++++++++++++----
 .../distributionStockListDetails.vue          |  83 ++++-
 7 files changed, 453 insertions(+), 161 deletions(-)

diff --git a/src/option/aftersales/vueTvemp.js b/src/option/aftersales/vueTvemp.js
index 04161914..5ceb8dcc 100644
--- a/src/option/aftersales/vueTvemp.js
+++ b/src/option/aftersales/vueTvemp.js
@@ -63,7 +63,7 @@ export const columnList = [
     label: '订单自编号',
     type: 2,
     values: '',
-    width: '150',
+    width: '180',
     checkarr: [],
     fixed: false,
     sortable: true,
@@ -731,7 +731,7 @@ export const AppealList = [
     label: '订单自编号',
     type: 2,
     values: '',
-    width: '130',
+    width: '180',
     checkarr: [],
     fixed: false,
     sortable: true,
diff --git a/src/views/aftersales/DataSynchronization.vue b/src/views/aftersales/DataSynchronization.vue
index 9e6697eb..e4c1ca70 100644
--- a/src/views/aftersales/DataSynchronization.vue
+++ b/src/views/aftersales/DataSynchronization.vue
@@ -1,11 +1,20 @@
 <template>
   <el-card class="box-card" v-loading="loading" element-loading-text="正在执行中...">
-    <div class="el_btn">
-      <el-input v-model="input" placeholder="请输入订单自编号，多个订单自编号用英文,逗号隔开">
-        <template #append>
-          <el-button type="primary" @click="synchronization">点击同步</el-button>
-        </template>
-      </el-input>
+    <div class="content">
+      <div>
+        <h2 style="text-align: center">数据同步功能</h2>
+        <h5 style="text-align: center">
+          输入订单自编号进行数据同步,多个订单自编号使用英文逗号进行分隔
+        </h5>
+        <h5></h5>
+      </div>
+      <div class="el_btn">
+        <el-input v-model="input" placeholder="请输入订单自编号，多个订单自编号用英文,逗号隔开">
+          <template #append>
+            <el-button type="primary" @click="synchronization">点击同步</el-button>
+          </template>
+        </el-input>
+      </div>
     </div>
   </el-card>
 </template>
@@ -24,6 +33,13 @@ function checkInput(input) {
 
 // 点击同步
 const synchronization = () => {
+  if (!input.value) {
+    ElMessage({
+      message: '请输入订单自编号',
+      type: 'warning',
+    });
+    return;
+  }
   const isInput = checkInput(input.value);
   console.log(isInput); // false
   if (isInput) {
@@ -51,6 +67,13 @@ const synchronization = () => {
 </script>
 
 <style scoped lang="scss">
+.content {
+  width: 100%;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+}
 .el-card {
   height: 100%;
 }
diff --git a/src/views/aftersales/aftersalesWorkOrderAdd.vue b/src/views/aftersales/aftersalesWorkOrderAdd.vue
index 6799cd40..1f738d58 100644
--- a/src/views/aftersales/aftersalesWorkOrderAdd.vue
+++ b/src/views/aftersales/aftersalesWorkOrderAdd.vue
@@ -819,11 +819,10 @@ const ruleForm = reactive({
     investigationProcess: [
       { required: true, message: '请输入调查经过', trigger: ['bulr', 'change'] },
     ],
-    result: [{ required: true, message: '请输选择处理结果', trigger: ['bulr'] }],
+    result: [{ required: false, message: '请输选择处理结果', trigger: ['bulr'] }],
     processor: [{ required: true, message: '请选择处理方', trigger: ['bulr'] }],
     processorEntityList: [{ required: true, message: '请选择责任方', trigger: ['bulr'] }],
   },
-
   packageCode: [{ required: true, message: '请输入包条码', trigger: ['bulr', 'change'] }],
   waybillNumber: [{ required: true, message: '请输入运单号', trigger: ['bulr', 'change'] }],
   orderCode: [{ required: true, message: '请输入订单自编号', trigger: ['bulr', 'change'] }],
@@ -836,11 +835,11 @@ const ruleForm = reactive({
   tripartite: [{ required: false, message: '请输入三方责任人', trigger: ['bulr', 'change'] }],
   description: [{ required: true, message: '请输入说明', trigger: ['bulr', 'change'] }],
   money: [{ required: true, message: '请输入金额', trigger: ['bulr', 'change'] }],
-  paymentUnit: [{ required: true, message: '请输入支付单位', trigger: ['bulr', 'change'] }],
-  compensationTime: [{ required: true, message: '请选择理赔支付时间', trigger: ['bulr', 'change'] }],
-  compensationMethod: [
-    { required: true, message: '请选择支付方式', trigger: ['bulr', 'change'] },
+  paymentUnit: [{ required: false, message: '请输入支付单位', trigger: ['bulr', 'change'] }],
+  compensationTime: [
+    { required: false, message: '请选择理赔支付时间', trigger: ['bulr', 'change'] },
   ],
+  compensationMethod: [{ required: false, message: '请选择支付方式', trigger: ['bulr', 'change'] }],
 });
 const ResponsibleParty = ref([]); //提货责任方
 const ruleFormRef = ref(); //表单示例
@@ -1506,6 +1505,8 @@ const onSubmit = () => {
         });
         // 订单自编号
         submitData.orderCode = form.value.PackageList[0].orderCode;
+        // 运单号
+        submitData.waybillNumber = form.value.PackageList[0].waybillNumber;
       }
 
       // 处理方处理
@@ -1553,7 +1554,7 @@ const onSubmit = () => {
         // 干线卸车环节不需要内部责任划分
         if (form.value.responsibilitiesList.length) {
           submitData.personResponsibleDTO = [];
-          let Responsibleperson=''
+          let Responsibleperson = '';
           form.value.responsibilitiesList.forEach(item => {
             console.log(item);
             let data = {
@@ -1562,20 +1563,28 @@ const onSubmit = () => {
               description: item.description, //说明
             };
             // 责任人查询
-            Responsibleperson =  item.ResponsibleoNameptions.find(res => res.id == item.personResponsibleId)
+            Responsibleperson = item.ResponsibleoNameptions.find(
+              res => res.id == item.personResponsibleId
+            );
             if (form.value.groundlineType == '1') {
-              data.personResponsibleName = item.personResponsibleId; //责任人名称 
-              data.businessName = item.Processingoptions.find( res => res.value == item.businessId).label; //责任方
+              data.personResponsibleName = item.personResponsibleId; //责任人名称
+              data.businessName = item.Processingoptions.find(
+                res => res.value == item.businessId
+              ).label; //责任方
               data.businessId = item.businessId; //责任方id
             } else {
-              data.personResponsibleId = Responsibleperson?item.personResponsibleId:''; //责任人id
-              data.personResponsibleName = Responsibleperson? Responsibleperson.name:item.personResponsibleId; //责任人名称
-              data.businessName = item.Responsibleoptions.find( res => res.value == item.businessId).label; //责任方
+              data.personResponsibleId = Responsibleperson ? item.personResponsibleId : ''; //责任人id
+              data.personResponsibleName = Responsibleperson
+                ? Responsibleperson.name
+                : item.personResponsibleId; //责任人名称
+              data.businessName = item.Responsibleoptions.find(
+                res => res.value == item.businessId
+              ).label; //责任方
               data.businessId = item.businessId; //责任方id
             }
             // 如果是自定义责任人就删除ID
-            if(!data.personResponsibleId){
-              delete data.personResponsibleId
+            if (!data.personResponsibleId) {
+              delete data.personResponsibleId;
             }
             submitData['personResponsibleDTO'].push(data);
           });
@@ -1583,7 +1592,7 @@ const onSubmit = () => {
       }
 
       // 图片处理
-      if (   
+      if (
         form.value.fileList.length &&
         (form.value.basis.workOrderType == '1' || form.value.basis.workOrderType == '3')
       ) {
@@ -1607,46 +1616,52 @@ const onSubmit = () => {
           processingMoneyEntityList: [],
         };
         let PlayName = []; //赔付方式名称
-        form.value.Claimamount.forEach(item => {
-          PlayName.push(item.Paymentmethod.find(res => res.value == item.compensationMethod).label);
-          submitData.aftersalesProcessingResultsDTO['processingMoneyEntityList'].push({
-            compensationMethodName: item.Paymentmethod.find(
-              res => res.value == item.compensationMethod
-            ).label, //支付方式名称
-            compensationMethod: item.compensationMethod, //支付方式value
-            compensationTime: item.compensationTime, //支付时间
-            money: item.money, //支付金额
-            paymentUnit: item.paymentUnit, //支付单位
-            resultName: item.title, //处理结果方式  下补单
-            resultType: Processingresultsoptions.value.find(res => res.label == item.title).value, //处理结果方式 value
-            typesOf: 1, //固定参数
+        if (form.value.Claimamount.length) {
+          form.value.Claimamount.forEach(item => {
+           let resultTypeValue =  Processingresultsoptions.value.find(res => res.label == item.title).value
+            if(item.compensationMethod){
+              PlayName.push(
+              item.Paymentmethod.find(res => res.value == item.compensationMethod).label
+            );
+            }
+            submitData.aftersalesProcessingResultsDTO['processingMoneyEntityList'].push({
+              compensationMethodName: item.Paymentmethod.find(
+                res => res.value == item.compensationMethod
+              ).label, //支付方式名称
+              compensationMethod:item.compensationMethod, //支付方式value
+              compensationTime:item.compensationTime, //支付时间
+              money:item.money, //支付金额
+              paymentUnit:item.paymentUnit, //支付单位
+              resultName:item.title, //处理结果方式  下补单
+              resultType:ProcessingresultsoptiTons.value.find(res => res.label == item.title).value, //处理结果方式 value
+              resultType:resultTypeValue?resultypeValue.value:null, //处理结果方式 value
+              typesOf: 1, //固定参数
+            });
           });
-        });
-        submitData.aftersalesProcessingResultsDTO.resultType = form.value.Claimamount.map(
-          res => res.title
-        ).join(','); //处理结果名称
+          submitData.aftersalesProcessingResultsDTO.resultType = form.value.Claimamount.map(
+            res => res.title
+          ).join(','); //处理结果名称
 
-        let filteredArray = form.value.Claimamount.map(res => res.money); //金额总和
+          let filteredArray = form.value.Claimamount.map(res => res.money); //金额总和
 
-        submitData.aftersalesProcessingResultsDTO.money = filteredArray.reduce(
-          (accumulator, currentValue) => accumulator + currentValue,
-          0
-        );
-        // 支付方式名称
-        submitData.aftersalesProcessingResultsDTO.compensationMethod = PlayName.join(',');
-        submitData.aftersalesProcessingResultsDTO.resultDescription =
-          form.value.basis.resultDescription; //处理结果说明
-        delete form.value.basis.resultDescription; //删除无用信息
-      } else {
-        delete submitData.result; //删除处理结果字段
+          submitData.aftersalesProcessingResultsDTO.money = filteredArray.reduce(
+            (accumulator, currentValue) => accumulator + currentValue,
+            0
+          );
+          // 支付方式名称
+          submitData.aftersalesProcessingResultsDTO.compensationMethod = PlayName.join(',');
+          submitData.aftersalesProcessingResultsDTO.resultDescription =
+            form.value.basis.resultDescription; //处理结果说明
+          delete form.value.basis.resultDescription; //删除无用信息
+        }
       }
 
       form.value.Pageloading = true; //关闭页面加载
-
       //是否直接提交到处理结果
       if (form.value.Processed) {
         submitData.workOrderStatus = 30;
       }
+      delete submitData.result; //删除处理结果字段  
       //移除责任方表单(必须)
       delete submitData.processor;
       console.log(submitData, '处理好的参数');
@@ -1674,7 +1689,7 @@ const onSubmit = () => {
                   title: 'aftersalesWorkOrder',
                   status: true,
                 });
-                $useStore.commit('Customer_Menu',0);//要刷新的菜单
+                $useStore.commit('Customer_Menu', 0); //要刷新的菜单
                 $useStore.commit('DEL_TAG_CURRENT'); //关闭当前页面
                 $router.push({
                   path: '/aftersales/aftersalesWorkOrder',
diff --git a/src/views/aftersales/aftersalesWorkOrderInfo.vue b/src/views/aftersales/aftersalesWorkOrderInfo.vue
index 285eb30e..d59eabe7 100644
--- a/src/views/aftersales/aftersalesWorkOrderInfo.vue
+++ b/src/views/aftersales/aftersalesWorkOrderInfo.vue
@@ -898,15 +898,15 @@ const PermissionButton = computed(() => {
   // else if ( $route.query.workOrderStatus != '21')return false
   // return true
   return {
-    reply:
-      !appeal.value &&
-      $route.query.workOrderStatus != '80' &&
-      $route.query.workOrderStatus != '30' &&
-      $route.query.workOrderStatus != '20' &&
-      $route.query.workOrderStatus != '40' && 
-      $route.query.workOrderStatus != '100' &&
-      $route.query.workOrderStatus != '110'
-      , //回复
+    
+    // !appeal.value &&
+    //   $route.query.workOrderStatus != '80' &&
+    //   $route.query.workOrderStatus != '30' &&
+    //   $route.query.workOrderStatus != '20' &&
+    //   $route.query.workOrderStatus != '40' && 
+    //   $route.query.workOrderStatus != '100' &&
+    //   $route.query.workOrderStatus != '110'
+    reply:true, //回复
     Processing_results:
       !appeal.value &&
       (($route.query.RouteIndexs == '0' && $route.query.workOrderStatus == '10') ||
@@ -967,7 +967,7 @@ const Chathistory = res => {
     .then(res => {
       MessageContent.value = []; //先清空内容，防止内容重复叠加
       res.data.data.surveyRecordEntities.forEach(item => {
-        MessageContent.value.unshift({
+        MessageContent.value.push({
           time: item.createTime, //时间
           content: item.processingResults, //消息内容
           name: item.addDepartment, //营业部名称
@@ -1285,7 +1285,6 @@ const addireply = () => {
       name: $route.query.workOrderNumber + '-回复',
       businessId: $route.query.workOrderNumber,
       RouterState: 'determine',
-      index: '0',
       workOrderStatus: $route.query.workOrderStatus, //工单状态
     },
   });
@@ -1299,9 +1298,8 @@ const addingRecord = () => {
       id: $route.query.id,
       name: $route.query.workOrderNumber + '-添加异常记录',
       businessId: $route.query.workOrderNumber,
-      RouteIndexs: $route.query.RouteIndexs,
-      RouterState: 'record',
-      index: '1',
+      RouteIndexs: $route.query.RouteIndexs,//当前菜单
+      RouterState: 'determine',
     },
   });
 };
diff --git a/src/views/aftersales/aftersalesWorkOrderend.vue b/src/views/aftersales/aftersalesWorkOrderend.vue
index 84cfc566..fe077821 100644
--- a/src/views/aftersales/aftersalesWorkOrderend.vue
+++ b/src/views/aftersales/aftersalesWorkOrderend.vue
@@ -323,8 +323,7 @@
               </div>
             </el-tab-pane>
           </el-tabs>
-          <!-- 完善信息 -->
-
+          <!-- 处理结果 -->
           <div class="Improveinformation">
             <div class="selector">
               <div class="el-form-item selector">
@@ -338,8 +337,9 @@
                       :reserve-keyword="false"
                       placeholder="请选择处理结果"
                       @change="changeProcessingResults"
-                      :disabled="$route.query.RouteIndexs == '0' || $route.query.RouteIndexs == '2'"
                     >
+                    
+                    <!-- :disabled="$route.query.RouteIndexs == '0' || $route.query.RouteIndexs == '2'" -->
                       <el-option
                         v-for="item in ProcessingResults"
                         :key="item.dictKey"
@@ -416,8 +416,9 @@
                           clearable
                           :autosize="{ minRows: 3, maxRows: 4 }"
                           type="textarea"
-                          :disabled="$route.query.RouteIndexs == '0' || $route.query.RouteIndexs == '2'"
                         />
+                        
+                        <!-- :disabled="$route.query.RouteIndexs == '0' || $route.query.RouteIndexs == '2'" -->
                       </el-form-item>
                       <div class="el_tool">
                         <span>总金额:{{ TotalClaimAmount }}元</span>
@@ -593,21 +594,21 @@
 
           <div class="el_sub">
             <el-button
-              v-if="$route.query.RouteIndexs != '0' &&  $route.query.RouterState == 'end'"
+              v-if="Completepermissions" 
               type="primary"
               class="button"
               @click="submitCompletion"
               >完结提交</el-button
             >
             <el-button
-              v-if="$route.query.RouteIndexs != '0' && $route.query.RouterState == 'record'"
+              v-if="$route.query.RouteIndexs != '0' && $route.query.RouterState == 'determine'"
               type="primary"
               class="button"
               @click="submitresults(1)"
               >处理结果提交</el-button
             >
             <el-button
-              v-if="$route.query.RouteIndexs != '0' && $route.query.RouterState == 'record'"
+              v-if="$route.query.RouteIndexs != '0' && $route.query.RouterState == 'determine'"
               type="primary"
               class="button"
               @click="submitresults(2)"
@@ -628,13 +629,13 @@
               @click="CustomerServiceCompleted"
               >客服完结完结</el-button
             >
-            <el-button
+            <!-- <el-button
               v-if="$route.query.RouteIndexs == '0' && $route.query.workOrderStatus != '21'"
               type="primary"
               class="button"
               @click="ElProcessingResults"
               >处理结果</el-button
-            >
+            > -->
           </div>
         </el-form>
       </div>
@@ -811,7 +812,7 @@
                       @input="appoint(Msgtextarea)"
                     />
                     <div class="msgHf">
-                      <el-button type="primary" @click="replyMessageEnd()"> 结束回复 </el-button>
+                      <!-- <el-button type="primary" @click="replyMessageEnd()"> 结束回复 </el-button> -->
                       <el-button type="primary" @click="replyMessage()"> 回复 </el-button>
                     </div>
                   </div>
@@ -1407,7 +1408,7 @@ const Fileidentifier = val => {
 // 聊天记录获取
 const Chathistory = res => {
   Msgloading.value = true; //开启加载效果
-  MessageResponsibility.value = []; //清空选择内容
+  MessageResponsibility.value = JSON.parse(JSON.stringify(MessageResponsibility.value)); //清空选择内容
   Msgtextarea.value = ''; //清空输入框消息
   let filetype = ''; //文件类型
   MessageContent.value = []; //先清空内容，防止内容重复叠加
@@ -1803,6 +1804,22 @@ const ProportionInput = val => {
   companyProportion.value = sum;
   console.log(sum, '公司占比');
 };
+// 完结提交按钮权限
+const Completepermissions =computed(()=>{
+  if(UserPermissions.value != '仓库客服'){
+    if( $route.query.RouteIndexs != '0'){
+    if($route.query.RouterState == 'end'){
+      return true
+    }else{
+      return false
+    }
+  }else{
+    return false
+  }
+  }else{
+    return false
+  }
+})
 
 // 财务处理
 const accountingBtn = item => {
@@ -2071,7 +2088,7 @@ const submitresults = async value => {
             AddressClosed('/aftersales/aftersalesWorkOrderend'); //删除当前页面
           }
         })
-        .catch(res => {
+        .catch(error => {
           console.log(error, 'error');
         })
         .finally(res => {
@@ -2629,8 +2646,8 @@ const ElProcessingResults = () => {
       id: $route.query.id,
       name: $route.query.businessId + '-添加异常记录',
       businessId: $route.query.workOrderNumber,
-      RouterState: 'record',
-      index: '1',
+      RouterState: 'determine',
+      RouteIndexs: $route.query.RouteIndexs,
     },
   });
   $useStore.commit('DEL_TAG_CURRENT');
@@ -2645,6 +2662,7 @@ const CustomerServiceCompleted = () => {
       businessId: $route.query.businessId,
       warehouseId: $route.query.warehouseId ? $route.query.warehouseId : '',
       workOrderNumber: $route.query.workOrderNumber,
+      RouteIndexs: $route.query.RouteIndexs,
       RouterState: 'Kfend',
       index: '1',
     },
diff --git a/src/views/aftersales/aftersalesWorkOrdermodifyTemp.vue b/src/views/aftersales/aftersalesWorkOrdermodifyTemp.vue
index c9ddd1c1..297c7ae5 100644
--- a/src/views/aftersales/aftersalesWorkOrdermodifyTemp.vue
+++ b/src/views/aftersales/aftersalesWorkOrdermodifyTemp.vue
@@ -634,18 +634,71 @@
         >
           <el-tab-pane label="完结信息" name="0">
             <div class="el-ckbtn">
+              <div class="Compensationamount"> 
                 <el-button type="primary" @click="AddCompensation">添加赔款方</el-button>
+                <span>{{CompensationNum}}</span>
+              </div>
+              <div class="Compensationamount">
                 <el-button type="primary" @click="AddPayee">添加受款方</el-button>
+                <span>{{PayeeNum}}</span>
+              </div>
             </div>
+            <template v-for="(item, index) in form.completion" :key="index">
+              <div class="el_left"> 
 
+            
+              <div class="el_compItem">
+                <span class="title" :style="{ color: !item.state ? '#000' : '#F56C6C' }"
+                  >{{ item.state ? '受款方' : '赔款方' }}
+                </span>
 
+                <el-form-item label="仓库">
+                  <el-select
+                    v-model="item.warehouseId"
+                    placeholder="请选择仓库"
+                    style="width: 100%"
+                    clearable
+                  >
+                    <el-option
+                      v-for="item in item.warehouse"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item.value"
+                    />
+                  </el-select>
+                </el-form-item>
+                <el-form-item label="原因" class="reason">
+                  <el-input v-model="item.reason" placeholder="请填写原因" clearable />
+                </el-form-item>
 
-          </el-tab-pane>
-        </el-tabs>
-
+                <el-form-item label="金额">
+                  <el-input-number
+                    v-model="item.money"
+                    :min="0"
+                    :max="9999999"
+                    :controls="false"
+                    :value-on-clear="0"
+                  />
+                </el-form-item>
 
+                <el-form-item label="责任人" v-if="!item.state">
+                  <el-input
+                    v-model="item.compensationPersonnel"
+                    placeholder="请填写责任人"
+                    clearable
+                  />
+                </el-form-item>
+              </div>
 
+            <div class="el_left_btn">
+              <el-button type="primary" @click="Compremove(item,index)" v-if="item.button">移除</el-button>
+            </div>
 
+            </div>
+        
+            </template>
+          </el-tab-pane>
+        </el-tabs>
 
         <!-- 照片上传 -->
         <el-tabs
@@ -785,14 +838,25 @@ const form = ref({
   deliver: [], //配送车次号
   //   理赔金额
   Claimamount: [],
-  Completion:[{
-    state:0,//赔款方
-    warehouseId:'',//仓库
-    reason:'',//原因
-    money:0,//金额
-    compensationPersonnel:'',//责任人
-    
-  }],//完结循环列表
+  completion: [
+    {
+      state: 0, //赔款方
+      warehouseId: '', //仓库
+      warehouse: [], //仓库列表
+      reason: '', //原因
+      money: 0, //金额
+      compensationPersonnel: '', //责任人
+      button:false,//按钮不可移除
+    },
+    {
+      state: 1, //受款方
+      warehouseId: '', //仓库
+      warehouse: [], //仓库列表
+      reason: '', //原因
+      money: 0, //金额
+      button:false,//按钮不可移除
+    },
+  ], //完结循环列表
   fileList: [], //照片
 });
 const myData = ref({}); //用户信息记录
@@ -994,16 +1058,16 @@ const getPageData = async () => {
       }
       //  内部责任划分
       if (pageData.personResponsibleVOS && pageData.personResponsibleVOS.length) {
-        form.value.responsibilitiesList=[];//清空初始值
+        form.value.responsibilitiesList = []; //清空初始值
         pageData.personResponsibleVOS.forEach(item => {
           let data = {
-            businessId:item.businessId, //责任方
-            personResponsibleId:item.personResponsibleId, //责任人
-            responsibilityRatio:Number(item.responsibilityRatio), //占比
+            businessId: item.businessId, //责任方
+            personResponsibleId: item.personResponsibleId, //责任人
+            responsibilityRatio: Number(item.responsibilityRatio), //占比
             description: item.description, //说明
             tripartite: item.tripartite, //责任人
             ProportionMax: 100, //最大值校验
-            valueId:item.id,
+            valueId: item.id,
             Processingoptions: [
               //提货责任方列表
               ...ResponsibleParty.value,
@@ -1014,9 +1078,9 @@ const getPageData = async () => {
             ],
             ResponsibleoNameptions: [
               {
-                name: item. personResponsibleName,
+                name: item.personResponsibleName,
                 id: item.personResponsibleId,
-              }
+              },
               // 责任人列表
             ],
             id: form.value.responsibilitiesList.length + 1,
@@ -1516,6 +1580,88 @@ const allFieldsFilled = computed(() => {
   form.value.Processed = allFilled;
   return allFilled;
 });
+
+
+
+// 配款方数量
+const CompensationNum=computed(()=>{
+let sum = form.value.completion.filter(res=>{
+    return !res.state
+  })
+return sum.length
+})
+
+// 受款方数量
+const PayeeNum=computed(()=>{
+let sum = form.value.completion.filter(res=>{
+    return res.state
+  })
+return sum.length
+})
+// 添加赔款方
+const AddCompensation = () => {
+  let data = {
+    state: 0, //赔款方
+    warehouseId: '', //仓库
+    warehouse: [...Processingoptions.value], //仓库列表
+    reason: '', //原因
+    money: 0, //金额
+    compensationPersonnel: '', //责任人
+    button:true,//按钮可移除
+  };
+  form.value.completion.splice(
+    form.value.completion.map(item => item.state).lastIndexOf(0) + 1,
+    0,
+    data
+  );
+};
+// 添加受款方
+const AddPayee = () => {
+  let data = {
+    state: 1, //受款方
+    warehouseId: '', //仓库
+    warehouse: [...Processingoptions.value], //仓库列表
+    reason: '', //原因
+    money: 0, //金额
+    compensationPersonnel: '', //责任人
+    button:true,//按钮可移除
+  };
+  form.value.completion.splice(
+    form.value.completion.map(item => item.state).lastIndexOf(1) + 1,
+    0,
+    data
+  );
+};
+
+// 完结信息移除
+const Compremove=(item,index)=>{
+  console.log(item,'item');
+  console.log(index,'index');
+  const cleanedItem = item.state?'受款方':'赔款方';
+  // 尝试使用 HTML 字符串
+  const message = `是否移除当前<span style="color: red; font-weight: bold">${cleanedItem}</span>?`;
+  ElMessageBox.confirm(
+    message,
+    '提示',
+    {
+      dangerouslyUseHTMLString: true, // 如果组件支持，启用此选项以解析 HTML
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    }
+  )
+    .then(() => {
+      form.value.completion.splice(index, 1);
+    })
+    .catch(() => {
+    
+    })
+
+
+
+}
+
+
 // 提交
 const onSubmit = () => {
   console.log(form.value);
@@ -1557,54 +1703,26 @@ const onSubmit = () => {
     }).then(async () => {
       form.value.Pageloading = true; //开启页面加载
 
-  let DataSubmit = {
-    packageEntityList: [], //新增的包件信息
-    unPpackageEntityList: [], //取消的包件ID
-    processorEntityList: [], //新增处理方
-    decreaseImageEntityList: [], //损货图片
-    unProcessorEntityList: [], //取消的处理方
-    unDecreaseImageEntityList: [], //取消的损货图片
-    completionRecipientEntities: [], //异常工单完结受款方(完成暂不可修改)
-    completionRecordEntities: [], //异常工单完结赔款方(完成暂不可修改)
-    aftersalesProcessingResultsDTO: {}, //处理结果（完成暂不可修改）
-    personResponsibleDTO: [], //添加预计责任人
-    unPersonResponsibleDTO: [], //取消预计责任人
-    surveyRecordDTO: {}, //调查经过
-    unCompletionRecipientEntities: [], //取消异常工单完结处理结果受款方
-    unCompletionRecordEntities: [], //取消异常工单完结的赔款方
-  };
-  //要修改的工单ID
-  DataSubmit.id = $route.query.id; 
-
-
-
-
-return 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+      let DataSubmit = {
+        packageEntityList: [], //新增的包件信息
+        unPpackageEntityList: [], //取消的包件ID
+        processorEntityList: [], //新增处理方
+        decreaseImageEntityList: [], //损货图片
+        unProcessorEntityList: [], //取消的处理方
+        unDecreaseImageEntityList: [], //取消的损货图片
+        completionRecipientEntities: [], //异常工单完结受款方(完成暂不可修改)
+        completionRecordEntities: [], //异常工单完结赔款方(完成暂不可修改)
+        aftersalesProcessingResultsDTO: {}, //处理结果（完成暂不可修改）
+        personResponsibleDTO: [], //添加预计责任人
+        unPersonResponsibleDTO: [], //取消预计责任人
+        surveyRecordDTO: {}, //调查经过
+        unCompletionRecipientEntities: [], //取消异常工单完结处理结果受款方
+        unCompletionRecordEntities: [], //取消异常工单完结的赔款方
+      };
+      //要修改的工单ID
+      DataSubmit.id = $route.query.id;
 
+      return;
 
       let submitData = {
         ...form.value.basis,
@@ -1784,6 +1902,8 @@ return
 const TabactiveClick = (a, b) => {
   console.log(a, b);
 };
+
+
 </script>
 
 <style scoped lang="scss">
@@ -2099,9 +2219,66 @@ const TabactiveClick = (a, b) => {
   left: 12%;
   top: 10%;
 }
-:deep(.Completioninformation){
-  .is-active{
+.el-ckbtn {
+  display: flex;
+  align-items: center;
+  margin-bottom: 16px;
+  margin-top: 20px;
+  .Compensationamount{
+    position: relative;
+    margin-right: 20px;
+    span{
+    position: absolute;
+    top: -8px;
+    right: -8px;
+    width: 24px;
+    height: 24px;
+    background-color: #f00;
+    color: #fff;
+    border-radius: 50%;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    font-size: 14px;
+      
+    }
+  }
+
+}
+:deep(.Completioninformation) {
+  .is-active {
     font-weight: bold;
   }
+  .el_compItem {
+    width: 80%;
+    display: flex;
+    align-items: baseline;
+
+    .el-form-item {
+      display: flex;
+      align-items: baseline;
+      margin-right: 12px;
+      width:16%;
+      .el-input-number {
+        width: 100%;
+      }
+    }
+    .reason {
+      width:36%;
+    }
+    .title {
+      width: 8%;
+      font-weight: bold;
+      .el-form-item__label {
+        font-size: 14px;
+      }
+    }
+  }
+  .el_left{
+    display: flex;
+    .el_left_btn{
+      flex: 1;
+    }
+  }
 }
 </style>
diff --git a/src/views/distribution/inventory/distributionStockListDetails.vue b/src/views/distribution/inventory/distributionStockListDetails.vue
index d1cc71e6..2e5d2207 100644
--- a/src/views/distribution/inventory/distributionStockListDetails.vue
+++ b/src/views/distribution/inventory/distributionStockListDetails.vue
@@ -93,6 +93,7 @@
         >
           <el-tab-pane label="库位库存品" name="library">
             <tablecmt
+              class="tableNode"
               :columnList="columnListarrs.column"
               :tableData="data"
               :loading="loading"
@@ -123,6 +124,7 @@
           </el-tab-pane>
           <el-tab-pane label="出库明细" name="outbound">
             <tablecmt
+            class="tableNode"
               :columnList="columnListarrs.columnDetails"
               :tableData="data1"
               :loading="loading"
@@ -155,6 +157,7 @@
               >导 出</el-button
             >
             <tablecmt
+            class="tableNode"
               :columnList="columnListarrs.columnWarehousing"
               :tableData="data2"
               :loading="loading"
@@ -201,6 +204,7 @@
               >导 出</el-button
             > -->
             <tablecmt
+            class="tableNode"
               :columnList="columnListarrs.columnUnpacking"
               :tableData="data3"
               :loading="loading"
@@ -320,7 +324,7 @@ import option from '@/option/distribution/distributionStockList';
 import { mapGetters } from 'vuex';
 import { getListStock } from '@/api/distribution/distributionStock';
 import { getStockListInfoList } from '@/api/distribution/distributionStockListInfo';
-import { downloadXls } from '@/utils/util';
+import { downloadXls,setNodeHeight} from '@/utils/util';
 import { ElMessage, ElMessageBox } from 'element-plus';
 export default {
   data() {
@@ -332,15 +336,21 @@ export default {
       columnListarrs: {
         //入库明细
         columnWarehousing: [
-          // {
-          //   prop: '',
-          //   label: '序号',
-          //   type: 0,
-          //   values: '',
-          //   width: 55,
-          //   checkarr: [],
-          //   fixed: true,
-          // },
+          {
+            prop: '',
+            label: '复选框',
+            type: 0,
+            width: 55,
+            fixed: true,
+          },
+          {
+            prop: '',
+            label: '序号',
+            type: 12,
+            values: '', 
+            width: 55,
+            fixed: true,
+          },
           {
             prop: 'createTime',
             label: '入库时间',
@@ -439,6 +449,7 @@ export default {
             fixed: false,
             sortable: true,
             head: false,
+            isshowSummary: true,
           },
           {
             prop: 'storageLocation',
@@ -466,7 +477,21 @@ export default {
         // 拆包明细
         columnUnpacking:[
    
-
+        {
+            prop: '',
+            label: '复选框',
+            type: 0,
+            width: 30,
+            fixed: true,
+          },
+          {
+            prop: '',
+            label: '序号',
+            type: 12,
+            values: '', 
+            width: 60,
+            fixed: true,
+          },
           {
             prop: 'unpackUser',
             label: '拆包操作人',
@@ -499,6 +524,7 @@ export default {
             fixed: true,
             sortable: true,
             head: false,
+            isshowSummary: true,
           },
           {
             prop: 'marketName',
@@ -567,6 +593,22 @@ export default {
           //   fixed: true,
           // },
           {
+    prop: '',
+    label: '复选框',
+    type: 0,
+    width: 20,
+    fixed: true,
+  },
+  {
+    prop: '',
+    label: '序号',
+    type: 12,
+    values: '', 
+    width: 30,
+    fixed: true,
+  },
+
+          {
             prop: 'allocationTitle',
             label: '货位',
             type: 2,
@@ -620,6 +662,7 @@ export default {
             fixed: false,
             sortable: true,
             head: false,
+            isshowSummary: true,
           },
           {
             prop: 'cargoUnit',
@@ -654,6 +697,21 @@ export default {
           //   checkarr: [],
           //   fixed: true,
           // },
+          {
+              prop: '',
+              label: '复选框',
+              type: 0,
+              width: 30,
+              fixed: true,
+            },
+            {
+              prop: '',
+              label: '序号',
+             type: 12,
+              values: '', 
+              width: 60,
+             fixed: true,
+           },
           {
             prop: 'outboundTypeName',
             label: '出库类型',
@@ -730,6 +788,7 @@ export default {
             fixed: false,
             sortable: true,
             head: false,
+            isshowSummary: true,
           },
         ],
       },
@@ -936,6 +995,8 @@ export default {
         // this.getOnChai(this.page2);
         this.getunpacking(this.page3)
       }
+      const _node = document.querySelectorAll('.tableNode');
+  setNodeHeight(_node, '', true);
     },
     // 查询拆包
     getunpacking(page){