From 228bd2a8dda4ddde3b3f54609b00d755a9ea5b63 Mon Sep 17 00:00:00 2001
From: caoyizhong <1270296080@qq.com>
Date: Thu, 3 Aug 2023 16:45:22 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9F=A5=E8=AF=A2=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../distribution/distributionStockArticle.js  | 112 +++++++++-
 .../delivery/distributionStockArticle.vue     | 148 ++++++++-----
 .../distributionStockArticleDiscuss.vue       |  94 ++++++++-
 .../distributionStockArticleMarket.vue        |  10 +-
 .../delivery/distributionStockArticleSelf.vue | 128 ++++++++++--
 .../distributionStockArticleDetails.vue       |  86 +++++++-
 .../inventory/distributionStockList.vue       |  19 +-
 .../distributionStockListDiscuss.vue          |  19 +-
 .../inventory/distributionStockListMarket.vue |  19 +-
 .../inventory/distributionStockListSelf.vue   |  19 +-
 .../stockup/distributionStockupDiscuss.vue    | 196 +++++++++++++-----
 .../stockup/distributionStockupMarket.vue     | 125 ++++++++---
 .../stockup/distributionStockupSelf.vue       |  96 +++++++--
 13 files changed, 844 insertions(+), 227 deletions(-)

diff --git a/src/option/distribution/distributionStockArticle.js b/src/option/distribution/distributionStockArticle.js
index f8d305f5..370d8960 100644
--- a/src/option/distribution/distributionStockArticle.js
+++ b/src/option/distribution/distributionStockArticle.js
@@ -104,9 +104,97 @@ export default {
       label: '服务类型',
       prop: 'typeServerName',
       search: true
+    },
+    {
+      label: '经销商名称',
+      prop: 'dealerName',
+      search: true
+    },
+    {
+      label: '经销商编码',
+      prop: 'dealerCode',
+      search: true
+    },
+    {
+      label: '车次号',
+      prop: 'trainNumber',
+      search: true
+    },
+    {
+      label: '工厂车次',
+      prop: 'factoryTrain',
+      search: true
     }
 
   ],
