职级模块开发

src/api/rank/RankService.js

@@ -0,0 +1,46 @@
+import request from '@/utils/httpRequest'
+
+export default class RankService {
+  list (params) {
+    return request({
+      url: '/rank/rank/list',
+      method: 'get',
+      params: params
+    })
+  }
+  queryById (id) {
+    return request({
+      url: '/rank/rank/queryById',
+      method: 'get',
+      params: {id: id}
+    })
+  }
+  save (inputForm) {
+    return request({
+      url: `/rank/rank/save`,
+      method: 'post',
+      data: inputForm
+    })
+  }
+  delete (ids) {
+    return request({
+      url: '/rank/rank/delete',
+      method: 'delete',
+      params: {ids: ids}
+    })
+  }
+  updateSort (params) {
+    return request({
+      url: `/rank/rank/updateSort`,
+      method: 'post',
+      data: params
+    })
+  }
+  queryAllSequence (params) {
+    return request({
+      url: '/rank/rank/queryAllSequence',
+      method: 'get',
+      params: params
+    })
+  }
+}

src/views/modules/rank/Rank.vue

@@ -31,10 +31,12 @@
 <script>
   import rankSequence from './tabs/RankSequenceList'
   import rankLevel from './tabs/RankLevelList'
+  import rank from './tabs/RankList'
   export default {
     components: {
       rankSequence,
-      rankLevel
+      rankLevel,
+      rank
     },
     data () {
       return {

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

@@ -0,0 +1,135 @@
+<template xmlns:v-slot="http://www.w3.org/1999/XSL/Transform">
+  <div>
+    <el-dialog
+      :title="title"
+      :close-on-click-modal="false"
+      v-dialogDrag
+      width="1000px"
+      @close="close"
+      @keyup.enter.native="doSubmit"
+      :visible.sync="visible">
+      <el-form size="middle" :model="inputForm" ref="inputForm" v-loading="loading" :class="method==='view'?'readonly':''"  :disabled="method==='view'"
+               label-width="100px" @submit.native.prevent>
+        <el-row  :gutter="15">
+          <el-col :span="12">
+            <el-form-item label="分组名称" prop="groupName"
+                          :rules="[{required: true, message: '分组名称不能为空', trigger: 'blur'}
+                 ]">
+              <el-input v-model="inputForm.groupName" placeholder="请填写分组名称"     ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="适用序列" prop="sequenceIdList" :rules="[
+            {required: true, message: '适用序列不能为空', trigger: 'blur'}]">
+              <el-select v-model="inputForm.sequenceIdList" style="width:100%" multiple placeholder="请选择">
+                <el-option
+                  v-for="sequence in sequenceList"
+                  :key="sequence.id"
+                  :label="sequence.name"
+                  :value="sequence.id">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="21">
+            <el-form-item label="状态" prop="useFlag"
+                          :rules="[{required: true, message: '状态不能为空', trigger: 'blur'}
+                 ]">
+              <el-radio v-model="inputForm.useFlag" label="1" size="mini" border>已启用</el-radio>
+              <el-radio v-model="inputForm.useFlag" label="2" size="mini" border>禁用</el-radio>
+            </el-form-item>
+          </el-col>
+
+
+        </el-row>
+
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+      <el-button size="small" @click="close()" icon="el-icon-circle-close">关闭</el-button>
+      <el-button size="small" type="primary" v-if="method != 'view'" @click="doSubmit()" icon="el-icon-circle-check" v-noMoreClick>确定</el-button>
+    </span>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+  import RankService from '@/api/rank/RankService'
+  export default {
+    data () {
+      return {
+        title: '',
+        method: '',
+        visible: false,
+        loading: false,
+        inputForm: {
+          groupName: '',
+          sequenceIdList: [],
+          useFlag: ''
+        },
+        sequenceList: []
+      }
+    },
+    rankService: null,
+    created () {
+      this.rankService = new RankService()
+    },
+    mounted () {
+    },
+    methods: {
+      init (method, id) {
+        this.method = method
+        this.inputForm = {
+          groupName: '',
+          sequenceIdList: [],
+          useFlag: ''
+        }
+        this.inputForm.id = id
+        if (method === 'add') {
+          this.title = `新建序列`
+        } else if (method === 'edit') {
+          this.title = '修改序列'
+        } else if (method === 'view') {
+          this.title = '查看序列'
+        }
+        this.visible = true
+        this.loading = false
+        this.$nextTick(() => {
+          this.$refs.inputForm.resetFields()
+          if (method === 'edit' || method === 'view') { // 修改或者查看
+            this.loading = true
+            this.rankService.queryById(this.inputForm.id).then(({data}) => {
+              this.inputForm = this.recover(this.inputForm, data)
+              this.inputForm = JSON.parse(JSON.stringify(this.inputForm))
+              this.loading = false
+            })
+          }
+        })
+      },
+      // 表单提交
+      doSubmit () {
+        this.$refs['inputForm'].validate((valid) => {
+          if (valid) {
+            this.loading = true
+            this.rankService.save(this.inputForm).then(({data}) => {
+              this.close()
+              this.$message.success(data)
+              this.$emit('refreshDataList')
+              this.loading = false
+            }).catch(() => {
+              this.loading = false
+            })
+          }
+        })
+      },
+      close () {
+        this.$refs.inputForm.resetFields()
+        this.visible = false
+      },
+      getAllSequence () {
+        this.rankService.queryAllSequence().then(({data}) => {
+          this.sequenceList = JSON.parse(JSON.stringify(data))
+        })
+      }
+    }
+  }
+</script>

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

