From ddb48582d7bd1b20207fdbe07e66dc8aaf36ba2f Mon Sep 17 00:00:00 2001
From: xzg <4727863@qq.com>
Date: Tue, 2 Jan 2024 14:47:17 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=8D=E6=A0=B8=E6=96=B0=E5=A2=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/distribution/distributionSignfor.js   |  12 ++
 .../aftersales/aftersalesWorkOrderAdd.vue     |  18 +--
 .../aftersales/aftersalesWorkOrderend.vue     |  39 +++----
 .../signfor/distributionSignfortreat.vue      | 106 ++++++++++++------
 4 files changed, 100 insertions(+), 75 deletions(-)

diff --git a/src/api/distribution/distributionSignfor.js b/src/api/distribution/distributionSignfor.js
index 72ee35f1..cc8904d0 100644
--- a/src/api/distribution/distributionSignfor.js
+++ b/src/api/distribution/distributionSignfor.js
@@ -302,3 +302,15 @@ export const $_updateSignAddValuePackage = data => {
     data,
   });
 };
+
+
+
+
+
+export const $_isSignt = params => {
+  return request({
+    url: '/api/logpm-distribution/signfor/isSign',
+    method: 'get',
+    params,
+  });
+};
diff --git a/src/views/aftersales/aftersalesWorkOrderAdd.vue b/src/views/aftersales/aftersalesWorkOrderAdd.vue
index 26631ecf..6d7b198c 100644
--- a/src/views/aftersales/aftersalesWorkOrderAdd.vue
+++ b/src/views/aftersales/aftersalesWorkOrderAdd.vue
@@ -445,7 +445,7 @@
       </el-tab-pane>
     </el-tabs>
 
-    <el-tabs type="border-card">
+    <el-tabs type="border-card" class="el_Processingresults">
       <el-tab-pane label="处理结果">
         <div class="selector">
           <el-select
@@ -495,18 +495,7 @@
           <div class="el_tool">
             <span>总金额:{{ TotalClaimAmount }}</span>
           </div>
-          <!-- <el-divider>
-            <span class="ZFname">理赔支付时间</span>
-          </el-divider>
-          <div class="lptime">
-            <el-date-picker
-              v-model="Indexform.compensationTime"
-              type="datetime"
-              format="YYYY-MM-DD"
-              value-format="YYYY-MM-DD HH:mm:ss"
-              placeholder="请选择运理赔支付时间"
-            />
-          </div> -->
+
         </div>
       </el-tab-pane>
     </el-tabs>
