diff --git a/.gitignore b/.gitignore
index f0a54a4e..7e245c6f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,6 +21,8 @@ yarn.lock
 
 pnpm-lock.yaml
 
+vite.config.js
+
 # editor directories and files
 .idea
 .vscode
diff --git a/index.html b/index.html
index 8696ce27..54a8156c 100644
--- a/index.html
+++ b/index.html
@@ -23,7 +23,7 @@
   </script>
   
   <script type="text/javascript"
-    src='https://webapi.amap.com/maps?v=2.0&key=f003ec4feb3fcc4cf0742e94f569fd33&plugin=AMap.PlaceSearch,AMap.Geocoder,Map3D,ElasticMarker,AMap.Driving,AMap.TruckDriving'></script>
+    src='https://webapi.amap.com/maps?v=1.4.15&key=f003ec4feb3fcc4cf0742e94f569fd33&plugin=AMap.PlaceSearch,AMap.Geocoder,Map3D,ElasticMarker,AMap.Driving,AMap.TruckDriving'></script>
     <script src="//webapi.amap.com/ui/1.1/main.js"></script>
   <script type="text/javascript"
     src="https://api.map.baidu.com/api?v=1.0&type=webgl&ak=FpjVxjf9nGo47eLj9I0ZuUvSZm1wGGqr"></script>
diff --git a/src/api/distribution/distributionLoadscanAbnormal.js b/src/api/distribution/distributionLoadscanAbnormal.js
new file mode 100644
index 00000000..721b9a64
--- /dev/null
+++ b/src/api/distribution/distributionLoadscanAbnormal.js
@@ -0,0 +1,50 @@
+import request from '@/axios';
+
+export const getList = (current, size, params) => {
+  return request({
+    url: '/api/logpm-distribution/loadscanAbnormal/list',
+    method: 'get',
+    params: {
+      ...params,
+      current,
+      size,
+    }
+  })
+}
+
+export const getDetail = (id) => {
+  return request({
+    url: '/api/logpm-distribution/loadscanAbnormal/detail',
+    method: 'get',
+    params: {
+      id
+    }
+  })
+}
+
+export const remove = (ids) => {
+  return request({
+    url: '/api/logpm-distribution/loadscanAbnormal/remove',
+    method: 'post',
+    params: {
+      ids,
+    }
+  })
+}
+
+export const add = (row) => {
+  return request({
+    url: '/api/logpm-distribution/loadscanAbnormal/submit',
+    method: 'post',
+    data: row
+  })
+}
+
+export const update = (row) => {
+  return request({
+    url: '/api/logpm-distribution/loadscanAbnormal/submit',
+    method: 'post',
+    data: row
+  })
+}
+
diff --git a/src/api/distribution/distributionReservation.js b/src/api/distribution/distributionReservation.js
index 036fa4d4..8545d925 100644
--- a/src/api/distribution/distributionReservation.js
+++ b/src/api/distribution/distributionReservation.js
@@ -201,6 +201,14 @@ export const getReservationStockListInfo = (reservationId) => {
   })
 }
 
+export const patchPrintList = (ids) => {
+  return request({
+    url: '/api/logpm-distribution/deliveryList/printBatchByReservation',
+    method: 'post',
+    params: ids
+  });
+}
+
 
 
 
diff --git a/src/option/basic/basicMaterial.js b/src/option/basic/basicMaterial.js
index 2a1d908a..4addafb1 100644
--- a/src/option/basic/basicMaterial.js
+++ b/src/option/basic/basicMaterial.js
@@ -7,157 +7,181 @@ export default {
   border: true,
   index: true,
   viewBtn: true,
-  delBtn:true,
+  delBtn: true,
   selection: false,
-  indexLabel: "序号",
+  indexLabel: '序号',
   indexWidth: '80',
   dialogClickModal: false,
   column: [
     {
-      label: "租户号",
-      prop: "tenantId",
-      type: "input",
+      label: '租户号',
+      prop: 'tenantId',
+      type: 'input',
+      width: '130',
       addDisplay: false,
       editDisplay: false,
       viewDisplay: false,
       hide: true,
     },
     {
-      label: "创建人",
-      prop: "createUser",
-      type: "input",
+      label: '创建人',
+      prop: 'createUser',
+      type: 'input',
+      width: '130',
       addDisplay: false,
       editDisplay: false,
       viewDisplay: false,
       hide: true,
     },
     {
-      label: "创建时间",
-      prop: "createTime",
-      type: "input",
+      label: '创建时间',
+      prop: 'createTime',
+      type: 'input',
+      width: '130',
       addDisplay: false,
       editDisplay: false,
       viewDisplay: false,
       hide: true,
     },
     {
-      label: "更新人",
-      prop: "updateUser",
-      type: "input",
+      label: '更新人',
+      prop: 'updateUser',
+      type: 'input',
+      width: '130',
       addDisplay: false,
       editDisplay: false,
       viewDisplay: false,
       hide: true,
     },
     {
-      label: "更新时间",
-      prop: "updateTime",
-      type: "input",
+      label: '更新时间',
+      prop: 'updateTime',
+      type: 'input',
+      width: '130',
       addDisplay: false,
       editDisplay: false,
       viewDisplay: false,
       hide: true,
     },
     {
-      label: "状态",
-      prop: "status",
-      type: "input",
+      label: '状态',
+      prop: 'status',
+      type: 'input',
+      width: '130',
       addDisplay: false,
       editDisplay: false,
       viewDisplay: false,
       hide: true,
     },
     {
-      label: "是否已删除",
-      prop: "isDeleted",
-      type: "input",
+      label: '是否已删除',
+      prop: 'isDeleted',
+      type: 'input',
+      width: '130',
       addDisplay: false,
       editDisplay: false,
       viewDisplay: false,
       hide: true,
     },
     {
-      label: "创建部门",
-      prop: "createDept",
-      type: "input",
+      label: '创建部门',
+      prop: 'createDept',
+      type: 'input',
+      width: '130',
       addDisplay: false,
       editDisplay: false,
       viewDisplay: false,
       hide: true,
     },
     {
-      label: "主键",
-      prop: "id",
-      type: "input",
+      label: '主键',
+      prop: 'id',
+      type: 'input',
+      width: '130',
       addDisplay: false,
       editDisplay: false,
       viewDisplay: false,
       hide: true,
     },
     {
-      label: "预留1",
-      prop: "reserve1",
-      type: "input",
+      label: '预留1',
+      prop: 'reserve1',
+      type: 'input',
       addDisplay: false,
       editDisplay: false,
       viewDisplay: false,
       hide: true,
     },
     {
-      label: "预留2",
-      prop: "reserve2",
-      type: "input",
+      label: '预留2',
+      prop: 'reserve2',
+      type: 'input',
       addDisplay: false,
       editDisplay: false,
       viewDisplay: false,
       hide: true,
     },
     {
-      label: "预留3",
-      prop: "reserve3",
-      type: "input",
+      label: '预留3',
+      prop: 'reserve3',
+      type: 'input',
       addDisplay: false,
       editDisplay: false,
       viewDisplay: false,
       hide: true,
     },
     {
-      label: "预留4",
-      prop: "reserve4",
-      type: "input",
+      label: '预留4',
+      prop: 'reserve4',
+      type: 'input',
       addDisplay: false,
       editDisplay: false,
       viewDisplay: false,
       hide: true,
     },
     {
-      label: "预留5",
-      prop: "reserve5",
-      type: "input",
+      label: '预留5',
+      prop: 'reserve5',
+      type: 'input',
       addDisplay: false,
       editDisplay: false,
       viewDisplay: false,
       hide: true,
     },
     {
-      label: "产品编码",
-      prop: "productCode",
-      type: "input",
+      label: '产品编码',
+      prop: 'productCode',
+      type: 'input',
       search: true,
-      width: 100,
+      width: '130',
+      rules: [
+        {
+          required: true,
+          message: '请输入产品编码',
+          trigger: 'blur',
+        },
+      ],
       overHidden: true,
     },
     {
-      label: "物品sku",
-      prop: "sku",
-      type: "input",
-      width: 100,
+      label: '物品sku',
+      prop: 'sku',
+      type: 'input',
+      width: '130',
+      rules: [
+        {
+          required: true,
+          message: '请输入物品sku',
+          trigger: 'blur',
+        },
+      ],
       overHidden: true,
     },
     {
-      label: "计量单位",
-      prop: "logpmUnit",
-      type: "select",
+      label: '计量单位',
+      prop: 'logpmUnit',
+      type: 'select',
+      width: '130',
       dicUrl: '/blade-system/dict-biz/dictionary?code=logpm_unit',
       props: {
         label: 'dictValue',
@@ -173,11 +197,18 @@ export default {
       ],
     },
     {
-      label: "名称",
-      prop: "name",
-      type: "input",
+      label: '名称',
+      prop: 'name',
+      type: 'input',
+      rules: [
+        {
+          required: true,
+          message: '请输入名称',
+          trigger: 'blur',
+        },
+      ],
       search: true,
-      width: 200,
+      width: '130',
       overHidden: true,
     },
     // {
@@ -196,9 +227,17 @@ export default {
     //   hide: false,
     // },
     {
-      label: "属性",
-      prop: "property",
-      type: "input",
+      label: '属性',
+      prop: 'property',
+      rules: [
+        {
+          required: true,
+          message: '请输入属性',
+          trigger: 'blur',
+        },
+      ],
+      width: '130',
+      type: 'input',
     },
     // {
     //   label: "规格",
@@ -206,78 +245,129 @@ export default {
     //   type: "input",
     // },
     {
-      label: "包装规格",
-      prop: "packingSpecification",
-      type: "input",
+      label: '包装规格',
+      prop: 'packingSpecification',
+      type: 'input',
+      width: '130',
+      rules: [
+        {
+          required: true,
+          message: '请输入包装规格',
+          trigger: 'blur',
+        },
+      ],
     },
     {
-      label: "包装数量",
-      prop: "packageNum",
-      type: "input",
+      label: '包装数量',
+      prop: 'packageNum',
+      type: 'input',
+      width: '130',
+      rules: [
+        {
+          required: true,
+          message: '请输入包装数量',
+          trigger: 'blur',
+        },
+      ],
     },
     {
-      label: "包装材质",
-      prop: "packagingMaterial",
-      type: "input",
+      label: '包装材质',
+      prop: 'packagingMaterial',
+      type: 'input',
+      width: '130',
+      rules: [
+        {
+          required: true,
+          message: '请输入包装材质',
+          trigger: 'blur',
+        },
+      ],
     },
     {
-      label: "长",
-      prop: "extent",
-      type: "input",
-      width: 100,
+      label: '长',
+      prop: 'extent',
+      type: 'input',
+      width: '130',
       overHidden: true,
+      rules: [
+        {
+          required: true,
+          message: '请输入长度',
+          trigger: 'blur',
+        },
+      ],
     },
     {
-      label: "宽",
-      prop: "breadth",
-      type: "input",
-      width: 100,
+      label: '宽',
+      prop: 'breadth',
+      type: 'input',
+      width: '130',
+      rules: [
+        {
+          required: true,
+          message: '请输入宽度',
+          trigger: 'blur',
+        },
+      ],
       overHidden: true,
     },
     {
-      label: "高度",
-      prop: "altitude",
-      type: "input",
-      width: 100,
+      label: '高度',
+      prop: 'altitude',
+      type: 'input',
+      width: '130',
+      rules: [
+        {
+          required: true,
+          message: '请输入高度',
+          trigger: 'blur',
+        },
+      ],
       overHidden: true,
     },
     {
-      label: "体积",
-      prop: "volume",
-      type: "input",
-      width: 100,
+      label: '体积',
+      prop: 'volume',
+      type: 'input',
+      width: '130',
+      rules: [
+        {
+          required: true,
+          message: '请输入体积',
+          trigger: 'blur',
+        },
+      ],
       overHidden: true,
     },
     {
-      label: "重量",
-      prop: "weight",
-      type: "input",
+      label: '重量',
+      prop: 'weight',
+      width: '130',
+      type: 'input',
     },
     {
-      label: "备注",
-      prop: "remark",
-      type: "input",
+      label: '备注',
+      prop: 'remark',
+      width: '130',
+      type: 'input',
     },
     {
-      label: "物料图片",
-      prop: "picture",
-      type: "upload",
+      label: '物料图片',
+      prop: 'picture',
+      type: 'upload',
       dataType: 'string',
       listType: 'picture-img',
       // hide: true,
-      labelWidth:'150',
-      span:10,
-      multiple:false,
-      width:"200px",
-      align:'left',
+      labelWidth: '150',
+      span: 10,
+      multiple: false,
+      width: '200px',
+      align: 'left',
       action: '/blade-resource/oss/endpoint/put-file',
       propsHttp: {
         res: 'data',
         url: 'link',
       },
     },
-
-
-
-  ]
-}
+  ],
+};
diff --git a/src/option/distribution/distributionLoadscanAbnormal.js b/src/option/distribution/distributionLoadscanAbnormal.js
new file mode 100644
index 00000000..244382b6
--- /dev/null
+++ b/src/option/distribution/distributionLoadscanAbnormal.js
@@ -0,0 +1,166 @@
+export default {
+  expand: false,
+  index: true,
+  border: true,
+  selection: true,
+  column: [
+    {
+      label: "租户号",
+      prop: "tenantId",
+      display: false,
+      hide: true,
+    },
+    {
+      label: "创建人",
+      prop: "createUser",
+      display: false,
+      hide: true,
+    },
+    {
+      label: "创建时间",
+      prop: "createTime",
+      display: false,
+      hide: true,
+    },
+    {
+      label: "更新人",
+      prop: "updateUser",
+      display: false,
+      hide: true,
+    },
+    {
+      label: "更新时间",
+      prop: "updateTime",
+      display: false,
+      hide: true,
+    },
+    {
+      label: "状态",
+      prop: "status",
+      display: false,
+      hide: true,
+    },
+    {
+      label: "是否已删除",
+      prop: "isDeleted",
+      display: false,
+      hide: true,
+    },
+    {
+      label: "创建部门",
+      prop: "createDept",
+      display: false,
+      hide: true,
+    },
+    {
+      label: "主键",
+      prop: "id",
+      display: false,
+      hide: true,
+    },
+    {
+      label: "预约ID",
+      prop: "reservationId",
+    },
+    {
+      label: "配送管理ID",
+      prop: "deliveryListId",
+    },
+    {
+      label: "包件ID",
+      prop: "packageId",
+    },
+    {
+      label: "订单ID",
+      prop: "stockArticleId",
+    },
+    {
+      label: "扫描操作人",
+      prop: "sacnUser",
+    },
+    {
+      label: "扫描操作时间",
+      prop: "scanTime",
+    },
+    {
+      label: "包条码",
+      prop: "packageCode",
+    },
+    {
+      label: "车次号",
+      prop: "trainNumber",
+    },
+    {
+      label: "司机ID",
+      prop: "driverId",
+    },
+    {
+      label: "司机名称",
+      prop: "driverName",
+    },
+    {
+      label: "车辆ID",
+      prop: "vehicleId",
+    },
+    {
+      label: "车牌号",
+      prop: "vehicleName",
+    },
+    {
+      label: "司机电话",
+      prop: "driverPhone",
+    },
+    {
+      label: "仓库Id",
+      prop: "warehouseId",
+    },
+    {
+      label: "仓库名称",
+      prop: "warehouseName",
+    },
+    {
+      label: "审核人",
+      prop: "auditingUser",
+    },
+    {
+      label: "审核时间",
+      prop: "auditingTime",
+    },
+    {
+      label: "包件配送类型 1 - 商配 2-市配",
+      prop: "deliveryType",
+    },
+    {
+      label: "备注",
+      prop: "remarks",
+    },
+    {
+      label: "审核状态 1-未审核 2- 已审核 3 - 异常",
+      prop: "auditingStatus",
+    },
+    {
+      label: "装车数量",
+      prop: "loadingQuantity",
+    },
+    {
+      label: "预留1",
+      prop: "reserve1",
+    },
+    {
+      label: "预留2",
+      prop: "reserve2",
+    },
+    {
+      label: "预留3",
+      prop: "reserve3",
+    },
+    {
+      label: "预留4",
+      prop: "reserve4",
+    },
+    {
+      label: "预留5",
+      prop: "reserve5",
+    },
+  ]
+}
diff --git a/src/page/index/top/index.vue b/src/page/index/top/index.vue
index 1cb15397..5008eb45 100644
--- a/src/page/index/top/index.vue
+++ b/src/page/index/top/index.vue
@@ -29,6 +29,9 @@
       <div class="top-bar__item" v-if="setting.debug">
         <top-logs></top-logs>
       </div>
+      <div class="top-bar__item">
+        <view>{{ datalist[checkwarehousevalue]?.name||'' }}</view>
+      </div>
       <div class="top-user">
         <img class="top-bar__img" :src="userInfo.avatar" />
         <el-dropdown>
@@ -109,9 +112,18 @@ export default {
       isshow: false,
       datalist: [],
       warehousevalue: '',
+      checkwarehousevalue:0,
     };
   },
