diff --git a/src/router/views/index.js b/src/router/views/index.js
index 84c17f65..8d69b1d1 100644
--- a/src/router/views/index.js
+++ b/src/router/views/index.js
@@ -1193,18 +1193,18 @@ export default [
     ],
   },
 
-  // {
-  //   path: '/aftersales/VueTemp',
-  //   component: Layout,
-  //   redirect: '/aftersales/VueTemp',
-  //   children: [
-  //     {
-  //       path: '/aftersales/VueTemp',
-  //       name: '工单',
-  //       component: () => import('@/views/aftersales/aftersalesWorkOrder.vue'),
-  //     },
-  //   ],
-  // },
+  {
+    path: '/aftersales/aftersalesWorkOrder',
+    component: Layout,
+    redirect: '/aftersales/aftersalesWorkOrder',
+    children: [
+      {
+        path: '/aftersales/aftersalesWorkOrder',
+        name: '工单',
+        component: () => import('@/views/aftersales/aftersalesWorkOrder.vue'),
+      },
+    ],
+  },
   {
     path: '/aftersales/aftersalesWorkOrderAdd',
     component: Layout,
diff --git a/src/views/aftersales/aftersalesWorkOrder.vue b/src/views/aftersales/aftersalesWorkOrder.vue
index ea513fcf..9a46ff2a 100644
--- a/src/views/aftersales/aftersalesWorkOrder.vue
+++ b/src/views/aftersales/aftersalesWorkOrder.vue
@@ -1753,6 +1753,7 @@ const view = val => {
       warehouseId: val.row.warehouseId,
       workOrderNumber: val.row.workOrderNumber, //添加异常记录包条码
       businessId: val.row.businessId,
+      ProcessType:TabPermissions.value==2?'2':TabPermissions.value==3?'1':'', //类型 1 待处理 2 已处理
     },
   });
   return;
diff --git a/src/views/aftersales/aftersalesWorkOrderInfo.vue b/src/views/aftersales/aftersalesWorkOrderInfo.vue
index 3791b685..792c1e9b 100644
--- a/src/views/aftersales/aftersalesWorkOrderInfo.vue
+++ b/src/views/aftersales/aftersalesWorkOrderInfo.vue
@@ -1096,6 +1096,7 @@ const EditInformation = () => {
       warehouseId: $route.query.warehouseId,
       workOrderNumber: $route.query.workOrderNumber,
       RouterState: true,
+      ProcessType:$route.query.ProcessType, //类型 1 待处理 2 已处理
     },
   });
 };
