修改字典状态查询不正确

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

@@ -1187,7 +1187,7 @@ export default {
         //   return item
         // });
       });
-      getDictionaryBiz('order_package_status').then(res => {
+      getDictionaryBiz('order_status').then(res => {
         this.deliveryOrderStatus = res.data.data;
         this.checkcColumnList("orderStatusName", this.columnList).checkarr=res.data.data.map(item=>{
           item.value=item.dictKey

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

@@ -1137,11 +1137,11 @@ export default {
       this.height = this.setPx(document.body.clientHeight - 340);
       getDictionaryBiz('distribution_type').then(res => {
         this.distributionType = res.data.data;
-        this.checkcColumnList("typeServerName", this.columnList).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

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

@@ -1150,14 +1150,14 @@ export default {
     },
     init () {
       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=>{
-      //   //   item.value=item.dictKey
-      //   //   item.label=item.dictValue
-      //   //   return item
-      //   // });
-      // });
+      getDictionaryBiz('distribution_type').then(res => {
+        this.distributionType = res.data.data;
+        // this.columnList[26].checkarr =res.data.data.map(item=>{
+        //   item.value=item.dictKey
+        //   item.label=item.dictValue
+        //   return item
+        // });
+      });
       getDictionaryBiz('order_status').then(res => {
         this.deliveryOrderStatus = res.data.data;
         this.checkcColumnList("orderStatusName", this.columnList).checkarr=res.data.data.map(item=>{

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

@@ -623,7 +623,7 @@ export default {
           sortable: true,
         },
         {
-          prop: 'orderStateName',
+          prop: 'orderStatusName',
           label: '订单状态',
           type: 3,
           values: '',
@@ -1002,8 +1002,8 @@ export default {
         this.query['freezeStatus'] = index;
       }else if(row.prop ==='completeSetName'){
         this.query['completeSet'] = index;
-      }else if(row.prop ==='orderStateName'){
-        this.query['state'] = index;
+      }else if(row.prop ==='orderStatusName'){
+        this.query['orderStatus'] = index;
       }else if(row.prop ==='typeName'){
         this.query['typeService'] = index;
       }else{
@@ -1273,19 +1273,13 @@ export default {
       this.height = this.setPx(document.body.clientHeight - 340);
       getDictionaryBiz('distribution_type').then(res => {
         this.distributionType = res.data.data;
-        this.checkcColumnList("typeServerName", this.columnList).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 => {
+      getDictionaryBiz('order_status').then(res => {
         this.deliveryOrderStatus = res.data.data;
         this.checkcColumnList("orderStatusName", this.columnList).checkarr=res.data.data.map(item=>{
           item.value=item.dictKey

src/views/distribution/stockup/distributionStockupSelf.vue

@@ -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,
@@ -359,28 +359,28 @@ export default {
           fixed: false,
           sortable: true,
         },
-        {
-          prop: '配送车次',
-          label: '备货区编号',
-          type: 2,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-          head: true,
-        },
-        {
-          prop: '配送司机',
-          label: '备货区编号',
-          type: 2,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-          head: true,
-        },
+        // {
+        //   prop: 'pickUpPlate',
+        //   label: '提货车次',
+        //   type: 2,
+        //   values: '',
+        //   width: '150',
+        //   checkarr: [],
+        //   fixed: false,
+        //   sortable: true,
+        //   head: true,
+        // },
+        // {
+        //   prop: 'consignee',
+        //   label: '提货人',
+        //   type: 2,
+        //   values: '',
+        //   width: '150',
+        //   checkarr: [],
+        //   fixed: false,
+        //   sortable: true,
+        //   head: true,
+        // },
         {
           prop: 'forkliftName',
           label: '叉车司机',
@@ -815,7 +815,25 @@ export default {
       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=>{
+      /*  this.columnList[8].checkarr =res.data.data.map(item=>{
+          item.value=item.dictKey
+          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
+        });
+      });
+      getDictionaryBiz('stockup_status').then(res => { //备货
+        // console.log("8908098080",res.data.data);
+        this.distributionType = res.data.data;
+        this.checkcColumnList("stockupStatusName", this.columnList).checkarr =res.data.data.map(item=>{
           item.value=item.dictKey
           item.label=item.dictValue
           return item
@@ -823,6 +841,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;
     },