-  mounted() {},
+  mounted() {
+    getMyWarehouseList().then(res => {
+          console.log(res.data.data, 'getMyWarehouseList');
+          let arr = [{ name: '全部', id: '0' }];
+          this.datalist = arr.concat(res.data.data);
+        });
+    this.checkwarehousevalue=Number(localStorage.getItem('checkwarehousevalue'))
+    console.log(this.checkwarehousevalue)
+  },
   filters: {},
   created() {},
   computed: {
@@ -140,6 +152,7 @@ export default {
         let res = await getclearWarehouseCache({});
         if (res.data.code == 200) {
           this.$message({ message: '切换成功', type: 'success' });
+          localStorage.setItem('checkwarehousevalue',this.warehousevalue)
           this.$router.push({
             path: '/',
           });
@@ -153,6 +166,7 @@ export default {
         let res = await preserveCurrentWarehouse(this.datalist[this.warehousevalue]);
         if (res.data.code == 200) {
           this.$message({ message: '切换成功', type: 'success' });
+          localStorage.setItem('checkwarehousevalue',this.warehousevalue)
           this.$router.push({
             path: '/',
           });
diff --git a/src/views/basicdata/brand/basicClient.vue b/src/views/basicdata/brand/basicClient.vue
index 40482de0..7a9303b2 100644
--- a/src/views/basicdata/brand/basicClient.vue
+++ b/src/views/basicdata/brand/basicClient.vue
@@ -464,7 +464,7 @@ export default {
       columnList: [
         {
           prop: '',
-          label: '序号',
+          label: '全选',
           type: 0,
           values: '',
           width: 55,
@@ -476,7 +476,7 @@ export default {
           label: '客户名称',
           type: 2,
           values: '',
-          width: 'fit-content',
+          width: '130',
           checkarr: [],
           fixed: false,
           sortable: true,
@@ -487,7 +487,7 @@ export default {
           label: '客户编码',
           type: 2,
           values: '',
-          width: 'fit-content',
+          width: '130',
           checkarr: [],
           fixed: false,
           sortable: true,
@@ -498,7 +498,7 @@ export default {
           label: '客户类型',
           type: 3,
           values: '',
-          width: 'fit-content',
+          width: '130',
           checkarr: [],
           fixed: false,
           sortable: true,
@@ -509,7 +509,7 @@ export default {
           label: '服务类型',
           type: 1,
           values: '',
-          width: 'fit-content',
+          width: '130',
           checkarr: [],
           fixed: false,
           sortable: true,
@@ -553,7 +553,7 @@ export default {
           label: '合同开始时间',
           type: 5,
           values: '',
-          width: '100',
+          width: '150',
           checkarr: [],
           fixed: false,
           sortable: true,
@@ -563,7 +563,7 @@ export default {
           label: '合同结束时间',
           type: 5,
           values: '',
-          width: '100',
+          width: '150',
           checkarr: [],
           fixed: false,
           sortable: true,
diff --git a/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelfView.vue b/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelfView.vue
index 70214136..a3a2f8d1 100644
--- a/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelfView.vue
+++ b/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelfView.vue
@@ -66,6 +66,28 @@
       </div>
     </el-scrollbar>
   </div>
+  <div class="tips">
+      <div>
+        总货位:
+        <span class="def">{{ boxdetails.cargoNub }}</span>
+      </div>
+      <div>
+        占用货位:
+        <span class="red">{{ boxdetails.employNub }}</span>
+      </div>
+      <div>
+        未用货位:
+        <span class="green">{{ boxdetails.unusedNub }}</span>
+      </div>
+      <div>
+        禁用货位:
+        <span class="red">{{ boxdetails.disableNub }}</span>
+      </div>
+      <div>
+        货物总数:
+        <span class="red">{{ boxdetails.goodsNub }}</span>
+      </div>
+    </div>
   <div class="mabx">
     <el-scrollbar max-height="70vh">
       <div class="contentbx" :style="contenbxsty">
@@ -496,6 +518,7 @@ let details = reactive({
   checkselectchangearr: [],
   isshowdow: false,
   inputtxts1: '',
+  boxdetails:{}
 });
 onMounted(() => {
   details.contenbxsty['--length'] = details.contenarr[0]?.length || 0;
@@ -716,7 +739,8 @@ async function checkshelves() {
   console.log(res.data, 'res.data.datares.data.datares.data.datares.data.datares.data.data');
   let arrs = [];
   let maxlength = 0;
-  res.data.data.map(item => {
+  details.boxdetails=res.data.data
+  res.data.data.list.map(item => {
     if (item.columnNum > maxlength) {
       maxlength = item.columnNum;
     }
@@ -725,7 +749,7 @@ async function checkshelves() {
     arrs.push([]);
   }
   console.log(arrs, 'arrsarrsarrs');
-  res.data.data.map(item => {
+  res.data.data.list.map(item => {
     arrs[item.columnNum - 1]?.push(item);
   });
   arrs.map(item => {
@@ -2155,6 +2179,7 @@ const checkitem = ite => {
   console.log(details.isshowcon, 'details.isshowcondetails.isshowcon');
 };
 const {
+  boxdetails,
   isshowdow,
   inputtxts1,
   total,
@@ -2221,7 +2246,7 @@ const {
   // box-sizing: border-box;
   box-sizing: border-box;
   .contentbx {
-    width: calc(150 * var(--length) * 1px);
+    width: calc(150 * var(--length) * 0.0521vw);
     display: flex;
     // flex-direction: column;
     align-items: flex-end;
@@ -2380,4 +2405,36 @@ const {
     }
   }
 }
+.tips {
+    display: flex;
+    align-items: center;
+    .exprbuts{
+      width: 70px;
+      height: 30px;
+      color: #666666;
+      font-size: 12px;
+      background-color: #fff;
+      border-radius: 3px;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      border: 1.5px solid #E8E8E8;
+      cursor: pointer;
+    }
+    > div {
+      margin-left: 20px;
+    }
+    .def {
+      color: rgb(30, 159, 255);
+      font-weight: 600;
+    }
+    .red {
+      color: rgb(255, 87, 34);
+      font-weight: 600;
+    }
+    .green {
+      color: rgb(95, 184, 120);
+      font-weight: 600;
+    }
+  }
 </style>
diff --git a/src/views/basicdata/warehouse/tray/basicdataTrayedt.vue b/src/views/basicdata/warehouse/tray/basicdataTrayedt.vue
index 858b620b..4d79305f 100644
--- a/src/views/basicdata/warehouse/tray/basicdataTrayedt.vue
+++ b/src/views/basicdata/warehouse/tray/basicdataTrayedt.vue
@@ -963,7 +963,7 @@ export default {
           head: false,
         },
         {
-          prop: 'waybillNumber',
+          prop: 'waybillNo',
           label: '运单号',
           type: 1,
           values: '',
diff --git a/src/views/basicdata/warehouse/tray/basicdataTrayhistory.vue b/src/views/basicdata/warehouse/tray/basicdataTrayhistory.vue
index 39af8ad7..a92e8e2a 100644
--- a/src/views/basicdata/warehouse/tray/basicdataTrayhistory.vue
+++ b/src/views/basicdata/warehouse/tray/basicdataTrayhistory.vue
@@ -226,7 +226,7 @@ export default {
           },
           {
             label: '运单号',
-            prop: 'waybillNumber',
+            prop: 'waybillNo',
             search: true,
             width: '100px',
           },
diff --git a/src/views/basicdata/warehouse/warehouse/basicdataWarehouse.vue b/src/views/basicdata/warehouse/warehouse/basicdataWarehouse.vue
index 3a7e558f..410a3894 100644
--- a/src/views/basicdata/warehouse/warehouse/basicdataWarehouse.vue
+++ b/src/views/basicdata/warehouse/warehouse/basicdataWarehouse.vue
@@ -89,7 +89,7 @@ export default {
         dialogClickModal: false,
         column: [
           {
-            label: '租户号',
+            label: '租户号1',
             prop: 'tenantId',
             type: 'input',
             addDisplay: false,
@@ -228,7 +228,7 @@ export default {
             ],
             span: 12,
             labelWidth: '120',
-            width: 'fit-content',
+            width: '130',
           },
           {
             label: '仓库编码',
@@ -243,14 +243,14 @@ export default {
             ],
             span: 12,
             labelWidth: '120',
-            width: 'fit-conent',
+            width: '130',
           },
           {
             label: '仓库简称',
             prop: 'abbreviation',
             type: 'input',
             labelWidth: '120',
-            width: 'fit-conent',
+            width: '130',
           },
           {
             label: '联系人',
@@ -259,7 +259,7 @@ export default {
             search: true,
             span: 12,
             labelWidth: '120',
-            width: 'fit-content',
+            width: '130',
             rules: [
               {
                 required: true,
@@ -283,7 +283,7 @@ export default {
             ],
             span: 12,
             labelWidth: '120',
-            width: 'fit-content',
+            width: '130',
           },
           {
             label: '事业线',
@@ -324,7 +324,7 @@ export default {
               leaf: 'leaf',
             },
             labelWidth: '120',
-            width: 'fit-conent',
+            width: '130',
           },
           {
             label: '职能类型',
@@ -332,7 +332,7 @@ export default {
             type: 'select',
             span: 12,
             labelWidth: '120',
-            width: 'fit-conent',
+            width: '130',
             search: true,
             dicUrl: '/api/blade-system/dict-biz/dictionary?code=warehouse_function_type',
             dataType: 'number',
@@ -347,7 +347,7 @@ export default {
             type: 'input',
             span: 12,
             labelWidth: '120',
-            width: 'fit-conent',
+            width: '130',
             addDisplay: false,
             editDisplay: false,
             viewDisplay: false,
@@ -360,7 +360,7 @@ export default {
             type: 'cascader',
             search: true,
             labelWidth: '120',
-            width: 'fit-conent',
+            width: '130',
             clearable: true,
             placeholder: '省/市/区',
             dicUrl: '/blade-system/region/lazy-listAll',
@@ -384,7 +384,7 @@ export default {
             type: 'map',
             span: 12,
             labelWidth: '120',
-            width: 'fit-conent',
+            width: '130',
             params: {
               zoom: 8,
               //地图是否能够缩放
@@ -397,10 +397,10 @@ export default {
               {
                 required: true,
                 message: '请输入仓库地址',
-                trigger: 'blur',
+                trigger: 'change',
               },
             ],
-            clearable: false,
+            clearable: true,
             addDisplay: true,
             editDisplay: true,
             hide: true,
@@ -411,7 +411,7 @@ export default {
             type: 'input',
             span: 12,
             labelWidth: '120',
-            width: 'fit-content',
+            width: '130',
             addDisplay: false,
             editDisplay: false,
             hide: true,
@@ -422,7 +422,7 @@ export default {
             type: 'input',
             span: 12,
             labelWidth: '120',
-            width: 'fit-content',
+            width: '130',
             addDisplay: false,
             editDisplay: false,
             hide: true,
@@ -433,7 +433,7 @@ export default {
             type: 'input',
             span: 12,
             labelWidth: '120',
-            width: 'fit-content',
+            width: '130',
             addDisplay: false,
             editDisplay: false,
             hide: true,
@@ -445,7 +445,7 @@ export default {
             type: 'tree',
             span: 12,
             labelWidth: '120',
-            width: 'fit-conent',
+            width: '130',
             dicUrl: '/api/blade-system/dept/lazy-tree?parentId=0',
             props: {
               label: 'title',
@@ -514,7 +514,7 @@ export default {
             search: true,
             span: 12,
             labelWidth: '120',
-            width: 'fit-conent',
+            width: '130',
             rules: [
               {
                 required: true,
@@ -535,7 +535,7 @@ export default {
             },
             span: 12,
             labelWidth: '120',
-            width: 'fit-conent',
+            width: '130',
             rules: [
               {
                 required: true,
@@ -583,7 +583,7 @@ export default {
             },
             span: 12,
             labelWidth: '120',
-            width: 'fit-conent',
+            width: '130',
             rules: [
               {
                 required: true,
@@ -603,7 +603,7 @@ export default {
             },
             span: 12,
             labelWidth: '120',
-            width: 'fit-conent',
+            width: '130',
             rules: [
               {
                 required: true,
@@ -618,7 +618,7 @@ export default {
             type: 'input',
             span: 12,
             labelWidth: '120',
-            width: 'fit-content',
+            width: '130',
           },
           {
             label: '电力类型',
@@ -632,7 +632,7 @@ export default {
               label: 'dictValue',
               value: 'dictKey',
             },
-            width: 'fit-conent',
+            width: '130',
             rules: [
               {
                 required: true,
@@ -666,7 +666,7 @@ export default {
             placeholder: '请选择租赁开始时间',
             span: 12,
             labelWidth: '120',
-            width: 'fit-content',
+            width: '130',
             viewDisplay: true,
             addDisplay: false,
             editDisplay: false,
@@ -681,7 +681,7 @@ export default {
             placeholder: '请选择租赁结束时间',
             span: 12,
             labelWidth: '120',
-            width: 'fit-content',
+            width: '130',
             viewDisplay: true,
             addDisplay: false,
             editDisplay: false,
@@ -699,7 +699,7 @@ export default {
             },
             span: 12,
             labelWidth: '120',
-            width: 'fit-conent',
+            width: '130',
             rules: [
               {
                 required: true,
@@ -720,7 +720,7 @@ export default {
             },
             span: 12,
             labelWidth: '120',
-            width: 'fit-conent',
+            width: '130',
             rules: [
               {
                 required: true,
@@ -755,7 +755,7 @@ export default {
             endPlaceholder: '租赁结束日期',
             span: 12,
             labelWidth: '120',
-            width: 'fit-content',
+            width: '130',
             search: true,
             searchRange: true,
             searchSpan: 12,
diff --git a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue
index e36ba886..1c021051 100644
--- a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue
+++ b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue
@@ -410,7 +410,7 @@
         </avue-form>
         <div style="bottom: 7%; margin-left: 500px; width: 50%">
           <div style="width: 100%">
-            <el-button type="primary" @click="submitForm" style="margin-right: 20%">确定</el-button>
+            <el-button type="primary" @click="submitForm">确定</el-button>
             <el-button type="primary" @click="cancellation">取消</el-button>
           </div>
         </div>
@@ -2505,18 +2505,16 @@ export default {
             console.log('更新参数>>>>>>>>', row);
              if (!!row.id) {
                updatesign(row).then(
-                       () => {
-                         this.$message({
-                           type: 'success',
-                           message: '操作成功!',
-                         });
-                         this.signBox = false;
-                         this.onLoad();
-                       },
-                       error => {
-                         console.log(error);
-                         this.signBox = false;
-                       }
+                () => {
+                  this.$message({
+                    type: 'success',
+                    message: '操作成功!',
+                  });
+                  this.onLoad();
+                },
+                error => {
+                  console.log(error);
+                }
                );
              }
           } else {
@@ -2530,10 +2528,12 @@ export default {
             console.log('一键签收data>>>>>>>>>>', data);
             getOneclickq(data).then(res => {
               this.$message.success(res.data.msg);
-              this.signBox = false;
               this.onLoad();
             });
           }
+          // 清空签收表单的数据, 并关闭弹出框
+          this.signform = {}
+          this.signBox = false;
         }
       });
     },
diff --git a/src/views/distribution/inventory/distributionStockArticleDetails.vue b/src/views/distribution/inventory/distributionStockArticleDetails.vue
index 9a07c937..0989bb9d 100644
--- a/src/views/distribution/inventory/distributionStockArticleDetails.vue
+++ b/src/views/distribution/inventory/distributionStockArticleDetails.vue
@@ -315,7 +315,6 @@
         <span slot="footer" class="dialog-footer">
           <!--    <el-button type="primary" @click="ddd">导 出</el-button>-->
           <el-button type="primary" @click="printTemplate">打 印</el-button>
-          <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
           <el-button @click="dialogVisible = false">取 消</el-button>
         </span>
       </el-dialog>
diff --git a/src/views/distribution/inventory/distributionStockList.vue b/src/views/distribution/inventory/distributionStockList.vue
index c0965c16..bf32f515 100644
--- a/src/views/distribution/inventory/distributionStockList.vue
+++ b/src/views/distribution/inventory/distributionStockList.vue
@@ -134,7 +134,7 @@
           >
             <el-form :inline="true" :model="formInline" class="demo-form-inline" label-width="100">
               <el-form-item label="SKU" style="width: 40%">
-                <el-input v-model="formInline.sku" placeholder="请输入sku" clearable />
+                <el-input v-model="formInline.sku" placeholder="请输入sku" clearable :disabled="Boolean(unpackFormDisable.sku)" />
               </el-form-item>
               <el-form-item label="货物名称" style="width: 40%">
                 <!--                      <el-input v-model="formInline.descriptionGoods" placeholder="请输入货物名称" clearable />-->
@@ -149,6 +149,7 @@
                   @change="getMethodName($event, '1')"
                   @blur="selectBlur"
                   :loading="loading"
+                  clearable
                 >
                   <el-option
                     v-for="item in optionsName"
@@ -167,6 +168,7 @@
                   reserve-keyword
                   remote-show-suffix
                   placeholder="请选择货物单位"
+                  :disabled="Boolean(unpackFormDisable.cargoUnit)"
                 >
                   <el-option
                     v-for="item in distributionUnit"
@@ -177,13 +179,13 @@
                 </el-select>
               </el-form-item>
               <el-form-item label="规格" style="width: 40%">
-                <el-input v-model="formInline.cargoNorms" placeholder="请输入规格" clearable />
+                <el-input v-model="formInline.cargoNorms" placeholder="请输入规格" clearable :disabled="Boolean(unpackFormDisable.cargoNorms)" />
               </el-form-item>
               <el-form-item label="产品编码" style="width: 40%">
-                <el-input v-model="formInline.cargoNumber" placeholder="请输入产品编码" clearable />
+                <el-input v-model="formInline.cargoNumber" placeholder="请输入产品编码" clearable :disabled="Boolean(unpackFormDisable.cargoNumber)"/>
               </el-form-item>
               <el-form-item label="包装数量" style="width: 40%">
-                <el-input v-model="formInline.packageNum" placeholder="请输入包装数量" clearable />
+                <el-input v-model="formInline.packageNum" placeholder="请输入包装数量" clearable :disabled="Boolean(unpackFormDisable.packageNum)"/>
               </el-form-item>
               <el-form-item label="拆箱数" style="width: 40%">
                 <el-input
@@ -301,6 +303,8 @@ export default {
       drawerShow: false,
       distributionType: [],
       distributionUnit: [],
+      // 拆包表单内输入框哪些禁止输入
+      unpackFormDisable: {},
       columnList: [
         {
           prop: '',
@@ -805,7 +809,10 @@ export default {
      * 物料选择赋值
      * */
     getMethodName(row, num) {
-      console.log('名称选择事件', row);
+      if(!row) {
+        this.formInline = {}
+        this.unpackFormDisable = {}
+      }
       switch (num) {
         case '1':
           let a = this.optionsName.find(i => i.id == row);
@@ -818,6 +825,7 @@ export default {
             this.formInline.packageNum = a.packageNum;
             this.formInline.descriptionGoods = a.descriptionGoods;
             this.formInline.sku = a.sku;
+            this.unpackFormDisable = this.formInline
           }
           break;
         case '2':
diff --git a/src/views/distribution/inventory/distributionStockListDiscuss.vue b/src/views/distribution/inventory/distributionStockListDiscuss.vue
index 8843796d..88898f3a 100644
--- a/src/views/distribution/inventory/distributionStockListDiscuss.vue
+++ b/src/views/distribution/inventory/distributionStockListDiscuss.vue
@@ -132,7 +132,7 @@
               padding-left: 1%;
             "
           >
-            <el-form :inline="true" :model="formInline" class="demo-form-inline" label-width="100">
+            <!-- <el-form :inline="true" :model="formInline" class="demo-form-inline" label-width="100">
               <el-form-item label="SKU" style="width: 40%">
                 <el-input v-model="formInline.sku" placeholder="请输入sku" clearable />
               </el-form-item>
@@ -171,6 +171,70 @@
                   clearable
                 />
               </el-form-item>
+            </el-form> -->
+
+           <el-form :inline="true" :model="formInline" class="demo-form-inline" label-width="100">
+              <el-form-item label="SKU" style="width: 40%">
+                <el-input v-model="formInline.sku" placeholder="请输入sku" clearable :disabled="Boolean(unpackFormDisable.sku)" />
+              </el-form-item>
+              <el-form-item label="货物名称" style="width: 40%">
+                <!--                      <el-input v-model="formInline.descriptionGoods" placeholder="请输入货物名称" clearable />-->
+                <el-select
+                  style="width: 100%"
+                  v-model="formInline.materialIdName"
+                  filterable
+                  remote
+                  reserve-keyword
+                  placeholder="请输入物料名称"
+                  :remote-method="remoteMethodName"
+                  @change="getMethodName($event, '1')"
+                  @blur="selectBlur"
+                  :loading="loading"
+                  clearable
+                >
+                  <el-option
+                    v-for="item in optionsName"
+                    :key="item.id"
+                    :label="item.name"
+                    :value="item.id"
+                  />
+                </el-select>
+              </el-form-item>
+              <el-form-item label="货物单位" style="width: 40%">
+                <el-select
+                  style="width: 100%"
+                  v-model="formInline.cargoUnit"
+                  filterable
+                  remote
+                  reserve-keyword
+                  remote-show-suffix
+                  placeholder="请选择货物单位"
+                  :disabled="Boolean(unpackFormDisable.cargoUnit)"
+                >
+                  <el-option
+                    v-for="item in distributionUnit"
+                    :key="item.dictKey"
+                    :label="item.dictValue"
+                    :value="item.dictKey"
+                  />
+                </el-select>
+              </el-form-item>
+              <el-form-item label="规格" style="width: 40%">
+                <el-input v-model="formInline.cargoNorms" placeholder="请输入规格" clearable :disabled="Boolean(unpackFormDisable.cargoNorms)" />
+              </el-form-item>
+              <el-form-item label="产品编码" style="width: 40%">
+                <el-input v-model="formInline.cargoNumber" placeholder="请输入产品编码" clearable :disabled="Boolean(unpackFormDisable.cargoNumber)"/>
+              </el-form-item>
+              <el-form-item label="包装数量" style="width: 40%">
+                <el-input v-model="formInline.packageNum" placeholder="请输入包装数量" clearable :disabled="Boolean(unpackFormDisable.packageNum)"/>
+              </el-form-item>
+              <el-form-item label="拆箱数" style="width: 40%">
+                <el-input
+                  v-model="formInline.unpackingQuantity"
+                  placeholder="请输入拆箱数"
+                  clearable
+                />
+              </el-form-item>
             </el-form>
           </div>
         </div>
@@ -280,6 +344,8 @@ export default {
       drawerShow: false,
       distributionType: [],
       distributionUnit: [],
+      // 拆包表单内输入框哪些禁止输入
+      unpackFormDisable: {},
       columnList: [
         {
           prop: '',
@@ -749,6 +815,33 @@ export default {
     },
   },
   methods: {
+    /**
+     * 物料选择赋值
+     * */
+    getMethodName(row, num) {
+      if(!row) {
+        this.formInline = {}
+        this.unpackFormDisable = {}
+      }
+      switch (num) {
+        case '1':
+          let a = this.optionsName.find(i => i.id == row);
+          console.log('aaaa>>', a);
+          if (!!a) {
+            this.formInline.materialCode = a.productCode;
+            this.formInline.cargoUnit = a.logpmUnit;
+            this.formInline.cargoNorms = a.packingSpecification;
+            this.formInline.cargoNumber = a.productCode;
+            this.formInline.packageNum = a.packageNum;
+            this.formInline.descriptionGoods = a.descriptionGoods;
+            this.formInline.sku = a.sku;
+            this.unpackFormDisable = this.formInline
+          }
+          break;
+        case '2':
+          break;
+      }
+    },
     showdrawer(value) {
       this.drawerShow = value;
     },
diff --git a/src/views/distribution/inventory/distributionStockListMarket.vue b/src/views/distribution/inventory/distributionStockListMarket.vue
index 988a74b8..d217b02b 100644
--- a/src/views/distribution/inventory/distributionStockListMarket.vue
+++ b/src/views/distribution/inventory/distributionStockListMarket.vue
@@ -1,25 +1,25 @@
 <template>
   <basic-container>
     <div class="avue-crud">
-          <el-row   v-if="!search" style="padding:6px 18px">
-            <!-- 查询模块 -->
-            <el-form :inline="true" :model="query">
-              <el-form-item label="货物名称:">
-                <el-input v-model="query.descriptionGoods" placeholder="请输入货物名称"></el-input>
-              </el-form-item>
-              <el-form-item label="货物编号:">
-                <el-input v-model="query.cargoNumber" placeholder="请输入商城名称"></el-input>
-              </el-form-item>
-              <el-form-item label="物流车次:">
-                <el-input v-model="query.despatch" placeholder="请输入商城名称"></el-input>
-              </el-form-item>
-              <!-- 查询按钮 -->
-              <el-form-item>
-                <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 v-if="!search" style="padding: 6px 18px">
+        <!-- 查询模块 -->
+        <el-form :inline="true" :model="query">
+          <el-form-item label="货物名称:">
+            <el-input v-model="query.descriptionGoods" placeholder="请输入货物名称"></el-input>
+          </el-form-item>
+          <el-form-item label="货物编号:">
+            <el-input v-model="query.cargoNumber" placeholder="请输入商城名称"></el-input>
+          </el-form-item>
+          <el-form-item label="物流车次:">
+            <el-input v-model="query.despatch" placeholder="请输入商城名称"></el-input>
+          </el-form-item>
+          <!-- 查询按钮 -->
+          <el-form-item>
+            <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">
           <!-- 头部左侧按钮模块 -->
@@ -50,23 +50,37 @@
           @selection="selectionChange"
         >
           <template #default="slotProps">
-            <el-text type="primary" text icon="el-icon-view" @click="handleViewDetails(slotProps.scope)">查看</el-text>
-            <el-text type="primary" text icon="el-icon-view" @click="handleViewDismantle(slotProps.scope)">拆包</el-text>
+            <el-text
+              type="primary"
+              text
+              icon="el-icon-view"
+              @click="handleViewDetails(slotProps.scope)"
+              >查看</el-text
+            >
+            <el-text
+              type="primary"
+              text
+              icon="el-icon-view"
+              @click="handleViewDismantle(slotProps.scope)"
+              >拆包</el-text
+            >
           </template>
         </tablecmt>
       </el-row>
       <el-row>
-        <div class="avue-crud__pagination" style="width:100%">
+        <div class="avue-crud__pagination" style="width: 100%">
           <!-- 分页模块 -->
-          <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>
@@ -80,48 +94,86 @@
         </avue-form>
       </el-dialog>
       <!-- 拆包模块 -->
-      <el-dialog :title="title"
-                 v-model="dismantle"
-                 width="60%"
-                 :before-close="beforeClose"
-                 append-to-body>
-        <div style="border: 1px solid #000000 ;height: 500px">
-          <div class="zhu" >
-            <div class="yi" >物品名称</div>
-            <div class="er" >{{getQuery.name}}</div>
+      <el-dialog
+        :title="title"
+        v-model="dismantle"
+        width="60%"
+        :before-close="beforeClose"
+        append-to-body
+      >
+        <div style="border: 1px solid #000000; height: 500px">
+          <div class="zhu">
+            <div class="yi">物品名称</div>
+            <div class="er">{{ getQuery.name }}</div>
           </div>
-          <div class="zhu" >
-            <div class="yi" >物品单位</div>
-            <div class="er" >{{ getQuery.logpmUnitName }}</div>
+          <div class="zhu">
+            <div class="yi">物品单位</div>
+            <div class="er">{{ getQuery.logpmUnitName }}</div>
           </div>
-          <div class="zhu" >
-            <div class="yi" >在库数</div>
-            <div class="er" >{{ getQuery.quantityStock }}</div>
+          <div class="zhu">
+            <div class="yi">在库数</div>
+            <div class="er">{{ getQuery.quantityStock }}</div>
           </div>
-          <div class="zhu" >
-            <div class="yi" >规格</div>
-            <div class="er" >{{ getQuery.packingSpecification }}</div>
+          <div class="zhu">
+            <div class="yi">规格</div>
+            <div class="er">{{ getQuery.packingSpecification }}</div>
           </div>
-          <div class="zhu" >
-            <div class="yi" >包装数量</div>
-            <div class="er" >{{ getQuery.packageNum }}</div>
+          <div class="zhu">
+            <div class="yi">包装数量</div>
+            <div class="er">{{ getQuery.packageNum }}</div>
           </div>
-          <div style="border-width: 1px 0 0 0; border-style: solid; border-color: black;margin-top: 5%;padding-top: 2%;padding-left: 1%">
+          <div
+            style="
+              border-width: 1px 0 0 0;
+              border-style: solid;
+              border-color: black;
+              margin-top: 5%;
+              padding-top: 2%;
+              padding-left: 1%;
+            "
+          >
             <el-form :inline="true" :model="formInline" class="demo-form-inline" label-width="100">
-              <el-form-item label="SKU"  style="width: 40%">
-                <el-input v-model="formInline.sku" placeholder="请输入sku" clearable />
+              <el-form-item label="SKU" style="width: 40%">
+                <el-input
+                  v-model="formInline.sku"
+                  placeholder="请输入sku"
+                  clearable
+                  :disabled="Boolean(unpackFormDisable.sku)"
+                />
               </el-form-item>
-              <el-form-item label="货物名称"  style="width: 40%">
-                <el-input v-model="formInline.descriptionGoods" placeholder="请输入货物名称" clearable />
+              <el-form-item label="货物名称" style="width: 40%">
+                <!--                      <el-input v-model="formInline.descriptionGoods" placeholder="请输入货物名称" clearable />-->
+                <el-select
+                  style="width: 100%"
+                  v-model="formInline.materialIdName"
+                  filterable
+                  remote
+                  reserve-keyword
+                  placeholder="请输入物料名称"
+                  :remote-method="remoteMethodName"
+                  @change="getMethodName($event, '1')"
+                  @blur="selectBlur"
+                  :loading="loading"
+                  clearable
+                >
+                  <el-option
+                    v-for="item in optionsName"
+                    :key="item.id"
+                    :label="item.name"
+                    :value="item.id"
+                  />
+                </el-select>
               </el-form-item>
-              <el-form-item label="货物单位"  style="width: 40%">
-                <el-select style="width: 100%;"
-                           v-model="formInline.cargoUnit"
-                           filterable
-                           remote
-                           reserve-keyword
-                           remote-show-suffix
-                           placeholder="请选择货物单位"
+              <el-form-item label="货物单位" style="width: 40%">
+                <el-select
+                  style="width: 100%"
+                  v-model="formInline.cargoUnit"
+                  filterable
+                  remote
+                  reserve-keyword
+                  remote-show-suffix
+                  placeholder="请选择货物单位"
+                  :disabled="Boolean(unpackFormDisable.cargoUnit)"
                 >
                   <el-option
                     v-for="item in distributionUnit"
@@ -132,74 +184,105 @@
                 </el-select>
               </el-form-item>
               <el-form-item label="规格" style="width: 40%">
-                <el-input v-model="formInline.cargoNorms" placeholder="请输入规格" clearable />
+                <el-input
+                  v-model="formInline.cargoNorms"
+                  placeholder="请输入规格"
+                  clearable
+                  :disabled="Boolean(unpackFormDisable.cargoNorms)"
+                />
+              </el-form-item>
+              <el-form-item label="产品编码" style="width: 40%">
+                <el-input
+                  v-model="formInline.cargoNumber"
+                  placeholder="请输入产品编码"
+                  clearable
+                  :disabled="Boolean(unpackFormDisable.cargoNumber)"
+                />
+              </el-form-item>
+              <el-form-item label="包装数量" style="width: 40%">
+                <el-input
+                  v-model="formInline.packageNum"
+                  placeholder="请输入包装数量"
+                  clearable
+                  :disabled="Boolean(unpackFormDisable.packageNum)"
+                />
               </el-form-item>
               <el-form-item label="拆箱数" style="width: 40%">
-                <el-input v-model="formInline.unpackingQuantity" placeholder="请输入拆箱数" clearable />
+                <el-input
+                  v-model="formInline.unpackingQuantity"
+                  placeholder="请输入拆箱数"
+                  clearable
+                />
               </el-form-item>
             </el-form>
           </div>
         </div>
         <!-- 表单按钮 -->
         <template #footer>
-          <span  class="dialog-footer">
-            <el-button type="primary" icon="el-icon-circle-check" @click="handleSubmit">确 定</el-button>
+          <span class="dialog-footer">
+            <el-button type="primary" icon="el-icon-circle-check" @click="handleSubmit"
+              >确 定</el-button
+            >
             <el-button icon="el-icon-circle-close" @click="dismantle = false">取 消</el-button>
           </span>
         </template>
       </el-dialog>
       <!-- 表单模块 -->
-      <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="orderCode">
-            <el-input v-model="form.orderCode" placeholder="请输入订单自编号"/>
+            <el-input v-model="form.orderCode" placeholder="请输入订单自编号" />
           </el-form-item>
           <el-form-item label="入库批次号" prop="incomingBatch">
-            <el-input v-model="form.incomingBatch" placeholder="请输入入库批次号"/>
+            <el-input v-model="form.incomingBatch" placeholder="请输入入库批次号" />
           </el-form-item>
           <el-form-item label="货物名称" prop="descriptionGoods">
-            <el-input v-model="form.descriptionGoods" placeholder="请输入货物名称"/>
+            <el-input v-model="form.descriptionGoods" placeholder="请输入货物名称" />
           </el-form-item>
           <el-form-item label="货物编号" prop="cargoNumber">
-            <el-input v-model="form.cargoNumber" placeholder="请输入货物编号"/>
+            <el-input v-model="form.cargoNumber" placeholder="请输入货物编号" />
           </el-form-item>
           <el-form-item label="仓库" prop="warehouse">
-            <el-input v-model="form.warehouse" placeholder="请输入仓库"/>
+            <el-input v-model="form.warehouse" placeholder="请输入仓库" />
           </el-form-item>
           <el-form-item label="商场" prop="market">
-            <el-input v-model="form.market" placeholder="请输入商场"/>
+            <el-input v-model="form.market" placeholder="请输入商场" />
           </el-form-item>
           <el-form-item label="货物单位" prop="cargoUnit">
-            <el-input v-model="form.cargoUnit" placeholder="请输入货物单位"/>
+            <el-input v-model="form.cargoUnit" placeholder="请输入货物单位" />
           </el-form-item>
           <el-form-item label="门店" prop="shop">
-            <el-input v-model="form.shop" placeholder="请输入门店"/>
+            <el-input v-model="form.shop" placeholder="请输入门店" />
           </el-form-item>
           <el-form-item label="库位信息" prop="storageLocation">
-            <el-input v-model="form.storageLocation" placeholder="请输入库位信息"/>
+            <el-input v-model="form.storageLocation" placeholder="请输入库位信息" />
           </el-form-item>
           <el-form-item label="商城名称" prop="mallName">
-            <el-input v-model="form.mallName" placeholder="请输入商城名称"/>
+            <el-input v-model="form.mallName" placeholder="请输入商城名称" />
           </el-form-item>
           <el-form-item label="库存数量" prop="quantityStock">
-            <el-input v-model="form.quantityStock" placeholder="请输入库存数量"/>
+            <el-input v-model="form.quantityStock" placeholder="请输入库存数量" />
           </el-form-item>
           <el-form-item label="出库数量" prop="outboundQuantity">
-            <el-input v-model="form.outboundQuantity" placeholder="请输入出库数量"/>
+            <el-input v-model="form.outboundQuantity" placeholder="请输入出库数量" />
           </el-form-item>
           <el-form-item label="发运车次" prop="despatch">
-            <el-input v-model="form.despatch" placeholder="请输入发运车次"/>
+            <el-input v-model="form.despatch" placeholder="请输入发运车次" />
           </el-form-item>
         </el-form>
         <!-- 表单按钮 -->
         <template #footer>
           <span v-if="!view" class="dialog-footer">
-            <el-button type="primary" icon="el-icon-circle-check" @click="handleSubmit">提 交</el-button>
+            <el-button 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>
@@ -222,12 +305,12 @@ import {
   update,
   remove,
   addParcels,
-  getStockListOwn
+  getStockListOwn,
 } from '@/api/distribution/distributionStockList';
-import { getListParcelDetails } from "@/api/distribution/distributionParcelDetails";
+import { getListParcelDetails } from '@/api/distribution/distributionParcelDetails';
 import { getListMaterial } from '@/api/basic/basicMaterial';
-import option from "@/option/distribution/distributionStockList";
-import { mapGetters } from "vuex";
+import option from '@/option/distribution/distributionStockList';
+import { mapGetters } from 'vuex';
 import { exportBlob } from '@/api/common';
 import { getToken } from '@/utils/auth';
 import { downloadXls } from '@/utils/util';
@@ -235,11 +318,15 @@ import dayjs from 'dayjs';
 import { getDictionaryBiz } from '@/api/system/dict';
 
 export default {
-  data () {
+  data() {
     return {
       drawerShow: false,
-      distributionType:[],
-      distributionUnit:[],
+      distributionType: [],
+      distributionUnit: [],
+      // 拆包表单内输入框哪些禁止输入
+      unpackFormDisable: {},
+      // 拆包名称下拉 选择
+      optionsName: [],
       columnList: [
         {
           prop: '',
@@ -361,7 +448,8 @@ export default {
           checkarr: [],
           fixed: false,
           sortable: true,
-        },{
+        },
+        {
           prop: 'outboundQuantity',
           label: '出库数量',
           type: 1,
@@ -487,14 +575,16 @@ export default {
           type: 1,
           values: '',
           width: '130',
-          checkarr: [ {
-            value: `true`,
-            label: '是',
-          },
+          checkarr: [
+            {
+              value: `true`,
+              label: '是',
+            },
             {
               value: `false`,
               label: '否',
-            },],
+            },
+          ],
           fixed: false,
           sortable: true,
         },
@@ -512,7 +602,7 @@ export default {
         // 更多列的配置...
       ],
       height: 0,
-      formInline:{
+      formInline: {
         descriptionGoods: '',
         cargoUnit: '',
         cargoNorms: '',
@@ -520,7 +610,7 @@ export default {
       },
       // 弹框标题
       title: '',
-      stockList: { }, //拆包对象
+      stockList: {}, //拆包对象
       // stockId: '', //拆包id
       // materialId: '', //物料id
       // marketId: '', //客户id
@@ -543,12 +633,12 @@ export default {
       page: {
         currentPage: 1,
         pageSize: 30,
-        total: 40
+        total: 40,
       },
       pageDetails: {
         currentPage: 1,
         pageSize: 30,
-        total: 40
+        total: 40,
       },
       // 表单数据
       form: {},
@@ -611,18 +701,18 @@ export default {
           },
         ],
       },
-    }
+    };
   },
-  mounted () {
+  mounted() {
     this.init();
     // this.onLoad(this.page);
     /**
      * 初始化获取本地缓存的编辑隐藏的列表
      *  固定搭配，不能更改
      */
-    let checkListnewarr = this.$functions.getStorage(window.location.pathname+'checkList');
-    let flexListnewarr = this.$functions.getStorage(window.location.pathname+'flexList');
-    let sortlistnewarr = this.$functions.getStorage(window.location.pathname+'sortlist');
+    let checkListnewarr = this.$functions.getStorage(window.location.pathname + 'checkList');
+    let flexListnewarr = this.$functions.getStorage(window.location.pathname + 'flexList');
+    let sortlistnewarr = this.$functions.getStorage(window.location.pathname + 'sortlist');
     if (checkListnewarr) {
       this.columnList.map(item => {
         item.head = false;
@@ -634,14 +724,14 @@ export default {
           }
         });
       });
-    }else{
-      let arr=[]
+    } else {
+      let arr = [];
       this.columnList.map(item => {
-        if(item.head){
-          arr.push(item.label)
+        if (item.head) {
+          arr.push(item.label);
         }
       });
-      this.$functions.setStorage(window.location.pathname+'checkList',arr)
+      this.$functions.setStorage(window.location.pathname + 'checkList', arr);
     }
     if (flexListnewarr) {
       this.columnList.map(item => {
@@ -650,22 +740,22 @@ export default {
       flexListnewarr.map(ite => {
         this.columnList.map(item => {
           if (ite == item.label) {
-            if(item.type==6){
+            if (item.type == 6) {
               item.fixed = 'right';
-            }else{
+            } else {
               item.fixed = true;
             }
           }
         });
       });
-    }else{
-      let arr=[]
+    } else {
+      let arr = [];
       this.columnList.map(item => {
-        if(item.fixed){
-          arr.push(item.label)
+        if (item.fixed) {
+          arr.push(item.label);
         }
       });
-      this.$functions.setStorage(window.location.pathname+'flexList',arr)
+      this.$functions.setStorage(window.location.pathname + 'flexList', arr);
     }
     if (sortlistnewarr) {
       this.columnList.map(item => {
@@ -678,55 +768,110 @@ export default {
           }
         });
       });
-    }else{
-      let arr=[]
+    } else {
+      let arr = [];
       this.columnList.map(item => {
-        if(item.sortable){
-          arr.push(item.label)
+        if (item.sortable) {
+          arr.push(item.label);
         }
       });
-      this.$functions.setStorage(window.location.pathname+'sortlist',arr)
+      this.$functions.setStorage(window.location.pathname + 'sortlist', arr);
     }
   },
   computed: {
-    ...mapGetters(["permission"]),
-    ids () {
+    ...mapGetters(['permission']),
+    ids() {
       let ids = [];
       this.selectionList.forEach(ele => {
         ids.push(ele.id);
       });
-      return ids.join(",");
+      return ids.join(',');
     },
-    idDismantle () {
+    idDismantle() {
       let ids = [];
       this.selectionListDismantle.forEach(ele => {
         ids.push(ele.id);
       });
-      return ids.join(",");
-    }
+      return ids.join(',');
+    },
   },
   methods: {
-
-    showdrawer(value){
-      this.drawerShow=value
+    selectBlur(e) {
+      // console.log(">>>>>><<<<<<<",e);
+      let value = e.target.value; // 输入框值
+      if (value) {
+        // 只有输入才有这个值，下拉框选择的话 这个值为空
+        // this.form.produce = value;
+        // console.log("获取的值",value);
+        this.formInline.materialIdName = value;
+      }
+    },
+    /**
+     * 查询
+     * */
+    async remoteMethodName(query) {
+      if (query) {
+        this.loading = true;
+        //查询物料数据
+        let asd = await getListMaterial(this.page.currentPage, this.page.pageSize, {
+          name: query,
+          pid: this.stockList.materialId,
+        }).then();
+        console.log('物料信息', asd.data.data);
+        if (!!asd.data.data) {
+          this.optionsName = asd.data.data.records;
+        }
+        this.loading = false;
+      } else {
+        this.optionsName = [];
+      }
+    },
+    /**
+     * 物料选择赋值
+     * */
+    getMethodName(row, num) {
+      if (!row) {
+        this.formInline = {};
+        this.unpackFormDisable = {};
+      }
+      switch (num) {
+        case '1':
+          let a = this.optionsName.find(i => i.id == row);
+          console.log('aaaa>>', a);
+          if (!!a) {
+            this.formInline.materialCode = a.productCode;
+            this.formInline.cargoUnit = a.logpmUnit;
+            this.formInline.cargoNorms = a.packingSpecification;
+            this.formInline.cargoNumber = a.productCode;
+            this.formInline.packageNum = a.packageNum;
+            this.formInline.descriptionGoods = a.descriptionGoods;
+            this.formInline.sku = a.sku;
+            this.unpackFormDisable = this.formInline;
+          }
+          break;
+        case '2':
+          break;
+      }
+    },
+    showdrawer(value) {
+      this.drawerShow = value;
     },
     /**
      * 弹窗的勾选回调，用于更改头部数组
      * 固定搭配，只需要更换   columnList
      */
-    setnewcolum(newarr, headarr,type) {
+    setnewcolum(newarr, headarr, type) {
       // console.log(newarr,'+++++++++++')
-      if(type==1){
+      if (type == 1) {
         this.columnList = newarr;
-        this.$functions.setStorage(window.location.pathname+'checkList', headarr);
-      }else if(type==2){
+        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.$functions.setStorage(window.location.pathname + 'flexList', headarr);
+      } else if (type == 3) {
         this.columnList = newarr;
-        this.$functions.setStorage(window.location.pathname+'sortlist', headarr);
+        this.$functions.setStorage(window.location.pathname + 'sortlist', headarr);
       }
-
     },
     selectionsc(value) {
       console.log(value);
@@ -744,23 +889,23 @@ export default {
     },
     selectsc(index, row) {
       console.log(index, row);
-      if(row.prop ==='completeSetName'){
+      if (row.prop === 'completeSetName') {
         this.query['completeSet'] = index;
-      }else if(row.prop ==='serviceTypeName'){
+      } else if (row.prop === 'serviceTypeName') {
         this.query['serviceType'] = index;
-      }else{
+      } else {
         this.query[row.prop] = index;
       }
       this.onLoad(this.page);
     },
     timesc(index, row) {
       console.log(index, row);
-      if (!!index){
+      if (!!index) {
         index = dayjs(index).format('YYYY-MM-DD');
       }
-      this.query[row.prop] =  index
-      if (!index){
-        delete this.query[row.prop]
+      this.query[row.prop] = index;
+      if (!index) {
+        delete this.query[row.prop];
       }
       this.onLoad(this.page);
     },
@@ -771,7 +916,7 @@ export default {
       this.onLoad(this.page);
     },
 
-    handleImport(){
+    handleImport() {
       this.excelBox = true;
     },
     refreshChange() {
@@ -791,59 +936,56 @@ export default {
       });
     },
     //数量校验
-    handleNumberRange(e,row) {
+    handleNumberRange(e, row) {
       // console.log("执行了2222",e,e.target.value,row);
-      if(e.target.value) {
-        e.target.value = e.target.value.replace(/[^\.\d]/g,'') //替换掉与数字无关的字符（中英文与符号都会被替换掉，只留下数字，此时值类型为字符串）
-        if(e.target.value) { //如果替换后还有值
+      if (e.target.value) {
+        e.target.value = e.target.value.replace(/[^\.\d]/g, ''); //替换掉与数字无关的字符（中英文与符号都会被替换掉，只留下数字，此时值类型为字符串）
+        if (e.target.value) {
+          //如果替换后还有值
           e.target.value = parseInt(e.target.value); //把字符型转成整数型
         }
-        if((e.target.value > row.number )) {
+        if (e.target.value > row.number) {
           this.$message.error('数量不能大于订单数');
           e.target.value = row.number;
-          return
+          return;
         }
       }
     },
-    init () {
+    init() {
       this.height = this.setPx(document.body.clientHeight - 340);
       getDictionaryBiz('logpm_unit').then(res => {
         this.distributionUnit = res.data.data;
         console.log(this.distributionUnit);
-      })
+      });
       getDictionaryBiz('distribution_type').then(res => {
         this.distributionType = res.data.data;
-        this.columnList[2].checkarr =res.data.data.map(item=>{
-          item.value=item.dictKey
-          item.label=item.dictValue
+        this.columnList[2].checkarr = res.data.data.map(item => {
+          item.value = item.dictKey;
+          item.label = item.dictValue;
           return item;
         });
       });
 
-
-
       this.onLoad(this.page);
-
     },
-    searchHide () {
+    searchHide() {
       this.search = !this.search;
     },
-    searchChange () {
+    searchChange() {
       this.onLoad(this.page);
     },
-    searchReset () {
+    searchReset() {
       this.query = {};
       this.page.currentPage = 1;
       this.onLoad(this.page);
     },
     //拆包提交
-    handleSubmit () {
+    handleSubmit() {
       // if(this.selectionListDismantle.length < 1){
       //   this.$message.warning("请选择一条数据！！！");
       //   return ;
       // }
       if (!this.form.id) {
-
         // if(this.selectionListDismantle.length > 0){
         //   console.log(this.selectionListDismantle);
         //   let shi = [];
@@ -857,30 +999,29 @@ export default {
         //   this.form.parcels = shi;
         // }
         // console.log("提交了");
-        if(parseInt(this.formInline.unpackingQuantity) >parseInt(this.getQuery.quantityStock)){
-          this.$message.warning("拆包数量大于在库数量!!!")
-          return ;
-        }else{
+        if (parseInt(this.formInline.unpackingQuantity) > parseInt(this.getQuery.quantityStock)) {
+          this.$message.warning('拆包数量大于在库数量!!!');
+          return;
+        } else {
           const regex = /\d+/g; // 正则表达式匹配数字
           const numbers = this.getQuery.packageNum.match(regex); // 使用match方法获取匹配到的数字数组
           parseInt(numbers[0]) * parseInt(this.formInline.unpackingQuantity);
 
-          this.formInline.storeNum =  parseInt(numbers[0]) * parseInt(this.formInline.unpackingQuantity);
+          this.formInline.storeNum =
+            parseInt(numbers[0]) * parseInt(this.formInline.unpackingQuantity);
         }
-        this.formInline.id =this.stockList.id;
-        this.formInline.materialId =this.stockList.materialId;
-        this.formInline.marketId =this.stockList.marketId;
-        this.formInline.storeId =this.stockList.storeId;
-
-
-        console.log("提交的值",this.formInline);
+        this.formInline.id = this.stockList.id;
+        this.formInline.materialId = this.stockList.materialId;
+        this.formInline.marketId = this.stockList.marketId;
+        this.formInline.storeId = this.stockList.storeId;
+        this.formInline.descriptionGoods = ''
         addParcels(this.formInline).then(() => {
           this.box = false;
           this.dismantle = false;
           this.onLoad(this.page);
           this.$message({
-            type: "success",
-            message: "操作成功!"
+            type: 'success',
+            message: '操作成功!',
           });
           this.formInline = {};
         });
@@ -889,63 +1030,61 @@ export default {
           this.box = false;
           this.onLoad(this.page);
           this.$message({
-            type: "success",
-            message: "操作成功!"
+            type: 'success',
+            message: '操作成功!',
           });
-        })
+        });
       }
     },
-    handleAdd () {
-      this.title = '新增'
-      this.form = {}
-      this.box = true
+    handleAdd() {
+      this.title = '新增';
+      this.form = {};
+      this.box = true;
     },
-    handleEdit (row) {
-      this.title = '编辑'
-      this.box = true
+    handleEdit(row) {
+      this.title = '编辑';
+      this.box = true;
       getDetail(row.id).then(res => {
         this.form = res.data.data;
       });
     },
-    handleView (row) {
-      this.title = '查看'
+    handleView(row) {
+      this.title = '查看';
       this.view = true;
       this.box = true;
       getDetail(row.id).then(res => {
         this.form = res.data.data;
       });
     },
-    handleViewDetails (row) {
+    handleViewDetails(row) {
       this.$router.push({
         path: '/distribution/inventory/distributionStockListDetails',
-        query:{
+        query: {
           id: row.row.id,
-          name: row.row.descriptionGoods+" — 明细"
-        }
+          name: row.row.descriptionGoods + ' — 明细',
+        },
       });
-
-
     },
-    async handleViewDismantle (row) {
-      console.log("><<>L:",row.row);
+    async handleViewDismantle(row) {
+      console.log('><<>L:', row.row);
       this.dismantle = true;
       this.view = true;
       this.title = '拆包';
       this.stockList = row.row;
       //查询包件详情表
-      let par ={
-        parcelListId : row.row.parcelListId
-      }
+      let par = {
+        parcelListId: row.row.parcelListId,
+      };
       let ap = {
         id: row.row.materialId,
-      }
+      };
       //查询物料信息
-      let aa =await getListMaterial(this.pageDetails.currentPage,this.pageDetails.pageSize,ap);
-      console.log("adfadsfvasd",aa.data.data);
+      let aa = await getListMaterial(this.pageDetails.currentPage, this.pageDetails.pageSize, ap);
+      console.log('adfadsfvasd', aa.data.data);
       this.getQuery = aa.data.data.records[0];
       this.getQuery.quantityStock = row.row.quantityStock;
       this.formInline.descriptionGoods = this.getQuery.name;
-      let q =  this.distributionUnit.find( i => i.dictKey == this.getQuery.logpmUnit);
+      let q = this.distributionUnit.find(i => i.dictKey == this.getQuery.logpmUnit);
       this.getQuery.logpmUnitName = q.dictValue;
       // getListParcelDetails(this.pageDetails.currentPage,this.pageDetails.pageSize,par).then(res => {
       //   console.log("<><>===", res.data.data);
@@ -956,15 +1095,15 @@ export default {
       //   this.selectionClear();
       // });
     },
-    handleDelete () {
+    handleDelete() {
       if (this.selectionList.length === 0) {
-        this.$message.warning("请选择至少一条数据");
+        this.$message.warning('请选择至少一条数据');
         return;
       }
-      this.$confirm("确定将选择数据删除?", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning"
+      this.$confirm('确定将选择数据删除?', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
       })
         .then(() => {
           return remove(this.ids);
@@ -973,16 +1112,16 @@ export default {
           this.selectionClear();
           this.onLoad(this.page);
           this.$message({
-            type: "success",
-            message: "操作成功!"
+            type: 'success',
+            message: '操作成功!',
           });
         });
     },
-    rowDel (row) {
-      this.$confirm("确定将选择数据删除?", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning"
+    rowDel(row) {
+      this.$confirm('确定将选择数据删除?', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
       })
         .then(() => {
           return remove(row.id);
@@ -990,75 +1129,88 @@ export default {
         .then(() => {
           this.onLoad(this.page);
           this.$message({
-            type: "success",
-            message: "操作成功!"
+            type: 'success',
+            message: '操作成功!',
           });
         });
     },
-    beforeClose (done) {
-      done()
+    beforeClose(done) {
+      done();
       this.form = {};
       this.view = false;
     },
-    selectionChange (list) {
+    selectionChange(list) {
       this.selectionList = list;
     },
-    selectionChangeDismantle (list) {
+    selectionChangeDismantle(list) {
       this.selectionListDismantle = list;
-
     },
-    selectionClear () {
+    selectionClear() {
       this.selectionList = [];
       // this.$refs.table.clearSelection();
     },
-    currentChange (currentPage) {
+    currentChange(currentPage) {
       this.page.currentPage = currentPage;
       this.onLoad(this.page);
     },
-    sizeChange (pageSize) {
+    sizeChange(pageSize) {
       this.page.pageSize = pageSize;
       this.onLoad(this.page);
     },
-    currentChangeDetails (currentPage) {
+    currentChangeDetails(currentPage) {
       this.pageDetails.currentPage = currentPage;
       // this.handleViewDismantle(this.page);
     },
-    sizeChangeDetails (pageSize) {
+    sizeChangeDetails(pageSize) {
       this.pageDetails.pageSize = pageSize;
       // this.handleViewDismantle(this.page);
     },
-    onLoad (page, params = {}) {
+    onLoad(page, params = {}) {
       this.loading = true;
       this.query.serviceType = '2';
-      getStockListOwn(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
-        const data = res.data.data;
-        this.page.total = data.total;
-        this.data = data.records;
-        this.data.forEach( i =>{
-          let a =  this.distributionType.find( d =>d.dictKey == i.serviceType);
-          i.serviceTypeName = a.dictValue;
-          if(i.unpack == false){
-            i.unpack = '否'
-          }else{
-            i.unpack = '是'
-          }
-        })
-        this.loading = false;
-        this.selectionClear();
-      });
-    }
-  }
+      getStockListOwn(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(
+        res => {
+          const data = res.data.data;
+          this.page.total = data.total;
+          this.data = data.records;
+          this.data.forEach(i => {
+            let a = this.distributionType.find(d => d.dictKey == i.serviceType);
+            i.serviceTypeName = a.dictValue;
+            if (i.unpack == false) {
+              i.unpack = '否';
+            } else {
+              i.unpack = '是';
+            }
+          });
+          this.loading = false;
+          this.selectionClear();
+        }
+      );
+    },
+  },
 };
 </script>
 <style>
-.zhu{
-  display: flex;flex-direction: row;
+.zhu {
+  display: flex;
+  flex-direction: row;
 }
-.yi{
-  border-width: 0 1px 1px 0; border-style: solid; border-color: black;width: 20%;font-size: 14px;text-align: right;padding: 1%;
+.yi {
+  border-width: 0 1px 1px 0;
+  border-style: solid;
+  border-color: black;
+  width: 20%;
+  font-size: 14px;
+  text-align: right;
+  padding: 1%;
 }
-.er{
-  border-width: 0 0 1px 0; border-style: solid; border-color: black;width: 90%;font-size: 14px;padding: 1%
+.er {
+  border-width: 0 0 1px 0;
+  border-style: solid;
+  border-color: black;
+  width: 90%;
+  font-size: 14px;
+  padding: 1%;
 }
 .demo-form-inline .el-input {
   --el-input-width: 220px;
diff --git a/src/views/distribution/inventory/distributionStockListSelf.vue b/src/views/distribution/inventory/distributionStockListSelf.vue
index 8c6c2c16..d09f7a9a 100644
--- a/src/views/distribution/inventory/distributionStockListSelf.vue
+++ b/src/views/distribution/inventory/distributionStockListSelf.vue
@@ -108,20 +108,47 @@
           </div>
           <div style="border-width: 1px 0 0 0; border-style: solid; border-color: black;margin-top: 5%;padding-top: 2%;padding-left: 1%">
             <el-form :inline="true" :model="formInline" class="demo-form-inline" label-width="100">
-              <el-form-item label="SKU"  style="width: 40%">
-                <el-input v-model="formInline.sku" placeholder="请输入sku" clearable />
+              <el-form-item label="SKU" style="width: 40%">
+                <el-input
+                  v-model="formInline.sku"
+                  placeholder="请输入sku"
+                  clearable
+                  :disabled="Boolean(unpackFormDisable.sku)"
+                />
               </el-form-item>
-              <el-form-item label="货物名称"  style="width: 40%">
-                <el-input v-model="formInline.descriptionGoods" placeholder="请输入货物名称" clearable />
+              <el-form-item label="货物名称" style="width: 40%">
+                <!--                      <el-input v-model="formInline.descriptionGoods" placeholder="请输入货物名称" clearable />-->
+                <el-select
+                  style="width: 100%"
+                  v-model="formInline.materialIdName"
+                  filterable
+                  remote
+                  reserve-keyword
+                  placeholder="请输入物料名称"
+                  :remote-method="remoteMethodName"
+                  @change="getMethodName($event, '1')"
+                  @blur="selectBlur"
+                  :loading="loading"
+                  clearable
+                >
+                  <el-option
+                    v-for="item in optionsName"
+                    :key="item.id"
+                    :label="item.name"
+                    :value="item.id"
+                  />
+                </el-select>
               </el-form-item>
-              <el-form-item label="货物单位"  style="width: 40%">
-                <el-select style="width: 100%;"
-                           v-model="formInline.cargoUnit"
-                           filterable
-                           remote
-                           reserve-keyword
-                           remote-show-suffix
-                           placeholder="请选择货物单位"
+              <el-form-item label="货物单位" style="width: 40%">
+                <el-select
+                  style="width: 100%"
+                  v-model="formInline.cargoUnit"
+                  filterable
+                  remote
+                  reserve-keyword
+                  remote-show-suffix
+                  placeholder="请选择货物单位"
+                  :disabled="Boolean(unpackFormDisable.cargoUnit)"
                 >
                   <el-option
                     v-for="item in distributionUnit"
@@ -132,10 +159,35 @@
                 </el-select>
               </el-form-item>
               <el-form-item label="规格" style="width: 40%">
-                <el-input v-model="formInline.cargoNorms" placeholder="请输入规格" clearable />
+                <el-input
+                  v-model="formInline.cargoNorms"
+                  placeholder="请输入规格"
+                  clearable
+                  :disabled="Boolean(unpackFormDisable.cargoNorms)"
+                />
+              </el-form-item>
+              <el-form-item label="产品编码" style="width: 40%">
+                <el-input
+                  v-model="formInline.cargoNumber"
+                  placeholder="请输入产品编码"
+                  clearable
+                  :disabled="Boolean(unpackFormDisable.cargoNumber)"
+                />
+              </el-form-item>
+              <el-form-item label="包装数量" style="width: 40%">
+                <el-input
+                  v-model="formInline.packageNum"
+                  placeholder="请输入包装数量"
+                  clearable
+                  :disabled="Boolean(unpackFormDisable.packageNum)"
+                />
               </el-form-item>
               <el-form-item label="拆箱数" style="width: 40%">
-                <el-input v-model="formInline.unpackingQuantity" placeholder="请输入拆箱数" clearable />
+                <el-input
+                  v-model="formInline.unpackingQuantity"
+                  placeholder="请输入拆箱数"
+                  clearable
+                />
               </el-form-item>
             </el-form>
           </div>
@@ -240,13 +292,17 @@ export default {
       drawerShow: false,
       distributionType:[],
       distributionUnit:[],
+      // 拆包表单内输入框哪些禁止输入
+      unpackFormDisable: {},
+      // 拆包名称下拉 选择
+      optionsName: [],
       columnList: [
         {
           prop: '',
-          label: '序号',
+          label: '全选',
           type: 0,
           values: '',
-          width: 55,
+          width: "55",
           checkarr: [],
           fixed: true,
         },
@@ -706,7 +762,63 @@ export default {
     }
   },
   methods: {
-
+    selectBlur(e) {
+      // console.log(">>>>>><<<<<<<",e);
+      let value = e.target.value; // 输入框值
+      if (value) {
+        // 只有输入才有这个值，下拉框选择的话 这个值为空
+        // this.form.produce = value;
+        // console.log("获取的值",value);
+        this.formInline.materialIdName = value;
+      }
+    },
+    /**
+     * 查询
+     * */
+    async remoteMethodName(query) {
+      if (query) {
+        this.loading = true;
+        //查询物料数据
+        let asd = await getListMaterial(this.page.currentPage, this.page.pageSize, {
+          name: query,
+          pid: this.stockList.materialId,
+        }).then();
+        console.log('物料信息', asd.data.data);
+        if (!!asd.data.data) {
+          this.optionsName = asd.data.data.records;
+        }
+        this.loading = false;
+      } else {
+        this.optionsName = [];
+      }
+    },
+    /**
+     * 物料选择赋值
+     * */
+    getMethodName(row, num) {
+      if (!row) {
+        this.formInline = {};
+        this.unpackFormDisable = {};
+      }
+      switch (num) {
+        case '1':
+          let a = this.optionsName.find(i => i.id == row);
+          console.log('aaaa>>', a);
+          if (!!a) {
+            this.formInline.materialCode = a.productCode;
+            this.formInline.cargoUnit = a.logpmUnit;
+            this.formInline.cargoNorms = a.packingSpecification;
+            this.formInline.cargoNumber = a.productCode;
+            this.formInline.packageNum = a.packageNum;
+            this.formInline.descriptionGoods = a.descriptionGoods;
+            this.formInline.sku = a.sku;
+            this.unpackFormDisable = this.formInline;
+          }
+          break;
+        case '2':
+          break;
+      }
+    },
     showdrawer(value){
       this.drawerShow=value
     },
@@ -872,7 +984,7 @@ export default {
         this.formInline.marketId =this.stockList.marketId;
         this.formInline.storeId =this.stockList.storeId;
 
-
+        this.formInline.descriptionGoods = ''
         console.log("提交的值",this.formInline);
         addParcels(this.formInline).then(() => {
           this.box = false;
diff --git a/src/views/distribution/loadscanabnormal/distributionLoadscanAbnormal.vue b/src/views/distribution/loadscanabnormal/distributionLoadscanAbnormal.vue
new file mode 100644
index 00000000..11a404ec
--- /dev/null
+++ b/src/views/distribution/loadscanabnormal/distributionLoadscanAbnormal.vue
@@ -0,0 +1,351 @@
+<template>
+  <basic-container>
+    <div class="avue-crud">
+      <el-row :hidden="!search" style="padding:6px 18px">
+        <!-- 查询模块 -->
+        <el-form :inline="true" :model="query">
+          <!-- 查询按钮 -->
+          <el-form-item>
+            <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="primary" icon="el-icon-plus" @click="handleAdd">新 增</el-button>
+            <el-button type="danger" icon="el-icon-delete" @click="handleDelete" plain>删 除</el-button>
+          </div>
+          <!-- 头部右侧按钮模块 -->
+          <div class="avue-crud__right">
+            <el-button icon="el-icon-refresh" @click="searchChange" circle></el-button>
+            <el-button icon="el-icon-search" @click="searchHide" circle></el-button>
+          </div>
+        </div>
+      </el-row>
+      <el-row>
+        <!-- 列表模块 -->
+        <el-table ref="table" v-loading="loading"
+                  @selection-change="selectionChange"
+                  :data="data"
+                  :height="height"
+                  style="width: 100%"
+                  :border="option.border">
+          <el-table-column type="selection" v-if="option.selection" width="55" align="center"></el-table-column>
+          <el-table-column type="expand" v-if="option.expand" align="center"></el-table-column>
+          <el-table-column v-if="option.index" label="#" type="index" width="50" align="center">
+          </el-table-column>
+          <template v-for="(item,index) in option.column">
+            <!-- table字段 -->
+            <el-table-column v-if="item.hide!==true"
+                             :prop="item.prop"
+                             :label="item.label"
+                             :width="item.width"
+                             :key="index">
+            </el-table-column>
+          </template>
+          <!-- 操作栏模块 -->
+          <el-table-column prop="menu" label="操作" :width="220" align="center">
+            <template #="{row}">
+              <el-button type="primary" text icon="el-icon-view" @click="handleView(row)">查看</el-button>
+              <el-button type="primary" text icon="el-icon-edit" @click="handleEdit(row)">编辑</el-button>
+              <el-button type="primary" text icon="el-icon-delete" @click="rowDel(row)">删除</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-row>
+      <el-row>
+        <div class="avue-crud__pagination" style="width:100%">
+          <!-- 分页模块 -->
+          <el-pagination align="right"
+                         background
+                         @size-change="sizeChange"
+                         @current-change="currentChange"
+                         :current-page="page.currentPage"
+                         :page-sizes="[10, 20, 30, 40, 50, 100]"
+                         :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-form :disabled="view" ref="form" :model="form" label-width="80px">
+          <!-- 表单字段 -->
+          <el-form-item label="预约ID" prop="reservationId">
+            <el-input v-model="form.reservationId" placeholder="请输入预约ID"/>
+          </el-form-item>
+          <el-form-item label="配送管理ID" prop="deliveryListId">
+            <el-input v-model="form.deliveryListId" placeholder="请输入配送管理ID"/>
+          </el-form-item>
+          <el-form-item label="包件ID" prop="packageId">
+            <el-input v-model="form.packageId" placeholder="请输入包件ID"/>
+          </el-form-item>
+          <el-form-item label="订单ID" prop="stockArticleId">
+            <el-input v-model="form.stockArticleId" placeholder="请输入订单ID"/>
+          </el-form-item>
+          <el-form-item label="扫描操作人" prop="sacnUser">
+            <el-input v-model="form.sacnUser" placeholder="请输入扫描操作人"/>
+          </el-form-item>
+          <el-form-item label="扫描操作时间" prop="scanTime">
+            <el-input v-model="form.scanTime" placeholder="请输入扫描操作时间"/>
+          </el-form-item>
+          <el-form-item label="包条码" prop="packageCode">
+            <el-input v-model="form.packageCode" placeholder="请输入包条码"/>
+          </el-form-item>
+          <el-form-item label="车次号" prop="trainNumber">
+            <el-input v-model="form.trainNumber" placeholder="请输入车次号"/>
+          </el-form-item>
+          <el-form-item label="司机ID" prop="driverId">
+            <el-input v-model="form.driverId" placeholder="请输入司机ID"/>
+          </el-form-item>
+          <el-form-item label="司机名称" prop="driverName">
+            <el-input v-model="form.driverName" placeholder="请输入司机名称"/>
+          </el-form-item>
+          <el-form-item label="车辆ID" prop="vehicleId">
+            <el-input v-model="form.vehicleId" placeholder="请输入车辆ID"/>
+          </el-form-item>
+          <el-form-item label="车牌号" prop="vehicleName">
+            <el-input v-model="form.vehicleName" placeholder="请输入车牌号"/>
+          </el-form-item>
+          <el-form-item label="司机电话" prop="driverPhone">
+            <el-input v-model="form.driverPhone" placeholder="请输入司机电话"/>
+          </el-form-item>
+          <el-form-item label="仓库Id" prop="warehouseId">
+            <el-input v-model="form.warehouseId" placeholder="请输入仓库Id"/>
+          </el-form-item>
+          <el-form-item label="仓库名称" prop="warehouseName">
+            <el-input v-model="form.warehouseName" placeholder="请输入仓库名称"/>
+          </el-form-item>
+          <el-form-item label="审核人" prop="auditingUser">
+            <el-input v-model="form.auditingUser" placeholder="请输入审核人"/>
+          </el-form-item>
+          <el-form-item label="审核时间" prop="auditingTime">
+            <el-input v-model="form.auditingTime" placeholder="请输入审核时间"/>
+          </el-form-item>
+          <el-form-item label="包件配送类型 1 - 商配 2-市配" prop="deliveryType">
+            <el-input v-model="form.deliveryType" placeholder="请输入包件配送类型 1 - 商配 2-市配"/>
+          </el-form-item>
+          <el-form-item label="备注" prop="remarks">
+            <el-input v-model="form.remarks" placeholder="请输入备注"/>
+          </el-form-item>
+          <el-form-item label="审核状态 1-未审核 2- 已审核 3 - 异常" prop="auditingStatus">
+            <el-input v-model="form.auditingStatus" placeholder="请输入审核状态 1-未审核 2- 已审核 3 - 异常"/>
+          </el-form-item>
+          <el-form-item label="装车数量" prop="loadingQuantity">
+            <el-input v-model="form.loadingQuantity" placeholder="请输入装车数量"/>
+          </el-form-item>
+          <el-form-item label="预留1" prop="reserve1">
+            <el-input v-model="form.reserve1" placeholder="请输入预留1"/>
+          </el-form-item>
+          <el-form-item label="预留2" prop="reserve2">
+            <el-input v-model="form.reserve2" placeholder="请输入预留2"/>
+          </el-form-item>
+          <el-form-item label="预留3" prop="reserve3">
+            <el-input v-model="form.reserve3" placeholder="请输入预留3"/>
+          </el-form-item>
+          <el-form-item label="预留4" prop="reserve4">
+            <el-input v-model="form.reserve4" placeholder="请输入预留4"/>
+          </el-form-item>
+          <el-form-item label="预留5" prop="reserve5">
+            <el-input v-model="form.reserve5" placeholder="请输入预留5"/>
+          </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="box = false">取 消</el-button>
+          </span>
+        </template>
+      </el-dialog>
+    </div>
+  </basic-container>
+</template>
+
+<script>
+import { getList, getDetail, add, update, remove } from "@/api/distribution/distributionLoadscanAbnormal";
+import option from "@/option/distribution/distributionLoadscanAbnormal";
+import { mapGetters } from "vuex";
+
+export default {
+  data () {
+    return {
+      height: 0,
+      // 弹框标题
+      title: '',
+      // 是否展示弹框
+      box: false,
+      // 是否显示查询
+      search: true,
+      // 加载中
+      loading: true,
+      // 是否为查看模式
+      view: false,
+      // 查询信息
+      query: {},
+      // 分页信息
+      page: {
+        currentPage: 1,
+        pageSize: 10,
+        total: 40
+      },
+      // 表单数据
+      form: {},
+      // 选择行
+      selectionList: [],
+      // 表单配置
+      option: option,
+      // 表单列表
+      data: [],
+    }
+  },
+  mounted () {
+    this.init();
+    this.onLoad(this.page);
+  },
+  computed: {
+    ...mapGetters(["permission"]),
+    ids () {
+      let ids = [];
+      this.selectionList.forEach(ele => {
+        ids.push(ele.id);
+      });
+      return ids.join(",");
+    }
+  },
+  methods: {
+    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);
+    },
+    handleSubmit () {
+      if (!this.form.id) {
+        add(this.form).then(() => {
+          this.box = false;
+          this.onLoad(this.page);
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          });
+        });
+      } else {
+        update(this.form).then(() => {
+          this.box = false;
+          this.onLoad(this.page);
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          });
+        })
+      }
+    },
+    handleAdd () {
+      this.title = '新增'
+      this.form = {}
+      this.box = true
+    },
+    handleEdit (row) {
+      this.title = '编辑'
+      this.box = true
+      getDetail(row.id).then(res => {
+        this.form = res.data.data;
+      });
+    },
+    handleView (row) {
+      this.title = '查看'
+      this.view = true;
+      this.box = true;
+      getDetail(row.id).then(res => {
+        this.form = res.data.data;
+      });
+    },
+    handleDelete () {
+      if (this.selectionList.length === 0) {
+        this.$message.warning("请选择至少一条数据");
+        return;
+      }
+      this.$confirm("确定将选择数据删除?", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          return remove(this.ids);
+        })
+        .then(() => {
+          this.selectionClear();
+          this.onLoad(this.page);
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          });
+        });
+    },
+    rowDel (row) {
+      this.$confirm("确定将选择数据删除?", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          return remove(row.id);
+        })
+        .then(() => {
+          this.onLoad(this.page);
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          });
+        });
+    },
+    beforeClose (done) {
+      done()
+      this.form = {};
+      this.view = false;
+    },
+    selectionChange (list) {
+      this.selectionList = list;
+    },
+    selectionClear () {
+      this.selectionList = [];
+      this.$refs.table.clearSelection();
+    },
+    currentChange (currentPage) {
+      this.page.currentPage = currentPage;
+      this.onLoad(this.page);
+    },
+    sizeChange (pageSize) {
+      this.page.pageSize = pageSize;
+      this.onLoad(this.page);
+    },
+    onLoad (page, params = {}) {
+      this.loading = true;
+      getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+        const data = res.data.data;
+        this.page.total = data.total;
+        this.data = data.records;
+        this.loading = false;
+        this.selectionClear();
+      });
+    }
+  }
+};
+</script>
diff --git a/src/views/distribution/reservation/atlas.vue b/src/views/distribution/reservation/atlas.vue
index 2bc04aa0..4b9fff68 100644
--- a/src/views/distribution/reservation/atlas.vue
+++ b/src/views/distribution/reservation/atlas.vue
@@ -8,11 +8,15 @@
         <div class="maplists">
           <el-scrollbar>
             <div class="mbx">
-              <el-text v-for="item in datalists" class="mx-1 txbx" type="primary">
+              <el-checkbox v-for="item in datalists" 
+              v-model="item.isck" 
+              :label="`${ item.content }--时间:${ item.time }--距离:${ item.distance }公里(${item.items.reservationNum+item.items.reservationStockListNum}件)`" 
+              size="large" />
+              <!-- <el-text class="mx-1 txbx" type="primary">
                 {{ item.content }}--时间:{{ item.time }}--距离:{{ item.distance }}公里({{
                   item.items.handQuantity
                 }}件)
-              </el-text>
+              </el-text> -->
             </div>
           </el-scrollbar>
         </div>
@@ -57,7 +61,7 @@ onMounted(() => {
 watchEffect(() => {
   console.log(router.currentRoute.value.query.id);
   details.item = router.currentRoute.value.query.id;
-  if(!details.item)return
+  if (!details.item) return;
   getReservationAddr(details.item).then(res => {
     // selectStockArticleAtlasInfo(details.item.id).then(res => {
     console.log(res.data.data);
@@ -89,14 +93,23 @@ function initmap() {
   });
 }
 function checkgoto() {
-      let ids = details.item;
-      router.push({
-        path: '/distribution/turndelivery/deliveryMarket',
-        query: {
-          id: ids,
-          name: '市配计划',
-        },
-      });
+  let ids = []
+  details.datalists.map(item=>{
+    if(item.isck){
+      ids.push(item.items.id)
+    }
+  })
+  if(ids.length==0){
+    return
+  }
+  let stids=ids.join(',')
+  router.push({
+    path: '/distribution/turndelivery/deliveryMarket',
+    query: {
+      id: stids,
+      name: '市配计划',
+    },
+  });
 }
 function init(data) {
   // maplabel()
@@ -173,6 +186,7 @@ function Driving(geocodess) {
           // console.log(result.routes[0]);
           item.time = formatSeconds(result.routes[0].time);
           item.distance = result.routes[0].distance / 1000;
+          item.isck=true
           // item.distance=result.routes[0].distance/1000
           details.datalists.push(item);
         } else {
diff --git a/src/views/distribution/reservation/reservation.vue b/src/views/distribution/reservation/reservation.vue
index acaa41fc..e2579d0b 100644
--- a/src/views/distribution/reservation/reservation.vue
+++ b/src/views/distribution/reservation/reservation.vue
@@ -41,8 +41,7 @@
                             <div class="avue-crud__left">
                                 <el-button type="primary" icon="el-icon-plus" @click="handleAdd"
                                 >添加预约
-                                </el-button
-                                >
+                                </el-button>
                                 <el-button
                                         v-if="this.query.reservationStatus === '1'"
                                         type="danger"
@@ -206,6 +205,14 @@
                                         plain
                                 >批量转配送
                                 </el-button>
+                                <el-button
+                                        v-if="this.query.reservationStatus === '2'"
+                                        type="danger"
+                                        icon="el-icon-delete"
+                                        @click="batchPrintData"
+                                        plain
+                                >批量打印
+                                </el-button>
                             </div>
                             <!-- 头部右侧按钮模块 -->
                             <div class="avue-crud__right">
@@ -262,6 +269,15 @@
                                 >确认预约
                                 </el-text
                                 >
+                                 <el-text
+                                        size="small"
+                                        type="primary"
+                                        link
+                                        icon="el-icon-view"
+                                        @click="printData(slotProps.scope)"
+                                >打印
+                                </el-text
+                                >
                             </template>
                         </tablecmt>
                         <!--        <el-popover :visible="visible" placement="top-start" :width="160">-->
@@ -328,6 +344,17 @@
                     </el-pagination>
                 </div>
             </el-row>
+
+            <el-dialog title="二维码" :visible.sync="dialogVisible" width="780px" v-model="dialogVisible">
+              <div>
+                <div v-html="html"></div>
+              </div>
+              <span slot="footer" class="dialog-footer">
+                <!--    <el-button type="primary" @click="ddd">导 出</el-button>-->
+                <el-button type="primary" @click="printTemplate">打 印</el-button>
+                <el-button @click="dialogVisible = false">取 消</el-button>
+              </span>
+            </el-dialog>
         </div>
     </basic-container>
     <edittablehead
@@ -395,7 +422,8 @@
     remove,
     confirms,
     addReservations,
-    cancelReservation
+    cancelReservation,
+    patchPrintList
   } from '@/api/distribution/distributionReservation';
   import option from '@/option/distribution/distributionReservation';
   import { mapGetters } from 'vuex';
@@ -406,10 +434,15 @@
   import { getListTeam } from '@/api/basicdata/basicdataTeamGroup';
   import { stockUp } from '@/api/basicdata/basicdataGoodsArea';
   import dayjs from 'dayjs';
+  import print from '@/utils/print';
 
   export default {
     data() {
       return {
+        // 弹出框是否显示
+        dialogVisible: false,
+        // 打印模版的html
+        html: '',
         columnList: [
           {
             prop: '',
@@ -1093,6 +1126,9 @@
         this.height = this.setPx(document.body.clientHeight - 340);
       },
       handleClick() {
+        // 切换选项卡时, 清空备选中的数组
+        this.selectionList = []
+
         if (this.activeName == 'yescheck') {
           this.activeName = 'nocheck';
         } else if (this.activeName == 'nocheck') {
@@ -1511,12 +1547,73 @@
           this.loading = false;
           this.selectionClear();
         });
-      }
+      },
+
+      /**
+       * 请求打印模版
+       */
+      async batchPrint(ids){
+        const res = await patchPrintList({ids: ids.join(',')})
+        return res
+      },
+
+      /**
+       * 批量打印
+       */
+      async batchPrintData(){
+        if(this.selectionList.length === 0) {
+          this.$message({
+            type: "error",
+            message: "最少选择一条数据哦"
+          })
+          return
+        }
+        const ids = this.selectionList.map(item => item.id)
+        const res = await this.batchPrint(ids)
+        const {code, data} = res.data
+        if(code === 200){
+          this.dialogVisible = true
+          console.log('data :>> ', data);
+          this.html = '';
+          data.forEach(item => {
+            return this.html += item.templateHtml
+          })
+        this.html ;
+        }
+      },
+
+      /**
+       * 单独打印
+       */
+      async printData(rowData){
+        const res = await this.batchPrint([rowData.row.id])
+        const {code, data} = res.data
+        if(code === 200){
+          this.dialogVisible = true
+          console.log('data :>> ', data);
+          this.html = '';
+          data.forEach(item => {
+            return this.html += item.templateHtml
+          })
+        this.html ;
+        }
+      },
+
+      /**
+       * 调用打印机
+       */
+      printTemplate() {
+        const orderNodeList = document.querySelectorAll('.el-dialog__body>div>div>div');
+        print(orderNodeList);
+      },
     }
   };
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
     // .el-tab-pane{
     //   margin-top: -20px;
     // }
+  :deep(.el-dialog){
+    width: fit-content !important;
+  }
 </style>
\ No newline at end of file
diff --git a/src/views/distribution/reservation/reservationAddFrom.vue b/src/views/distribution/reservation/reservationAddFrom.vue
index 38b19a65..176fed68 100644
--- a/src/views/distribution/reservation/reservationAddFrom.vue
+++ b/src/views/distribution/reservation/reservationAddFrom.vue
@@ -136,14 +136,24 @@
                             @selection="selectionChange"
                     >
                         <template #default="slotProps">
-                            <el-text
+
+
+                            <el-text v-if="slotProps.scope.row.resource !=='零担'"
                                     type="primary"
                                     link
                                     icon="el-icon-view"
                                     @click="viewStockArticlePackage(slotProps.scope.row)"
                             >查看包件
-                            </el-text
-                            >
+                            </el-text>
+                            <el-text v-else
+                                    type="primary"
+                                    link
+                                    icon="el-icon-view"
+                                    @click="viewStockArticlePackage(slotProps.scope.row)"
+                            >录入数量
+                            </el-text>
+
+
                             <el-text
                                     type="primary"
                                     link
@@ -364,16 +374,12 @@
 
             <el-dialog v-model="isaddvalue" title="包件信息" width="100%" :model="addvalue">
                 <!-- 列表模块 -->
+<!--                :isselectfun="checkPackage"-->
                 <tablecmt
                         :columnList="columnParcels"
                         :tableData="packageData"
-                        :checkselect="packageData"
-                        :isselectfun="checkPackage"
+                        :checkselect="packageDataSec"
                         :loading="loading"
-                        @inputTxt="inputsc"
-                        @timeCheck="timesc"
-                        @btnCheck="btnsc"
-                        @selectCheck="selectsc"
                         @selection="selectionPackageChange"
                 >
                     <template #default="slotProps">
@@ -599,6 +605,17 @@
             sortable: true,
             head: false
           },
+          {
+            prop: 'resource',
+            label: '订单来源',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false
+          },
           {
             prop: 'descriptionGoods',
             label: '货物名称',
@@ -664,6 +681,17 @@
             fixed: false,
             sortable: true,
             head: false
+          },
+           {
+            prop: 'reservationNum',
+            label: '预约数量',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false
           },
           {
             prop: 'customerName',
@@ -1252,18 +1280,7 @@
           },
           {
             prop: 'cargoNumber',
-            label: '货物编号',
-            type: 2,
-            values: '',
-            width: '150',
-            checkarr: [],
-            fixed: false,
-            sortable: true,
-            head: false
-          },
-          {
-            prop: 'materialId',
-            label: '物料ID',
+            label: '物料编码',
             type: 2,
             values: '',
             width: '150',
@@ -1272,6 +1289,17 @@
             sortable: true,
             head: false
           },
+          // {
+          //   prop: 'materialId',
+          //   label: '物料ID',
+          //   type: 2,
+          //   values: '',
+          //   width: '150',
+          //   checkarr: [],
+          //   fixed: false,
+          //   sortable: true,
+          //   head: false
+          // },
           {
             prop: 'descriptionGoods',
             label: '物料名称',
@@ -1668,6 +1696,10 @@
         orderIds: '',
         //预约编号
         reservationId: '',
+        // 商城名称
+        marketName: '',
+        // 包件复选框列表
+        packageDataSec: [],
         inventoryData: [],
         orderData: [],
         stockListShow: false,
@@ -1808,7 +1840,11 @@
               item.applyNum = item.quantityStock - item.quantityOccupied;
             });
             this.page.total = inventoryList.total;
-            this.inventoryInfo = inventoryList.records;
+            console.log('res :>> ', res);
+            this.inventoryInfo = inventoryList.records.filter(value=>{
+              if(this.marketName === '')return value
+              return value.marketName === this.marketName
+            });
             //存在库存品，需要将库存品进行回显勾选
             if (this.inventoryData) {
               this.inventoryInfo.forEach((item, index) => {
@@ -1906,19 +1942,19 @@
         this.loading = true;
         this.packageList = row.packageList;
         this.obj = row;
-        console.log('>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>', row);
+        console.log('row>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>', row);
         if (this.reservationId) {
           //这里就是编辑的数据回显问题
           let packageInfo = row.parcelListVOS;
           // this.packageData = row.parcelListVOS;
           let packageListData = this.packageData;
-          if (row.packageList) {
+          if (row.packageList.length>0) {
             let packageListInfo = row.packageList;
             packageInfo.forEach((item, index) => {
               packageListInfo.forEach(p => {
                 if (item.id === p.id) {
                   this.$nextTick(() => {
-                    // this.$refs.packageList.toggleRowSelection(this.packageData[index], true);
+                    this.$refs.packageList.toggleRowSelection(this.packageData[index], true);
                   });
                 }
               });
@@ -1932,8 +1968,19 @@
             });
           }
           this.packageData = row.parcelListVOS;
+          
+          // 当row内packageList为空时, 默认全选
+          if(row.packageList.length === 0) {
+            this.packageDataSec = row.parcelListVOS
+          }else{
+            this.packageDataSec = row.parcelListVOS.filter(item => {
+              return row.packageList.some( value => value.id === item.id)
+            });
+          }
+
         } else {
           this.packageData = row.parcelListVOS;
+          this.packageDataSec = row.parcelListVOS;
           //这里回显展示的效果应该是展示被其他预约单勾选的订单处于禁用勾选，冻结订单处于禁用无法勾选，其他默认为全选
           let data = row.parcelListVOS;
           data.forEach((item, index) => {
@@ -1945,8 +1992,8 @@
               this.$nextTick(() => {
                 this.$refs.packageList.toggleRowSelection(this.packageData[index], true);
               });
-              console.log('::', item);
-              this.checkPackage(item, index);
+              // console.log('::', item);
+              // this.checkPackage(item, index);
             } else if (
               item.orderPackageFreezeStatusName !== '已冻结' ||
               item.orderPackageFreezeStatus !== '20'
@@ -1964,14 +2011,14 @@
         //区分编辑还是新增
         //编辑需要对这个预约单下的包件信息均可进行调整
         console.log(row, 'rowrowrowrowrowrow');
-        if (!this.reservationId) {
-          if (
-            row.orderPackageReservationStatusName === '已预约' ||
-            row.orderPackageReservationStatusName === '20'
-          ) {
-            return true;
-          }
-        }
+        // if (!this.reservationId) {
+        //   if (
+        //     row.orderPackageReservationStatusName === '已预约' ||
+        //     row.orderPackageReservationStatusName === '20'
+        //   ) {
+        //     return true;
+        //   }
+        // }
         if (row.orderPackageFreezeStatus === '10' || row.orderPackageFreezeStatusName === '已冻结') {
           return false;
         } else {
@@ -2028,13 +2075,13 @@
         this.handleAddInventory();
       },
       onSubmitPackage() {
-        if (this.packageList.length === 0) {
+        if (this.packageDataSec.length === 0) {
           this.$message.warning('请选择包件!!!');
           return;
         }
         this.orderData.forEach(item => {
           if (item.id === this.obj.id) {
-            item.packageList = this.packageList;
+            item.packageList = this.packageDataSec;
           }
         });
         console.log('this.orderData------------>', this.orderData);
@@ -2148,6 +2195,10 @@
           }
           console.log(item);
         });
+        // 当两个列表没有数据时, 清空限制
+        if(this.inventoryData.length === 0 && this.orderData.length === 0) this.marketName = ''
+        // 当列表没有数据时, 表单清空
+        if(this.orderData.length === 0) this.form = {}
         console.log('>>>>>>>>>>>>>>>row', row);
       },
       removeStockList(row) {
@@ -2159,8 +2210,10 @@
           if (item.id === row.id) {
             this.inventoryData.splice(index, 1);
           }
-          console.log(item);
+          console.log('item>>>>>>>>>>>',item);
         });
+        // 当两个列表没有数据时, 清空限制
+        if(this.inventoryData.length === 0 && this.orderData.length === 0) this.marketName = ''
         console.log('>>>>>>>>>>>>>>>row', row);
       },
       showStockListEdit(row) {
@@ -2209,7 +2262,7 @@
       selectionPackageChange(list) {
         console.log('-----------<>', list);
         if (this.reservationId) {
-          this.packageList = list;
+          this.packageDataSec = list;
         } else {
           //新增
           let a = [];
@@ -2222,7 +2275,7 @@
               a.push(item);
             }
           });
-          this.packageList = a;
+          this.packageDataSec = a;
         }
       },
       selectionInventoryChange(list) {
@@ -2253,6 +2306,18 @@
             return;
           }
         });
+        console.log('this.inventoryList :>> ', this.inventoryList);
+        // 检测商场是否选择统一商场
+        let _marketName = ''
+        const _isUnifyMarketName = this.inventoryList.every(value => {
+          if (_marketName === '') _marketName = value.marketName
+          return _marketName === value.marketName 
+        })
+        if(!_isUnifyMarketName){
+          this.$message.warning('请选择统一商场!!!');
+          return;
+        }
+        this.marketName = _marketName
         this.inventoryData = this.inventoryList;
 
         // if (this.orderData.length) {
@@ -2307,6 +2372,9 @@
           }
         }
 
+        // 设置商场名称
+        this.marketName = list[0].marketName
+
         this.form.consignee = name;
         this.form.deliveryAddress = address;
         this.form.deliveryPhone = phone;
@@ -2324,6 +2392,9 @@
             this.stockArticleInfo.splice(index, 1);
           });
         });
+
+
+
         if (this.orderData.length >= 1) {
           let newDate1 = this.orderData.map(item => {
             // map遍历本地数据
@@ -2341,8 +2412,18 @@
           }
           console.log('this.orderData------------->', this.orderData);
         } else {
+
           this.orderData = this.orderList;
         }
+
+
+        this.orderData.forEach(a=>{
+          a.reservationNum= a.handQuantity
+
+        })
+
+
+
         // this.orderData.push(info);
         this.orderShow = false;
       },
@@ -2387,8 +2468,9 @@
           this.reservationId,
           Object.assign(params, this.query)
         ).then(res => {
-          console.log('res------------>', res);
+          console.log('res123123------------>', res);
           const data = res.data.data;
+          console.log('data :>> ', data);
           this.stockArticleInfo = data.records;
           this.stockArticleInfo.forEach((item, index) => {
             //检查订单是否冻结
@@ -2474,9 +2556,16 @@
           page.pageSize,
           Object.assign(params, this.query)
         ).then(res => {
-          console.log('res------------>', res);
-          const data = res.data.data;
-          this.stockArticleInfo = data.records;
+          console.log('res123------------>', res);
+          const {records, total} = res.data.data;
+          this.stockArticleInfo = records.filter(value => {
+            if(this.marketName === '') return value
+            if(this.marketName) {
+              console.log('value.marketName :>> ', value.marketName);
+              return value.mallName === this.marketName
+            }
+          });
+          console.log('this.stockArticleInfo :>> ', this.stockArticleInfo);
           this.stockArticleInfo.forEach((item, index) => {
             //检查订单是否冻结
             this.checkOrder(item, index);
@@ -2491,7 +2580,7 @@
             // }else {
             //   this.orderList = [];
             // }
-            this.page.total = data.total;
+            this.page.total = total;
           });
           this.orderList = [];
         });
@@ -2540,7 +2629,9 @@
             // stockArticleListInfo.forEach(item=>{
             //
             // })
-            console.log('>>>>>>>>', reservation);
+            console.log('reservation>>>>>>>>', reservation);
+            // 添加限制的商场名称
+            this.marketName = reservation.mallName;
             this.orderData = reservation.stockArticleList;
             this.inventoryData = reservation.inventoryList;
             this.inventoryData.forEach(item => {
@@ -2564,7 +2655,7 @@
     }
   };
 </script>
-<style>
+<style lang="scss">
     input::-webkit-outer-spin-button,
     input::-webkit-inner-spin-button {
         -webkit-appearance: none;
diff --git a/src/views/distribution/reservation/reservationDetails.vue b/src/views/distribution/reservation/reservationDetails.vue
index 98d6a653..c3248ba1 100644
--- a/src/views/distribution/reservation/reservationDetails.vue
+++ b/src/views/distribution/reservation/reservationDetails.vue
@@ -675,7 +675,7 @@
             head: false
           },
           {
-            prop: 'orderCode',
+            prop: 'sku',
             label: 'SKU码',
             type: 2,
             values: '',
@@ -686,8 +686,18 @@
             head: false
           },
           {
-            prop: 'orderCode',
-            label: '物料名称',
+            prop: 'marketName',
+            label: '商场名称',
+            type: 2,
+            values: '',
+            width: '160',
+            checkarr: [],
+            fixed: false,
+            sortable: true
+          },
+          {
+            prop: 'cargoNumber',
+            label: '物料编码',
             type: 2,
             values: '',
             width: '160',
@@ -707,7 +717,7 @@
           },
           {
             prop: 'descriptionGoods',
-            label: '库存品名称',
+            label: '物料名称',
             type: 2,
             values: '',
             width: '160',
@@ -724,7 +734,8 @@
             checkarr: [],
             fixed: false,
             sortable: true
-          },{
+          },
+          {
             prop: 'reservationNum',
             label: '预约数量',
             type: 2,
@@ -734,6 +745,7 @@
             fixed: false,
             sortable: true
           },
+
           {
             prop: 'orderCode',
             label: '备货件数',
@@ -745,7 +757,7 @@
             sortable: true
           },
           {
-            prop: 'orderCode',
+            prop: 'stockupNum',
             label: '已备件数',
             type: 2,
             values: '',
@@ -754,9 +766,19 @@
             fixed: false,
             sortable: true
           },
+          // {
+          //   prop: 'orderCode',
+          //   label: '备货时间',
+          //   type: 2,
+          //   values: '',
+          //   width: '160',
+          //   checkarr: [],
+          //   fixed: false,
+          //   sortable: true
+          // },
           {
-            prop: 'orderCode',
-            label: '备货时间',
+            prop: 'stockupArea',
+            label: '备货区',
             type: 2,
             values: '',
             width: '160',
@@ -765,7 +787,7 @@
             sortable: true
           },
           {
-            prop: 'orderCode',
+            prop: '',
             label: '托盘码',
             type: 2,
             values: '',
@@ -775,7 +797,7 @@
             sortable: true
           },
           {
-            prop: 'orderCode',
+            prop: '',
             label: '库位信息',
             type: 2,
             values: '',
@@ -784,16 +806,6 @@
             fixed: false,
             sortable: true
           },
-          {
-            prop: 'orderCode',
-            label: '备货区',
-            type: 2,
-            values: '',
-            width: '160',
-            checkarr: [],
-            fixed: false,
-            sortable: true
-          },
           {
             prop: '',
             label: '操作',
diff --git a/src/views/distribution/signdetail/distributionSigndetail.vue b/src/views/distribution/signdetail/distributionSigndetail.vue
index cec0a93f..740c37f6 100644
--- a/src/views/distribution/signdetail/distributionSigndetail.vue
+++ b/src/views/distribution/signdetail/distributionSigndetail.vue
@@ -142,17 +142,6 @@ export default {
           sortable: true,
           head: false,
         },
-        // {
-        //   prop: 'noteNumber',
-        //   label: '配送单号',
-        //   type: 2,
-        //   values: '',
-        //   width: '150',
-        //   checkarr: [],
-        //   fixed: true,
-        //   sortable: true,
-        //   head: false,
-        // },
         {
           prop: 'trainNumber',
           label: '配送车次号',
@@ -170,7 +159,16 @@ export default {
           type: 3,
           values: '',
           width: '130',
-          checkarr: [],
+          checkarr: [
+            {
+              value: '2',
+              label: '市配',
+            },
+            {
+              value: '1',
+              label: '商配',
+            },
+          ],
           fixed: false,
           sortable: true,
         },
@@ -195,16 +193,16 @@ export default {
           fixed: false,
           sortable: true,
         },
-        {
-          prop: 'descriptionGoods',
-          label: '货物名称',
-          type: 2,
-          values: '',
-          width: '130',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-        },
+        // {
+        //   prop: 'descriptionGoods',
+        //   label: '货物名称',
+        //   type: 2,
+        //   values: '',
+        //   width: '130',
+        //   checkarr: [],
+        //   fixed: false,
+        //   sortable: true,
+        // },
         {
           prop: 'warehouse',
           label: '仓库',
@@ -277,6 +275,16 @@ export default {
           fixed: false,
           sortable: true,
         },
+        {
+          prop: 'signfornum',
+          label: '签收件数',
+          type: 2,
+          values: '',
+          width: '130',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
         {
           prop: 'completeSet',
           label: '是否齐套',
@@ -627,7 +635,7 @@ export default {
     selectionClear () {
       this.selectionList = [];
       // this.$refs.table.clearSelection();
-      
+
     },
     currentChange (currentPage) {
       this.page.currentPage = currentPage;
diff --git a/src/views/distribution/signdetail/distributionSigndetaledt.vue b/src/views/distribution/signdetail/distributionSigndetaledt.vue
index 1d5ff23c..19b33f02 100644
--- a/src/views/distribution/signdetail/distributionSigndetaledt.vue
+++ b/src/views/distribution/signdetail/distributionSigndetaledt.vue
@@ -783,6 +783,7 @@ export default {
     //包件列表
     handlePackage(page){
       let params={}
+      console.log(11111,22222,">>>>>>>>>>>>>>>>>")
       params.deliveryId =  this.orderdata.id
       getpackdetail(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
         console.log("查看>>>>>包间>>",res.data.data);
@@ -943,6 +944,8 @@ export default {
       this.getWrapdetails(this.wpage)
     },
     onLoad() {
+      console.log("初始化执行")
+      console.log('this.$route.query :>> ', this.$route.query);
       //查询详情
       const data = decodeURIComponent(this.$route.query.data);
       this.orderdata = JSON.parse(data);
@@ -954,7 +957,7 @@ export default {
         const data = res.data.data
         this.wpage.total = data.total;
         this.packdata = data.records
-
+        this.data = this.packdata
       });
       this.loading = false;
     }
diff --git a/src/views/distribution/signfor/distributionSignforedt.vue b/src/views/distribution/signfor/distributionSignforedt.vue
index 17002341..62bd130e 100644
--- a/src/views/distribution/signfor/distributionSignforedt.vue
+++ b/src/views/distribution/signfor/distributionSignforedt.vue
@@ -3,15 +3,9 @@
     <div class="avue-crud">
       <el-row :gutter="24" class="rows">
         <el-col :xl="7" :lg="7" :md="8" :sm="24">
-          <el-steps :active="stepActive" finish-status="success" process-status="finish">
-            <!-- 步骤条 -->
-            <el-step
-              v-for="step in stepsList"
-              :key="step.title"
-              :icon="step.icon"
-              :title="step.title"
-            />
-          </el-steps>
+          <span style="padding-left: 10%"
+            >当前签收单状态>>>>>>>>> {{ signfordata.signingStatusAll }}</span
+          >
         </el-col>
       </el-row>
       <el-divider>基本信息</el-divider>
@@ -25,9 +19,36 @@
         <el-col :xl="5" :lg="7" :md="8" :sm="24">
           <span>预约时间：{{ signfordata.reservationDate }} </span>
         </el-col>
-        <el-col :xl="3" :lg="7" :md="8" :sm="24">
-          <span>服务类型：{{ signfordata.deliveryType }}</span>
+        <!--                <el-col :xl="3" :lg="7" :md="8" :sm="24">-->
+        <!--                    <span>配送车次：{{signfordata.deliveryType}}</span>-->
+        <!--                </el-col>-->
+        <!--                <el-col :xl="3" :lg="7" :md="8" :sm="24">-->
+        <!--                    <span>服务类型：{{signfordata.deliveryType}}</span>-->
+        <!--                </el-col>-->
+      </el-row>
+      <el-divider>配送信息</el-divider>
+      <el-row :gutter="24" class="rows">
+        <el-col :xl="5" :lg="7" :md="8" :sm="24">
+          <span>配送车次：{{ signfordata.trainNumber }} </span>
         </el-col>
+        <el-col :xl="5" :lg="7" :md="8" :sm="24">
+          <span>配送司机：{{ signfordata.driverName }} </span>
+        </el-col>
+        <el-col :xl="4" :lg="7" :md="8" :sm="24">
+          <span>配送车辆：{{ signfordata.vehicleName }} </span>
+        </el-col>
+        <el-col :xl="5" :lg="7" :md="8" :sm="24">
+          <span>装车班组：{{ signfordata.loadingTeamName }} </span>
+        </el-col>
+        <el-col :xl="5" :lg="7" :md="8" :sm="24">
+          <span>卸车班组：{{ signfordata.unLoadingTeamName }} </span>
+        </el-col>
+        <!--                <el-col :xl="3" :lg="7" :md="8" :sm="24">-->
+        <!--                    <span>配送车次：{{signfordata.deliveryType}}</span>-->
+        <!--                </el-col>-->
+        <!--                <el-col :xl="3" :lg="7" :md="8" :sm="24">-->
+        <!--                    <span>服务类型：{{signfordata.deliveryType}}</span>-->
+        <!--                </el-col>-->
       </el-row>
       <el-divider>收货人信息</el-divider>
       <el-row :gutter="24" class="rows">
@@ -46,7 +67,7 @@
           <span>是否加急：{{ signfordata.isUrgent }} </span>
         </el-col>
         <el-col :xl="7" :lg="7" :md="10" :sm="24">
-          <span>配送备注：{{ signfordata.remarks }} </span>
+          <span>客户备注：{{ signfordata.remarks }} </span>
         </el-col>
       </el-row>
       <el-dialog v-model="fbox" title="增值服务" width="30%">
@@ -1617,6 +1638,7 @@ export default {
         if (data.orderInfo) {
           this.orderData = data.orderInfo;
         }
+        console.log('data111>>>>>>', data);
         this.stepActive = this.stepsList.findIndex(item => item.title === data.signingStatusAll);
         this.signfordata = data;
         this.signfordata.address = 'aa';
@@ -1624,6 +1646,24 @@ export default {
         // this.getListOrders(this.page)
         this.getListPackage();
       });
+      // this.getListOrders(this.page)
+
+      this.getListPackage();
+      let a = {
+        signforId: id,
+        addvalueId: 1,
+      };
+      addvalueInfoList(a).then(res => {
+        console.log('res------------->', res.data.data);
+        const data = res.data.data;
+        if (data === null) {
+          this.addvalueData = [];
+          this.addvalueinfo = {};
+        } else {
+          this.addvalueinfo = data;
+          this.addvalueData = data.packageEntityList;
+        }
+      });
 
       this.loading = false;
     },
diff --git a/src/views/distribution/stockup/distributionStockup.vue b/src/views/distribution/stockup/distributionStockup.vue
index a60ac896..797cb0a1 100644
--- a/src/views/distribution/stockup/distributionStockup.vue
+++ b/src/views/distribution/stockup/distributionStockup.vue
@@ -602,49 +602,25 @@ export default {
     },
     //查询叉车人员
     async getFork(){
-      let ides = '';
-      let ide = {  };
-      let b = false;
       await getListUser().then(res =>{ //查询当前人信息
-        // console.log("res>>>",res.data.data);
-        if(res.data.data.userName != 'admin'){
-          b = true;
-        }
-        ides = res.data.data.tenantId;
-        this.deptId = res.data.data.deptId;
-      })
-      await getPostList(ides).then(res =>{ // 查询角色
-        // console.log("查询>>>>",res.data.data);
-        res.data.data.forEach(i =>{
-          if(i.postName == "叉车"){
-            ide = i;
-          }
-        })
-      })
-      // console.log("ied>>>>>",ide);
-      let params={
-        // postId: ide.id, //岗位
-        deptId: this.deptId, //部门
-        // roleId: '', //角色
-      }
-      if(b){
-        // console.log("进来了");
-        params.postId = ide.id;//岗位
-      }
-      getListOwn(Object.assign(params, this.query)).then(res =>{ //查询人员
-        // console.log(".............",res.data.data);
+        // console.log("查询当前人信息>>>",res.data.data);
         let fo = [];
         res.data.data.forEach( i =>{
           let a ={
             dictKey: i.id,
-            dictValue: i.name
+            dictValue: i.realName
           };
           fo.push(a);
+          if(!this.deptId){
+            this.deptId =i.deptId;
+          }
         });
         this.forkliftData = fo;
+
+        this.deptId = res.data.data.deptId;
       })
-     await this.getStorageArea();
-     await this.getTeam();
+      await this.getStorageArea();
+      await this.getTeam();
 
     },
     //查询班组
diff --git a/src/views/distribution/stockup/distributionStockupDiscuss.vue b/src/views/distribution/stockup/distributionStockupDiscuss.vue
index ece38ec0..7581883d 100644
--- a/src/views/distribution/stockup/distributionStockupDiscuss.vue
+++ b/src/views/distribution/stockup/distributionStockupDiscuss.vue
@@ -729,47 +729,22 @@ export default {
     },
     //查询叉车人员
     async getFork(){
-      let ides = '';
-      let ide = {  };
-      let b = false;
       await getListUser().then(res =>{ //查询当前人信息
-        // console.log("res>>>",res.data.data);
-        if(res.data.data.userName != 'admin'){
-          b = true;
-        }
-        ides = res.data.data.tenantId;
-        this.deptId = res.data.data.deptId;
-      })
-      await getPostList(ides).then(res =>{ // 查询角色
-        // console.log("查询>>>>",res.data.data);
-        res.data.data.forEach(i =>{
-          if(i.postName == "叉车"){
-            ide = i;
-          }
-        })
-      })
-      // console.log("ied>>>>>",ide);
-      let params={
-        // postId: ide.id, //岗位
-        deptId: this.deptId, //部门
-        // roleId: '', //角色
-      }
-      if(b){
-        // console.log("进来了");
-        params.postId = ide.id;//岗位
-      }
-      // console.log("查询人员信息",params);
-      getListOwn(Object.assign(params, this.query)).then(res =>{ //查询人员
-        // console.log(".............",res.data.data);
+        console.log("查询当前人信息>>>",res.data.data);
         let fo = [];
         res.data.data.forEach( i =>{
           let a ={
             dictKey: i.id,
-            dictValue: i.name
+            dictValue: i.realName
           };
           fo.push(a);
+          if(!this.deptId){
+            this.deptId =i.deptId;
+          }
         });
         this.forkliftData = fo;
+
+        this.deptId = res.data.data.deptId;
       })
       await this.getStorageArea();
       await this.getTeam();
diff --git a/src/views/distribution/stockup/distributionStockupMarket.vue b/src/views/distribution/stockup/distributionStockupMarket.vue
index c5f8abeb..38bce22d 100644
--- a/src/views/distribution/stockup/distributionStockupMarket.vue
+++ b/src/views/distribution/stockup/distributionStockupMarket.vue
@@ -229,7 +229,6 @@
 
 <script>
 import { getList, getDetail, add, update, remove,getListUser,addAssign } from "@/api/distribution/distributionStockup";
-import { getPostList } from '@/api/system/post';
 import { stockUp } from '@/api/basicdata/basicdataGoodsArea';
 import { getListOwn,getUser } from '@/api/system/user';
 import option from "@/option/distribution/distributionStockup";
@@ -237,6 +236,8 @@ import { mapGetters } from "vuex";
 import { getListTeam } from '@/api/basicdata/basicdataTeamGroup';
 import dayjs from 'dayjs';
 import { getDictionaryBiz } from '@/api/system/dict';
+import { getRoleTree } from '@/api/system/role';
+import { getPostList } from '@/api/system/post';
 
 export default {
   data () {
@@ -668,47 +669,22 @@ export default {
     },
     //查询叉车人员
     async getFork(){
-      let ides = '';
-      let ide = {  };
-      let b = false;
       await getListUser().then(res =>{ //查询当前人信息
-        // console.log("res>>>",res.data.data);
-        if(res.data.data.userName != 'admin'){
-          b = true;
-        }
-        ides = res.data.data.tenantId;
-        this.deptId = res.data.data.deptId;
-      })
-      await getPostList(ides).then(res =>{ // 查询角色
-        // console.log("查询>>>>",res.data.data);
-        res.data.data.forEach(i =>{
-          if(i.postName == "叉车"){
-            ide = i;
-          }
-        })
-      })
-      // console.log("ied>>>>>",ide);
-      let params={
-        // postId: ide.id, //岗位
-        deptId: this.deptId, //部门
-        // roleId: '', //角色
-      }
-      if(b){
-        // console.log("进来了");
-        params.postId = ide.id;//岗位
-      }
-      // console.log("查询人员信息",params);
-      getListOwn(Object.assign(params, this.query)).then(res =>{ //查询人员
-        // console.log(".............",res.data.data);
+        console.log("查询当前人信息>>>",res.data.data);
         let fo = [];
         res.data.data.forEach( i =>{
           let a ={
             dictKey: i.id,
-            dictValue: i.name
+            dictValue: i.realName
           };
           fo.push(a);
+          if(!this.deptId){
+            this.deptId =i.deptId;
+          }
         });
         this.forkliftData = fo;
+
+        this.deptId = res.data.data.deptId;
       })
       await this.getStorageArea();
       await this.getTeam();
@@ -770,8 +746,8 @@ export default {
       if(!a){
         this.num = '3';
         this.dialogFormCustomer = true;
-        this.getFork();
-        this.getTeam();
+        this.getFork(); //查询叉车人员
+        this.getTeam();//查询班组
       }else{
         this.$message.warning("已指派，请勿重复指派！！！")
       }
diff --git a/src/views/distribution/stockup/distributionStockupSelf.vue b/src/views/distribution/stockup/distributionStockupSelf.vue
index 4a196181..2ff0c102 100644
--- a/src/views/distribution/stockup/distributionStockupSelf.vue
+++ b/src/views/distribution/stockup/distributionStockupSelf.vue
@@ -667,47 +667,22 @@ export default {
     },
     //查询叉车人员
     async getFork(){
-      let ides = '';
-      let ide = {  };
-      let b = false;
       await getListUser().then(res =>{ //查询当前人信息
-        console.log("当前人信息res>>>",res.data.data);
-        if(res.data.data.userName != 'admin'){
-          b = true;
-        }
-        ides = res.data.data.tenantId;
-        this.deptId = res.data.data.deptId;
-      })
-      await getPostList(ides).then(res =>{ // 查询角色
-        // console.log("查询>>>>",res.data.data);
-        res.data.data.forEach(i =>{
-          if(i.postName == "叉车"){
-            ide = i;
-          }
-        })
-      })
-      // console.log("ied>>>>>",ide);
-      let params={
-        // postId: ide.id, //岗位
-        deptId: this.deptId, //部门
-        // roleId: '', //角色
-      }
-      if(b){
-        // console.log("进来了");
-        params.postId = ide.id;//岗位
-      }
-      // console.log("查询人员信息",params);
-      getListOwn(Object.assign(params, this.query)).then(res =>{ //查询人员
-        // console.log(".............",res.data.data);
+        console.log("查询当前人信息>>>",res.data.data);
         let fo = [];
         res.data.data.forEach( i =>{
           let a ={
             dictKey: i.id,
-            dictValue: i.name
+            dictValue: i.realName
           };
           fo.push(a);
+          if(!this.deptId){
+            this.deptId =i.deptId;
+          }
         });
         this.forkliftData = fo;
+
+        this.deptId = res.data.data.deptId;
       })
       await this.getStorageArea();
       await this.getTeam();
diff --git a/src/views/warehouse/updownGoods/warehouseUpdownGoodsLog.vue b/src/views/warehouse/updownGoods/warehouseUpdownGoodsLog.vue
index cf12471e..2a263cef 100644
--- a/src/views/warehouse/updownGoods/warehouseUpdownGoodsLog.vue
+++ b/src/views/warehouse/updownGoods/warehouseUpdownGoodsLog.vue
@@ -1,6 +1,17 @@
 <template>
   <basic-container>
     <div class="avue-crud">
+      <el-row>
+        <div class="avue-crud__header">
+          <!-- 头部左侧按钮模块 -->
+          <div class="avue-crud__left"></div>
+          <!-- 头部右侧按钮模块 -->
+          <div class="avue-crud__right">
+            <el-button icon="el-icon-refresh" @click="searchChange" circle></el-button>
+          </div>
+        </div>
+      </el-row>
+
       <el-tabs type="border-card">
         <el-tab-pane label="订制品">
           <el-row>
@@ -127,7 +138,14 @@
 </template>
 
 <script>
-import { getDetail, getpage, update, remove,getinventorypage,gettruckloadpage } from '@/api/warehouse/warehouseUpdownGoodsLog';
+import {
+  getDetail,
+  getpage,
+  update,
+  remove,
+  getinventorypage,
+  gettruckloadpage,
+} from '@/api/warehouse/warehouseUpdownGoodsLog';
 import option from '@/option/warehouse/warehouseUpdownGoodsLog';
 import { mapGetters } from 'vuex';
 
@@ -568,8 +586,8 @@ export default {
       option: option,
       // 表单列表
       data: [],
-      data1:[],
-      data2:[],
+      data1: [],
+      data2: [],
     };
   },
   mounted() {
@@ -664,6 +682,10 @@ export default {
     },
   },
   methods: {
+    // 局部刷新页面
+    searchChange() {
+      this.onLoad(this.page);
+    },
     showdrawer(value) {
       this.drawerShow = value;
     },
@@ -744,28 +766,32 @@ export default {
     },
     onLoad(page, params = {}, uname) {
       this.loading = true;
-      if (uname=='page1') {
-        getinventorypage(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
-          const data = res.data.data;
-          if (uname) {
-            this[uname].total = data.total;
+      if (uname == 'page1') {
+        getinventorypage(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(
+          res => {
+            const data = res.data.data;
+            if (uname) {
+              this[uname].total = data.total;
+            }
+            this.data1 = data.records;
+            this.data1 = this.$functions.newdatas(this.columnList1, this.data1);
+            this.loading = false;
+            this.selectionClear();
           }
-          this.data1 = data.records;
-          this.data1 = this.$functions.newdatas(this.columnList1, this.data1);
-          this.loading = false;
-          this.selectionClear();
-        });
-      }else if(uname=='page2'){
-        gettruckloadpage(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
-          const data = res.data.data;
-          if (uname) {
-            this[uname].total = data.total;
+        );
+      } else if (uname == 'page2') {
+        gettruckloadpage(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(
+          res => {
+            const data = res.data.data;
+            if (uname) {
+              this[uname].total = data.total;
+            }
+            this.data2 = data.records;
+            this.data2 = this.$functions.newdatas(this.columnList2, this.data2);
+            this.loading = false;
+            this.selectionClear();
           }
-          this.data2 = data.records;
-          this.data2 = this.$functions.newdatas(this.columnList2, this.data2);
-          this.loading = false;
-          this.selectionClear();
-        });
+        );
       } else {
         getpage(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
           const data = res.data.data;
diff --git a/src/views/warehouse/warehousingentry/warehouseWarehouseingAddReceipt.vue b/src/views/warehouse/warehousingentry/warehouseWarehouseingAddReceipt.vue
index d0dbb41a..6fd05995 100644
--- a/src/views/warehouse/warehousingentry/warehouseWarehouseingAddReceipt.vue
+++ b/src/views/warehouse/warehousingentry/warehouseWarehouseingAddReceipt.vue
@@ -13,7 +13,7 @@
         >
           <!-- 表单字段 -->
           <el-col :span="24">
-            <el-form-item label="入库批次" prop="receiptBatch">
+            <el-form-item label="入库批次">
               <el-input v-model="form.receiptBatch" clearable placeholder="请输入入库批次" />
             </el-form-item>
             <el-form-item label="入库时间" prop="receiptDate">
@@ -52,10 +52,10 @@
               </el-select>
             </el-form-item>
 
-            <el-form-item label="客户编码" prop="clientCode">
+            <el-form-item label="客户编码" prop="customerCode">
               <!--              <el-input v-model="form.customerName" placeholder="请输入客户名称"/>-->
               <el-select
-                v-model="form.clientCode"
+                v-model="form.customerCode"
                 filterable
                 remote
                 reserve-keyword
@@ -75,7 +75,6 @@
               </el-select>
             </el-form-item>
 
-            <!--            <el-form-item label="门店名称" prop="storeName">-->
             <el-form-item label="门店名称">
               <!--              <el-input v-model="form.storeName" placeholder="请输入门店名称"/>-->
               <el-select
@@ -98,9 +97,16 @@
             </el-form-item>
           </el-col>
           <el-col :span="24">
+            <el-form-item label="物流公司">
+              <el-input v-model="form.logisticsCompany" clearable placeholder="请输入物流公司" />
+            </el-form-item>
             <!--            <el-form-item label="物流单号" prop="trainNumber">-->
-            <el-form-item label="物流车次">
-              <el-input v-model="form.trainNumber" clearable placeholder="请输入物流车次" />
+            <el-form-item label="物流运单号">
+              <el-input
+                v-model="form.LogisticsWaybillNumber"
+                clearable
+                placeholder="请输入物流运单号"
+              />
             </el-form-item>
 
             <!--            <el-form-item label="入库车牌" prop="licensePlate">-->
@@ -134,6 +140,7 @@
                   :key="item.value"
                   :label="item.label"
                   :value="item.value"
+                  :checked="store.length === 1"
                 />
               </el-select>
             </el-form-item>
@@ -171,10 +178,15 @@
             <!--            <el-button type="danger" icon="el-icon-delete" @click="handleDelete" plain>删 除</el-button>-->
           </div>
           <!-- 头部右侧按钮模块 -->
-          <!--          <div class="avue-crud__right">-->
-          <!--            <el-button icon="el-icon-refresh" @click="searchChange" circle :disabled="view"></el-button>-->
-          <!--            <el-button icon="el-icon-search" @click="searchHide" circle :disabled="view"></el-button>-->
-          <!--          </div>-->
+          <div class="avue-crud__right">
+            <el-button
+              icon="el-icon-refresh"
+              @click="searchChange"
+              circle
+              :disabled="view"
+            ></el-button>
+            <!-- <el-button icon="el-icon-search" @click="searchHide" circle :disabled="view"></el-button> -->
+          </div>
         </div>
       </el-row>
       <el-row>
@@ -262,7 +274,7 @@
             @click="handleSubmit"
             :disabled="view && !this.$route.query.type == '3'"
             v-if="this.$route.query.type"
-            >提 交1</el-button
+            >提 交</el-button
           >
           <el-button
             type="primary"
@@ -429,6 +441,7 @@ import {
   update,
   remove,
   getWarehouseDetail,
+  getList
 } from '@/api/warehouse/warehouseWarehousingEntry';
 import option from '@/option/warehouse/warehouseWarehousingDetail';
 import { mapGetters, mapMutations } from 'vuex';
@@ -524,6 +537,7 @@ export default {
         licensePlate: [{ required: true, message: '请填写入库车牌', trigger: 'change' }],
         warehouseId: [{ required: true, message: '请选择所在仓库', trigger: 'blur' }],
         serviceType: [{ required: true, message: '请选择服务类型', trigger: 'blur' }],
+        customerCode: [{ required: true, message: '请选择客户编码', trigger: 'blur' }],
       },
     };
   },
@@ -607,6 +621,7 @@ export default {
           });
         }
         this.form = da;
+        console.log('da :>> ', da);
         // console.log(">>>>>>",this.form.storeId);
         if (!!this.form.storeId && parseInt(this.form.storeId) == -1) {
           console.log('>>>>>>', this.form.storeId);
@@ -820,7 +835,7 @@ export default {
       if (query) {
         // this.loading = true;
         let cl = await getListCopy(this.page.currentPage, this.page.pageSize, { name: query });
-        // console.log("仓库查询>>>>",cl.data.data.records);
+        console.log('仓库查询>>>>', cl.data.data.records);
         this.store = [];
         cl.data.data.records.forEach(i => {
           let st = {
@@ -829,6 +844,10 @@ export default {
           };
           this.store.push(st);
         });
+        // 当仓库数据只有一条时, 直接数据回显
+        if (this.store.length === 1) {
+          this.form.warehouseId = this.store[0].value;
+        }
         // setTimeout(() => {
         //   this.loading = false
         //   this.loading = this.list.filter((item) => {
@@ -966,6 +985,14 @@ export default {
       this.search = !this.search;
     },
     searchChange() {
+      // 当是新增入库时
+      if (!this.$route.query.type) {
+        // 清空外部表单
+        this.form = {};
+      }
+      // 清空弹出框表单
+      this.formDetail = {};
+      // 重新加载列表数据
       this.onLoad(this.page);
     },
     searchReset() {
@@ -1197,6 +1224,10 @@ export default {
           value: i.id,
         };
         this.store.push(st);
+        // 如果仓库只有一条数据时, 直接回显
+        if (this.store.length === 1) {
+          console.log('this.store.length :>> ', [...this.store]);
+          this.form.warehouseId = this.store[0].value;}
       });
 
       /*    if(b.data.data.deptCategory == "4"){
@@ -1226,6 +1257,14 @@ export default {
         });
       }*/
     },
+    // 获取列表数据
+    async getListData(data){
+    data.currentPage = data.currentPage || 1; // 当前页码, 默认为1
+    data.pageSize = data.pageSize || 10; // 当前页数, 默认为10
+    const res = await getList(data.currentPage, data.pageSize, {conditions: data.conditions})
+    // 抛出数据
+    return res
+    }
   },
 };
 </script>
diff --git a/src/views/warehouse/warehousingentry/warehouseWarehousingEntry.vue b/src/views/warehouse/warehousingentry/warehouseWarehousingEntry.vue
index 827b241e..31b1e9e3 100644
--- a/src/views/warehouse/warehousingentry/warehouseWarehousingEntry.vue
+++ b/src/views/warehouse/warehousingentry/warehouseWarehousingEntry.vue
@@ -798,8 +798,10 @@ export default {
     },
     onLoad(page, params = {}) {
       this.loading = true;
+      // 获取列表数据
       getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
         const data = res.data.data;
+        console.log('data :>> ', data);
         this.page.total = data.total;
         data.records.forEach(i => {
           if (i.conditions == '1') {
diff --git a/vite.config.js b/vite.config.js
index db6ef992..21266574 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -12,15 +12,12 @@ export default ({ mode, command }) => {
       port: 2888,
       proxy: {
         '/api': {
-          // target: 'http://192.168.10.101:8888',
-          // target: 'http://192.168.10.123:8889',
+          // target: 'http://192.168.10.126:8889',
           // target: 'http://192.168.10.48:8888',
-          // target: 'http://192.168.10.101:8888',
-          target: 'http://192.168.10.75:8777',
-          // target: 'http://test.api.huitongys.com',
-          // target: 'http://192.168.10.101:8888',
+          // target: 'http://192.168.10.123:8889',
+          // target: 'http://192.168.10.75:8777',
           // target: 'http://192.168.10.29:13000',
-          //target: 'http://test3.javablade.com',
+          target: 'http://test.api.huitongys.com',
           changeOrigin: true,
           rewrite: path => path.replace(/^\/api/, ''),
         },
@@ -42,12 +39,16 @@ export default ({ mode, command }) => {
         output: {
           // 分包
           manualChunks(id) {
-            if (id.includes('node_modules')) {
-              return id.toString().split('node_modules/')[1].split('/')[0].toString();
+            if (id.includes("node_modules")) {
+              return id
+                .toString()
+                .split("node_modules/")[1]
+                .split("/")[0]
+                .toString();
             }
           },
         },
       },
-    },
+    }
   });
 };