@@ -0,0 +1,233 @@
+<template>
+  <div class="page">
+    <el-form size="small" :inline="true" class="query-form" ref="searchForm" :model="searchForm" @keyup.enter.native="refreshList()" @submit.native.prevent>
+      <!-- 搜索框-->
+      <el-form-item prop="groupName">
+        <el-input size="small" v-model="searchForm.groupName" placeholder="分组名称" clearable></el-input>
+      </el-form-item>
+      <el-form-item prop="sequenceIdList" :rules="[]">
+        <el-select v-model="searchForm.sequenceIdList" style="width:100%" multiple placeholder="请选择适用序列">
+          <el-option
+            v-for="sequence in sequenceList"
+            :key="sequence.id"
+            :label="sequence.name"
+            :value="sequence.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>
+      </el-form-item>
+    </el-form>
+    <div class="bg-white top" style="">
+      <vxe-toolbar :refresh="{query: refreshList}" custom>
+        <template #buttons>
+          <el-button v-if="hasPermission('rank:rank:add')" type="primary" size="small" icon="el-icon-plus" @click="add()">新建</el-button>
+          <el-button v-if="hasPermission('rank:rank:del')" type="danger"   size="small" icon="el-icon-delete" @click="del()" :disabled="$refs.rankTable && $refs.rankTable.getCheckboxRecords().length === 0" plain>删除</el-button>
+          <el-button type="default" size="small"  @click="goLog()"  disabled plain>变更日志</el-button>
+          <el-button v-if="hasPermission('rank:rank:view')" disabled type="default" size="small"  @click="openSortDialog"  plain>排序</el-button>
+        </template>
+      </vxe-toolbar>
+
+      <div style="height: calc(100% - 80px)">
+        <vxe-table
+          border="inner"
+          auto-resize
+          resizable
+          height="auto"
+          :loading="loading"
+          size="small"
+          ref="rankTable"
+          show-header-overflow
+          show-overflow
+          highlight-hover-row
+          :menu-config="{}"
+          @sort-change="sortChangeHandle"
+          :sort-config="{remote:true}"
+          :data="dataList"
+          :checkbox-config="{}">
+          <vxe-column type="seq" width="40"></vxe-column>
+          <vxe-column type="checkbox" width="40" ></vxe-column>
+          <vxe-column field="groupName" title="分组名称" :edit-render="{}"></vxe-column>
+          <vxe-column field="sequenceDTOList" title="适用序列" :edit-render="{}">
+            <template scope="scope" >
+              <el-tag v-for="(item, index) in scope.row.sequenceDTOList">{{item.name}}</el-tag>
+            </template>
+          </vxe-column>
+          <vxe-column field="useFlag" title="状态" :edit-render="{}">
+            <template  slot-scope="scope">
+              <el-tag type="success" v-if="scope.row.useFlag === '1' ">已启用</el-tag>
+              <el-tag type="danger" v-if="scope.row.useFlag === '2' ">禁用</el-tag>
+            </template>
+          </vxe-column>
+          <vxe-column title="操作" width="200px" fixed="right" align="center">
+            <template  slot-scope="scope">
+
+              <el-button v-if="hasPermission('rank:rank:edit')" type="text" icon="el-icon-edit" size="small" @click="edit(scope.row.id)">修改</el-button>
+              <el-button v-if="hasPermission('rank:rank:del')" type="text"  icon="el-icon-delete" size="small" @click="del(scope.row.id)">删除</el-button>
+            </template>
+          </vxe-column>
+        </vxe-table>
+        <vxe-pager
+          background
+          size="small"
+          :current-page="tablePage.currentPage"
+          :page-size="tablePage.pageSize"
+          :total="tablePage.total"
+          :page-sizes="[10, 20, 100, 1000, {label: '全量数据', value: 1000000}]"
+          :layouts="['PrevPage', 'JumpNumber', 'NextPage', 'FullJump', 'Sizes', 'Total']"
+          @page-change="currentChangeHandle">
+        </vxe-pager>
+      </div>
+    </div>
+    <RankForm  ref="rankForm" @refreshDataList="refreshList"></RankForm>
+  </div>
+</template>
+
+<script>
+  import RankService from '@/api/rank/RankService'
+  import RankForm from './RankForm'
+  export default {
+    props: {
+      index: {
+        type: String,
+        default: ''
+      },
+      i: {
+        type: String,
+        default: ''
+      }
+    },
+    data () {
+      return {
+        sequenceList: [],
+        searchForm: {
+          groupName: '',
+          useFlag: '',
+          sequenceIdList: []
+        },
+        dataList: [],
+        tablePage: {
+          total: 0,
+          currentPage: 1,
+          pageSize: 10,
+          orders: []
+        },
+        loading: false,
+        firmList: []
+      }
+    },
+    rankService: null,
+    created () {
+      this.rankService = new RankService()
+    },
+    watch: {
+      index (index) {
+        if (index === this.i) {
+          this.refreshList()
+          this.getAllSequence()
+        }
+      }
+    },
+    components: {
+      RankForm
+    },
+    mounted () {
+      this.refreshList()
+    },
+
+    methods: {
+      goLog () {
+        this.$router.push({path: `/position/PositionLog`, query: {type: '1'}})
+      },
+      // 新增
+      add () {
+        this.$refs.rankForm.init('add', '')
+        this.$refs.rankForm.getAllSequence()
+      },
+      // 修改
+      edit (id) {
+        id = id || this.$refs.rankTable.getCheckboxRecords().map(item => {
+          return item.id
+        })[0]
+        this.$refs.rankForm.init('edit', id)
+        this.$refs.rankForm.getAllSequence()
+      },
+      // 查看
+      view (id) {
+        this.$refs.rankForm.init('view', id)
+        this.$refs.rankForm.getAllSequence()
+      },
+      // 获取数据列表
+      refreshList () {
+        this.loading = true
+        this.rankService.list({
+          'current': this.tablePage.currentPage,
+          'size': this.tablePage.pageSize,
+          'orders': this.tablePage.orders,
+          ...this.searchForm
+        }).then(({data}) => {
+          this.dataList = data.records
+          this.tablePage.total = data.total
+          this.loading = false
+        })
+      },
+      // 当前页
+      currentChangeHandle ({currentPage, pageSize}) {
+        this.tablePage.currentPage = currentPage
+        this.tablePage.pageSize = pageSize
+        this.refreshList()
+      },
+      // 排序
+      sortChangeHandle (column) {
+        this.tablePage.orders = []
+        if (column.order != null) {
+          this.tablePage.orders.push({column: this.$utils.toLine(column.property), asc: column.order === 'asc'})
+        }
+        this.refreshList()
+      },
+      // 删除
+      del (id) {
+        let ids = id || this.$refs.rankTable.getCheckboxRecords().map(item => {
+          return item.id
+        }).join(',')
+        this.$confirm(`确定删除所选项吗?`, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          this.loading = true
+          this.rankService.delete(ids).then(({data}) => {
+            this.$message.success(data)
+            this.refreshList()
+            this.loading = false
+          })
+        })
+      },
+      resetSearch () {
+        this.$refs.searchForm.resetFields()
+        this.refreshList()
+      },
+      openSortDialog () {
+        this.$refs.sortTableDialog.init(this.dataList)
+      },
+      dataSort (dataListSort) {
+        this.rankService.updateSort(dataListSort).then(() => {
+          this.refreshList()
+        })
+      },
+      getAllSequence () {
+        this.rankService.queryAllSequence().then(({data}) => {
+          this.sequenceList = JSON.parse(JSON.stringify(data))
+        })
+      }
+    }
+  }
+</script>

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

