rev:现场调试优化

nladmin-ui/public/config.js

@@ -1,9 +1,9 @@
 window.g = {
   dev: {
-    VUE_APP_BASE_API: 'http://192.168.217.8:8010'
+    VUE_APP_BASE_API: 'http://192.168.217.2:8010'
   },
   prod: {
-    VUE_APP_BASE_API: 'http://192.168.217.8:8010'
+    VUE_APP_BASE_API: 'http://192.168.217.2:8010'
   }
 
 }

nladmin-ui/src/views/wms/basedata/material/MaterialDialog.vue

@@ -24,14 +24,21 @@
           @keyup.enter.native="crud.toQuery"
         />
       </el-form-item>
-      <el-form-item label="物料名称">
-        <el-input
+      <el-form-item label="物料类型">
+        <el-select
           v-model="query.material_type"
           clearable
           size="mini"
           placeholder="物料类型"
-          @keyup.enter.native="crud.toQuery"
-        />
+          class="filter-item"
+          @change="hand"
+        >
+          <el-option
+            v-for="item in materialTypesList"
+            :label="item.material_type"
+            :value="item.material_type"
+          />
+        </el-select>
       </el-form-item>
       <rrOperation />
     </el-form>
@@ -81,6 +88,7 @@ import CRUD, { header, presenter } from '@crud/crud'
 import rrOperation from '@crud/RR.operation'
 import pagination from '@crud/Pagination'
 import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+import materialRecord from '@/views/wms/sch/materialRecord/materialRecord'
 
 export default {
   name: 'MaterialDialog',
@@ -104,7 +112,8 @@ export default {
     return {
       dialogVisible: false,
       tableRadio: null,
-      tableData: []
+      tableData: [],
+      materialTypesList: []
     }
   },
   watch: {
@@ -119,7 +128,9 @@ export default {
       this.tableRadio = item
     },
     open() {
-
+      materialRecord.getMaterialTypes().then(res => {
+        this.materialTypesList = res
+      })
     },
     handleSelectionChange(val, row) {
       if (val.length > 1) {

nladmin-ui/src/views/wms/sch/materialRecord/materialRecord.js

@@ -24,4 +24,11 @@ export function edit(data) {
   })
 }
 
-export default { add, edit, del }
+export function getMaterialTypes() {
+  return request({
+    url: 'api/materialRecord/getMaterialTypes',
+    method: 'post'
+  })
+}
+
+export default { add, edit, del, getMaterialTypes}