Merge remote-tracking branch 'origin/master'

src/views/remind/addInvRemindSetDialog.vue

@@ -60,7 +60,7 @@
         <el-row>
           <el-col :span="8">
             <el-form-item class="query-form-item" label="仓库名称:">
-              <el-select v-model="formData.invCode" placeholder="请选择所属仓库"
+              <el-select v-model="productQuery.invCode" placeholder="请选择所属仓库"
                          @change="invChange"
                          style="width: 90%"
               >
@@ -77,7 +77,7 @@
 
           <el-col :span="8">
             <el-form-item class="query-form-item" label="货位名称:">
-              <el-select v-model="formData.invSpaceCode" placeholder="请选择货位"
+              <el-select v-model="productQuery.invSpaceCode" placeholder="请选择货位"
                          @change="invSpaceChange"
                          style="width: 90%"
               >
@@ -280,6 +280,8 @@ export default {
       this.productTotal = 0;
     },
     getInvProductList() {
+      debugger
+      console.log(this.productQuery.invCode+"---------");
       getInvProduct(this.productQuery).then((res) => {
         if (res.code === 20000) {
           this.productList = res.data.list || [];

src/views/remind/invRemindSet.vue

@@ -245,6 +245,7 @@ export default {
         limit: 20,
       };
       this.getList();
+      this.queryName=null;
     },
     search() {
       this.filterQuery.page = 1;