Merge remote-tracking branch 'origin/dev' into dev

src/views/basic/business/stockOrderPrint.vue

@@ -430,7 +430,9 @@ export default {
     },
 
     combine(){
-      if(this.orderQuery==null && this.orderQuery.length==0){
+      debugger
+      console.log(this.orderQuery)
+      if(this.orderQuery==null || this.orderQuery.length==0){
         this.$message.error("请先选择单据！")
         return;
       }

src/views/inventory/addInvRemindSetDialog.vue

@@ -145,7 +145,7 @@ export default {
         deptCode: null,
         invCode: null,
         invSpaceCode: null,
-        lowStock: false,
+        lowStock: null,
         lackStock: false,
         overStock: false,
         expireDate: false,
@@ -166,11 +166,21 @@ export default {
       getInfoByInvId({invId: this.invId}).then((res) => {
         if (res.code === 20000) {
           this.formData = res.data;
+          if (res.data.lowStock == null) {
             this.formData.lowStock = false;
+          }
+          if (res.data.lackStock == null) {
             this.formData.lackStock = false;
+          }
+          if (res.data.overStock == null) {
             this.formData.overStock = false;
+          }
+          if (res.data.expireDate == null) {
             this.formData.expireDate = false;
+          }
+          if (res.data.recentDate == null) {
             this.formData.recentDate = false;
+          }
         } else {
           this.$message.error(res.meesage);
         }

src/views/purchase/purOrder/purOrderEditDialog.vue

@@ -452,6 +452,7 @@ export default {
     },
     tableCountChange(row) {
       if (this.$isNotBlank(row)) {
+        this.currentRow.supId = row.supName;
         updateDetail(this.currentRow);
       }
     },

src/views/remind/invRemindMsg.vue

@@ -361,6 +361,7 @@ export default {
         limit: 20,
         listInv:this.invCodeList,
       };
+      this.queryName = null;
       this.getList();
       this.spaceList = [];
       this.ggxhList = [];