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

src/views/inout/DialogCreateOrder.vue

@@ -1097,7 +1097,8 @@ export default {
             if(tQuery.selectSupId!=null){
               this.codeFormData.selectSupId=tQuery.selectSupId
             }
-
+            //DI绑定多个产品,请指定对应产品 时候传递关键字做过滤
+            this.codeFormData.key ="key";
             this.selectRlVisible = true;
           } else if (response.code == 503) {
             //该产品绑定多个供应商处理

src/views/inout/DialogSelectRl.vue

@@ -587,6 +587,7 @@ export default {
       this.filterQuery.nameCode = this.curRow.nameCode;
       this.filterQuery.bindRlIds = this.curRow.bindRlIds;
       this.filterQuery.unitFk = this.fromCorp;
+      this.filterQuery.key = this.curRow.key;
       getMutiUdiInfos(this.filterQuery)
         .then((response) => {
           this.loading = false;

src/views/remind/invRemindMsg.vue

@@ -362,6 +362,8 @@ export default {
         listInv:this.invCodeList,
       };
       this.getList();
+      this.spaceList = [];
+      this.ggxhList = [];
     },
     search() {
       this.filterQuery.page = 1;