Browse Source

职级加筛选条件

lizhenhao 2 years atrás
parent
commit
d3cc40859d

+ 2 - 0
src/views/modules/rank/tabs/RankSequenceForm.vue

@@ -71,6 +71,8 @@
     rankSequenceService: null,
     created () {
       this.rankSequenceService = new RankSequenceService()
+    },
+    mounted () {
       this.getAllFirm()
     },
     methods: {

+ 24 - 1
src/views/modules/rank/tabs/RankSequenceList.vue

@@ -5,6 +5,22 @@
       <el-form-item prop="name">
         <el-input size="small" v-model="searchForm.name" placeholder="序列名称" clearable></el-input>
       </el-form-item>
+      <el-form-item prop="officeIdList" :rules="[]">
+        <el-select v-model="searchForm.officeIdList" style="width:100%" multiple placeholder="请选择适用范围">
+          <el-option
+            v-for="office in firmList"
+            :key="office.id"
+            :label="office.name"
+            :value="office.id">
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item prop="useFlag" :rules="[]">
+        <el-select v-model="searchForm.useFlag" style="width:100%" placeholder="请选择启用状态">
+          <el-option key="1" label="已启用" value="1"></el-option>
+          <el-option key="2" label="禁用" value="2"></el-option>
+        </el-select>
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" @click="refreshList()" size="small" icon="el-icon-search">查询</el-button>
         <el-button @click="resetSearch()" size="small" icon="el-icon-refresh-right">重置</el-button>
@@ -100,7 +116,8 @@
           pageSize: 10,
           orders: []
         },
-        loading: false
+        loading: false,
+        firmList: []
       }
     },
     rankSequenceService: null,
@@ -119,6 +136,7 @@
     },
     mounted () {
       this.refreshList()
+      this.getAllFirm()
     },
 
     methods: {
@@ -197,6 +215,11 @@
         this.rankSequenceService.updateSort(dataListSort).then(() => {
           this.refreshList()
         })
+      },
+      getAllFirm () {
+        this.rankSequenceService.queryAllFirm().then(({data}) => {
+          this.firmList = JSON.parse(JSON.stringify(data))
+        })
       }
     }
   }

+ 0 - 2
src/views/modules/sys/workClient/WorkClientForm.vue

@@ -226,7 +226,6 @@
           show-overflow
           ref="xTable1"
           class="vxe-table-element"
-          height="200"
           :data="bankInfos"
           style="margin-left: 5em"
           @cell-click="dbclickFun"
@@ -270,7 +269,6 @@
           show-overflow
           ref="xTable2"
           class="vxe-table-element"
-          height="200"
           :data="linkmanInfos"
           style="margin-left: 5em"
           @cell-click="dbclickFun"