Merge branch 'dev' into pre-production

src/views/aftersales/aftersalesWorkOrder.vue

@@ -232,6 +232,16 @@
                           @click="Resultediting(slotProps.scope)"
                           >编辑</el-button
                         >
+
+
+                             <!-- 处理完毕 处理结果编辑 -->
+                        <el-button
+                          v-if="TabPermissions == '2' && UserPermissions == '仓库客服'"
+                          @click="ProcessedResultediting(slotProps.scope)"
+                          >编辑</el-button
+                        >
+
+
                         <!-- 理赔金额确定 -->
                         <el-button
                           v-if="TabPermissions == '4' && UserPermissions == '仓库客服'"
@@ -1731,7 +1741,7 @@ const Resultediting = val => {
     query: {
       id: val.row.lawoId,
       subId: val.row.laprId,
-      name: val.row.workOrderNumber + '-理赔金额未出编辑',
+      name: val.row.workOrderNumber + '-处理结果编辑',
       businessId: val.row.businessId,
       warehouseId: val.row.warehouseId,
       workOrderNumber: val.row.workOrderNumber,
@@ -1741,7 +1751,25 @@ const Resultediting = val => {
     },
   });
 };
-
+const ProcessedResultediting=(val)=>{
+console.log(val,'参数');
+  // return
+  $router.push({
+    path: '/aftersales/aftersalesWorkOrdermodify',
+    query: {
+      id: val.row.id,
+      subId: val.row.id,
+      name: val.row.workOrderNumber + '-处理结果编辑',
+      businessId: val.row.businessId,
+      warehouseId: val.row.warehouseId,
+      workOrderNumber: val.row.workOrderNumber,
+      RouterState: 'Kfend',
+      Processingresults: true, //处理结果编辑
+      Processed:'true',
+      index: '1',
+    },
+  });
+}
 // 工单申诉确认按钮
 const Appealbutton = state => {
   if (UserPermissions.value == '仓库客服') {

src/views/aftersales/aftersalesWorkOrderInfoTemp.vue

@@ -50,6 +50,12 @@
 
           <el-tabs type="border-card" class="PackageInformation">
             <el-tab-pane label="包件信息">
+              <template #label>
+              <span class="custom-tabs-label">
+                <el-icon><Box /></el-icon>
+                <span>包件信息</span>
+              </span>
+            </template>
               <div class="ResponsibilityBoxS">
                 <div class="el_btbox" v-for="(item, index) in PackageInfo" :key="index">
                   <div class="leftbox">
@@ -280,7 +286,13 @@
           <el-form-item v-if="isShowFormItem2"> </el-form-item>
 
           <el-tabs type="border-card" class="el_nint">
-            <el-tab-pane label="内部责任划分">
+            <el-tab-pane>
+              <template #label>
+              <span class="custom-tabs-label">
+                <el-icon><List /></el-icon>
+                <span>内部责任划分</span>
+              </span>
+            </template>
               <div class="ResponsibilityBox">
                 <div class="el_btbox" v-for="(item, index) in FangAddList" :key="index">
                   <div class="leftbox">
@@ -382,7 +394,13 @@
           </el-tabs>
         </el-form>
         <el-tabs type="border-card" class="el_Processingresults">
-          <el-tab-pane label="处理结果">
+          <el-tab-pane>
+            <template #label>
+              <span class="custom-tabs-label">
+                <el-icon><EditPen /></el-icon>
+                <span>处理结果</span>
+              </span>
+            </template>
             <div class="selector">
               <el-select
                 v-model="Indexform.result"
@@ -391,6 +409,7 @@
                 default-first-option
                 :reserve-keyword="false"
                 placeholder="请选择处理结果"
+                disabled
               >
                 <el-option
                   v-for="item in ProcessingResults"
@@ -405,11 +424,10 @@
               <div class="title">处理结果-理赔金额</div>
               <div class="Listadmiration">
                 <div class="name" v-for="(item, index) in ProcessingList" :key="index">
-                  
                   <div class="payment_right">
                     <div class="el_titleName">
                       <span>{{ item.name }}</span>
-                    <el-input class="money" v-model="item.input" />
+                      <el-input disabled class="money" v-model="item.input" />
                     </div>
                     <div class="el_titleName">
                       <span>支付方式</span>
@@ -421,7 +439,7 @@
                     <div class="el_titleName">
                       <span>支付单位</span>
                       <div class="el_PaymentUnit">
-                        <el-input v-model="item.paymentUnit" placeholder="支付单位" />
+                        <el-input disabled v-model="item.paymentUnit" placeholder="支付单位" />
                       </div>
                     </div>
 
@@ -433,6 +451,7 @@
                         format="YYYY-MM-DD"
                         value-format="YYYY-MM-DD HH:mm:ss"
                         placeholder="理赔支付时间"
+                        disabled
                       />
                     </div>
                   </div>
@@ -440,8 +459,87 @@
               </div>
 
               <div class="el_tool">
-                <span>总金额:{{ TotalClaimAmount }}</span>
+                <span>总金额:{{ TotalClaimAmount }}元</span>
+              </div>
+            </div>
+          </el-tab-pane>
+        </el-tabs>
+
+        <!-- 完结信息 -->
+        <el-tabs
+          type="border-card"
+          class="demo-tabs el-endtabs"
+          v-if="UserPermissions != '仓库客服'"
+        >
+          <el-tab-pane>
+            <template #label>
+              <span class="custom-tabs-label">
+                <el-icon><calendar /></el-icon>
+                <span>完结信息</span>
+              </span>
+            </template>
+
+            <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
+                >
+              </div>
+
+              <div class="el_pkLi">
+                <div class="sk_input">
+                  <el-input
+                    v-model="item.name"
+                    :placeholder="item.state == 0 ? '暂无赔款方' : '暂无受款方'"
+                    disabled
+                  />
+                </div>
+                <div class="sk_input">
+                  <el-input v-model="item.reason" placeholder="暂无原因" disabled />
+                </div>
+                <div class="sk_input">
+                  <el-input
+                    @input="amountMoney"
+                    :min="0"
+                    v-model="item.num"
+                    placeholder="金额"
+                    disabled
+                  />
+                </div>
+                <!-- 赔款方是那个仓库的 -->
+                <div class="sk_input" v-if="item.state == 0">
+                  <el-select v-model="item.warehouseId" disabled filterable 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 == 1"></div>
+                <!-- 责任人  -->
+                <div class="sk_input" v-if="item.state == 0">
+                  <el-input
+                    v-model="item.compensationPersonnel"
+                    placeholder="暂无责任人"
+                    clearable
+                    :rows="2"
+                    disabled
+                  />
+                </div>
+
+                <div class="sk_input" v-if="item.state == 1"></div>
+              </div>
             </div>
+            <div class="paySum">
+              <span>
+                <el-icon><Coin /></el-icon>赔款金额总和:<b>{{ TotalamountCompensation }}</b></span
+              >
+              <span>
+                <el-icon><Coin /></el-icon>受款金额总和:<b>{{ TotalamountReceived }}</b></span
+              >
             </div>
           </el-tab-pane>
         </el-tabs>
@@ -666,6 +764,31 @@ const msgHight = ref(100); //聊天框消息高度
 const msgTop = ref(0); //调查记录距离页面吸顶记录
 const msgState = ref(0);
 const Msgloading = ref(false);
+const TotalamountCompensation = ref(0); //赔款总金额
+const TotalamountReceived = ref(0); //受款总金额
+const CompensationParty = ref([
+  {
+    name: '',
+    state: 0,
+    num: null,
+    reason: '',
+    cld: 1,
+    warehouseId: null,
+    compensationPersonnel: '',
+  }, //赔款方
+  // explains: ''
+  {
+    name: '',
+    state: 1,
+    num: null,
+    reason: '',
+    cld: 1,
+    warehouseId: null,
+    compensationPersonnel: '',
+  }, //受款方
+  // explains: ''
+]); //收/赔
+
 // =======
 
 const PackageInfo = ref([
@@ -946,7 +1069,7 @@ const onLoad = () => {
           item => {
             Indexform.value.result.push(item.resultType);
             return {
-              input: item.money,
+              input: item.money + '元',
               min: 0,
               max: 9999999999999999999999999999,
               state: item.resultType,
@@ -994,6 +1117,8 @@ const onLoad = () => {
             cld: index + 1,
             id: item.id,
             accounting: item.accounting ? item.accounting : '',
+            warehouseId: item.warehouseId, //仓库
+            compensationPersonnel: item.compensationPersonnel, //责任人
           });
         });
       }
@@ -1392,18 +1517,19 @@ const isShowFormItem2 = computed(() => {
         :deep(.el-input) {
           height: 100% !important;
         }
-        :deep(.money){
+        :deep(.money) {
           width: 100px;
         }
       }
       span {
-        display: block;
-        color: #606266;
+        color: #000000;
         font-size: 16px;
         margin-right: 8px;
         display: flex;
         align-items: center;
-        width: max-content;
+        justify-content: flex-end;
+        width: 80px;
+        margin-left: 10px;
       }
       .el_titleName {
         display: flex;
@@ -1475,8 +1601,8 @@ const isShowFormItem2 = computed(() => {
     font-size: 14px;
     border: 1px solid #ccc;
     padding: 4px 20px;
-    color: #30316e;
-    font-weight: normal;
+    color: #000000;
+    font-weight: 600;
   }
 }
 .el_nint {
@@ -1673,4 +1799,50 @@ const isShowFormItem2 = computed(() => {
   border-bottom: 1px solid #d5d5d563 !important;
   border-right: 1px solid #d5d5d563 !important;
 }
+.el-endtabs {
+  margin-top: 10px;
+}
+:deep(.custom-tabs-label) {
+  font-weight: bold;
+  display: flex;
+  align-items: center;
+  .el-icon{
+    margin-right: 4px;
+  }
+}
+.payanindemnity {
+  display: flex;
+  align-items: center;
+  margin-top: 20px;
+  justify-content: space-between;
+  .title {
+    width: max-content;
+    height: 100%;
+    display: flex;
+    display: block;
+    align-items: center;
+  }
+  .sk_input {
+    margin: 0 5px;
+    margin-left: 20px;
+    width: 20%;
+  }
+  .el-button {
+    border: none;
+  }
+  .el_pkLi {
+    display: flex;
+    width: 100%;
+  }
+}
+.paySum {
+  margin-top: 36px;
+  font-size: 14px;
+  display: flex;
+  span {
+    margin-right: 30px;
+    display: flex;
+    align-items: center;
+  }
+}
 </style>

src/views/aftersales/aftersalesWorkOrderend.vue

@@ -1,13 +1,13 @@
 <template>
   <el-card class="box-card">
-    <template #header>
+    <!-- <template #header>
       <div class="card-header">
         <span>{{
           $route.query.index == '0' ? '回复' : $route.query.index == '1' ? '新增记录' : '完结'
         }}</span>
-        <!-- <el-button class="button" v-if="$route.query.index=='1' || $route.query.index=='2'" @click="submit">提交</el-button> -->
+       
       </div>
-    </template>
+    </template> -->
 
     <div class="contemtMax">
       <div class="left">
@@ -587,7 +587,7 @@
               >客服仲裁完结</el-button
             >
             <el-button
-              v-if="$route.query.index == '0' && $route.query.workOrderStatus!='21'" 
+              v-if="$route.query.index == '0' && $route.query.workOrderStatus != '21'"
               type="primary"
               class="button"
               @click="ElProcessingResults"
@@ -1081,7 +1081,6 @@ const onLoad = () => {
     }
     console.log(UserPermissions.value, '当前角色权限');
     Chathistory(); //聊天的历史记录
-  });
 
     // 获取页面参数
     if ($route.query.id) {
@@ -1095,10 +1094,10 @@ const onLoad = () => {
         endFrom.value.processor = [];
         endFrom.value.packageImage = [];
         //图片处理回显
-      if(res.data.data.discoveryNode=='1'){
-      groundlineType.value = '1'
-    }else{
-      groundlineType.value = 'null'
+        if (res.data.data.discoveryNode == '1') {
+          groundlineType.value = '1';
+        } else {
+          groundlineType.value = 'null';
         }
         res.data.data.decreaseImageVOList.forEach(res => {
           amplifysrcList.value.push(res.imagePath);
@@ -1142,11 +1141,14 @@ const onLoad = () => {
           }
         });
         console.log(JSON.parse(localStorage.getItem('my_data')).id);
+        if (UserPermissions.value == '仓库客服') {
           MessageResponsibility.value.push(JSON.parse(localStorage.getItem('my_data')).id);
           MessageResponsibility.value = [...new Set(MessageResponsibility.value)]; //对回复方去重
           MessageResponsibility.value = MessageResponsibility.value.filter(
             item => item !== JSON.parse(localStorage.getItem('my_data')).id
           ); //过滤掉当前登录人的仓库
+        }
+
         console.log(endFrom.value.processor, ' endFrom.value.processor');
         getDictionaryBiz('pc_work_order').then(res => {
           //处理结果字典
@@ -1232,8 +1234,8 @@ const onLoad = () => {
               cld: index + 1,
               id: item.id,
               accounting: item.accounting ? item.accounting : '',
-            warehouseId:item.warehouseId,//仓库
-            compensationPersonnel:item.compensationPersonnel,//赔款人员
+              warehouseId: item.warehouseId, //仓库
+              compensationPersonnel: item.compensationPersonnel, //赔款人员
             });
           });
         }
@@ -1274,6 +1276,7 @@ const onLoad = () => {
         });
       });
     });
+  });
 };
 
 // 多开页面的时候刷新参数
