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,8 +125,8 @@ export const columnList = [
     head: false,
   },
   {
-    prop: 'trainNumber',
-    label: '车次号',
+    prop: 'customerServiceName',
+    label: '归属客服名称',
     type: 2,
     values: '',
     width: '150',
@@ -136,17 +136,6 @@ export const columnList = [
     head: false,
   },
 
-  {
-    prop: 'vehicleRoute',
-    label: '车辆线路',
-    type: 2,
-    values: '',
-    width: '150',
-    checkarr: [],
-    fixed: false,
-    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

@@ -1282,6 +1282,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/aftersalesWorkOrder.vue

@@ -83,8 +83,6 @@
               <div class="avue-crud__header">
                 <!-- 头部左侧按钮模块 -->
                 <div class="avue-crud__left">
-                  <!-- v-if="ButtonPermissions.add" -->
-                  <!-- v-if="PermissionButton.workAdd" -->
                   <el-button v-if="ButtonPermissions.add" type="primary" @click="AddInfo">
                     <el-icon><Plus /></el-icon>新 增</el-button
                   >
@@ -92,42 +90,59 @@
                     <el-icon><Delete /></el-icon>批量删除</el-button
                   > -->
 
-                  <!-- v-if="ButtonPermissions.batchReject" -->
-                  <!-- v-if="PermissionButton.batch_return" -->
                   <el-button
                     v-if="ButtonPermissions.batchReject"
                     type="primary"
                     @click="BatchReturn"
                     >批量打回</el-button
                   >
-                  <!-- v-if="ButtonPermissions.assignment" -->
-                  <!-- v-if="PermissionButton.assign" -->
-                  <el-button type="primary" @click="assign">工单指派</el-button>
+                  <!-- 仓库客服批量确定 -->
+                  <el-button
+                    v-if="ButtonPermissions.Batchdetermination"
+                    type="primary"
+                    @click="ResultConfirmation"
+                    >批量确定</el-button
+                  >
+                                 <!-- 总部客服批量确定 -->
+                  <!-- <el-button
+                    v-if="ButtonPermissions.ManagerConfirmed"
+                    @click="DetermineStorage"
+                          >批量确定</el-button
+                        > -->
+
+
+
+
+                  <el-button type="primary" v-if="ButtonPermissions.assignment" @click="assign"
+                    >工单指派</el-button
+                  >
 
-                  <!-- v-if="ButtonPermissions.applyArbitration" -->
-                  <!-- v-if="PermissionButton.apply_arbitration" -->
                   <el-button
                     v-if="ButtonPermissions.applyArbitration"
                     type="primary"
                     @click="arbitrate"
                     >客服介入</el-button
                   >
-                  <el-button type="primary" @click="DingTalk">钉钉号填写</el-button>
+                  <el-button
+                    type="primary"
+                    v-if="ButtonPermissions.DingTalkNumber"
+                    @click="DingTalk"
+                    >钉钉号填写</el-button
+                  >
 
-                  <!-- v-if="ButtonPermissions.batchFinish" -->
-                  <!-- v-if="PermissionButton.batch_completion" -->
-                  <el-button ButtonPermissions.batchFinish type="primary" @click="Batchcompletion"
+                  <el-button
+                    v-if="ButtonPermissions.batchFinish"
+                    type="primary"
+                    @click="Batchcompletion"
                     >批量完结</el-button
                   >
-                  <el-button
+                  <!-- <el-button
                     ButtonPermissions.batchFinish
                     type="primary"
-                    v-if="AppealStatusT"
                     @click="Batchdeletionappeals"
                     >批量删除</el-button
-                  >
-                  <!-- v-if="ButtonPermissions.appeal" -->
-                  <!-- v-if="PermissionButton.representations" -->
+                  > -->
+
                   <el-button v-if="ButtonPermissions.appeal" type="primary" @click="appeal"
                     >申诉</el-button
                   >
@@ -177,26 +192,28 @@
                     <div class="ElBtnClass">
                       <div>
                         <!-- <el-button @click="addingRecord(slotProps.scope)">新增记录</el-button> -->
-                        <el-button
-                          v-if="
-                            (!AppealStatusT && TabPermissions != '8') ||
-                            (AppealStatusT &&
-                              UserPermissions !== '仓库客服' &&
-                              slotProps.scope.row.typesOf != '2')
-                          "
-                          @click="view(slotProps.scope)"
-                          >查看</el-button
-                        >
-
+                        <el-button @click="view(slotProps.scope)">查看</el-button>
+                        <!-- v-if="
+                            (!AppealStatusT && TabPermissions != '8') || (AppealStatusT && UserPermissions !== '仓库客服' &&  slotProps.scope.row.typesOf != '2')
+                          " -->
                         <!-- 处理结果确定和处理完毕 -->
+                        <!-- 总部客服确定 -->
+                        <!-- <el-button
+                          v-if="TabPermissions == '2' && UserPermissions == '总部客服经理'"
+                          @click="ResultConfirmation(slotProps.scope)"
+                          >确定</el-button
+                        > -->
+                        <!-- 仓库客服确定  -->
                         <el-button
                           v-if="
-                            TabPermissions == '1' ||  TabPermissions == '2'
-                          "
-                          @click="DetermineStorage(slotProps.scope)"
+                           ( TabPermissions == '2' || TabPermissions == '1' ) &&  slotProps.scope.row.workOrderStatus == '21' && (UserPermissions == '仓库客服' || UserPermissions == '总部客服经理')"
+                            
+                          
+                          @click="ResultConfirmation(slotProps.scope)"
                           >确定</el-button
                         >
-                        <!-- 仓库客服的缺点
+
+                        <!-- 仓库客服的缺确定
                         <el-button
                           v-if="
                             TabPermissions == '1' && slotProps.scope.row.workOrderStatus != '30'
@@ -204,8 +221,6 @@
                           @click="DetermineStorage(slotProps.scope)"
                           >确定</el-button
                         > -->
-
-
                         <el-button
                           v-if="
                             TabPermissions == '6' &&
@@ -233,14 +248,26 @@
                           >编辑</el-button
                         >
 
-
-                             <!-- 处理完毕 处理结果编辑 -->
+                        <!-- 处理完毕 处理结果编辑 -->
                         <el-button
-                          v-if="TabPermissions == '2' && UserPermissions == '仓库客服'"
+                          v-if="
+                            TabPermissions == '2' &&
+                            UserPermissions == '仓库客服' &&
+                            slotProps.scope.row.workOrderStatus == '21'
+                          "
                           @click="ProcessedResultediting(slotProps.scope)"
                           >编辑</el-button
                         >
-
+                        <!-- 完结信息编辑 -->
+                        <!-- <el-button
+                          v-if="
+                            TabPermissions == '6' &&
+                            UserPermissions != '仓库客服' &&
+                            slotProps.scope.row.typesOfName == '待处理'
+                          "
+                          @click="CompletedEditing(slotProps.scope)"
+                          >编辑</el-button
+                        > -->
 
                         <!-- 理赔金额确定 -->
                         <el-button
@@ -280,12 +307,12 @@
                         <!-- <el-button v-if="ClaimStatus" @click="appeal(slotProps.scope)"
                           >申诉</el-button
                         > -->
+                        <el-button
+                        v-if="TabPermissions == '7' && UserPermissions != '仓库客服'"
+                          @click="BtnModifyAmount(slotProps.scope)"
+                          >修改金额</el-button
+                        >
                       </div>
-                      <el-button
-                        v-if="TabPermissions == 7"
-                        @click="BtnModifyAmount(slotProps.scope)"
-                        >修改金额</el-button
-                      >
                     </div>
                   </template>
                 </template>
@@ -713,6 +740,23 @@ console.log(accessControl, '权限按钮');
 // arbitration_completed;//仲裁完结
 // information_editing;//信息编辑
 console.log(accessControl.workAdd, '新增按钮权限');
+// const PermissionButton = computed(() => {
+//   return {
+//     workAdd: accessControl.workAdd, //新增
+//     batch_return: accessControl.batch_return, //批量打回
+//     assign: accessControl.assign, //工单指派
+//     apply_arbitration: accessControl.apply_arbitration, //申请仲裁
+//     batch_completion: accessControl.batch_completion, //批量完结
+//     representations: accessControl.representations, //申诉
+//     reply: accessControl.reply, //回复
+//     processing_completed: accessControl.processing_completed, //处理完结
+//     work_order_completion: accessControl.work_order_completion, //完结
+//     repulse: accessControl.repulse, //打回
+//     arbitration_completed: accessControl.arbitration_completed, //仲裁完结
+//     information_editing: accessControl.information_editing, //信息编辑
+//   };
+// });
+
 const PermissionButton = computed(() => {
   return {
     workAdd: accessControl.workAdd, //新增
@@ -729,6 +773,7 @@ const PermissionButton = computed(() => {
     information_editing: accessControl.information_editing, //信息编辑
   };
 });
+
 const DingTalkfilling = ref({}); //钉钉号表单
 const dialogDingTalk = ref(false); //钉钉号弹窗
 const tabValue = ref(0); //侧边栏激活状态
@@ -1012,75 +1057,109 @@ const ButtonPermissions = computed(() => {
   switch (TabPermissions.value) {
     case 0: //全部
       return {
-        add: UserPermissions.value == '仓库客服', //新增按钮
-        batchReject: UserPermissions.value == '职能客服', //批量打回
-        assignment: UserPermissions.value == '客服经理', //工单指派
-        applyArbitration: UserPermissions.value == '仓库客服', //申请仲裁
-        batchFinish: UserPermissions.value == '职能客服' || UserPermissions.value == '客服经理', //批量完结
+        // add: true, //新增按钮
+        // batchReject: true, //批量打回
+        // assignment: true, //工单指派
+        // applyArbitration:true, //客服介入
+        // DingTalkNumber:true,//钉钉号填写
+        // batchFinish:true, //批量完结
+        // appeal: true, //申诉
+        add:true, //新增按钮
+        batchReject: UserPermissions.value != '仓库客服', //批量打回
+        assignment: UserPermissions.value == '总部客服经理', //工单指派
+        applyArbitration: UserPermissions.value == '仓库客服', //客服介入
+        DingTalkNumber: UserPermissions.value == '总部客服经理', //钉钉号填写
+        batchFinish: UserPermissions.value != '仓库客服', //批量完结
         appeal: false, //申诉
+        ManagerConfirmed:false,//处理完毕下面的客服经理批量确定
       };
     case 1: //处理中
       return {
         add: false, //新增按钮
         batchReject: UserPermissions.value == '职能客服' || UserPermissions.value == '客服经理', //批量打回
         assignment: false, //工单指派
-        applyArbitration: UserPermissions.value == '仓库客服', //申请仲裁
+        applyArbitration: UserPermissions.value == '仓库客服', //客服介入
         batchFinish: UserPermissions.value != '仓库客服', //批量完结
+        Batchdetermination: UserPermissions.value != '仓库客服', //批量确定
         appeal: false, //申诉
+        ManagerConfirmed:false,//处理完毕下面的客服经理批量确定
       };
     case 2: //处理完毕
       return {
         add: false, //新增按钮
         batchReject: false, //批量打回
         assignment: false, //工单指派
-        applyArbitration: false, //申请仲裁
+        applyArbitration: false, //客服介入
         batchFinish: false, //批量完结
         appeal: UserPermissions.value == '仓库客服' && AppealStatusT.value, //申诉
+        Batchdetermination: UserPermissions.value == '仓库客服', //批量确定
+        ManagerConfirmed:UserPermissions.value == '总部客服经理',//处理完毕下面的客服经理批量确定
       };
     case 3: //待处理
       return {
         add: false, //新增按钮
-        batchReject: UserPermissions.value == '职能客服', //批量打回
-        assignment: UserPermissions.value == '客服经理', //工单指派
-        applyArbitration: false, //申请仲裁
-        batchFinish: false, //批量完结
+        batchReject: UserPermissions.value == '总部客服', //批量打回
+        assignment: UserPermissions.value == '总部客服经理', //工单指派
+        applyArbitration: UserPermissions.value == '仓库客服', //客服介入
+        batchFinish:UserPermissions.value != '仓库客服' , //批量完结
         appeal: false, //申诉
+        Batchdetermination: false, //批量确定
+        ManagerConfirmed:false,//处理完毕下面的客服经理批量确定
       };
     case 4: //理赔金额未出
       return {
         add: false, //新增按钮
         batchReject: false, //批量打回
         assignment: false, //工单指派
-        applyArbitration: false, //申请仲裁
+        applyArbitration: false, //客服介入
         batchFinish: false, //批量完结
         appeal: false, //申诉
+        Batchdetermination: false, //批量确定
+        ManagerConfirmed:false,//处理完毕下面的客服经理批量确定
       };
     case 5: //仲裁中
       return {
         add: false, //新增按钮
         batchReject: false, //批量打回
         assignment: false, //工单指派
-        applyArbitration: false, //申请仲裁
+        applyArbitration: false, //客服介入
         batchFinish: false, //批量完结
         appeal: false, //申诉
+        Batchdetermination: false, //批量确定
+        ManagerConfirmed:false,//处理完毕下面的客服经理批量确定
       };
     case 6: //完结
       return {
         add: false, //新增按钮
         batchReject: false, //批量打回
         assignment: false, //工单指派
-        applyArbitration: false, //申请仲裁
+        applyArbitration: false, //客服介入
         batchFinish: false, //批量完结
-        appeal: true, //申诉
+        appeal: UserPermissions.value == '仓库客服', //申诉
+        Batchdetermination: false, //批量确定
+        ManagerConfirmed:false,//处理完毕下面的客服经理批量确定
       };
     case 7: //超时未处理
       return {
         add: false, //新增按钮
         batchReject: false, //批量打回
         assignment: false, //工单指派
-        applyArbitration: false, //申请仲裁
+        applyArbitration: false, //客服介入
+        batchFinish: false, //批量完结
+        appeal: false, //申诉
+        Batchdetermination: false, //批量确定
+        ManagerConfirmed:false,//处理完毕下面的客服经理批量确定
+      };
+    case 8: //待回复
+      return {
+        add: false, //新增按钮
+        batchReject: false, //批量打回
+        assignment: false, //工单指派
+        applyArbitration: true, //客服介入
         batchFinish: false, //批量完结
         appeal: false, //申诉
+        Batchdetermination: false, //批量确定
+        ManagerConfirmed:false,//处理完毕下面的客服经理批量确定
       };
     // 其他任何情况下的默认情况
     default:
@@ -1091,6 +1170,8 @@ const ButtonPermissions = computed(() => {
         applyArbitration: false,
         batchFinish: false,
         appeal: false,
+        Batchdetermination: false, //批量确定
+        ManagerConfirmed:false,//处理完毕下面的客服经理批量确定
       };
   }
 });
@@ -1137,7 +1218,7 @@ const TransportLossNode = ref([
 ]);
 
 const Statusprocessing = val => {
-  console.log(columnList[10],'22212as');
+  console.log(columnList[10], '22212as');
   val.forEach(item => {
     console.log(item, 'item');
     // 对为null的数据进行处理
@@ -1198,7 +1279,7 @@ const Statusprocessing = val => {
       item.workOrderStatusNameS = columnList[10].checkarr[9].label; //处理结果已提交
     } else if (item.workOrderStatus == 100) {
       item.workOrderStatusNameS = columnList[10].checkarr[10].label; //已结束
-    }else if (item.workOrderStatus == 110) {
+    } else if (item.workOrderStatus == 110) {
       item.workOrderStatusNameS = columnList[10].checkarr[11].label; //已结束
     }
   });
@@ -1268,9 +1349,9 @@ const IndexTable = val => {
 };
 
 // 表格切换
-const Tableheaderswitching =  val => {
+const Tableheaderswitching = val => {
   publicColumnList.value = val; //默认加载表格
-  details.columnList = val;//列表配置项
+  details.columnList = val; //列表配置项
 };
 
 // 页面初始化
@@ -1412,6 +1493,7 @@ const InformationViewing = val => {
         RouteIndexs: TabPermissions.value, //当前记录参数
         Routstate: 'appeal', //申诉列表
         AppealReview: val.row.typesOf == '0' ? 'true' : 'false', //当前只能查看申诉详情信息
+        workOrderStatus: val.row.workOrderStatus, //工单状态
       },
     });
     return;
@@ -1437,6 +1519,23 @@ const InformationViewing = val => {
     });
     return;
   }
+  if (TabPermissions.value == 7) {
+    console.log('当前在超时未处理未出');
+    $router.push({
+    path: '/aftersales/aftersalesWorkOrderInfo',
+    query: {
+      id: val.row.workOrderId,
+      appealID: val.row.id, //只有才需要的参数
+      name: val.row.workOrderNumber + '-信息查看',
+      warehouseId: val.row.warehouseId,
+      workOrderNumber: val.row.workOrderNumber, //添加异常记录包条码
+      businessId: val.row.businessId,
+      RouteIndexs: TabPermissions.value, //当前记录参数
+      workOrderStatus: val.row.workOrderStatus, //订单状态
+    },
+  });
+  return
+  }
   $router.push({
     path: '/aftersales/aftersalesWorkOrderInfo',
     query: {
@@ -1447,6 +1546,7 @@ const InformationViewing = val => {
       businessId: val.row.businessId,
       ProcessType: TabPermissions.value == 2 ? '2' : TabPermissions.value == 3 ? '1' : '', //类型 1 待处理 2 已处理
       RouteIndexs: TabPermissions.value, //当前记录参数
+      workOrderStatus: val.row.workOrderStatus, //工单状态
     },
   });
 };
@@ -1466,16 +1566,15 @@ const view = val => {
         workOrderNumber: val.row.workOrderNumber, //添加异常记录包条码
         businessId: val.row.businessId,
         ProcessType: TabPermissions.value == 2 ? '2' : TabPermissions.value == 3 ? '1' : '', //类型 1 待处理 2 已处理
-        RouteIndexs: TabPermissions.value, //当前记录参数
+        RouteIndexs: TabPermissions.value, //当前菜单
         Routstate: 'appeal', //申诉列表
         AppealReview: val.row.typesOf == '0' ? 'true' : 'false', //当前只能查看申诉详情信息
+        workOrderStatus: val.row.workOrderStatus, //当前工单状态
       },
     });
     return;
   }
 