@@ -1378,6 +1379,7 @@ const EndJump = () => {
     flex-wrap: wrap;
     margin-top: 26px;
     justify-content: space-between;
+    justify-content: flex-start;
     .name {
       display: flex;
       margin-bottom: 20px;
diff --git a/src/views/aftersales/aftersalesWorkOrderend.vue b/src/views/aftersales/aftersalesWorkOrderend.vue
index c2b6c946..c0f853bd 100644
--- a/src/views/aftersales/aftersalesWorkOrderend.vue
+++ b/src/views/aftersales/aftersalesWorkOrderend.vue
@@ -1071,8 +1071,9 @@ const onLoad = () => {
 
       // 完结信息回显
       // 收款方
-      CompensationParty.value = [];
+    
       if (res.data.data.completionRecipientEntityList.length > 0) {
+        CompensationParty.value = [];
         res.data.data.completionRecipientEntityList.forEach((item, index) => {
           TotalamountReceived.value += Number(item.money);
           CompensationParty.value.push({
@@ -1532,7 +1533,7 @@ const PaymentConfirmation = val => {
 // 提交信息
 const submit = () => {
   console.log(UserPermissions.value, '当前角色');
-  // if (UserPermissions.value == '职能客服' || UserPermissions.value == '客服经理' ) {
+  if (UserPermissions.value == '职能客服' || UserPermissions.value == '客服经理' ) {
 
   // 完结的逻辑
   // 异常问题描述非必填
@@ -1605,25 +1606,25 @@ const submit = () => {
     // 赔款方
 
     console.log(data, '处理好的值');
-    // $_addCompletionEnd(data).then(res => {
-    //   $router.push('/aftersales/aftersalesWorkOrder');
-    //   console.log(res, '完结成功返回值');
-    //   if (res.data.code == 200) {
-    //     ElMessage({
-    //       showClose: true,
-    //       message: res.data.msg,
-    //       type: 'success',
-    //     });
-    //   }
-    // });
-    // }else{
-    //   ElMessage({
-    //     message: '权限不足',
-    //     type: 'warning',
-    //   });
-    //   console.log(UserPermissions.value);
-    //   return;
-    // }
+    $_addCompletionEnd(data).then(res => {
+      $router.push('/aftersales/aftersalesWorkOrder');
+      console.log(res, '完结成功返回值');
+      if (res.data.code == 200) {
+        ElMessage({
+          showClose: true,
+          message: res.data.msg,
+          type: 'success',
+        });
+      }
+    });
+    }else{
+      ElMessage({
+        message: '权限不足',
+        type: 'warning',
+      });
+      console.log(UserPermissions.value);
+      return;
+    }
   } else {
     if (UserPermissions.value != '仓库客服') {
       ElMessage({
@@ -1684,8 +1685,7 @@ const submit = () => {
         }
       })
       .filter(item => item !== null);
-    data.aftersalesProcessingResultsDTO.processingMoneyEntityList =
-      data['processingMoneyEntityList'];
+    data.aftersalesProcessingResultsDTO.processingMoneyEntityList =  data['processingMoneyEntityList'];
     console.log('走到了这一步');
     data.aftersalesProcessingResultsDTO.workOrderId = $route.query.id; //异常工单ID
     data.aftersalesProcessingResultsDTO['resultType'] = ProcessingList.value
@@ -1705,7 +1705,7 @@ const submit = () => {
     console.log(data, '处理好的数据');
     delete data.aftersalesProcessingResultsDTO.id; //删除ID字段
 
-    (data.aftersalesProcessingResultsDTO.warehouseId = info.warehouseId), //仓库ID
+    data.aftersalesProcessingResultsDTO.warehouseId = info.warehouseId; //仓库ID
       console.log(data, '处理好的数据');
     $_addProcessingResults(data).then(res => {
       console.log(res, '提交后的参数');
diff --git a/src/views/aftersales/aftersalesWorkOrdermodify.vue b/src/views/aftersales/aftersalesWorkOrdermodify.vue
index 94f7f32d..8eb3afa5 100644
--- a/src/views/aftersales/aftersalesWorkOrdermodify.vue
+++ b/src/views/aftersales/aftersalesWorkOrdermodify.vue
@@ -635,6 +635,7 @@ const deletePackageInfo = ref([]); //被删除的包间信息
 const unDecreaseImageEntityList = ref([]); //移除的货损图片
 const NewImageAddress = ref([]); //旧的片地址
 const InitialresponsibleParty = ref(); //初始的责任方
+const ProcessingParty = ref(); //拷贝一份处理方
 const CompensationParty = ref([
   { name: '', state: 0, num: null, reason: '', cld: 1, explains: '' }, //赔款方
   { name: '', state: 1, num: null, reason: '', cld: 1, explains: '' }, //收款方
@@ -817,6 +818,8 @@ const onLoad = () => {
         Indexform.value.processor.push(item.businessId);
       }
     });
+    ProcessingParty.value = JSON.parse(JSON.stringify(Indexform.value.processor)); //拷贝一份处理方
+    console.log(ProcessingParty.value, '拷贝的处理方');
     console.log(Indexform.value.processor, ' Indexform.value.processor');
     getDictionaryBiz('pc_work_order').then(res => {
       //处理结果字典
@@ -866,33 +869,38 @@ const onLoad = () => {
     Indexform.value.compensationTime = res.data.data.processingResultsVO.compensationTime;
     // 处理结果说明回显
     Indexform.value.resultDescription = res.data.data.processingResultsVO.resultDescription;
-    // 收款方
-    CompensationParty.value = [];
-    if (res.data.data.completionRecipientEntityList) {
-      if (res.data.data.completionRecipientEntityList.length > 0) {
-        res.data.data.completionRecipientEntityList.forEach((item, index) => {
-          TotalamountReceived.value += Number(item.money);
+
+    if (
+      res.data.data.completionRecordEntities.length ||
+      res.data.data.completionRecipientEntityList.length
+    ) {
+      // 如果收款方和赔款方存在数据清空初始数据
+      CompensationParty.value = [];
+
+      // 赔款方
+      if (res.data.data.completionRecordEntities.length) {
+        res.data.data.completionRecordEntities.forEach((item, index) => {
+          TotalamountCompensation.value += Number(item.money);
           CompensationParty.value.push({
-            state: 1, //状态
+            state: 0, //状态
             num: item.money, //金额
-            name: item.recipient, //收款方名字
-            reason: item.reasonReceivingPayment, //收款方原因
+            name: item.indemnitor, //收款方名字
+            reason: item.reason, //收款方原因
             explains: item.explains, //收款方说明
             cld: index + 1,
           });
         });
       }
-    }
-    if (res.data.data.completionRecordEntities) {
-      // 赔款方
-      if (res.data.data.completionRecordEntities.length > 0) {
-        res.data.data.completionRecordEntities.forEach((item, index) => {
-          TotalamountCompensation.value += Number(item.money);
+
+      // 收款方
+      if (res.data.data.completionRecipientEntityList.length) {
+        res.data.data.completionRecipientEntityList.forEach((item, index) => {
+          TotalamountReceived.value += Number(item.money);
           CompensationParty.value.push({
-            state: 0, //状态
+            state: 1, //状态
             num: item.money, //金额
-            name: item.indemnitor, //收款方名字
-            reason: item.reason, //收款方原因
+            name: item.recipient, //收款方名字
+            reason: item.reasonReceivingPayment, //收款方原因
             explains: item.explains, //收款方说明
             cld: index + 1,
           });
@@ -900,6 +908,7 @@ const onLoad = () => {
       }
     }
 
+    Indexform.value.arbitrate = res.data.data.reasonArbitration; //仲裁原因
     // 异常类型下标
     SelectType.value = IndexException.value.find(
       item => item.value == Indexform.value.workOrderType
@@ -1147,17 +1156,17 @@ const ConfirmForm = () => {
     packageEntityList: [], //新增的包件信息 (完成)
     unPpackageEntityList: [], //取消的包件ID（完成）
 
-    processorEntityList: [], //新增的责任方和处理方
-    unProcessorEntityList: [], //取消的责任方和处理方
+    processorEntityList: [], //新增的责任方和处理方(完成)
+    unProcessorEntityList: [], //取消的责任方和处理方（完成）
 
     decreaseImageEntityList: [], //损货图片 （完成）
     unDecreaseImageEntityList: [], //取消的损货图片（完成）
-    completionRecipientEntities: [], //异常工单完结收款方
-    completionRecordEntities: [], //异常工单完结赔款方
-    aftersalesProcessingResultsDTO: {}, //处理结果
+    completionRecipientEntities: [], //异常工单完结收款方(完成暂不可修改)
+    completionRecordEntities: [], //异常工单完结赔款方(完成暂不可修改)
+    aftersalesProcessingResultsDTO: {}, //处理结果（完成暂不可修改）
 
-    personResponsibleDTO: [], //添加预计责任人
-    unPersonResponsibleDTO: [], //取消预计责任人
+    personResponsibleDTO: [], //添加预计责任人(完成)
+    unPersonResponsibleDTO: [], //取消预计责任人（完成）
 
     surveyRecordDTO: {}, //调查经过
   };
@@ -1167,6 +1176,13 @@ const ConfirmForm = () => {
     objB => !unPackageInfo.value.some(objA => JSON.stringify(objA) === JSON.stringify(objB))
   ); //修改过的包件信息
 
+  // 调查经过
+  DataSubmit.surveyRecordDTO = {
+    content: Indexform.value.investigationPocess, //内容'
+    workOrderId: $route.query.id, //工单ID
+    // pictureUrl: KFfeel.value.join(','), //附件路径
+  };
+
   if (Modified.length) {
     // 如果有修改过包件信息执行
     Modified.forEach(item => {
@@ -1212,6 +1228,7 @@ const ConfirmForm = () => {
       });
     }
   }
+
   // 移除的包件ID
   DataSubmit['unPpackageEntityList'] = deletePackageInfo.value.map(item => item.id);
 
@@ -1228,28 +1245,173 @@ const ConfirmForm = () => {
   modifyresponsibility.forEach(item => {
     DataSubmit['personResponsibleDTO'].push({
       wordOrderId: Indexform.value.workOrderNumber, //工单异常ID
-      personResponsibleId:personResponsibleList.value.find(obj => obj.id == item.personResponsibleName)?.id || null, //责任人ID
-      personResponsibleName:personResponsibleList.value.find(obj => obj.id == item.personResponsibleName)?.name || null, //责任人名称
+      personResponsibleId:
+        personResponsibleList.value.find(obj => obj.id == item.personResponsibleName)?.id || null, //责任人ID
+      personResponsibleName:
+        personResponsibleList.value.find(obj => obj.id == item.personResponsibleName)?.name || null, //责任人名称
       businessId: warehouseData.value.find(obj => obj.value == item.businessName)?.value || null, //责任方ID
-      businessName:warehouseData.value.find(obj => obj.value == item.businessName)?.label || null, //责任方名称//责任方名称
-      responsibilityRatio:item.responsibilityRatio, //责任比例
+      businessName: warehouseData.value.find(obj => obj.value == item.businessName)?.label || null, //责任方名称//责任方名称
+      responsibilityRatio: item.responsibilityRatio, //责任比例
       description: item.description, //说明
     });
   });
-// 被移除的责任方处理
-if(unProcessorEntityList.value.length){
-  unProcessorEntityList.value.forEach(item=>{
-    DataSubmit['unPersonResponsibleDTO'].push({
-      wordOrderId: Indexform.value.workOrderNumber, //工单异常ID
-      personResponsibleId:personResponsibleList.value.find(obj => obj.id == item.personResponsibleName)?.id || null, //责任人ID
-      personResponsibleName:personResponsibleList.value.find(obj => obj.id == item.personResponsibleName)?.name || null, //责任人名称
-      businessId: warehouseData.value.find(obj => obj.value == item.businessName)?.value || null, //责任方ID
-      businessName:warehouseData.value.find(obj => obj.value == item.businessName)?.label || null, //责任方名称//责任方名称
-      responsibilityRatio:item.responsibilityRatio, //责任比例
-      description: item.description, //说明
+  // 被移除的责任方处理
+  if (unProcessorEntityList.value.length) {
+    unProcessorEntityList.value.forEach(item => {
+      DataSubmit['unPersonResponsibleDTO'].push({
+        wordOrderId: Indexform.value.workOrderNumber, //工单异常ID
+        personResponsibleId:
+          personResponsibleList.value.find(obj => obj.id == item.personResponsibleName)?.id || null, //责任人ID
+        personResponsibleName:
+          personResponsibleList.value.find(obj => obj.id == item.personResponsibleName)?.name ||
+          null, //责任人名称
+        businessId: warehouseData.value.find(obj => obj.value == item.businessName)?.value || null, //责任方ID
+        businessName:
+          warehouseData.value.find(obj => obj.value == item.businessName)?.label || null, //责任方名称//责任方名称
+        responsibilityRatio: item.responsibilityRatio, //责任比例
+        description: item.description, //说明
+      });
     });
-  })
-}
+  }
+
+  // 判断是否处理方发送了改变
+  let arraysAreEqual =
+    ProcessingParty.value.length === Indexform.value.processor.length &&
+    ProcessingParty.value.every(aElement => Indexform.value.processor.includes(aElement));
+  if (arraysAreEqual) {
+    Indexform.value.processor.forEach(item => {
+      DataSubmit['processorEntityList'].push({
+        businessName: warehouseData.value.find(obj => obj.value == item).label, //名称
+        businessId: warehouseData.value.find(obj => obj.value == item).value, //ID
+        workOrderId: $route.query.id, //异常工单ID
+        conditions: 1, //状态  1正常  2新增  3取消
+        typesOf: 2, //1 责任方 2 处理方
+        warehouseId: $route.query.warehouseId, //仓库ID
+        processingStatus: $route.query.ProcessType, //处理状态 类型 1 待处理 2 已处理
+      });
+    });
+    console.log('处理方没有发送改变');
+  } else {
+    // 如果发送了改变才执行下面的操作
+    console.log(ProcessingParty.value, '初始值处理方');
+    // 筛选出发送改变的
+    let changedElements = Indexform.value.processor.filter(
+      bElement => !ProcessingParty.value.some(aElement => aElement === bElement)
+    );
+    console.log(changedElements, '发送改变的处理方');
+    // 如果有发送改变的处理方执行
+    if (changedElements) {
+      // 新增的责任方和处理方
+      changedElements.forEach(item => {
+        DataSubmit['processorEntityList'].push({
+          businessName: warehouseData.value.find(obj => obj.value == item).label, //名称
+          businessId: warehouseData.value.find(obj => obj.value == item).value, //ID
+          workOrderId: $route.query.id, //异常工单ID
+          conditions: 2, //状态  1正常  2新增  3取消
+          typesOf: 2, //1 责任方 2 处理方
+          warehouseId: $route.query.warehouseId, //仓库ID
+          processingStatus: $route.query.ProcessType, //处理状态 类型 1 待处理 2 已处理
+        });
+      });
+    }
+
+    // 筛选出被移除的处理方
+    let removedElements = ProcessingParty.value.filter(
+      aElement => !Indexform.value.processor.includes(aElement)
+    );
+    console.log(removedElements, '被移除的处理方');
+    if (removedElements.length) {
+      // 取消的责任方和处理方
+      Indexform.value.processor.forEach(item => {
+        DataSubmit['unProcessorEntityList'].push({
+          businessName: warehouseData.value.find(obj => obj.value == item).label, //名称
+          businessId: warehouseData.value.find(obj => obj.value == item).value, //ID
+          workOrderId: $route.query.id, //异常工单ID
+          conditions: 3, //状态  1正常  2新增  3取消
+          typesOf: 2, //1 责任方 2 处理方
+          warehouseId: $route.query.warehouseId, //仓库ID
+          processingStatus: $route.query.ProcessType, //处理状态 类型 1 待处理 2 已处理
+        });
+      });
+    }
+  }
+
+
+
+  
+
+
+
+//   // 完结信息修改
+//   console.log(CompensationParty.value);
+//   // 异常工单完结赔款方
+// DataSubmit['completionRecordEntities'] = CompensationParty.value
+//   .filter(item => item.state === 0) // 先筛选出状态为 0 的项
+//   .map(item => {
+//     return {
+//       indemnitor: item.name, // 赔款方
+//       reason: item.reason, // 原因
+//       money: Number(item.num), // 金额
+//       reasonArbitration: item.reason, // 说明
+//       workOrderId: $route.query.id, // 异常工单
+//       warehouseId: $route.query.warehouseId, // 仓库ID
+//     };
+//   });
+//   // 异常工单完结收款方
+// DataSubmit['completionRecipientEntities'] = CompensationParty.value
+//   .filter(item => item.state === 1) // 先筛选出状态为 1 的项
+//   .map(item => {
+//     return {
+//       recipient: item.name, // 收款方
+//       reasonReceivingPayment: item.reason, // 原因
+//       money: Number(item.num), // 金额
+//       workOrderNumber: $route.query.workOrderNumber, // 工单号
+//       responsibleParty: FangAddList.value
+//             .map(aItem =>
+//               warehouseData.value
+//                 .filter(bItem => bItem.value === aItem.businessName)
+//                 .map(match => match.label)
+//                 .join(',')
+//             )
+//             .join(','),
+//       warehouseId: $route.query.warehouseId, // 仓库ID
+//       workOrderId: $route.query.id, //异常工单
+//     };
+//   });
+
+
+
+//   // 支付方式
+//   DataSubmit.aftersalesProcessingResultsDTO['compensationMethod'] = ProcessingList.value
+//       .map(item => item.text)
+//       .join(',');
+
+  
+//       DataSubmit.aftersalesProcessingResultsDTO['processingMoneyEntityList'] = ProcessingList.value
+//       .map(item => {
+//         console.log(item);
+//         let match = ProcessingResults.value.find(element => element.dictValue == item.name);
+//         if (match) {
+//           let paymentMethodMatch = Paymentmethod.value.find(
+//             paymentMethod => paymentMethod.dictKey == item.payment
+//           );
+//           return {
+//             resultType: match.dictKey, //赔方式的key
+//             money: item.input, //金额
+//             typesOf: 1, //固定参数
+//             compensationMethod: paymentMethodMatch ? paymentMethodMatch.dictKey : '未知支付方式',
+//             compensationMethodName: paymentMethodMatch
+//               ? paymentMethodMatch.dictValue
+//               : '未知支付方式',
+//             resultName: item.name, //处理结果名字
+//           };
+//         } else {
+//           return null;
+//         }
+//       })
+//       .filter(item => item !== null);
+
+
 
 
   //移除的货损图片
@@ -1271,38 +1433,42 @@ const Arbitrationcompleted = () => {
     },
   };
   data.aftersalesProcessingResultsDTO.workOrderId = $route.query.id; //异常工单ID
-  CompensationParty.value.forEach(item => {
-    if (item.state == 0) {
-      // 赔款
-      data['completionRecordEntities'].push({
-        indemnitor: item.name, //赔款方
-        reason: item.reason, //原因
-        money: Number(item.num), //金额
-        reasonArbitration: item.reason, //说明
-        workOrderId: $route.query.id, //异常工单
-        warehouseId: $route.query.warehouseId, //仓库ID
-      });
-    } else {
-      // 收款方
-      data['completionRecipientEntities'].push({
-        recipient: item.name, //收款方
-        reasonReceivingPayment: item.reason, //收款原因
-        money: Number(item.num), //金额
-        responsibleParty: FangAddList.value
-          .map(aItem =>
-            warehouseData.value
-              .filter(bItem => bItem.value === aItem.businessName)
-              .map(match => match.label)
-              .join(',')
-          )
-          .join(','),
-        workOrderNumber: $route.query.workOrderNumber, //工单号
-        workOrderId: $route.query.id, //异常工单
-        warehouseId: $route.query.warehouseId, //仓库ID
-      });
-    }
+
+  DataSubmit['completionRecordEntities'] = CompensationParty.value
+  .filter(item => item.state === 0) // 先筛选出状态为 0 的项
+  .map(item => {
+    return {
+      indemnitor: item.name, // 赔款方
+      reason: item.reason, // 原因
+      money: Number(item.num), // 金额
+      reasonArbitration: item.reason, // 说明
+      workOrderId: $route.query.id, // 异常工单
+      warehouseId: $route.query.warehouseId, // 仓库ID
+    };
+  });
+
+DataSubmit['completionRecipientEntities'] = CompensationParty.value
+  .filter(item => item.state === 1) // 先筛选出状态为 1 的项
+  .map(item => {
+    return {
+      recipient: item.name, // 收款方
+      reasonReceivingPayment: item.reason, // 原因
+      money: Number(item.num), // 金额
+      workOrderNumber: $route.query.workOrderNumber, // 工单号
+      responsibleParty: FangAddList.value
+            .map(aItem =>
+              warehouseData.value
+                .filter(bItem => bItem.value === aItem.businessName)
+                .map(match => match.label)
+                .join(',')
+            )
+            .join(','),
+      warehouseId: $route.query.warehouseId, // 仓库ID
+      workOrderId: $route.query.id, //异常工单
+    };
   });
 
+
   // 处理结果
 
   data.aftersalesProcessingResultsDTO['processingMoneyEntityList'] = ProcessingList.value
diff --git a/src/views/distribution/deliverylist/distributionDeliveryListmar.vue b/src/views/distribution/deliverylist/distributionDeliveryListmar.vue
index 5af87830..f72f7882 100644
--- a/src/views/distribution/deliverylist/distributionDeliveryListmar.vue
+++ b/src/views/distribution/deliverylist/distributionDeliveryListmar.vue
@@ -124,6 +124,13 @@
                                     <el-text size="small" @click="editmap(slotProps.scope)">地 图</el-text>
                                     <!--                  <el-text size="small" v-if="slotProps.scope.row.deliveryStatusName !== '已完成' ||-->
                                     <!--              slotProps.scope.row.deliveryStatus !== '3'-->
+
+
+                                    <el-text size="small" v-if="slotProps.scope.row.deliveryStatusName !== '已完成' ||
+              slotProps.scope.row.deliveryStatus !== '3'
+              " @click="handleEdit(slotProps.scope)">编 辑
+                                    </el-text>
+
                                     <!--              " @click="handleEdit(slotProps.scope)">编 辑</el-text>-->
 
                                     <!--            <el-button size="small" @click="costadd(slotProps.scope)">费 用 增 项</el-button>-->
diff --git a/src/views/distribution/signfor/distributionSignfortreat.vue b/src/views/distribution/signfor/distributionSignfortreat.vue
index b3dd590c..c7a8eead 100644
--- a/src/views/distribution/signfor/distributionSignfortreat.vue
+++ b/src/views/distribution/signfor/distributionSignfortreat.vue
@@ -814,9 +814,29 @@ export default {
           fixed: false,
           sortable: true,
         },
+        {
+          prop: 'unloadedNumber',
+          label: '未装车件数',
+          type: 1,
+          values: '',
+          width: '130',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
         {
           prop: 'receivedQuantity',
-          label: '司机签收数',
+          label: '签收件数',
+          type: 1,
+          values: '',
+          width: '130',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'unreceivedQuantity',
+          label: '未签收件数',
           type: 1,
           values: '',
           width: '130',
diff --git a/src/views/distribution/turndelivery/deliveryMarket.vue b/src/views/distribution/turndelivery/deliveryMarket.vue
index da4b4217..f1859b80 100644
--- a/src/views/distribution/turndelivery/deliveryMarket.vue
+++ b/src/views/distribution/turndelivery/deliveryMarket.vue
@@ -256,6 +256,7 @@
         </el-form>
     </div>
     <h3>预约列表</h3>
+    <el-button type="primary" @click="addReservation">新 增</el-button>
     <div>
         <el-row>
           <tablecmt
@@ -358,6 +359,57 @@
     </el-dialog>
 
 
+
+    <el-dialog
+            title="预约池"
+            v-model="reservationDialogVisible"
+            width="70%"
+            height="50%"
+            >
+        <el-row>
+            <tablecmt
+                    :columnList="reservationListColumnList"
+                    :tableData="reservationListData"
+                    :loading="loading"
+                    @inputTxt="inputsc"
+                    @timeCheck="timesc"
+                    @btnCheck="btnsc"
+                    @selectCheck="selectsc"
+                    @selection="selectionChange"
+            >
+                <template #default="slotProps">
+                    <el-text v-if="isoperation" type="primary" link icon="el-icon-edit" @click="removeStockArticle(slotProps.scope.row)">移除</el-text>
+                </template>
+
+            </tablecmt>
+            <el-row>
+                <div class="avue-crud__pagination flex-c-sb" style="width: 100%">
+                    <div style="font-size: 14px">勾选数量: {{ selectionList.length }}</div>
+                    <!-- 分页模块 -->
+                    <el-pagination
+                            align="right"
+                            background
+                            @size-change="sizeChange"
+                            @current-change="currentChange"
+                            :current-page="page.currentPage"
+                            :page-sizes="[30, 50, 80, 120]"
+                            :page-size="page.pageSize"
+                            layout="total, sizes, prev, pager, next, jumper"
+                            :total="page.total"
+                    >
+                    </el-pagination>
+                </div>
+            </el-row>
+        </el-row>
+        <span slot="footer" class="dialog-footer">
+    <el-button @click="reservationDialogVisible = false">取 消</el-button>
+    <el-button type="primary" @click="saveAddReservation">确 定</el-button>
+  </span>
+    </el-dialog>
+
+
+
+
     <el-dialog
             title="提示"
             v-model="dialogVisible"
@@ -396,7 +448,7 @@
   import { getDictionaryBiz } from '@/api/system/dict';
   import option from '@/option/distribution/distributionReservation';
   import { getListTeamInfo } from '@/api/basicdata/basicdataTeamGroup';
-  import { deliveryTask, getReservationAddr } from '@/api/distribution/distributionReservation';
+  import { deliveryTask, getList, getReservationAddr } from '@/api/distribution/distributionReservation';
   import { getMarketDeliveryList, updateMarketDelivery,cancelDeliveryListTask } from '@/api/distribution/distributionDeliveryList';
   import { getListUser } from '@/api/distribution/distributionStockup';
   import { getPostList } from '@/api/system/post';
@@ -410,6 +462,16 @@
   export default {
     data() {
       return {
+        //新增预约窗口
+        reservationDialogVisible:false,
+        //预约单查询对象
+        reservationQuery:{},
+        reservationListData:[],
+        page: {
+          currentPage: 1,
+          pageSize: 30,
+          total: 40,
+        },
         columnList: [
         {
           prop: '',
@@ -421,6 +483,16 @@
           fixed: true,
         },
         {
+          prop: 'reservationCode',
+          label: '预约单号',
+          type: 2,
+          values: '',
+          width: '200',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+          {
           prop: 'stockArticleId',
           label: '订单自编号',
           type: 2,
@@ -430,6 +502,26 @@
           fixed: false,
           sortable: true,
         },
+          {
+            prop: 'warehouseName',
+            label: '仓库',
+            type: 2,
+            values: '',
+            width: '200',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+          },
+          {
+            prop: 'mallName',
+            label: '商场名称',
+            type: 2,
+            values: '',
+            width: '200',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+          },
         {
           prop: 'consignee',
           label: '收货人',
@@ -480,7 +572,7 @@
           fixed: false,
           sortable: true,
         },
-        {
+          {
           prop: 'deliveryWayName',
           label: '配送方式',
           type: 2,
@@ -490,7 +582,37 @@
           fixed: false,
           sortable: true,
         },
-        {
+          {
+            prop: 'deliveryTypeName',
+            label: '配送类型',
+            type: 2,
+            values: '',
+            width: '200',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+          },
+          {
+            prop: 'reservationStatusName',
+            label: '预约单状态',
+            type: 2,
+            values: '',
+            width: '200',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+          },
+          {
+            prop: 'stockupStatusName',
+            label: '备货状态',
+            type: 2,
+            values: '',
+            width: '200',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+          },
+          {
           prop: 'loadingStatusName',
           label: '装车状态',
           type: 2,
@@ -500,7 +622,7 @@
           fixed: false,
           sortable: true,
         },
-        {
+          {
           prop: 'signingStatusName',
           label: '签收状态',
           type: 2,
@@ -510,16 +632,26 @@
           fixed: false,
           sortable: true,
         },
-        {
-          prop: 'deliveryTypeName',
-          label: '配送类型',
-          type: 2,
-          values: '',
-          width: '200',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-        },
+          {
+            prop: 'reservationNum',
+            label: '包件数量',
+            type: 2,
+            values: '',
+            width: '200',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+          },
+          {
+            prop: 'reservationStockListNum',
+            label: '库存品数量',
+            type: 2,
+            values: '',
+            width: '200',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+          },
         {
           prop: 'collectFee',
           label: '到付运费',
@@ -560,9 +692,92 @@
           fixed: false,
           sortable: true,
         },
+
+
+          {
+            prop: '',
+            label: '操作',
+            type: 6,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: 'right',
+            hide: true,
+          },
+      ],
+        reservationListColumnList: [
+        {
+          prop: '',
+          label: '序号',
+          type: 0,
+          values: '',
+          width: 55,
+          checkarr: [],
+          fixed: true,
+        },
+        {
+          prop: 'reservationCode',
+          label: '预约单号',
+          type: 2,
+          values: '',
+          width: '200',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+          {
+          prop: 'stockArticleId',
+          label: '订单自编号',
+          type: 2,
+          values: '',
+          width: '200',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+          {
+            prop: 'warehouseName',
+            label: '仓库',
+            type: 2,
+            values: '',
+            width: '200',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+          },
+          {
+            prop: 'mallName',
+            label: '商场名称',
+            type: 2,
+            values: '',
+            width: '200',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+          },
+        {
+          prop: 'consignee',
+          label: '收货人',
+          type: 2,
+          values: '',
+          width: '200',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'deliveryAddress',
+          label: '收件地址',
+          type: 2,
+          values: '',
+          width: '200',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
         {
-          prop: 'reservationStatusName',
-          label: '预约信息状态',
+          prop: 'deliveryPhone',
+          label: '收件人电话',
           type: 2,
           values: '',
           width: '200',
@@ -571,8 +786,8 @@
           sortable: true,
         },
         {
-          prop: 'stockupStatusName',
-          label: '备货状态',
+          prop: 'reservationDate',
+          label: '预约时间',
           type: 2,
           values: '',
           width: '200',
@@ -581,8 +796,68 @@
           sortable: true,
         },
         {
-          prop: 'reservationNum',
-          label: '包件数量',
+          prop: 'periodOfTimeName',
+          label: '时段',
+          type: 2,
+          values: '',
+          width: '200',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+          {
+          prop: 'deliveryWayName',
+          label: '配送方式',
+          type: 2,
+          values: '',
+          width: '200',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+          {
+            prop: 'deliveryTypeName',
+            label: '配送类型',
+            type: 2,
+            values: '',
+            width: '200',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+          },
+          {
+            prop: 'reservationStatusName',
+            label: '预约单状态',
+            type: 2,
+            values: '',
+            width: '200',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+          },
+          {
+            prop: 'stockupStatusName',
+            label: '备货状态',
+            type: 2,
+            values: '',
+            width: '200',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+          },
+          {
+          prop: 'loadingStatusName',
+          label: '装车状态',
+          type: 2,
+          values: '',
+          width: '200',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+          {
+          prop: 'signingStatusName',
+          label: '签收状态',
           type: 2,
           values: '',
           width: '200',
@@ -590,6 +865,68 @@
           fixed: false,
           sortable: true,
         },
+          {
+            prop: 'reservationNum',
+            label: '包件数量',
+            type: 2,
+            values: '',
+            width: '200',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+          },
+          {
+            prop: 'reservationStockListNum',
+            label: '库存品数量',
+            type: 2,
+            values: '',
+            width: '200',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+          },
+        {
+          prop: 'collectFee',
+          label: '到付运费',
+          type: 2,
+          values: '',
+          width: '200',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'otherFee',
+          label: '其他费用',
+          type: 2,
+          values: '',
+          width: '200',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'replaceFee',
+          label: '代付运费',
+          type: 2,
+          values: '',
+          width: '200',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'fee',
+          label: '总费用',
+          type: 2,
+          values: '',
+          width: '200',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+
+
           {
             prop: '',
             label: '操作',
@@ -757,6 +1094,50 @@
       this.onLoad(this.page);
     },
     methods: {
+      //预约单新增
+      addReservation(){
+        console.log("aaaaa-------->",'执行预约新增');
+        //开启弹窗
+        this.reservationDialogVisible = true;
+        console.log("aaaaa-------->",'aaa');
+        //查询可进行预约的预约单
+        let excludeId=[];
+        if (this.reservationData.length>0){
+          //列表存在的预约单进行过滤
+          excludeId = this.reservationData.map(item=> item.id).join(",")
+        }
+        this.getAddReservationList(this.page,excludeId);
+
+
+
+      },
+      saveAddReservation(){
+        if (this.selectionList.length === 0 ){
+          this.$message.warning("请选择需要增加的预约单");
+        }
+
+
+        this.reservationData.push(...this.selectionList);
+
+        console.log('aaa->>>>>>',this.selectionList);
+        console.log('this.reservationData->>>>>>',this.reservationData);
+        this.reservationDialogVisible = false;
+
+
+
+      },
+      //查询可用预约单
+      getAddReservationList(page,excludeId,params={}){
+        this.reservationQuery.reservationStatus = '20';
+        this.reservationQuery.excludeId = excludeId;
+        getList(page.currentPage,page.pageSize , Object.assign(params,  this.reservationQuery)).then(res=>{
+          console.log('res=========>',res);
+          const data = res.data.data;
+          this.reservationListData = data.records;
+          this.page.total = data.total;
+        })
+
+      },
       //查询叉车人员
       async getFork() {
         let ides = '';
@@ -957,7 +1338,7 @@
                 type: 'warning',
               })
               return
-              } 
+              }
       }
 
       console.log(">>>>>>>>>>>> 配送类型:",this.aaa +"   "+ this.bbb)
@@ -1343,7 +1724,7 @@
         this.query = {};
       },
 
-    
+
 
       onLoad(page, params = {}) {
 
diff --git a/src/views/warehouse/parcelList/distributionParcelList.vue b/src/views/warehouse/parcelList/distributionParcelList.vue
index e6543f96..5bbde338 100644
--- a/src/views/warehouse/parcelList/distributionParcelList.vue
+++ b/src/views/warehouse/parcelList/distributionParcelList.vue
@@ -224,6 +224,16 @@ export default {
           fixed: false,
           sortable: true,
         },
+        {
+          prop: 'warehouseEntryTimeEnd',
+          label: '入库时间',
+          type: 2,
+          values: '',
+          width: '200',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
         {
           prop: 'orderPackageCode',
           label: '包条码',
@@ -728,10 +738,29 @@ export default {
       this.page.pageSize = pageSize;
       this.onLoad(this.page);
     },
+    formatDateTime(dateTimeString) {
+    // 检查时间字符串是否以 "00:00:00" 结束
+    if (dateTimeString.endsWith('00:00:00')) {
+        // 如果是，去除时间部分（包括前面的空格）
+        return dateTimeString.slice(0, -9);
+    } else {
+        // 如果不是，返回原始字符串
+        return dateTimeString;
+    }
+},
     onLoad(page, params = {}) {
       this.loading = true;
       getpage(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+        
+
         const data = res.data.data;
+        console.log(res,'获取到的页面初始值');
+        res.data.data.records.forEach(item=>{
+          if( item.warehouseEntryTimeEnd){
+            item.warehouseEntryTimeEnd=  this.formatDateTime(item.warehouseEntryTimeEnd)
+          }
+         
+        })
         this.page.total = data.total;
         this.data = data.records.map(val => {
           val.conditionsType = val.conditions === 1 ? '定制品' : '库存品';
diff --git a/vite.config.js b/vite.config.js
index 5f58ef50..0d63bc25 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -23,15 +23,15 @@ export default ({ mode, command }) => {
           // 新zyc
           // target: 'http://192.168.6.116:8777',
           // target: 'http://192.168.6.122:8777',
-          // target: 'http://192.168.10.25:13000',
+          target: 'http://192.168.10.25:13000',
           // target: 'http://192.168.10.25:2888',
-          // target: 'http://192.168.6.122:8777',
+        // target: 'http://192.168.6.122:8777',
           // target: 'http://192.168.6.116:8777',
           // tjj
           // sst
           // target: 'http://192.168.10.94:8888',
           // target: 'http://192.168.10.29:13000',
-          target: 'http://h5uapi.huitongys.com',
+          // target: 'http://h5uapi.huitongys.com',
           // target: 'http://test.api.huitongys.com',
           changeOrigin: true,
           rewrite: path => path.replace(/^\/api/, ''),