@@ -73,7 +73,6 @@
       this.rankSequenceService = new RankSequenceService()
     },
     mounted () {
-      this.getAllFirm()
     },
     methods: {
       init (method, id) {

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

@@ -128,6 +128,7 @@
       index (index) {
         if (index === this.i) {
           this.refreshList()
+          this.getAllFirm()
         }
       }
     },
@@ -136,7 +137,6 @@
     },
     mounted () {
       this.refreshList()
-      this.getAllFirm()
     },
 
     methods: {
@@ -146,6 +146,7 @@
       // 新增
       add () {
         this.$refs.rankSequenceForm.init('add', '')
+        this.$refs.rankSequenceForm.getAllFirm()
       },
       // 修改
       edit (id) {
@@ -153,10 +154,12 @@
           return item.id
         })[0]
         this.$refs.rankSequenceForm.init('edit', id)
+        this.$refs.rankSequenceForm.getAllFirm()
       },
       // 查看
       view (id) {
         this.$refs.rankSequenceForm.init('view', id)
+        this.$refs.rankSequenceForm.getAllFirm()
       },
       // 获取数据列表
       refreshList () {

src/views/modules/sys/workClient/WorkClientForm.vue

@@ -10,44 +10,64 @@
       :visible.sync="visible">
       <el-form size="middle" :model="inputForm" ref="inputForm" v-loading="loading" :class="method==='view'?'readonly':''"  :disabled="method==='view'"
                label-width="150px">
-        <el-row  :gutter="15">
-          <el-col :span="18">
+        <el-row  :gutter="0">
+          <el-col :span="10">
             <el-form-item label="客户名称" prop="workClientInfo.name" :rules="[
                   {required: true, message:'请输入客户名称', trigger:'blur'}
                 ]">
               <el-input v-model="inputForm.workClientInfo.name" placeholder="请输入客户名称"></el-input>
             </el-form-item>
           </el-col>
