From e3fb5101568ca99b276a09990f86b26cb8c23dbe Mon Sep 17 00:00:00 2001
From: caoyizhong <1270296080@qq.com>
Date: Mon, 17 Jul 2023 10:18:27 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../delivery/distributionStockArticle.vue     | 162 +++++++++++++-
 .../distributionStockArticleDiscuss.vue       | 190 +++++++++++++++-
 .../distributionStockArticleMarket.vue        | 190 +++++++++++++++-
 .../delivery/distributionStockArticleSelf.vue | 207 +++++++++++++++++-
 .../inventory/distributionStockList.vue       |  62 +++---
 5 files changed, 747 insertions(+), 64 deletions(-)

diff --git a/src/views/distribution/inventory/delivery/distributionStockArticle.vue b/src/views/distribution/inventory/delivery/distributionStockArticle.vue
index 3c9ec16e..9d808c2a 100644
--- a/src/views/distribution/inventory/delivery/distributionStockArticle.vue
+++ b/src/views/distribution/inventory/delivery/distributionStockArticle.vue
@@ -439,6 +439,24 @@ export default {
           sortable: true,
         },
         {
+          prop: 'consigneeUnit',
+          label: '收货单位',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        }, {
+          prop: 'consigneePerson',
+          label: '收货人',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        }, {
           prop: 'handQuantity',
           label: '在库件数',
           type: 1,
@@ -447,8 +465,7 @@ export default {
           checkarr: [],
           fixed: false,
           sortable: true,
-        },
-        {
+        }, {
           prop: 'availableQuantity',
           label: '可用数量',
           type: 2,
@@ -458,6 +475,109 @@ export default {
           fixed: false,
           sortable: true,
         },
+        {
+          prop: 'handQuantity',
+          label: '未入库数量',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },  {
+          prop: 'sortingQuantity',
+          label: '分拣数量',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },  {
+          prop: 'deliveryQuantity',
+          label: '配送数量',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        }, {
+          prop: 'transferQuantity',
+          label: '中转数量',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        }, {
+          prop: 'signinQuantity',
+          label: '签收数量',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },{
+          prop: 'handQuantity',
+          label: '上架状态',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },{
+          prop: 'allocation',
+          label: '货区-货位-货架',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },{
+          prop: 'resource',
+          label: '订单来源',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'trays',
+          label: '所在托盘',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'freeze_status',
+          label: '冻结状态',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'state',
+          label: '状态',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
         {
           prop: 'completeSetName',
           label: '是否齐套',
@@ -536,6 +656,42 @@ export default {
           checkarr: [],
           fixed: false,
           sortable: true,
+        }, {
+          prop: 'createUser',
+          label: '创建人',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        }, {
+          prop: 'createTime',
+          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: '',
@@ -946,7 +1102,7 @@ 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.columnList[13].checkarr =res.data.data.map(item=>{
           item.value=item.dictKey
           item.label=item.dictValue
           return item
diff --git a/src/views/distribution/inventory/delivery/distributionStockArticleDiscuss.vue b/src/views/distribution/inventory/delivery/distributionStockArticleDiscuss.vue
index ab652c36..827850e7 100644
--- a/src/views/distribution/inventory/delivery/distributionStockArticleDiscuss.vue
+++ b/src/views/distribution/inventory/delivery/distributionStockArticleDiscuss.vue
@@ -440,6 +440,24 @@ export default {
           sortable: true,
         },
         {
+          prop: 'consigneeUnit',
+          label: '收货单位',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        }, {
+          prop: 'consigneePerson',
+          label: '收货人',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        }, {
           prop: 'handQuantity',
           label: '在库件数',
           type: 1,
@@ -448,6 +466,118 @@ export default {
           checkarr: [],
           fixed: false,
           sortable: true,
+        }, {
+          prop: 'availableQuantity',
+          label: '可用数量',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'handQuantity',
+          label: '未入库数量',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },  {
+          prop: 'sortingQuantity',
+          label: '分拣数量',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },  {
+          prop: 'deliveryQuantity',
+          label: '配送数量',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        }, {
+          prop: 'transferQuantity',
+          label: '中转数量',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        }, {
+          prop: 'signinQuantity',
+          label: '签收数量',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },{
+          prop: 'handQuantity',
+          label: '上架状态',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },{
+          prop: 'allocation',
+          label: '货区-货位-货架',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },{
+          prop: 'resource',
+          label: '订单来源',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'trays',
+          label: '所在托盘',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'freeze_status',
+          label: '冻结状态',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'state',
+          label: '状态',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
         },
         {
           prop: 'completeSetName',
@@ -468,20 +598,20 @@ export default {
           fixed: false,
           sortable: true,
         },
+        // {
+        //   prop: 'brand',
+        //   label: '品牌',
+        //   type: 2,
+        //   values: '',
+        //   width: '150',
+        //   checkarr: [],
+        //   fixed: false,
+        //   sortable: true,
+        // },
         {
-          prop: 'brand',
-          label: '品牌',
-          type: 2,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-        },
-        {
-          prop: 'typeService',
+          prop: 'typeName',
           label: '服务类型',
-          type: 1,
+          type: 3,
           values: '',
           width: '150',
           checkarr: [],
@@ -527,6 +657,42 @@ export default {
           checkarr: [],
           fixed: false,
           sortable: true,
+        }, {
+          prop: 'createUser',
+          label: '创建人',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        }, {
+          prop: 'createTime',
+          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: '',
diff --git a/src/views/distribution/inventory/delivery/distributionStockArticleMarket.vue b/src/views/distribution/inventory/delivery/distributionStockArticleMarket.vue
index 0c350dc6..eda640af 100644
--- a/src/views/distribution/inventory/delivery/distributionStockArticleMarket.vue
+++ b/src/views/distribution/inventory/delivery/distributionStockArticleMarket.vue
@@ -440,6 +440,24 @@ export default {
           sortable: true,
         },
         {
+          prop: 'consigneeUnit',
+          label: '收货单位',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        }, {
+          prop: 'consigneePerson',
+          label: '收货人',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        }, {
           prop: 'handQuantity',
           label: '在库件数',
           type: 1,
@@ -448,6 +466,118 @@ export default {
           checkarr: [],
           fixed: false,
           sortable: true,
+        }, {
+          prop: 'availableQuantity',
+          label: '可用数量',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'handQuantity',
+          label: '未入库数量',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },  {
+          prop: 'sortingQuantity',
+          label: '分拣数量',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },  {
+          prop: 'deliveryQuantity',
+          label: '配送数量',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        }, {
+          prop: 'transferQuantity',
+          label: '中转数量',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        }, {
+          prop: 'signinQuantity',
+          label: '签收数量',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },{
+          prop: 'handQuantity',
+          label: '上架状态',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },{
+          prop: 'allocation',
+          label: '货区-货位-货架',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },{
+          prop: 'resource',
+          label: '订单来源',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'trays',
+          label: '所在托盘',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'freeze_status',
+          label: '冻结状态',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'state',
+          label: '状态',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
         },
         {
           prop: 'completeSetName',
@@ -468,20 +598,20 @@ export default {
           fixed: false,
           sortable: true,
         },
+        // {
+        //   prop: 'brand',
+        //   label: '品牌',
+        //   type: 2,
+        //   values: '',
+        //   width: '150',
+        //   checkarr: [],
+        //   fixed: false,
+        //   sortable: true,
+        // },
         {
-          prop: 'brand',
-          label: '品牌',
-          type: 2,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-        },
-        {
-          prop: 'typeService',
+          prop: 'typeName',
           label: '服务类型',
-          type: 1,
+          type: 3,
           values: '',
           width: '150',
           checkarr: [],
@@ -527,6 +657,42 @@ export default {
           checkarr: [],
           fixed: false,
           sortable: true,
+        }, {
+          prop: 'createUser',
+          label: '创建人',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        }, {
+          prop: 'createTime',
+          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: '',
diff --git a/src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue b/src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue
index f11fc944..ad8b8d8b 100644
--- a/src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue
+++ b/src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue
@@ -441,6 +441,24 @@ export default {
           sortable: true,
         },
         {
+          prop: 'consigneeUnit',
+          label: '收货单位',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        }, {
+          prop: 'consigneePerson',
+          label: '收货人',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        }, {
           prop: 'handQuantity',
           label: '在库件数',
           type: 1,
@@ -449,6 +467,118 @@ export default {
           checkarr: [],
           fixed: false,
           sortable: true,
+        }, {
+          prop: 'availableQuantity',
+          label: '可用数量',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'handQuantity',
+          label: '未入库数量',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },  {
+          prop: 'sortingQuantity',
+          label: '分拣数量',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },  {
+          prop: 'deliveryQuantity',
+          label: '配送数量',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        }, {
+          prop: 'transferQuantity',
+          label: '中转数量',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        }, {
+          prop: 'signinQuantity',
+          label: '签收数量',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },{
+          prop: 'handQuantity',
+          label: '上架状态',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },{
+          prop: 'allocation',
+          label: '货区-货位-货架',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },{
+          prop: 'resource',
+          label: '订单来源',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'trays',
+          label: '所在托盘',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'freeze_status',
+          label: '冻结状态',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'state',
+          label: '状态',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
         },
         {
           prop: 'completeSetName',
@@ -469,10 +599,20 @@ export default {
           fixed: false,
           sortable: true,
         },
+        // {
+        //   prop: 'brand',
+        //   label: '品牌',
+        //   type: 2,
+        //   values: '',
+        //   width: '150',
+        //   checkarr: [],
+        //   fixed: false,
+        //   sortable: true,
+        // },
         {
-          prop: 'brand',
-          label: '品牌',
-          type: 2,
+          prop: 'typeName',
+          label: '服务类型',
+          type: 3,
           values: '',
           width: '150',
           checkarr: [],
@@ -480,12 +620,21 @@ export default {
           sortable: true,
         },
         {
-          prop: 'typeService',
-          label: '服务类型',
-          type: 1,
+          prop: 'notification',
+          label: '通知状态',
+          type: 3,
           values: '',
           width: '150',
-          checkarr: [],
+          checkarr: [
+            {
+              value: '2',
+              label: '已通知',
+            },
+            {
+              value: '1',
+              label: '未通知',
+            },
+          ],
           fixed: false,
           sortable: true,
         },
@@ -528,6 +677,42 @@ export default {
           checkarr: [],
           fixed: false,
           sortable: true,
+        }, {
+          prop: 'createUser',
+          label: '创建人',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        }, {
+          prop: 'createTime',
+          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: '',
@@ -542,6 +727,7 @@ export default {
         // 更多列的配置...
       ],
       columnListedit: [],
+
       drawerShow: false,
       height: 0,
       // 弹框标题
@@ -1128,6 +1314,13 @@ export default {
       getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
         const data = res.data.data;
         this.page.total = data.total;
+        data.records.some(i =>{
+          if(i.notification == '1'){
+            i.notification = '未通知'
+          }else{
+            i.notification = '已通知'
+          }
+        });
         this.data = data.records;
         this.loading = false;
         this.selectionClear();
diff --git a/src/views/distribution/inventory/distributionStockList.vue b/src/views/distribution/inventory/distributionStockList.vue
index bf106466..49b592ba 100644
--- a/src/views/distribution/inventory/distributionStockList.vue
+++ b/src/views/distribution/inventory/distributionStockList.vue
@@ -251,16 +251,16 @@ export default {
         //   fixed: false,
         //   sortable: true,
         // },
-        {
-          prop: 'marketName',
-          label: '商场',
-          type: 2,
-          values: '',
-          width: '180',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-        },
+        // {
+        //   prop: 'marketName',
+        //   label: '商场',
+        //   type: 2,
+        //   values: '',
+        //   width: '180',
+        //   checkarr: [],
+        //   fixed: false,
+        //   sortable: true,
+        // },
         {
           prop: 'descriptionGoods',
           label: '货物名称',
@@ -290,16 +290,16 @@ export default {
         //   fixed: false,
         //   sortable: true,
         // },
-        {
-          prop: 'storeName',
-          label: '门店',
-          type: 2,
-          values: '',
-          width: '180',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-        },
+        // {
+        //   prop: 'storeName',
+        //   label: '门店',
+        //   type: 2,
+        //   values: '',
+        //   width: '180',
+        //   checkarr: [],
+        //   fixed: false,
+        //   sortable: true,
+        // },
 /*        {
           prop: 'storageLocation',
           label: '库位信息',
@@ -310,16 +310,17 @@ export default {
           fixed: false,
           sortable: true,
         },*/
+        // {
+        //   prop: 'mallName',
+        //   label: '商城名称',
+        //   type: 2,
+        //   values: '',
+        //   width: '180',
+        //   checkarr: [],
+        //   fixed: false,
+        //   sortable: true,
+        // },
         {
-          prop: 'mallName',
-          label: '商城名称',
-          type: 2,
-          values: '',
-          width: '180',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-        },{
           prop: 'quantityStock',
           label: '库存数量',
           type: 1,
@@ -433,7 +434,8 @@ export default {
           checkarr: [],
           fixed: false,
           sortable: true,
-        },{
+        },
+        {
           prop: 'shoppingMall',
           label: '所属商场',
           type: 2,

From 36664b22717688bb9edff9bbd9b319a9c151da3d Mon Sep 17 00:00:00 2001
From: caoyizhong <1270296080@qq.com>
Date: Mon, 17 Jul 2023 17:42:16 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9C=A8=E5=BA=93?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../distribution/distrilbutionCallDelivery.js |  11 ++
 .../distribution/distributionStockArticle.js  |  19 +++
 .../delivery/distributionStockArticleSelf.vue | 114 ++++++++++++++++--
 .../stockup/distributionStockup.vue           |  72 ++++++++---
 4 files changed, 191 insertions(+), 25 deletions(-)

diff --git a/src/api/distribution/distrilbutionCallDelivery.js b/src/api/distribution/distrilbutionCallDelivery.js
index 001ed282..98aad322 100644
--- a/src/api/distribution/distrilbutionCallDelivery.js
+++ b/src/api/distribution/distrilbutionCallDelivery.js
@@ -11,6 +11,17 @@ export const getList = (current, size, params) => {
     }
   })
 }
+export const getListCallDelivery = (current, size, params) => {
+  return request({
+    url: '/api/logpm-distribution/distrilbutionCallDelivery/list',
+    method: 'get',
+    params: {
+      ...params,
+      current,
+      size,
+    }
+  })
+}
 
 export const getDetail = (id) => {
   return request({
diff --git a/src/option/distribution/distributionStockArticle.js b/src/option/distribution/distributionStockArticle.js
index a387eb7b..f6143b2c 100644
--- a/src/option/distribution/distributionStockArticle.js
+++ b/src/option/distribution/distributionStockArticle.js
@@ -3,6 +3,25 @@ export default {
   index: true,
   border: true,
   selection: true,
+  //提货记录
+  columnWayBill: [
+    {
+      label: '时间',
+      prop: 'createTime',
+      search: true
+    },
+    {
+      label: '跟进记录',
+      prop: 'followUpRecord',
+      search: true
+    },
+    {
+      label: '运单号',
+      prop: 'waybillNumber',
+      search: true
+    }
+
+  ],
   columnBasic: [
     {
       label: '租户号',
diff --git a/src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue b/src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue
index ad8b8d8b..e1ec6fd5 100644
--- a/src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue
+++ b/src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue
@@ -65,8 +65,8 @@
           </div>
           <div class="avue-crud__left">
 <!--            <el-button type="primary" icon="el-icon-plus" @click="handlebill"  >创建提货单</el-button>-->
-            <el-button type="primary" icon="el-icon-plus" @click="handleCallDelivery('1')"  >通知提货</el-button>
-            <el-button type="danger" icon="el-icon-delete" @click="handleCallDelivery('1')"  >再次通知</el-button>
+            <el-button type="primary" icon="el-icon-plus" @click="handleCallDelivery('1','1')"  >通知提货</el-button>
+            <el-button type="danger" icon="el-icon-delete" @click="handleCallDelivery('1','2')"  >再次通知</el-button>
 
           </div>
           <!-- 头部右侧按钮模块 -->
@@ -131,11 +131,53 @@
               placeholder="请填写内容"
             />
           </el-form-item>
-          <el-form-item label="历史跟进" :label-width="formLabelWidth">
+          <el-form-item label="历史跟进" :label-width="formLabelWidth" v-if="lishi">
+            <!-- 列表模块 -->
+            <el-table ref="table" v-loading="loading"
+                      @selection-change="selectionChange"
+                      :data="dataHistorical"
+                      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="70" align="center">
+              </el-table-column>
+              <template v-for="(item,index) in option.columnWayBill">
+                <!-- 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-form-item>
         </el-form>
+        <div class="avue-crud__pagination" style="width:100%">
+          <!-- 分页模块 -->
+          <el-pagination align="right"
+                         background
+                         @size-change="sizeChangeCall"
+                         @current-change="currentChangeCall"
+                         :current-page="pageCall.currentPage"
+                         :page-sizes="[10, 20, 30, 40, 50, 100]"
+                         :page-size="pageCall.pageSize"
+                         layout="total, sizes, prev, pager, next, jumper"
+                         :total="pageCall.total">
+          </el-pagination>
+        </div>
         <template #footer>
       <span class="dialog-footer">
         <el-button @click="dialogFormVisible = false">取消</el-button>
@@ -333,6 +375,7 @@ import { addService } from "@/api/distribution/distributionServiceLog";
 import option from "@/option/distribution/distributionStockArticle";
 import { mapGetters } from "vuex";
 import { getDictionaryBiz } from '@/api/system/dict';
+import { getListCallDelivery } from '@/api/distribution/distrilbutionCallDelivery';
 import dayjs from 'dayjs';
 
 export default {
@@ -748,6 +791,11 @@ export default {
         pageSize: 10,
         total: 40
       },
+      pageCall: {
+        currentPage: 1,
+        pageSize: 10,
+        total: 40
+      },
       // 表单数据
       form: {},
       formCall: {},// 通知
@@ -759,12 +807,14 @@ export default {
       option: option,
       // 表单列表
       data: [],
+      dataHistorical: [],
       distributionType: [],
       dialogTableVisible: false,
       dialogFormVisible: false,
       dialogFormCustomer: false, //多选客户弹窗
       dialogFormCustomerOwn: false, //单独的客户标识
       dialogFormService: false,
+      lishi: false,
       formLabelWidth: '120px',
       handler:true, //首次
       trade:false, // 商
@@ -1022,8 +1072,8 @@ export default {
     callFordelivery(inde){
       switch (inde) {
         case '1':
-          console.log(this.formCall);
-          this.formCall.waybillNumber = this.ids;
+          // console.log(this.formCall);
+          this.formCall.stockArticleId = this.ids;
           addCallDelivery(this.formCall).then(() => {
             this.$message({
               type: "success",
@@ -1090,7 +1140,7 @@ export default {
       });
     },
     //通知提货
-    handleCallDelivery(ind){
+    handleCallDelivery(ind,ty){
       if (this.selectionList.length === 0) {
         this.$message.warning("请选择至少一条数据");
         return;
@@ -1098,11 +1148,39 @@ export default {
       switch (ind) {
           case '1':
             let ids = [];
-            this.selectionList.forEach(ele => {
-              ids.push(ele.orderSelfNumbering);
+            let idde = [];
+            let nus = { };
+            let nu = '';
+            let d = false;
+            this.selectionList.some(ele => {
+              if(!!nu){
+                if(nus.customerName != ele.customerName){
+                  d= true;
+                  return ;
+                }
+              }
+              ids.push(ele.waybillNumber);
+              idde.push(ele.id);
+              nus.customerName = ele.customerName;
+              nu = ele.customerName;
+              nus.customerTelephone = ele.customerTelephone;
             });
+            if(d){
+              this.$message.warning("请选择一样的联系人！！！");
+              return;
+            }
+            if(ty =='1'){
+              this.lishi = false;
+            }else if(ty == '2'){
+              this.lishi = true;
+              //查询历史记录
+              this.getHistorical(this.pageCall,idde);
+            }
             this.formCall.waybill = ids;
+            this.formCall.customerName = nus.customerName;
+            this.formCall.customerTelephone = nus.customerTelephone;
             this.dialogFormVisible = true;
+
             break;
             case '2':
 
@@ -1114,6 +1192,18 @@ export default {
             break;
       }
 
+    },
+    //历史通知记录
+    async getHistorical(page,ids){
+      let i = '';
+     if(!!ids){
+      i = ids.join(',');
+     }
+      let a =await getListCallDelivery(page.currentPage,page.pageSize,{ stockArticleId : i});
+      console.log("a>>>>",a.data.data);
+      this.dataHistorical= a.data.data.records;
+      this.pageCall.total = a.data.data.total;
+
     },
     init () {
       this.height = this.setPx(document.body.clientHeight - 340);
@@ -1307,6 +1397,14 @@ export default {
       this.page.pageSize = pageSize;
       this.onLoad(this.page);
     },
+    currentChangeCall (currentPage) {
+      this.pageCall.currentPage = currentPage;
+      this.getHistorical(this.pageCall);
+    },
+    sizeChangeCall (pageSize) {
+      this.pageCall.pageSize = pageSize;
+      this.getHistorical(this.pageCall);
+    },
     onLoad (page, params = {}) {
       this.loading = true;
       this.query.genre = 1;
diff --git a/src/views/distribution/stockup/distributionStockup.vue b/src/views/distribution/stockup/distributionStockup.vue
index 1162ed6e..939d5d06 100644
--- a/src/views/distribution/stockup/distributionStockup.vue
+++ b/src/views/distribution/stockup/distributionStockup.vue
@@ -26,7 +26,7 @@
           <div class="avue-crud__left">
             <el-button type="primary" icon="el-icon-plus" @click="handleAdd">新 增</el-button>
             <el-button type="danger" icon="el-icon-delete" @click="handleDelete" plain>删 除</el-button>
-            <el-button type="primary" text icon="el-icon-edit" @click="handleForklift(row)" >指派叉车司机</el-button>
+            <el-button type="primary" text icon="el-icon-edit" @click="handleForklift" >指派叉车司机</el-button>
           </div>
           <!-- 头部右侧按钮模块 -->
           <div class="avue-crud__right">
@@ -76,7 +76,7 @@
       <el-dialog v-model="dialogFormCustomer" title="指派叉车">
         <el-form :model="form">
           <el-form-item label="叉车司机" :label-width="formLabelWidth">
-            <el-select v-model="form.forklift" clearable placeholder="请选择叉车司机">
+            <el-select v-model="form.forkliftId" clearable placeholder="请选择叉车司机"  @change="getForklift($event,'1')">
               <el-option
                 v-for="item in forkliftData"
                 :key="item.dictKey"
@@ -86,7 +86,7 @@
             </el-select>
           </el-form-item>
           <el-form-item label="装卸班组" :label-width="formLabelWidth">
-            <el-select v-model="form.loader" clearable placeholder="请选择装卸班组">
+            <el-select v-model="form.loaderId" clearable placeholder="请选择装卸班组" @change="getForklift($event,'2')">
               <el-option
                 v-for="item in loaderData"
                 :key="item.dictKey"
@@ -95,8 +95,8 @@
               </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="备货区域" :label-width="formLabelWidth">
-            <el-select v-model="form.stockupArea" clearable placeholder="请选择备货区编号">
+          <el-form-item label="备货区域" :label-width="formLabelWidth" @change="getForklift($event,'3')">
+            <el-select v-model="form.goodsAreaId" clearable placeholder="请选择备货区编号">
               <el-option
                 v-for="item in goodsAreaIdData"
                 :key="item.dictKey"
@@ -418,6 +418,31 @@ export default {
     }
   },
   methods: {
+    //选择
+    getForklift(row,ty){
+      console.log("执行了了了了",row);
+      switch (ty){
+        case '1':
+          let x = this.forkliftData.find(i =>i.dictKey==row);
+          // console.log("xxx",x);
+          this.form.forkliftName = x.dictValue;
+          break;
+        case '2':
+          let b = this.loaderData.find(i =>i.dictKey == row)
+          this.form.loaderName = b.dictValue;
+          break;
+        case '3':
+          let f = this.goodsAreaIdData.find(i =>i.dictKey == row)
+          console.log("fff",f);
+          this.form.stockupArea = f.dictValue;
+          break;
+      }
+
+
+
+    },
+
+
     showdrawer(value){
       this.drawerShow=value
     },
@@ -437,7 +462,7 @@ export default {
         this.columnList = newarr;
         this.$functions.setStorage(window.location.pathname+'sortlist', headarr);
       }
-      
+
     },
     selectionsc(value) {
       console.log(value);
@@ -498,13 +523,17 @@ export default {
     async getFork(){
       let ides = '';
       let ide = {  };
-      await getListUser().then(res =>{
+      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);
+      await getPostList(ides).then(res =>{ // 查询角色
+        // console.log("查询>>>>",res.data.data);
         res.data.data.forEach(i =>{
           if(i.postName == "叉车"){
             ide = i;
@@ -513,11 +542,16 @@ export default {
       })
       // console.log("ied>>>>>",ide);
       let params={
-        postId: ide.id, //岗位
+        // postId: ide.id, //岗位
         deptId: this.deptId, //部门
         // roleId: '', //角色
       }
-      getListOwn(Object.assign(params, this.query)).then(res =>{
+      if(b){
+        // console.log("进来了");
+        params.postId = ide.id;//岗位
+      }
+      // console.log("查询人员信息",params);
+      getListOwn(Object.assign(params, this.query)).then(res =>{ //查询人员
         // console.log(".............",res.data.data);
         let fo = [];
         res.data.data.forEach( i =>{
@@ -569,6 +603,9 @@ export default {
         this.goodsAreaIdData = fo;
       })
     },
+    /**
+     * 指派叉车查询的司机
+     */
      handleForklift(){
        if (this.selectionList.length === 0) {
          this.$message.warning("请选择至少一条数据");
@@ -582,7 +619,8 @@ export default {
     //确定指派
     callFordelivery(){
       this.form.ids = this.ids;
-      addAssign(this.form).then(res =>{
+      console.log("数据》》》",this.form);
+ /*     addAssign(this.form).then(res =>{
         this.$message({
           type: "success",
           message: "操作成功！"
@@ -590,7 +628,7 @@ export default {
         this.onLoad(this.page);
         this.dialogFormCustomer = false;
       })
-
+*/
     },
     init () {
       this.height = this.setPx(document.body.clientHeight - 340);
@@ -713,11 +751,11 @@ export default {
         this.page.total = data.total;
         this.data = data.records;
        this.data.forEach(async i =>{
-         if(i.forklift != "-1"){
+        /* if(i.forkliftId != "-1"){
            console.log("i==",i);
-           let a = await getUser(i.forklift);
-           i.forklift =a.data.data.name;
-         }
+           let a = await getUser(i.forkliftId);
+           i.forkliftId =a.data.data.name;
+         }*/
 
          i.loader = i.groupName;
          i.stockupArea = i.headline;