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 53de43d8..ae91aab8 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'
           ),
       },
     ],
@@ -700,7 +709,7 @@ export default [
         name: '配送查看',
         meta: {
           i18n: 'dict',
-          keepAlive:true
+          keepAlive: true,
         },
         props: route => ({
           name: route.query.name,
diff --git a/src/views/distribution/checkInventoryTask/createTaskTemp.vue b/src/views/distribution/checkInventoryTask/createTaskTemp.vue
index 267265e6..2f2df09d 100644
--- a/src/views/distribution/checkInventoryTask/createTaskTemp.vue
+++ b/src/views/distribution/checkInventoryTask/createTaskTemp.vue
@@ -14,8 +14,7 @@
             <el-input v-model="SoInfoData.c" placeholder="物流车次" />
           </el-form-item>
         </el-form>
-    
-        
+
         <div class="SoBtn">
           <el-button icon="el-icon-delete" @click="searchReset()">清 空</el-button>
           <el-button type="primary" icon="el-icon-search" @click="searchChange">搜 索</el-button>
@@ -25,17 +24,19 @@
       <!-- 头部右侧按钮模块 -->
 
       <div class="avue-crud__right">
-          <div>
-               <el-button type="primary" icon="el-icon-search" @click="InventoryTask">创建盘点任务</el-button>
-               <el-button type="primary" icon="el-icon-search" >取消盘点</el-button>
-               <el-button type="primary" icon="el-icon-search" >盘点完成</el-button>
-               <el-button type="primary" icon="el-icon-search" >取消完成</el-button>
-               <el-button type="primary" icon="el-icon-search">批量删除</el-button>
-          </div>
-        <div> 
-        <el-button icon="el-icon-refresh" @click="Refresh" circle></el-button>
-        <el-button icon="el-icon-search" @click="searchSo = !searchSo" circle></el-button>
-         </div>
+        <div>
+          <el-button type="primary" icon="el-icon-search" @click="InventoryTask"
+            >创建盘点任务</el-button
+          >
+          <el-button type="primary" icon="el-icon-search">取消盘点</el-button>
+          <el-button type="primary" icon="el-icon-search">盘点完成</el-button>
+          <el-button type="primary" icon="el-icon-search">取消完成</el-button>
+          <el-button type="primary" icon="el-icon-search">批量删除</el-button>
+        </div>
+        <div>
+          <el-button icon="el-icon-refresh" @click="Refresh" circle></el-button>
+          <el-button icon="el-icon-search" @click="searchSo = !searchSo" circle></el-button>
+        </div>
       </div>
       <!-- 表格开始 -->
       <el-table
@@ -100,7 +101,7 @@
                   @click="ViewEvent(props.row)"
                   >明细</el-button
                 >
-                   <el-button
+                <el-button
                   :link="ElButtonS[0].link"
                   :class="ElButtonS[0].class"
                   :auto-insert-space="ElButtonS[0].space"
@@ -109,7 +110,7 @@
                   @click="DetailsNotCounted(props.row)"
                   >未盘点明细</el-button
                 >
-                     <el-button
+                <el-button
                   :link="ElButtonS[1].link"
                   :class="ElButtonS[1].class"
                   :auto-insert-space="ElButtonS[1].space"
@@ -118,7 +119,7 @@
                   @click="extension(props.row)"
                   >延期</el-button
                 >
-                  <el-button
+                <el-button
                   :link="ElButtonS[3].link"
                   :class="ElButtonS[3].class"
                   :auto-insert-space="ElButtonS[3].space"
@@ -129,11 +130,7 @@
                 >
               </div>
               <span v-if="item.type == 7">{{
-                props.row[item.prop] == 1
-                  ? '全部'
-                  : props.row[item.prop] == 2
-                  ? '全仓'
-                  : '/'
+                props.row[item.prop] == 1 ? '全部' : props.row[item.prop] == 2 ? '全仓' : '/'
               }}</span>
               <span v-if="item.type == 8">{{
                 props.row[item.prop] == 0
@@ -142,15 +139,13 @@
                   ? '开始'
                   : props.row[item.prop] == 2
                   ? '暂停'
-                    : props.row[item.prop] == 3
+                  : props.row[item.prop] == 3
                   ? '结束'
                   : '/'
               }}</span>
               <span v-if="item.type == 1">{{
                 props.row[item.prop] ? props.row[item.prop] : '/'
               }}</span>
-
-
             </template>
           </el-table-column>
         </el-table-column>
@@ -171,22 +166,22 @@
       />
     </div>
     <!-- 弹窗详情 -->
-    
-    <el-dialog v-model="PopupDetails" title="盘点数据" width="70%" :before-close="handleClose">
-        <div style="margin-bottom:10px;">
-         <div>
-            <!-- v-if='TcMInventoryStatus' -->
-        <div v-if="!NotCounted">
-        <el-button type="primary"  @click="searchChange">删 除</el-button>
-        <el-button type="primary"  @click="InventoryModification">提交修改</el-button>
-        <el-button type="primary"  @click="ModifyingStatus">修改状态</el-button>
-        </div>
 
-        <div v-if="NotCounted">
-        <el-button type="primary"  @click="NotInventoried">盘点</el-button>
-        </div>
-        </div>
+    <el-dialog v-model="PopupDetails" title="盘点数据" width="70%" :before-close="handleClose">
+      <div style="margin-bottom: 10px">
+        <div>
+          <!-- v-if='TcMInventoryStatus' -->
+          <div>
+            <!-- v-if="!NotCounted" -->
+            <el-button type="primary" @click="searchChange">删 除</el-button>
+            <el-button type="primary" @click="InventoryModification">提交修改</el-button>
+            <el-button type="primary" @click="ModifyingStatus">修改状态</el-button>
+          </div>
+          <div v-if="NotCounted">
+            <el-button type="primary" @click="NotInventoried">盘点</el-button>
+          </div>
         </div>
+      </div>
       <!-- 表格开始 -->
       <el-table
         v-loading="TcPdloading"
@@ -218,7 +213,7 @@
           :fixed="item.fixed"
           align="center"
           v-for="(item, index) in InventoryDetails"
-         :key="item.label"
+          :key="item.label"
         >
           <el-table-column
             :prop="item.prop"
@@ -235,9 +230,26 @@
                 v-model="item.values"
                 :placeholder="`请输入${item.label}`"
               /> -->
+
+              <el-select
+                v-model="TcFrom.questTarget"
+                class="m-2"
+                placeholder="选择品类"
+                size="large"
+                v-if="item.type == 6"
+                @change="TcChengeQuestTarget"
+                :clearable="true"
+              >
+                <el-option
+                  v-for="item in options"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                />
+              </el-select>
             </template>
             <template #default="props">
-                   <span v-if="item.type == 5">{{
+              <span v-if="item.type == 5">{{
                 props.row[item.prop] == 0
                   ? '待盘点'
                   : props.row[item.prop] == 1
@@ -247,9 +259,9 @@
                   : props.row[item.prop] == 3
                   ? '已排除'
                   : '/'
-              }}</span> 
+              }}</span>
 
-                <span v-if="item.type == 6">{{
+              <span v-if="item.type == 6">{{
                 props.row[item.prop] == 1
                   ? '定制品'
                   : props.row[item.prop] == 2
@@ -257,20 +269,19 @@
                   : props.row[item.prop] == 3
                   ? '库存品'
                   : '/'
-              }}</span> 
+              }}</span>
 
-             <span v-if="item.type == 10">
-                 <el-input
-                @change="InputSo(item)"
-                clearable
-                :disabled='props.row.Checkbox'
-                v-model="props.row[item.prop]"
-                :placeholder="`请输入${item.label}`"
-              />    
+              <span v-if="item.type == 10">
+                <el-input
+                  @change="InputSo(item)"
+                  clearable
+                  :disabled="props.row.Checkbox"
+                  v-model="props.row[item.prop]"
+                  :placeholder="`请输入${item.label}`"
+                />
               </span>
 
-
-             <div :class="ElBtnClass" v-if="item.type == 3 && !NotCounted">
+              <div :class="ElBtnClass" v-if="item.type == 3 && !NotCounted">
                 <el-button
                   :link="ElButtonS[2].link"
                   :class="ElButtonS[2].class"
@@ -282,7 +293,6 @@
                 >
               </div>
 
-
               <span v-if="item.type == 4">{{
                 props.row[item.prop] ? props.row[item.prop] : '/'
               }}</span>
@@ -291,66 +301,74 @@
         </el-table-column>
       </el-table>
       <template #footer>
-              <!-- 表格翻页功能 -->
-    <div class="demo-pagination-blockPD demo-pagination-block TCdemo-pagination-block">
-      <el-pagination
-        v-model:current-page="TccurrentPage"
-        v-model:page-size="TcpageSize"
-        :page-sizes="pageList"
-        :disabled="disabled"
-        :background="background"
-        layout="total, sizes, prev, pager, next, jumper"
-        :total="Tctotal"
-        @size-change="TcPageSizeChange"
-        @current-change="TcSizeChange"
-      />
-    </div>
+        <!-- 表格翻页功能 -->
+        <div class="demo-pagination-blockPD demo-pagination-block TCdemo-pagination-block">
+          <el-pagination
+            v-model:current-page="TccurrentPage"
+            v-model:page-size="TcpageSize"
+            :page-sizes="pageList"
+            :disabled="disabled"
+            :background="background"
+            layout="total, sizes, prev, pager, next, jumper"
+            :total="Tctotal"
+            @size-change="TcPageSizeChange"
+            @current-change="TcSizeChange"
+          />
+        </div>
         <span class="dialog-footer">
           <el-button>取消</el-button>
           <el-button type="primary">确定</el-button>
         </span>
       </template>
 
-
-
       <!-- 弹窗里面的详情 -->
 
-<!-- 状态选择 -->
- <el-dialog v-model="InventoryStatus" title="状态选择" width="70%" style="display: flex;flex-direction: column;"> 
-      <!-- 定制品单选框 -->
-       <el-radio-group v-model="WrapBarEditing.radio" class="tcradiogroup" v-if="!TcStateSwitching">
-         <template v-for='(item,index) in radioList' :key='item.label'>
+      <!-- 状态选择 -->
+      <el-dialog
+        v-model="InventoryStatus"
+        title="状态选择"
+        width="70%"
+        style="display: flex; flex-direction: column"
+      >
+        <!-- 定制品单选框 -->
+        <el-radio-group
+          v-model="WrapBarEditing.radio"
+          class="tcradiogroup"
+          v-if="!TcStateSwitching"
+        >
+          <template v-for="(item, index) in radioList" :key="item.label">
             <div class="Tcstate">
-          <el-radio @change='TcReac' :label=item.label>{{item.txt}} </el-radio> <el-input-number v-model="counting[item.input]" :disabled="item.disabled"  placeholder="数量" />
-           </div>
-        </template>
-      </el-radio-group>
-
-
-      <!-- 多选框 -->
-  <el-checkbox-group v-model="radioList" v-else>
-    <template v-for='(item,index) in radioList' :key='item.label'>
-       <div class="Tcstate">
-          <el-checkbox @change='Tcmultiple' :label="item.txt"/><el-input-number v-model="counting[item.input]" :disabled="item.disabled"  placeholder="数量" />
-       </div>
-    </template>
-  </el-checkbox-group>
-
-
-
+              <el-radio @change="TcReac" :label="item.label">{{ item.txt }} </el-radio>
+              <el-input-number
+                v-model="counting[item.input]"
+                :disabled="item.disabled"
+                placeholder="数量"
+              />
+            </div>
+          </template>
+        </el-radio-group>
+
+        <!-- 多选框 -->
+        <el-checkbox-group v-model="readList" @change="Tcmultiple" v-else>
+          <template v-for="(item, index) in radioList" :key="item.label">
+            <div class="Tcstate TcstateS">
+              <el-checkbox :label="item.txt" /><el-input-number
+                v-model="counting[item.input]"
+                :disabled="item.disabled"
+                placeholder="数量"
+              />
+            </div>
+          </template>
+        </el-checkbox-group>
 
         <span class="Tcstdialog-footer">
-          <el-button @click="InventoryStatus=false">取消</el-button>
+          <el-button @click="InventoryStatus = false">取消</el-button>
           <el-button type="primary" @click="StatusDetermination">确定</el-button>
         </span>
-   </el-dialog>
-
-  <el-dialog
-    v-model="PopupEditing"
-    title="信息编辑"
-    width="60%"
-  >
-    <el-form :model="WrapBarEditing" label-position='right'     label-width="100px">
+      </el-dialog>
+
+      <el-dialog v-model="PopupEditing" title="信息编辑" width="60%">
+        <el-form :model="WrapBarEditing" label-position="right" label-width="100px">
           <el-form-item label="包条:">
             <el-input v-model="WrapBarEditing.orderPackageCode" placeholder="包条" />
           </el-form-item>
@@ -358,99 +376,98 @@
             <el-input v-model="WrapBarEditing.orderCode" placeholder="请输入订单自编号" />
           </el-form-item>
 
-      <el-form-item label="异常状态:">
-          <el-radio-group v-model="WrapBarEditing.radio">
-          <el-radio :label=item.label v-for='item in radioList'>{{item.txt}}</el-radio>
-      </el-radio-group>
+          <el-form-item label="异常状态:">
+            <el-radio-group v-model="WrapBarEditing.radio">
+              <el-radio :label="item.label" v-for="item in radioList" :key="item.label">{{
+                item.txt
+              }}</el-radio>
+            </el-radio-group>
           </el-form-item>
 
-
           <el-form-item label="新的货位:">
             <el-input v-model="WrapBarEditing.positionCode" placeholder="请输入" />
           </el-form-item>
-    </el-form>
-
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button @click="PopupEditing = false">取消</el-button>
-        <el-button @click="ResetInformation">重置</el-button>
-        <el-button type="primary" @click="PopupEditing = false">提交</el-button>
-      </span>
-    </template>
-  </el-dialog>
+        </el-form>
+
+        <template #footer>
+          <span class="dialog-footer">
+            <el-button @click="PopupEditing = false">取消</el-button>
+            <el-button @click="ResetInformation">重置</el-button>
+            <el-button type="primary" @click="PopupEditing = false">提交</el-button>
+          </span>
+        </template>
+      </el-dialog>
     </el-dialog>
     <!-- 创建盘点弹窗 -->
-  <el-dialog
-    v-model="InventoryPopup"
-    title="创建盘点任务"
-    width="30%"
-    :before-close="InventoryPopupClose"
-  >
-   <el-form :model="formInventory" label-width="120px">
-   <el-form-item label="商场名称">
-   <el-select   multiple v-model="formInventory.scname" class="m-2" placeholder="请选择商场" size="large"  @change='formInventoryChange'>
-   <el-option
-      v-for="item in formInventory.select"
-      :key="item.id"
-      :label="item.clientName"
-      :value="item.id"
-    />
-  </el-select>
-    </el-form-item>
-
-    <el-form-item label="品牌">
+    <el-dialog
+      v-model="InventoryPopup"
+      title="创建盘点任务"
+      width="30%"
+      :before-close="InventoryPopupClose"
+    >
+      <el-form :model="formInventory" label-width="120px">
+        <el-form-item label="商场名称">
+          <el-select
+            multiple
+            v-model="formInventory.scname"
+            class="m-2"
+            placeholder="请选择商场"
+            size="large"
+            @change="formInventoryChange"
+          >
+            <el-option
+              v-for="item in formInventory.select"
+              :key="item.id"
+              :label="item.clientName"
+              :value="item.id"
+            />
+          </el-select>
+        </el-form-item>
+
+        <el-form-item label="品牌">
           <el-input v-model="formInventory.brandName" disabled placeholder="品牌名称" />
-    </el-form-item>
-
-
-    <el-form-item label="盘点时间">
-    <el-date-picker
-      v-model="formInventory.time"
-      type="datetimerange"
-      range-separator="至"
-      start-placeholder="盘点开始时间"
-      format="YYYY-MM-DD HH:mm:ss"
-      date-format="YYYY/MM/DD ddd"
-      value-format="YYYY/MM/DD HH:mm:ss"
-      end-placeholder="盘点结束时间">
-    </el-date-picker>
-    </el-form-item>
-
-    </el-form>
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button @click="InventoryPopup = false">取消</el-button>
-        <el-button type="primary" @click="InventorySubmit">
-          提交
-        </el-button>
-      </span>
-    </template>
-
-
-
-  </el-dialog>
-<!-- 延期弹窗 -->
-  <el-dialog v-model="dialogTabData" title="选择延期时间">
-   <el-date-picker
+        </el-form-item>
+
+        <el-form-item label="盘点时间">
+          <el-date-picker
+            v-model="formInventory.time"
+            type="datetimerange"
+            range-separator="至"
+            start-placeholder="盘点开始时间"
+            format="YYYY-MM-DD HH:mm:ss"
+            date-format="YYYY/MM/DD ddd"
+            value-format="YYYY/MM/DD HH:mm:ss"
+            end-placeholder="盘点结束时间"
+          >
+          </el-date-picker>
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button @click="InventoryPopup = false">取消</el-button>
+          <el-button type="primary" @click="InventorySubmit"> 提交 </el-button>
+        </span>
+      </template>
+    </el-dialog>
+    <!-- 延期弹窗 -->
+    <el-dialog v-model="dialogTabData" title="选择延期时间">
+      <el-date-picker
         v-model="TcData"
         type="date"
         placeholder="请选择延期时间"
         value-format="YYYY-MM-DD HH:mm:ss"
-        
       />
-          <template #footer>
-      <span class="dialog-footer">
-        <el-button @click="dialogTabData = false">取消</el-button>
-        <el-button type="primary" @click="InventoryDate">
-          提交
-        </el-button>
-      </span>
-    </template>
-  </el-dialog>
-
-<!-- 对比信息弹窗 -->
-  <el-dialog v-model="dialogcontrast" title="对比信息"  width="70%">
-        <!-- 表格开始 -->
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button @click="dialogTabData = false">取消</el-button>
+          <el-button type="primary" @click="InventoryDate"> 提交 </el-button>
+        </span>
+      </template>
+    </el-dialog>
+
+    <!-- 对比信息弹窗 -->
+    <el-dialog v-model="dialogcontrast" title="对比信息" width="70%">
+      <!-- 表格开始 -->
       <el-table
         v-loading="contrastloading"
         element-loading-text="数据正在更新中..."
@@ -504,94 +521,105 @@
                 <!-- 按钮 -->
               </div>
               <span v-if="item.type == 7">{{
-                props.row[item.prop] == 1
-                  ? '/'
-                  : props.row[item.prop] == 2
-                  ? '/'
-                  : '/'
+                props.row[item.prop] == 1 ? '/' : props.row[item.prop] == 2 ? '/' : '/'
               }}</span>
               <span v-if="item.type == 4">{{
-                props.row[item.prop] !=null? props.row[item.prop] : '/'
+                props.row[item.prop] != null ? props.row[item.prop] : '/'
               }}</span>
             </template>
           </el-table-column>
         </el-table-column>
       </el-table>
-  </el-dialog>
-<!-- 数据对比结束 -->
-
+    </el-dialog>
+    <!-- 数据对比结束 -->
   </div>
 </template>
 
 <script setup>
-import { ref, reactive, onMounted, computed } from 'vue';
 import {
-  getDictList,
-  getTaskQuestPage,
-  postAddtaskQuest,
+  $_getContrastInfo,
   $_getDetailInfo,
-  $_updateDetailInfo,
   $_updateDate,
-  $_getContrastInfo,
+  $_updateDetailInfo,
   $_updateQuestChildInfo,
+  getDictList,
+  getTaskQuestPage,
+  postAddtaskQuest,
 } from '@/api/distribution/createTask';
 import { ElMessage } from 'element-plus';
+import { ref } from 'vue';
 const SoInfoData = ref({}); //搜索框参数
 const searchSo = ref(false); //搜索框
 const ElData = ref([]); //表格的值
-const TcPD=ref([]);//弹窗盘点表格得值
+const TcPD = ref([]); //弹窗盘点表格得值
 const currentPage = ref(1); // 默认页码
 const pageSize = ref(40); // 默认每一页几条
-const dialogTabData=ref(false);//延期弹窗
+const dialogTabData = ref(false); //延期弹窗
 const TccurrentPage = ref(1); // 默认页码
 const TcpageSize = ref(50); // 默认每一页几条
 const Tctotal = ref(null); //明细页码总数
-const TcData=ref(null);//延期时间
+const TcData = ref(null); //延期时间
 const pageList = ref([50, 100, 200, 500, 1000]); // 选择每页显示多少条
 const background = ref(true); // 是否开启背景颜色
 const disabled = ref(false); // 是否禁止使用页码功能
 const total = ref(0); //页码总数
 const loading = ref(false); //表格加载Load
 const PopupDetails = ref(false); //弹窗详情是否展示
-const InventoryPopup=ref(false);//创建判断任务弹窗
-const formInventory=ref({});//盘点任务表单_
-const TcPdloading=ref(false);//弹窗盘点数据
-const row=ref({});//选择当前列
-const Tcrow=ref();//弹窗当前行
-const WrapBarEditing=ref({});//弹窗数据编辑
-const PopupEditing=ref(false);//弹窗编辑
-const ElBtnClass=ref(null);
-const contrastData=ref([]);//对比数据表格
-const dialogcontrast=ref(false);//对比数据弹窗
-const contrastloading=ref(false);//对比数据表格加载
-const Inventoryrow=ref({});//详情编辑响应式临时数据
-const NotCounted=ref(false);//为盘点信息
-const UncheckedRow=ref({});//未盘点当前行存储数据 
-const InventoryStatus=ref(false);//盘点中的状态修改
-const InventoryInput=ref(null);//用来存储盘点状态定制品选怎的第几个input
+const InventoryPopup = ref(false); //创建判断任务弹窗
+const formInventory = ref({}); //盘点任务表单_
+const TcPdloading = ref(false); //弹窗盘点数据
+const TcFrom = ref({}); //弹窗搜索
+const row = ref({}); //选择当前列
+const Tcrow = ref(); //弹窗当前行
+const WrapBarEditing = ref({}); //弹窗数据编辑
+const PopupEditing = ref(false); //弹窗编辑
+const ElBtnClass = ref(null);
+const contrastData = ref([]); //对比数据表格
+const dialogcontrast = ref(false); //对比数据弹窗
+const contrastloading = ref(false); //对比数据表格加载
+const Inventoryrow = ref({}); //详情编辑响应式临时数据
+const NotCounted = ref(false); //为盘点信息
+const UncheckedRow = ref({}); //未盘点当前行存储数据
+const InventoryStatus = ref(false); //盘点中的状态修改
+const InventoryInput = ref(null); //用来存储盘点状态定制品选怎的第几个input
 // const InventoryData=ref([]);//盘带状态修改保存的数据
-const TcMInventoryStatus=ref(true);//盘点弹窗按钮权限控制
-const TcStatusModification=ref(false);//表示当前在修改状态
-const TcStateSwitching=ref(false);//默认表示定制品状态
-const TcnumStatu=ref(false);//表示零担,库存品,初始化状态
-const radioList=ref([
-            {label:0,txt:'在库',input:'stockNum',disabled:true },
-            {label:1,txt:'破损',input:'wornNum',disabled:true },
-            { label:2,txt:'丢失',input:'lossNum' ,disabled:true },
-            {label:3,txt:'不可修复',input:'noRepairNum',disabled:true },
-            {label:4,txt:'已配送',input:'deliveNum',disabled:true },
-            {label:5,txt:'未入库',input:'noReceivedNum',disabled:true },
-            ])
-const counting=ref({})
+const TcMInventoryStatus = ref(true); //盘点弹窗按钮权限控制
+const TcStatusModification = ref(false); //表示当前在修改状态
+const TcStateSwitching = ref(false); //默认表示定制品状态
+const TcnumStatu = ref(false); //表示零担,库存品,初始化状态
+const readList = ref([]); //多选框
+const radioList = ref([
+  { label: 0, txt: '在库', input: 'stockNum', disabled: true },
+  { label: 1, txt: '破损', input: 'wornNum', disabled: true },
+  { label: 2, txt: '丢失', input: 'lossNum', disabled: true },
+  { label: 3, txt: '不可修复', input: 'noRepairNum', disabled: true },
+  { label: 4, txt: '已配送', input: 'deliveNum', disabled: true },
+  { label: 5, txt: '未入库', input: 'noReceivedNum', disabled: true },
+]);
+const counting = ref({});
 const Tabs = ref([
   // 标题栏
-  { label: '处理中', name: 0, icon: 'Monitor'},
+  { label: '处理中', name: 0, icon: 'Monitor' },
   { label: '理赔金额未出', name: 1, icon: 'Coin' },
   { label: '处理完毕', name: 2, icon: 'Check' },
-  { label: '完结', name: 3, icon: 'Reading'},
+  { label: '完结', name: 3, icon: 'Reading' },
   { label: '仲裁中', name: 4, icon: 'List' },
-  { label: '全部', name: 5, icon: 'Notification'},
+  { label: '全部', name: 5, icon: 'Notification' },
 ]);
+const options = [
+  {
+    value: 1,
+    label: '定制品',
+  },
+  {
+    value: 2,
+    label: '零担',
+  },
+  {
+    value: 3,
+    label: '库存品',
+  },
+];
 // 菜单表头
 const menuData = ref([
   {
@@ -616,7 +644,7 @@ const menuData = ref([
     search: true,
     head: true,
   },
-    {
+  {
     prop: 'marketName',
     label: '商城名称',
     type: 4,
@@ -660,7 +688,7 @@ const menuData = ref([
     search: false,
     head: true,
   },
-    {
+  {
     prop: 'questType',
     label: '类型',
     type: 7,
@@ -696,8 +724,8 @@ const menuData = ref([
 ]); //表头结构
 
 // 弹窗盘点
-const InventoryDetails =ref([
-    {
+const InventoryDetails = ref([
+  {
     prop: 'orderPackageCode',
     label: '包条',
     type: 4,
@@ -708,7 +736,7 @@ const InventoryDetails =ref([
     search: true,
     head: true,
   },
-      {
+  {
     prop: 'orderCode',
     label: '订单自编号',
     type: 4,
@@ -719,7 +747,7 @@ const InventoryDetails =ref([
     search: true,
     head: true,
   },
-    {
+  {
     prop: 'questTarget',
     label: '品类',
     type: 6,
@@ -730,7 +758,7 @@ const InventoryDetails =ref([
     search: true,
     head: true,
   },
-{
+  {
     prop: 'questStatus',
     label: '盘点状态',
     type: 5,
@@ -741,7 +769,7 @@ const InventoryDetails =ref([
     search: true,
     head: true,
   },
-      {
+  {
     prop: 'positionCode',
     label: '货位',
     type: 4,
@@ -752,7 +780,7 @@ const InventoryDetails =ref([
     search: true,
     head: true,
   },
-      {
+  {
     prop: 'trayCode',
     label: '托盘码',
     type: 4,
@@ -764,10 +792,7 @@ const InventoryDetails =ref([
     head: true,
   },
 
-
-
-
-      {
+  {
     prop: 'firsts',
     label: '一级品类',
     type: 10,
@@ -778,7 +803,7 @@ const InventoryDetails =ref([
     search: true,
     head: true,
   },
-      {
+  {
     prop: 'second',
     label: '二级品类',
     type: 10,
@@ -789,7 +814,7 @@ const InventoryDetails =ref([
     search: true,
     head: true,
   },
-      {
+  {
     prop: 'thirdProduct',
     label: '三级品类',
     type: 10,
@@ -801,8 +826,7 @@ const InventoryDetails =ref([
     head: true,
   },
 
-
-    {
+  {
     prop: 'categoryName',
     label: '产品名称',
     type: 10,
@@ -813,7 +837,7 @@ const InventoryDetails =ref([
     search: true,
     head: true,
   },
-    {
+  {
     prop: '',
     label: '操作',
     type: 3,
@@ -824,7 +848,7 @@ const InventoryDetails =ref([
     search: false,
     head: true,
   },
-])
+]);
 // 对比数据表格结构
 const contrast = ref([
   {
@@ -849,7 +873,7 @@ const contrast = ref([
     search: true,
     head: true,
   },
-    {
+  {
     prop: 'mallName',
     label: '商场名称',
     type: 4,
@@ -893,7 +917,7 @@ const contrast = ref([
     search: false,
     head: true,
   },
-    {
+  {
     prop: 'totalNumber',
     label: '总件数',
     type: 4,
@@ -915,7 +939,7 @@ const contrast = ref([
     search: false,
     head: true,
   },
-    {
+  {
     prop: 'pallet',
     label: '所在托盘号',
     type: 4,
@@ -926,7 +950,7 @@ const contrast = ref([
     search: false,
     head: true,
   },
-   {
+  {
     prop: 'goodsAllocation',
     label: '货区-货架-货位',
     type: 4,
@@ -937,7 +961,7 @@ const contrast = ref([
     search: false,
     head: true,
   },
-   {
+  {
     prop: 'updateUser',
     label: '盘点人',
     type: 4,
@@ -948,7 +972,7 @@ const contrast = ref([
     search: false,
     head: true,
   },
-     {
+  {
     prop: 'updateTime',
     label: '盘点时间',
     type: 4,
@@ -959,7 +983,7 @@ const contrast = ref([
     search: false,
     head: true,
   },
-       {
+  {
     prop: 'questNum',
     label: '盘点件数',
     type: 4,
@@ -981,7 +1005,7 @@ const contrast = ref([
     search: false,
     head: true,
   },
-   {
+  {
     prop: 'trayCode',
     label: '托盘码',
     type: 4,
@@ -992,7 +1016,7 @@ const contrast = ref([
     search: false,
     head: true,
   },
-     {
+  {
     prop: 'positionCode',
     label: '库位',
     type: 4,
@@ -1003,7 +1027,7 @@ const contrast = ref([
     search: false,
     head: true,
   },
-   {
+  {
     prop: 'questStatusName',
     label: '货物状态',
     type: 4,
@@ -1014,7 +1038,7 @@ const contrast = ref([
     search: false,
     head: true,
   },
-]); 
+]);
 // 按钮配置
 const ElButtonS = ref([
   // 1.link    切换按钮样式(文本模式-false ,按钮模式-tre)
@@ -1031,7 +1055,7 @@ const ElButtonS = ref([
     icon: 'el-icon-view',
     table: '详情',
   },
-    {
+  {
     link: false,
     class: 'el-btn-view',
     space: true,
@@ -1039,7 +1063,7 @@ const ElButtonS = ref([
     icon: 'el-icon-view',
     table: '延期',
   },
-    {
+  {
     link: false,
     class: 'el-btn-view',
     space: true,
@@ -1047,7 +1071,7 @@ const ElButtonS = ref([
     icon: 'el-icon-view',
     table: '编辑',
   },
-      {
+  {
     link: false,
     class: 'el-btn-view',
     space: true,
@@ -1063,25 +1087,24 @@ function onLoad() {
     current: currentPage.value, //页码
     size: pageSize.value, //条数
   };
-     getTaskQuestPage().then(res=>{
-        console.log(res,'获取盘点列表');
-        if(res.data.code==200){
-            total.value=  res.data.data.total
-            loading.value = false; //关闭表格加载
-            res.data.data.records//初始化盘点列表
-            let refName='';//商场名称
-            let brandName='';//品牌名称
-            if(res.data.data.records){
-                res.data.data.records.forEach(items=>{
-                items.marketName = items.list.map(item => item.refName).join(',');//商场名称
-                items.brandName = items.list.map(item => item.brandName).join(',');//品牌名称
-            })
-            console.log(ElData.value,'ElData.value');
-            
-            }
-            ElData.value=res.data.data.records
-        }
-    })
+  getTaskQuestPage().then(res => {
+    console.log(res, '获取盘点列表');
+    if (res.data.code == 200) {
+      total.value = res.data.data.total;
+      loading.value = false; //关闭表格加载
+      res.data.data.records; //初始化盘点列表
+      let refName = ''; //商场名称
+      let brandName = ''; //品牌名称
+      if (res.data.data.records) {
+        res.data.data.records.forEach(items => {
+          items.marketName = items.list.map(item => item.refName).join(','); //商场名称
+          items.brandName = items.list.map(item => item.brandName).join(','); //品牌名称
+        });
+        console.log(ElData.value, 'ElData.value');
+      }
+      ElData.value = res.data.data.records;
+    }
+  });
 }
 // 调用页面初始化获取数据
 onLoad();
@@ -1094,371 +1117,390 @@ const selectChange = () => {
   console.log('触发了选择');
 };
 // 表格筛选
-const selectAll = (val) => {
-  console.log(val,'触发了选择');
-  
+const selectAll = val => {
+  console.log(val, '触发了选择');
 };
 // 弹窗详情选中（全选）
-const TcselectAll=(selectAll,val)=>{
-  Tcrow.value=selectAll
-    if(!selectAll.length){
-        TcPD.value.forEach(item=>{
-              item.Checkbox=!item.Checkbox
-        })
-    }else{
-    selectAll.forEach(item=>{
-        item.Checkbox=!item.Checkbox
-    })
-    }
+const TcselectAll = (selectAll, val) => {
+  Tcrow.value = selectAll;
+  if (!selectAll.length) {
+    TcPD.value.forEach(item => {
+      item.Checkbox = !item.Checkbox;
+    });
+  } else {
+    selectAll.forEach(item => {
+      item.Checkbox = !item.Checkbox;
+    });
+  }
 
-    // 状态修改
-}
+  // 状态修改
+};
 // 弹窗详情单选
-const TcselectChange=(selectAll,val)=>{
-    val.Checkbox=!val.Checkbox;//开启修改
-    if(TcStatusModification.value){ //表示当前在修改状态
-    if(val.questTarget!=1){
-      Tcrow.value=val
-      Tcrow.value=selectAll
-      console.log(Tcrow.value,'状态多条修改');
-    }else{
-      Tcrow.value=val
-      console.log(Tcrow.value,'零担单条数据修改');
-    }
-    }else{
-      // 这里不是状态修改
-      Tcrow.value=selectAll
+const TcselectChange = (selectAll, val) => {
+  val.Checkbox = !val.Checkbox; //开启修改
+  if (TcStatusModification.value) {
+    //表示当前在修改状态
+    if (val.questTarget != 1) {
+      Tcrow.value = val;
+      Tcrow.value = selectAll;
+      console.log(Tcrow.value, '状态多条修改');
+    } else {
+      Tcrow.value = val;
+      console.log(Tcrow.value, '零担单条数据修改');
     }
-
-}
+  } else {
+    // 这里不是状态修改
+    Tcrow.value = selectAll;
+  }
+};
 // 延期
-const extension=(val)=>{
-    row.value=val
-    dialogTabData.value=true;
-}
+const extension = val => {
+  row.value = val;
+  dialogTabData.value = true;
+};
 // 延期提交
-const InventoryDate=()=>{
-    console.log(TcData.value,'延期');
-    $_updateDate({
-        id:row.value.id,
-        startTime:row.value.startTime,
-        endTime:TcData.value,
-    }).then(res=>{
-        dialogTabData.value=false;
-    if(res.data.code==200){
-    ElMessage({
-    showClose: true,
-    message:res.data.msg,
-    type: 'success',
-  })
-   }
-        onLoad()
-        console.log(res,'延期成功返回值');
-    })
-}
+const InventoryDate = () => {
+  console.log(TcData.value, '延期');
+  $_updateDate({
+    id: row.value.id,
+    startTime: row.value.startTime,
+    endTime: TcData.value,
+  }).then(res => {
+    dialogTabData.value = false;
+    if (res.data.code == 200) {
+      ElMessage({
+        showClose: true,
+        message: res.data.msg,
+        type: 'success',
+      });
+    }
+    onLoad();
+    console.log(res, '延期成功返回值');
+  });
+};
 
 // 提交修改
-const InventoryModification=()=>{
-if(!Tcrow.value){
-      ElMessage({
-    showClose: true,
-    message: '暂未选择信息',
-    type: 'warning',
-  })
-  return
-}
-let data =[]
-Tcrow.value.forEach(item=>{
-    data.push({
-        id:item.id,
-        firsts:item.firsts,
-        second:item.second,
-        thirdProduct:item.thirdProduct,
-        categoryName:item.categoryName,
-        questId:item.questId,
-        questNum:row.value.questNum,
-    })
-})
-$_updateDetailInfo(
-    data
-).then(res=>{
-   TcViewEvent(row.value);//修改之后刷新页面
-       console.log(res,'修改成功之后的返回值');  
-   if(res.data.code==200){
+const InventoryModification = () => {
+  if (!Tcrow.value) {
     ElMessage({
-    showClose: true,
-    message:res.data.msg,
-    type: 'success',
-  })
-   }
-
-})
-}
+      showClose: true,
+      message: '暂未选择信息',
+      type: 'warning',
+    });
+    return;
+  }
+  let data = [];
+  Tcrow.value.forEach(item => {
+    data.push({
+      id: item.id,
+      firsts: item.firsts,
+      second: item.second,
+      thirdProduct: item.thirdProduct,
+      categoryName: item.categoryName,
+      questId: item.questId,
+      questNum: row.value.questNum,
+    });
+  });
+  $_updateDetailInfo(data).then(res => {
+    TcViewEvent(row.value); //修改之后刷新页面
+    console.log(res, '修改成功之后的返回值');
+    if (res.data.code == 200) {
+      ElMessage({
+        showClose: true,
+        message: res.data.msg,
+        type: 'success',
+      });
+    }
+  });
+};
 // 对比数据按钮
-const comparativeData=(val)=>{
-dialogcontrast.value=true;//显示对比数据表格
-contrastloading.value=true;//开启表格加载
-console.log(val,'对比数据当前行');
-let data ={}
-data.questNum=val.questNum;
-data.questId=val.id;
-$_getContrastInfo(data).then(res=>{
-  console.log(res,'对比数据返回值');
-    contrastData.value= res.data.data
-     contrastloading.value=false;//关闭表格加载
-})
-}
+const comparativeData = val => {
+  dialogcontrast.value = true; //显示对比数据表格
+  contrastloading.value = true; //开启表格加载
+  console.log(val, '对比数据当前行');
+  let data = {};
+  data.questNum = val.questNum;
+  data.questId = val.id;
+  $_getContrastInfo(data).then(res => {
+    console.log(res, '对比数据返回值');
+    contrastData.value = res.data.data;
+    contrastloading.value = false; //关闭表格加载
+  });
+};
 // 重置搜索表单
 const searchReset = () => {
   SoInfoData.value = {};
 };
 
-const TcViewEvent=(val)=>{
-    TcPdloading.value=true;
-  console.log(val,'要传递的对象');
-  let data={
-      questNum:val.questNum,
-      questId:val.id,
-      current: TccurrentPage.value, //页码
-      size: TcpageSize.value, //条数
-  }
-  console.log(data,'要提交的数据');
-  
-  $_getDetailInfo(data).then(res=>{
-      Tctotal.value= res.data.data.total
-      res.data.data.records.forEach(item=>{
-      item.Checkbox=true;
-      })
-      TcPdloading.value=false
-      console.log(res,'明细返回值');
-      TcPD.value = res.data.data.records
-  })
-}
+const TcViewEvent = val => {
+  TcPdloading.value = true;
+  console.log(val, '要传递的对象');
+  let data = {
+    questNum: val.questNum,
+    questId: val.id,
+    current: TccurrentPage.value, //页码
+    size: TcpageSize.value, //条数
+  };
+  console.log(data, '要提交的数据');
+
+  $_getDetailInfo(data).then(res => {
+    Tctotal.value = res.data.data.total;
+    res.data.data.records.forEach(item => {
+      item.Checkbox = true;
+    });
+    TcPdloading.value = false;
+    console.log(res, '明细返回值');
+    TcPD.value = res.data.data.records;
+  });
+};
 // 点击详情按钮
 const ViewEvent = val => {
-   TccurrentPage.value=1;//重置页码
-   NotCounted.value=false;//关闭未盘点
-  row.value=val
+  TccurrentPage.value = 1; //重置页码
+  NotCounted.value = false; //关闭未盘点
+  row.value = val;
   PopupDetails.value = true;
-  TcPdloading.value=true;
-  console.log(val,'明细');
-  if(val.questStatus !=1){
-  TcMInventoryStatus.value=false;//表示当前盘点任务不属于盘点中,关闭所有按钮权限
-  }else{
-    TcMInventoryStatus.value=true;
+  TcPdloading.value = true;
+  console.log(val, '明细');
+  if (val.questStatus != 1) {
+    TcMInventoryStatus.value = false; //表示当前盘点任务不属于盘点中,关闭所有按钮权限
+  } else {
+    TcMInventoryStatus.value = true;
   }
-  TcViewEvent(row.value)
+  TcViewEvent(row.value);
 };
 
 // 未盘点数据请求
-const NotCountedFn=(row)=>{
-  TcPdloading.value=true;
-      $_getDetailInfo({
-      questStatus:0,
-      questNum:row.questNum,
-      questId:row.id,
-      current: TccurrentPage.value, //页码
-      size: TcpageSize.value, //条数
-      }).then(res=>{
-      TcPdloading.value=false;
-      console.log(res,'未盘点明细返回值');
-      res.data.data.records.forEach(item=>{
-      item.Checkbox=true;
-      })
-       TcPD.value = res.data.data.records
-       Tctotal.value = res.data.data.total;//总页码
-  })
-}
+const NotCountedFn = row => {
+  TcPdloading.value = true;
+  $_getDetailInfo({
+    questStatus: 0,
+    questNum: row.questNum,
+    questId: row.id,
+    current: TccurrentPage.value, //页码
+    size: TcpageSize.value, //条数
+  }).then(res => {
+    TcPdloading.value = false;
+    console.log(res, '未盘点明细返回值');
+    res.data.data.records.forEach(item => {
+      item.Checkbox = true;
+    });
+    TcPD.value = res.data.data.records;
+    Tctotal.value = res.data.data.total; //总页码
+  });
+};
 
 // 未盘点明细
-const DetailsNotCounted=(row)=>{
-   TccurrentPage.value=1;//重置页码
-  UncheckedRow.value=row;//存储当前点击行的数据
-  console.log(row.value,'点击盘点了');
-  
-  NotCounted.value=true;//展开未盘点
-    TcPdloading.value=true;
-   PopupDetails.value = true;
-   NotCountedFn(UncheckedRow.value)
-}
+const DetailsNotCounted = row => {
+  TccurrentPage.value = 1; //重置页码
+  UncheckedRow.value = row; //存储当前点击行的数据
+  console.log(row.value, '点击盘点了');
+
+  NotCounted.value = true; //展开未盘点
+  TcPdloading.value = true;
+  PopupDetails.value = true;
+  NotCountedFn(UncheckedRow.value);
+};
 // 未盘点转已盘点按钮
-const NotInventoried=(val)=>{
-  if(!Tcrow.value){
-      ElMessage({
-    showClose: true,
-    message: '暂未选择信息',
-    type: 'warning',
-  })
-  return
-}
-  let data=[]
-  console.log(UncheckedRow.value,'提交盘点了');
-  Tcrow.value.forEach(item=>{
-    data.push({
-      id:item.id,
-      questStatus:item.questStatus=1,
-      questId:item.questId,
-      questNum:UncheckedRow.value.questNum,
-    })
-  })
-console.log(data,'未盘点处理好的值');
-$_updateDetailInfo(data).then(res=>{
-  console.log(res,'未盘点转为已盘点');
-  if(res.data.code==200){
+const NotInventoried = val => {
+  if (!Tcrow.value) {
     ElMessage({
-    showClose: true,
-    message:res.data.msg,
-    type: 'success',
-  })
-  NotCountedFn(UncheckedRow.value)
+      showClose: true,
+      message: '暂未选择信息',
+      type: 'warning',
+    });
+    return;
   }
-})
-}
-// 对盘点中的参数,修改状态
-const ModifyingStatus=()=>{
-  if(!Tcrow.value){
+  let data = [];
+  console.log(UncheckedRow.value, '提交盘点了');
+  Tcrow.value.forEach(item => {
+    data.push({
+      id: item.id,
+      questStatus: (item.questStatus = 1),
+      questId: item.questId,
+      questNum: UncheckedRow.value.questNum,
+    });
+  });
+  console.log(data, '未盘点处理好的值');
+  $_updateDetailInfo(data).then(res => {
+    console.log(res, '未盘点转为已盘点');
+    if (res.data.code == 200) {
       ElMessage({
-    showClose: true,
-    message: '暂未选择信息',
-    type: 'warning',
-  })
-  return
-}
-InventoryStatus.value=true;//展开状态选择
-if(Tcrow.value[0].questTarget==1){//表示当前是定制品
-TcStateSwitching.value=false;
-}else{
-  TcStateSwitching.value=true;//表示当前是零担，库存品
-}
-
-}
+        showClose: true,
+        message: res.data.msg,
+        type: 'success',
+      });
+      NotCountedFn(UncheckedRow.value);
+    }
+  });
+};
+// 对盘点中的参数,修改状态
+const ModifyingStatus = () => {
+  if (!Tcrow.value) {
+    ElMessage({
+      showClose: true,
+      message: '暂未选择信息',
+      type: 'warning',
+    });
+    return;
+  }
+  InventoryStatus.value = true; //展开状态选择
+  if (Tcrow.value[0].questTarget == 1) {
+    //表示当前是定制品
+    TcStateSwitching.value = false;
+  } else {
+    TcStateSwitching.value = true; //表示当前是零担，库存品
+  }
+};
 
 // 盘点状态选择
-const TcReac=(val)=>{
-    console.log(val);
-    InventoryInput.value=val;//存储当前选择的是第几个input
-  if(!TcStateSwitching.value){//定制品规则 可以批量操作
-      radioList.value.forEach(item=>{
-       item.disabled=true;
-       counting.value[item.input]=0
-    })
-      radioList.value[val].disabled=false;
-      counting.value[radioList.value[val].input]=1;//定制品选中的值默认为1
-  }else{
+const TcReac = val => {
+  console.log(val);
+  InventoryInput.value = val; //存储当前选择的是第几个input
+  if (!TcStateSwitching.value) {
+    //定制品规则 可以批量操作
+    radioList.value.forEach(item => {
+      item.disabled = true;
+      counting.value[item.input] = 0;
+    });
+    radioList.value[val].disabled = false;
+    counting.value[radioList.value[val].input] = 1; //定制品选中的值默认为1
+  } else {
     //零担,库存品规则
-      if(!TcnumStatu.value){
-       radioList.value.forEach(item=>{
-       item.disabled=true;
-       counting.value[item.input]=0
-      })
-      TcnumStatu.value=true;//表示当前零担库存品已经初始化了
-      }else{
-        radioList.value[val].disabled=false; 
-      }
+    if (!TcnumStatu.value) {
+      radioList.value.forEach(item => {
+        item.disabled = true;
+        counting.value[item.input] = 0;
+      });
+      TcnumStatu.value = true; //表示当前零担库存品已经初始化了
+    } else {
+      radioList.value[val].disabled = false;
+    }
   }
-}
+};
 // 状态多选操作
-const Tcmultiple=(val)=>{  
-  console.log(val);
-}
+const Tcmultiple = val => {
+  console.log(val, '多选框参数');
+};
 // 盘点状态确认修改
-const StatusDetermination=()=>{
-  console.log(row.value,'row.value');
-if(!TcStateSwitching.value){//定制品规则
-let InputMax=counting.value[radioList.value[InventoryInput.value].input];//存储当前输入框最大值
-if(InputMax>Tcrow.value[0].questTarget){
-    ElMessage({
-    showClose: true,
-    message: '数量超过最大值上限',
-    type: 'warning',
-  })
-return
-}
-console.log(counting.value,'状态输入框的值');  
-let start= Tcrow.value.questTarget
-let data=[];
-const filteredData = Tcrow.value.filter(item => item.name == start); //
-filteredData.forEach(item=>{
-console.log(item);
- data.push({
- stockNum:counting.value.stockNum,//在库数量
- lossNum:counting.value.lossNum,//丢失数量
- deliveNum:counting.value.deliveNum,//配送数量
- wornNum:counting.value.wornNum,//破损数量
- noRepairNum:counting.value.noRepairNum,//不可修复数量
- noReceivedNum:counting.value.noReceivedNum,//未入库数量
- questNum:row.value.questNum,//任务编号
- questId:item.questId,
- allocationId:item.allocationId,//上架后的库位id
- id:item.id,
- cargoName: Number((InventoryInput.value +1) +'0') ,//状态
-})
-})
-console.log(data,'处理好的数据');
-
-$_updateQuestChildInfo(data).then(res=>{
-    console.log(res,'盘点状态修改完成的返回值');
-    if(res.data.code==200){
-    ElMessage({
-    showClose: true,
-    message:res.data.msg,
-    type: 'success',
-  })
-  InventoryStatus.value=false;//关闭状态选择
-  TcViewEvent(row.value)
+const StatusDetermination = () => {
+  console.log(row.value, 'row.value');
+  if (!TcStateSwitching.value) {
+    //定制品规则
+    let InputMax = counting.value[radioList.value[InventoryInput.value].input]; //存储当前输入框最大值
+    if (InputMax > Tcrow.value[0].questTarget) {
+      ElMessage({
+        showClose: true,
+        message: '数量超过最大值上限',
+        type: 'warning',
+      });
+      return;
     }
-  })
-}
-// else{
-//   // 零担,库存品规则
-
-// }
-
-
-}
+    console.log(counting.value, '状态输入框的值');
+    let start = Tcrow.value.questTarget;
+    let data = [];
+    const filteredData = Tcrow.value.filter(item => item.name == start); //
+    filteredData.forEach(item => {
+      console.log(item);
+      data.push({
+        stockNum: counting.value.stockNum, //在库数量
+        lossNum: counting.value.lossNum, //丢失数量
+        deliveNum: counting.value.deliveNum, //配送数量
+        wornNum: counting.value.wornNum, //破损数量
+        noRepairNum: counting.value.noRepairNum, //不可修复数量
+        noReceivedNum: counting.value.noReceivedNum, //未入库数量
+        questNum: row.value.questNum, //任务编号
+        questId: item.questId,
+        allocationId: item.allocationId, //上架后的库位id
+        id: item.id,
+        cargoName: Number(InventoryInput.value + 1 + '0'), //状态
+      });
+    });
+    console.log(data, '处理好的数据');
+
+    $_updateQuestChildInfo(data).then(res => {
+      console.log(res, '盘点状态修改完成的返回值');
+      if (res.data.code == 200) {
+        ElMessage({
+          showClose: true,
+          message: res.data.msg,
+          type: 'success',
+        });
+        InventoryStatus.value = false; //关闭状态选择
+        TcViewEvent(row.value);
+      }
+    });
+  }
+  // else{
+  //   // 零担,库存品规则
 
+  // }
+};
+// 弹窗品类搜索
+const TcChengeQuestTarget = val => {
+  console.log(val);
+  TcPdloading.value = true;
+  console.log(val, '要传递的对象');
+  let data = {
+    questNum: row.value.questNum,
+    questId: row.value.id,
+    current: TccurrentPage.value, //页码
+    size: TcpageSize.value, //条数
+    questTarget: val, //状态
+  };
+  console.log(data, '要提交的数据');
+
+  $_getDetailInfo(data).then(res => {
+    Tctotal.value = res.data.data.total;
+    res.data.data.records.forEach(item => {
+      item.Checkbox = true;
+    });
+    TcPdloading.value = false;
+    console.log(res, '明细返回值');
+    TcPD.value = res.data.data.records;
+  });
+};
 // 弹窗明细，每一页多少条
-const TcPageSizeChange=(val)=>{
-console.log('每一页多少条');
-
-   TcpageSize.value=val;
-  if(NotCounted.value){//表示当前是未盘点翻页
-     NotCountedFn(UncheckedRow.value)
-  }else{
+const TcPageSizeChange = val => {
+  console.log('每一页多少条');
+
+  TcpageSize.value = val;
+  if (NotCounted.value) {
+    //表示当前是未盘点翻页
+    NotCountedFn(UncheckedRow.value);
+  } else {
     console.log(val);
-    TcViewEvent(row.value)
+    TcViewEvent(row.value);
   }
- 
-}
+};
 
 // 弹窗明细，选择了多少页
-const TcSizeChange=(val)=>{
-console.log('翻页');
-    TccurrentPage.value=val;
-    if(NotCounted.value){//表示当前是未盘点翻页
-    
-     NotCountedFn(UncheckedRow.value)
-  }else{
+const TcSizeChange = val => {
+  console.log('翻页');
+  TccurrentPage.value = val;
+  if (NotCounted.value) {
+    //表示当前是未盘点翻页
+
+    NotCountedFn(UncheckedRow.value);
+  } else {
     console.log(val);
-    TcViewEvent(row.value)
+    TcViewEvent(row.value);
   }
-}
+};
 // 弹窗翻页
-const TcpageList=(val)=>{
-    console.log(val,'弹窗翻页');
-    
-}
-const SizeChange=(val)=>{
-    console.log(val,'条数');
-}
+const TcpageList = val => {
+  console.log(val, '弹窗翻页');
+};
+const SizeChange = val => {
+  console.log(val, '条数');
+};
 // 对比数据单选按钮
-const contrastselectChange=(select,val)=>{
-  console.log(select,val,'对比数据1');
-}
+const contrastselectChange = (select, val) => {
+  console.log(select, val, '对比数据1');
+};
 // 对比数据全选按钮
-const contrastselectAll=(select,val)=>{
-console.log(select,val,'对比数据2');
-}
+const contrastselectAll = (select, val) => {
+  console.log(select, val, '对比数据2');
+};
 
 // 关闭弹窗关闭回调
 const handleClose = () => {
@@ -1469,15 +1511,15 @@ const Refresh = () => {
   onLoad(); //初始化表格数据
 };
 // 盘点详情编辑
-const InventoryEditing=(val)=>{
-PopupEditing.value=true;
-Inventoryrow.value=val;//存一份响应式数据
-const copiedObject = Object.assign({}, val);
-console.log(val,'盘点详情编辑');
-WrapBarEditing.value.orderPackageCode=copiedObject.orderPackageCode;//包条
-WrapBarEditing.value.orderCode=copiedObject.orderCode;//订单自编号
-WrapBarEditing.value.positionCode =copiedObject.positionCode;//货位
-}
+const InventoryEditing = val => {
+  PopupEditing.value = true;
+  Inventoryrow.value = val; //存一份响应式数据
+  const copiedObject = Object.assign({}, val);
+  console.log(val, '盘点详情编辑');
+  WrapBarEditing.value.orderPackageCode = copiedObject.orderPackageCode; //包条
+  WrapBarEditing.value.orderCode = copiedObject.orderCode; //订单自编号
+  WrapBarEditing.value.positionCode = copiedObject.positionCode; //货位
+};
 // 获取盘点列表
 // 搜索盘点任务
 //  const searchChange=()=>{
@@ -1488,26 +1530,25 @@ WrapBarEditing.value.positionCode =copiedObject.positionCode;//货位
 //  }
 
 // 创建盘点任务
-const InventoryTask=()=>{
-    let select=[]
-    InventoryPopup.value=true;//开启创建盘点任务弹窗
-    getDictList().then(res=>{
-        console.log('创建盘点返回值',res);
-        if(res.data.code==200){
-            res.data.data.forEach(item=>{
-            console.log(item,'盘点任务返回值');
-            select.push({
-            clientName: item.clientName,     // 商城名称
-            id: item.id,   // 商场id
-            brandName: item.brandName,  // 商场下品牌名
-            })
-            })
-            formInventory.value.select =select
-            console.log( formInventory.value,'处理好的商场名称');
-            
-        }
-    })
-}
+const InventoryTask = () => {
+  let select = [];
+  InventoryPopup.value = true; //开启创建盘点任务弹窗
+  getDictList().then(res => {
+    console.log('创建盘点返回值', res);
+    if (res.data.code == 200) {
+      res.data.data.forEach(item => {
+        console.log(item, '盘点任务返回值');
+        select.push({
+          clientName: item.clientName, // 商城名称
+          id: item.id, // 商场id
+          brandName: item.brandName, // 商场下品牌名
+        });
+      });
+      formInventory.value.select = select;
+      console.log(formInventory.value, '处理好的商场名称');
+    }
+  });
+};
 
 // 处理商场名称函数根据传入ID读取列表中的商场
 function matchInfoById(idArray, infoArray) {
@@ -1521,51 +1562,49 @@ function matchInfoById(idArray, infoArray) {
   return matchedInfo;
 }
 
-
 // 商场名称选择回调
-const formInventoryChange=(val)=>{
-    formInventory.value.id=val
-    const matchedInfo = matchInfoById(val, formInventory.value.select);
-    console.log(matchedInfo,'处理好的参数');
-    formInventory.value.brandName
-    let name=[]
-    matchedInfo.forEach(item=>{
-        name.push(item.brandName) 
-    })
-    formInventory.value.brandName=name.join(',')//处理品牌名称显示
+const formInventoryChange = val => {
+  formInventory.value.id = val;
+  const matchedInfo = matchInfoById(val, formInventory.value.select);
+  console.log(matchedInfo, '处理好的参数');
+  formInventory.value.brandName;
+  let name = [];
+  matchedInfo.forEach(item => {
+    name.push(item.brandName);
+  });
+  formInventory.value.brandName = name.join(','); //处理品牌名称显示
 };
 
 // 创建盘点任务弹窗关闭回调
-const InventoryPopupClose=()=>{
-    console.log('创建盘点任务关闭弹窗回调');
-    
-}
+const InventoryPopupClose = () => {
+  console.log('创建盘点任务关闭弹窗回调');
+};
 // 盘点提交
-const InventorySubmit=()=>{
-    console.log(formInventory.value,'盘点选择好的参数');
-    // 创建提交表单
-    let SubData={}
-    SubData.list=[]
-    // 处理商场名称和商场ID
-    const matchedInfo = matchInfoById(formInventory.value.id, formInventory.value.select);
-    console.log(matchedInfo,'matchedInfo提交处理数据');
-    matchedInfo.forEach(item=>{
-         SubData.list.push({
-           refId: item.id,
-           refName: item.clientName
-         })
-    })
-    // 结束时间
-     SubData.endTime=formInventory.value.time[0]
-    // 开始时间
-    SubData.startTime=formInventory.value.time[1]
-    console.log(SubData,'处理好要提交的数据');
-     InventoryPopup.value=false;//关闭创建盘点任务弹窗
-    postAddtaskQuest(SubData).then(res=>{
-        console.log(res,'盘点计划提交成功');
-        onLoad()//体积之后初始化页面
-    })
-}
+const InventorySubmit = () => {
+  console.log(formInventory.value, '盘点选择好的参数');
+  // 创建提交表单
+  let SubData = {};
+  SubData.list = [];
+  // 处理商场名称和商场ID
+  const matchedInfo = matchInfoById(formInventory.value.id, formInventory.value.select);
+  console.log(matchedInfo, 'matchedInfo提交处理数据');
+  matchedInfo.forEach(item => {
+    SubData.list.push({
+      refId: item.id,
+      refName: item.clientName,
+    });
+  });
+  // 结束时间
+  SubData.endTime = formInventory.value.time[0];
+  // 开始时间
+  SubData.startTime = formInventory.value.time[1];
+  console.log(SubData, '处理好要提交的数据');
+  InventoryPopup.value = false; //关闭创建盘点任务弹窗
+  postAddtaskQuest(SubData).then(res => {
+    console.log(res, '盘点计划提交成功');
+    onLoad(); //体积之后初始化页面
+  });
+};
 </script>
 
 <style lang="scss" scoped>
@@ -1576,25 +1615,30 @@ const InventorySubmit=()=>{
   display: flex;
   flex-direction: column;
 }
+
 .SoInput {
   display: flex;
   justify-content: space-between;
   padding: 0 10px;
   margin-top: 10px;
+
   form {
     display: flex;
     flex-wrap: wrap;
     margin-top: 5px;
+
     :deep(.el-form-item) {
       margin-bottom: 0;
     }
   }
+
   .SoBtn {
     display: flex;
     align-items: center;
     justify-content: center;
   }
 }
+
 .avue-crud__right {
   margin-top: 5px;
   display: flex;
@@ -1602,9 +1646,11 @@ const InventorySubmit=()=>{
   margin-bottom: 5px;
   padding: 0 10px;
 }
+
 :deep(.cell) {
   padding: 0;
 }
+
 .demo-pagination-block {
   flex: 1;
   display: flex;
@@ -1613,42 +1659,62 @@ const InventorySubmit=()=>{
   justify-content: flex-end;
   margin-right: 6px;
 }
-.demo-pagination-blockPD{
-    justify-content: space-between;
+
+.demo-pagination-blockPD {
+  justify-content: space-between;
 }
+
 :deep(.el-table-column--selection) {
   text-align: center;
 }
-:deep(.el-dialog__footer){
-   display: flex;
+
+:deep(.el-dialog__footer) {
+  display: flex;
 }
-:deep(.el-dialog__body){
-    padding-top: 0;
+
+:deep(.el-dialog__body) {
+  padding-top: 0;
 }
-:deep(.el-dialog){
-      position: absolute;
-    top: 50%;
-    left: 50%;
-    transform: translate(-50%, -50%);
-    margin-top: 0;
+
+:deep(.el-dialog) {
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  transform: translate(-50%, -50%);
+  margin-top: 0;
 }
-.Tcstdialog-footer{
-     display: flex;
-    justify-content: flex-end;
-    margin-top: 80px;
+
+.Tcstdialog-footer {
+  display: flex;
+  justify-content: flex-end;
+  margin-top: 80px;
 }
-.Tcstate{
+
+.Tcstate {
   display: flex;
   margin-bottom: 20px;
-  .el-radio{
-    width:54px;
+
+  .el-radio {
+    width: 54px;
+  }
+}
+.TcstateS{
+  margin: 0 2%;
+  margin-bottom: 30px;
+  label{
+    width: 80px;
   }
 }
-.tcradiogroup{
+.tcradiogroup {
   display: inline-flex;
-    align-items: flex-start;
-    font-size: 0;
-    flex-direction: row;
+  align-items: flex-start;
+  font-size: 0;
+  flex-direction: row;
+  flex-wrap: wrap;
+  justify-content: space-between;
+}
+.el-checkbox-group{
+  display: flex;
     flex-wrap: wrap;
     justify-content: space-between;
 }
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 b8d029f8..cf50b4fb 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>
 
             <el-button type="primary" @click="printBatchOrder">批量打印</el-button>
@@ -59,16 +82,46 @@
       </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>-->
 
             <el-text size="small" text 
@@ -76,18 +129,32 @@
           </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">
@@ -104,8 +171,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>
@@ -116,7 +187,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>
@@ -125,7 +198,7 @@
       
 
   <!-- 打印模块 -->
-  <el-dialog title="二维码" :visible.sync="isShow" width="780px" v-model="isShow">
+  <el-dialog title="二维码" :visible.sync="isShow" width="70%" v-model="isShow">
         <div>
           <div v-html="html"></div>
 
@@ -299,7 +372,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>
 
@@ -318,6 +396,7 @@ import {
 import {
   printBatch,
 } from '@/api/distribution/distributionDeliveryList';
+import print from '@/utils/print';
 import option from '@/option/distribution/distrilbutionBillLading';
 import { mapGetters } from 'vuex';
 import { getDictionaryBiz } from '@/api/system/dict';
@@ -879,6 +958,10 @@ export default {
         }
       }
     },
+    printTemplate(){
+      // var nodev =document.querySelectorAll('.el-dialog__body');
+      print();
+    },
     async handleSubmit() {
       if (!this.form.id) {
         let fei = new Map();
@@ -1240,8 +1323,6 @@ export default {
   padding: 0;
 }
 
-
-
 :deep(.avue-crud) {
   display: flex;
   height: 100%;
diff --git a/vite.config.js b/vite.config.js
index 9594ad38..6bcd32c3 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -20,6 +20,8 @@ export default ({ mode, command }) => {
           // target: 'http://192.168.10.101:8888',
           // target: 'http://192.168.10.75:8777',
              target: 'http://192.168.10.200:13000',
+          // target: 'http://192.168.10.200:13000',
+          target: 'http://192.168.10.75:8777',
           // tjj
           // sst
           // target: 'http://192.168.10.94:8888',