From 620e22d6ab35561fb5e5ab98e718fd358ba66702 Mon Sep 17 00:00:00 2001
From: xzg <4727863@qq.com>
Date: Wed, 27 Dec 2023 15:46:39 +0800
Subject: [PATCH 1/7] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/tablecmt/tablecmt.vue          |   2 +-
 src/option/aftersales/vueTvemp.js             |  12 +-
 src/views/aftersales/aftersalesWorkOrder.vue  | 110 +++++++++++++-----
 .../aftersales/aftersalesWorkOrderAdd.vue     |  82 +++++++------
 .../distributionDeliveryListedt.vue           |  36 +++---
 .../signfor/distributionSignforedt.vue        |  48 ++++----
 6 files changed, 183 insertions(+), 107 deletions(-)

diff --git a/src/components/tablecmt/tablecmt.vue b/src/components/tablecmt/tablecmt.vue
index b678a093..ff9f3c83 100644
--- a/src/components/tablecmt/tablecmt.vue
+++ b/src/components/tablecmt/tablecmt.vue
@@ -40,7 +40,7 @@
           <template #header>
             <!-- <el-text class="mx-1">{{ column.label }}</el-text> -->
             <el-input
-              v-if="column.type == 2"
+              v-if="column.type == 2 || column.type == 13"
               v-model.trim="column.values"
               clearable
               :placeholder="`请输入${column.label}`"
