包件明细新增字段

src/views/distribution/deliverylist/distributionDeliveryListedt.vue

@@ -396,6 +396,7 @@
         class="el-dialog-view"
         :fullscreen="wrapoption.fullscreen"
         :before-close="beforeClose"
+        :show-close="false"
         append-to-body
       >
         <template #header="{ close, titleId, titleClass }">

src/views/warehouse/parcelList/distributionParcelList.vue

@@ -197,16 +197,6 @@ export default {
           sortable: false,
           head: false,
         },
-        {
-          prop: 'materialCode',
-          label: '物料编码',
-          type: 2,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-        },
         {
           prop: 'trainNumber',
           label: '配送车次',
@@ -291,7 +281,7 @@ export default {
         },
         {
           prop: 'conditionsType',
-          label: '包件明细状态',
+          label: '包件类型',
           type: 3,
           values: '',
           width: '130',
@@ -309,7 +299,16 @@ export default {
           sortable: false,
           head: false,
         },
-
+        {
+          prop: 'materialCode',
+          label: '物料编码',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
         {
           prop: 'firsts',
           label: '一级品',
@@ -340,7 +339,16 @@ export default {
           fixed: false,
           sortable: true,
         },
-
+        {
+          prop: 'orderPackageStockupStatusName',
+          label: '备货状态',
+          type: 3,
+          values: '',
+          width: '130',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
         {
           prop: 'orderPackageStatusName',
           label: '包件状态',
@@ -351,7 +359,35 @@ export default {
           fixed: false,
           sortable: true,
         },
-
+        {
+          prop: 'orderPackageLoadingStatusName',
+          label: '装车状态',
+          type: 3,
+          values: '',
+          width: '130',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'orderPackageReservationStatusName',
+          label: '预约状态',
+          type: 3,
+          values: '',
+          width: '130',
+          checkarr: [
+            {
+              label: '待上架',
+              value: '10',
+            },
+            {
+              label: '已上架',
+              value: '20',
+            },
+          ],
+          fixed: false,
+          sortable: true,
+        },
         {
           prop: 'orderPackageGroundingStatusName',
           label: '上架状态',
@@ -611,26 +647,30 @@ export default {
     btnsc() {},
     // 复选框
     selectsc(value, row) {
-      this.query[row.prop] = value;
+      // this.query[row.prop] = value;
       // 包件明细状态
       if (row.prop === 'conditionsType') {
         this.query.conditions = value;
         if (value === '') delete this.query.conditions;
       }
-      // 上架状态
-      if (row.prop === 'orderPackageGroundingStatusName') {
-        this.query.orderPackageGroundingStatus = value;
-        if (value === '') delete this.query.orderPackageGroundingStatus;
-      }
 
-      if (row.prop === 'orderPackageStatusName') {
-        this.query.orderPackageStatus = value;
-        if (value === '') delete this.query.orderPackageStatus;
-      }
+      this.query[row.prop.replace(/Name/, '')] = value;
+      if (value === '') delete this.query[row.prop.replace(/Name/, '')];
 
-      if (value === '') {
-        delete this.query[row.prop];
-      }
+      // // 上架状态
+      // if (row.prop === 'orderPackageGroundingStatusName') {
+      //   this.query.orderPackageGroundingStatus = value;
+      //   if (value === '') delete this.query.orderPackageGroundingStatus;
+      // }
+
+      // if (row.prop === 'orderPackageStatusName') {
+      //   this.query.orderPackageStatus = value;
+      //   if (value === '') delete this.query.orderPackageStatus;
+      // }
+
+      // if (value === '') {
+      //   delete this.query[row.prop];
+      // }
       this.page.currentPage = 1;
       this.onLoad(this.page);
     },
@@ -656,6 +696,7 @@ export default {
     init() {
       this.height = this.setPx(document.body.clientHeight - 340);
 
+      // 包件状态
       getDictionaryBiz('order_package_status').then(res => {
         this.distributionType = res.data.data;
         this.$functions.checkcColumnList('orderPackageStatusName', this.columnList).checkarr =
@@ -665,6 +706,56 @@ export default {
             return item;
           });
       });
+
+      // 装车状态
+      getDictionaryBiz('order_package_loading_status').then(res => {
+        this.distributionType = res.data.data;
+        this.$functions.checkcColumnList(
+          'orderPackageLoadingStatusName',
+          this.columnList
+        ).checkarr = res.data.data.map(item => {
+          item.value = item.dictKey;
+          item.label = item.dictValue;
+          return item;
+        });
+      });
+
+      // 备货状态 orderPackageStockupStatusName
+      getDictionaryBiz('order_package_stockup_status').then(res => {
+        this.distributionType = res.data.data;
+        this.$functions.checkcColumnList(
+          'orderPackageStockupStatusName',
+          this.columnList
+        ).checkarr = res.data.data.map(item => {
+          item.value = item.dictKey;
+          item.label = item.dictValue;
+          return item;
+        });
+      });
+
+      // 入库状态
+      getDictionaryBiz('order_package_status').then(res => {
+        this.distributionType = res.data.data;
+        this.$functions.checkcColumnList('orderPackageStatusName', this.columnList).checkarr =
+          res.data.data.map(item => {
+            item.value = item.dictKey;
+            item.label = item.dictValue;
+            return item;
+          });
+      });
+
+      // 预约状态
+      getDictionaryBiz('order_package_reservation_status').then(res => {
+        this.distributionType = res.data.data;
+        this.$functions.checkcColumnList(
+          'orderPackageReservationStatusName',
+          this.columnList
+        ).checkarr = res.data.data.map(item => {
+          item.value = item.dictKey;
+          item.label = item.dictValue;
+          return item;
+        });
+      });
     },
     searchHide() {
       this.search = !this.search;