From bcdaea7e72f0b95766fa1ac2a121104ba8abc30a Mon Sep 17 00:00:00 2001
From: qb <1191961160@qq.com>
Date: Wed, 22 Nov 2023 22:24:52 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=B9=B2=E7=BA=BF=E6=8F=90?=
 =?UTF-8?q?=E8=B4=A7=E9=A1=B5=E9=9D=A2=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../arteryDistrilbutionBillLadingList.js      | 100 +++
 .../arteryDistrilbutionBillLadingList.js      |  76 +-
 src/router/views/index.js                     |  20 +-
 .../arteryDistrilbutionBillLadingList.vue     | 409 +++++++++-
 ...teryDistrilbutionBillLadingListDetails.vue | 732 ++++++++++++++++++
 .../inventory/distrilbutionBillLading.vue     |  11 +-
 .../inventory/distrilbutionBillLadingList.vue | 132 +++-
 7 files changed, 1371 insertions(+), 109 deletions(-)
 create mode 100644 src/api/distribution/arteryDistrilbutionBillLadingList.js
 create mode 100644 src/views/distribution/inventory/arteryDistrilbutionBillLadingListDetails.vue

diff --git a/src/api/distribution/arteryDistrilbutionBillLadingList.js b/src/api/distribution/arteryDistrilbutionBillLadingList.js
new file mode 100644
index 00000000..7b21fd36
--- /dev/null
+++ b/src/api/distribution/arteryDistrilbutionBillLadingList.js
@@ -0,0 +1,100 @@
+import request from '@/axios';
+
+/**
+ * 获取提货单列表
+ */
+export const postPageList = data => {
+  return request({
+    url: '/api/logpm-trunkline/billlading/pageList',
+    method: 'post',
+    data,
+  });
+};
+
+/**
+ * 查询所有计费方式
+ */
+export const postFindChargeTypeList = data => {
+  return request({
+    url: '/api/logpm-trunkline/billlading/findChargeTypeList',
+    method: 'post',
+    data,
+  });
+};
+
+/**
+ * 创建新提货单
+ */
+export const postSaveNew = data => {
+  return request({
+    url: '/api/logpm-trunkline/billlading/saveNew',
+    method: 'post',
+    data,
+  });
+};
+
+/**
+ * 查询运单列表
+ */
+export const postList = data => {
+  return request({
+    url: '/api/logpm-warehouseWaybill/list',
+    method: 'post',
+    data,
+  });
+};
+
+/**
+ * 更新提货单状态
+ */
+export const postUpdateBillladingStatus = data => {
+  return request({
+    url: '/api/logpm-trunkline/billlading/updateBillladingStatus',
+    method: 'post',
+    data,
+  });
+};
+
+/**
+ * 查询提货单详情
+ */
+export const postBillladingDetail = data => {
+  return request({
+    url: '/api/logpm-trunkline/billlading/billladingDetail',
+    method: 'post',
+    data,
+  });
+};
+
+/**
+ * 查询提货单包件明细
+ */
+export const postBillladingPackageDetail = data => {
+  return request({
+    url: '/api/logpm-trunkline/billlading/billladingPackageDetail',
+    method: 'post',
+    data,
+  });
+};
+
+/**
+ * 更新提货单关联运单数据
+ */
+export const postUpdateBillladingWaybillNum = data => {
+  return request({
+    url: '/api/logpm-trunkline/billlading/updateBillladingWaybillNum',
+    method: 'post',
+    data,
+  });
+};
+
+/**
+ * 提货单添加运单
+ */
+export const postAddWaybillToBillladingId = data => {
+  return request({
+    url: '/api/logpm-trunkline/billlading/addWaybillToBillladingId',
+    method: 'post',
+    data,
+  });
+};
diff --git a/src/option/distribution/arteryDistrilbutionBillLadingList.js b/src/option/distribution/arteryDistrilbutionBillLadingList.js
index 388d9a19..860c1def 100644
--- a/src/option/distribution/arteryDistrilbutionBillLadingList.js
+++ b/src/option/distribution/arteryDistrilbutionBillLadingList.js
@@ -16,7 +16,7 @@ export const columnList = [
     fixed: true,
   },
   {
-    prop: 'pickupBatch',
+    prop: 'billladingCode',
     label: '提货批次',
     type: 13,
     values: '',
@@ -27,8 +27,8 @@ export const columnList = [
     head: false,
   },
   {
-    prop: 'serviceNumber',
-    label: '车牌',
+    prop: 'carNumber',
+    label: '车牌号',
     type: 2,
     values: '',
     width: '130',
@@ -37,7 +37,7 @@ export const columnList = [
     sortable: true,
   },
   {
-    prop: 'waybillNumber',
+    prop: 'driverName',
     label: '司机名称',
     type: 2,
     values: '',
@@ -47,7 +47,7 @@ export const columnList = [
     sortable: true,
   },
   {
-    prop: 'consigneeUnit',
+    prop: 'driverPhone',
     label: '司机电话',
     type: 2,
     values: '',
@@ -57,7 +57,7 @@ export const columnList = [
     sortable: true,
   },
   {
-    prop: 'customerName',
+    prop: 'warehouseName',
     label: '仓库名称',
     type: 2,
     values: '',
@@ -67,7 +67,7 @@ export const columnList = [
     sortable: true,
   },
   {
-    prop: 'customerTelephone',
+    prop: 'lineNameTitle',
     label: '线路标题',
     type: 1,
     values: '',
@@ -77,7 +77,7 @@ export const columnList = [
     sortable: true,
   },
   {
-    prop: 'warehouse',
+    prop: 'nodeNub',
     label: '线路节点数',
     type: 2,
     values: '',
@@ -87,7 +87,7 @@ export const columnList = [
     sortable: true,
   },
   {
-    prop: 'warehouseEntryTime',
+    prop: 'startTime',
     label: '提货开始时间',
     type: 4,
     values: '',
@@ -97,7 +97,7 @@ export const columnList = [
     sortable: true,
   },
   {
-    prop: 'collectFee',
+    prop: 'endTime',
     label: '提货完成时间',
     type: 4,
     values: '',
@@ -107,7 +107,7 @@ export const columnList = [
     sortable: true,
   },
   {
-    prop: 'transport',
+    prop: 'planVolume',
     label: '预计数量',
     type: 2,
     values: '',
@@ -117,7 +117,7 @@ export const columnList = [
     sortable: true,
   },
   {
-    prop: 'storageFee',
+    prop: 'billladingStatus',
     label: '状态',
     type: 3,
     values: '',
@@ -127,7 +127,7 @@ export const columnList = [
     sortable: true,
   },
   {
-    prop: 'forklift',
+    prop: 'chargeType',
     label: '计费模式',
     type: 3,
     values: '',
@@ -137,7 +137,7 @@ export const columnList = [
     sortable: true,
   },
   {
-    prop: 'otherFee',
+    prop: 'totalFee',
     label: '提货费用',
     type: 2,
     values: '',
@@ -147,7 +147,7 @@ export const columnList = [
     sortable: true,
   },
   {
-    prop: 'pickUpTime',
+    prop: 'remark',
     label: '备注',
     type: 2,
     values: '',
@@ -157,7 +157,7 @@ export const columnList = [
     sortable: true,
   },
   {
-    prop: 'totalNumber',
+    prop: 'carrierName',
     label: '承运商',
     type: 2,
     values: '',
@@ -167,7 +167,7 @@ export const columnList = [
     sortable: true,
   },
   {
-    prop: 'stopNum',
+    prop: 'waybillCount',
     label: '单数',
     type: 2,
     values: '',
@@ -177,7 +177,7 @@ export const columnList = [
     sortable: true,
   },
   {
-    prop: 'brand',
+    prop: 'totalNum',
     label: '件数',
     type: 2,
     values: '',
@@ -187,7 +187,7 @@ export const columnList = [
     sortable: true,
   },
   {
-    prop: 'productInformation',
+    prop: 'totalWeight',
     label: '重量',
     type: 2,
     values: '',
@@ -197,7 +197,7 @@ export const columnList = [
     sortable: true,
   },
   {
-    prop: 'customerTelephone',
+    prop: 'totalVolume',
     label: '体积',
     type: 2,
     values: '',
@@ -207,7 +207,7 @@ export const columnList = [
     sortable: false,
   },
   {
-    prop: 'consignee',
+    prop: 'createUserName',
     label: '创建人',
     type: 2,
     values: '',
@@ -247,7 +247,7 @@ export const columnDetailList = [
     fixed: true,
   },
   {
-    prop: 'pickupBatch',
+    prop: 'billladingCode',
     label: '提货批次',
     type: 2,
     values: '',
@@ -258,7 +258,7 @@ export const columnDetailList = [
     head: false,
   },
   {
-    prop: 'serviceNumber',
+    prop: 'driverName',
     label: '提货司机',
     type: 2,
     values: '',
@@ -268,7 +268,7 @@ export const columnDetailList = [
     sortable: true,
   },
   {
-    prop: 'waybillNumber',
+    prop: 'carNumber',
     label: '提货车牌',
     type: 2,
     values: '',
@@ -278,7 +278,7 @@ export const columnDetailList = [
     sortable: true,
   },
   {
-    prop: 'consigneeUnit',
+    prop: 'waybillNo',
     label: '运单号',
     type: 2,
     values: '',
@@ -288,7 +288,7 @@ export const columnDetailList = [
     sortable: true,
   },
   {
-    prop: 'customerName',
+    prop: 'orderCode',
     label: '合同号',
     type: 2,
     values: '',
@@ -298,7 +298,7 @@ export const columnDetailList = [
     sortable: true,
   },
   {
-    prop: 'customerTelephone',
+    prop: 'destination',
     label: '目的地',
     type: 2,
     values: '',
@@ -308,7 +308,7 @@ export const columnDetailList = [
     sortable: true,
   },
   {
-    prop: 'warehouse',
+    prop: 'incomingType',
     label: '入库类型',
     type: 2,
     values: '',
@@ -318,7 +318,7 @@ export const columnDetailList = [
     sortable: true,
   },
   {
-    prop: 'warehouseEntryTime',
+    prop: '',
     label: '是否齐套',
     type: 2,
     values: '',
@@ -328,7 +328,7 @@ export const columnDetailList = [
     sortable: true,
   },
   {
-    prop: 'collectFee',
+    prop: 'trayCode',
     label: '托盘码',
     type: 2,
     values: '',
@@ -338,7 +338,7 @@ export const columnDetailList = [
     sortable: true,
   },
   {
-    prop: 'transport',
+    prop: 'firstPickName',
     label: '一级品类',
     type: 2,
     values: '',
@@ -348,7 +348,7 @@ export const columnDetailList = [
     sortable: true,
   },
   {
-    prop: 'storageFee',
+    prop: 'secondPickName',
     label: '二级品类',
     type: 2,
     values: '',
@@ -358,7 +358,7 @@ export const columnDetailList = [
     sortable: true,
   },
   {
-    prop: 'forklift',
+    prop: 'thirdPickName',
     label: '三级品类',
     type: 2,
     values: '',
@@ -368,7 +368,7 @@ export const columnDetailList = [
     sortable: true,
   },
   {
-    prop: 'otherFee',
+    prop: 'materialName',
     label: '物料名称',
     type: 2,
     values: '',
@@ -378,7 +378,7 @@ export const columnDetailList = [
     sortable: true,
   },
   {
-    prop: 'pickUpTime',
+    prop: 'brand',
     label: '品牌',
     type: 2,
     values: '',
@@ -388,7 +388,7 @@ export const columnDetailList = [
     sortable: true,
   },
   {
-    prop: 'totalNumber',
+    prop: '',
     label: '操作仓库',
     type: 2,
     values: '',
@@ -398,7 +398,7 @@ export const columnDetailList = [
     sortable: true,
   },
   {
-    prop: 'stopNum',
+    prop: 'createUserName',
     label: '操作人',
     type: 2,
     values: '',
@@ -408,7 +408,7 @@ export const columnDetailList = [
     sortable: true,
   },
   {
-    prop: 'brand',
+    prop: '',
     label: '提货扫码时间',
     type: 4,
     values: '',
diff --git a/src/router/views/index.js b/src/router/views/index.js
index 9bcc642b..f40ada16 100644
--- a/src/router/views/index.js
+++ b/src/router/views/index.js
@@ -201,10 +201,10 @@ export default [
     ],
   },
   {
-    path: '/distribution/inventory/arteryDistrilbutionBillLadingList',
+    path: '/distribution/inventory',
     component: Layout,
-    key: 'fullPath',
-    redirect: '/distribution/inventory',
+    // key: 'fullPath',
+    redirect: '/distribution/inventory/arteryDistrilbutionBillLadingList',
     children: [
       {
         path: '/distribution/inventory/arteryDistrilbutionBillLadingList',
@@ -212,9 +212,18 @@ export default [
         meta: {
           data: 'data',
         },
+        component: () =>
+          import('@/views/distribution/inventory/arteryDistrilbutionBillLadingList.vue'),
+      },
+      {
+        path: '/distribution/inventory/arteryDistrilbutionBillLadingListDetails',
+        name: '干线提货管理详情',
+        meta: {
+          data: 'data',
+        },
         component: () =>
           import(
-            /* webpackChunkName: "views" */ '@/views/distribution/inventory/arteryDistrilbutionBillLadingList.vue'
+            /* webpackChunkName: "views" */ '@/views/distribution/inventory/arteryDistrilbutionBillLadingListDetails.vue'
           ),
       },
     ],
@@ -688,7 +697,7 @@ export default [
         name: '配送查看',
         meta: {
           i18n: 'dict',
-          keepAlive:true
+          keepAlive: true,
         },
         props: route => ({
           name: route.query.name,
@@ -1067,7 +1076,6 @@ export default [
     ],
   },
 
-
   // {
   //   path: '/distribution/turndelivery/devtmp',
   //   component: Layout,
diff --git a/src/views/distribution/inventory/arteryDistrilbutionBillLadingList.vue b/src/views/distribution/inventory/arteryDistrilbutionBillLadingList.vue
index a94962c8..6c3812fc 100644
--- a/src/views/distribution/inventory/arteryDistrilbutionBillLadingList.vue
+++ b/src/views/distribution/inventory/arteryDistrilbutionBillLadingList.vue
@@ -45,11 +45,21 @@
             <el-button type="primary" icon="el-icon-plus" @click="handleAddDistrilbution"
               >添加提货数据</el-button
             >
-            <el-button type="primary" icon="el-icon-check" @click="handleAdd">提货完成</el-button>
-            <el-button type="primary" icon="el-icon-close" @click="handleAdd">取消完成</el-button>
-            <el-button type="primary" icon="el-icon-close" @click="handleAdd">取消提货</el-button>
-            <el-button type="primary" icon="el-icon-check" @click="handleAdd">结 算</el-button>
-            <el-button type="primary" icon="el-icon-close" @click="handleAdd">取消结算</el-button>
+            <el-button type="primary" icon="el-icon-check" @click="handleDistributionConfirm"
+              >提货完成</el-button
+            >
+            <el-button type="primary" icon="el-icon-close" @click="handleCloseConfirm"
+              >取消完成</el-button
+            >
+            <el-button type="primary" icon="el-icon-close" @click="handleDistributionClose"
+              >取消提货</el-button
+            >
+            <el-button type="primary" icon="el-icon-check" @click="handleSettleAccounts"
+              >结 算</el-button
+            >
+            <el-button type="primary" icon="el-icon-close" @click="handleCloseSettleAccounts"
+              >取消结算</el-button
+            >
             <!-- <el-button type="danger" icon="el-icon-download" @click="handleExportInfo" plain
               >导出
             </el-button> -->
@@ -139,7 +149,27 @@
           <!-- 表单字段 -->
           <el-row>
             <el-form-item label="提货车辆" prop="pickUpTime">
-              <el-input v-model="form.pickUpTime" placeholder="请选择提货车辆" />
+              <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"
@@ -153,7 +183,27 @@
               icon="plus"
             ></el-button>
             <el-form-item label="司机" prop="consignee">
-              <el-input v-model="form.consignee" placeholder="请选择司机" />
+              <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"
@@ -167,7 +217,27 @@
               icon="plus"
             ></el-button>
             <el-form-item label="线路" prop="pickUpPlate">
-              <el-input v-model="form.pickUpPlate" placeholder="请选择线路" />
+              <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"
@@ -328,10 +398,10 @@
                   <el-input v-model="form.pickUpTime" type="textarea" placeholder="请输入备注" />
                 </el-form-item>
                 <el-form-item label="总时效" prop="pickUpTime">
-                  <el-input v-model="form.pickUpTime" disabled placeholder="总时效" />
+                  <el-input v-model="totalAging" disabled placeholder="总时效" />
                 </el-form-item>
                 <el-form-item label="总里程" prop="pickUpTime">
-                  <el-input v-model="form.pickUpTime" disabled placeholder="总里程" />
+                  <el-input v-model="totalDistance" disabled placeholder="总里程" />
                 </el-form-item>
               </el-form>
             </div>
@@ -340,7 +410,9 @@
           <div class="card_container_item">
             <div class="card_container_item_title">
               <div>节点信息</div>
-              <el-text type="primary" class="pointer">创建新节点</el-text>
+              <el-text type="primary" @click="popUpShow.addNewNodeVisited = true" class="pointer"
+                >创建新节点</el-text
+              >
             </div>
             <div class="card_container_item_box">
               <el-scrollbar height="400px">
@@ -355,25 +427,22 @@
                         <el-row>
                           <!-- 表单字段 -->
                           <template v-if="index === 0">
-                            <el-form-item label="起点" prop="pickUpTime">
+                            <el-form-item label="起点" prop="productName">
+                              <!--            <el-input v-model="formDetail.productName" placeholder="请输入物品名称"/>-->
                               <el-select
-                                v-model="item.customerCode"
+                                v-model="item.productName"
                                 filterable
                                 remote
                                 reserve-keyword
                                 remote-show-suffix
-                                :remote-method="remoteCodeMethod"
-                                :loading="loading"
-                                @change="getMenDian($event, 2)"
-                                placeholder="请输入内容"
-                                :teleported="false"
-                                placement="bottom-end"
-                                class="popUpselect"
+                                :remote-method="remoteMethodStuffName"
+                                @change="getMenDian($event, 1)"
+                                placeholder="请输入物品名称"
                               >
                                 <el-option
-                                  v-for="item in options"
+                                  v-for="item in stuffName"
                                   :key="item.value"
-                                  :label="item.code"
+                                  :label="item.label"
                                   :value="item.value"
                                 />
                               </el-select>
@@ -429,10 +498,10 @@
                           <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.code" />
+                          <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.code" />
+                          <el-input-number :min="0" v-model="item.distance" />
                         </el-form-item>
                       </el-form>
                       <el-button
@@ -508,7 +577,79 @@
             >
             <el-button
               icon="el-icon-circle-close"
-              @click="popUpShow.addDistrilbutionVisited = false"
+              @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>
@@ -629,6 +770,8 @@
       </el-dialog>
     </div>
   </basic-container>
+
+  <!-- 列表配置显示 -->
   <edittablehead
     @setcolum="setnewcolum"
     @closce="showdrawer"
@@ -644,6 +787,19 @@ import {
   getListOwnNUm,
   getBillLadingExport,
 } from '@/api/distribution/distrilbutionBillLading';
+// 引入页面请求
+import {
+  postPageList,
+  postFindChargeTypeList,
+  postSaveNew,
+  postList,
+  postUpdateBillladingStatus,
+  postBillladingDetail,
+  postBillladingPackageDetail,
+  postUpdateBillladingWaybillNum,
+  postAddWaybillToBillladingId,
+} from '@/api/distribution/arteryDistrilbutionBillLadingList';
+// 引入表格配置文件
 import {
   columnList,
   columnDetailList,
@@ -676,6 +832,8 @@ export default {
         distrilbutionDetailVisited: false,
         /** 新增线路是否显示 */
         addDistrilbutionLineVisited: false,
+        /** 新增新节点是否显示 */
+        addNewNodeVisited: false,
       },
       // 是否显示查询
       search: true,
@@ -747,6 +905,23 @@ export default {
         /** 终点信息 */
         endInfo: {},
       },
+      /** 新增新节点 */
+      addNewNodeInfo: {
+        /** 新增新节点信息 */
+        addNewNodeForm: {},
+        /** 地图配置 */
+        //高德初始化参数
+        params: {
+          zoom: 10,
+          // zoomEnable: false,
+          // dragEnable: false,
+        },
+        map: [],
+        /** 节点列表 */
+        nodeList: [{}],
+        /** 节点信息 */
+        nodeInfo: {},
+      },
       /** 字典 */
       clientType: [],
       options: [],
@@ -822,6 +997,24 @@ export default {
       // 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: {
     /** 导出 */
@@ -993,6 +1186,121 @@ export default {
       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);
@@ -1000,12 +1308,13 @@ export default {
     /** 查询详细 */
     handleLike(row) {
       console.log('row :>> ', row);
-      // this.$router.push({
-      //   path: '/distribution/inventory/distrilbutionBillLadingView',
-      //   query: {
-      //     id: row.row.id,
-      //   },
-      // });
+      this.$router.push({
+        path: '/distribution/inventory/arteryDistrilbutionBillLadingListDetails',
+        query: {
+          id: row.row.id,
+          name: '编辑提货单',
+        },
+      });
     },
     /** 查看 */
     handleEdits(row) {
@@ -1114,7 +1423,7 @@ export default {
       this.addInfo.haveIds = this.addInfo.map(val => val.id);
     },
     /** 请求页面数据 */
-    onLoad(page, params = {}) {
+    async onLoad(page, params = {}) {
       this.loading = true;
       if (this.stockupDate.length > 0) {
         let startDate = this.stockupDate[0];
@@ -1228,6 +1537,34 @@ export default {
         this.shop.push(st);
       });
     },
+    //客户编号
+    async remoteCodeMethod(query) {
+      if (query) {
+        // this.loading = true;
+        this.options = [];
+        this.form.clientId = null;
+        let cl = await getListClient(this.page.currentPage, this.page.pageSize, {
+          clientCode: 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);
+        });
+        // setTimeout(() => {
+        //   this.loading = false
+        //   this.loading = this.list.filter((item) => {
+        //     return item.label.toLowerCase().includes(query.toLowerCase())
+        //   })
+        // }, 200)
+      } else {
+        this.options = [];
+      }
+    },
   },
 };
 </script>
@@ -1382,8 +1719,12 @@ export default {
   margin-right: 10%;
 }
 
-.popUpselect :deep(.el-select__popper) {
+:deep(.popUpselect .el-select__popper) {
   inset: auto !important;
-  top: 110% !important;
+  top: 120% !important;
+}
+
+:deep(.avue-input-map) {
+  width: 100%;
 }
 </style>
diff --git a/src/views/distribution/inventory/arteryDistrilbutionBillLadingListDetails.vue b/src/views/distribution/inventory/arteryDistrilbutionBillLadingListDetails.vue
new file mode 100644
index 00000000..db2ffaff
--- /dev/null
+++ b/src/views/distribution/inventory/arteryDistrilbutionBillLadingListDetails.vue
@@ -0,0 +1,732 @@
+<template>
+  <basic-container>
+    <div class="avue-crud">
+      <el-tabs type="border-card" v-model="activeTab">
+        <el-tab-pane label="详 情 信 息" name="tab1">
+          <el-divider>提货基本信息</el-divider>
+          <el-row :gutter="24" class="rows">
+            <el-col :xl="7" :lg="7" :md="8" :sm="24">
+              <span>批次代码：{{ deliverydata.kindName }} </span>
+            </el-col>
+            <el-col :xl="7" :lg="7" :md="8" :sm="24">
+              <span>提货线路：{{ deliverydata.vehicleName }} </span>
+            </el-col>
+            <el-col :xl="7" :lg="7" :md="8" :sm="24">
+              <span>提货车辆：{{ deliverydata.vehicleName }} </span>
+            </el-col>
+          </el-row>
+
+          <el-row :gutter="24" class="rows">
+            <el-col :xl="7" :lg="7" :md="8" :sm="24">
+              <span>司机：{{ deliverydata.kindName }} </span>
+            </el-col>
+            <el-col :xl="7" :lg="7" :md="8" :sm="24">
+              <span>预计件数{{ deliverydata.vehicleName }} </span>
+            </el-col>
+            <el-col :xl="7" :lg="7" :md="8" :sm="24">
+              <span>承运商：{{ deliverydata.vehicleName }} </span>
+            </el-col>
+          </el-row>
+
+          <el-row :gutter="24" class="rows">
+            <el-col :xl="7" :lg="7" :md="8" :sm="24">
+              <span>计费模式：{{ deliverydata.kindName }} </span>
+            </el-col>
+            <el-col :xl="7" :lg="7" :md="8" :sm="24">
+              <span>提货费用：{{ deliverydata.vehicleName }} </span>
+            </el-col>
+            <el-col :xl="7" :lg="7" :md="8" :sm="24">
+              <span>备注：{{ deliverydata.vehicleName }} </span>
+            </el-col>
+          </el-row>
+          <el-row v-if="!search">
+            <!-- 查询模块 -->
+            <el-form :inline="true" :model="query" class="el-fr-d">
+              <!-- <div class="fo-fl"> -->
+              <el-form-item label="提货批次:">
+                <el-input v-model="query.serviceNumber" placeholder="请输入提货批次"></el-input>
+              </el-form-item>
+              <el-form-item label="开单日期:" class="el-times">
+                <!--            <el-input v-model="query.stockupArea" placeholder="请输入备货区"></el-input>-->
+                <el-date-picker
+                  v-model="stockupDate"
+                  type="datetimerange"
+                  unlink-panels
+                  range-separator="至"
+                  start-placeholder="开始时间"
+                  end-placeholder="结束时间"
+                  :shortcuts="shortcuts"
+                />
+              </el-form-item>
+              <!-- </div> -->
+              <!-- 查询按钮 -->
+              <el-form-item class="el-btn">
+                <el-button type="primary" icon="el-icon-search" @click="searchChange"
+                  >搜 索</el-button
+                >
+                <el-button icon="el-icon-delete" @click="searchReset()">清 空</el-button>
+              </el-form-item>
+            </el-form>
+          </el-row>
+          <el-row>
+            <div class="avue-crud__header">
+              <!-- 头部左侧按钮模块 -->
+              <div class="avue-crud__left">
+                <!--                 <el-button
+                  type="danger"
+                  icon="el-icon-download"
+                  v-if="permission.distrilbutionBillLadingList_export"
+                  @click="handleExportInfo"
+                  plain
+                  >导出
+                </el-button> -->
+              </div>
+              <!-- 头部右侧按钮模块 -->
+              <div class="avue-crud__right">
+                <el-button icon="el-icon-refresh" @click="searchChange" circle></el-button>
+                <el-button icon="Operation" @click="showdrawer(true)" circle></el-button>
+                <el-button icon="el-icon-search" @click="searchHide" circle></el-button>
+              </div>
+            </div>
+          </el-row>
+          <tablecmt
+            :columnList="columnList"
+            :tableData="data"
+            :loading="loading"
+            @inputTxt="inputsc"
+            @timeCheck="timesc"
+            @btnCheck="btnsc"
+            @selectCheck="selectsc"
+            @selection="selectionChange"
+          >
+            <template #default="slotProps">
+              <template v-if="slotProps.scope.column.label === '运单号'">
+                <el-text size="small" text @click="handleLike(slotProps.scope)">{{
+                  //   slotProps.scope.row.pickupBatch
+                  123
+                }}</el-text>
+              </template>
+              <template v-if="slotProps.scope.column.label === '操作'">
+                <el-text @click="handleEdit(slotProps.scope)">编辑</el-text>
+              </template>
+            </template>
+          </tablecmt>
+
+          <el-row style="margin-top: 20px; font-size: 14px">
+            <div style="margin-right: 10px">选择数: 12，</div>
+            <div style="margin-right: 10px">选择数: 12，</div>
+            <div style="margin-right: 10px">选择数: 12，</div>
+            <div style="margin-right: 10px">选择数: 12</div>
+          </el-row>
+
+          <div class="col">
+            <!-- 分页模块 -->
+            <el-pagination
+              align="right"
+              background
+              @size-change="sizeChange"
+              @current-change="currentChange"
+              :current-page="page.currentPage"
+              :page-sizes="[30, 50, 80, 120]"
+              :page-size="page.pageSize"
+              layout="total, sizes, prev, pager, next, jumper"
+              :total="page.total"
+            >
+            </el-pagination>
+            <el-button icon="CircleCheckFilled" type="primary" @click="this.$router.go(-1)"
+              >确认修改</el-button
+            >
+            <!-- 站位的div -->
+            <div></div>
+          </div>
+        </el-tab-pane>
+
+        <el-tab-pane label="操 作 日 志" name="tab2">
+          <div style="min-height: 300px">
+            <el-steps direction="vertical" space="80px">
+              <el-step title="32131">
+                <template #description> {{ new Date() }} </template>
+                <template #icon>
+                  <el-icon color="#172e60" size="20px"><HelpFilled /></el-icon>
+                </template>
+              </el-step>
+              <el-step title="32131">
+                <template #description> {{ new Date() }} </template>
+                <template #icon>
+                  <el-icon color="#172e60" size="20px"><HelpFilled /></el-icon>
+                </template>
+              </el-step>
+            </el-steps>
+          </div>
+        </el-tab-pane>
+      </el-tabs>
+    </div>
+
+    <!-- 编辑弹窗 -->
+    <el-dialog
+      title="新增节点"
+      v-model="box"
+      width="30%"
+      :before-close="beforeClose"
+      append-to-body
+    >
+      <el-form :disabled="view" ref="form" :model="form" 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-date-picker v-model="form.time" type="date" 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-number v-model="form.pickUpTime" type="text" :min="0" 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">
+          <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">
+          <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="textarea" placeholde="备注" />
+        </el-form-item>
+      </el-form>
+      <!-- 表单按钮 -->
+      <template #footer>
+        <div v-if="!view" class="dialog-footer">
+          <el-button type="primary" icon="el-icon-circle-check" @click="handleEditSubmit"
+            >提 交</el-button
+          >
+          <el-button icon="el-icon-circle-close" @click="box = false">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </basic-container>
+  <edittablehead
+    @setcolum="setnewcolum"
+    @closce="showdrawer"
+    :drawerShow="drawerShow"
+    :columnList="columnList"
+  >
+  </edittablehead>
+</template>
+
+<script>
+// import {} from 'module';
+import { mapGetters } from 'vuex';
+import dayjs from 'dayjs';
+import { ElMessage } from 'element-plus';
+import { getToken } from '@/utils/auth';
+export default {
+  data() {
+    return {
+      columnList: [
+        {
+          prop: 'reservationCode',
+          label: '序号',
+          type: 12,
+          values: '',
+          width: '55',
+          checkarr: [],
+          fixed: true,
+          head: false,
+        },
+        {
+          prop: 'reservationCode',
+          label: '提货批次',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: true,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'trainNumber',
+          label: '运单号',
+          type: 13,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: true,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'mallName',
+          label: '开单日期',
+          type: 4,
+          values: '',
+          width: '180',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'consignee',
+          label: '货物名称',
+          type: 2,
+          values: '',
+          width: '130',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'deliveryPhone',
+          label: '提货件数',
+          type: 10,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          isshowSummary: true,
+        },
+        {
+          prop: 'deliveryAddress',
+          label: '提货重量',
+          type: 10,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          isshowSummary: true,
+        },
+        {
+          prop: 'receivingUnit',
+          label: '提货体积',
+          type: 10,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+          isshowSummary: true,
+        },
+        {
+          prop: 'reservationNum',
+          label: '到站',
+          type: 2,
+          values: '',
+          width: '180',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'reservationStockListNum',
+          label: '目的仓',
+          type: 3,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'loadedNub',
+          label: '发货人',
+          type: 2,
+          values: '',
+          width: '180',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'inventoryNub',
+          label: '收货人',
+          type: 2,
+          values: '',
+          width: '180',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'receivedQuantity',
+          label: '发货手机',
+          type: 2,
+          values: '',
+          width: '130',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'remarks',
+          label: '收货电话',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'isUrgentName',
+          label: '收货地址',
+          type: 2,
+          values: '',
+          width: '180',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'isUrgentName',
+          label: '备注',
+          type: 1,
+          values: '',
+          width: '180',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'assignStatusName',
+          label: '支付方式',
+          type: 2,
+          values: '',
+          width: '180',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'stockupStatusName',
+          label: '提货费用',
+          type: 2,
+          values: '',
+          width: '130',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'forkliftName',
+          label: '运输费用',
+          type: 2,
+          values: '',
+          width: '130',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: '',
+          label: '操作',
+          type: 6,
+          values: '',
+          width: '200',
+          checkarr: [],
+          fixed: 'right',
+          hide: true,
+        },
+        // 更多列的配置...
+      ],
+      height: 300,
+      // 弹框标题
+      title: '',
+      activeTab: 'tab1',
+      // 是否展示弹框
+      box: false,
+      // 是否显示查询
+      search: true,
+      /** 提货基本信息 */
+      deliverydata: {},
+      /** 显示列表控件 */
+      drawerShow: false,
+      // 加载中
+      loading: true,
+      // 是否为查看模式。。
+      view: false,
+      // 查询信息
+      query: {},
+      formCustomer: {},
+      // 分页信息
+      page: {
+        currentPage: 1,
+        pageSize: 30,
+        total: 40,
+      },
+      // 表单数据
+      form: {},
+      // 选择行
+      selectionList: [],
+      // 表单列表
+      data: [],
+    };
+  },
+  watch: {
+    '$route.data': {
+      handler(newVal, oldVal) {
+        console.log(newVal, oldVal);
+        if (this.$router.data) {
+          this.fetchData();
+        }
+        this.onLoad(this.page);
+      },
+      deep: true,
+      immediate: true,
+    },
+  },
+  mounted() {
+    var bodyContent = document.querySelectorAll('.maboxhi');
+    bodyContent.forEach(val => {
+      val.style.height = '500px';
+      // val.style.width = '45%';
+    });
+    this.init();
+    this.onLoad();
+  },
+  created() {
+    // //查询字典
+    // this.queryDictionary();
+  },
+  computed: {
+    ...mapGetters(['permission']),
+    ids() {
+      let ids = [];
+      this.selectionList.forEach(ele => {
+        ids.push(ele.id);
+      });
+      return ids.join(',');
+    },
+    // 图片上传接口
+    doubledCount() {
+      return '/api/blade-resource/oss/endpoint/put-file';
+    },
+    // 图片上传必须携带TOKEN
+    headers() {
+      return { 'Blade-Auth': 'Bearer ' + getToken() };
+    },
+  },
+  methods: {
+    /**
+     * 弹窗的勾选回调，用于更改头部数组
+     * 固定搭配，只需要更换   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);
+      } else if (type == 4) {
+        this.columnList = newarr;
+      }
+    },
+    showdrawer(value) {
+      this.drawerShow = value;
+    },
+    init() {
+      this.height = this.setPx(document.body.clientHeight - 340);
+    },
+    searchHide() {
+      this.search = !this.search;
+    },
+    searchChange() {
+      this.onLoad(this.page);
+    },
+    searchReset() {
+      this.query = {};
+      this.page.currentPage = 1;
+      this.onLoad(this.page);
+    },
+
+    inputsc(index, row) {
+      this.query[row.prop] = index;
+      if (index === '') delete this.query[row.prop];
+      this.onLoad(this.page);
+    },
+    timesc(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);
+    },
+    btnsc() {},
+    selectsc() {
+      this.query[row.prop] = index;
+      if (!index) delete this.query[row.prop];
+      this.onLoad(this.page);
+    },
+    beforeClose(done) {
+      done();
+      this.form = {};
+      this.view = false;
+    },
+    selectionChange(list) {
+      console.log('sllsls');
+      this.selectionList = list;
+    },
+    selectionClear() {
+      this.selectionList = [];
+      this.$refs.table.clearSelection();
+    },
+    currentChange(currentPage) {
+      this.page.currentPage = currentPage;
+      this.onLoad(this.page);
+    },
+    sizeChange(pageSize) {
+      this.page.pageSize = pageSize;
+      this.onLoad(this.page);
+    },
+    onLoad() {
+      //查询详情
+      /*       const data = decodeURIComponent(this.$route.query.data);
+      this.deliverydata = JSON.parse(data);
+
+      this.deliveryId = this.deliverydata.id; //存储ID
+      this.loading = true;
+      let id = this.deliverydata.id;
+      getDetail(id).then(res => {
+        console.log('res.data>>>>>>>>>>>>', res.data.data);
+        const data = res.data.data;
+        this.deliverydata = data;
+
+        console.log('this.deliverydata>>>>>>>>>>>>', this.deliverydata);
+        this.deliverydata.remarks = data.remarks;
+
+        this.data = data.reservationList;
+        let a = 0;
+        let packNum = 0;
+        let invenNum = 0;
+        let signNum = 0;
+        this.data.map(item => {
+          console.log('--------------->item', item);
+          a += parseInt(item.inventoryNub) + parseInt(item.loadedNub);
+          packNum += parseInt(item.reservationNum);
+          invenNum += parseInt(item.reservationStockListNum);
+          signNum += parseInt(item.receivedQuantity);
+        });
+      }); */
+
+      this.loading = false;
+    },
+
+    /** 开启编辑弹窗 */
+    handleEdit({ row }) {
+      console.log('row :>> ', row);
+      this.box = true;
+    },
+
+    /** 编辑提交 */
+    handleEditSubmit() {},
+
+    //客户编号
+    async remoteCodeMethod(query) {
+      if (query) {
+        // this.loading = true;
+        this.options = [];
+        this.form.clientId = null;
+        let res = await getListClient(this.page.currentPage, this.page.pageSize, {
+          clientCode: query,
+        });
+        console.log('客户信息1234>>>>', res.data.data.records);
+        res.data.data.records.forEach(i => {
+          let st = {
+            label: i.clientName,
+            value: i.id,
+            code: i.clientCode,
+          };
+          this.options.push(st);
+        });
+      } else {
+        this.options = [];
+      }
+    },
+  },
+};
+</script>
+<style scoped lang="scss">
+:deep(.el-dialog__body) {
+  img {
+    width: 100%;
+  }
+}
+
+.col {
+  margin-top: 20px;
+  display: flex;
+  justify-content: space-between;
+  > div {
+    flex: 1;
+  }
+}
+
+// 日期选择器
+:deep(.el-date-editor.el-input) {
+  height: 100% !important;
+  width: 100% !important;
+}
+
+:deep(.el-range-editor.el-input__wrapper) {
+  height: 100% !important;
+}
+
+// 下拉选择器
+:deep(.el-select) {
+  width: 100%;
+}
+
+// 数字输入框
+:deep(.el-input-number) {
+  width: 100%;
+
+  .el-input__inner {
+    text-align: left;
+  }
+}
+</style>
diff --git a/src/views/distribution/inventory/distrilbutionBillLading.vue b/src/views/distribution/inventory/distrilbutionBillLading.vue
index 37336dc3..c9f03335 100644
--- a/src/views/distribution/inventory/distrilbutionBillLading.vue
+++ b/src/views/distribution/inventory/distrilbutionBillLading.vue
@@ -54,7 +54,12 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="12"> </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="备注">
+              <el-input type="textarea" v-model="form.remark" />
+            </el-form-item>
+          </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="24">
@@ -81,7 +86,7 @@
           </el-col>
           <el-col :span="24">
             <el-form-item label="费用合计" prop="totalCost">
-              <el-input v-model="form.totalCost" placeholder="请输入费用合计" />
+              <el-input v-model="form.totalCost" placeholder="费用合计" disabled />
             </el-form-item>
           </el-col>
         </el-row>
@@ -314,7 +319,7 @@
           :total="pageStock.total"
         >
         </el-pagination>
-      </div>                                          
+      </div>
 
       <template #footer>
         <span class="dialog-footer">
diff --git a/src/views/distribution/inventory/distrilbutionBillLadingList.vue b/src/views/distribution/inventory/distrilbutionBillLadingList.vue
index f7743bf3..bab4734d 100644
--- a/src/views/distribution/inventory/distrilbutionBillLadingList.vue
+++ b/src/views/distribution/inventory/distrilbutionBillLadingList.vue
@@ -10,8 +10,15 @@
             </el-form-item>
             <el-form-item label="入库时间:" class="el-times">
               <!--            <el-input v-model="query.stockupArea" placeholder="请输入备货区"></el-input>-->
-              <el-date-picker v-model="stockupDate" type="datetimerange" unlink-panels range-separator="至"
-                start-placeholder="开始时间" end-placeholder="结束时间" :shortcuts="shortcuts" />
+              <el-date-picker
+                v-model="stockupDate"
+                type="datetimerange"
+                unlink-panels
+                range-separator="至"
+                start-placeholder="开始时间"
+                end-placeholder="结束时间"
+                :shortcuts="shortcuts"
+              />
             </el-form-item>
           </div>
           <!-- 查询按钮 -->
@@ -29,7 +36,8 @@
         </el-col>
         <el-col :span="10">
           <span style="margin-bottom: 2%; font-size: 16px">
-            已提货：{{ stopNum }}单/{{ numBill }}件</span>
+            已提货：{{ stopNum }}单/{{ numBill }}件</span
+          >
         </el-col>
       </el-row>
       <el-row>
@@ -38,12 +46,27 @@
           <div class="avue-crud__left">
             <!-- <el-button type="primary" icon="el-icon-plus" @click="handleAdd">新 增</el-button>
             <el-button type="danger" icon="el-icon-delete" @click="handleDelete" plain>删 除</el-button>-->
-            <el-button type="primary" icon="el-icon-plus" v-if="permission.distrilbutionBillLadingList_add"
-              @click="handleBillAdd">创建自提</el-button>
-            <el-button type="primary" icon="el-icon-plus" v-if="permission.distrilbutionBillLadingList_sign"
-              @click="handleSign(null, 2)">自提签收</el-button>
-            <el-button type="danger" icon="el-icon-delete" v-if="permission.distrilbutionBillLadingList_export"
-              @click="handleExportInfo" plain>导出
+            <el-button
+              type="primary"
+              icon="el-icon-plus"
+              v-if="permission.distrilbutionBillLadingList_add"
+              @click="handleBillAdd"
+              >创建自提</el-button
+            >
+            <el-button
+              type="primary"
+              icon="el-icon-plus"
+              v-if="permission.distrilbutionBillLadingList_sign"
+              @click="handleSign(null, 2)"
+              >自提签收</el-button
+            >
+            <el-button
+              type="danger"
+              icon="el-icon-delete"
+              v-if="permission.distrilbutionBillLadingList_export"
+              @click="handleExportInfo"
+              plain
+              >导出
             </el-button>
           </div>
           <!-- 头部右侧按钮模块 -->
@@ -56,32 +79,76 @@
       </el-row>
       <el-row>
         <!-- 列表模块 -->
-        <tablecmt :columnList="columnList" :tableData="data" :loading="loading" @inputTxt="inputsc" @timeCheck="timesc"
-          @btnCheck="btnsc" @selectCheck="selectsc" @selection="selectionChange">
+        <tablecmt
+          :columnList="columnList"
+          :tableData="data"
+          :loading="loading"
+          @inputTxt="inputsc"
+          @timeCheck="timesc"
+          @btnCheck="btnsc"
+          @selectCheck="selectsc"
+          @selection="selectionChange"
+        >
           <template #default="slotProps">
             <!--            <el-button size="small" @click="editsolt(slotProps.scope)">修改</el-button>-->
-            <el-text size="small" text v-if="permission.distrilbutionBillLadingList_view"
-              @click="handleLike(slotProps.scope)">查看</el-text>
-            <el-text size="small" type="danger" icon="el-icon-edit" text @click="handleSign(slotProps.scope, 1)"
-              v-if="permission.distrilbutionBillLadingList_qs && slotProps.scope.row.conditions < 30">签收</el-text>
-            <el-text type="primary" text icon="el-icon-edit" @click="handleEdits(slotProps.scope)"
-              v-if="permission.distrilbutionBillLadingList_edit && slotProps.scope.row.conditions < 20">编辑提货信息</el-text>
+            <el-text
+              size="small"
+              text
+              v-if="permission.distrilbutionBillLadingList_view"
+              @click="handleLike(slotProps.scope)"
+              >查看</el-text
+            >
+            <el-text
+              size="small"
+              type="danger"
+              icon="el-icon-edit"
+              text
+              @click="handleSign(slotProps.scope, 1)"
+              v-if="
+                permission.distrilbutionBillLadingList_qs && slotProps.scope.row.conditions < 30
+              "
+              >签收</el-text
+            >
+            <el-text
+              type="primary"
+              text
+              icon="el-icon-edit"
+              @click="handleEdits(slotProps.scope)"
+              v-if="
+                permission.distrilbutionBillLadingList_edit && slotProps.scope.row.conditions < 20
+              "
+              >编辑提货信息</el-text
+            >
             <!--            <el-button size="small" type="danger" icon="el-icon-edit" text @click="handleDeleteOwn(slotProps.scope)">删除</el-button>-->
           </template>
         </tablecmt>
       </el-row>
-      <el-row class='el-fy'>
+      <el-row class="el-fy">
         <div class="avue-crud__pagination flex-c-sb" style="width: 100%">
           <div style="font-size: 14px">勾选数量: {{ selectionList.length }}</div>
           <!-- 分页模块 -->
-          <el-pagination align="right" background @size-change="sizeChange" @current-change="currentChange"
-            :current-page="page.currentPage" :page-sizes="[30, 50, 80, 120]" :page-size="page.pageSize"
-            layout="total, sizes, prev, pager, next, jumper" :total="page.total">
+          <el-pagination
+            align="right"
+            background
+            @size-change="sizeChange"
+            @current-change="currentChange"
+            :current-page="page.currentPage"
+            :page-sizes="[30, 50, 80, 120]"
+            :page-size="page.pageSize"
+            layout="total, sizes, prev, pager, next, jumper"
+            :total="page.total"
+          >
           </el-pagination>
         </div>
       </el-row>
       <!-- 表单模块 -->
-      <el-dialog :title="title" v-model="box" width="50%" :before-close="beforeClose" append-to-body>
+      <el-dialog
+        :title="title"
+        v-model="box"
+        width="50%"
+        :before-close="beforeClose"
+        append-to-body
+      >
         <el-form :disabled="view" ref="form" :model="form" label-width="80px">
           <!-- 表单字段 -->
           <el-form-item label="提货时间" prop="pickUpTime">
@@ -98,8 +165,12 @@
           </el-form-item>
           <el-form-item label="证件类型" prop="certificateType">
             <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
+                v-for="item in certificateTypeData"
+                :key="item.dictKey"
+                :label="item.dictValue"
+                :value="item.dictKey"
+              >
               </el-option>
             </el-select>
           </el-form-item>
@@ -110,7 +181,9 @@
         <!-- 表单按钮 -->
         <template #footer>
           <span v-if="!view" class="dialog-footer">
-            <el-button type="primary" icon="el-icon-circle-check" @click="handleSubmit">提 交</el-button>
+            <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>
           </span>
         </template>
@@ -268,7 +341,12 @@
       </div>
     </div>-->
   </basic-container>
-  <edittablehead @setcolum="setnewcolum" @closce="showdrawer" :drawerShow="drawerShow" :columnList="columnList">
+  <edittablehead
+    @setcolum="setnewcolum"
+    @closce="showdrawer"
+    :drawerShow="drawerShow"
+    :columnList="columnList"
+  >
   </edittablehead>
 </template>
 
@@ -1163,8 +1241,6 @@ export default {
   padding: 0;
 }
 
-
-
 :deep(.avue-crud) {
   display: flex;
   height: 100%;