@@ -1895,7 +1898,6 @@ const submit = () => {
     let data = {
       aftersalesProcessingResultsDTO: {
         // ...info,
-           
       },
       // processingMoneyEntityList: [], //赔付方式
     };
@@ -1908,7 +1910,7 @@ const submit = () => {
     }
     data.aftersalesProcessingResultsDTO.money = sum; //金额汇总
     // data.resultDescription=endFrom.value.resultDescription;//处理结果说明
-    data.aftersalesProcessingResultsDTO.resultDescription=endFrom.value.resultDescription;//处理结果说明
+    data.aftersalesProcessingResultsDTO.resultDescription = endFrom.value.resultDescription; //处理结果说明
     // data['compensationMethod'] = Paymentmethod.value.filter(
     //   item => item.dictKey == endFrom.value.compensationMethod
     // )[0].dictValue; //目前是单选

src/views/aftersales/aftersalesWorkOrdermodify.vue

@@ -418,7 +418,7 @@
       </div>
 
       <div class="el_tool">
-        <span>总金额:{{ TotalClaimAmount }}</span>
+        <span>总金额:{{ TotalClaimAmount }}元</span>
       </div>
 
     </div>
@@ -793,6 +793,7 @@ const dialogImgList = ref(false); //图片预览弹窗
 const amplifyurl = ref(''); //当前点击的图片
 const amplifysrcList = ref([]); //图片循环列表
 const Processingresults = ref(false); //理赔是否可以编辑
+const ProcessedId=ref(null);//处理完毕里面编辑的iD
 // ref 用于跟踪哪些字段被修改过
 // 当字段改变时标记它为已修改
 
@@ -1100,7 +1101,10 @@ const onLoad = () => {
         }
       );
     }