-            <el-col :span="6">
-            <el-popover
-              v-model="visable"
-              placement="left"
-              width="400"
-              height="800"
-              trigger="click"
-              :popper-options="{ boundariesElement: 'viewport', removeOnDestroy: true }"
-              ref="pops">
-              <vxe-table
-                border="inner"
-                auto-resize
-                resizable
-                :row-config="{isHover: true}"
-                :data="gridData"
-                :checkbox-config="{}"
-                :row-style="rowStyle"
-                @cell-click="rowClick"
-                :show-header="false"
-              >
-                <vxe-column title="" field="entname" ></vxe-column>
-              </vxe-table>
-
-              <el-button type="info" slot="reference" @click="getPopTable" style="width: 100%" plain>查询</el-button>
-
-            </el-popover>
+            <el-col :span="2">
+              <el-popover
+                v-model="visable"
+                placement="left"
+                width="400"
+                height="800"
+                trigger="click"
+                :popper-options="{ boundariesElement: 'viewport', removeOnDestroy: true }"
+                ref="pops">
+                <vxe-table
+                  border="inner"
+                  auto-resize
+                  resizable
+                  :row-config="{isHover: true}"
+                  :data="gridData"
+                  :checkbox-config="{}"
+                  :row-style="rowStyle"
+                  @cell-click="rowClick"
+                  :show-header="false"
+                >
+                  <vxe-column title="" field="entname" ></vxe-column>
+                </vxe-table>
+
+                <el-button type="info" slot="reference" @click="getPopTable" style="width: 100%" plain>查询</el-button>
+
+              </el-popover>
             <el-form-item>
 
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item label="归属区域" prop="workClientInfo.areaId"
+                          :rules="[
+                   {required: true, message:'请选择归属区域', trigger:'blur'}
+                 ]">
+              <SelectTree
+                ref="areaTree"
+                :props="{
+                      value: 'id',             // ID字段名
+                      label: 'name',         // 显示名称
+                      children: 'children'    // 子级字段名
+                    }"
+                url="/sys/area/treeData"
+                :value="inputForm.workClientInfo.areaId"
+                :clearable="true"
+                :accordion="true"
+                v-if="visible"
+                @getValue="(value) => {inputForm.workClientInfo.areaId=value}"/>
+            </el-form-item>
+          </el-col>
         </el-row>
         <el-row  :gutter="15">
 