+  columnTakeClice: [
+    {
+      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: '收货人名字',
+      prop: 'consigneePerson'
+    },
+    {
+      label: '收货人电话',
+      prop: 'consigneeMobile'
+    },
+    {
+      label: '收货人地址',
+      prop: 'consigneeAddress'
+    }
+  ],
   columnTakeOver: [
     {
       label: '租户号',
@@ -264,18 +352,30 @@ export default {
       label: '仓库',
       prop: 'warehouse'
     },
-    {
-      label: '包件类型',
-      prop: 'conditions',
-      search: true
-    },
+    // {
+    //   label: '包件类型',
+    //   prop: 'conditions',
+    //   search: true
+    // },
     {
       label: '包件状态',
       prop: 'orderPackageStatusName',
     },
     {
       label: '冻结状态',
-      prop: 'orderPackageStatusName',
+      prop: 'orderPackageFreezeStatusName',
+    },
+    {
+      label: '上架状态',
+      prop: 'orderPackageGroundingStatusName',
+    },
+    {
+      label: '备货状态',
+      prop: 'orderPackageStockupStatusName',
+    },
+    {
+      label: '预约状态',
+      prop: 'orderPackageReservationStatusName',
     },
     {
       label: '包条码',
diff --git a/src/views/distribution/inventory/delivery/distributionStockArticle.vue b/src/views/distribution/inventory/delivery/distributionStockArticle.vue
index 5e6e8525..75f1b760 100644
--- a/src/views/distribution/inventory/delivery/distributionStockArticle.vue
+++ b/src/views/distribution/inventory/delivery/distributionStockArticle.vue
@@ -595,7 +595,7 @@ export default {
           sortable: true,
         },
         {
-          prop: 'orderStatesName',
+          prop: 'orderStatusName',
           label: '状态',
           type: 3,
           values: '',
@@ -604,6 +604,26 @@ export default {
           fixed: false,
           sortable: true,
         },
+        {
+          prop: 'reservationStatusName',
+          label: '预约状态',
+          type: 3,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'stockupStatusName',
+          label: '备货状态',
+          type: 3,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
         {
           prop: 'completeSetName',
           label: '是否齐套',
@@ -702,46 +722,27 @@ export default {
           checkarr: [],
           fixed: false,
           sortable: true,
-        }, {
-          prop: 'inventoryDate',
-          label: '最新盘点时间',
-          type: 1,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-        },
-        {
-          prop: 'inventoryPerson',
-          label: '盘点人',
-          type: 1,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-        },
-        {
-          prop: 'reservationStatusName',
-          label: '预约状态',
-          type: 3,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-        },
-        {
-          prop: 'stockupStatusName',
-          label: '备货状态',
-          type: 3,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
         },
+        // {
+        //   prop: 'inventoryDate',
+        //   label: '最新盘点时间',
+        //   type: 1,
+        //   values: '',
+        //   width: '150',
+        //   checkarr: [],
+        //   fixed: false,
+        //   sortable: true,
+        // },
+        // {
+        //   prop: 'inventoryPerson',
+        //   label: '盘点人',
+        //   type: 1,
+        //   values: '',
+        //   width: '150',
+        //   checkarr: [],
+        //   fixed: false,
+        //   sortable: true,
+        // },
         {
           prop: '',
           label: '操作',
@@ -939,7 +940,7 @@ export default {
         this.query['freezeStatus'] = index;
       }else if(row.prop ==='completeSetName'){
         this.query['completeSet'] = index;
-      }else if(row.prop ==='orderStatesName'){
+      }else if(row.prop ==='orderStatusName'){
         this.query['orderStatus'] = index;
       }else if(row.prop ==='typeName'){
         this.query['typeService'] = index;
@@ -1156,50 +1157,89 @@ export default {
       this.height = this.setPx(document.body.clientHeight - 340);
       getDictionaryBiz('distribution_type').then(res => {
         this.distributionType = res.data.data;
-        this.columnList[26].checkarr =res.data.data.map(item=>{
+        this.checkcColumnList("typeServerName", this.columnList).checkarr=res.data.data.map(item=>{
           item.value=item.dictKey
           item.label=item.dictValue
           return item
         });
+
+        // this.columnList[26].checkarr =res.data.data.map(item=>{
+        //   item.value=item.dictKey
+        //   item.label=item.dictValue
+        //   return item
+        // });
       });
       getDictionaryBiz('order_package_status').then(res => {
         this.deliveryOrderStatus = res.data.data;
-        this.columnList[24].checkarr =res.data.data.map(item=>{
+        this.checkcColumnList("orderStatusName", this.columnList).checkarr=res.data.data.map(item=>{
           item.value=item.dictKey
           item.label=item.dictValue
           return item
         });
+        // this.columnList[24].checkarr =res.data.data.map(item=>{
+        //   item.value=item.dictKey
+        //   item.label=item.dictValue
+        //   return item
+        // });
       });
       getDictionaryBiz('basic_grounding').then(res => {
-        this.columnList[19].checkarr =res.data.data.map(item=>{
+        this.checkcColumnList("groundingStatusName", this.columnList).checkarr=res.data.data.map(item=>{
           item.value=item.dictKey
           item.label=item.dictValue
           return item
         });
+        // this.columnList[19].checkarr =res.data.data.map(item=>{
+        //   item.value=item.dictKey
+        //   item.label=item.dictValue
+        //   return item
+        // });
       });
       getDictionaryBiz('freeze_status').then(res => {
-        this.columnList[19].checkarr =res.data.data.map(item=>{
+        this.checkcColumnList("freezeStatusName", this.columnList).checkarr=res.data.data.map(item=>{
           item.value=item.dictKey
           item.label=item.dictValue
           return item
         });
+        // this.columnList[19].checkarr =res.data.data.map(item=>{
+        //   item.value=item.dictKey
+        //   item.label=item.dictValue
+        //   return item
+        // });
       });
       getDictionaryBiz('stockup_status').then(res => {
-        this.columnList[36].checkarr =res.data.data.map(item=>{
+        this.checkcColumnList("stockupStatusName", this.columnList).checkarr=res.data.data.map(item=>{
           item.value=item.dictKey
           item.label=item.dictValue
           return item
         });
+        // this.columnList[36].checkarr =res.data.data.map(item=>{
+        //   item.value=item.dictKey
+        //   item.label=item.dictValue
+        //   return item
+        // });
       });
-      getDictionaryBiz('reservation_status').then(res => {
-        this.columnList[35].checkarr =res.data.data.map(item=>{
+      getDictionaryBiz('order_reservation_status').then(res => {
+        this.checkcColumnList("reservationStatusName", this.columnList).checkarr=res.data.data.map(item=>{
           item.value=item.dictKey
           item.label=item.dictValue
           return item
         });
+        // this.columnList[35].checkarr =res.data.data.map(item=>{
+        //   item.value=item.dictKey
+        //   item.label=item.dictValue
+        //   return item
+        // });
       });
 
     },
+    checkcColumnList(prop,columnList){
+      for(var a = 0; a < columnList.length; a++){
+        if(columnList[a].prop===prop){
+          console.log("1111111111111",columnList[a]);
+          return columnList[a];
+        }
+      }
+    },
     searchHide () {
       this.search = !this.search;
     },
@@ -1391,11 +1431,11 @@ export default {
         this.data = data.records;
         this.data = this.data.map( i => {
           // console.log("iiiii",i.createUser);
-          const freezeStatusMap = {
-            0: "未冻结",
-            1: "已冻结",
-            default: "无"
-          };
+          // const freezeStatusMap = {
+          //   0: "未冻结",
+          //   1: "已冻结",
+          //   default: "无"
+          // };
           const nuMap = {
             '-1': "0"
           };
@@ -1406,7 +1446,7 @@ export default {
           //   3: "已下架",
           //   default: "无"
           // };
-          i.freezeStatusName = freezeStatusMap[i.freezeStatus] || freezeStatusMap.default;
+          // i.freezeStatusName = freezeStatusMap[i.freezeStatus] || freezeStatusMap.default;
           // i.groundingStatusName = groundingStatusMap[i.groundingStatus] || groundingStatusMap.default;
           i.handQuantity = nuMap[i.handQuantity] || i.handQuantity;
           i.sortingQuantity = nuMap[i.sortingQuantity] || i.sortingQuantity;
diff --git a/src/views/distribution/inventory/delivery/distributionStockArticleDiscuss.vue b/src/views/distribution/inventory/delivery/distributionStockArticleDiscuss.vue
index eec3a1ef..d1e93551 100644
--- a/src/views/distribution/inventory/delivery/distributionStockArticleDiscuss.vue
+++ b/src/views/distribution/inventory/delivery/distributionStockArticleDiscuss.vue
@@ -528,7 +528,7 @@ export default {
           values: '',
           width: '150',
           checkarr: [
-         
+
           ],
           fixed: false,
           sortable: true,
@@ -568,7 +568,7 @@ export default {
           values: '',
           width: '150',
           checkarr: [
-        
+
           ],
           fixed: false,
           sortable: true,
@@ -583,6 +583,26 @@ export default {
           fixed: false,
           sortable: true,
         },
+        {
+          prop: 'reservationStatusName',
+          label: '预约状态',
+          type: 3,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'stockupStatusName',
+          label: '备货状态',
+          type: 3,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
         {
           prop: 'completeSetName',
           label: '是否齐套',
@@ -679,7 +699,7 @@ export default {
           checkarr: [],
           fixed: false,
           sortable: true,
-        }, 
+        },
         // {
         //   prop: 'inventoryDate',
         //   label: '最新盘点时间',
@@ -891,8 +911,8 @@ export default {
     },
     /**
      * 处理字段和名称不一致的问题
-     * @param {} index 
-     * @param {*} row 
+     * @param {} index
+     * @param {*} row
      */
     selectsc(index, row) {
       if(row.prop ==='freezeStatusName'){
@@ -1117,37 +1137,89 @@ export default {
       this.height = this.setPx(document.body.clientHeight - 340);
       getDictionaryBiz('distribution_type').then(res => {
         this.distributionType = res.data.data;
-        // this.columnList[12].checkarr =res.data.data.map(item=>{
+        this.checkcColumnList("typeServerName", this.columnList).checkarr=res.data.data.map(item=>{
+          item.value=item.dictKey
+          item.label=item.dictValue
+          return item
+        });
+
+        // this.columnList[26].checkarr =res.data.data.map(item=>{
         //   item.value=item.dictKey
         //   item.label=item.dictValue
         //   return item
         // });
       });
-      getDictionaryBiz('order_status').then(res => {
+      getDictionaryBiz('order_package_status').then(res => {
         this.deliveryOrderStatus = res.data.data;
-        this.columnList[24].checkarr =res.data.data.map(item=>{
+        this.checkcColumnList("orderStatusName", this.columnList).checkarr=res.data.data.map(item=>{
           item.value=item.dictKey
           item.label=item.dictValue
           return item
         });
+        // this.columnList[24].checkarr =res.data.data.map(item=>{
+        //   item.value=item.dictKey
+        //   item.label=item.dictValue
+        //   return item
+        // });
       });
       getDictionaryBiz('basic_grounding').then(res => {
-        this.columnList[19].checkarr =res.data.data.map(item=>{
+        this.checkcColumnList("groundingStatusName", this.columnList).checkarr=res.data.data.map(item=>{
           item.value=item.dictKey
           item.label=item.dictValue
           return item
         });
+        // this.columnList[19].checkarr =res.data.data.map(item=>{
+        //   item.value=item.dictKey
+        //   item.label=item.dictValue
+        //   return item
+        // });
       });
-
       getDictionaryBiz('freeze_status').then(res => {
-        this.columnList[23].checkarr =res.data.data.map(item=>{
+        this.checkcColumnList("freezeStatusName", this.columnList).checkarr=res.data.data.map(item=>{
           item.value=item.dictKey
           item.label=item.dictValue
           return item
         });
+        // this.columnList[19].checkarr =res.data.data.map(item=>{
+        //   item.value=item.dictKey
+        //   item.label=item.dictValue
+        //   return item
+        // });
+      });
+      getDictionaryBiz('stockup_status').then(res => {
+        this.checkcColumnList("stockupStatusName", this.columnList).checkarr=res.data.data.map(item=>{
+          item.value=item.dictKey
+          item.label=item.dictValue
+          return item
+        });
+        // this.columnList[36].checkarr =res.data.data.map(item=>{
+        //   item.value=item.dictKey
+        //   item.label=item.dictValue
+        //   return item
+        // });
+      });
+      getDictionaryBiz('order_reservation_status').then(res => {
+        this.checkcColumnList("reservationStatusName", this.columnList).checkarr=res.data.data.map(item=>{
+          item.value=item.dictKey
+          item.label=item.dictValue
+          return item
+        });
+        // this.columnList[35].checkarr =res.data.data.map(item=>{
+        //   item.value=item.dictKey
+        //   item.label=item.dictValue
+        //   return item
+        // });
       });
 
     },
+    checkcColumnList(prop,columnList){
+      for(var a = 0; a < columnList.length; a++){
+        if(columnList[a].prop===prop){
+          console.log("1111111111111",columnList[a]);
+          return columnList[a];
+        }
+      }
+    },
     searchHide () {
       this.search = !this.search;
     },
diff --git a/src/views/distribution/inventory/delivery/distributionStockArticleMarket.vue b/src/views/distribution/inventory/delivery/distributionStockArticleMarket.vue
index 628a0859..290352dd 100644
--- a/src/views/distribution/inventory/delivery/distributionStockArticleMarket.vue
+++ b/src/views/distribution/inventory/delivery/distributionStockArticleMarket.vue
@@ -527,7 +527,7 @@ export default {
           values: '',
           width: '150',
           checkarr: [
-       
+
           ],
           fixed: false,
           sortable: true,
@@ -567,7 +567,7 @@ export default {
           values: '',
           width: '150',
           checkarr: [
-        
+
           ],
           fixed: false,
           sortable: true,
@@ -579,15 +579,13 @@ export default {
           type: 3,
           values: '',
           width: '150',
-          checkarr: [
-        
-          ],
+          checkarr: [],
           fixed: false,
           sortable: true,
         },
         {
           prop: 'orderStatusName',
-          label: '状态',
+          label: '订单状态',
           type: 3,
           values: '',
           width: '150',
diff --git a/src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue b/src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue
index 7b4ad3a5..8eb1524c 100644
--- a/src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue
+++ b/src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue
@@ -624,7 +624,27 @@ export default {
         },
         {
           prop: 'orderStateName',
-          label: '状态',
+          label: '订单状态',
+          type: 3,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'reservationStatusName',
+          label: '预约状态',
+          type: 3,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'stockupStatusName',
+          label: '备货状态',
           type: 3,
           values: '',
           width: '150',
@@ -747,25 +767,26 @@ export default {
           checkarr: [],
           fixed: false,
           sortable: true,
-        }, {
-          prop: 'inventoryDate',
-          label: '最新盘点时间',
-          type: 1,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-        }, {
-          prop: 'inventoryPerson',
-          label: '盘点人',
-          type: 1,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
         },
+        // {
+        //   prop: 'inventoryDate',
+        //   label: '最新盘点时间',
+        //   type: 1,
+        //   values: '',
+        //   width: '150',
+        //   checkarr: [],
+        //   fixed: false,
+        //   sortable: true,
+        // }, {
+        //   prop: 'inventoryPerson',
+        //   label: '盘点人',
+        //   type: 1,
+        //   values: '',
+        //   width: '150',
+        //   checkarr: [],
+        //   fixed: false,
+        //   sortable: true,
+        // },
         {
           prop: '',
           label: '操作',
@@ -1242,28 +1263,89 @@ export default {
       this.height = this.setPx(document.body.clientHeight - 340);
       getDictionaryBiz('distribution_type').then(res => {
         this.distributionType = res.data.data;
-        // this.columnList[12].checkarr =res.data.data.map(item=>{
+        this.checkcColumnList("typeServerName", this.columnList).checkarr=res.data.data.map(item=>{
+          item.value=item.dictKey
+          item.label=item.dictValue
+          return item
+        });
+
+        // this.columnList[26].checkarr =res.data.data.map(item=>{
         //   item.value=item.dictKey
         //   item.label=item.dictValue
         //   return item
         // });
       });
-      getDictionaryBiz('basic_order_state').then(res => {
-        this.columnList[24].checkarr =res.data.data.map(item=>{
+      getDictionaryBiz('order_package_status').then(res => {
+        this.deliveryOrderStatus = res.data.data;
+        this.checkcColumnList("orderStatusName", this.columnList).checkarr=res.data.data.map(item=>{
           item.value=item.dictKey
           item.label=item.dictValue
           return item
         });
+        // this.columnList[24].checkarr =res.data.data.map(item=>{
+        //   item.value=item.dictKey
+        //   item.label=item.dictValue
+        //   return item
+        // });
       });
       getDictionaryBiz('basic_grounding').then(res => {
-        this.columnList[19].checkarr =res.data.data.map(item=>{
+        this.checkcColumnList("groundingStatusName", this.columnList).checkarr=res.data.data.map(item=>{
+          item.value=item.dictKey
+          item.label=item.dictValue
+          return item
+        });
+        // this.columnList[19].checkarr =res.data.data.map(item=>{
+        //   item.value=item.dictKey
+        //   item.label=item.dictValue
+        //   return item
+        // });
+      });
+      getDictionaryBiz('freeze_status').then(res => {
+        this.checkcColumnList("freezeStatusName", this.columnList).checkarr=res.data.data.map(item=>{
+          item.value=item.dictKey
+          item.label=item.dictValue
+          return item
+        });
+        // this.columnList[19].checkarr =res.data.data.map(item=>{
+        //   item.value=item.dictKey
+        //   item.label=item.dictValue
+        //   return item
+        // });
+      });
+      getDictionaryBiz('stockup_status').then(res => {
+        this.checkcColumnList("stockupStatusName", this.columnList).checkarr=res.data.data.map(item=>{
           item.value=item.dictKey
           item.label=item.dictValue
           return item
         });
+        // this.columnList[36].checkarr =res.data.data.map(item=>{
+        //   item.value=item.dictKey
+        //   item.label=item.dictValue
+        //   return item
+        // });
+      });
+      getDictionaryBiz('order_reservation_status').then(res => {
+        this.checkcColumnList("reservationStatusName", this.columnList).checkarr=res.data.data.map(item=>{
+          item.value=item.dictKey
+          item.label=item.dictValue
+          return item
+        });
+        // this.columnList[35].checkarr =res.data.data.map(item=>{
+        //   item.value=item.dictKey
+        //   item.label=item.dictValue
+        //   return item
+        // });
       });
 
     },
+    checkcColumnList(prop,columnList){
+      for(var a = 0; a < columnList.length; a++){
+        if(columnList[a].prop===prop){
+          console.log("1111111111111",columnList[a]);
+          return columnList[a];
+        }
+      }
+    },
     searchHide () {
       this.search = !this.search;
     },
diff --git a/src/views/distribution/inventory/distributionStockArticleDetails.vue b/src/views/distribution/inventory/distributionStockArticleDetails.vue
index d1220818..e8413654 100644
--- a/src/views/distribution/inventory/distributionStockArticleDetails.vue
+++ b/src/views/distribution/inventory/distributionStockArticleDetails.vue
@@ -1,11 +1,10 @@
 <template>
   <basic-container>
     <div class="avue-crud">
-      <el-row :hidden="!search" style="padding:6px 18px;margin-bottom: 5%">
+      <el-row :hidden="!search" style="margin-bottom: 1%">
         <!-- 列表模块 -->
         <el-table ref="table" v-loading="loading"
                   :data="data"
-                  height="20%"
                   style="width: 100%"
                   :border="option.border">
 <!--          <el-table-column type="selection" v-if="option.selection" width="55" align="center"></el-table-column>-->
@@ -23,12 +22,11 @@
           </template>
         </el-table>
       </el-row>
-      <el-row style="margin-bottom: 5%">
+      <el-row style="margin-bottom: 1%">
         <!-- 列表模块 -->
         <el-table ref="table" v-loading="loading"
                   @selection-change="selectionChange"
                   :data="data"
-                  height="20%"
                   style="width: 100%"
                   :border="option.border">
 <!--          <el-table-column type="selection" v-if="option.selection" width="55" align="center"></el-table-column>-->
@@ -55,6 +53,38 @@
         </el-table>
 
 
+      </el-row>
+      <el-row style="margin-bottom: 1%">
+        <!-- 列表模块 -->
+        <el-table ref="table" v-loading="loading"
+                  @selection-change="selectionChange"
+                  :data="data"
+                  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="60" align="center">-->
+<!--          </el-table-column>-->
+          <template v-for="(item,index) in option.columnTakeClice">
+            <!-- table字段 -->
+            <el-table-column v-if="item.hide!==true"
+                             :prop="item.prop"
+                             :label="item.label"
+                             :width="item.width"
+                             :key="index">
+            </el-table-column>
+          </template>
+<!--          &lt;!&ndash; 操作栏模块 &ndash;&gt;-->
+<!--          <el-table-column prop="menu" label="操作" :width="220" align="center">-->
+<!--            <template #="{row}">-->
+<!--&lt;!&ndash;              <el-button type="primary" text icon="el-icon-view" @click="handleView(row)">查看</el-button>&ndash;&gt;-->
+<!--              <el-button type="primary" text icon="el-icon-edit" @click="handleCallDelivery('3',row)">编辑</el-button>-->
+<!--              &lt;!&ndash;              <el-button type="primary" text icon="el-icon-delete" @click="rowDel(row)">删除</el-button>&ndash;&gt;-->
+<!--            </template>-->
+<!--          </el-table-column>-->
+        </el-table>
+
+
       </el-row>
       <el-row>
         <!-- 列表模块 -->
@@ -80,7 +110,8 @@
           <!-- 操作栏模块 -->
           <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-view" @click="handleTrajectory(row)">查看轨迹</el-button>
+              <el-button type="primary" text icon="el-icon-view" @click="handleQRCode(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>
@@ -127,6 +158,27 @@
       </span>
         </template>
       </el-dialog>
+      <el-dialog
+        title="二维码"
+        :visible.sync="dialogVisible"
+        width="30%"
+        v-model="dialogVisible">
+        <div >
+          <div v-for="(item,index) in qrCodeObj">
+            <el-row>
+              <el-col :span="24" >
+                <el-image  width="10" height="10" w-full  :key="index" :src="item " alt="Preview Image"/>
+              </el-col>
+            </el-row>
+          </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 type="primary" @click="dialogVisible = false">确 定</el-button>
+          <el-button @click="dialogVisible = false">取 消</el-button>
+        </span>
+      </el-dialog>
     </div>
   </basic-container>
 </template>
@@ -177,6 +229,8 @@ export default {
       dataPare: [],
       distributionType: [],
       dialogTableVisible: false,
+      dialogVisible:false, //二维码控制
+      qrCodeObj:[], //二维码图片
       dialogFormVisible: false,
       dialogFormCustomer: false,
       dialogFormService: false,
@@ -469,6 +523,28 @@ export default {
         this.form = res.data.data;
       });
     },
+    handleQRCode (row) {
+      // this.title = '查看'
+      // this.view = true;
+      // this.box = true;
+      this.dialogVisible = true;
+      getDetail(row.id).then(res => {
+        this.form = res.data.data;
+      });
+
+
+    },
+    handleTrajectory (row) {
+      console.log(">>>>",row);
+      this.$message.warning("暂无法显示！！！");
+      // this.title = '查看'
+      // this.view = true;
+      // this.box = true;
+      // this.dialogVisible = true;
+      // getDetail(row.id).then(res => {
+      //   this.form = res.data.data;
+      // });
+    },
     handleDelete () {
       if (this.selectionList.length === 0) {
         this.$message.warning("请选择至少一条数据");
diff --git a/src/views/distribution/inventory/distributionStockList.vue b/src/views/distribution/inventory/distributionStockList.vue
index 451c6b27..9695bfdb 100644
--- a/src/views/distribution/inventory/distributionStockList.vue
+++ b/src/views/distribution/inventory/distributionStockList.vue
@@ -1,22 +1,25 @@
 <template>
   <basic-container>
     <div class="avue-crud">
-  <!--    <el-row :hidden="!search" style="padding:6px 18px">
-        &lt;!&ndash; 查询模块 &ndash;&gt;
+      <el-row :hidden="!search" style="padding:6px 18px">
+        <!-- 查询模块 -->
         <el-form :inline="true" :model="query">
-          <el-form-item label="订单自编号:">
-            <el-input v-model="query.orderCode" placeholder="请输入订单自编号"></el-input>
+          <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.mallName" placeholder="请输入商城名称"></el-input>
+          <el-form-item label="货物编号:">
+            <el-input v-model="query.cargoNumber" placeholder="请输入商城名称"></el-input>
           </el-form-item>
-          &lt;!&ndash; 查询按钮 &ndash;&gt;
+          <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>
       <el-row>
         <div class="avue-crud__header">
           <!-- 头部左侧按钮模块 -->
diff --git a/src/views/distribution/inventory/distributionStockListDiscuss.vue b/src/views/distribution/inventory/distributionStockListDiscuss.vue
index 58daaeac..b6205f72 100644
--- a/src/views/distribution/inventory/distributionStockListDiscuss.vue
+++ b/src/views/distribution/inventory/distributionStockListDiscuss.vue
@@ -1,22 +1,25 @@
 <template>
   <basic-container>
     <div class="avue-crud">
-      <!--    <el-row :hidden="!search" style="padding:6px 18px">
-            &lt;!&ndash; 查询模块 &ndash;&gt;
+          <el-row :hidden="!search" style="padding:6px 18px">
+            <!-- 查询模块 -->
             <el-form :inline="true" :model="query">
-              <el-form-item label="订单自编号:">
-                <el-input v-model="query.orderCode" placeholder="请输入订单自编号"></el-input>
+              <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.mallName" placeholder="请输入商城名称"></el-input>
+              <el-form-item label="货物编号:">
+                <el-input v-model="query.cargoNumber" placeholder="请输入商城名称"></el-input>
               </el-form-item>
-              &lt;!&ndash; 查询按钮 &ndash;&gt;
+              <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>
       <el-row>
         <div class="avue-crud__header">
           <!-- 头部左侧按钮模块 -->
diff --git a/src/views/distribution/inventory/distributionStockListMarket.vue b/src/views/distribution/inventory/distributionStockListMarket.vue
index b731a8f5..071d79aa 100644
--- a/src/views/distribution/inventory/distributionStockListMarket.vue
+++ b/src/views/distribution/inventory/distributionStockListMarket.vue
@@ -1,22 +1,25 @@
 <template>
   <basic-container>
     <div class="avue-crud">
-      <!--    <el-row :hidden="!search" style="padding:6px 18px">
-            &lt;!&ndash; 查询模块 &ndash;&gt;
+          <el-row :hidden="!search" style="padding:6px 18px">
+            <!-- 查询模块 -->
             <el-form :inline="true" :model="query">
-              <el-form-item label="订单自编号:">
-                <el-input v-model="query.orderCode" placeholder="请输入订单自编号"></el-input>
+              <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.mallName" placeholder="请输入商城名称"></el-input>
+              <el-form-item label="货物编号:">
+                <el-input v-model="query.cargoNumber" placeholder="请输入商城名称"></el-input>
               </el-form-item>
-              &lt;!&ndash; 查询按钮 &ndash;&gt;
+              <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>
       <el-row>
         <div class="avue-crud__header">
           <!-- 头部左侧按钮模块 -->
diff --git a/src/views/distribution/inventory/distributionStockListSelf.vue b/src/views/distribution/inventory/distributionStockListSelf.vue
index 586b9d00..5daa40fa 100644
--- a/src/views/distribution/inventory/distributionStockListSelf.vue
+++ b/src/views/distribution/inventory/distributionStockListSelf.vue
@@ -1,22 +1,25 @@
 <template>
   <basic-container>
     <div class="avue-crud">
-      <!--    <el-row :hidden="!search" style="padding:6px 18px">
-            &lt;!&ndash; 查询模块 &ndash;&gt;
+          <el-row :hidden="!search" style="padding:6px 18px">
+            <!-- 查询模块 -->
             <el-form :inline="true" :model="query">
-              <el-form-item label="订单自编号:">
-                <el-input v-model="query.orderCode" placeholder="请输入订单自编号"></el-input>
+              <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.mallName" placeholder="请输入商城名称"></el-input>
+              <el-form-item label="货物编号:">
+                <el-input v-model="query.cargoNumber" placeholder="请输入商城名称"></el-input>
               </el-form-item>
-              &lt;!&ndash; 查询按钮 &ndash;&gt;
+              <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>
       <el-row>
         <div class="avue-crud__header">
           <!-- 头部左侧按钮模块 -->
diff --git a/src/views/distribution/stockup/distributionStockupDiscuss.vue b/src/views/distribution/stockup/distributionStockupDiscuss.vue
index f9f94241..1297b7bd 100644
--- a/src/views/distribution/stockup/distributionStockupDiscuss.vue
+++ b/src/views/distribution/stockup/distributionStockupDiscuss.vue
@@ -1,25 +1,54 @@
 <template>
   <basic-container>
     <div class="avue-crud">
-      <!--<el-row :hidden="!search" style="padding:6px 18px">
-        &lt;!&ndash; 查询模块 &ndash;&gt;
+      <el-row :hidden="!search" style="padding:6px 18px">
+        <!-- 查询模块 -->
         <el-form :inline="true" :model="query">
-          <el-form-item label="备货状态:">
-            <el-input v-model="query.stockupStatus" placeholder="请输入备货状态"></el-input>
+<!--          <el-form-item label="备货状态:">
+&lt;!&ndash;            <el-input v-model="query.stockupStatus" placeholder="请输入备货状态"></el-input>&ndash;&gt;
+            <el-select v-model="query.stockupStatus" class="m-2" placeholder="请选择备货状态">
+              <el-option
+                v-for="item in stockupStatus"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
           </el-form-item>
           <el-form-item label="备货区:">
             <el-input v-model="query.stockupArea" placeholder="请输入备货区"></el-input>
+          </el-form-item>-->
+          <el-form-item label="备货时间:">
+<!--            <el-input v-model="query.stockupArea" placeholder="请输入备货区"></el-input>-->
+            <el-date-picker
+              v-model="stockupDate"
+              type="datetimerange"
+              unlink-panels
+              range-separator="至"
+              start-placeholder="开始时间"
+              end-placeholder="结束时间"
+              :shortcuts="shortcuts"
+            />
           </el-form-item>
-          <el-form-item label="指派状态;1-未指派、2-已指派:">
-            <el-input v-model="query.assignStatus" placeholder="请输入指派状态;1-未指派、2-已指派"></el-input>
-          </el-form-item>
-          &lt;!&ndash; 查询按钮 &ndash;&gt;
+          <!--<el-form-item label="指派状态">
+&lt;!&ndash;            <el-input v-model="query.assignStatus" placeholder="请输入指派状态;1-未指派、2-已指派"></el-input>&ndash;&gt;
+            <el-select v-model="query.assignStatus" class="m-2"  placeholder="请选择指派状态">
+              <el-option
+                v-for="item in stockAllocation"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+
+          </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>
       <el-row>
         <div class="avue-crud__header">
           <!-- 头部左侧按钮模块 -->
@@ -265,22 +294,22 @@ export default {
           values: '',
           width: '180',
           checkarr: [
-            {
-              label: '未备货',
-              value: '1',
-            },
-            {
-              label: '待备货',
-              value: '2',
-            },
-            {
-              label: '备货中',
-              value: '3',
-            },
-            {
-              label: '已备货',
-              value: '4',
-            },
+            // {
+            //   label: '未备货',
+            //   value: '1',
+            // },
+            // {
+            //   label: '待备货',
+            //   value: '2',
+            // },
+            // {
+            //   label: '备货中',
+            //   value: '3',
+            // },
+            // {
+            //   label: '已备货',
+            //   value: '4',
+            // },
           ],
           fixed: false,
           sortable: true,
@@ -433,8 +462,40 @@ export default {
       loaderData: [],
       goodsAreaIdData: [],
       distributionType: [],
+      stockupStatus: [],
+      stockAllocation: [],
       deptId: '',
       num: '',
+      stockupDate: [],
+      shortcuts :[
+        {
+          text: '最近一周',
+          value: () => {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            return [start, end]
+          },
+        },
+        {
+          text: '最近一个月',
+          value: () => {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            return [start, end]
+          },
+        },
+        {
+          text: '最近三个月',
+          value: () => {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            return [start, end]
+          },
+        },
+      ]
     }
   },
   mounted () {
@@ -729,17 +790,49 @@ export default {
     },
     init () {
       this.height = this.setPx(document.body.clientHeight - 340);
+      // getDictionaryBiz('distribution_type').then(res => {
+      //   // console.log("8908098080",res.data.data);
+      //   this.distributionType = res.data.data;
+      //   this.columnList[8].checkarr =res.data.data.map(item=>{
+      //     item.value=item.dictKey
+      //     item.label=item.dictValue
+      //     return item
+      //   });
+      // });
       getDictionaryBiz('distribution_type').then(res => {
-        // console.log("8908098080",res.data.data);
         this.distributionType = res.data.data;
-        this.columnList[8].checkarr =res.data.data.map(item=>{
-          item.value=item.dictKey
-          item.label=item.dictValue
+        this.checkcColumnList("typeServiceName", this.columnList).checkarr = res.data.data.map(item => {
+          item.value = item.dictKey
+          item.label = item.dictValue
+          return item
+        });
+      });
+      getDictionaryBiz('stockup_status').then(res => {
+        this.stockupStatus = res.data.data;
+        this.checkcColumnList("stockupStatusName", this.columnList).checkarr = res.data.data.map(item => {
+          item.value = item.dictKey
+          item.label = item.dictValue
+          return item
+        });
+      });
+      getDictionaryBiz('stock_allocation').then(res => {
+        this.stockAllocation = res.data.data;
+        this.checkcColumnList("assignStatusName", this.columnList).checkarr = res.data.data.map(item => {
+          item.value = item.dictKey
+          item.label = item.dictValue
           return item
         });
       });
       this.onLoad(this.page);
     },
+    checkcColumnList(prop,columnList){
+      for(var a = 0; a < columnList.length; a++){
+        if(columnList[a].prop===prop){
+          console.log("1111111111111",columnList[a]);
+          return columnList[a];
+        }
+      }
+    },
     searchHide () {
       this.search = !this.search;
     },
@@ -748,6 +841,7 @@ export default {
     },
     searchReset () {
       this.query = {};
+      this.stockupDate = [];
       this.page.currentPage = 1;
       this.onLoad(this.page);
     },
@@ -872,35 +966,39 @@ export default {
       this.page.pageSize = pageSize;
       this.onLoad(this.page);
     },
+    getTime(dat){
+      let date = new Date(dat);
+      var y = date.getFullYear()
+      var m = date.getMonth() + 1
+      m = m < 10 ? '0' + m : m
+      var d = date.getDate()
+      d = d < 10 ? '0' + d : d
+      var h = date.getHours()
+      h = h < 10 ? '0' + h : h
+      var minute = date.getMinutes()
+      minute = minute < 10 ? '0' + minute : minute
+      var s = date.getSeconds()
+      s = s < 10 ? '0' + s : s
+      return y + '-' + m + '-' + d + ' ' + h + ':' + minute + ':' + s;
+    },
     onLoad (page, params = {}) {
       this.loading = true;
+
+      if(this.stockupDate.length > 0){
+        let startDate = this.stockupDate[0];
+        let entDate = this.stockupDate[1];
+        params.startDate = this.getTime(startDate.toString());
+        params.entDate = this.getTime(entDate.toString());
+      }
+      // console.log(">>>>",params);
+      this.query.typeService = '1';
       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.data.forEach(async i =>{
-          /* if(i.forkliftId != "-1"){
-             console.log("i==",i);
-             let a = await getUser(i.forkliftId);
-             i.forkliftId =a.data.data.name;
-           }*/
-          let s =this.distributionType.find(d => d.dictKey == i.typeService);
-          // console.log("sssss",s);
-          i.typeServiceName = s.dictValue;
           i.loader = i.groupName;
           i.stockupArea = i.headline;
-          if(i.assignStatus == '2'){
-            i.assignStatusName = '已指派';
-          }else{
-            i.assignStatusName = '未指派';
-          }
-          if(i.stockupStatus == '2'){
-            i.stockupStatusName = '待备货';
-          }else if(i.stockupStatus == '3'){
-            i.stockupStatusName = '已备货';
-          }else{
-            i.stockupStatusName = '未备货';
-          }
         });
         this.selectionClear();
         this.loading = false;
diff --git a/src/views/distribution/stockup/distributionStockupMarket.vue b/src/views/distribution/stockup/distributionStockupMarket.vue
index f9f94241..8634b845 100644
--- a/src/views/distribution/stockup/distributionStockupMarket.vue
+++ b/src/views/distribution/stockup/distributionStockupMarket.vue
@@ -1,10 +1,10 @@
 <template>
   <basic-container>
     <div class="avue-crud">
-      <!--<el-row :hidden="!search" style="padding:6px 18px">
-        &lt;!&ndash; 查询模块 &ndash;&gt;
+      <el-row :hidden="!search" style="padding:6px 18px">
+        <!-- 查询模块 -->
         <el-form :inline="true" :model="query">
-          <el-form-item label="备货状态:">
+<!--          <el-form-item label="备货状态:">
             <el-input v-model="query.stockupStatus" placeholder="请输入备货状态"></el-input>
           </el-form-item>
           <el-form-item label="备货区:">
@@ -12,14 +12,25 @@
           </el-form-item>
           <el-form-item label="指派状态;1-未指派、2-已指派:">
             <el-input v-model="query.assignStatus" placeholder="请输入指派状态;1-未指派、2-已指派"></el-input>
+          </el-form-item>-->
+          <el-form-item label="备货时间:">
+            <el-date-picker
+              v-model="stockupDate"
+              type="datetimerange"
+              unlink-panels
+              range-separator="至"
+              start-placeholder="开始时间"
+              end-placeholder="结束时间"
+              :shortcuts="shortcuts"
+            />
           </el-form-item>
-          &lt;!&ndash; 查询按钮 &ndash;&gt;
+          <!-- 查询按钮 -->
           <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>
       <el-row>
         <div class="avue-crud__header">
           <!-- 头部左侧按钮模块 -->
@@ -435,6 +446,38 @@ export default {
       distributionType: [],
       deptId: '',
       num: '',
+      stockupStatus: [],
+      stockAllocation: [],
+      stockupDate: [],
+      shortcuts :[
+        {
+          text: '最近一周',
+          value: () => {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            return [start, end]
+          },
+        },
+        {
+          text: '最近一个月',
+          value: () => {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            return [start, end]
+          },
+        },
+        {
+          text: '最近三个月',
+          value: () => {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            return [start, end]
+          },
+        },
+      ]
     }
   },
   mounted () {
@@ -730,16 +773,39 @@ export default {
     init () {
       this.height = this.setPx(document.body.clientHeight - 340);
       getDictionaryBiz('distribution_type').then(res => {
-        // console.log("8908098080",res.data.data);
         this.distributionType = res.data.data;
-        this.columnList[8].checkarr =res.data.data.map(item=>{
-          item.value=item.dictKey
-          item.label=item.dictValue
+        this.checkcColumnList("typeServiceName", this.columnList).checkarr = res.data.data.map(item => {
+          item.value = item.dictKey
+          item.label = item.dictValue
+          return item
+        });
+      });
+      getDictionaryBiz('stockup_status').then(res => {
+        this.stockupStatus = res.data.data;
+        this.checkcColumnList("stockupStatusName", this.columnList).checkarr = res.data.data.map(item => {
+          item.value = item.dictKey
+          item.label = item.dictValue
+          return item
+        });
+      });
+      getDictionaryBiz('stock_allocation').then(res => {
+        this.stockAllocation = res.data.data;
+        this.checkcColumnList("assignStatusName", this.columnList).checkarr = res.data.data.map(item => {
+          item.value = item.dictKey
+          item.label = item.dictValue
           return item
         });
       });
       this.onLoad(this.page);
     },
+    checkcColumnList(prop,columnList){
+      for(var a = 0; a < columnList.length; a++){
+        if(columnList[a].prop===prop){
+          console.log("1111111111111",columnList[a]);
+          return columnList[a];
+        }
+      }
+    },
     searchHide () {
       this.search = !this.search;
     },
@@ -748,6 +814,7 @@ export default {
     },
     searchReset () {
       this.query = {};
+      this.stockupDate = [];
       this.page.currentPage = 1;
       this.onLoad(this.page);
     },
@@ -872,8 +939,30 @@ export default {
       this.page.pageSize = pageSize;
       this.onLoad(this.page);
     },
+    getTime(dat){
+      let date = new Date(dat);
+      var y = date.getFullYear()
+      var m = date.getMonth() + 1
+      m = m < 10 ? '0' + m : m
+      var d = date.getDate()
+      d = d < 10 ? '0' + d : d
+      var h = date.getHours()
+      h = h < 10 ? '0' + h : h
+      var minute = date.getMinutes()
+      minute = minute < 10 ? '0' + minute : minute
+      var s = date.getSeconds()
+      s = s < 10 ? '0' + s : s
+      return y + '-' + m + '-' + d + ' ' + h + ':' + minute + ':' + s;
+    },
     onLoad (page, params = {}) {
       this.loading = true;
+      if(this.stockupDate.length > 0){
+        let startDate = this.stockupDate[0];
+        let entDate = this.stockupDate[1];
+        params.startDate = this.getTime(startDate.toString());
+        params.entDate = this.getTime(entDate.toString());
+      }
+      this.query.typeService = '2';
       getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
         const data = res.data.data;
         this.page.total = data.total;
@@ -884,23 +973,11 @@ export default {
              let a = await getUser(i.forkliftId);
              i.forkliftId =a.data.data.name;
            }*/
-          let s =this.distributionType.find(d => d.dictKey == i.typeService);
-          // console.log("sssss",s);
-          i.typeServiceName = s.dictValue;
+          // let s =this.distributionType.find(d => d.dictKey == i.typeService);
+          // // console.log("sssss",s);
+          // i.typeServiceName = s.dictValue;
           i.loader = i.groupName;
           i.stockupArea = i.headline;
-          if(i.assignStatus == '2'){
-            i.assignStatusName = '已指派';
-          }else{
-            i.assignStatusName = '未指派';
-          }
-          if(i.stockupStatus == '2'){
-            i.stockupStatusName = '待备货';
-          }else if(i.stockupStatus == '3'){
-            i.stockupStatusName = '已备货';
-          }else{
-            i.stockupStatusName = '未备货';
-          }
         });
         this.selectionClear();
         this.loading = false;
diff --git a/src/views/distribution/stockup/distributionStockupSelf.vue b/src/views/distribution/stockup/distributionStockupSelf.vue
index a76600fe..230f6563 100644
--- a/src/views/distribution/stockup/distributionStockupSelf.vue
+++ b/src/views/distribution/stockup/distributionStockupSelf.vue
@@ -1,10 +1,10 @@
 <template>
   <basic-container>
     <div class="avue-crud">
-      <!--<el-row :hidden="!search" style="padding:6px 18px">
-        &lt;!&ndash; 查询模块 &ndash;&gt;
+      <el-row :hidden="!search" style="padding:6px 18px">
+        <!-- 查询模块 -->
         <el-form :inline="true" :model="query">
-          <el-form-item label="备货状态:">
+          <!--<el-form-item label="备货状态:">
             <el-input v-model="query.stockupStatus" placeholder="请输入备货状态"></el-input>
           </el-form-item>
           <el-form-item label="备货区:">
@@ -12,14 +12,25 @@
           </el-form-item>
           <el-form-item label="指派状态;1-未指派、2-已指派:">
             <el-input v-model="query.assignStatus" placeholder="请输入指派状态;1-未指派、2-已指派"></el-input>
+          </el-form-item>-->
+          <el-form-item label="备货时间:">
+            <el-date-picker
+              v-model="stockupDate"
+              type="datetimerange"
+              unlink-panels
+              range-separator="至"
+              start-placeholder="开始时间"
+              end-placeholder="结束时间"
+              :shortcuts="shortcuts"
+            />
           </el-form-item>
-          &lt;!&ndash; 查询按钮 &ndash;&gt;
+          <!-- 查询按钮 -->
           <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>
       <el-row>
         <div class="avue-crud__header">
           <!-- 头部左侧按钮模块 -->
@@ -447,6 +458,36 @@ export default {
       distributionType: [],
       deptId: '',
       num: '',
+      stockupDate: [],
+      shortcuts :[
+        {
+          text: '最近一周',
+          value: () => {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            return [start, end]
+          },
+        },
+        {
+          text: '最近一个月',
+          value: () => {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            return [start, end]
+          },
+        },
+        {
+          text: '最近三个月',
+          value: () => {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            return [start, end]
+          },
+        },
+      ]
     }
   },
   mounted () {
@@ -904,8 +945,29 @@ export default {
       this.page.pageSize = pageSize;
       this.onLoad(this.page);
     },
+    getTime(dat){
+      let date = new Date(dat);
+      var y = date.getFullYear()
+      var m = date.getMonth() + 1
+      m = m < 10 ? '0' + m : m
+      var d = date.getDate()
+      d = d < 10 ? '0' + d : d
+      var h = date.getHours()
+      h = h < 10 ? '0' + h : h
+      var minute = date.getMinutes()
+      minute = minute < 10 ? '0' + minute : minute
+      var s = date.getSeconds()
+      s = s < 10 ? '0' + s : s
+      return y + '-' + m + '-' + d + ' ' + h + ':' + minute + ':' + s;
+    },
     onLoad (page, params = {}) {
       this.loading = true;
+      if(this.stockupDate.length > 0){
+        let startDate = this.stockupDate[0];
+        let entDate = this.stockupDate[1];
+        params.startDate = this.getTime(startDate.toString());
+        params.entDate = this.getTime(entDate.toString());
+      }
       getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
         const data = res.data.data;
         this.page.total = data.total;
@@ -921,18 +983,18 @@ export default {
           // i.typeServiceName = s.dictValue;
           // i.loader = i.groupName;
           // i.stockupArea = i.headline;
-          if(i.assignStatus == '2'){
-            i.assignStatusName = '已指派';
-          }else{
-            i.assignStatusName = '未指派';
-          }
-          if(i.stockupStatus == '2'){
-            i.stockupStatusName = '待备货';
-          }else if(i.stockupStatus == '3'){
-            i.stockupStatusName = '已备货';
-          }else{
-            i.stockupStatusName = '未备货';
-          }
+          // if(i.assignStatus == '2'){
+          //   i.assignStatusName = '已指派';
+          // }else{
+          //   i.assignStatusName = '未指派';
+          // }
+          // if(i.stockupStatus == '2'){
+          //   i.stockupStatusName = '待备货';
+          // }else if(i.stockupStatus == '3'){
+          //   i.stockupStatusName = '已备货';
+          // }else{
+          //   i.stockupStatusName = '未备货';
+          // }
         });
         this.selectionClear();
         this.loading = false;