fix

lms/nladmin-ui/src/views/wms/sch/report/index.vue

@@ -11,22 +11,34 @@
           label-suffix=":"
         >
           <el-form-item label="供应商名称">
-            <el-input
+            <el-select
               v-model="query.supplierName"
               clearable
               size="mini"
               placeholder="供应商名称"
-              @keyup.enter.native="crud.toQuery"
-            />
+              class="filter-item"
+            >
+              <el-option
+                v-for="item in supplierNameList"
+                :label="item"
+                :value="item"
+              />
+            </el-select>
           </el-form-item>
           <el-form-item label="物料名称">
-            <el-input
+            <el-select
               v-model="query.productDescription"
               clearable
               size="mini"
               placeholder="物料名称"
-              @keyup.enter.native="crud.toQuery"
-            />
+              class="filter-item"
+            >
+              <el-option
+                v-for="item in productDescriptionList"
+                :label="item"
+                :value="item"
+              />
+            </el-select>
           </el-form-item>
           <rrOperation />
         </el-form>
@@ -274,6 +286,8 @@ export default {
       workShopList: [],
       pointList: [],
       regionList: [],
+      supplierNameList: [],
+      productDescriptionList: [],
       choose: '物料'
     }
   },
@@ -281,6 +295,8 @@ export default {
     this.getWorkShopList()
     this.getPointList()
     this.getRegionList()
+    this.getSupplierNameList()
+    this.getProductDescriptionList()
   },
   methods: {
     // 钩子：在获取表格数据之前执行，false 则代表不获取数据
@@ -302,6 +318,16 @@ export default {
         this.pointList = res
       })
     },
+    getSupplierNameList(){
+      crudMaterial.getSupplierNameList().then(res => {
+        this.supplierNameList = res.content
+      })
+    },
+    getProductDescriptionList(){
+      crudMaterial.getProductDescriptionList().then(res => {
+        this.productDescriptionList = res.content
+      })
+    },
     tableChanged(row) {
       this.form.material_name = row.material_name
       this.form.material_id = row.material_id

lms/nladmin-ui/src/views/wms/sch/report/report.js

@@ -32,4 +32,20 @@ export function getGroup(data) {
   })
 }
 
-export default { add, edit, del, getGroup }
+export function getSupplierNameList(data) {
+  return request({
+    url: 'api/report/getSupplierNameList',
+    method: 'get',
+    data
+  })
+}
+
+export function getProductDescriptionList(data) {
+  return request({
+    url: 'api/report/getProductDescriptionList',
+    method: 'get',
+    data
+  })
+}
+
+export default { add, edit, del, getGroup,getSupplierNameList,getProductDescriptionList }