@@ -65,7 +85,7 @@
 
           <el-col :span="12">
             <el-form-item label="统一社会信用代码" prop="workClientInfo.uscCode" v-if="inputForm.workClientInfo.hasUscc === '1'"
-                 :rules="[
+                          :rules="[
                    {required: true, message:'请输入统一社会信用代码', trigger:'blur'}
                  ]">
               <el-input v-model="inputForm.workClientInfo.uscCode" placeholder="请输入统一社会信用代码"></el-input>
@@ -169,26 +189,7 @@
             </el-form-item>
           </el-col>
 
-          <el-col :span="12">
-            <el-form-item label="归属区域" prop="workClientInfo.areaId"
-                          :rules="[
-                   {required: true, message:'请选择归属区域', trigger:'blur'}
-                 ]">
-              <SelectTree
-                ref="areaTree"
-                :props="{
-                      value: 'id',             // ID字段名
-                      label: 'name',         // 显示名称
-                      children: 'children'    // 子级字段名
-                    }"
-                url="/sys/area/treeData"
-                :value="inputForm.workClientInfo.areaId"
-                :clearable="true"
-                :accordion="true"
-                v-if="visible"
-                @getValue="(value) => {inputForm.workClientInfo.areaId=value}"/>
-            </el-form-item>
-          </el-col>
+
 
           <el-col :span="24">
             <el-form-item label="注册地址" prop="workClientInfo.registerAddress">
@@ -676,7 +677,9 @@
               const deputyList = []
               if (data.workClientInfo.deputy !== null && data.workClientInfo.deputy !== undefined && data.workClientInfo.deputy !== '') {
                 data.workClientInfo.deputy.split(',').forEach(item => {
-                  deputyList.push(item)
+                  if (item !== null && item !== undefined && item !== '') {
+                    deputyList.push(item)
+                  }
                 })
               }
               this.inputForm.workClientInfo = JSON.parse(JSON.stringify(data.workClientInfo))