独立填写单增加归属组合项及界面名称列及检索条件

src/components/preTreat/CombinQuestion.vue

@@ -203,6 +203,7 @@
         let param = {
           tagTypeList: this.filter.tagType[0] ? this.filter.tagType: [4,6],
           current: this.currentPage,
+          callType:2,
           size: this.pageSize,
           type: this.filter.tagAdscription,
           tagName: this.filter.tagSysName,

src/components/preTreat/SimpleQuestion.vue

@@ -1,6 +1,6 @@
 <template>
     <div>
-        <crumbs title="独立填写单维护">
+        <crumbs title="独立填写单维护" class="simpleQ-crumb">
             <el-form :inline="true" class="demo-form-inline">
                 <el-form-item label="归属：">
                     <el-select size="mini" v-model="filter.tagAdscription"  placeholder="归属" clearable>
@@ -12,6 +12,12 @@
                         <el-option v-for="item in tagTypes" :label="item.name" :value="item.val" :key="item.id"></el-option>
                     </el-select>
                 </el-form-item>
+                <el-form-item label="归属组合项：">
+                    <el-input size="mini" v-model="filter.combinationName" 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 label="填写单系统名称：">
                     <el-input size="mini" v-model="filter.tagSysName" placeholder="填写单系统名称" clearable></el-input>
                 </el-form-item>
@@ -21,7 +27,7 @@
                 </el-form-item>
             </el-form>
         </crumbs>
-        <div class="contents">
+        <div class="contents simpleQ-contents">
             <el-table
                     :data="list"
                     border
@@ -44,6 +50,11 @@
                         prop="tagName"
                         label="填写单系统名称">
                 </el-table-column>
+                <el-table-column
+                        :resizable = "false"
+                        prop="name"
+                        label="填写单界面名称">
+                </el-table-column>
                 <el-table-column
                         :resizable = "false"
                         prop="typeCn"
@@ -55,6 +66,11 @@
                         prop="tagTypeCn"
                         label="类型">
                 </el-table-column>
+                <el-table-column
+                        :resizable = "false"
+                        prop="combinationName"
+                        label="归属组合项">
+                </el-table-column>
                 <el-table-column
                         :resizable = "false"
                         prop="modifier"
@@ -104,6 +120,8 @@
           controlType: [],
           tagAdscription: '', //标签归属
           tagSysName: '', //标签系统名称
+          combinationName:'',//归属组合项
+          name:'',      //填写单界面名称
         },
         currentPage: 1,
         pageSize: 10,
@@ -214,22 +232,30 @@
         //     this.getDataList();
         // }
       },
+      clearFilter(){
+        this.filter = {
+          tagType: [], //标签类型
+          controlType: [],
+          tagAdscription: '', //标签归属
+          tagSysName: '', //标签系统名称
+          combinationName:'',//归属组合项
+          name:'',      //填写单界面名称
+        }
+      },
       getFilterItems(isTurnPage) {
         //翻页时筛选条件没点确定则清空
         if(isTurnPage&&!this.searched){
-          this.filter = {
-            tagType: [], //标签类型
-            controlType: [],
-            tagAdscription: '', //标签归属
-            tagSysName: '', //标签系统名称
-          }
+          this.clearFilter();
         };
         const param = {
           tagTypeList: [1],
+          callType:1,
           current: this.currentPage,
           size: this.pageSize,
           type: this.filter.tagAdscription,
           tagName: this.filter.tagSysName,
+          combinationName:this.filter.combinationName,
+          name:this.filter.name,
           controlTypeList: this.filter.controlType[0] ? this.filter.controlType: []
         };
         return param;
@@ -265,12 +291,7 @@
             if(res.data.code=='0'){
               if(!this.searched){
                 //未点确认时清空搜索条件
-                this.filter={
-                    tagType: [], //标签类型
-                    controlType: [],
-                    tagAdscription: '', //标签归属
-                    tagSysName: '', //标签系统名称
-                };
+                this.clearFilter();
               }
               if(this.list.length==1){
                 //当前在最后一页且只有一条数据时，删除后跳到前一页
@@ -305,4 +326,17 @@
     .el-select .el-input .el-icon-circle-close{
         float:left;
     }
+    .container.simpleQ-crumb{
+        height:90px!important;
+    }
+    .simpleQ-crumb .contents{
+        max-width: 870px;
+        text-align: right;
+    }
+    .contents.simpleQ-contents{
+        padding-top:120px;
+    }
+    .simpleQ-crumb .el-form--inline .el-form-item{
+        margin-bottom: 0;
+    }
 </style>