Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev

src/views/distribution/inventory/delivery/distributionStockArticle.vue

@@ -1505,7 +1505,7 @@ export default {
         //   return item
         // });
       });
-      getDictionaryBiz('stockup_status').then(res => {
+      getDictionaryBiz('order_stockup_status').then(res => {
         this.$functions.checkcColumnList('stockupStatusName', this.columnList).checkarr =
           res.data.data.map(item => {
             item.value = item.dictKey;

src/views/distribution/inventory/delivery/distributionStockArticleDiscuss.vue

@@ -1310,7 +1310,7 @@ export default {
             return item;
           });
       });
-      getDictionaryBiz('stockup_status').then(res => {
+      getDictionaryBiz('order_stockup_status').then(res => {
         this.$functions.checkcColumnList('stockupStatusName', this.columnList).checkarr =
           res.data.data.map(item => {
             item.value = item.dictKey;

src/views/distribution/inventory/delivery/distributionStockArticleMarket.vue

@@ -680,6 +680,16 @@ export default {
           fixed: false,
           sortable: true,
         },
+        {
+          prop: 'stockupStatusName',
+          label: '备货状态',
+          type: 3,
+          values: '',
+          width: '130',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
         {
           prop: 'orderReceiveStatusName',
           label: '入库状态',
@@ -1376,6 +1386,14 @@ export default {
             return item;
           });
       });
+      getDictionaryBiz('order_stockup_status').then(res => {
+        this.$functions.checkcColumnList('stockupStatusName', this.columnList).checkarr =
+          res.data.data.map(item => {
+            item.value = item.dictKey;
+            item.label = item.dictValue;
+            return item;
+          });
+      });
     },
     searchHide() {
       this.search = !this.search;

src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue

@@ -1667,7 +1667,7 @@ export default {
         //   return item
         // });
       });
-      getDictionaryBiz('stockup_status').then(res => {
+      getDictionaryBiz('order_stockup_status').then(res => {
         this.$functions.checkcColumnList('stockupStatusName', this.columnList).checkarr =
           res.data.data.map(item => {
             item.value = item.dictKey;

src/views/distribution/inventory/delivery/distributionStockArticleWhole.vue

@@ -1407,7 +1407,7 @@ export default {
         //   return item
         // });
       });
-      getDictionaryBiz('stockup_status').then(res => {
+      getDictionaryBiz('order_stockup_status').then(res => {
         this.$functions.checkcColumnList('stockupStatusName', this.columnList).checkarr =
           res.data.data.map(item => {
             item.value = item.dictKey;

src/views/distribution/stockup/distributionStockupDiscuss.vue

@@ -483,16 +483,16 @@ export default {
           fixed: false,
           sortable: true,
         },*/
-        // {
-        //   prop: 'loaderName',
-        //   label: '装卸班组',
-        //   type: 2,
-        //   values: '',
-        //   width: '130',
-        //   checkarr: [],
-        //   fixed: false,
-        //   sortable: true,
-        // },
+        {
+          prop: 'pallet',
+          label: '所在托盘',
+          type: 2,
+          values: '',
+          width: '130',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
         {
           prop: 'fixTime',
           label: '确认完成备货时间',

src/views/distribution/stockup/distributionStockupMarket.vue

@@ -475,16 +475,16 @@ export default {
         //   fixed: false,
         //   sortable: true,
         // },
-        // {
-        //   prop: 'loaderName',
-        //   label: '装卸班组',
-        //   type: 2,
-        //   values: '',
-        //   width: '130',
-        //   checkarr: [],
-        //   fixed: false,
-        //   sortable: true,
-        // },
+        {
+          prop: 'pallet',
+          label: '所在托盘',
+          type: 2,
+          values: '',
+          width: '130',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
         {
           prop: 'fixTime',
           label: '确认完成备货时间',

src/views/distribution/stockup/distributionStockupSelf.vue

@@ -473,16 +473,16 @@ export default {
         //   fixed: false,
         //   sortable: true,
         // },
-        /*{
-          prop: 'loaderName',
-          label: '装卸班组',
+        {
+          prop: 'pallet',
+          label: '所在托盘',
           type: 2,
           values: '',
           width: '130',
           checkarr: [],
           fixed: false,
           sortable: true,
-        },*/
+        },
         {
           prop: 'fixTime',
           label: '确认完成备货时间',