修改备货条件查询

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

@@ -596,7 +596,7 @@ export default {
         },
         {
           prop: 'orderStatusName',
-          label: '状态',
+          label: '订单状态',
           type: 3,
           values: '',
           width: '150',
@@ -940,6 +940,12 @@ export default {
         this.query['freezeStatus'] = index;
       }else if(row.prop ==='completeSetName'){
         this.query['completeSet'] = index;
+      }else if(row.prop ==='reservationStatusName'){
+        this.query['reservationStatus'] = index;
+      }else if(row.prop ==='groundingStatusName'){
+        this.query['groundingStatus'] = index;
+      }else if(row.prop ==='stockupStatusName'){
+        this.query['stockupStatus'] = index;
       }else if(row.prop ==='orderStatusName'){
         this.query['orderStatus'] = index;
       }else if(row.prop ==='typeServerName'){

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

@@ -917,14 +917,18 @@ export default {
     selectsc(index, row) {
       if(row.prop ==='freezeStatusName'){
         this.query['freezeStatus'] = index;
-      }else if(row.prop ==='orderStatusName'){
-        this.query['orderStatus'] = index;
       }else if(row.prop ==='completeSetName'){
         this.query['completeSet'] = index;
-      }else if(row.prop ==='typeName'){
-        this.query['typeService'] = index;
-      }else if (row.prop ==='groundingStatusName'){
+      }else if(row.prop ==='reservationStatusName'){
+        this.query['reservationStatus'] = index;
+      }else if(row.prop ==='groundingStatusName'){
         this.query['groundingStatus'] = index;
+      }else if(row.prop ==='stockupStatusName'){
+        this.query['stockupStatus'] = index;
+      }else if(row.prop ==='orderStatusName'){
+        this.query['orderStatus'] = index;
+      }else if(row.prop ==='typeServerName'){
+        this.query['typeService'] = index;
       }else{
         this.query[row.prop] = index;
       }

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

@@ -902,18 +902,19 @@ export default {
     selectsc(index, row) {
       if(row.prop ==='freezeStatusName'){
         this.query['freezeStatus'] = index;
-      }else if(row.prop ==='orderStatusName'){
-        this.query['orderStatus'] = index;
       }else if(row.prop ==='completeSetName'){
         this.query['completeSet'] = index;
-      }else if(row.prop ==='typeName'){
-        this.query['typeService'] = index;
-      }else if (row.prop ==='groundingStatusName'){
-        this.query['groundingStatus'] = index;
-      }else if (row.prop ==='reservationStatusName'){
+      }else if(row.prop ==='reservationStatusName'){
         this.query['reservationStatus'] = index;
-      }
-      else{
+      }else if(row.prop ==='groundingStatusName'){
+        this.query['groundingStatus'] = index;
+      }else if(row.prop ==='stockupStatusName'){
+        this.query['stockupStatus'] = index;
+      }else if(row.prop ==='orderStatusName'){
+        this.query['orderStatus'] = index;
+      }else if(row.prop ==='typeServerName'){
+        this.query['typeService'] = index;
+      }else{
         this.query[row.prop] = index;
       }
       this.onLoad(this.page);

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

@@ -1123,6 +1123,12 @@ export default {
         this.query['freezeStatus'] = index;
       }else if(row.prop ==='completeSetName'){
         this.query['completeSet'] = index;
+      }else if(row.prop ==='reservationStatusName'){
+        this.query['reservationStatus'] = index;
+      }else if(row.prop ==='groundingStatusName'){
+        this.query['groundingStatus'] = index;
+      }else if(row.prop ==='stockupStatusName'){
+        this.query['stockupStatus'] = index;
       }else if(row.prop ==='orderStatusName'){
         this.query['orderStatus'] = index;
       }else if(row.prop ==='typeName'){
@@ -1721,11 +1727,11 @@ export default {
           //   '7': " 已完成",
           //   default: "无"
           // };
-          const freezeStatusMap = {
-            0: "未冻结",
-            1: "已冻结",
-            default: "无"
-          };
+          // const freezeStatusMap = {
+          //   0: "未冻结",
+          //   1: "已冻结",
+          //   default: "无"
+          // };
           const nuMap = {
             '-1': "0"
           };
@@ -1738,7 +1744,7 @@ export default {
           // };
           // i.stateName = stateMap[i.state] || stateMap.default;
           i.notification = notificationMap[i.notification] || notificationMap.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;

src/views/distribution/inventory/distributionStockList.vue

@@ -813,10 +813,10 @@ export default {
       })
       getDictionaryBiz('distribution_type').then(res => {
         this.distributionType = res.data.data;
-        this.columnList[2].checkarr =res.data.data.map(item=>{
+        this.checkcColumnList("serviceTypeName", this.columnList).checkarr=res.data.data.map(item=>{
           item.value=item.dictKey
           item.label=item.dictValue
-          return item;
+          return item
         });
       });
 
@@ -825,6 +825,14 @@ export default {
       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;
     },

src/views/distribution/inventory/distributionStockListDiscuss.vue

@@ -261,7 +261,7 @@ export default {
           sortable: true,
           head: false,
         },
-        {
+      /*  {
           prop: 'serviceTypeName',
           label: '服务类型',
           type: 1,
@@ -271,7 +271,7 @@ export default {
           fixed: true,
           sortable: true,
           head: false,
-        },
+        },*/
         // {
         //   prop: 'orderCode',
         //   label: '订单自编号',

src/views/distribution/inventory/distributionStockListMarket.vue

@@ -261,7 +261,7 @@ export default {
           sortable: true,
           head: false,
         },
-        {
+        /*{
           prop: 'serviceTypeName',
           label: '服务类型',
           type: 1,
@@ -271,7 +271,7 @@ export default {
           fixed: true,
           sortable: true,
           head: false,
-        },
+        },*/
         // {
         //   prop: 'orderCode',
         //   label: '订单自编号',

src/views/distribution/inventory/distributionStockListSelf.vue

@@ -261,7 +261,7 @@ export default {
           sortable: true,
           head: false,
         },
-        {
+      /*  {
           prop: 'serviceTypeName',
           label: '服务类型',
           type: 1,
@@ -271,7 +271,7 @@ export default {
           fixed: true,
           sortable: true,
           head: false,
-        },
+        },*/
         // {
         //   prop: 'orderCode',
         //   label: '订单自编号',

src/views/distribution/stockup/distributionStockup.vue

@@ -753,9 +753,26 @@ export default {
         //   return item
         // });
       });
+      getDictionaryBiz('stock_assign_status').then(res => { //指派
+        // console.log("8908098080",res.data.data);
+        // this.distributionType = 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;
     },

src/views/distribution/stockup/distributionStockupDiscuss.vue

@@ -836,6 +836,15 @@ export default {
           item.label = item.dictValue
           return item
         });
+      })
+      getDictionaryBiz('stock_assign_status').then(res => { //指派
+        // console.log("8908098080",res.data.data);
+        this.distributionType = 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);
     },

src/views/distribution/stockup/distributionStockupMarket.vue

@@ -290,22 +290,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,
@@ -320,16 +320,16 @@ export default {
           fixed: false,
           sortable: true,
         },
-        {
-          prop: 'goodsAreaId',
-          label: '备货区Id',
-          type: 2,
-          values: '',
-          width: '180',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-        },
+        // {
+        //   prop: 'goodsAreaId',
+        //   label: '备货区Id',
+        //   type: 2,
+        //   values: '',
+        //   width: '180',
+        //   checkarr: [],
+        //   fixed: false,
+        //   sortable: true,
+        // },
         {
           prop: 'assignStatusName',
           label: '指派状态',
@@ -337,14 +337,14 @@ export default {
           values: '',
           width: '150',
           checkarr: [
-            {
-              label: '未指派',
-              value: '1',
-            },
-            {
-              label: '已指派',
-              value: '2',
-            },
+            // {
+            //   label: '未指派',
+            //   value: '1',
+            // },
+            // {
+            //   label: '已指派',
+            //   value: '2',
+            // },
           ],
           fixed: false,
           sortable: true,
@@ -812,6 +812,14 @@ export default {
           return item
         });
       });
+      getDictionaryBiz('stock_assign_status').then(res => { //指派
+        console.log("8908098080",res.data.data);
+        this.checkcColumnList("assignStatusName", 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 => {