修改订单状态

src/option/distribution/distributionStockList.js

@@ -213,7 +213,7 @@ export default {
     },
     {
       label: "货位",
-      prop: "orderSelfNumbering",
+      prop: "storageLocation",
       search: true,
     },
     {
@@ -222,7 +222,7 @@ export default {
     },
     {
       label: "上架时间",
-      prop: "warehousingTime",
+      prop: "groundingTime",
     },
     // {
     //   label: "入库数量",
@@ -335,7 +335,7 @@ export default {
     },
     {
       label: "出库类型",
-      prop: "outboundType",
+      prop: "outboundTypeName",
     },
     {
       label: "订单自编号",

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

@@ -528,21 +528,21 @@ export default {
           values: '',
           width: '150',
           checkarr: [
-            {
-              value: '0',
-              label: '未上架',
-            },
-            {
-              value: '1',
-              label: '部分上架',
-            }, {
-              value: '2',
-              label: '已上架',
-            },
-            {
-              value: '3',
-              label: '已下架',
-            },
+            // {
+            //   value: '0',
+            //   label: '未上架',
+            // },
+            // {
+            //   value: '1',
+            //   label: '部分上架',
+            // }, {
+            //   value: '2',
+            //   label: '已上架',
+            // },
+            // {
+            //   value: '3',
+            //   label: '已下架',
+            // },
           ],
           fixed: false,
           sortable: true,
@@ -582,20 +582,20 @@ export default {
           values: '',
           width: '150',
           checkarr: [
-            {
-              value: '1',
-              label: '已冻结',
-            },
-            {
-              value: '0',
-              label: '未冻结',
-            },
+            // {
+            //   value: '1',
+            //   label: '已冻结',
+            // },
+            // {
+            //   value: '0',
+            //   label: '未冻结',
+            // },
           ],
           fixed: false,
           sortable: true,
         },
         {
-          prop: 'orderStateName',
+          prop: 'orderStatesName',
           label: '状态',
           type: 3,
           values: '',
@@ -711,7 +711,8 @@ export default {
           checkarr: [],
           fixed: false,
           sortable: true,
-        }, {
+        },
+        {
           prop: 'inventoryPerson',
           label: '盘点人',
           type: 1,
@@ -721,6 +722,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: '',
           label: '操作',
@@ -918,8 +939,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 ==='orderStatesName'){
+        this.query['orderStatus'] = index;
       }else if(row.prop ==='typeName'){
         this.query['typeService'] = index;
       }else{
@@ -1141,7 +1162,7 @@ export default {
           return item
         });
       });
-      getDictionaryBiz('delivery_order_status').then(res => {
+      getDictionaryBiz('order_package_status').then(res => {
         this.deliveryOrderStatus = res.data.data;
         this.columnList[24].checkarr =res.data.data.map(item=>{
           item.value=item.dictKey
@@ -1156,6 +1177,27 @@ export default {
           return item
         });
       });
+      getDictionaryBiz('freeze_status').then(res => {
+        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=>{
+          item.value=item.dictKey
+          item.label=item.dictValue
+          return item
+        });
+      });
+      getDictionaryBiz('reservation_status').then(res => {
+        this.columnList[35].checkarr =res.data.data.map(item=>{
+          item.value=item.dictKey
+          item.label=item.dictValue
+          return item
+        });
+      });
 
     },
     searchHide () {

src/views/distribution/inventory/distributionStockListDetails.vue

@@ -299,7 +299,7 @@ export default {
   },
   mounted () {
     this.init();
-    this.onLoad(this.page);
+
   },
   computed: {
     ...mapGetters(["permission"]),
@@ -328,6 +328,7 @@ export default {
     },
     init () {
       this.height = this.setPx(document.body.clientHeight - 470);
+      this.onLoad(this.page);
     },
     searchHide () {
       this.search = !this.search;
@@ -485,6 +486,17 @@ export default {
       this.query.stockListId = this.$route.query.id;
       let b =await getListStock(page.currentPage, page.pageSize, Object.assign(params, this.query));
       this.data1 = b.data.data.records;
+      this.data1.forEach( i =>{
+        if(i.outboundType == '1'){
+          i.outboundTypeName = "商配"
+        }
+        if(i.outboundType == '2'){
+          i.outboundTypeName = "市配"
+        }
+        if(i.outboundType == '3'){
+          i.outboundTypeName = "自提"
+        }
+      })
       this.page1.total = b.data.data.total;
       this.loading = false;
     },
@@ -514,6 +526,7 @@ export default {
       this.query.storeId = !!this.queryOwn.storeId ? this.queryOwn.storeId : null;
       let b =await getList(page.currentPage, page.pageSize, Object.assign(params, this.query));
       this.data = b.data.data.records;
+      console.log("库存品信息",this.data);
       this.page.total = b.data.data.total;
       this.loading = false;
     },