添加筛选项

src/components/RuleManager/AddRuleApply.vue

@@ -43,6 +43,8 @@
                 id:null,
                 rules:{
                     ruleId:[{ required: true, message: '请输入规则ID',trigger: ['blur'] }],
+                    typeId:[{ required: true, message: '请选择规则类型',trigger: ['blur'] }],
+                    remind:[{ required: true, message: '请输入规则信息',trigger: ['blur'] }],
                 },
                 ruleTypeList:[]
             }

src/components/RuleManager/RuleApply.vue

@@ -2,11 +2,14 @@
     <div>
         <crumbs title="规则应用维护">
             <el-form :inline="true">
-                <!--<el-form-item label="规则类型：">
-                    <el-input size="mini" v-model="filter.tagSysName" placeholder="填写单系统名称" clearable></el-input>
-                </el-form-item>-->
+                <el-form-item label="规则ID：">
+                    <el-input size="mini" v-model="filter.ruleId" placeholder="填写单系统名称" clearable></el-input>
+                </el-form-item>
+                <el-form-item label="规则信息：">
+                    <el-input size="mini" v-model="filter.remind" placeholder="填写单系统名称" clearable></el-input>
+                </el-form-item>
                 <el-form-item>
-                   <!-- <el-button size="mini" @click="filterDatas">确认</el-button>-->
+                    <el-button size="mini" @click="filterDatas">确认</el-button>
                     <el-button size="mini" type="warning" @click="addRuleApply">添加规则应用</el-button>
                 </el-form-item>
             </el-form>
@@ -22,16 +25,6 @@
                         label="修改时间"
                         width="180">
                 </el-table-column>
-                <!--<el-table-column
-                        :resizable = "false"
-                        prop="tagName"
-                        label="创建人">
-                </el-table-column>
-                <el-table-column
-                        :resizable = "false"
-                        prop="name"
-                        label="修改人">
-                </el-table-column>-->
                 <el-table-column
                         :resizable = "false"
                         prop="ruleId"
@@ -86,12 +79,8 @@
                 ruleTypes: [],
                 searched:false,
                 filter: {
-                    tagType: [], //标签类型
-                    controlType: [],
-                    tagAdscription: '', //标签归属
-                    tagSysName: '', //标签系统名称
-                    combinationName:'',//归属组合项
-                    name:'',      //填写单界面名称
+                    ruleId:'',//规则ID
+                    remind:'',      //规则信息
                 },
                 currentPage: 1,
                 pageSize: config.pageSize,
@@ -193,11 +182,8 @@
             },
             clearFilter(){
                 this.filter = {
-                    controlType: [],
-                    tagAdscription: '', //标签归属
-                    tagSysName: '', //标签系统名称
-                    combinationName:'',//归属组合项
-                    name:'',      //填写单界面名称
+                    ruleId:'',//规则ID
+                    remind:'',
                 }
             },
             getFilterItems(isTurnPage) {
@@ -206,6 +192,8 @@
                     this.clearFilter();
                 };
                 const param = {
+                    remind:this.filter.remind,
+                    ruleId:this.filter.ruleId,
                     current: this.inCurrentPage||this.currentPage,
                     size: this.pageSize,
                 };

src/components/RuleManager/RulesManager.vue

@@ -2,14 +2,11 @@
     <div>
         <crumbs title="规则维护">
             <el-form :inline="true">
-                <!--<el-form-item label="创建人：">
-                    <el-input size="mini" v-model="filter.combinationName" placeholder="归属组合项" clearable></el-input>
+                <el-form-item label="规则名：">
+                    <el-input size="mini" v-model="filter.pubName" placeholder="请输入规则名" clearable></el-input>
                 </el-form-item>
-                <el-form-item label="修改人：">
-                    <el-input size="mini" v-model="filter.name" placeholder="填写单界面名称" clearable></el-input>
-                </el-form-item>-->
                 <el-form-item>
-                   <!-- <el-button size="mini" @click="filterDatas">确认</el-button>-->
+                    <el-button size="mini" @click="filterDatas">确认</el-button>
                     <el-button size="mini" type="warning" @click="addRule">添加规则</el-button>
                 </el-form-item>
             </el-form>
@@ -116,17 +113,9 @@
         data: function() {
             return {
                 list: [],
-                tagTypes: [],
-                Adscriptions: [],
-                tagTypesList:[],
                 searched:false,
                 filter: {
-                    tagType: [], //标签类型
-                    controlType: [],
-                    tagAdscription: '', //标签归属
-                    tagSysName: '', //标签系统名称
-                    combinationName:'',//归属组合项
-                    name:'',      //填写单界面名称
+                    pubName:'',      //规则名
                 },
                 currentPage: 1,
                 pageSize: config.pageSize,
@@ -171,19 +160,6 @@
                 api.getRulesList(param).then((res) => {
                     loading.close()
                     const list = [...res.data.data.records];
-                    for (var i = 0; i < list.length; i++) {
-                        for (var j =  0; j < this.tagTypes.length; j++) {
-                            if(list[i].controlType == this.tagTypes[j].val) {
-                                list[i].tagTypeCn = this.tagTypes[j].name;
-                            }
-                        }
-                        //后台数据typeCn转换为筛选中对应的字段名称
-                        for (var z =  0; z < this.Adscriptions.length; z++) {
-                            if(list[i].type == this.Adscriptions[z].val) {
-                                list[i].typeCn = this.Adscriptions[z].name;
-                            }
-                        }
-                    }
                     this.list = list;
                     this.total = res.data.data.total;
                     if(this.inCurrentPage!==undefined){
@@ -234,12 +210,7 @@
             },
             clearFilter(){
                 this.filter = {
-                    tagType: [], //标签类型
-                    controlType: [],
-                    tagAdscription: '', //标签归属
-                    tagSysName: '', //标签系统名称
-                    combinationName:'',//归属组合项
-                    name:'',      //填写单界面名称
+                    pubName:'',      //规则名
                 }
             },
             getFilterItems(isTurnPage) {
@@ -248,15 +219,9 @@
                     this.clearFilter();
                 };
                 const param = {
-                    tagTypeList: [1],
-                    callType:1,
                     current: this.inCurrentPage||this.currentPage,
                     size: this.pageSize,
-                    type: this.filter.tagAdscription,
-                    tagName: this.filter.tagSysName.trim(),
-                    combinationName:this.filter.combinationName.trim(),
-                    name:this.filter.name.trim(),
-                    controlTypeList: this.filter.controlType[0] ? this.filter.controlType: []
+                    pubName:this.filter.pubName.trim(),
                 };
                 return param;
             },