@@ -1833,4 +1822,7 @@ const ViewPackageDetails = val => {
 .Paymentname:hover {
   border: 1px solid #172e60;
 }
+.el_Processingresults{
+  margin-top: 12px;
+}
 </style>
diff --git a/src/views/aftersales/aftersalesWorkOrderend.vue b/src/views/aftersales/aftersalesWorkOrderend.vue
index f068b9c9..27d1d37c 100644
--- a/src/views/aftersales/aftersalesWorkOrderend.vue
+++ b/src/views/aftersales/aftersalesWorkOrderend.vue
@@ -327,30 +327,14 @@
                   <div class="Paymentname" @click="PaymentSelection(item)">
                     {{ item.payment ? item.text : '支付方式' }}
                   </div>
+
+                  
                 </div>
               </div>
 
               <div class="el_tool">
                 <span>总金额:{{ TotalClaimAmount }}</span>
               </div>
-              <!-- <div class="ZFlptime">
-                 <span class="name">支付方式（此处单选）</span> 
-                 <el-radio-group v-model="endFrom.compensationMethod">
-            <el-radio :label="item.dictKey" v-for="item in Paymentmethod" :key="item.dictKey" size="large" border>{{
-              item.dictValue
-            }}</el-radio>
-          </el-radio-group> 
-                支付方式多选 
-                 <el-checkbox-group v-model="endFrom.compensationMethod">
-         
-            <el-checkbox
-              :label="item.dictValue"
-              border
-              v-for="item in Paymentmethod"
-              :key="item.dictKey"
-            />
-          </el-checkbox-group> 
-              </div> -->
 
               <el-divider>
                 <span class="ZFname">理赔支付时间</span>
@@ -1007,6 +991,7 @@ const onLoad = () => {
     routerState.value = $route.query.RouterState; //当前是新增记录
     console.log(routerState.value, '当前状态');
     $_getInfo({ id: $route.query.id }).then(res => {
+
       console.log(res, '回显返回值参数');
       endFrom.value = res.data.data;
       endFrom.value.result = [];
@@ -1056,20 +1041,16 @@ const onLoad = () => {
           res => res.dictKey == endFrom.value.workOrderType
         ).dictValue; //异常类型回显
       });
-
+ 
       //发现环节回显
       getDictionaryBiz('pc_discovery_node').then(res => {
+
         console.log(res, '发现环节');
-        // ProcessingResults.value = res.data.data;
         TransportlossList.value = res.data.data;
         console.log(TransportlossList.value, '处理好的发现环节');
-        // endFrom.discoveryNode
-      });
-      getDictionaryBiz('result_handling').then(res => {
-        console.log(res, '发现环节');
-        ProcessingResults.value = res.data.data;
       });
 
+
       // 公司占比回显计算
       let sum = 0;
       FangAddList.value.forEach(item => {
@@ -1148,6 +1129,12 @@ const onLoad = () => {
       console.log(res, '处理记录返回值');
       details.recorddata = res.data.data.surveyRecordEntities;
     });
+    getDictionaryBiz('result_handling').then(res => {
+        console.log(res, '处理结果');
+        ProcessingResults.value = res.data.data;
+      }); 
+
+
   }
 
   // 异常类型业务字典
@@ -1733,7 +1720,7 @@ const submit = () => {
               ? paymentMethodMatch.dictValue
               : '未知支付方式',
             resultName: item.name, //处理结果名字
-            
+
           };
         } else {
           return null;
diff --git a/src/views/distribution/signfor/distributionSignfortreat.vue b/src/views/distribution/signfor/distributionSignfortreat.vue
index 1e967eba..1df6fb26 100644
--- a/src/views/distribution/signfor/distributionSignfortreat.vue
+++ b/src/views/distribution/signfor/distributionSignfortreat.vue
@@ -191,7 +191,7 @@
 
             <template v-if="slotProps.scope.column.label === '操作'">
               <el-text size="small" @click="editsolt(slotProps.scope)">查 看</el-text>
-         
+
               <el-text
                 size="small"
                 v-if="slotProps.scope.row.isHaveAbnormalPackage === 2"
@@ -460,9 +460,7 @@
     :before-close="beforeClose"
     append-to-body
   >
-
     <el-table
-    
       ref="table"
       v-loading="Abnormalloading"
       @selection-change="selectionChange"
@@ -557,6 +555,7 @@ import {
   loadingAbnormalPackageListAuditing,
   getSignforExport,
   numberDetail,
+  $_isSignt,
 } from '@/api/distribution/distributionSignfor';
 import { update as updatesign } from '@/api/distribution/distributionSignfor';
 import option from '@/option/distribution/distributionSignfor';
@@ -566,12 +565,12 @@ import dayjs from 'dayjs';
 import { getDeliveryListExport } from '@/api/distribution/distributionDeliveryList';
 import { downloadXls } from '@/utils/util';
 import { getToken } from '@/utils/auth';
-import { ElMessage } from 'element-plus';
+import { ElMessage, ElMessageBox } from 'element-plus';
 export default {
   data() {
     return {
-      abnormalReview:'',//异常审核
-      Abnormalloading:false,//审核加载效果
+      abnormalReview: '', //异常审核
+      Abnormalloading: false, //审核加载效果
       dialogImageUrl: '', //图片放大地址
       dialogVisible: false, //图片状态
       dialogImageUrlA: '',
@@ -2071,7 +2070,7 @@ export default {
     },
     //审批异常装车包件
     auditing(row) {
-      this.Abnormalloading=true;
+      this.Abnormalloading = true;
       // const { row } = scope;
       console.log('----------->row', row);
       loadingAbnormalPackageListAuditing(row.id).then(res => {
@@ -2081,8 +2080,8 @@ export default {
             type: 'success',
             message: '操作成功!',
           });
-          this.Abnormalloading=false;
-          this.AbnormalreviewFn(this.abnormalReview);//审核完成更新数据
+          this.Abnormalloading = false;
+          this.AbnormalreviewFn(this.abnormalReview); //审核完成更新数据
         }
       });
     },
@@ -2090,7 +2089,7 @@ export default {
      * 一键审批
      */
     fastAuditing() {
-      this.Abnormalloading=true;//开启加载效果 
+      this.Abnormalloading = true; //开启加载效果
       console.log('this.wrapdata---------->', this.wrapdata);
       let ids = [];
       this.wrapdata.forEach(item => {
@@ -2103,18 +2102,18 @@ export default {
             type: 'success',
             message: '操作成功!',
           });
-         
-          this.abnormalBox = false;//关闭弹窗
-          this.Abnormalloading=false;//关闭加载效果
+
+          this.abnormalBox = false; //关闭弹窗
+          this.Abnormalloading = false; //关闭加载效果
         }
       });
       console.log('ids---------->', ids);
     },
-    handleSign(row) {
+    // 复核请求公共函数
+    checkFn(row) {
       console.log('签收>>>>>>>>>>', row);
       // this.title = '查看';
       // this.view = true;
-      this.reservationId = row.reservationId; //存储当前行的ID
       this.signform = row;
       this.signBox = true;
       getDetail(row.id).then(res => {
@@ -2127,23 +2126,58 @@ export default {
         this.FragilePhotos = [];
         this.HomePhotos = [];
         this.SignForPhotos = [];
-        res.data.data.printVOList.forEach(item => {
-          if (item.type == 'photo_1') {
-            this.DoorstepPhoto.push({ name: item.name, url: item.urlRoute });
-          }
-          if (item.type == 'photo_2') {
-            this.StackingPhoto.push({ name: item.name, url: item.urlRoute });
-          }
-          if (item.type == 'photo_3') {
-            this.FragilePhotos.push({ name: item.name, url: item.urlRoute });
-          }
-          if (item.type == 'photo_4') {
-            this.HomePhotos.push({ name: item.name, url: item.urlRoute });
-          }
-          if (item.type == 'photo_5') {
-            this.SignForPhotos.push({ name: item.name, url: item.urlRoute });
-          }
-        });
+        if (res.data.data.printVOList.length) {
+          InfoData.printVOList.forEach(item => {
+            if (item.type == 'photo_1') {
+              this.DoorstepPhoto.push({ name: item.name, url: item.urlRoute });
+            }
+            if (item.type == 'photo_2') {
+              this.StackingPhoto.push({ name: item.name, url: item.urlRoute });
+            }
+            if (item.type == 'photo_3') {
+              this.FragilePhotos.push({ name: item.name, url: item.urlRoute });
+            }
+            if (item.type == 'photo_4') {
+              this.HomePhotos.push({ name: item.name, url: item.urlRoute });
+            }
+            if (item.type == 'photo_5') {
+              this.SignForPhotos.push({ name: item.name, url: item.urlRoute });
+            }
+          });
+        }
+      });
+    },
+    handleSign(row) {
+      this.reservationId = row.reservationId; //存储当前行的ID
+      let data = {
+        signingId: row.id,
+      };
+      $_isSignt(data).then(res => {
+        console.log(res, '预请求返回值');
+        if (res.data.msg == '存在异常包件') {
+          ElMessage({
+            message: res.data.msg,
+            type: 'warning',
+          });
+          return;
+        }
+        if (res.data.msg == '此任务存在未完成包件，请确认') {
+          ElMessageBox.confirm(res.data.msg, '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning',
+          })
+            .then(() => {
+              this.checkFn(row);
+            })
+            .catch(() => {
+              console.log('取消');
+            });
+          return;
+        }
+        if (res.data.msg == '直接进行复核操作') {
+          this.checkFn(row);
+        }
       });
       //  this.wid= row.id
       // this.getWrapdetails(this.wpage)
@@ -2151,7 +2185,7 @@ export default {
     // 异常装车
 
     // 异常审核函数
-    AbnormalreviewFn(row){
+    AbnormalreviewFn(row) {
       loadingAbnormalPackageListDetail(row.id).then(res => {
         this.wrapdata = res.data.data;
         console.log('res------------->', res.data.data);
@@ -2160,13 +2194,13 @@ export default {
 
     viewAbnormalLoading(scope) {
       const { row } = scope;
-      console.log(scope,'异常审核');
-      this.abnormalReview=row
+      console.log(scope, '异常审核');
+      this.abnormalReview = row;
       // this.title = '查看';
       // this.view = true;
       this.abnormalBox = true;
       console.log('异常装车审核------------->', row);
-      this.AbnormalreviewFn(this.abnormalReview)
+      this.AbnormalreviewFn(this.abnormalReview);
     },
     editsolt(scope) {
       const { row } = scope;