Преглед на файлове

新增BOM的搜索条件

695593266@qq.com преди 9 месеца
родител
ревизия
cb06cbe1be
променени са 2 файла, в които са добавени 77 реда и са изтрити 8 реда
  1. 75 5
      src/views/material/BOMmanage/components/BOM-search.vue
  2. 2 3
      vue.config.js

+ 75 - 5
src/views/material/BOMmanage/components/BOM-search.vue

@@ -7,7 +7,7 @@
     @submit.native.prevent
   >
     <el-row :gutter="10">
-      <el-col v-bind="styleResponsive ? { md: 5 } : { span: 5 }">
+      <el-col v-bind="styleResponsive ? { md: 4 } : { span: 4 }">
         <el-form-item label="物品编码">
           <el-input
             size="mini"
@@ -17,7 +17,7 @@
           />
         </el-form-item>
       </el-col>
-      <el-col v-bind="styleResponsive ? { md: 5 } : { span: 5 }">
+      <el-col v-bind="styleResponsive ? { md: 4 } : { span: 4 }">
         <el-form-item label="名称">
           <el-input
             size="mini"
@@ -27,7 +27,7 @@
           />
         </el-form-item>
       </el-col>
-      <el-col v-bind="styleResponsive ? { md: 5 } : { span: 5 }">
+      <el-col v-bind="styleResponsive ? { md: 4 } : { span: 4 }">
         <el-form-item label="状态">
           <el-select
             clearable
@@ -45,6 +45,47 @@
           </el-select>
         </el-form-item>
       </el-col>
+
+      <el-col v-bind="styleResponsive ? { md: 4 } : { span: 4 }">
+        <el-form-item label="存货类型">
+          <el-select
+            clearable
+            v-model.trim="where.attributeType"
+            placeholder="请选择"
+            class="w100"
+            size="mini"
+          >
+            <el-option
+              v-for="item in attributeList"
+              :key="item.value"
+              :value="item.value"
+              :label="item.label"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+      </el-col>
+
+      <el-col v-bind="styleResponsive ? { md: 4 } : { span: 4 }">
+        <el-form-item label="规格">
+          <el-input
+            size="mini"
+            clearable
+            v-model.trim="where.specification"
+            placeholder="请输入"
+          />
+        </el-form-item>
+      </el-col>
+
+      <el-col v-bind="styleResponsive ? { md: 4 } : { span: 4 }">
+        <el-form-item label="型号">
+          <el-input
+            size="mini"
+            clearable
+            v-model.trim="where.modeType"
+            placeholder="请输入"
+          />
+        </el-form-item>
+      </el-col>
       <!-- <el-col v-bind="styleResponsive ? { lg: 5, md: 10 } : { span: 5}">
         <el-form-item label="组织机构:">
           <auth-selection size="mini" v-model.trim="where.deptIds" style="width: 100%"></auth-selection>
@@ -94,6 +135,7 @@
 
 <script>
   import importDialog from './import-dialog.vue';
+  import { getByCode } from '@/api/system/dictionary-data';
   export default {
     components: {
       importDialog
@@ -113,13 +155,17 @@
         code: '',
         categoryCode: this.categoryCode,
         categoryName: '',
-        status: ''
+        status: '',
+        attributeType: '',
+        specification: '',
+        modeType: ''
       };
       return {
         defaultWhere,
         // 表单数据
         where: { ...defaultWhere },
-        moudleName: 'mainUser'
+        moudleName: 'mainUser',
+        attributeList: []
       };
     },
     computed: {
@@ -128,6 +174,11 @@
         return this.$store.state.theme.styleResponsive;
       }
     },
+
+    mounted() {
+      this.getAttributeList('inventory_type');
+    },
+
     methods: {
       /* 搜索 */
       search() {
@@ -145,6 +196,25 @@
 
       success() {
         this.search();
+      },
+      async getAttributeList(code) {
+        let res = await getByCode(code);
+
+        // this.attributeList = res.data.map((item) => {
+        //   let values = Object.keys(item);
+        //   return {
+        //     value: values[0],
+        //     label: item[values[0]]
+        //   };
+        // });
+
+        let list = res.data.map((item) => {
+          let key = Object.keys(item)[0];
+          return { value: Number(key), label: item[key] };
+        });
+        this.attributeList = list;
+
+        console.log(this.attributeList, 'this.attributeList');
       }
     }
   };

+ 2 - 3
vue.config.js

@@ -36,12 +36,11 @@ module.exports = {
         // target: 'http://192.168.1.158:18086',
         // target: 'http://192.168.1.176:18086',
 
-        // target: 'http://192.168.1.251:18086',
-        // target: 'http://192.168.1.125:18086',
+        target: 'http://192.168.1.125:18086',
         // target: 'http://192.168.1.251:18186',
 
         // target: 'http://192.168.1.251:18087',
-        target: 'http://192.168.1.251:18086',
+        // target: 'http://192.168.1.251:18086',
         // target: 'http://192.168.1.116:18086',
 
         changeOrigin: true, // 只有这个值为true的情况下 才表示开启跨域