-
+    // 保存处理完毕的编辑ID
+    if(res.data.data.processingResultsVO.id){
+      ProcessedId.value  = res.data.data.processingResultsVO.id;
+    }
     // 总金额回显
     TotalClaimAmount.value = res.data.data.processingResultsVO.money;
     // 理赔支付时间
@@ -1342,58 +1346,37 @@ const TopChange = val => {
 };
 
 const changeProcessingResults = val => {
-  console.log(val,'当前点击的参数');
-  console.log(ProcessingList.value,'当前的列表');
-    // 首先删除取消的项目
-  console.log(val[val.length-1]);
-  ProcessingList.value = ProcessingList.value.filter(item => val.includes(item.state - 1));
-  // 然后添加或保持新的项目
-console.log(val,'当前状态');
-    console.log(num,'当前参数');
-     newItem = {
-      input: 0,
-      min: 0,
-      max: 9999999999999,
-      state: num,
-      payment: '',
-      text: '',
-      compensationTime: '',
-      paymentUnit: '',
-    };
 
-    // 根据num为newItem的name字段赋值
-    switch (num) {
-      case '1':
-        newItem.name = '下补单';
-        break;
-      case '2':
-        newItem.name = '维修/补漆';
-        break;
-      case '3':
-        newItem.name = '客户未要求理赔';
-        break;
-      case '4':
-        newItem.name = '用库存';
-        break;
-      case '5':
-        newItem.name = '赔商家';
-        break;
-      case '6':
-        newItem.name = '赔付运费';
-        break;
-      case '7':
-        newItem.name = '工厂考核';
-        break;
-      default:
-        return;
-    }
+ProcessingList.value = ProcessingList.value.filter(item => val.includes(item.state));
+  const nameMapping = {  
+  '1': '下补单',
+  '2': '维修/补漆',
+  '3': '客户未要求理赔',
+  '4': '用库存',
+  '5': '赔商家',
+  '6': '赔付运费',
+  '7': '工厂考核'
+};
     
-    // 如果列表中不存在则加入新项目
-    if (!ProcessingList.value.some(item => item.state === newItem.state)) {
-      ProcessingList.value.push(newItem);
-      console.log(`添加：${newItem.name}`);
+val.forEach(value => {
+  let existingItem = ProcessingList.value.find(item => item.state === value); 
+  // 如果s中不存在state为当前值的对象，则创建一个空对象并添加到s中
+  if (!existingItem) {
+    ProcessingList.value.push({
+          "input": 0,
+          "min": 0,
+          "state": value,
+          "payment": "",
+          "name": nameMapping[value] || "",
+          "text": "",
+          "compensationTime": "",
+          "paymentUnit": "",
+          "id": ""
+    });
+  } else {
+    existingItem.name = nameMapping[value] || "";
   }
- 
+});
 };
 
 // 支付方式选择
@@ -1875,12 +1858,15 @@ const Arbitrationcompleted = () => {
     // 理赔金额未出编辑
     // 处理结果编辑
     let data = {
-      id: $route.query.id,
+      id:$route.query.id,
       // workOrderId: $route.query.id, //异常工单ID
       resultDescription:Indexform.value.resultDescription,//处理结果说明
       aftersalesProcessingResultsDTO: {
+        assignList:[],//删除的处理结果ID
         resultDescription:Indexform.value.resultDescription,//处理结果说明
-        id:$route.query.subId,
+        id:$route.query.Processed?ProcessedId.value:$route.query.subId,
+        // $route.query.Processed?
+        // ProcessedId.value
       },
     };
     data.aftersalesProcessingResultsDTO['processingMoneyEntityList'] = ProcessingList.value

src/views/distribution/deliverylist/distributionDeliveryListedt.vue

@@ -3621,9 +3621,6 @@ export default {
       this.SignForPhotos = [];
      this.signBox = true;
      this.reservationId = row.id;
-
-
-
     },
     beforeOpen(done, type) {
       if (['edit', 'view'].includes(type)) {
@@ -3799,7 +3796,7 @@ export default {
     handlePrint(row) {
       console.log('this.deliverydata.type :>> ', this.deliverydata.type);
       const submitData = {
-        ids: row.id,
+        ids: row.deliveryId,
         type: this.deliverydata.type,
       };
       printBatch(submitData);
@@ -4089,6 +4086,27 @@ export default {
     },
     // 复核签收确认弹窗
     submitForm() {
+      if(!this.DoorstepPhoto.length){
+        ElMessage({
+        message: '至少上传一张上门照片',
+        type: 'warning',
+        })
+        return
+      }
+      if(!this.StackingPhoto.length){
+        ElMessage({
+        message: '至少上传一张对码照片',
+        type: 'warning',
+      })
+        return
+      }
+      if(!this.SignForPhotos.length){
+        ElMessage({
+        message: '至少上传一张签收照片',
+        type: 'warning',
+      })
+        return
+      }
       console.log(this.reservationId);
       console.log(this.CheckStore, '要处理的值');
       this.checkloading = true; //开启复核签收加载效果