Merge remote-tracking branch 'origin/master'

src/views/inventory/InvCountOrderModify.vue

@@ -344,6 +344,8 @@ export default {
         }
         this.spaceList = res.data.list || [];
       });
+      this.formData.invSpaceCode=JSON.parse(localStorage.getItem('key'));
+
     },
     invSpaceChange() {
       this.$forceUpdate();
@@ -357,7 +359,7 @@ export default {
         invSpaceCode: this.formData.invSpaceCode,
         countType: this.countType
       };
-
+      localStorage.setItem('key', JSON.stringify(this.formData.invSpaceCode));
       saveCountOrder(orderData).then((res) => {
         if (res.code === 20000) {
           this.formData.orderId = res.data.orderId;

src/views/inventory/InvCountOrderNew.vue

@@ -273,7 +273,7 @@ export default {
     editOrder(row) {
       this.formVisible = true;
       this.formName = "edit_" + row.countType;
-      this.deviceReceiveOrder = row;
+      this.countOrder = row;
     },
     submitAudit(row) {
       let params = {id: row.id};