-
-
   // 理赔查看
   if (TabPermissions.value == 4) {
     $router.push({
@@ -1497,6 +1596,29 @@ const view = val => {
     });
     return;
   }
+  if (TabPermissions.value == 7) {
+    console.log('当前在超时未处理未出');
+    $router.push({
+    path: '/aftersales/aftersalesWorkOrderInfo',
+    query: {
+      id: val.row.workOrderId,
+      appealID: val.row.id, //只有才需要的参数
+      name: val.row.workOrderNumber + '-信息查看',
+      warehouseId: val.row.warehouseId,
+      workOrderNumber: val.row.workOrderNumber, //添加异常记录包条码
+      businessId: val.row.businessId,
+      RouteIndexs: TabPermissions.value, //当前记录参数
+      workOrderStatus: val.row.workOrderStatus, //订单状态
+    },
+  });
+  return
+  }
+  
+ 
+
+
+
+
 
   $router.push({
     // AppealStatusT为真表示是申诉列表
@@ -1751,8 +1873,8 @@ const Resultediting = val => {
     },
   });
 };
-const ProcessedResultediting=(val)=>{
-console.log(val,'参数');
+const ProcessedResultediting = val => {
+  console.log(val, '参数');
   // return
   $router.push({
     path: '/aftersales/aftersalesWorkOrdermodify',
@@ -1765,11 +1887,31 @@ console.log(val,'参数');
       workOrderNumber: val.row.workOrderNumber,
       RouterState: 'Kfend',
       Processingresults: true, //处理结果编辑
-      Processed:'true',
+      Processed: 'true',
       index: '1',
     },
   });
-}
+};
+
+// 完结菜单的编辑
+const CompletedEditing = val => {
+  console.log(val);
+  $router.push({
+    path: '/aftersales/aftersalesWorkOrdermodify',
+    query: {
+      id: val.row.workOrderId,
+      name: val.row.workOrderNumber + '-完结编辑',
+      businessId: val.row.businessId,
+      warehouseId: val.row.warehouseId,
+      workOrderNumber: val.row.workOrderNumber,
+      RouterState: 'Kfend',
+      CompletedEditing: 'true', //完结信息编辑
+      Appealeditor: 'appeal', //只是编辑完结
+      Processed: 'true',
+      index: '1',
+    },
+  });
+};
 // 工单申诉确认按钮
 const Appealbutton = state => {
   if (UserPermissions.value == '仓库客服') {
@@ -1866,8 +2008,8 @@ const inputsc = (index, row) => {
   processRowProperty(index, row, details);
   details.query[row.prop] = index;
   // tabChenge( TabPermissions.value,details.query)
-  DataRendering(TabPermissions.value,details.query)
-  return
+  DataRendering(TabPermissions.value, details.query);
+  return;
   console.log('没有执行');
   if (TabPermissions.value == '4') {
     // 理赔金额未出
@@ -1887,7 +2029,7 @@ const inputsc = (index, row) => {
   }
   if (TabPermissions.value == '7') {
     TimeoutHandling(details.query); //超时未处理
-    return
+    return;
   }
 
   IndexTable(details.query); //首页初始化信息
@@ -1922,9 +2064,8 @@ const inputsc = (index, row) => {
 };
 // 网页顶部搜索按钮
 const searchChange = () => {
-
-  DataRendering(TabPermissions.value,details.query)
-  return
+  DataRendering(TabPermissions.value, details.query);
+  return;
 
   if (ClaimStatus.value) {
     // 表示这是理赔查询
@@ -1949,12 +2090,12 @@ const emptyvalues = data => {
 
 // 清空头部搜索条件
 const empty = () => {
-// 清空搜索参数
+  // 清空搜索参数
   for (let key in details.query) {
-  if (key !== 'workOrderStatus') {
-    delete details.query[key];
+    if (key !== 'workOrderStatus') {
+      delete details.query[key];
+    }
   }
-}
   // let dataList = [columnList, recordList, Claimsfield, AppealList, timeoutList];
   details.columnList.forEach(item => {
     item.values = '';
@@ -1996,8 +2137,8 @@ const selectsc = (index, row) => {
   console.log(details, '下拉的参数');
   details.query.workOrderStatus = TabPermissions.value;
 
-  DataRendering(TabPermissions.value,details.query)
-  return
+  DataRendering(TabPermissions.value, details.query);
+  return;
 
   if (TimeoutStatus.value) {
     // 超时列表
@@ -2045,8 +2186,8 @@ const selectionChange = list => {
 /** 页码改变执行的回调 */
 const currentChange = val => {
   page.value.currentPage = val;
-  DataRendering(TabPermissions.value,details.query)
-  return
+  DataRendering(TabPermissions.value, details.query);
+  return;
   // 超时
   if (TimeoutStatus.value) {
     TimeoutHandling(details.query);
@@ -2075,8 +2216,8 @@ const currentChange = val => {
 // 每页多少条
 const sizeChange = val => {
   page.value.pageSize = val;
-  DataRendering(TabPermissions.value,details.query)
-  return
+  DataRendering(TabPermissions.value, details.query);
+  return;
   // 超时
   if (TimeoutStatus.value) {
     TimeoutHandling(details.query);
@@ -2277,11 +2418,12 @@ function AppealListFn(val) {
 
 // 超时金额修改
 const BtnModifyAmount = val => {
+
   console.log(val, '超时金额修改');
   dialogModifyAmount.value = true; //开启超时金额弹窗修改
   fromamount.value.title = val.row.workOrderNumber; //工单号
   fromamount.value.ytimeout = val.row.money; //原本金额
-  fromamount.value.id = val.row.lawoId; //id
+  fromamount.value.id = val.row.id; //id
 };
 // 修改金额确定
 const ModifyAmountFn = () => {
@@ -2300,6 +2442,8 @@ const ModifyAmountFn = () => {
       });
     }
     dialogModifyAmount.value = false; //关闭超时金额弹窗修改
+  }).catch(res=>{
+    dialogModifyAmount.value = false; //关闭超时金额弹窗修改
   });
 };
 function getWinHight() {
@@ -2346,11 +2490,11 @@ const TimeoutHandling = val => {
 };
 
 // 数据渲染公共函数
-const DataRendering =(val,input)=>{
+const DataRendering = (val, input) => {
   // val:当前是在哪一个菜单下面
   //input:当前传入的搜索参数
   console.log('执行了公共函数');
-  if(val !=6){
+  if (val != 6) {
     AppealStatusT.value = false; //申诉列表关闭
   }
   console.log(val, '触发了标签栏');
@@ -2421,12 +2565,12 @@ const DataRendering =(val,input)=>{
     ArbitrationStatus.value = false; //不可以申请仲裁
     Tableheaderswitching(columnList); //表头切换
     IndexTable(data);
-  } else if(val == 6 &&  AppealStatusT.value){
+  } else if (val == 6 && AppealStatusT.value) {
     console.log('申诉列表');
     data.workOrderStatus = null;
     details.query.workOrderStatus = null;
     AppealListFn(data); //申诉列表函数
-  }  else if (val == 6) {
+  } else if (val == 6) {
     // 完结
     ProcessingPartyState.value = false; //关闭处理方
     data.workOrderStatus = 80;
@@ -2459,16 +2603,14 @@ const DataRendering =(val,input)=>{
     }
   }
   console.log('执行完毕');
-}
-
-
+};
 
 // 标签栏触发
 
 const tabChenge = async (val, input) => {
   TabPermissions.value = val; //记录当前点击的菜单
 
-  if(val !=6){
+  if (val != 6) {
     AppealStatusT.value = false; //申诉列表关闭
   }
   console.log(val, '触发了标签栏');
@@ -2476,8 +2618,8 @@ const tabChenge = async (val, input) => {
     ...input, //搜索输入框
   };
   await empty();
-  DataRendering(TabPermissions.value,input)
-  return
+  DataRendering(TabPermissions.value, input);
+  return;
   if (val == 0) {
     ProcessingPartyState.value = false; //关闭处理方
     ArbitrationStatus.value = true; //可以以申请仲裁
@@ -2541,12 +2683,12 @@ const tabChenge = async (val, input) => {
     ArbitrationStatus.value = false; //不可以申请仲裁
     Tableheaderswitching(columnList); //表头切换
     IndexTable(data);
-  } else if(val == 6 &&  AppealStatusT.value){
+  } else if (val == 6 && AppealStatusT.value) {
     console.log('申诉列表');
     data.workOrderStatus = null;
     details.query.workOrderStatus = null;
     AppealListFn(data); //申诉列表函数
-  }  else if (val == 6) {
+  } else if (val == 6) {
     // 完结
     ProcessingPartyState.value = false; //关闭处理方
     data.workOrderStatus = 80;
@@ -2791,14 +2933,52 @@ const fellSuccess = (response, uploadFile) => {
 };
 // 处理结果和理赔确定
 const DetermineStorage = val => {
+
   let data = {
     assignList: [],
   };
-  let ID = {};
-  ID = val.row.id;
-  data['assignList'].push(ID);
+  let ConfirmStatus = false; //批量确认状态
+  if (!val.row) {
+    // 说明点击的批量确定
+    console.log('当前点击的批量确定');
+    if (!details.selectionList.length) {
+      ElMessage({
+        message: '请勾选要处理的数据数据',
+        type: 'warning',
+      });
+      return;
+    } else {
+      ConfirmStatus = true; //说明走的是批量
+      data['assignList'] = details.selectionList.map(item => item.id);
+      console.log(data['assignList'], '批量确定处理好的参数');
+    }
+  } else {
+    let ID = {};
+    ID = val.row.id;
+    data['assignList'].push(ID);
+  }
+
+  if (ConfirmStatus) {
+    // 走的批量确认
+    let state = details.selectionList.every(item => item.workOrderStatus == '40');
+    if (!state) {
+      ElMessage({
+        message: '批量确认中状态只能为待审核',
+        type: 'warning',
+      });
+      return;
+    }
+  }else{
+    if(val.workOrderStatus != '40'){
+      ElMessage({
+        message: '状态错误,已经确认过',
+        type: 'warning',
+      });
+      return
+    }
+  }
+
   details.loadingObj.list = true; //开启加载效果
-  if (UserPermissions.value == '总部客服经理' && TabPermissions.value == '1') {
     // 完结结果确定
     $_updateManagerConfirmed(data)
       .then(res => {
@@ -2812,36 +2992,146 @@ const DetermineStorage = val => {
         tabChenge(TabPermissions.value);
       })
       .catch(res => {
+        console.log(res,'错误信息');
+      }).finally(res=>{
         details.loadingObj.list = false; //关闭加载效果
-      });
+      })
     // 赔款方
     console.log(data, '处理好的值');
+};
+// 处理完毕里面确定（仓库客服用的）
 
-    return;
+const ResultConfirmation = (val) => {
+if(UserPermissions.value == '仓库客服'){ //处理完毕菜单下面确定按钮用于确定处理结果（仓库客服用的）
+  let data = {
+    assignList: [],
+  };
+  let ConfirmStatus = false; //批量确认状态
+  if (!val.row) {
+    // 说明点击的批量确定
+    console.log('当前点击的批量确定');
+    if (!details.selectionList.length) {
+      ElMessage({
+        message: '请勾选要处理的数据数据',
+        type: 'warning',
+      });
+      return;
+    } else {
+      ConfirmStatus = true; //说明走的是批量
+      data['assignList'] = details.selectionList.map(item => item.id);
+      console.log(data['assignList'], '批量确定处理好的参数');
+    }
+  } else {
+    let ID = {};
+    ID = val.row.id;
+    data['assignList'].push(ID);
   }
+ 
+
   // 仓库客服
-  if (
-    TabPermissions.value == '2' && UserPermissions.value == '仓库客服' && val.row.workOrderStatus != '30'
-  ) {
-    // 处理结果确定
-    console.log(data, '处理好的数据');
-    $_updateWorkOrderStatus(data)
+
+  if (ConfirmStatus) {
+    // 走的批量确认
+    let state = details.selectionList.every(item => item.workOrderStatus == '21');
+    if (!state) {
+      ElMessage({
+        message: '批量确认中有状态不符合的必须为处理结果已提交',
+        type: 'warning',
+      });
+      return;
+    }
+  }else{
+    if(val.workOrderStatus == '30'){
+      ElMessage({
+        message: '状态错误,已经确认过',
+        type: 'warning',
+      });
+      return
+    }
+  }
+  details.loadingObj.list = true; //开启加载效果
+  console.log(data, '处理好的数据');
+  $_updateWorkOrderStatus(data)
+    .then(res => {
+      console.log(res, '确定提交存储');
+      if (res.data.code == 200) {
+        ElMessage({
+          message: res.data.msg,
+          type: 'success',
+        });
+      }
+      tabChenge(TabPermissions.value);
+    })
+    .catch(res => {
+      details.loadingObj.list = false; //关闭加载效果
+    });
+  }else{
+    let data = {
+    assignList: [],
+  };
+  let ConfirmStatus = false; //批量确认状态
+  if (!val.row) {
+    // 说明点击的批量确定
+    console.log('当前点击的批量确定');
+    if (!details.selectionList.length) {
+      ElMessage({
+        message: '请勾选要处理的数据数据',
+        type: 'warning',
+      });
+      return;
+    } else {
+      ConfirmStatus = true; //说明走的是批量
+      data['assignList'] = details.selectionList.map(item => item.id);
+      console.log(data['assignList'], '批量确定处理好的参数');
+    }
+  } else {
+    let ID = {};
+    ID = val.row.id;
+    data['assignList'].push(ID);
+  }
+
+  if (ConfirmStatus) {
+    // 走的批量确认
+    let state = details.selectionList.every(item => item.workOrderStatus == '40');
+    if (!state) {
+      ElMessage({
+        message: '批量确认中状态只能为待审核',
+        type: 'warning',
+      });
+      return;
+    }
+  }else{
+    if(val.workOrderStatus != '40'){
+      ElMessage({
+        message: '状态错误,已经确认过',
+        type: 'warning',
+      });
+      return
+    }
+  }
+
+  details.loadingObj.list = true; //开启加载效果
+    // 完结结果确定
+    $_updateManagerConfirmed(data)
       .then(res => {
-        console.log(res, '确定提交存储');
         if (res.data.code == 200) {
           ElMessage({
             message: res.data.msg,
             type: 'success',
           });
         }
+        console.log(res, '处理完毕确定');
         tabChenge(TabPermissions.value);
       })
       .catch(res => {
+        console.log(res,'错误信息');
+      }).finally(res=>{
         details.loadingObj.list = false; //关闭加载效果
-      });
+      })
+    // 赔款方
+    console.log(data, '处理好的值');
   }
 };
-
 // 批量打回
 const BatchReturn = () => {
   BatchFrom.value.businessDepartment = [];

src/views/aftersales/aftersalesWorkOrderend.vue

@@ -1,5 +1,7 @@
 <template>
-  <el-card class="box-card">
+  <el-card class="box-card" 
+  v-loading="Pageloading"
+    element-loading-text="Loading...">
     <!-- <template #header>
       <div class="card-header">
         <span>{{
@@ -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,7 +582,7 @@
             > -->
 
             <el-button
-              v-if="$route.query.index == '0'"
+              v-if="$route.query.workOrderStatus == '10' && UserPermissions.value != '仓库客服' "
               type="primary"
               class="button"
               @click="CustomerServiceCompleted"
@@ -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: '' },
@@ -1873,7 +1879,7 @@ const submit = () => {
     console.log(data, '处理好的值');
 
     // 赔款方
-
+    Pageloading.value = true;//开启页面加载
     $_addCompletionEnd(data)
       .then(res => {
         console.log(res, '完结成功返回值');
@@ -1888,6 +1894,7 @@ const submit = () => {
         }
       })
       .catch(res => {
+        Pageloading.value = false;//开启页面加载
         console.log(res, '提交失败');
       });
   } else {
@@ -1972,7 +1979,7 @@ const submit = () => {
 
     data.aftersalesProcessingResultsDTO.warehouseId = info.warehouseId; //仓库ID
     console.log(data, '处理好的数据');
-
+    Pageloading.value = true;//开启页面加载
     $_addProcessingResults(data)
       .then(res => {
         console.log(res, '提交后的参数');
@@ -1986,7 +1993,9 @@ const submit = () => {
           AddressClosed('/aftersales/aftersalesWorkOrderend'); //删除当前页面
         }
       })
-      .catch(res => {});
+      .catch(res => {
+        Pageloading.value = false;//开启页面加载
+      });
   }
 };
 // 消息回复
@@ -2580,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;
@@ -2741,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/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

@@ -4095,7 +4095,7 @@ export default {
       }
       if(!this.StackingPhoto.length){
         ElMessage({
-        message: '至少上传一张对码照片',
+        message: '至少上传一张堆码照片',
         type: 'warning',
       })
         return

vite.config.js

@@ -25,7 +25,7 @@ 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',