体系表加筛选条件

src/views/modules/rank/tabs/RankList.vue

@@ -146,7 +146,6 @@
       index (index) {
         if (index === this.i) {
           this.refreshList()
-          this.getAllSequence()
         }
       }
     },
@@ -182,6 +181,7 @@
       // 获取数据列表
       refreshList () {
         this.loading = true
+        this.getAllSequence()
         this.rankService.list({
           'current': this.tablePage.currentPage,
           'size': this.tablePage.pageSize,

src/views/modules/rank/tabs/RankSequenceList.vue

@@ -139,7 +139,6 @@
       index (index) {
         if (index === this.i) {
           this.refreshList()
-          this.getAllFirm()
         }
       }
     },
@@ -163,6 +162,7 @@
       // 获取数据列表
       refreshList () {
         this.loading = true
+        this.getAllFirm()
         this.rankSequenceService.list({
           'current': this.tablePage.currentPage,
           'size': this.tablePage.pageSize,

src/views/modules/rank/tabs/RankSystemTableList.vue

@@ -5,6 +5,16 @@
       <el-form-item prop="rankName">
         <el-input size="small" v-model="searchForm.rankName" placeholder="职级名称" clearable></el-input>
       </el-form-item>
+      <el-form-item prop="levelId" :rules="[]">
+        <el-select v-model="searchForm.levelId" style="width:100%" placeholder="请选择职层名称">
+          <el-option
+            v-for="rankLevel in rankLevelList"
+            :key="rankLevel.id"
+            :label="rankLevel.name"
+            :value="rankLevel.id">
+          </el-option>
+        </el-select>
+      </el-form-item>
       <!--<el-form-item prop="name">
         <el-input size="small" v-model="searchForm.sequenceChildName" placeholder="子序列名称" clearable></el-input>
       </el-form-item>
@@ -181,8 +191,14 @@
             }
           })
           this.tablePage.total = data.total
+          this.queryAllRankLevel()
+          this.loading = false
+        }).catch(() => {
+          this.loading = false
+        }).finally(() => {
           this.loading = false
         })
+
       },
       // 当前页
       currentChangeHandle ({currentPage, pageSize}) {

src/views/modules/sys/userInfo/UserInfoForm.vue

@@ -2165,7 +2165,7 @@
       },
       showPhoto (url) {
         this.onPreview(url)
-        return
+        // return
       },
       // 身份证验证
       async validID (rule, value, callback) {