1.修复库存预警信息，预验收入库查询bug

src/views/inventory/InvSupPreInSerach.vue

@@ -100,7 +100,7 @@
 
           <el-col :span="6">
             <el-form-item class="query-form-item" label="生产企业:">
-              <el-input v-model="codeQuery.ylqxzcrbarmc" placeholder="请输入生产企业"
+              <el-input v-model="codeQuery.manufactory" placeholder="请输入生产企业"
                         style="width: 90%"
                         clearable="true"></el-input>
             </el-form-item>
@@ -354,6 +354,7 @@ export default {
         batchNo: null,
         ylqxzcrbarmc: null,
         zczbhhzbapzbh: null,
+        manufactory: null,
         page: 1,
         limit: 10
       },
@@ -372,25 +373,6 @@ export default {
   },
   components: {},
   methods: {
-    onReset() {
-      this.$router.push({
-        path: "",
-      });
-      this.getList();
-    },
-    onSubmit() {
-      this.loading = true;
-
-      if (this.auditDateRange !== null) {
-        this.codeQuery.startAduditTime = this.auditDateRange[0];
-        this.codeQuery.endAduditTime = this.auditDateRange[1];
-      } else {
-        this.codeQuery.startAduditTime = null;
-        this.codeQuery.endAduditTime = null;
-      }
-      this.codeQuery.page = 1;
-      this.getList();
-    },
     hideSearch() {
       this.showSearch = !this.showSearch;
     },
@@ -428,64 +410,6 @@ export default {
       this.codeDetailList = [];
       this.codeTotal = 0;
     },
-    //获取订单列表
-    getList() {
-      this.loading = true;
-      this.currentRow = {billNo: ""};
-      this.clearDetailList();
-      this.filterQuery.fromCorp = store.getters.customerId
-      filterPrein(this.filterQuery)
-        .then((response) => {
-          this.loading = false;
-          if (response.code === 20000) {
-            this.list = response.data.list || [];
-            this.total = response.data.total || 0;
-          } else {
-            this.$message.error(response.message);
-          }
-        })
-        .catch((error) => {
-          this.$message.error(error.message)
-          this.loading = false;
-          this.list = [];
-          this.total = 0;
-        });
-    },
-    deleteOrders(data) {
-      this.loading = true;
-      let delQuery = {
-        billNo: data,
-      }
-      deleterPrein(delQuery)
-        .then((response) => {
-
-          if (response.code == 20000) {
-            this.getList();
-            this.$message({
-              type: "success",
-              message: "删除成功！",
-            });
-          } else if (response.code == 520) {
-            this.$message.error("新增扫码单据列表已不存在该扫码单据！");
-            this.getList();
-          }
-
-        })
-        .catch(() => {
-        });
-    },
-    deleteDialog(row) {
-      this.$confirm("此操作将永久删除该订单, 是否继续?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(() => {
-          this.deleteOrders(row.billNo);
-        })
-        .catch(() => {
-        });
-    },
     onCodeReset() {
       this.codeQuery = {
         orderIdFk: null,
@@ -498,7 +422,7 @@ export default {
 
     keyup_submit(event) {
       this.filterQuery.page = 1;
-      this.getList();
+      this.getCodeDetailList();
       event.target.select();
     },
 
@@ -572,7 +496,7 @@ export default {
   created() {
     this.codeQuery.invCode=this.$store.getters.locInvCode;
     this.getInvList();
-    this.getList();
+    this.getCodeDetailList();
     let supId = this.$store.getters.customerId;
     if (supId == "110") {
       this.showSup = true;

src/views/remind/invRemindMsg.vue

@@ -39,29 +39,15 @@
 
           <el-col :span="6">
             <el-form-item class="query-form-item" label="物资名称:">
-              <el-autocomplete
+                <el-input v-model="filterQuery.productName" placeholder="清输入物资名称" style="width: 90%" clearable></el-input>
-                class="inline-input"
-                style="width: 90%"
-                v-model="queryName"
-                :fetch-suggestions="queryProductName"
-                placeholder="请输入物资名称"
-                clearable
-                @select="handleSelect"
-                @clear="clearQueryProduct"
-              ></el-autocomplete>
             </el-form-item>
           </el-col>
 
           <el-col :span="6">
             <el-form-item class="query-form-item" label="规格型号:">
-              <el-select v-model="filterQuery.ggxh" placeholder="请选择规格型号" style="width: 90%">
+              <el-input v-model="filterQuery.ggxh" placeholder="请输入规格型号"
-                <el-option
+                        style="width: 90%"
-                  v-for="item in ggxhList"
+                        clearable="true"></el-input>
-                  :key="item"
-                  :label="item"
-                  :value="item">
-                </el-option>
-              </el-select>
             </el-form-item>
           </el-col>
         </el-row>
@@ -302,6 +288,7 @@ export default {
     return {
       showSearch: true,
       filterQuery: {
+        productName: null,
         relId: null,
         batchNo: null,
         ggxh: null,
@@ -355,7 +342,15 @@ export default {
         path: "",
       });
       this.filterQuery = {
-        paramStatus: 1,
+        productName: null,
+        relId: null,
+        batchNo: null,
+        ggxh: null,
+        status: 1,
+        ignoreStatus: 0,
+        invCode: this.$store.getters.locInvCode,
+        invSpaceCode: null,
+        type: null,
         page: 1,
         limit: 20,
       };

src/views/remind/supInvRemindMsg.vue

@@ -5,29 +5,13 @@
         <el-row>
           <el-col :span="8">
             <el-form-item class="query-form-item" label="物资名称:">
-              <el-autocomplete
+              <el-input v-model="filterQuery.productName" placeholder="清输入物资名称" style="width: 90%" clearable></el-input>
-                class="inline-input"
-                style="width: 90%"
-                v-model="queryName"
-                :fetch-suggestions="queryProductName"
-                placeholder="请输入物资名称"
-                clearable
-                @select="handleSelect"
-                @clear="clearQueryProduct"
-              ></el-autocomplete>
             </el-form-item>
           </el-col>
 
           <el-col :span="8">
             <el-form-item class="query-form-item" label="规格型号:">
-              <el-select v-model="filterQuery.ggxh" placeholder="请选择" style="width: 90%">
+              <el-input v-model="filterQuery.ggxh" placeholder="清输入规格型号" style="width: 90%" clearable></el-input>
-                <el-option
-                  v-for="item in ggxhList"
-                  :key="item"
-                  :label="item"
-                  :value="item">
-                </el-option>
-              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -262,6 +246,7 @@ export default {
     return {
       showSearch: true,
       filterQuery: {
+        productName: null,
         relId: null,
         batchNo: null,
         ggxh: null,
@@ -313,7 +298,15 @@ export default {
         path: "",
       });
       this.filterQuery = {
-        paramStatus: 1,
+        productName: null,
+        relId: null,
+        batchNo: null,
+        ggxh: null,
+        status: 1,
+        ignoreStatus: 0,
+        invCode: this.$store.getters.locInvCode,
+        invSpaceCode: null,
+        type: null,
         page: 1,
         limit: 20,
       };