diff --git a/src/option/aftersales/vueTvemp.js b/src/option/aftersales/vueTvemp.js
index 58152504..e643f2d8 100644
--- a/src/option/aftersales/vueTvemp.js
+++ b/src/option/aftersales/vueTvemp.js
@@ -39,7 +39,7 @@ export const columnList = [
   {
     prop: 'workOrderNumber',
     label: '异常工单号',
-    type: 2,
+    type: 13,
     values: '',
     width: '120',
     checkarr: [],
@@ -743,6 +743,16 @@ export const AppealList = [
     sortable: true,
     head: false,
   },
+  {
+    prop: '',
+    label: '操作',
+    type: 6,
+    values: '',
+    width: '80',
+    checkarr: [],
+    fixed: 'right',
+    sortable: false,
+  },
 ]
 
 
diff --git a/src/views/aftersales/aftersalesWorkOrder.vue b/src/views/aftersales/aftersalesWorkOrder.vue
index 50ed9f0d..b2e6793c 100644
--- a/src/views/aftersales/aftersalesWorkOrder.vue
+++ b/src/views/aftersales/aftersalesWorkOrder.vue
@@ -120,10 +120,10 @@
             <!-- 申诉列表展示 -->
             <el-tabs
               type="border-card"
-              v-if="details.query.workOrderStatus == 30"
+              v-if="TabPermissions == 6"
               @tab-change="AppealTab"
             >
-              <el-tab-pane label="处理完毕"></el-tab-pane>
+              <el-tab-pane label="完结"></el-tab-pane>
               <el-tab-pane label="申诉列表"></el-tab-pane>
             </el-tabs>
             <!-- 首页表格 -->
@@ -154,9 +154,13 @@
                     <div class="ElBtnClass">
                       <div>
                         <!-- <el-button @click="addingRecord(slotProps.scope)">新增记录</el-button> -->
-                        <el-button v-if="TabPermissions != '4'" @click="view(slotProps.scope)"
+                        <el-button v-if="TabPermissions != '4' && !AppealStatusT" @click="view(slotProps.scope)"
                           >查看</el-button
                         >
+                        <!-- AppealStatusT申诉列表状态 -->
+                        <el-button v-if="AppealStatusT"
+                          >待添加</el-button
+                        >  
                         <!-- <el-button @click="ViewEvent(slotProps.scope)">编辑</el-button> -->
                         <!-- <el-button @click="reply(slotProps.scope)">回复</el-button> -->
                         <!-- <el-button @click="ViewDelete(slotProps.scope)">删除</el-button> -->
@@ -400,10 +404,10 @@
               <el-upload
                 v-model:file-list="AppealAttachment"
                 list-type="picture-card"
-                :on-preview="pictureList"
-                :on-remove="ImgListRemove"
+                :on-preview="AppealAttachmentpictureList"
+                :on-remove="AppealAttachmentImgListRemove"
                 :action="doubledCount"
-                :on-success="ImgSuccess"
+                :on-success="AppealAttachmentImgSuccess"
                 :before-upload="beforeAvatarUpload"
                 :headers="headers"
                 multiple
@@ -548,7 +552,7 @@ const TransportlossList = ref([
   //运损发现节点
 ]);
 const pageSize = ref(30); // 默认每一页几条
-const AppealAttachment=ref('');//申诉附件
+const AppealAttachment = ref([]); //申诉附件
 const total = ref(0); //页码总页数
 const KFinput = ref(''); //客服发送消息
 const Appealselection = ref([]); //申诉选择的责任人
@@ -1118,7 +1122,18 @@ const AddInfo = () => {
   //   });
   // });
 };
-
+// 上传图片规则
+const beforeAvatarUpload = rawFile => {
+  console.log(rawFile);
+  if (rawFile.type !== 'image/png' && rawFile.type !== 'image/jpeg') {
+    ElMessage.error('图片格式只能为 png/jpg!');
+    return false;
+  } else if (rawFile.size / 1024 / 1024 > 10) {
+    ElMessage.error('图片大小不能大于10MB!');
+    return false;
+  }
+  return true;
+};
 // 首页新增表单确定
 const ConfirmForm = () => {
   console.log(warehouseData.value, '准备好的数据');
@@ -1182,6 +1197,22 @@ const searchHide = () => {
   console.log(details);
   details.search = !details.search;
 };
+
+// 异常工单号点击查看
+const InformationViewing=(val)=>{
+  $router.push({
+    path: '/aftersales/aftersalesWorkOrderInfo',
+    query: {
+      id: val.row.id,
+      name: val.row.workOrderNumber + '-信息查看',
+      warehouseId: val.row.warehouseId,
+      workOrderNumber: val.row.workOrderNumber, //添加异常记录包条码
+      businessId: val.row.businessId,
+      ProcessType: TabPermissions.value == 2 ? '2' : TabPermissions.value == 3 ? '1' : '', //类型 1 待处理 2 已处理
+      RouteIndexs: TabPermissions.value, //当前记录参数
+    },
+  });
+}
 // 首页查看详情按钮
 const view = val => {
   console.log(val.row.id);
@@ -1297,6 +1328,18 @@ const addingRecord = val => {
   });
 };
 
+// 点击了申诉附件图片
+const AppealAttachmentpictureList = val => {
+  console.log(val, '点击申诉附件图片');
+};
+// 申诉附件移除
+const AppealAttachmentImgListRemove = val => {
+  console.log(val, '申诉附件移除');
+};
+// 申诉附件图片上传成功回调
+const AppealAttachmentImgSuccess = val => {
+  console.log(val, '申诉图片上传成功');
+};
 //  工单申诉按钮
 const appeal = val => {
   console.log(details.selectionList, 'details.selectionList');
@@ -1318,36 +1361,46 @@ const appeal = val => {
 };
 // 工单申诉确认按钮
 const Appealbutton = () => {
+  if(AppealAttachment.value.length>1){
+    ElMessage({
+      message: '只能上传一张图片',
+      type: 'warning',
+    });
+    return
+  }
   console.log(details.selectionList, '当前申诉的东西');
   loadingappeal.value = true; //开启加载效果
   console.log(Appealselection.value, '当前选择的责任人');
   console.log(warehouseData.value, '要循环处理的参数');
   let data = {
     peopleEntityList: [], //参数一
+    imagePath: '', //申诉图片附件
   };
   data.workOrderId = details.selectionList[0].lawoId;
   data.reason = Reasonforappeal.value;
 
-  (data.appealPeopleName = warehouseData.value
+  data.appealPeopleName = warehouseData.value
     .filter(item => Appealselection.value.includes(item.value))
     .map(item => item.label)
-    .join(',')), //实际责任人名称
-    details.selectionList.forEach(item => {
-      console.log(item.id);
-      console.log(item, '已经选择的列表');
-      data['peopleEntityList'].push({
-        workOrderId: item.id, //异常工单ID
-        warehouseId: item.warehouseId == '/' ? '' : item.warehouseId,
-        reason: Reasonforappeal.value, //申诉理由
-        claimant: userInfo.value.content.user_name, //申诉人
-        claimantUserId: userInfo.value.content.user_id, //申诉人ID
-        actualPersonName: warehouseData.value
-          .filter(item => Appealselection.value.includes(item.value))
-          .map(item => item.label)
-          .join(','), //实际责任人名称
-      });
+    .join(','); //实际责任人名称
+  details.selectionList.forEach(item => {
+    console.log(item.id);
+    console.log(item, '已经选择的列表');
+    data['peopleEntityList'].push({
+      workOrderId: item.id, //异常工单ID
+      warehouseId: item.warehouseId == '/' ? '' : item.warehouseId,
+      reason: Reasonforappeal.value, //申诉理由
+      claimant: userInfo.value.content.user_name, //申诉人
+      claimantUserId: userInfo.value.content.user_id, //申诉人ID
+      actualPersonName: warehouseData.value
+        .filter(item => Appealselection.value.includes(item.value))
+        .map(item => item.label)
+        .join(','), //实际责任人名称
     });
+  });
+  data.imagePath = AppealAttachment.value[0].response.data.link; //申诉图片
   console.log(data, '处理好的值');
+
   $_appealSubmit(data).then(res => {
     dialogappeal.value = false; //关闭申诉弹窗
     loadingappeal.value = false; //关闭加载效果
@@ -1754,11 +1807,11 @@ const AppealTab = val => {
     Tableheaderswitching(columnList); //切换表头
     console.log('处理完毕');
     ProcessingPartyState.value = false; //关闭处理方
-    details.query.workOrderStatus = 30;
+    details.query.workOrderStatus = 80;
     ArbitrationStatus.value = false; //不可以申请仲裁
     empty(); //清空搜索数据
     let data = {
-      workOrderStatus: 30,
+     
       ...details.query,
     };
     IndexTable(data);
@@ -2957,4 +3010,9 @@ const CompletedSubmission = () => {
 .el_textBtn {
   color: #9bb40d;
 }
+:deep(.el-upload-dragger) {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
 </style>
diff --git a/src/views/aftersales/aftersalesWorkOrderAdd.vue b/src/views/aftersales/aftersalesWorkOrderAdd.vue
index c499bfd2..9ecd28fe 100644
--- a/src/views/aftersales/aftersalesWorkOrderAdd.vue
+++ b/src/views/aftersales/aftersalesWorkOrderAdd.vue
@@ -137,36 +137,7 @@
       <el-input v-model="Indexform.orderCode" placeholder="请输入订单自编号" clearable />
     </el-form-item> -->
 
-      <!-- 必填 -->
 
-      <el-form-item
-        label="配送司机"
-        v-if="
-          groundlineSet ||
-          groundlineType == 3 ||
-          groundlineType == 4 ||
-          groundlineType == 8 ||
-          groundlineType == 5 ||
-          groundlineType == 7 ||
-          groundlineType == 8
-        "
-      >
-        <el-select
-          v-model="Indexform.deliveryDriver"
-          filterable
-          default-first-option
-          :reserve-keyword="false"
-          placeholder="请输入配送司机"
-          @change="changeDeliveryDriver"
-        >
-          <el-option
-            v-for="item in DeliveryDriver"
-            :key="item.value"
-            :label="item.driverName + '-' + item.trainNumber"
-            :value="item.id"
-          />
-        </el-select>
-      </el-form-item>
       <!-- 必填 -->
 
       <el-form-item
@@ -205,12 +176,44 @@
         <el-date-picker
           v-model="Indexform.deliveryTime"
           type="datetime"
-          format="YYYY-MM-DD HH:mm:ss"
+          format="YYYY-MM-DD"
           value-format="YYYY-MM-DD"
           placeholder="请选择配送时间"
-          @change="DeliveryTrainnumber"
         />
       </el-form-item>
+
+            <!-- 必填 -->
+
+            <el-form-item
+        label="配送司机"
+        v-if="
+          groundlineSet ||
+          groundlineType == 3 ||
+          groundlineType == 4 ||
+          groundlineType == 8 ||
+          groundlineType == 5 ||
+          groundlineType == 7 ||
+          groundlineType == 8
+        "
+      >
+        <el-select
+          v-model="Indexform.deliveryDriver"
+          filterable
+          default-first-option
+          :reserve-keyword="false"
+          placeholder="请输入配送司机"
+          @change="changeDeliveryDriver"
+        >
+          <el-option
+            v-for="item in DeliveryDriver"
+            :key="item.value"
+            :label="item.driverName + '-' + item.trainNumber"
+            :value="item.id"
+          />
+        </el-select>
+      </el-form-item>
+
+
       <el-form-item label="车辆路线" v-if="groundlineSet || groundlineType == 3">
         <el-input v-model="Indexform.vehicleRoute" placeholder="请输入车辆路线车次号" clearable />
       </el-form-item>
@@ -219,8 +222,8 @@
         <el-date-picker
           v-model="Indexform.deliverGoodsTime"
           type="datetime"
-          format="YYYY-MM-DD HH:mm:ss"
-          value-format="YYYY-MM-DD HH:mm:ss"
+          format="YYYY-MM-DD"
+          value-format="YYYY-MM-DD"
           placeholder="请选择发货时间"
         />
       </el-form-item>
@@ -708,7 +711,7 @@ const ResponsiblePartychange = (val, index) => {
   });
 };
 const onLoad = () => {
-  DeliveryTrainnumber(); //获取司机
+  // DeliveryTrainnumber(); //获取司机
   console.log($route.query.id, '页面初始化');
   routerState.value = $route.query.routerState;
   updateDictionary(IndexException.value, 'pc_work_order'); //异常类型
@@ -747,6 +750,14 @@ const DiscoveringNodesChange = val => {
 
 // 车次号自动带出时间司机
 function DeliveryTrainnumber() {
+  if(!Indexform.value.trainNumber){
+    Indexform.value.deliveryTime=''
+    Indexform.value.deliveryDriver=''
+    DeliveryDriver.value =[]
+  }
+  if(!Indexform.value.trainNumber){
+    return
+  }
   let data = {
     trainNumber: Indexform.value.trainNumber,
     taskTime: Indexform.value.deliveryTime,
@@ -754,9 +765,6 @@ function DeliveryTrainnumber() {
   data.current = 1; //页码
   data.size = 999; //条数
   $_shippingInformation(data).then(res => {
-    // DeliveryDriver;
-    // Indexform.deliveryDriver;
-
     console.log(res, '查询返回值');
     DeliveryDriver.value = res.data.data.records; //获取到的信息
     // 如果是精确搜索自动带入日期
diff --git a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue
index d7f78db9..4caad91e 100644
--- a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue
+++ b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue
@@ -1378,7 +1378,7 @@ export default {
           values: '',
           width: '150',
           checkarr: [],
-          fixed: false,
+          fixed: true,
           sortable: true,
           head: false,
         },
@@ -1389,7 +1389,7 @@ export default {
           values: '',
           width: '150',
           checkarr: [],
-          fixed: false,
+          fixed: true,
           sortable: true,
           head: false,
         },
@@ -1400,7 +1400,7 @@ export default {
           values: '',
           width: '150',
           checkarr: [],
-          fixed: false,
+          fixed: true,
           sortable: true,
           head: false,
         },
@@ -1411,7 +1411,7 @@ export default {
           values: '',
           width: '180',
           checkarr: [],
-          fixed: false,
+          fixed: true,
           sortable: true,
         },
         {
@@ -1419,7 +1419,7 @@ export default {
           label: '仓库',
           type: 2,
           values: '',
-          width: '180',
+          width: '100',
           checkarr: [],
           fixed: false,
           sortable: true,
@@ -1472,7 +1472,7 @@ export default {
           label: '一级品类',
           type: 2,
           values: '',
-          width: '180',
+          width: '100',
           checkarr: [],
           fixed: false,
           sortable: true,
@@ -1482,7 +1482,7 @@ export default {
           label: '二级品类',
           type: 2,
           values: '',
-          width: '180',
+          width: '100',
           checkarr: [],
           fixed: false,
           sortable: true,
@@ -1492,7 +1492,7 @@ export default {
           label: '三级品类',
           type: 2,
           values: '',
-          width: '180',
+          width: '100',
           checkarr: [],
           fixed: false,
           sortable: true,
@@ -1524,7 +1524,7 @@ export default {
           label: '包件状态',
           type: 1,
           values: '',
-          width: '180',
+          width: '80',
           checkarr: [],
           fixed: false,
           sortable: true,
@@ -1534,7 +1534,7 @@ export default {
           label: '冻结状态',
           type: 1,
           values: '',
-          width: '150',
+          width: '80',
           checkarr: [],
           fixed: false,
           sortable: true,
@@ -1544,7 +1544,7 @@ export default {
           label: '上架状态',
           type: 1,
           values: '',
-          width: '150',
+          width: '80',
           checkarr: [],
           fixed: false,
           sortable: true,
@@ -1555,7 +1555,7 @@ export default {
           label: '备货状态',
           type: 1,
           values: '',
-          width: '150',
+          width: '80',
           checkarr: [],
           fixed: false,
           sortable: true,
@@ -1566,7 +1566,7 @@ export default {
           label: '预约状态',
           type: 1,
           values: '',
-          width: '150',
+          width: '80',
           checkarr: [],
           fixed: false,
           sortable: true,
@@ -1577,7 +1577,7 @@ export default {
           label: '装车状态',
           type: 1,
           values: '',
-          width: '150',
+          width: '80',
           checkarr: [],
           fixed: false,
           sortable: true,
@@ -1588,7 +1588,7 @@ export default {
           label: '包件数量',
           type: 1,
           values: '',
-          width: '180',
+          width: '40',
           checkarr: [],
           fixed: false,
           sortable: true,
@@ -1599,7 +1599,7 @@ export default {
           label: '计划数量',
           type: 1,
           values: '',
-          width: '180',
+          width: '40',
           checkarr: [],
           fixed: false,
           sortable: true,
@@ -1609,7 +1609,7 @@ export default {
           label: '装车数量',
           type: 1,
           values: '',
-          width: '180',
+          width: '40',
           checkarr: [],
           fixed: false,
           sortable: true,
@@ -1619,7 +1619,7 @@ export default {
           label: '签收数量',
           type: 1,
           values: '',
-          width: '180',
+          width: '40',
           checkarr: [],
           fixed: false,
           sortable: true,
diff --git a/src/views/distribution/signfor/distributionSignforedt.vue b/src/views/distribution/signfor/distributionSignforedt.vue
index 75768bb6..a245f546 100644
--- a/src/views/distribution/signfor/distributionSignforedt.vue
+++ b/src/views/distribution/signfor/distributionSignforedt.vue
@@ -1035,9 +1035,9 @@ const menuData2 = ref([
     label: '运单号',
     type: 2,
     values: '',
-    width: '150',
+    width: '100',
     checkarr: [],
-    fixed: false,
+    fixed: true,
     sortable: true,
     head: false,
   },
@@ -1046,9 +1046,9 @@ const menuData2 = ref([
     label: '服务号',
     type: 2,
     values: '',
-    width: '250',
+    width: '150',
     checkarr: [],
-    fixed: false,
+    fixed: true,
     sortable: true,
     head: false,
   },
@@ -1057,9 +1057,9 @@ const menuData2 = ref([
     label: '订单自编号',
     type: 2,
     values: '',
-    width: '280',
+    width: '160',
     checkarr: [],
-    fixed: false,
+    fixed: true,
     sortable: true,
     head: false,
   },
@@ -1068,9 +1068,9 @@ const menuData2 = ref([
     label: '包条码',
     type: 2,
     values: '',
-    width: '200',
+    width: '130',
     checkarr: [],
-    fixed: false,
+    fixed: true,
     sortable: true,
     head: false,
   },
@@ -1079,7 +1079,7 @@ const menuData2 = ref([
     label: '仓库',
     type: 2,
     values: '',
-    width: '150',
+    width: '80',
     checkarr: [],
     fixed: false,
     sortable: true,
@@ -1090,7 +1090,7 @@ const menuData2 = ref([
     label: '发站仓',
     type: 2,
     values: '',
-    width: '150',
+    width: '80',
     checkarr: [],
     fixed: false,
     sortable: true,
@@ -1101,7 +1101,7 @@ const menuData2 = ref([
     label: '目的地',
     type: 2,
     values: '',
-    width: '150',
+    width: '80',
     checkarr: [],
     fixed: false,
     sortable: true,
@@ -1157,7 +1157,7 @@ const menuData2 = ref([
     label: '计划数量',
     type: 1,
     values: '',
-    width: '150',
+    width: '40',
     checkarr: [],
     fixed: false,
     sortable: true,
@@ -1169,7 +1169,7 @@ const menuData2 = ref([
     label: '装车数量',
     type: 1,
     values: '',
-    width: '150',
+    width: '40',
     checkarr: [],
     fixed: false,
     sortable: true,
@@ -1181,7 +1181,7 @@ const menuData2 = ref([
     label: '签收数量',
     type: 1,
     values: '',
-    width: '150',
+    width: '40',
     checkarr: [],
     fixed: false,
     sortable: true,
@@ -1193,7 +1193,7 @@ const menuData2 = ref([
     label: '一级品类',
     type: 2,
     values: '',
-    width: '150',
+    width: '100',
     checkarr: [],
     fixed: false,
     sortable: true,
@@ -1204,7 +1204,7 @@ const menuData2 = ref([
     label: '二级品类',
     type: 2,
     values: '',
-    width: '200',
+    width: '100',
     checkarr: [],
     fixed: false,
     sortable: true,
@@ -1215,7 +1215,7 @@ const menuData2 = ref([
     label: '三级品类',
     type: 2,
     values: '',
-    width: '200',
+    width: '100',
     checkarr: [],
     fixed: false,
     sortable: true,
@@ -1226,7 +1226,7 @@ const menuData2 = ref([
     label: '包件状态',
     type: 1,
     values: '',
-    width: '200',
+    width: '80',
     checkarr: [],
     fixed: false,
     sortable: true,
@@ -1237,7 +1237,7 @@ const menuData2 = ref([
     label: '冻结状态',
     type: 2,
     values: '',
-    width: '200',
+    width: '80',
     checkarr: [],
     fixed: false,
     sortable: true,
@@ -1259,7 +1259,7 @@ const menuData2 = ref([
     label: '备货状态',
     type: 2,
     values: '',
-    width: '200',
+    width: '80',
     checkarr: [],
     fixed: false,
     sortable: true,
@@ -1270,7 +1270,7 @@ const menuData2 = ref([
     label: '预约状态',
     type: 2,
     values: '',
-    width: '200',
+    width: '80',
     checkarr: [],
     fixed: false,
     sortable: true,
@@ -1281,7 +1281,7 @@ const menuData2 = ref([
     label: '装车状态 ',
     type: 2,
     values: '',
-    width: '200',
+    width: '80',
     checkarr: [],
     fixed: false,
     sortable: true,
@@ -1292,7 +1292,7 @@ const menuData2 = ref([
     label: '装车方式',
     type: 2,
     values: '',
-    width: '200',
+    width: '80',
     checkarr: [],
     fixed: false,
     sortable: true,
@@ -1303,7 +1303,7 @@ const menuData2 = ref([
     label: '计划装车人',
     type: 2,
     values: '',
-    width: '200',
+    width: '80',
     checkarr: [],
     fixed: false,
     sortable: true,

From bd74612bdf637dd1330c08d1a73ba0bb83a23b9e Mon Sep 17 00:00:00 2001
From: qb <1191961160@qq.com>
Date: Wed, 27 Dec 2023 16:23:26 +0800
Subject: [PATCH 2/7] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../distribution/zeroAdditionalRecording.js   |   10 +
 src/router/views/index.js                     |   17 +-
 .../artery/zeroAdditionalRecording.vue        |  208 ++-
 .../distribution/inventory/BookingNote.vue    |   10 +-
 .../addArteryDistrilbutionBillLadingList.vue  | 1539 +++++++++++++++++
 .../arteryDistrilbutionBillLadingList.vue     |   29 +-
 .../signfor/distributionSignfortreat.vue      |   11 +-
 .../parcelList/distributionParcelList.vue     |   30 +-
 vite.config.js                                |    6 +-
 9 files changed, 1758 insertions(+), 102 deletions(-)
 create mode 100644 src/views/distribution/inventory/addArteryDistrilbutionBillLadingList.vue

diff --git a/src/option/distribution/zeroAdditionalRecording.js b/src/option/distribution/zeroAdditionalRecording.js
index c0b9bc74..a46cfe0b 100644
--- a/src/option/distribution/zeroAdditionalRecording.js
+++ b/src/option/distribution/zeroAdditionalRecording.js
@@ -237,6 +237,16 @@ export const newColumnList = [
     fixed: false,
     sortable: true,
   },
+  {
+    prop: 'warehouseName',
+    label: '计划目的网点',
+    type: 1,
+    values: '',
+    width: '130',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
   {
     prop: 'shipperName',
     label: '发货单位',
diff --git a/src/router/views/index.js b/src/router/views/index.js
index a6388ac7..32161c70 100644
--- a/src/router/views/index.js
+++ b/src/router/views/index.js
@@ -279,13 +279,14 @@ export default [
     redirect: '/distribution/inventory/arteryDistrilbutionBillLadingList',
     children: [
       {
-        path: '/distribution/inventory/arteryDistrilbutionBillLadingList',
-        name: '干线提货管理',
+        path: '/distribution/inventory/addArteryDistrilbutionBillLadingList',
+        name: '新增干线提货',
         meta: {
           data: 'data',
+          keepAlive: true,
         },
         component: () =>
-          import('@/views/distribution/inventory/arteryDistrilbutionBillLadingList.vue'),
+          import('@/views/distribution/inventory/addArteryDistrilbutionBillLadingList.vue'),
       },
       {
         path: '/distribution/inventory/arteryDistrilbutionBillLadingListDetails',
@@ -1211,7 +1212,7 @@ export default [
       {
         meta: {
           i18n: 'dict',
-          keepAlive:false,
+          keepAlive: false,
         },
         path: '/aftersales/aftersalesWorkOrder',
         name: '工单',
@@ -1244,7 +1245,7 @@ export default [
       {
         meta: {
           i18n: 'dict',
-          keepAlive:false,
+          keepAlive: false,
         },
         path: '/aftersales/aftersalesWorkOrderInfo',
         name: '工单详情查看',
@@ -1261,7 +1262,7 @@ export default [
       {
         meta: {
           i18n: 'dict',
-          keepAlive:false,
+          keepAlive: false,
         },
         path: '/aftersales/aftersalesWorkOrderend',
         name: '工单完结',
@@ -1277,7 +1278,7 @@ export default [
       {
         meta: {
           i18n: 'dict',
-          keepAlive:false,
+          keepAlive: false,
         },
         path: '/aftersales/WorkorderTimeout',
         name: '工单超时罚款',
@@ -1317,7 +1318,7 @@ export default [
       },
     ],
   },
- 
+
   {
     path: '/aftersales/DataSynchronization',
     component: Layout,
diff --git a/src/views/distribution/artery/zeroAdditionalRecording.vue b/src/views/distribution/artery/zeroAdditionalRecording.vue
index 2831b7a3..5dc8ca02 100644
--- a/src/views/distribution/artery/zeroAdditionalRecording.vue
+++ b/src/views/distribution/artery/zeroAdditionalRecording.vue
@@ -149,14 +149,25 @@
           </div>
 
           <div style="margin-bottom: 10px" class="flex-c-sb">
-            <el-button type="text" class="pointer" @click="handleRemoveWaybill">
-              <el-icon><CaretLeft /></el-icon>
-              移除调度池
-            </el-button>
+            <div>
+              <el-button type="text" class="pointer" @click="handleRemoveWaybill">
+                <el-icon><CaretLeft /></el-icon>
+                移除调度池
+              </el-button>
+
+              <el-button
+                type="primary"
+                icon="Edit"
+                v-if="details.finalNodeIdArr.length > 1"
+                @click="handleEditNode"
+              >
+                修改节点
+              </el-button>
+            </div>
 
             <!-- 控件 -->
             <div class="avue-crud__right">
-              <el-button icon="el-icon-refresh" @click="searchChange" circle></el-button>
+              <el-button icon="el-icon-refresh" @click="handleRefresh" circle></el-button>
               <el-button icon="Operation" @click="showdrawer(true, 2)" circle></el-button>
               <el-button icon="el-icon-search" @click="searchHide" circle></el-button>
             </div>
@@ -200,6 +211,7 @@
     type="primary"
     class="submitBtn"
     icon="el-icon-circle-check"
+    :loading="details.loadingObj.submitLoading"
     @click="handleEditZeroSubmit"
     >提 交</el-button
   >
@@ -211,7 +223,7 @@
     :align-center="true"
   >
     <el-form-item label-width="100px" label="选择节点">
-      <el-select v-model="details.chooseNodeId" class="m-2" placeholder="Select">
+      <el-select v-model="details.finalNodeId" class="m-2" placeholder="选择节点">
         <el-option
           v-for="item in details.finalNodeIdArr"
           :key="item.warehouseId"
@@ -223,8 +235,8 @@
 
     <template #footer>
       <div class="flex-c-c">
-        <el-button @click="dialogVisible = false">取消</el-button>
-        <el-button type="primary" @click="submitClient"> 确定(修改客户) </el-button>
+        <el-button @click="details.showPopUpObj.editNodeIdDialogVisible = false">取消</el-button>
+        <el-button type="primary" @click="handleChooseNode"> 确定(选择节点) </el-button>
       </div>
     </template>
   </el-dialog>
@@ -256,10 +268,15 @@ import {
 import { downloadXls } from '@/utils/util';
 import { oldColumnList, newColumnList } from '@/option/distribution/zeroAdditionalRecording';
 import { ElMessage } from 'element-plus';
-import { useRoute } from 'vue-router';
+import { useRoute, useRouter } from 'vue-router';
+import { useStore } from 'vuex';
 
 // 路由实例
 const $route = useRoute();
+const $router = useRouter();
+
+// 实例化仓库
+const $store = useStore();
 
 const details = reactive<any>({
   /** 是否开启搜索 */
@@ -305,7 +322,7 @@ const details = reactive<any>({
   oldColumnList,
   newColumnList,
   /** 订单池数据 */
-  oldData: [{}],
+  oldData: [],
   /** 调度池数据 */
   newData: [],
   /** 页面loading */
@@ -313,6 +330,8 @@ const details = reactive<any>({
     /** 列表加载loading */
     list: false,
     newListLoading: false,
+    /** 提交按钮 */
+    submitLoading: false,
   },
   /** 订单池列表复选框选中的数据 */
   oldSelectionList: [],
@@ -353,11 +372,14 @@ const details = reactive<any>({
   finalNodeIdArr: [],
   /** 运单Id */
   loadId: '',
+  /** 弹出层 */
   showPopUpObj: {
-    editNodeIdDialogVisible: true,
+    editNodeIdDialogVisible: false,
   },
   /** 选择的Id */
-  chooseNodeId: '',
+  finalNodeId: '',
+  /** 确认框的事件类型 add -- 新增 edit -- 修改 */
+  confirmType: 'add',
 });
 
 const {
@@ -587,26 +609,33 @@ const setnewcolum = (newarr, headarr, type) => {
 const handleAddWaybill = () => {
   if (details.oldSelectionList.length === 0) return ElMessage.error('最少选择一条数据');
 
-  for (let item of details.oldSelectionList) {
-    console.log('item.stockNum :>> ', item.stockNum);
-    item.loadingNum = Number(item.stockNum || 0);
-    details.newData.push(item);
-  }
+  // 有多个后续节点
+  if (details.finalNodeIdArr.length > 1) {
+    details.confirmType = 'add';
 
-  details.orderCodeList = [
-    ...new Set([...details.orderCodeList, ...details.oldSelectionList.map(val => val.orderCode)]),
-  ];
+    details.showPopUpObj.editNodeIdDialogVisible = true;
+  } else {
+    const _item = details.finalNodeIdArr[0];
 
-  details.page.pageNum = 1;
-  onLoad();
+    for (let item of details.oldSelectionList) {
+      item.finalNodeId = _item.warehouseId;
+      item.warehouseName = _item.warehouseName;
+      item.loadingNum = Number(item.stockNum || 0);
+      details.newData.push(item);
+    }
+
+    details.orderCodeList = [
+      ...new Set([...details.orderCodeList, ...details.oldSelectionList.map(val => val.orderCode)]),
+    ];
+
+    details.page.pageNum = 1;
+    onLoad();
+  }
 };
 
 /** 移除运单 */
 const handleRemoveWaybill = () => {
   if (details.newSelectionList.length === 0) return ElMessage.warning('最少选择一条运单');
-  for (const iterator of details.newSelectionList) {
-    console.log('111 :>> ', 111);
-  }
 
   details.newData = details.newData.filter((val, index) => {
     const _flag = !details.newSelectionList.includes(val);
@@ -623,29 +652,114 @@ const handleRemoveWaybill = () => {
   onLoad();
 };
 
+/** 清空调度池 */
+const handleRefresh = () => {
+  details.newData = [];
+  details.newSelectionList = [];
+  details.orderCodeList = [];
+  details.page.pageNum = 1;
+  onLoad();
+};
+
+/** 开启修改零担补录节点弹窗 */
+const handleEditNode = () => {
+  if (details.finalNodeIdArr.length <= 1) return ElMessage.error('后续节点数小于2个');
+
+  if (details.newSelectionList.length === 0) return ElMessage.warning('最少选择一条数据');
+
+  details.confirmType = 'edit';
+
+  details.showPopUpObj.editNodeIdDialogVisible = true;
+};
+
+/** 新增提交 */
+const handleAdd = (warehouseName, finalNodeId) => {
+  for (let item of details.oldSelectionList) {
+    item.finalNodeId = details.finalNodeId;
+    item.warehouseName = warehouseName;
+    item.loadingNum = Number(item.stockNum || 0);
+    details.newData.push(item);
+  }
+
+  details.orderCodeList = [
+    ...new Set([...details.orderCodeList, ...details.oldSelectionList.map(val => val.orderCode)]),
+  ];
+
+  details.page.pageNum = 1;
+  onLoad();
+
+  details.showPopUpObj.editNodeIdDialogVisible = false;
+};
+
+const handleEdit = (warehouseName, finalNodeId) => {
+  for (const iterator of details.newSelectionList) {
+    iterator.finalNodeId = finalNodeId;
+    iterator.warehouseName = warehouseName;
+  }
+
+  details.showPopUpObj.editNodeIdDialogVisible = false;
+};
+
+/** 修改零担补录节点 */
+const handleChooseNode = () => {
+  if (!details.finalNodeId) return ElMessage.error('请选择节点');
+
+  const _finalNodeId = details.finalNodeId;
+
+  // 获取节点名称
+  const _warehouseName = details.finalNodeIdArr.find(
+    val => val.warehouseId === _finalNodeId
+  ).warehouseName;
+
+  details.confirmType === 'add'
+    ? handleAdd(_warehouseName, _finalNodeId)
+    : handleEdit(_warehouseName, _finalNodeId);
+};
+
+/** 返回上一页 */
+const back = () => {
+  $router.back();
+
+  $store.commit('DEL_TAG');
+};
+
 /** 零担补录提交 */
-const handleEditZeroSubmit = () => {
-  if (details.newData.length === 0) return ElMessage.error('请选择运单');
-
-  // const _data = details.newData.filter(val => {
-  //   return val.loadingNum > 0;
-  // });
-
-  const submitData = {
-    loadId: details.loadId,
-    zeroSuppleList: [],
-  };
-
-  for (const iterator of details.newData) {
-    submitData.zeroSuppleList.push({
-      orderCode: iterator.orderCode,
-      waybillNo: iterator.waybillNo,
-      enterNum: iterator.stockNum,
-      finalNodeId: iterator.nodeId,
+const handleEditZeroSubmit = async () => {
+  try {
+    // 开启提交loading
+    details.loadingObj.submitLoading = true;
+
+    if (details.newData.length === 0) return ElMessage.error('请选择运单');
+
+    const _data = details.newData.filter(val => {
+      return val.loadingNum > 0;
     });
-  }
 
-  console.log('_data :>> ', _data);
+    const submitData = {
+      loadId: details.loadId,
+      zeroSuppleList: [],
+    };
+
+    for (const iterator of details.newData) {
+      submitData.zeroSuppleList.push({
+        orderCode: iterator.orderCode,
+        waybillNo: iterator.waybillNo,
+        enterNum: iterator.loadingNum,
+        finalNodeId: iterator.finalNodeId,
+      });
+    }
+
+    console.log('submitData :>> ', submitData);
+    const res = await postAddZeroSupple(submitData);
+
+    const { code } = res.data;
+    if (code !== 200) return;
+  } catch (error) {
+    console.log('error :>> ', error);
+  } finally {
+    // 关闭提交loading
+    details.loadingObj.submitLoading = false;
+  }
 };
 </script>
 
@@ -743,4 +857,8 @@ const handleEditZeroSubmit = () => {
 :deep(.el-input-number__increase) {
   zoom: 0.8;
 }
+
+.el-select {
+  width: 100%;
+}
 </style>
diff --git a/src/views/distribution/inventory/BookingNote.vue b/src/views/distribution/inventory/BookingNote.vue
index 856c44b9..db295e45 100644
--- a/src/views/distribution/inventory/BookingNote.vue
+++ b/src/views/distribution/inventory/BookingNote.vue
@@ -186,7 +186,7 @@
             <div class="table-row table_row_number" v-for="item in pageInfo.detailList" :key="item">
               <div style="width: 230px; flex: none">
                 <el-form-item label="计价方式:" label-width="fit-content" class="el-times">
-                  <el-radio-group v-model="item.chargeType" style="display: flex">
+                  <el-radio-group v-model="item.chargeType" disabled style="display: flex">
                     <el-radio :label="1">件</el-radio>
                     <el-radio :label="2">方</el-radio>
                     <el-radio :label="3">公斤</el-radio>
@@ -200,6 +200,7 @@
                     v-for="item in details.options"
                     :key="item.value"
                     :label="item.label"
+                    readonly
                     :value="item.value"
                   />
                 </el-select>
@@ -210,6 +211,7 @@
                   v-model="item.num"
                   controls-position="right"
                   :precision="0"
+                  readonly
                   :step="0.1"
                 />
               </el-form-item>
@@ -219,6 +221,7 @@
                   v-model="item.volume"
                   controls-position="right"
                   :precision="4"
+                  readonly
                   :step="0.1"
                 />
               </el-form-item>
@@ -228,6 +231,7 @@
                   v-model="item.weight"
                   controls-position="right"
                   :precision="3"
+                  readonly
                   :step="0.1"
                 />
               </el-form-item>
@@ -237,6 +241,7 @@
                   v-model="item.price"
                   controls-position="right"
                   :precision="2"
+                  readonly
                   :step="0.1"
                 />
               </el-form-item>
@@ -247,6 +252,7 @@
                   controls-position="right"
                   :precision="2"
                   :step="0.1"
+                  readonly
                 />
               </el-form-item>
             </div>
@@ -362,7 +368,7 @@
                     <span class="red">{{ totalCost }}</span>
                   </div>
                   <div>
-                    <el-form label-width="fit-content" readonly>
+                    <el-form label-width="fit-content">
                       <el-row>
                         <el-form-item label="运费:">
                           <el-input
diff --git a/src/views/distribution/inventory/addArteryDistrilbutionBillLadingList.vue b/src/views/distribution/inventory/addArteryDistrilbutionBillLadingList.vue
new file mode 100644
index 00000000..6bef3ae8
--- /dev/null
+++ b/src/views/distribution/inventory/addArteryDistrilbutionBillLadingList.vue
@@ -0,0 +1,1539 @@
+<template>
+  <basic-container>
+    <div class="avue-crud">
+      <!-- 表单模块 -- 新增 -- 编辑 -->
+      <!-- 表单 -->
+      <el-form :disabled="view" ref="form" :model="form" label-width="80px">
+        <!-- 表单字段 -->
+        <el-row>
+          <el-form-item label="提货车辆" prop="pickUpTime">
+            <el-select
+              v-model="form.customerCode"
+              filterable
+              remote
+              reserve-keyword
+              remote-show-suffix
+              :remote-method="remoteCodeMethod"
+              :loading="loading"
+              @change="getMenDian($event, 2)"
+              placeholder="请选择提货车辆"
+              :teleported="false"
+              placement="bottom-end"
+              class="popUpselect"
+            >
+              <el-option
+                v-for="item in options"
+                :key="item.value"
+                :label="item.code"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-button
+            style="margin-right: 10px"
+            v-if="addInfo.isNew"
+            type="primary"
+            @click="
+              () => {
+                this.box = false;
+                this.$router.push('/basicdata/vehicle/basicdataVehicle');
+              }
+            "
+            icon="plus"
+          ></el-button>
+          <el-form-item label="司机" prop="consignee">
+            <el-select
+              v-model="form.customerCode"
+              filterable
+              remote
+              reserve-keyword
+              remote-show-suffix
+              :remote-method="remoteCodeMethod"
+              :loading="loading"
+              @change="getMenDian($event, 2)"
+              placeholder="请选择司机"
+              :teleported="false"
+              placement="bottom-end"
+              class="popUpselect"
+            >
+              <el-option
+                v-for="item in options"
+                :key="item.value"
+                :label="item.code"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-button
+            type="primary"
+            style="margin-right: 10px"
+            v-if="addInfo.isNew"
+            @click="
+              () => {
+                this.box = false;
+                this.$router.push('/basicdata/driverArtery/basicdataDriverArtery');
+              }
+            "
+            icon="plus"
+          ></el-button>
+          <el-form-item label="线路" prop="pickUpPlate">
+            <el-select
+              v-model="form.customerCode"
+              filterable
+              remote
+              reserve-keyword
+              remote-show-suffix
+              :remote-method="remoteCodeMethod"
+              :loading="loading"
+              @change="getMenDian($event, 2)"
+              placeholder="请选择线路"
+              :teleported="false"
+              placement="bottom-end"
+              class="popUpselect"
+            >
+              <el-option
+                v-for="item in options"
+                :key="item.value"
+                :label="item.code"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-button
+            type="primary"
+            style="margin-right: 10px"
+            v-if="addInfo.isNew"
+            @click="
+              () => {
+                this.popUpShow.addDistrilbutionLineVisited = true;
+              }
+            "
+            icon="plus"
+          ></el-button>
+          <el-form-item label="预计件数" prop="deliveryDocument">
+            <el-input-number v-model="addInfo.form.num" :min="0" />
+          </el-form-item>
+        </el-row>
+
+        <el-row>
+          <el-form-item label="承运商" prop="pickUpTime">
+            <el-select v-model="form.certificateType" clearable placeholder="请选择承运商">
+              <el-option
+                v-for="item in certificateTypeData"
+                :key="item.dictKey"
+                :label="item.dictValue"
+                :value="item.dictKey"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="计费模式" prop="consignee">
+            <el-select v-model="form.certificateType" clearable placeholder="请选择计费模式">
+              <el-option
+                v-for="item in certificateTypeData"
+                :key="item.dictKey"
+                :label="item.dictValue"
+                :value="item.dictKey"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="提货费用" prop="pickUpPlate">
+            <el-input-number v-model="addInfo.form.num" :min="0" />
+          </el-form-item>
+        </el-row>
+        <el-form-item label="备注" prop="deliveryPlate">
+          <el-input v-model="form.deliveryPlate" type="textarea" placeholder="请输入送货费用" />
+        </el-form-item>
+      </el-form>
+
+      <!-- 表格 -->
+      <div class="add_row">
+        <!-- 列表模块 -->
+        <div style="width: 49%">
+          <el-divider content-position="left">
+            <span>运单池</span>
+          </el-divider>
+
+          <div style="text-align: end">
+            <el-button type="text" style="cursor: pointer" @click="handleAddWaybill">
+              添 加
+              <el-icon><CaretRight /></el-icon>
+            </el-button>
+          </div>
+          <tablecmt
+            :columnList="columnNewList"
+            :tableData="addInfo.oldData"
+            :loading="loadingObj.oldListLoading"
+            @inputTxt="inputsc"
+            @timeCheck="timesc"
+            @selectCheck="selectsc"
+            @selection="selectionChange"
+          >
+          </tablecmt>
+          <div class="avue-crud__pagination flex-c-sb" style="width: 100%">
+            <div class="statistics_row">
+              <div>合计: 选择数: {{ addInfo.oldSelectionList.length }}</div>
+            </div>
+            <!-- 分页模块 -->
+            <el-pagination
+              style="zoom: 0.9"
+              align="right"
+              background
+              @size-change="sizeChange"
+              @current-change="currentChange"
+              :current-page="addInfo.oldPages.pageNum"
+              :page-sizes="[30, 50, 80, 120]"
+              :page-size="addInfo.oldPages.pageSize"
+              layout="total, sizes, prev, pager, next, jumper"
+              :total="addInfo.oldPages.total"
+            >
+            </el-pagination>
+          </div>
+        </div>
+
+        <!-- 列表模块 -->
+        <div style="width: 49%">
+          <el-divider content-position="left">
+            <span>调度池</span>
+          </el-divider>
+          <div style="text-align: start">
+            <el-button type="text" class="pointer" @click="handleRemoveWaybill">
+              <el-icon><CaretLeft /></el-icon>
+              移 除
+            </el-button>
+          </div>
+          <tablecmt
+            :columnList="columnNewList"
+            :tableData="addInfo.newData"
+            :loading="loadingObj.oldListLoading"
+            @inputTxt="inputsc"
+            @timeCheck="timesc"
+            @selectCheck="selectsc"
+            @selection="selectionChange"
+          >
+          </tablecmt>
+          <div class="statistics_row">
+            <div>合计: 选择数: {{ addInfo.oldSelectionList.length }}</div>
+          </div>
+        </div>
+      </div>
+
+      <!-- 表单按钮 -->
+      <div v-if="!view" class="footerBtn">
+        <el-button type="primary" icon="el-icon-circle-check" @click="handleSubmit"
+          >提 交</el-button
+        >
+        <el-button icon="el-icon-circle-close" @click="box = false">取 消</el-button>
+      </div>
+      <!-- 底部站位 -->
+      <div class="footer-container"></div>
+
+      <!-- 新增线路 -->
+      <el-dialog
+        title="新增线路"
+        v-model="popUpShow.addDistrilbutionLineVisited"
+        width="50%"
+        :before-close="beforeClose"
+        append-to-body
+      >
+        <div class="crad_container">
+          <div class="card_container_item">
+            <div class="card_container_item_title">基本信息</div>
+            <div class="card_container_item_box">
+              <!-- 表单 -->
+              <el-form
+                :disabled="view"
+                ref="form"
+                :model="addLineInfo.addLineForm"
+                label-width="80px"
+              >
+                <!-- 表单字段 -->
+                <el-form-item label="状态" prop="pickUpTime">
+                  <el-switch v-model="form.pickUpTime" />
+                </el-form-item>
+                <el-form-item label="备注" prop="pickUpTime">
+                  <el-input v-model="form.pickUpTime" type="textarea" placeholder="请输入备注" />
+                </el-form-item>
+                <el-form-item label="总时效" prop="pickUpTime">
+                  <el-input v-model="totalAging" disabled placeholder="总时效" />
+                </el-form-item>
+                <el-form-item label="总里程" prop="pickUpTime">
+                  <el-input v-model="totalDistance" disabled placeholder="总里程" />
+                </el-form-item>
+              </el-form>
+            </div>
+          </div>
+
+          <div class="card_container_item">
+            <div class="card_container_item_title">
+              <div>节点信息</div>
+              <el-text type="primary" @click="popUpShow.addNewNodeVisited = true" class="pointer"
+                >创建新节点</el-text
+              >
+            </div>
+            <div class="card_container_item_box">
+              <el-scrollbar height="400px">
+                <el-steps direction="vertical" style="height: 100%">
+                  <el-step
+                    icon="Location"
+                    v-for="(item, index) in addLineInfo.lineList"
+                    :key="item"
+                  >
+                    <template #description>
+                      <el-form :model="item" label-width="80px" style="zoom: 0.9">
+                        <el-row>
+                          <!-- 表单字段 -->
+                          <template v-if="index === 0">
+                            <el-form-item label="起点" prop="productName">
+                              <!--            <el-input v-model="formDetail.productName" placeholder="请输入物品名称"/>-->
+                              <el-select
+                                v-model="item.productName"
+                                filterable
+                                remote
+                                reserve-keyword
+                                remote-show-suffix
+                                :remote-method="remoteMethodStuffName"
+                                @change="getMenDian($event, 1)"
+                                placeholder="请输入物品名称"
+                              >
+                                <el-option
+                                  v-for="item in stuffName"
+                                  :key="item.value"
+                                  :label="item.label"
+                                  :value="item.value"
+                                />
+                              </el-select>
+                            </el-form-item>
+                          </template>
+
+                          <template v-else>
+                            <el-form-item label="节点" prop="pickUpTime">
+                              <el-select
+                                v-model="item.customerCode"
+                                filterable
+                                remote
+                                reserve-keyword
+                                remote-show-suffix
+                                :remote-method="remoteCodeMethod"
+                                :loading="loading"
+                                @change="getMenDian($event, 2)"
+                                placeholder="请输入内容"
+                                :teleported="false"
+                                placement="bottom-end"
+                                class="popUpselect"
+                              >
+                                <el-option
+                                  v-for="item in options"
+                                  :key="item.value"
+                                  :label="item.code"
+                                  :value="item.value"
+                                />
+                              </el-select>
+                            </el-form-item>
+                          </template>
+
+                          <el-button
+                            type="primary"
+                            v-if="index !== 0"
+                            icon="CirclePlusFilled"
+                            @click="
+                              () => {
+                                addLineInfo.lineList.splice(index, 1);
+                              }
+                            "
+                            >删除</el-button
+                          >
+                        </el-row>
+
+                        <el-form-item label="联系人" prop="pickUpTime">
+                          <el-input v-model="item.name" type="text" />
+                        </el-form-item>
+                        <el-form-item label="联系方式" prop="pickUpTime">
+                          <el-input v-model="item.code" type="text" />
+                        </el-form-item>
+                        <el-form-item label="联系地址" prop="pickUpTime">
+                          <el-input v-model="item.code" type="text" />
+                        </el-form-item>
+                        <el-form-item label="时效" prop="pickUpTime">
+                          <el-input-number :min="0" v-model="item.aging" />
+                        </el-form-item>
+                        <el-form-item label="里程" prop="pickUpTime">
+                          <el-input-number :min="0" v-model="item.distance" />
+                        </el-form-item>
+                      </el-form>
+                      <el-button
+                        type="primary"
+                        v-if="index === addLineInfo.lineList.length - 1"
+                        icon="CirclePlusFilled"
+                        @click="
+                          () => {
+                            addLineInfo.lineList.push({});
+                          }
+                        "
+                        >新增</el-button
+                      >
+                    </template>
+                  </el-step>
+
+                  <!-- 终点 -->
+                  <el-step icon="Location">
+                    <template #description>
+                      <el-form
+                        :disabled="view"
+                        ref="form"
+                        :model="addLineInfo.addLineForm"
+                        label-width="80px"
+                        style="zoom: 0.9"
+                      >
+                        <!-- 表单字段 -->
+                        <el-form-item label="终点" prop="pickUpTime">
+                          <el-select
+                            v-model="form.customerCode"
+                            filterable
+                            remote
+                            reserve-keyword
+                            remote-show-suffix
+                            :remote-method="remoteCodeMethod"
+                            :loading="loading"
+                            @change="getMenDian($event, 2)"
+                            placeholder="请输入内容"
+                            :teleported="false"
+                            placement="bottom-end"
+                            class="popUpselect"
+                          >
+                            <el-option
+                              v-for="item in options"
+                              :key="item.value"
+                              :label="item.code"
+                              :value="item.value"
+                            />
+                          </el-select>
+                        </el-form-item>
+                        <el-form-item label="联系人" prop="pickUpTime">
+                          <el-input v-model="form.pickUpTime" type="text" />
+                        </el-form-item>
+                        <el-form-item label="联系方式" prop="pickUpTime">
+                          <el-input v-model="form.pickUpTime" type="text" />
+                        </el-form-item>
+                        <el-form-item label="联系地址" prop="pickUpTime">
+                          <el-input v-model="form.pickUpTime" type="text" />
+                        </el-form-item>
+                      </el-form>
+                    </template>
+                  </el-step>
+                </el-steps>
+              </el-scrollbar>
+            </div>
+          </div>
+        </div>
+        <!-- 表单按钮 -->
+        <template #footer>
+          <span v-if="!view" class="dialog-footer">
+            <el-button type="primary" icon="el-icon-circle-check" @click="handleSubmit"
+              >提 交</el-button
+            >
+            <el-button
+              icon="el-icon-circle-close"
+              @click="popUpShow.addDistrilbutionLineVisited = false"
+              >取 消</el-button
+            >
+          </span>
+        </template>
+      </el-dialog>
+
+      <!-- 新增节点 -->
+      <el-dialog
+        title="新增节点"
+        v-model="popUpShow.addNewNodeVisited"
+        width="50%"
+        :before-close="beforeClose"
+        append-to-body
+      >
+        <el-form
+          :disabled="view"
+          ref="form"
+          :model="addLineInfo.addLineForm"
+          label-width="80px"
+          style="zoom: 0.9"
+        >
+          <!-- 表单字段 -->
+          <el-form-item label="提货客户" prop="pickUpTime">
+            <el-select
+              v-model="form.customerCode"
+              filterable
+              remote
+              reserve-keyword
+              remote-show-suffix
+              :remote-method="remoteCodeMethod"
+              :loading="loading"
+              @change="getMenDian($event, 2)"
+              placeholder="请输入内容"
+              :teleported="false"
+              placement="bottom-end"
+              class="popUpselect"
+            >
+              <el-option
+                v-for="item in options"
+                :key="item.value"
+                :label="item.code"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="联系人" prop="pickUpTime">
+            <el-input v-model="form.pickUpTime" type="text" placeholder="联系人" />
+          </el-form-item>
+          <el-form-item label="联系方式" prop="pickUpTime">
+            <el-input v-model="form.pickUpTime" type="text" placeholder="联系方式" />
+          </el-form-item>
+          <!-- <el-form-item label="提货地址" prop="pickUpTime">
+            <el-input v-model="form.pickUpTime" type="text" placeholder="提货地址" />
+          </el-form-item> -->
+          <el-form-item label="提货地址" prop="pickUpTime">
+            <avue-input-map
+              :params="addNewNodeInfo.params"
+              placeholder="请选择地图"
+              v-model="addNewNodeInfo.map"
+            ></avue-input-map>
+          </el-form-item>
+          <el-form-item label="备注" prop="pickUpTime">
+            <el-input v-model="form.pickUpTime" type="textarea" placeholde="备注" />
+          </el-form-item>
+        </el-form>
+        <!-- 表单按钮 -->
+        <template #footer>
+          <span v-if="!view" class="dialog-footer">
+            <el-button type="primary" icon="el-icon-circle-check" @click="handleSubmit"
+              >提 交</el-button
+            >
+            <el-button icon="el-icon-circle-close" @click="popUpShow.addNewNodeVisited = false"
+              >取 消</el-button
+            >
+          </span>
+        </template>
+      </el-dialog>
+
+      <!-- 添加提货数据 -->
+      <el-dialog
+        :title="title"
+        v-model="popUpShow.addDistrilbutionVisited"
+        width="50%"
+        :before-close="beforeClose"
+        append-to-body
+      >
+        <el-form :disabled="view" ref="form" :model="form" label-width="80px">
+          <!-- 表单字段 -->
+          <el-form-item label="运单号" prop="clientId">
+            <!--              <el-input v-model="form.customerName" placeholder="请输入客户名称"/>-->
+            <el-select
+              v-model="form.clientId"
+              filterable
+              remote
+              reserve-keyword
+              remote-show-suffix
+              :remote-method="remoteMethod"
+              :loading="loading"
+              clearable
+              placeholder="请输入运单号"
+            >
+              <el-option
+                v-for="item in options"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="开单日期" prop="consignee">
+            <el-input v-model="form.consignee" placeholder="请输入提货人" />
+          </el-form-item>
+          <el-form-item label="货物名称" prop="pickUpPlate">
+            <el-input v-model="form.pickUpPlate" placeholder="请输入货物名称" />
+          </el-form-item>
+          <el-form-item label="提货件数" prop="deliveryDocument">
+            <el-input-number v-model="form.deliveryDocument" :min="1" :max="10" />
+          </el-form-item>
+          <el-form-item label="到站" prop="deliveryDocument">
+            <el-input v-model="form.deliveryDocument" placeholder="请输入提货证件" />
+          </el-form-item>
+          <el-form-item label="发货人" prop="pickUpTime">
+            <el-input v-model="form.pickUpTime" placeholder="请输入发货人" />
+          </el-form-item>
+          <el-form-item label="发货手机" prop="consignee">
+            <el-input v-model="form.consignee" placeholder="请输入发货手机" />
+          </el-form-item>
+          <el-form-item label="收货电话" prop="pickUpPlate">
+            <el-input v-model="form.pickUpPlate" placeholder="请输入收货电话" />
+          </el-form-item>
+          <el-form-item label="支付方式" prop="deliveryDocument">
+            <el-input v-model="form.deliveryDocument" placeholder="请输入支付方式" />
+          </el-form-item>
+          <el-form-item label="备注" prop="deliveryDocument">
+            <el-input v-model="form.deliveryDocument" type="textarea" placeholder="请输入备注" />
+          </el-form-item>
+        </el-form>
+        <!-- 表单按钮 -->
+        <template #footer>
+          <span v-if="!view" class="dialog-footer">
+            <el-button type="primary" icon="el-icon-circle-check" @click="handleSubmit"
+              >提 交</el-button
+            >
+            <el-button
+              icon="el-icon-circle-close"
+              @click="popUpShow.addDistrilbutionVisited = false"
+              >取 消</el-button
+            >
+          </span>
+        </template>
+      </el-dialog>
+
+      <!-- 查看明细 -->
+      <el-dialog
+        :title="title"
+        v-model="popUpShow.distrilbutionDetailVisited"
+        width="80%"
+        destroy-on-close
+        :before-close="beforeClose"
+        append-to-body
+      >
+        <!-- 列表模块 -->
+        <tablecmt
+          :columnList="columnDetailList"
+          :tableData="data"
+          :loading="loading"
+          @inputTxt="inputsc"
+          @timeCheck="timesc"
+          @selectCheck="selectsc"
+          @selection="selectionChange"
+        >
+        </tablecmt>
+        <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="detailSizeChange"
+            @current-change="detailCurrentChange"
+            :current-page="detailPage.pageNum"
+            :page-sizes="[30, 50, 80, 120]"
+            :page-size="detailPage.pageSize"
+            layout="total, sizes, prev, pager, next, jumper"
+            :total="detailPage.total"
+          >
+          </el-pagination>
+        </div>
+      </el-dialog>
+    </div>
+  </basic-container>
+
+  <!-- 列表配置显示 -->
+  <edittablehead
+    @setcolum="setnewcolum"
+    @closce="showdrawer"
+    :drawerShow="drawerShow"
+    :columnList="columnList"
+  ></edittablehead>
+</template>
+
+<script lang="ts">
+import {
+  remove,
+  getListOwn,
+  getListOwnNUm,
+  getBillLadingExport,
+} from '@/api/distribution/distrilbutionBillLading';
+// 引入页面请求
+import {
+  postPageList,
+  postFindChargeTypeList,
+  postSaveNew,
+  postList,
+  postUpdateBillladingStatus,
+  postBillladingDetail,
+  postBillladingPackageDetail,
+  postUpdateBillladingWaybillNum,
+  postAddWaybillToBillladingId,
+} from '@/api/distribution/arteryDistrilbutionBillLadingList';
+// 引入表格配置文件
+import {
+  columnList,
+  columnDetailList,
+  columnNewList,
+} from '@/option/distribution/arteryDistrilbutionBillLadingList';
+import { mapGetters } from 'vuex';
+import { getDictionaryBiz } from '@/api/system/dict';
+import { getToken } from '@/utils/auth';
+import dayjs from 'dayjs';
+import { downloadXls } from '@/utils/util';
+
+export default {
+  data() {
+    return {
+      columnList,
+      columnDetailList,
+      columnNewList,
+      /** 列表配置抽屉 */
+      drawerShow: false,
+      height: 0,
+      // 弹框标题
+      title: '',
+      // 是否展示弹框
+      box: false,
+      /** 弹出层显示 */
+      popUpShow: {
+        /** 添加提货数据 */
+        addDistrilbutionVisited: false,
+        /** 提货详情是否显示 */
+        distrilbutionDetailVisited: false,
+        /** 新增线路是否显示 */
+        addDistrilbutionLineVisited: false,
+        /** 新增新节点是否显示 */
+        addNewNodeVisited: false,
+      },
+      // 是否显示查询
+      search: true,
+      // 加载中
+      loading: true,
+      /** 加载中 */
+      loadingObj: {
+        loading: false,
+        oldListLoading: false,
+        newlistLoading: false,
+      },
+      // 是否为查看模式
+      view: false,
+      // 查询信息
+      query: {},
+      stockupDate: [],
+      stopNum: 0,
+      treatNum: 0,
+      numBill: 0,
+      // 分页信息
+      page: {
+        pageNum: 1,
+        pageSize: 30,
+        total: 0,
+      },
+      /** 详情内分页信息 */
+      detailPage: {
+        pageNum: 1,
+        pageSize: 30,
+        total: 40,
+      },
+      // 表单数据
+      form: {},
+      // 选择行
+      selectionList: [],
+      // 表单列表
+      data: [],
+      /** 新增 && 编辑 信息 */
+      addInfo: {
+        /** 表单 */
+        form: {},
+        /** 未选择 -- 数据 */
+        oldData: [],
+        /** 已选择数据 */
+        newData: [],
+        /** 未选择 -- 复选框 */
+        oldSelectionList: [],
+        /** 已选择 -- 复选框 */
+        newSelectionList: [],
+        /** 未选择 -- 页码数据 */
+        oldPages: {
+          pageNum: 1,
+          pageSize: 30,
+          total: 40,
+        },
+        /** 已选择 -- ids */
+        haveIds: [],
+        /** 是否是新增 */
+        isNew: true,
+      },
+      /** 创建线路信息 */
+      addLineInfo: {
+        /** 创建线路信息表单 */
+        addLineForm: {},
+        /** 线路列表 */
+        lineList: [{}],
+        /** 起点信息 */
+        startInfo: {},
+        /** 终点信息 */
+        endInfo: {},
+      },
+      /** 新增新节点 */
+      addNewNodeInfo: {
+        /** 新增新节点信息 */
+        addNewNodeForm: {},
+        /** 地图配置 */
+        //高德初始化参数
+        params: {
+          zoom: 10,
+          // zoomEnable: false,
+          // dragEnable: false,
+        },
+        map: [],
+        /** 节点列表 */
+        nodeList: [{}],
+        /** 节点信息 */
+        nodeInfo: {},
+      },
+      /** 字典 */
+      clientType: [],
+      options: [],
+      /** 时间 */
+      shortcuts: [
+        {
+          text: '最近一周',
+          value: () => {
+            const end = new Date();
+            const start = new Date();
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+            return [start, end];
+          },
+        },
+        {
+          text: '最近一个月',
+          value: () => {
+            const end = new Date();
+            const start = new Date();
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+            return [start, end];
+          },
+        },
+        {
+          text: '最近三个月',
+          value: () => {
+            const end = new Date();
+            const start = new Date();
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+            return [start, end];
+          },
+        },
+      ],
+    };
+  },
+  mounted() {
+    console.log('columnDetailList :>> ', columnDetailList);
+    this.init();
+    this.onLoad(this.page);
+    /**
+     * 初始化获取本地缓存的编辑隐藏的列表
+     *  固定搭配，不能更改
+     */
+    let newarr = this.$functions.getStorage(window.location.pathname);
+    if (newarr) {
+      this.columnList.map(item => {
+        item.head = false;
+      });
+      newarr.map(ite => {
+        this.columnList.map(item => {
+          if (ite == item.label) {
+            item.head = true;
+          }
+        });
+      });
+    }
+  },
+  computed: {
+    ...mapGetters(['permission', 'tagWel', 'tagList']),
+    ids() {
+      let ids = [];
+      this.selectionList.forEach(ele => {
+        ids.push(ele.id);
+      });
+      return ids.join(',');
+    },
+    headers() {
+      return {
+        'Blade-Auth': 'Bearer ' + getToken(),
+      };
+    },
+    action() {
+      // return '/api/logpm-basicdata/common/uploadFile'
+      return '/api/blade-resource/oss/endpoint/put-file';
+    },
+    /** 总里程 */
+    totalDistance() {
+      return this.addLineInfo.lineList.reduce((curr, item) => {
+        const _number = Number(item.distance);
+        // 判断是否为数字
+        if (_number === _number) return curr + _number;
+        return curr;
+      }, 0);
+    },
+
+    /** 总时效 */
+    totalAging() {
+      return this.addLineInfo.lineList.reduce((curr, item) => {
+        const _number = Number(item.aging);
+        if (_number === _number) return (curr += _number);
+        return curr;
+      }, 0);
+    },
+  },
+  methods: {
+    /** 导出 */
+    handleExportInfo() {
+      let row = {};
+      console.log(this.stockupDate);
+      if (this.query.startDate) {
+        row.startDate = this.query.startDate[0]; //开始时间
+        row.endDate = this.query.startDate[1]; //结束时间
+      }
+      if (this.query.serviceNumber) {
+        row.serviceNumber = this.query.serviceNumber; //服务号
+      }
+      if (!!this.ids) {
+        row.ids = this.ids;
+      } else {
+        row.ids = '';
+      }
+      getBillLadingExport(row).then(res => {
+        console.log(res.data);
+        downloadXls(res.data, '提货数据.xlsx');
+      });
+    },
+    showdrawer(value) {
+      this.drawerShow = value;
+    },
+    /**
+     * 弹窗的勾选回调，用于更改头部数组
+     * 固定搭配，只需要更换   columnList
+     */
+    setnewcolum(newarr, headarr, type) {
+      // console.log(newarr,'+++++++++++')
+      if (type == 1) {
+        this.columnList = newarr;
+        this.$functions.setStorage(window.location.pathname + 'checkList', headarr);
+      } else if (type == 2) {
+        this.columnList = newarr;
+        this.$functions.setStorage(window.location.pathname + 'flexList', headarr);
+      } else if (type == 3) {
+        this.columnList = newarr;
+        this.$functions.setStorage(window.location.pathname + 'sortlist', headarr);
+      }
+    },
+    selectionsc(value) {
+      console.log(value);
+    },
+    selectsc(index, row) {
+      console.log('index :>> ', index);
+      console.log('row :>> ', row);
+      this.query[row.prop] = index;
+      if (!index) delete this.query[row.prop];
+      if (row.prop === 'certificateTypeName') {
+        this.query['certificateType'] = index;
+        if (!index) delete this.query['certificateType'];
+      }
+      this.onLoad(this.page);
+    },
+    timesc(index, row) {
+      console.log(index, row);
+      if (!!index) {
+        index = dayjs(index).format('YYYY-MM-DD');
+      }
+      this.query[row.prop] = index;
+      if (!index) {
+        delete this.query[row.prop];
+      }
+      this.onLoad(this.page);
+    },
+    inputsc(index, row) {
+      console.log(index, row);
+      this.query[row.prop] = index;
+      this.onLoad(this.page);
+    },
+    /** 客户查询 */
+    async remoteMethod(query) {
+      if (query) {
+        // this.loading = true;
+        this.options = [];
+        this.form.customerCode = null;
+        let cl = await getListClient(this.page.pageNum, this.page.pageSize, {
+          clientName: query,
+        });
+        console.log('客户信息1234>>>>', cl.data.data.records);
+        cl.data.data.records.forEach(i => {
+          let st = {
+            label: i.clientName,
+            value: i.id,
+            code: i.clientCode,
+          };
+          this.options.push(st);
+        });
+      } else {
+        this.options = [];
+      }
+    },
+    init() {
+      this.height = this.setPx(document.body.clientHeight - 160);
+      // //字典
+      // getDictionaryBiz('delivery_cost').then(res => {
+      //   this.clientType = res.data.data;
+      // });
+      // //字典
+      // getDictionaryBiz('certificate_type').then(res => {
+      //   this.certificateType = res.data.data;
+      //   this.$functions.checkcColumnList('certificateTypeName', this.columnList).checkarr =
+      //     res.data.data.map(item => {
+      //       item.value = item.dictKey;
+      //       item.label = item.dictValue;
+      //       return item;
+      //     });
+      // });
+    },
+    checkcColumnList(prop, columnList) {
+      return columnList.find(item => item.prop === prop);
+    },
+    /** 是否显示搜索控件 */
+    searchHide() {
+      this.search = !this.search;
+    },
+    /** 搜索 */
+    searchChange() {
+      this.onLoad(this.page);
+    },
+    /** 重置搜索数据 */
+    searchReset() {
+      this.query = {};
+      this.stockupDate = [];
+      this.page.pageNum = 1;
+      this.onLoad(this.page);
+    },
+    /** 表单提交 */
+    async handleSubmit() {},
+    /** 新增 */
+    handleAdd() {
+      this.title = '新增';
+      this.addInfo.form = {};
+      this.box = true;
+      this.addInfo.isNew = true;
+      this.$nextTick(() => {
+        // 获取表格实例并赋值高度和宽度
+        var bodyContent = document.querySelectorAll('.el-dialog .maboxhi');
+        bodyContent.forEach(val => {
+          val.style.height = '350px';
+          // val.style.width = '45%';
+        });
+      });
+    },
+    /** 修改 */
+    handleEdit() {
+      this.title = '修改';
+      this.addInfo.form = {};
+      this.box = true;
+      this.addInfo.isNew = false;
+      this.$nextTick(() => {
+        // 获取表格实例并赋值高度和宽度
+        var bodyContent = document.querySelectorAll('.el-dialog .maboxhi');
+        bodyContent.forEach(val => {
+          val.style.height = '350px';
+          // val.style.width = '45%';
+        });
+      });
+    },
+    /** 编辑提货数据的状态 */
+    handleEditBillladingStatus(type: number) {
+      if (this.selectionList.length === 0) return this.$message.error('最少选择一条数据');
+
+      if (this.selectionList.length > 1) return this.$message.error('暂时只支持单条数据操作');
+
+      this.$confirm('确定将选择数据提货完成?', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'success',
+      })
+        .then(() => {
+          return postUpdateBillladingStatus({
+            id: this.selectionList[0].id,
+            type,
+          });
+        })
+        .then(() => {
+          // 清空复选框
+          this.selectionClear();
+          // 刷新表格
+          this.onLoad(this.page);
+          this.$message({
+            type: 'success',
+            message: '操作成功!',
+          });
+        });
+    },
+    /** 开启添加提货数据弹窗 */
+    handleAddDistrilbution() {
+      if (this.selectionList.length === 0) return this.$message.error('最少选择一条数据');
+      this.title = '添加提货数据';
+      this.popUpShow.addDistrilbutionVisited = true;
+    },
+    /** 提货完成 */
+    handleDistributionConfirm() {
+      if (this.selectionList.length === 0) return this.$message.error('最少选择一条数据');
+
+      this.$confirm('确定将选择数据提货完成?', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'success',
+      })
+        .then(() => {
+          return remove(this.ids);
+        })
+        .then(() => {
+          // 清空复选框
+          this.selectionClear();
+          // 刷新表格
+          this.onLoad(this.page);
+          this.$message({
+            type: 'success',
+            message: '操作成功!',
+          });
+        });
+    },
+    /** 取消提货完成 */
+    handleCloseConfirm() {
+      if (this.selectionList.length === 0) return this.$message.error('最少选择一条数据');
+
+      this.$confirm('确定将选择数据取消提货完成?', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      })
+        .then(() => {
+          return remove(this.ids);
+        })
+        .then(() => {
+          // 清空复选框
+          this.selectionClear();
+          // 刷新表格
+          this.onLoad(this.page);
+          this.$message({
+            type: 'success',
+            message: '操作成功!',
+          });
+        });
+    },
+    /** 取消提货 */
+    handleDistributionClose() {
+      if (this.selectionList.length === 0) return this.$message.error('最少选择一条数据');
+
+      this.$confirm('确定将选择数据取消提货?', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      })
+        .then(() => {
+          return remove(this.ids);
+        })
+        .then(() => {
+          // 清空复选框
+          this.selectionClear();
+          // 刷新表格
+          this.onLoad(this.page);
+          this.$message({
+            type: 'success',
+            message: '操作成功!',
+          });
+        });
+    },
+    /** 结算 */
+    handleSettleAccounts() {
+      if (this.selectionList.length === 0) return this.$message.error('最少选择一条数据');
+
+      this.$confirm('确定将选择数据结算?', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'success',
+      })
+        .then(() => {
+          return remove(this.ids);
+        })
+        .then(() => {
+          // 清空复选框
+          this.selectionClear();
+          // 刷新表格
+          this.onLoad(this.page);
+          this.$message({
+            type: 'success',
+            message: '操作成功!',
+          });
+        });
+    },
+    /** 取消结算 */
+    handleCloseSettleAccounts() {
+      if (this.selectionList.length === 0) return this.$message.error('最少选择一条数据');
+
+      this.$confirm('确定将选择数据取消结算?', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      })
+        .then(() => {
+          return remove(this.ids);
+        })
+        .then(() => {
+          // 清空复选框
+          this.selectionClear();
+          // 刷新表格
+          this.onLoad(this.page);
+          this.$message({
+            type: 'success',
+            message: '操作成功!',
+          });
+        });
+    },
+    /** 删除 */
+    handleDeleteOwn(row) {
+      console.log('删除！！', row);
+    },
+    /** 查询详细 */
+    handleLike(row) {
+      console.log('row :>> ', row);
+      this.$router.push({
+        path: '/distribution/inventory/arteryDistrilbutionBillLadingListDetails',
+        query: {
+          id: row.row.id,
+          name: '编辑提货单',
+        },
+      });
+    },
+    /** 查看 */
+    handleEdits(row) {
+      this.$router.push({
+        path: '/distribution/inventory/distrilbutionBillLading',
+        query: {
+          id: row.row.id,
+          name: '编辑提货单',
+          type: '2',
+        },
+      });
+    },
+    /** 批量删除 */
+    handleDelete() {
+      if (this.selectionList.length === 0) {
+        this.$message.warning('请选择至少一条数据');
+        return;
+      }
+      this.$confirm('确定将选择数据删除?', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      })
+        .then(() => {
+          return remove(this.ids);
+        })
+        .then(() => {
+          this.selectionClear();
+          this.onLoad(this.page);
+          this.$message({
+            type: 'success',
+            message: '操作成功!',
+          });
+        });
+    },
+    /** 弹出层开启前清除数据 */
+    beforeClose(done) {
+      done();
+      this.form = {};
+      this.view = false;
+    },
+    /** 表格复选框改变执行的回调 */
+    selectionChange(list) {
+      this.selectionList = list;
+    },
+    /** 清空复选框 */
+    selectionClear() {
+      this.selectionList = [];
+      // this.$refs.table.clearSelection();
+    },
+    /** 页码改变执行回调 */
+    currentChange(pageNum) {
+      this.page.pageNum = pageNum;
+      this.onLoad(this.page);
+    },
+    /** 页数改变执行回调 */
+    sizeChange(pageSize) {
+      this.page.pageSize = pageSize;
+      this.onLoad(this.page);
+    },
+    /** 详情 -- 页码改变执行回调 */
+    detailCurrentChange(pageNum) {
+      this.page.pageNum = pageNum;
+      this.onLoad(this.page);
+    },
+    /** 详情 -- 页数改变执行回调 */
+    detailSizeChange(pageSize) {
+      this.page.pageSize = pageSize;
+      this.onLoad(this.page);
+    },
+    /** 获取时间 */
+    getTime(dat) {
+      let date = new Date(dat);
+      let formatter = new Intl.DateTimeFormat('en', {
+        year: 'numeric',
+        month: '2-digit',
+        day: '2-digit',
+        hour: '2-digit',
+        minute: '2-digit',
+        second: '2-digit',
+      });
+      let formattedDate = formatter.format(date);
+      return formattedDate.replace(/\//g, '-');
+    },
+    /** 查看明细 */
+    handleShowDetail({ row }) {
+      this.title = `${row.pickupBatch} 提货明细`;
+      this.popUpShow.distrilbutionDetailVisited = true;
+      this.$nextTick(() => {
+        var bodyContent = document.querySelector('.el-dialog .maboxhi');
+        bodyContent.style.height = '600px';
+      });
+    },
+    /** 添加运单 */
+    handleAddWaybill() {
+      if (this.addInfo.oldSelectionList.length === 0)
+        return this.$message.warning('最少选择一条运单');
+      this.addInfo.newData = [...this.addInfo.newData, ...this.addInfo.oldSelectionList];
+      this.addInfo.haveIds = this.addInfo.map(val => val.id);
+    },
+    /** 移除运单 */
+    handleRemoveWaybill() {
+      if (this.addInfo.newSelectionList.length === 0)
+        return this.$message.warning('最少选择一条运单');
+      this.addInfo.newData = [...this.addInfo.newData, ...this.addInfo.oldSelectionList];
+      this.addInfo.haveIds = this.addInfo.map(val => val.id);
+    },
+    /** 请求页面数据 */
+    async onLoad(page, params = {}) {
+      try {
+        // 开启页面loading
+        this.loading = true;
+
+        // 请求页面数据
+        const res = await postPageList({ ...page, ...this.query, ...params });
+
+        console.log('res :>> ', res);
+        const { code, data } = res.data;
+        if (code !== 200) return;
+
+        this.data = data.records;
+        this.page.total = data.total;
+      } catch (error) {
+        console.log('error :>> ', error);
+      } finally {
+        this.loading = false;
+      }
+
+      // if (this.stockupDate.length > 0) {
+      //   let startDate = this.stockupDate[0];
+      //   let entDate = this.stockupDate[1];
+      //   params.startDate = this.getTime(startDate.toString());
+      //   params.entDate = this.getTime(entDate.toString());
+      // }
+      // getListOwnNUm(params).then(res => {
+      //   console.log('查询数量!!!', res.data.data);
+      //   if (!!res.data.data) {
+      //     this.treatNum = !res.data.data.treatNum ? 0 : parseInt(res.data.data.treatNum);
+      //     this.stopNum = !res.data.data.stopNum ? 0 : res.data.data.stopNum;
+      //     this.numBill = parseInt(this.treatNum) + parseInt(this.stopNum);
+      //   }
+      // });
+      // getListOwn(page.pageNum, page.pageSize, Object.assign(params, this.query)).then(res => {
+      //   const data = res.data.data;
+      //   console.log('???????', data);
+      //   this.page.total = data.total;
+      //   this.data = data.records;
+
+      //   this.data.forEach(i => {
+      //     if (!!i.list) {
+      //       i.collectFee = 0;
+      //       i.storageFee = 0;
+      //       i.transport = 0;
+      //       i.forklift = 0;
+      //       i.otherFee = 0;
+      //       i.list.forEach(a => {
+      //         const { cost, money } = a; // 对象解构，获取a对象的cost和money属性
+      //         switch (cost) {
+      //           case '1': // 到付
+      //             i.collectFee = money ? parseInt(money) : 0;
+      //             break;
+      //           case '2': // 仓储费用
+      //             i.storageFee = money ? parseInt(money) : 0;
+      //             break;
+      //           case '3': // 搬运费
+      //             console.log('0=-0-=');
+      //             i.transport = money ? parseInt(money) : 0;
+      //             break;
+      //           case '4': // 叉车费
+      //             i.forklift = money ? parseInt(money) : 0;
+      //             break;
+      //           case '5': // 其他增值费
+      //             i.otherFee = money ? parseInt(money) : 0;
+      //             break;
+      //         }
+      //       });
+      //     }
+      //   });
+      //   console.log(this.data);
+      //   this.loading = false;
+      //   this.selectionClear();
+      // });
+    },
+    async getMenDian(row, num) {},
+    //客户编号
+    async remoteCodeMethod(query) {
+      console.log('query :>> ', query);
+    },
+  },
+};
+</script>
+
+<style scoped lang="scss">
+/* .el-input {
+  margin-left: 8px;
+}
+*/
+:deep(.el-form-item) {
+  margin-right: 0;
+}
+
+:deep(.el-form-item__content) {
+  width: 200px !important;
+  margin: 0 8px;
+}
+.el-fr-d {
+  width: 100%;
+  display: flex;
+  justify-content: space-between;
+}
+.el-btn {
+  margin-right: 0;
+}
+// 日期选择框
+.el-times {
+  :deep(.el-tooltip__trigger) {
+    height: 30px !important;
+  }
+}
+:deep(.el-form-item__label) {
+  padding: 0;
+}
+
+:deep(.avue-crud) {
+  height: 100%;
+
+  overflow-y: scroll;
+}
+:deep(.el-card__body) {
+  height: 100%;
+}
+:deep(.el-card) {
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+}
+.el-fy {
+  display: flex;
+  align-items: flex-end;
+}
+
+// 新增行
+.add_row {
+  display: flex;
+  justify-content: space-between;
+}
+
+// 统计行
+.statistics_row {
+  margin: 10px 0;
+  font-size: 14px;
+  zoom: 0.9;
+  display: flex;
+
+  > div {
+    margin-right: 20px;
+  }
+}
+
+// 卡片容器
+.crad_container {
+  display: flex;
+
+  .card_container_item {
+    flex: 1;
+    // padding: 10px;
+    border-radius: 5px;
+    box-shadow: 0 0 5px #ccc;
+
+    &:first-child {
+      margin-right: 20px;
+    }
+
+    .card_container_item_title {
+      padding: 10px;
+      border-bottom: 1px solid #ccc;
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+    }
+
+    .card_container_item_box {
+      padding: 10px;
+    }
+  }
+}
+
+.pointer {
+  cursor: pointer;
+}
+
+// 新增线路
+.addLine_list {
+  width: 100%;
+
+  .list_row {
+    display: flex;
+    height: 30px;
+    border: 1px solid #ccc;
+    border-radius: 5px;
+
+    .list_row_title {
+      width: 50%;
+    }
+  }
+}
+
+:deep(.el-step:last-of-type .el-step__description) {
+  margin-right: 10%;
+}
+
+:deep(.popUpselect .el-select__popper) {
+  inset: auto !important;
+  top: 120% !important;
+}
+
+:deep(.avue-input-map) {
+  width: 100%;
+}
+
+// 标题
+:deep(.el-divider__text.is-left) {
+  font-size: 20px;
+  font-weight: bold;
+  color: var(--el-color-primary);
+}
+
+// 底部站位
+.footer-container {
+  height: 100px;
+}
+
+// 底部表单按钮
+.footerBtn {
+  position: fixed;
+  bottom: 20px;
+  left: 50%;
+  transform: translateX(-50%);
+}
+</style>
diff --git a/src/views/distribution/inventory/arteryDistrilbutionBillLadingList.vue b/src/views/distribution/inventory/arteryDistrilbutionBillLadingList.vue
index a334d27b..84d88a6d 100644
--- a/src/views/distribution/inventory/arteryDistrilbutionBillLadingList.vue
+++ b/src/views/distribution/inventory/arteryDistrilbutionBillLadingList.vue
@@ -1147,18 +1147,25 @@ export default {
     async handleSubmit() {},
     /** 新增 */
     handleAdd() {
-      this.title = '新增';
-      this.addInfo.form = {};
-      this.box = true;
-      this.addInfo.isNew = true;
-      this.$nextTick(() => {
-        // 获取表格实例并赋值高度和宽度
-        var bodyContent = document.querySelectorAll('.el-dialog .maboxhi');
-        bodyContent.forEach(val => {
-          val.style.height = '350px';
-          // val.style.width = '45%';
-        });
+      this.$router.push({
+        path: '/distribution/inventory/addArteryDistrilbutionBillLadingList',
+        query: {
+          name: '新增提货',
+        },
       });
+
+      // this.title = '新增';
+      // this.addInfo.form = {};
+      // this.box = true;
+      // this.addInfo.isNew = true;
+      // this.$nextTick(() => {
+      //   // 获取表格实例并赋值高度和宽度
+      //   var bodyContent = document.querySelectorAll('.el-dialog .maboxhi');
+      //   bodyContent.forEach(val => {
+      //     val.style.height = '350px';
+      //     // val.style.width = '45%';
+      //   });
+      // });
     },
     /** 修改 */
     handleEdit() {
diff --git a/src/views/distribution/signfor/distributionSignfortreat.vue b/src/views/distribution/signfor/distributionSignfortreat.vue
index 3ae8f765..b3d5512b 100644
--- a/src/views/distribution/signfor/distributionSignfortreat.vue
+++ b/src/views/distribution/signfor/distributionSignfortreat.vue
@@ -162,8 +162,8 @@
                 '装车件数' ||
                 '签收数' ||
                 '未签收数' ||
-                '未装车件数'||
-                '异常装车件数'||
+                '未装车件数' ||
+                '异常装车件数' ||
                 '异常签收件数'
               "
             >
@@ -394,7 +394,6 @@
               :on-success="ImgSuccessC"
               :headers="headers"
               multiple
-
             >
               <el-icon><Plus /></el-icon>
             </el-upload>
@@ -1856,11 +1855,11 @@ export default {
           type = 5;
           this.numberTitle = '未签收详情列表';
           break;
-          case '异常装车件数':
+        case '异常装车件数':
           type = 6;
           this.numberTitle = '异常装车详情列表';
           break;
-          case '异常签收件数':
+        case '异常签收件数':
           type = 7;
           this.numberTitle = '异常签收详情列表';
           break;
@@ -2511,7 +2510,7 @@ export default {
   display: flex;
   align-items: flex-end;
 }
-:deep(.el-upload-list__item-thumbnail){
+:deep(.el-upload-list__item-thumbnail) {
   object-fit: fill;
 }
 </style>
diff --git a/src/views/warehouse/parcelList/distributionParcelList.vue b/src/views/warehouse/parcelList/distributionParcelList.vue
index a1cde114..806c5888 100644
--- a/src/views/warehouse/parcelList/distributionParcelList.vue
+++ b/src/views/warehouse/parcelList/distributionParcelList.vue
@@ -260,7 +260,7 @@ export default {
           head: false,
         },
         {
-          prop: 'trainNumber',
+          prop: 'carNumber',
           label: '客户车次号',
           type: 2,
           values: '',
@@ -370,7 +370,6 @@ export default {
           sortable: true,
         },
 
-
         {
           prop: 'reservationCode',
           label: '预约单编号',
@@ -381,10 +380,8 @@ export default {
           fixed: false,
           sortable: true,
         },
-
-
         {
-          prop: 'noteNumber',
+          prop: 'trainNumber',
           label: '配送车次号',
           type: 2,
           values: '',
@@ -393,8 +390,6 @@ export default {
           fixed: false,
           sortable: true,
         },
-
-
         {
           prop: 'driverName',
           label: '配送司机',
@@ -405,8 +400,6 @@ export default {
           fixed: false,
           sortable: true,
         },
-
-
         {
           prop: 'scanTime',
           label: '装车时间',
@@ -417,8 +410,6 @@ export default {
           fixed: false,
           sortable: true,
         },
-
-
         {
           prop: 'scanUser',
           label: '实际装车人',
@@ -509,7 +500,7 @@ export default {
           fixed: false,
           sortable: true,
         },
-     
+
         // {
         //   prop: 'allocationMsg',
         //   label: '货位信息',
@@ -761,21 +752,6 @@ export default {
         delete this.query[row.prop.replace(/Name/, '')];
         delete this.query[row.prop];
       }
-
-      // // 上架状态
-      // if (row.prop === 'orderPackageGroundingStatusName') {
-      //   this.query.orderPackageGroundingStatus = value;
-      //   if (value === '') delete this.query.orderPackageGroundingStatus;
-      // }
-
-      // if (row.prop === 'orderPackageStatusName') {
-      //   this.query.orderPackageStatus = value;
-      //   if (value === '') delete this.query.orderPackageStatus;
-      // }
-
-      // if (value === '') {
-      //   delete this.query[row.prop];
-      // }
       this.page.currentPage = 1;
       this.onLoad(this.page);
     },
diff --git a/vite.config.js b/vite.config.js
index a8678b55..08e6eaf9 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -23,13 +23,13 @@ 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.148:9777',
-          // target: 'http://192.168.10.57:13000',
+          target: 'http://192.168.10.57:13000',
           // tjj
           // sst
-          // target: 'http://192.168.10.94:8888',
+          // target: 'http://192.168.10.200:13000',
           // target: 'http://192.168.10.29:13000',
           // target: 'http://h5uapi.huitongys.com',
           // target: 'http://test.api.huitongys.com',

From ffc259f268d0895a8bb81909b603e3846ce20656 Mon Sep 17 00:00:00 2001
From: xzg <4727863@qq.com>
Date: Wed, 27 Dec 2023 16:27:44 +0800
Subject: [PATCH 3/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/aftersales/aftersalesWorkOrderend.vue      |  6 +++---
 .../warehouse/parcelList/distributionParcelList.vue  | 12 ++----------
 2 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/src/views/aftersales/aftersalesWorkOrderend.vue b/src/views/aftersales/aftersalesWorkOrderend.vue
index 74b7ed6a..8693c81e 100644
--- a/src/views/aftersales/aftersalesWorkOrderend.vue
+++ b/src/views/aftersales/aftersalesWorkOrderend.vue
@@ -1010,7 +1010,7 @@ const onLoad = () => {
       });
       // 包件回显
       PackageInfo.value = res.data.data.abnormalPackageVOList;
-
+      // 要修改
       // 责任方回显
       FangAddList.value = res.data.data.processorVOList
         .filter(item => item.typesOf == '1')
@@ -1028,12 +1028,12 @@ const onLoad = () => {
           description: res.description, //说明
         };
       });
-
+      // 要修改
       res.data.data.processorVOList.forEach(item => {
         if (item.typesOf == 2) {
           // 处理方
           endFrom.value.processor.push(item.businessId);
-          // MessageResponsibility.value.push(item.businessId)
+          //MessageResponsibility.value.push(item.businessId)
         }
       });
       console.log(endFrom.value.processor, ' endFrom.value.processor');
diff --git a/src/views/warehouse/parcelList/distributionParcelList.vue b/src/views/warehouse/parcelList/distributionParcelList.vue
index a1cde114..8d8ef45e 100644
--- a/src/views/warehouse/parcelList/distributionParcelList.vue
+++ b/src/views/warehouse/parcelList/distributionParcelList.vue
@@ -381,11 +381,9 @@ export default {
           fixed: false,
           sortable: true,
         },
-
-
         {
           prop: 'noteNumber',
-          label: '配送车次号',
+          label: '配送单号',
           type: 2,
           values: '',
           width: '130',
@@ -393,8 +391,6 @@ export default {
           fixed: false,
           sortable: true,
         },
-
-
         {
           prop: 'driverName',
           label: '配送司机',
@@ -405,8 +401,6 @@ export default {
           fixed: false,
           sortable: true,
         },
-
-
         {
           prop: 'scanTime',
           label: '装车时间',
@@ -417,8 +411,6 @@ export default {
           fixed: false,
           sortable: true,
         },
-
-
         {
           prop: 'scanUser',
           label: '实际装车人',
@@ -451,7 +443,7 @@ export default {
         },
         {
           prop: 'dvehicleName',
-          label: '配送车牌',
+          label: '配送车次号',
           type: 2,
           values: '',
           width: '130',

From 28b472c380216386cf68c11e7f942e647fad6560 Mon Sep 17 00:00:00 2001
From: qb <1191961160@qq.com>
Date: Wed, 27 Dec 2023 16:36:03 +0800
Subject: [PATCH 4/7] =?UTF-8?q?=E5=8C=85=E4=BB=B6=E6=98=8E=E7=BB=86?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../parcelList/distributionParcelList.vue     | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/src/views/warehouse/parcelList/distributionParcelList.vue b/src/views/warehouse/parcelList/distributionParcelList.vue
index 2271b809..9acc9e89 100644
--- a/src/views/warehouse/parcelList/distributionParcelList.vue
+++ b/src/views/warehouse/parcelList/distributionParcelList.vue
@@ -440,6 +440,16 @@ export default {
           fixed: false,
           sortable: true,
         },
+        {
+          prop: 'noteNumber',
+          label: '配送单号',
+          type: 2,
+          values: '',
+          width: '130',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
         {
           prop: 'dvehicleName',
           label: '配送车次号',
@@ -450,6 +460,16 @@ export default {
           fixed: false,
           sortable: true,
         },
+        {
+          prop: 'vehicleName',
+          label: '配送车牌',
+          type: 2,
+          values: '',
+          width: '130',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
         {
           prop: 'firsts',
           label: '一级品',

From a6a78d1c1bba6586a24d9196a3a686937ddac1c8 Mon Sep 17 00:00:00 2001
From: xzg <4727863@qq.com>
Date: Wed, 27 Dec 2023 17:35:37 +0800
Subject: [PATCH 5/7] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../distributionDeliveryListedt.vue           |   7 +-
 .../turndelivery/deliveryDiscuss.vue          | 124 +++++++++++++++++-
 2 files changed, 125 insertions(+), 6 deletions(-)

diff --git a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue
index 4caad91e..f6e320b3 100644
--- a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue
+++ b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue
@@ -182,11 +182,12 @@
                 text
                 icon="el-icon-view"
                 @click="handleSignone(slotProps.scope.row)"
-                v-if="
+             
+                >一键签收
+                <!-- v-if="
                   slotProps.scope.row.signingStatus == '待审核' &&
                   slotProps.scope.row.driverSigning == '未签收'
-                "
-                >一键签收
+                " -->
               </el-text>
             </template>
           </tablecmt>
diff --git a/src/views/distribution/turndelivery/deliveryDiscuss.vue b/src/views/distribution/turndelivery/deliveryDiscuss.vue
index 90183d73..0465d54e 100644
--- a/src/views/distribution/turndelivery/deliveryDiscuss.vue
+++ b/src/views/distribution/turndelivery/deliveryDiscuss.vue
@@ -421,6 +421,9 @@
                   <el-dialog v-model="AddLalog" :title="wrapLoading ? '包件信息' : '在库订单信息'">
                     <!-- 表格列开始 -->
                     <!-- data 订单信息  wrapData包件信息 -->
+                    <div v-if="!wrapLoading"> 
+
+                  
                     <div class="SoInput" v-if="searchSo" ref="SoHeight">
                       <el-form label-width="100px" :model="parameter">
                         <el-form-item label="商场名称:">
@@ -484,6 +487,27 @@
                         搜索菜单预留按钮 
                       </div> -->
                     </div>
+                  </div>
+                  <!-- 包件搜索 -->
+                    <div v-else class="el_package"> 
+                      <el-form  :model="PackageFrom">
+                        <el-form-item label="运单号:">
+                          <el-input
+                            v-model="PackageFrom.inputwaybillNumber"
+                            clearable
+                            placeholder="请输入运单号"
+                          />
+                        </el-form-item>
+                        <el-form-item label="包条码:">
+                          <el-input
+                            v-model="PackageFrom.orderPackageCode"
+                            placeholder="请输入包条码"
+                          />
+                        </el-form-item>
+                      </el-form>
+                    </div>
+
+
                     <!-- 顶部开始 -->
                     <div class="el-Cart-button">
                       <!-- 表格顶部左侧按钮 -->
@@ -831,6 +855,7 @@ const pageList = ref([5, 10, 50, 100, 200]); // 选择每页显示多少条
 const background = ref(true); // 是否开启背景颜色
 const disabled = ref(false); // 是否禁止使用页码功能
 const data = ref([]); // 表格数据
+const PackageFrom=ref({});//包件搜索
 const wrapData = ref([]); //包件表格信息
 const wrapLoading = ref(false); //包件表格弹窗
 const dataInfo = ref([]); //表格展示信息
@@ -849,6 +874,7 @@ const flexList = ref<(string | number)[]>([]); //冻结
 const loading = ref(false); //刷新功能
 const BG = ref(false); //表格功能列表
 const BtnRadio = ref('1'); //按钮样式风格切换
+const Packageow = ref(); //查看包间报错当前数据
 const ElBtnClass = ref('el-Btn-link'); //按钮样式风格类名
 const searchSo = ref(false); //搜索弹窗
 const SoHeight = ref(); //搜索栏高度动态
@@ -1614,8 +1640,6 @@ const wrap = ref([
     head: true,
   },
 
-
-
   {
     prop: 'quantity',
     label: '数量',
@@ -2107,17 +2131,89 @@ const findIndexById = id => {
   return -1; //返回-1表示没用查询到
 };
 
+// 查看包间函数
+const PackageFn=()=>{
+  //接收点击查看当前行数据;
+  //   编辑信息弹窗状态
+  if (RouteId.value) {
+    console.log(wrapLoading.value, '当前为编辑状态');
+    $_getPackageListByDeliveryIdAndOrderId({
+     ...PackageFrom.value,//搜索参数
+      current: 1,
+      size: 100,
+      deliveryId: RouteId.value,
+      id: Packageow.value.id,
+    }).then(res => {
+      console.log(res, '订单包件信息');
+      if (res.data.code == 200) {
+        wrapData.value = res.data.data.data.packageList;
+        let IdTmp = []; //订单ID暂存
+        dataInfo.value[dataId.value].packageListInfo = wrapTemp.value[dataId.value];
+        //查看当前订单下面包件是缓存值,如果有就读取缓存值,否则就是第一次加载,使用API返回值
+        if (dataInfo.value[dataId.value].packageListInfo) {
+          dataInfo.value[dataId.value].packageListInfo.forEach(item => {
+            IdTmp.push(item.id);
+          });
+        }
+        toggleSelection({
+          val: false,
+          data: IdTmp.length ? IdTmp : res.data.data.data.packageListIds.split(','),
+          index: kind.value ? 0 : 1,
+        }); //编辑的时候选中已有的数据
+      }
+      // AddLalog.value = false; //关闭弹窗
+      console.log(wrapData.value, '包件表格信息');
+      console.log(res);
+    });
+  } else {
+    // 运单号
+    // 包条码
+    $_getPackageListByStockArticleId({
+      ...PackageFrom.value,//搜索参数
+      id: Packageow.value.id,
+      current: 1,
+      size: 100,
+    }).then(res => {
+      wrapData.value = res.data.data.records;
+      console.log(res, '订单包件');
+      if (kind.value) {
+        toggleSelection({ index: 0 }); //自主配送下面包件全选
+      } else {
+        toggleSelection({ index: 1 }); //外协下面包件全选
+      }
+      console.log(tableRefs, 'tableRefs');
+      console.log(res.data.data.records, '查看下面的包件');
+    });
+    // 新增 查看订单流程
+    console.log('当前为新增状态');
+    console.log(Packageow.value, Packageow.value.id, '查看包件事件');
+    //临时存储下标用于查询包件对应的下标
+    console.log(dataId.value, 'dataId.value下标');
+    console.log(wrapDataInfo.value[dataId.value], '当前订单下面的包件信息');
+    console.log(wrapDataInfo, '订单');
+  }
+  editLoading.value = false; //关闭加载效果
+}
+
+
+
+
 // 查看包件事件
 const ViewEvent = val => {
+  Packageow.value = val;
   wrapLoading.value = true; //查看包件弹窗
   AddLalog.value = true; //开启弹窗
   editLoading.value = true; //开启加载效果
   dataId.value = findIndexById(val.id);
   //接收点击查看当前行数据;
   //   编辑信息弹窗状态
+  PackageFn()
+  return
   if (RouteId.value) {
     console.log(wrapLoading.value, '当前为编辑状态');
     $_getPackageListByDeliveryIdAndOrderId({
+      waybillNumber: '', //运单号
+      orderPackageCode: '', //包条码
       current: 1,
       size: 100,
       deliveryId: RouteId.value,
@@ -2145,7 +2241,11 @@ const ViewEvent = val => {
       console.log(res);
     });
   } else {
+    // 运单号
+    // 包条码
     $_getPackageListByStockArticleId({
+      waybillNumber: '', //运单号
+      orderPackageCode: '', //包条码
       id: val.id,
       current: 1,
       size: 100,
@@ -2317,20 +2417,33 @@ const search = () => {
 };
 // 顶部搜索功能
 const SoInput = () => {
+if(!wrapLoading){
   if (kind.value) {
     OrderSelection(0, parameter.value);
   } else {
     OrderSelection(1, parameter.value);
   }
+}else{
+  PackageFn()
+}
+
+
+
 };
 // 顶部清空搜索
 const SoEmpty = () => {
-  parameter.value = {};
+  if(!wrapLoading){
+    parameter.value = {};
   if (kind.value) {
     OrderSelection(0);
   } else {
     OrderSelection(1);
   }
+  }else{
+    PackageFrom.value={}
+    PackageFn()
+  }
+
 };
 
 // 去重函数 接收一个数字通过ID匹配去掉重复项
@@ -3172,4 +3285,9 @@ const SubmitCommercial = () => {
   background-color: #ff0000;
   color: #fff;
 }
+.el_package{
+  :deep(.el-form){
+    justify-content: flex-start !important;
+  }
+}
 </style>

From a701141e2d82e54f7651facea67e107f240b8654 Mon Sep 17 00:00:00 2001
From: xzg <4727863@qq.com>
Date: Wed, 27 Dec 2023 17:51:41 +0800
Subject: [PATCH 6/7] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=97=A5=E6=9C=9F?=
 =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/aftersales/aftersalesWorkOrderAdd.vue | 6 +++---
 vite.config.js                                  | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/views/aftersales/aftersalesWorkOrderAdd.vue b/src/views/aftersales/aftersalesWorkOrderAdd.vue
index 9ecd28fe..82bdeaab 100644
--- a/src/views/aftersales/aftersalesWorkOrderAdd.vue
+++ b/src/views/aftersales/aftersalesWorkOrderAdd.vue
@@ -177,7 +177,7 @@
           v-model="Indexform.deliveryTime"
           type="datetime"
           format="YYYY-MM-DD"
-          value-format="YYYY-MM-DD"
+          value-format="YYYY-MM-DD HH:mm:ss"
           placeholder="请选择配送时间"
         />
       </el-form-item>
@@ -223,7 +223,7 @@
           v-model="Indexform.deliverGoodsTime"
           type="datetime"
           format="YYYY-MM-DD"
-          value-format="YYYY-MM-DD"
+          value-format="YYYY-MM-DD HH:mm:ss"
           placeholder="请选择发货时间"
         />
       </el-form-item>
@@ -763,7 +763,7 @@ function DeliveryTrainnumber() {
     taskTime: Indexform.value.deliveryTime,
   };
   data.current = 1; //页码
-  data.size = 999; //条数
+  data.size = 200; //条数
   $_shippingInformation(data).then(res => {
     console.log(res, '查询返回值');
     DeliveryDriver.value = res.data.data.records; //获取到的信息
diff --git a/vite.config.js b/vite.config.js
index 86c520b7..7054f708 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -26,8 +26,8 @@ export default ({ mode, command }) => {
           // 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.148:9777',
-          target: 'http://192.168.10.57:13000',
+          target: 'http://192.168.6.148:9777',
+          // target: 'http://192.168.10.57:13000',
           // tjj
           // sst
           // target: 'http://192.168.10.200:13000',

From 48f46dfa7a7be58b2c1190d960da0ce003cdf33a Mon Sep 17 00:00:00 2001
From: xzg <4727863@qq.com>
Date: Wed, 27 Dec 2023 19:31:31 +0800
Subject: [PATCH 7/7] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=80=E9=94=AE?=
 =?UTF-8?q?=E7=AD=BE=E6=94=B6=E5=9B=BE=E7=89=87=E7=BC=93=E5=AD=98=EF=BC=8C?=
 =?UTF-8?q?=E7=AD=BE=E6=94=B6=E5=9B=BE=E7=89=87=E6=89=B9=E9=87=8F=E4=B8=8A?=
 =?UTF-8?q?=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../deliverylist/distributionDeliveryListedt.vue    | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue
index f6e320b3..f92ed37f 100644
--- a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue
+++ b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue
@@ -551,6 +551,7 @@
               :on-remove="handleRemove"
               :on-success="ImgSuccessA"
               :headers="headers"
+              multiple
             >
               <el-icon><Plus /></el-icon>
             </el-upload>
@@ -569,6 +570,7 @@
               :on-remove="handleRemove"
               :on-success="ImgSuccessB"
               :headers="headers"
+              multiple
             >
               <el-icon><Plus /></el-icon>
             </el-upload>
@@ -587,6 +589,7 @@
               :on-remove="handleRemove"
               :on-success="ImgSuccessC"
               :headers="headers"
+              multiple
             >
               <el-icon><Plus /></el-icon>
             </el-upload>
@@ -605,6 +608,7 @@
               :on-remove="handleRemove"
               :on-success="ImgSuccessD"
               :headers="headers"
+              multiple
             >
               <el-icon><Plus /></el-icon>
             </el-upload>
@@ -612,7 +616,7 @@
               <img w-full :src="dialogImageUrlD" alt="IMG" />
             </el-dialog>
           </div>
-
+          
           <div class="imgName">
             <span>签收照</span>
             <el-upload
@@ -623,6 +627,7 @@
               :on-remove="handleRemove"
               :on-success="ImgSuccessE"
               :headers="headers"
+              multiple
             >
               <el-icon><Plus /></el-icon>
             </el-upload>
@@ -3555,6 +3560,12 @@ export default {
     },
     //一键签收
     handleSignone(row) {
+      // 清空图片缓存
+          this.DoorstepPhoto=[]
+          this.StackingPhoto=[]
+          this.FragilePhotos=[]
+          this.HomePhotos=[]
+          this.SignForPhotos=[]
       console.log('一键签收222>>>>>>>>>>', row);
       if (row.loadingStatus != '已装车') {
         ElMessage({