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

src/api/aftersales/aftersalesWorkOrder.js

@@ -382,7 +382,7 @@ export const $_updateWorkOrderStatus = (data) => {
     data
   })
 }
-// 完结结果确定
+// 处理结果完结结果确定
 export const $_updateManagerConfirmed = (data) => {
   return request({
     url: '/api/logpm-aftersales/aftersalesWorkOrder/updateManagerConfirmed',

src/option/aftersales/vueTvemp.js

@@ -125,20 +125,8 @@ export const columnList = [
     head: false,
   },
   {
-    prop: 'trainNumber',
-    label: '车次号',
-    type: 2,
-    values: '',
-    width: '150',
-    checkarr: [],
-    fixed: false,
-    sortable: true,
-    head: false,
-  }, 
-
-  {
-    prop: 'vehicleRoute',
-    label: '车辆线路',
+    prop: 'customerServiceName',
+    label: '归属客服名称',
     type: 2,
     values: '',
     width: '150',
@@ -147,6 +135,7 @@ export const columnList = [
     sortable: true,
     head: false,
   },
+
   {
     prop: 'deliverGoodsTime',
     label: '送货时间',
@@ -204,10 +193,21 @@ export const columnList = [
     sortable: true,
     head: false,
   },
+  {
+    prop: 'trainNumber',
+    label: '车次号',
+    type: 2,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  }, 
 
   {
-    prop: 'customerServiceName',
-    label: '归属客服名称',
+    prop: 'vehicleRoute',
+    label: '车辆线路',
     type: 2,
     values: '',
     width: '150',
@@ -216,6 +216,9 @@ export const columnList = [
     sortable: true,
     head: false,
   },
+
+
+
   {
     prop: 'overTime',
     label: '完结时间',
@@ -811,18 +814,6 @@ export const timeoutList = [
   },
 
 
-  {
-    prop: 'workOrderId',
-    label: '异常工单ID',
-    type: 2,
-    values: '',
-    width: '130',
-    checkarr: [],
-    fixed: false,
-    sortable: true,
-    head: false,
-  },
-
   {
     prop: 'money',
     label: '金额',
@@ -905,7 +896,7 @@ export const timeoutList = [
     label: '操作',
     type: 6,
     values: '',
-    width: '220',
+    width: '120',
     checkarr: [],
     fixed: 'right',
     sortable: false,

src/router/views/index.js

@@ -1302,6 +1302,24 @@ export default [
     ],
   },
 
+
+  {
+    path: '/aftersales/aftersalesWorkOrderInfoEnxt',
+    component: Layout,
+    redirect: '/aftersales/aftersalesWorkOrderInfoEnxt',
+    children: [
+      {
+        meta: {
+          i18n: 'dict',
+          keepAlive: false,
+        },
+        path: '/aftersales/aftersalesWorkOrderInfoEnxt',
+        name: '编辑重构',
+        component: () => import('@/views/aftersales/aftersalesWorkOrderInfoEnxt.vue'),
+      },
+    ],
+  },
+
   {
     path: '/aftersales/aftersalesWorkOrderend',
     component: Layout,

src/views/aftersales/aftersalesWorkOrderAdd.vue

@@ -2070,4 +2070,8 @@ const isShowFormItem2 = computed(() => {
 :deep(.el_inputTop) {
   margin-bottom: 0 !important;
 }
+:deep(.el-form-item.is-required:not(.is-no-asterisk).asterisk-left > .el-form-item__label:before){
+  color: #ff0000;
+}
+
 </style>

src/views/aftersales/aftersalesWorkOrderend.vue

@@ -1,13 +1,15 @@
 <template>
-  <el-card class="box-card">
-    <template #header>
+  <el-card class="box-card" 
+  v-loading="Pageloading"
+    element-loading-text="Loading...">
+    <!-- <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">
@@ -449,7 +451,7 @@
                     }}</b></span
                   >
                   <span>
-                    <el-icon><Coin /></el-icon>收款金额总和:<b>{{ TotalamountReceived }}</b></span
+                    <el-icon><Coin /></el-icon>受款金额总和:<b>{{ TotalamountReceived }}</b></span
                   >
                 </div>
               </el-tab-pane>
@@ -580,14 +582,14 @@
             > -->
 
             <el-button
-              v-if="$route.query.index == '0'"
+              v-if="$route.query.workOrderStatus == '10' && UserPermissions.value != '仓库客服' "
               type="primary"
               class="button"
               @click="CustomerServiceCompleted"
               >客服仲裁完结</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"
@@ -631,10 +633,33 @@
                     >
                       <!-- {time: '2021-08-06 16:00:00',content:'内容4',name:'营业部名称'}, -->
                       <el-card>
-                        <div class="e_ico">
-                          <el-icon><User /></el-icon>:
-                          <h4>{{ item.username }}【{{ item.name }}】</h4>
+                        <div class="header-top">
+                          <div class="e_ico">
+                            <el-icon><User /></el-icon>:
+                            <h4>{{ item.username }}【{{ item.name }}】</h4>
+                          </div>
+
+                        
+                          <el-tag
+                            :class="{
+                              identifyingC1: item.difference == '1',
+                              identifyingC2: item.difference == '2',
+                              identifyingC3: item.difference == '3',
+                              'mx-1': true,
+                            }"
+                            effect="dark"
+                            >{{
+                              item.difference == '1'
+                                ? ' 调查记录'
+                                : item.difference == '2'
+                                ? '指定记录'
+                                : item.difference == '3'
+                                ? '操作记录'
+                                : ''
+                            }}
+                          </el-tag>
                         </div>
+
                         <div class="e_ico">
                           <el-icon><ChatRound /></el-icon>:<span> {{ item.content }}</span>
                         </div>
@@ -663,31 +688,11 @@
                             </span>
                           </a>
                         </div>
-                        <div class="e_ico">
-                          <el-icon><Timer /></el-icon>:
-                          <p>{{ item.time }}</p>
-                        </div>
-
                         <div class="identifying">
-                          <el-tag
-                            :class="{
-                              identifyingC1: item.difference == '1',
-                              identifyingC2: item.difference == '2',
-                              identifyingC3: item.difference == '3',
-                              'mx-1': true,
-                            }"
-                            effect="dark"
-                            >{{
-                              item.difference == '1'
-                                ? ' 调查记录'
-                                : item.difference == '2'
-                                ? '指定记录'
-                                : item.difference == '3'
-                                ? '操作记录'
-                                : ''
-                            }}
-                          </el-tag>
-
+                          <div class="e_ico">
+                            <el-icon><Timer /></el-icon>:
+                            <p>{{ item.time }}</p>
+                          </div>
                           <div
                             class="tag"
                             v-if="
@@ -901,6 +906,7 @@ const amplifyurl = ref(''); //当前点击的图片
 const amplifysrcList = ref([]); //图片循环列表
 const Replycopy = ref([]); //拷贝一份回复方
 const Mydata = ref(); //当前登录人信息
+const Pageloading=ref(false);//页面加载load
 const PackageInfo = ref([
   //包件信息
   { packageCode: '', orderCode: '', waybillNumber: '' },
@@ -1081,196 +1087,199 @@ const onLoad = () => {
     }
     console.log(UserPermissions.value, '当前角色权限');
     Chathistory(); //聊天的历史记录
-  });
 
-  // 获取页面参数
-  if ($route.query.id) {
-    console.log($route.query);
-    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 = [];
-      endFrom.value.processor = [];
-      endFrom.value.packageImage = [];
-      //图片处理回显
-      if(res.data.data.discoveryNode=='1'){
-      groundlineType.value = '1'
-    }else{
-      groundlineType.value = 'null'
-    }
-      res.data.data.decreaseImageVOList.forEach(res => {
-        amplifysrcList.value.push(res.imagePath);
-        endFrom.value['packageImage'].push({
-          name: res.imageName,
-          url: res.imagePath,
+    // 获取页面参数
+    if ($route.query.id) {
+      console.log($route.query);
+      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 = [];
+        endFrom.value.processor = [];
+        endFrom.value.packageImage = [];
+        //图片处理回显
+        if (res.data.data.discoveryNode == '1') {
+          groundlineType.value = '1';
+        } else {
+          groundlineType.value = 'null';
+        }
+        res.data.data.decreaseImageVOList.forEach(res => {
+          amplifysrcList.value.push(res.imagePath);
+          endFrom.value['packageImage'].push({
+            name: res.imageName,
+            url: res.imagePath,
+          });
         });
-      });
-      // 包件回显
-      PackageInfo.value = res.data.data.abnormalPackageVOList;
-      // 要修改
-      // 责任方回显
-      FangAddList.value = res.data.data.processorVOList
-        .filter(item => item && item.typesOf && item.typesOf === '1')
-        .map(item => {
-          return { businessName: item.businessId };
+        // 包件回显
+        PackageInfo.value = res.data.data.abnormalPackageVOList;
+        // 要修改
+        // 责任方回显
+        FangAddList.value = res.data.data.processorVOList
+          .filter(item => item && item.typesOf && item.typesOf === '1')
+          .map(item => {
+            return { businessName: item.businessId };
+          });
+        let factorydata = res.data.data.personResponsibleVOS.find(item => item.typesOf);
+        if (factorydata.typesOf) {
+          groundlineType.value = true; //切换处理方模式
+        }
+        FangAddList.value = res.data.data.personResponsibleVOS.map(res => {
+          console.log(groundlineType.value, '当前责任方状态');
+          return {
+            businessName: res.businessName, //责任方ID
+            personResponsibleName: res.personResponsibleName, //责任人名称
+            responsibilityRatio: res.responsibilityRatio, //占比
+            description: res.description, //说明
+          };
         });
-      let factorydata = res.data.data.personResponsibleVOS.find(item => item.typesOf);
-      if (factorydata.typesOf) {
-        groundlineType.value = true; //切换处理方模式
-      }
-      FangAddList.value = res.data.data.personResponsibleVOS.map(res => {
-        console.log(groundlineType.value, '当前责任方状态');
-        return {
-          businessName: res.businessName, //责任方ID
-          personResponsibleName: res.personResponsibleName, //责任人名称
-          responsibilityRatio: res.responsibilityRatio, //占比
-          description: res.description, //说明
-        };
-      });
 
-      // 要修改
-      res.data.data.processorVOList.forEach(item => {
-        if (item) {
-          if (item.typesOf == 2) {
-            // 处理方
-            endFrom.value.processor.push(item.businessId);
-            MessageResponsibility.value.push(item.businessId);
-            Replycopy.value.push(item.businessId); //拷贝一份要回复的
+        // 要修改
+        res.data.data.processorVOList.forEach(item => {
+          if (item) {
+            if (item.typesOf == 2) {
+              // 处理方
+              endFrom.value.processor.push(item.businessId);
+              MessageResponsibility.value.push(item.businessId);
+              Replycopy.value.push(item.businessId); //拷贝一份要回复的
+            }
           }
+        });
+        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(JSON.parse(localStorage.getItem('my_data')).id);
-      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 => {
-        //处理结果字典
-        console.log(res, '环节字典');
-        endFrom.value.workOrderType = res.data.data.find(
-          res => res.dictKey == endFrom.value.workOrderType
-        ).dictValue; //异常类型回显
-      });
 
-      //发现环节回显
-      getDictionaryBiz('pc_discovery_node').then(res => {
-        console.log(res, '发现环节');
-        TransportlossList.value = res.data.data;
-        console.log(TransportlossList.value, '处理好的发现环节');
-      });
+        console.log(endFrom.value.processor, ' endFrom.value.processor');
+        getDictionaryBiz('pc_work_order').then(res => {
+          //处理结果字典
+          console.log(res, '环节字典');
+          endFrom.value.workOrderType = res.data.data.find(
+            res => res.dictKey == endFrom.value.workOrderType
+          ).dictValue; //异常类型回显
+        });
 
-      // 公司占比回显计算
-      let sum = 0;
-      FangAddList.value.forEach(item => {
-        if (item.responsibilityRatio) {
-          item.responsibilityRatio = item.responsibilityRatio.replace(/%/g, '');
-          sum = Number(item.responsibilityRatio) + sum;
-        }
-      });
-      FangAddList.value.forEach(item => {
-        item.responsibilityRatio = item.responsibilityRatio + '%';
-      });
-      companyProportion.value = 100 - sum;
-      if (res.data.data.processingResultsVO.processingMoneyEntityList) {
-        ProcessingList.value = res.data.data.processingResultsVO.processingMoneyEntityList.map(
-          item => {
-            endFrom.value.result.push(item.resultType);
-            return {
-              input: item.money,
-              min: 0,
-              max: 9999999999999999999999999999,
-              state: item.resultType,
-              payment: item.compensationMethod,
-              name: item.resultTypeName,
-              text: item.compensationMethodName,
-              compensationTime: item.compensationTime,
-              paymentUnit: item.paymentUnit,
-            };
+        //发现环节回显
+        getDictionaryBiz('pc_discovery_node').then(res => {
+          console.log(res, '发现环节');
+          TransportlossList.value = res.data.data;
+          console.log(TransportlossList.value, '处理好的发现环节');
+        });
+
+        // 公司占比回显计算
+        let sum = 0;
+        FangAddList.value.forEach(item => {
+          if (item.responsibilityRatio) {
+            item.responsibilityRatio = item.responsibilityRatio.replace(/%/g, '');
+            sum = Number(item.responsibilityRatio) + sum;
           }
-        );
-      }
+        });
+        FangAddList.value.forEach(item => {
+          item.responsibilityRatio = item.responsibilityRatio + '%';
+        });
+        companyProportion.value = 100 - sum;
+        if (res.data.data.processingResultsVO.processingMoneyEntityList) {
+          ProcessingList.value = res.data.data.processingResultsVO.processingMoneyEntityList.map(
+            item => {
+              endFrom.value.result.push(item.resultType);
+              return {
+                input: item.money,
+                min: 0,
+                max: 9999999999999999999999999999,
+                state: item.resultType,
+                payment: item.compensationMethod,
+                name: item.resultTypeName,
+                text: item.compensationMethodName,
+                compensationTime: item.compensationTime,
+                paymentUnit: item.paymentUnit,
+              };
+            }
+          );
+        }
 
-      // 总金额回显
-      TotalClaimAmount.value = res.data.data.processingResultsVO.money;
-      // 理赔支付时间
-      // endFrom.value.compensationTime = res.data.data.processingResultsVO.compensationTime;
-      // 处理结果说明回显
-      endFrom.value.resultDescription = res.data.data.processingResultsVO.resultDescription;
-
-      // 完结信息回显
-      // 受款方
-
-      if (res.data.data.completionRecipientEntityList.length > 0) {
-        CompensationParty.value = [];
-        res.data.data.completionRecipientEntityList.forEach((item, index) => {
-          TotalamountReceived.value += Number(item.money);
-          CompensationParty.value.push({
-            state: 1, //状态
-            num: item.money, //金额
-            name: item.recipient, //受款方名字
-            reason: item.reasonReceivingPayment, //受款方原因
-            // explains: item.explains, //受款方说明
-            cld: index + 1,
-            id: item.id,
+        // 总金额回显
+        TotalClaimAmount.value = res.data.data.processingResultsVO.money;
+        // 理赔支付时间
+        // endFrom.value.compensationTime = res.data.data.processingResultsVO.compensationTime;
+        // 处理结果说明回显
+        endFrom.value.resultDescription = res.data.data.processingResultsVO.resultDescription;
+
+        // 完结信息回显
+        // 受款方
+
+        if (res.data.data.completionRecipientEntityList.length > 0) {
+          CompensationParty.value = [];
+          res.data.data.completionRecipientEntityList.forEach((item, index) => {
+            TotalamountReceived.value += Number(item.money);
+            CompensationParty.value.push({
+              state: 1, //状态
+              num: item.money, //金额
+              name: item.recipient, //受款方名字
+              reason: item.reasonReceivingPayment, //受款方原因
+              // explains: item.explains, //受款方说明
+              cld: index + 1,
+              id: item.id,
+            });
           });
-        });
-      }
-      // 赔款方
-      if (res.data.data.completionRecordEntities.length) {
-        res.data.data.completionRecordEntities.forEach((item, index) => {
-          TotalamountCompensation.value += Number(item.money);
-          CompensationParty.value.push({
-            state: 0, //状态
-            num: item.money, //金额
-            name: item.indemnitor, //受款方名字
-            reason: item.reason, //受款方原因
-            // explains: item.explains, //受款方说明
-            cld: index + 1,
-            id: item.id,
-            accounting: item.accounting ? item.accounting : '',
-            warehouseId:item.warehouseId,//仓库
-            compensationPersonnel:item.compensationPersonnel,//赔款人员
+        }
+        // 赔款方
+        if (res.data.data.completionRecordEntities.length) {
+          res.data.data.completionRecordEntities.forEach((item, index) => {
+            TotalamountCompensation.value += Number(item.money);
+            CompensationParty.value.push({
+              state: 0, //状态
+              num: item.money, //金额
+              name: item.indemnitor, //受款方名字
+              reason: item.reason, //受款方原因
+              // explains: item.explains, //受款方说明
+              cld: index + 1,
+              id: item.id,
+              accounting: item.accounting ? item.accounting : '',
+              warehouseId: item.warehouseId, //仓库
+              compensationPersonnel: item.compensationPersonnel, //赔款人员
+            });
           });
-        });
-      }
-      endFrom.value.arbitrate = res.data.data.reasonArbitration; //仲裁原因
-    });
+        }
+        endFrom.value.arbitrate = res.data.data.reasonArbitration; //仲裁原因
+      });
 
-    getDictionaryBiz('result_handling').then(res => {
-      console.log(res, '处理结果');
-      ProcessingResults.value = res.data.data;
-    });
-  }
+      getDictionaryBiz('result_handling').then(res => {
+        console.log(res, '处理结果');
+        ProcessingResults.value = res.data.data;
+      });
+    }
 
-  // 异常类型业务字典
-  getDictionaryBiz('work_order_status').then(res => {
-    //处理结果字典
-    endFrom.value.workOrderStatus = res.data.data.filter(
-      obj => obj.dictKey == endFrom.value.workOrderStatus
-    ).dictValue; //异常类型处理
-  });
+    // 异常类型业务字典
+    getDictionaryBiz('work_order_status').then(res => {
+      //处理结果字典
+      endFrom.value.workOrderStatus = res.data.data.filter(
+        obj => obj.dictKey == endFrom.value.workOrderStatus
+      ).dictValue; //异常类型处理
+    });
 
-  // 支付方式字典
-  getDictionaryBiz('payment_method').then(res => {
-    //处理结果字典
-    console.log(res);
-    Paymentmethod.value = res.data.data;
-  });
+    // 支付方式字典
+    getDictionaryBiz('payment_method').then(res => {
+      //处理结果字典
+      console.log(res);
+      Paymentmethod.value = res.data.data;
+    });
 
-  getDeptWarehouse({}).then(res => {
-    // 验证本地仓库用于回复选择，自己不能选择自己仓库
-    console.log(res, '处理方');
-    localStorage.getItem('WarehouseName');
-    console.log(localStorage.getItem('WarehouseName'), '当前本地仓库');
-    res.data.data.forEach(item => {
-      warehouseData.value.push({
-        value: item.id,
-        label: item.name,
-        disabled: item.name == localStorage.getItem('WarehouseName'),
+    getDeptWarehouse({}).then(res => {
+      // 验证本地仓库用于回复选择，自己不能选择自己仓库
+      console.log(res, '处理方');
+      localStorage.getItem('WarehouseName');
+      console.log(localStorage.getItem('WarehouseName'), '当前本地仓库');
+      res.data.data.forEach(item => {
+        warehouseData.value.push({
+          value: item.id,
+          label: item.name,
+          disabled: item.name == localStorage.getItem('WarehouseName'),
+        });
       });
     });
   });
@@ -1870,7 +1879,7 @@ const submit = () => {
     console.log(data, '处理好的值');
 
     // 赔款方
-
+    Pageloading.value = true;//开启页面加载
     $_addCompletionEnd(data)
       .then(res => {
         console.log(res, '完结成功返回值');
@@ -1885,6 +1894,7 @@ const submit = () => {
         }
       })
       .catch(res => {
+        Pageloading.value = false;//开启页面加载
         console.log(res, '提交失败');
       });
   } else {
@@ -1895,9 +1905,8 @@ const submit = () => {
     let data = {
       aftersalesProcessingResultsDTO: {
         // ...info,
-           
       },
-      processingMoneyEntityList: [], //赔付方式
+      // processingMoneyEntityList: [], //赔付方式
     };
     data.id = $route.query.id;
     data.aftersalesProcessingResultsDTO['workOrderId'] = $route.query.id; //异常工单ID
@@ -1908,7 +1917,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; //目前是单选
@@ -1919,7 +1928,7 @@ const submit = () => {
     data.aftersalesProcessingResultsDTO['compensationMethod'] = ProcessingList.value
       .map(item => item.text)
       .join(',');
-      data.aftersalesProcessingResultsDTO.processingMoneyEntityList = ProcessingList.value
+    data.aftersalesProcessingResultsDTO.processingMoneyEntityList = ProcessingList.value
       .map(item => {
         console.log(item);
         let match = ProcessingResults.value.find(element => element.dictValue == item.name);
@@ -1970,7 +1979,7 @@ const submit = () => {
 
     data.aftersalesProcessingResultsDTO.warehouseId = info.warehouseId; //仓库ID
     console.log(data, '处理好的数据');
-
+    Pageloading.value = true;//开启页面加载
     $_addProcessingResults(data)
       .then(res => {
         console.log(res, '提交后的参数');
@@ -1984,7 +1993,9 @@ const submit = () => {
           AddressClosed('/aftersales/aftersalesWorkOrderend'); //删除当前页面
         }
       })
-      .catch(res => {});
+      .catch(res => {
+        Pageloading.value = false;//开启页面加载
+      });
   }
 };
 // 消息回复
@@ -2578,6 +2589,14 @@ const CustomerServiceCompleted = () => {
       cursor: pointer;
     }
   }
+  .header-top {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    :deep(.el-tag){
+      width: 70px;
+    }
+  }
 }
 .inputMax {
   position: absolute;
@@ -2739,6 +2758,10 @@ const CustomerServiceCompleted = () => {
 .identifying {
   display: flex;
   justify-content: space-between;
+  align-items: center;
+  .el-tag{
+    width: 70px;
+    }
 }
 .identifyingC1 {
   background-color: #409eff;

src/views/authority/role.vue

@@ -107,6 +107,7 @@ import {
 } from '@/api/system/role';
 import { mapGetters } from 'vuex';
 import website from '@/config/website';
+import { set } from 'nprogress';
 
 export default {
   data() {

src/views/basicdata/driverArtery/basicdataDriverArtery.vue

@@ -46,7 +46,7 @@
         <!--        </el-button>-->
 
 
-        <el-dialog title="物料导入" append-to-body v-model="excelBox" width="555px">
+        <el-dialog title="司机导入" append-to-body v-model="excelBox" width="555px">
       <avue-form :option="excelOption" v-model="excelForm" :upload-after="uploadAfter">
         <template #excelTemplate>
           <el-button type="primary" @click="handleTemplate">
@@ -102,7 +102,7 @@ export default {
               res: 'data',
             },
             tip: '请上传 .xls,.xlsx 标准格式文件',
-            action: '/api/logpm-basicdata/driverArtery/mport-stockArticle',
+            action: '/api/logpm-basicdata/driverArtery/import-stockArticle',
           },
           {
             label: '模板下载',
@@ -790,7 +790,7 @@ export default {
         });
     },
     handleExport() {
-      let downloadUrl = `/api/logpm-b1asicdata/driverArtery/export-basicdataDriverArteryMb?${
+      let downloadUrl = `/api/logpm-basicdata/driverArtery/export-basicdataDriverArtery?${
         this.website.tokenHeader
       }=${getToken()}`;
       const {} = this.query;
@@ -811,9 +811,9 @@ export default {
     handleTemplate() {
       console.log('下载模板！！！');
       exportBlob(
-        `/api/logpm/basicdata/driverArtery/export-basicdataDriverArteryMb?${this.website.tokenHeader}=${getToken()}`
+        `/api/logpm-basicdata/driverArtery/export-basicdataDriverArteryMb?${this.website.tokenHeader}=${getToken()}`
       ).then(res => {
-        downloadXls(res.data, '物料数据模板.xlsx');
+        downloadXls(res.data, '司机信息导入模板.xlsx');
       });
     },
     beforeOpen(done, type) {

src/views/distribution/deliverylist/distributionDeliveryListedt.vue

@@ -252,9 +252,9 @@
             </template>
           </tablecmt>
 
-          <!-- <div class="avue-crud__pagination" style="width: 100%"> -->
+          <div class="avue-crud__pagination" style="width: 100%">
           <!-- 分页模块 -->
-          <!-- <el-pagination
+          <el-pagination
             align="right"
             background
             @size-change="psizeChange"
@@ -265,7 +265,8 @@
             layout="total, sizes, prev, pager, next, jumper"
             :total="packpage.total"
           >
-          </el-pagination> -->
+          </el-pagination>
+        </div>
         </el-tab-pane>
 
         <el-tab-pane label="库 存 品 列 表" name="tab4">
@@ -3620,9 +3621,6 @@ export default {
       this.SignForPhotos = [];
      this.signBox = true;
      this.reservationId = row.id;
-
-
-
     },
     beforeOpen(done, type) {
       if (['edit', 'view'].includes(type)) {
@@ -3798,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);
@@ -4088,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; //开启复核签收加载效果
@@ -4305,7 +4324,7 @@ export default {
         }
       );
     },
-    //包件列表
+    //包件列表函数
     handlePackage(page) {
       let params = {};
       this.loading = true;
@@ -4313,15 +4332,19 @@ export default {
       params.deliveryId = this.deliverydata.id;
       getpackdetail(page.currentPage, page.pageSize, Object.assign(params, this.packageQuery)).then(
         res => {
+          console.log(res);
           this.loading = false;
-          console.log('查看>>>>>包间>>', res.data.data);
-          if (res.data.data) {
-            const data = res.data.data;
+          console.log('查看>>>>>包间>>', res.data.data.records);
+          if (res.data.data.records) {
+            const data = res.data.data.records;
+            this.packpage.total= res.data.data.total
             this.packdata = data;
             // this.packpage.total = data.length;
           }
         }
-      );
+      ).catch(res=>{
+        this.loading = false;
+      });
     },
     //库存列表
     handleInventory(page) {

vite.config.js

@@ -25,12 +25,14 @@ export default ({ mode, command }) => {
           // target: 'http://192.168.6.122:8777',
           // target: 'http://192.168.10.25:13000',
           // target: 'http://192.168.10.25:2888', 
-          target: 'http://192.168.6.163:9777',//CYZ
+          target: 'http://192.168.6.169:9777',//CYZ
           // target: 'http://192.168.10.57:13000',
           // target: 'http://192.168.10.200:13000',
           // target: 'http://192.168.10.29:13000',
+          // target: 'http://192.168.10.210:13000',//？
           // target: 'http://h5uapi.huitongys.com',
           // target: 'http://test.api.huo5you.com',
+
           changeOrigin: true,
           rewrite: path => path.replace(/^\/api/, ''),
         },