فهرست منبع

dictSelection组件修改添加过滤函数

lucw 9 ماه پیش
والد
کامیت
5ec94a84d2

+ 11 - 0
src/components/Dict/DictSelection.vue

@@ -51,6 +51,11 @@
       ChinEng: {
       ChinEng: {
         Boolean,
         Boolean,
         default: false
         default: false
+      },
+      // 数据筛选
+      listFormatte: {
+        type: Function,
+        default: null
       }
       }
     },
     },
     data() {
     data() {
@@ -59,6 +64,12 @@
     computed: {
     computed: {
       ...mapGetters(['dict', 'getDict']),
       ...mapGetters(['dict', 'getDict']),
       dictList() {
       dictList() {
+        if (this.listFormatte) {
+          return this.listFormatte(
+            this.dict[dictEnum[this.dictName]] || [],
+            this.valueName
+          );
+        }
         return this.dict[dictEnum[this.dictName]] || [];
         return this.dict[dictEnum[this.dictName]] || [];
       },
       },
       selectVal: {
       selectVal: {

+ 12 - 0
src/components/selectMatterRules/matter-search.vue

@@ -44,6 +44,7 @@
             dictName="规则类型"
             dictName="规则类型"
             clearable
             clearable
             v-model.trim="where.type"
             v-model.trim="where.type"
+            :listFormatte="listFormatte"
           >
           >
           </DictSelection>
           </DictSelection>
         </el-form-item>
         </el-form-item>
@@ -84,6 +85,14 @@
 
 
 <script>
 <script>
   export default {
   export default {
+    props: {
+      filterType: {
+        type: Array,
+        default: () => {
+          return [];
+        }
+      }
+    },
     data() {
     data() {
       // 默认表单数据
       // 默认表单数据
       const defaultWhere = {
       const defaultWhere = {
@@ -110,6 +119,9 @@
     },
     },
     created() {},
     created() {},
     methods: {
     methods: {
+      listFormatte(list, valueName) {
+        return list.filter((i) => ['1', '2', '5'].includes(i[valueName]));
+      },
       /* 搜索 */
       /* 搜索 */
       search() {
       search() {
         const [startTime = '', endTime = ''] = this.time || [];
         const [startTime = '', endTime = ''] = this.time || [];

+ 16 - 3
src/components/selectMatterRules/select-matter-rules.vue

@@ -10,7 +10,7 @@
     width="90%"
     width="90%"
   >
   >
     <el-card shadow="never" v-loading="loading">
     <el-card shadow="never" v-loading="loading">
-      <matter-search @search="reload"> </matter-search>
+      <matter-search @search="reload" :filterType="filterType"> </matter-search>
       <!-- 数据表格 -->
       <!-- 数据表格 -->
       <ele-pro-table
       <ele-pro-table
         ref="table"
         ref="table"
@@ -46,6 +46,14 @@
   export default {
   export default {
     mixins: [dictMixins, tabMixins],
     mixins: [dictMixins, tabMixins],
     emits: ['chooseRules'],
     emits: ['chooseRules'],
+    props: {
+      filterType: {
+        type: Array,
+        default: () => {
+          return [];
+        }
+      }
+    },
     components: {
     components: {
       MatterSearch
       MatterSearch
     },
     },
@@ -159,11 +167,16 @@
       },
       },
       /* 表格数据源 */
       /* 表格数据源 */
       datasource({ page, limit, where }) {
       datasource({ page, limit, where }) {
-        return getList({ pageNum: page, size: limit, ...where });
+        return getList({
+          pageNum: page,
+          size: limit,
+          ...where,
+          types: this.filterType
+        });
       },
       },
       /* 刷新表格 */
       /* 刷新表格 */
       reload(where) {
       reload(where) {
-        this.$refs.table.reload({ page: 1, where });
+        this.$refs.table.reload({ page: 1, where, types: this.filterType });
       },
       },
 
 
       remove(row) {
       remove(row) {

+ 3 - 2
src/views/technology/production/components/user-setting-matter-add.vue

@@ -8,14 +8,14 @@
     @update:visible="updateVisible"
     @update:visible="updateVisible"
     :maxable="true"
     :maxable="true"
     :before-close="handleClose"
     :before-close="handleClose"
+    width="800px"
   >
   >
     <el-form
     <el-form
       :model="formData"
       :model="formData"
       v-loading="dialogLoading"
       v-loading="dialogLoading"
       ref="formRef"
       ref="formRef"
-      label-width="180px"
+      label-width="120px"
       :rules="rules"
       :rules="rules"
-      style="width: 800px; margin: 0 auto"
     >
     >
       <el-form-item label="类型" required prop="itemType">
       <el-form-item label="类型" required prop="itemType">
         <DictSelection
         <DictSelection
@@ -131,6 +131,7 @@
     <selectMatterRules
     <selectMatterRules
       ref="selectMatterRulesRef"
       ref="selectMatterRulesRef"
       @chooseRules="chooseRules"
       @chooseRules="chooseRules"
+      :filterType="[1, 2, 5]"
     ></selectMatterRules>
     ></selectMatterRules>
 
 
     <selectReleaseRules
     <selectReleaseRules

+ 2 - 2
vue.config.js

@@ -37,13 +37,13 @@ module.exports = {
         // target: 'http://192.168.1.176:18086',
         // target: 'http://192.168.1.176:18086',
 
 
         // target: 'http://192.168.1.251: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.125:18086',
         // target: 'http://192.168.1.125:18086',
         // target: 'http://192.168.1.251:18186',
         // target: 'http://192.168.1.251:18186',
 
 
         // target: 'http://192.168.1.251:18087',
         // target: 'http://192.168.1.251:18087',
 
 
-        // target: 'http://192.168.1.116:18086',
+        target: 'http://192.168.1.116:18086',
 
 
         changeOrigin: true, // 只有这个值为true的情况下 才表示开启跨域
         changeOrigin: true, // 只有这个值为true的情况下 才表示开启跨域
         pathRewrite: {
         pathRewrite: {