Prechádzať zdrojové kódy

职级体系-体系表

lizhenhao 2 rokov pred
rodič
commit
8057b96ede

+ 46 - 0
src/api/rank/RankSystemTableService.js

@@ -0,0 +1,46 @@
+import request from '@/utils/httpRequest'
+
+export default class RankLevelService {
+  list (params) {
+    return request({
+      url: '/rank/rank_system_table/list',
+      method: 'get',
+      params: params
+    })
+  }
+  queryById (rankId, rcId, rsId) {
+    return request({
+      url: '/rank/rank_system_table/queryById',
+      method: 'get',
+      params: {rankId: rankId, rcId: rcId, rsId: rsId}
+    })
+  }
+  save (inputForm) {
+    return request({
+      url: `/rank/rank_system_table/save`,
+      method: 'post',
+      data: inputForm
+    })
+  }
+  queryAllRankLevel () {
+    return request({
+      url: '/rank/rank_system_table/queryAllRankLevel',
+      method: 'get',
+      params: {}
+    })
+  }
+  queryAllPosition () {
+    return request({
+      url: '/rank/rank_system_table/queryAllPosition',
+      method: 'get',
+      params: {}
+    })
+  }
+  queryAllPost () {
+    return request({
+      url: '/rank/rank_system_table/queryAllPost',
+      method: 'get',
+      params: {}
+    })
+  }
+}

+ 4 - 4
src/views/modules/rank/Rank.vue

@@ -20,7 +20,7 @@
         />
       </el-tab-pane>
       <el-tab-pane label="体系表" name="rankSystemTable" style="height: calc(100vh - 210px)" lazy>
-        <system-table
+        <rank-system-table
           i="rankSystemTable"
           :index="activeName"
         />
@@ -29,20 +29,20 @@
   </div>
 </template>
 <script>
-  // import rankSystemTable from './tabs/RankSystemTable'
+  import rankSystemTable from './tabs/RankSystemTableList'
   import rankSequence from './tabs/RankSequenceList'
   import rankLevel from './tabs/RankLevelList'
   import rank from './tabs/RankList'
   export default {
     components: {
-      // rankSystemTable,
+      rankSystemTable,
       rankSequence,
       rankLevel,
       rank
     },
     data () {
       return {
-        activeName: 'rank'
+        activeName: 'rankSystemTable'
       }
     },
     created () {

+ 2 - 2
src/views/modules/rank/tabs/RankLevelList.vue

@@ -15,8 +15,8 @@
         <template #buttons>
           <el-button v-if="hasPermission('rank:rank_level:add')" type="primary" size="small" icon="el-icon-plus" @click="add()">新建</el-button>
           <el-button v-if="hasPermission('rank:rank_level:del')" type="danger"   size="small" icon="el-icon-delete" @click="del()" :disabled="$refs.rankLevelTable && $refs.rankLevelTable.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_level:view')" disabled type="default" size="small"  @click="openSortDialog"  plain>排序</el-button>
+<!--          <el-button type="default" size="small"  @click="goLog()"  disabled plain>变更日志</el-button>-->
+<!--          <el-button v-if="hasPermission('rank:rank_level:view')" disabled type="default" size="small"  @click="openSortDialog"  plain>排序</el-button>-->
         </template>
       </vxe-toolbar>
 

+ 2 - 2
src/views/modules/rank/tabs/RankList.vue

@@ -31,8 +31,8 @@
         <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>
+<!--          <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>
 

+ 15 - 5
src/views/modules/rank/tabs/RankSequenceForm.vue

@@ -99,10 +99,12 @@
         visible: false,
         loading: false,
         inputForm: {
-          rankSequenceDTOList: []
+          rankSequenceDTOList: [],
+          change: false
         },
         isInclude: false,
-        firmList: []
+        firmList: [],
+        startInclude: false
       }
     },
     rankSequenceService: null,
@@ -112,12 +114,12 @@
     mounted () {
     },
     methods: {
-      init () {
+      async init () {
         this.title = '编辑序列'
         this.visible = true
         this.loading = true
         this.isInclude = false
-        this.rankSequenceService.getList().then(({data}) => {
+        await this.rankSequenceService.getList().then(({data}) => {
           this.inputForm.rankSequenceDTOList = data
           this.inputForm.rankSequenceDTOList.forEach(item => {
             if (item.rankSequenceDTOList.length !== 0) {
@@ -126,13 +128,21 @@
           })
           this.loading = false
         })
+        this.startInclude = this.isInclude
+        console.log(this.startInclude, this.isInclude)
       },
       // 表单提交
       doSubmit () {
         this.$refs['inputForm'].validate((valid) => {
           if (valid) {
             this.loading = true
-            this.rankSequenceService.save(this.inputForm.rankSequenceDTOList).then(({data}) => {
+            if (this.startInclude === this.isInclude) {
+              this.inputForm.change = false
+            } else {
+              this.inputForm.change = true
+            }
+            console.log(this.startInclude, this.isInclude)
+            this.rankSequenceService.save(this.inputForm).then(({data}) => {
               this.close()
               this.$message.success(data)
               this.$emit('refreshDataList')

+ 2 - 2
src/views/modules/rank/tabs/RankSequenceList.vue

@@ -31,8 +31,8 @@
         <template #buttons>
           <el-button v-if="hasPermission('rank:rank_sequence:add')" type="primary" size="small" icon="el-icon-plus" @click="add()">编辑</el-button>
           <el-button v-if="hasPermission('rank:rank_sequence:del')" type="danger"   size="small" icon="el-icon-delete" @click="del()" :disabled="$refs.rankSequenceTable && $refs.rankSequenceTable.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_sequence:view')" disabled type="default" size="small"  @click="openSortDialog"  plain>排序</el-button>
+<!--          <el-button type="default" size="small"  @click="goLog()"  disabled plain>变更日志</el-button>-->
+<!--          <el-button v-if="hasPermission('rank:rank_sequence:view')" disabled type="default" size="small"  @click="openSortDialog"  plain>排序</el-button>-->
         </template>
       </vxe-toolbar>
 

+ 217 - 0
src/views/modules/rank/tabs/RankSystemTableForm.vue

@@ -0,0 +1,217 @@
+<template>
+  <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="21">
+            <el-form-item label="职级名称" prop="rankName"
+                          :rules="[{required: true, message: '职级名称不能为空', trigger: 'blur'}
+                 ]">
+              <el-input disabled v-model="inputForm.rankName" placeholder="请填写职级名称"     ></el-input>
+            </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" style="margin-right: 0px" border>启用</el-radio>
+              <el-radio v-model="inputForm.useFlag" label="2" size="mini" border>禁用</el-radio>
+            </el-form-item>
+          </el-col>
+          <el-col :span="21">
+            <el-form-item label="序列" prop="sequenceName"
+                          :rules="[{required: true, message: '序列不能为空', trigger: 'blur'}
+                 ]">
+              <el-input disabled v-model="inputForm.sequenceName" placeholder="请填写序列名称"     ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="21" v-if="isShowC === true">
+            <el-form-item label="子序列" prop="sequenceChildName"
+                          :rules="[{required: true, message: '子序列不能为空', trigger: 'blur'}
+                 ]">
+              <el-input disabled v-model="inputForm.sequenceChildName" placeholder="请填写子序列名称"     ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="21">
+            <el-form-item label="职层" prop="levelName"
+                          :rules="[
+                 ]">
+              <el-select v-model="inputForm.rankRstLevelDTO.id" 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-col>
+          <el-col :span="21">
+            <el-form-item label="适应职务" prop="rankRstPositionDTOList"
+                          :rules="[
+                 ]">
+              <el-select v-model="inputForm.rankRstPositionDTOIdList" style="width:100%" multiple placeholder="请选择适应职务">
+                <el-option
+                  v-for="rankRstPositionDTO in rankRstPositionDTOList"
+                  :key="rankRstPositionDTO.id"
+                  :label="rankRstPositionDTO.name"
+                  :value="rankRstPositionDTO.id">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="21">
+            <el-form-item label="适应岗位" prop="rankRstPostDTOList"
+                          :rules="[
+                 ]">
+              <el-select v-model="inputForm.rankRstPostDTOIdList" style="width:100%" multiple placeholder="请选择适应岗位">
+                <el-option
+                  v-for="rankRstPostDTO in rankRstPostDTOList"
+                  :key="rankRstPostDTO.id"
+                  :label="rankRstPostDTO.name"
+                  :value="rankRstPostDTO.id">
+                </el-option>
+              </el-select>
+            </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 RankSystemTableService from '@/api/rank/RankSystemTableService'
+  export default {
+    data () {
+      return {
+        title: '',
+        method: '',
+        visible: false,
+        loading: false,
+        inputForm: {
+          id: '',
+          rankId: '',
+          rankName: '',
+          useFlag: '',
+          sequenceName: '',
+          sequenceChildName: '',
+          levelId: '',
+          levelName: '',
+          rankRstPositionDTOIdList: [],
+          rankRstPostDTOIdList: [],
+          rcId: '',
+          rsId: '',
+          rankRstLevelDTO: {
+            id: ''
+          }
+        },
+        isShowC: false,
+        rankLevelList: [],
+        rankRstPositionDTOList: [],
+        rankRstPostDTOList: []
+      }
+    },
+    rankSystemTableService: null,
+    created () {
+      this.rankSystemTableService = new RankSystemTableService()
+    },
+    methods: {
+      init (method, rankId, rcId, rsId, isShowC) {
+        this.isShowC = isShowC
+        this.method = method
+        this.inputForm = {
+          id: '',
+          rankId: '',
+          rankName: '',
+          useFlag: '',
+          sequenceName: '',
+          sequenceChildName: '',
+          levelId: '',
+          levelName: '',
+          rankRstPositionDTOIdList: [],
+          rankRstPostDTOIdList: [],
+          rcId: '',
+          rsId: '',
+          rankRstLevelDTO: {
+            id: ''
+          }
+        }
+        this.inputForm.rankId = rankId
+        this.inputForm.rcId = rcId
+        this.inputForm.rsId = rsId
+        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.rankSystemTableService.queryById(this.inputForm.rankId, this.inputForm.rcId, this.inputForm.rsId).then(({data}) => {
+              this.inputForm = this.recover(this.inputForm, data)
+              this.inputForm = JSON.parse(JSON.stringify(this.inputForm))
+              this.inputForm.rcId = rcId
+              this.inputForm.rsId = rsId
+              console.log('inputForm', this.inputForm)
+              this.loading = false
+            })
+          }
+        })
+      },
+      // 表单提交
+      doSubmit () {
+        this.$refs['inputForm'].validate((valid) => {
+          if (valid) {
+            this.loading = true
+            this.rankSystemTableService.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
+      },
+      queryAllRankLevel () {
+        this.rankSystemTableService.queryAllRankLevel().then(({data}) => {
+          this.rankLevelList = JSON.parse(JSON.stringify(data))
+        })
+      },
+      queryAllPosition () {
+        this.rankSystemTableService.queryAllPosition().then(({data}) => {
+          this.rankRstPositionDTOList = JSON.parse(JSON.stringify(data))
+        })
+      },
+      queryAllPost () {
+        this.rankSystemTableService.queryAllPost().then(({data}) => {
+          this.rankRstPostDTOList = JSON.parse(JSON.stringify(data))
+        })
+      }
+    }
+  }
+</script>

+ 189 - 0
src/views/modules/rank/tabs/RankSystemTableList.vue

@@ -0,0 +1,189 @@
+<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="name">
+        <el-input size="small" v-model="searchForm.name" placeholder="职层名称" clearable></el-input>
+      </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 type="default" size="small"  @click="goLog()"  disabled 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="rankSystemTable"
+          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="sequenceName" title="序列" :edit-render="{}"></vxe-column>
+          <vxe-column v-if="isShowC === true" field="sequenceChildName" title="子序列" :edit-render="{}"></vxe-column>
+          <vxe-column field="rankRstLevelDTO.name" title="职层" :edit-render="{}"></vxe-column>
+          <vxe-column field="rankName" title="职级名称" :edit-render="{}"></vxe-column>
+          <vxe-column field="rankRstPositionDTOList" title="适用职务" :edit-render="{}">
+            <template scope="scope" >
+              <el-tag v-for="(item, index) in scope.row.rankRstPositionDTOList">{{item.name}}</el-tag>
+            </template>
+          </vxe-column>
+          <vxe-column field="rankRstPostDTOList" title="适用岗位" :edit-render="{}">
+            <template scope="scope" >
+              <el-tag v-for="(item, index) in scope.row.rankRstPostDTOList">{{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_system_table:edit')" type="text" icon="el-icon-edit" size="small" @click="edit(scope.row)">修改</el-button>
+              <el-button v-if="hasPermission('rank:rank_system_table: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>
+    <RankSystemTableForm  ref="rankSystemTableForm" @refreshDataList="refreshList"></RankSystemTableForm>
+  </div>
+</template>
+
+<script>
+  import RankSystemTableService from '@/api/rank/RankSystemTableService'
+  import RankSystemTableForm from './RankSystemTableForm'
+  export default {
+    props: {
+      index: {
+        type: String,
+        default: ''
+      },
+      i: {
+        type: String,
+        default: ''
+      }
+    },
+    data () {
+      return {
+        searchForm: {
+        },
+        dataList: [],
+        tablePage: {
+          total: 0,
+          currentPage: 1,
+          pageSize: 10,
+          orders: []
+        },
+        loading: false,
+        isShowC: false
+      }
+    },
+    rankSystemTableService: null,
+    created () {
+      this.rankSystemTableService = new RankSystemTableService()
+    },
+    watch: {
+      index (index) {
+        if (index === this.i) {
+          this.isShowC = false
+          this.refreshList()
+        }
+      }
+    },
+    components: {
+      RankSystemTableForm
+    },
+    mounted () {
+      this.refreshList()
+    },
+
+    methods: {
+      goLog () {
+        this.$router.push({path: `/position/PositionLog`, query: {type: '1'}})
+      },
+      // 新增
+      add () {
+        this.$refs.rankSystemTableForm.init('add', '')
+      },
+      // 修改
+      edit (row) {
+        this.$refs.rankSystemTableForm.queryAllRankLevel()
+        this.$refs.rankSystemTableForm.queryAllPosition()
+        this.$refs.rankSystemTableForm.queryAllPost()
+        this.$refs.rankSystemTableForm.init('edit', row.rankId, row.rcId, row.rsId, this.isShowC)
+      },
+      // 查看
+      view (id) {
+        this.$refs.rankSystemTableForm.init('view', id)
+      },
+      // 获取数据列表
+      refreshList () {
+        this.loading = true
+        this.rankSystemTableService.list({
+          'current': this.tablePage.currentPage,
+          'size': this.tablePage.pageSize,
+          'orders': this.tablePage.orders,
+          ...this.searchForm
+        }).then(({data}) => {
+          this.dataList = data.records
+          this.dataList.forEach(item => {
+            if (item.sequenceChildName !== null && item.sequenceChildName !== undefined && item.sequenceChildName !== '') {
+              this.isShowC = true
+            }
+          })
+          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()
+      },
+      resetSearch () {
+        this.$refs.searchForm.resetFields()
+        this.refreshList()
+      }
+    }
+  }
+</script>

+ 21 - 23
src/views/modules/sys/userInfo/UserInfoForm.vue

@@ -1423,9 +1423,9 @@
         this.inputForm.signatureUrl = res.url
         this.$forceUpdate()
       },
-      handleAvatarSuccess3 (res, file ,scope) {
-          this.sysUserEducations[scope.$rowIndex].educationCertificateUrl = res.url
-          this.$forceUpdate()
+      handleAvatarSuccess3 (res, file, scope) {
+        this.sysUserEducations[scope.$rowIndex].educationCertificateUrl = res.url
+        this.$forceUpdate()
       },
       handleAvatarSuccess4 (res, file, scope) {
         this.sysUserEducations[scope.$rowIndex].degreeCertificateUrl = res.url
@@ -2098,12 +2098,11 @@
       },
 
       // 身份证验证
-      async validID(rule,value,callback)
-      {
+      async validID (rule, value, callback) {
         // 身份证号码为15位或者18位,15位时全为数字,18位前17位为数字,最后一位是校验位,可能为数字或字符X
         let reg = /(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/
         if (reg.test(value)) {
-          await this.go(value.length);
+          await this.go(value.length)
           // callback()
         } else {
           // callback(new Error('身份证号码不正确'))
@@ -2112,25 +2111,24 @@
 
       // 实现自动生成生日/年龄
       go (val) {
-        let iden = this.inputForm.idCard;
-        let sex = null;
-        let birth = null;
-        let myDate = new Date();
-        let month = myDate.getMonth() + 1;
-        let day = myDate.getDate();
-        let age = 0;
-
-        if(val===18){
-          age = myDate.getFullYear() - iden.substring(6, 10) - 1;
-          sex = iden.substring(16,17);
-          birth = iden.substring(6,10)+"-"+iden.substring(10,12)+"-"+iden.substring(12,14);
+        let iden = this.inputForm.idCard
+        let sex = null
+        let birth = null
+        let myDate = new Date()
+        let month = myDate.getMonth() + 1
+        let day = myDate.getDate()
+        let age = 0
+
+        if (val === 18) {
+          age = myDate.getFullYear() - iden.substring(6, 10) - 1
+          sex = iden.substring(16, 17)
+          birth = iden.substring(6, 10) + '-' + iden.substring(10, 12) + '-' + iden.substring(12, 14)
           if ((iden.substring(10, 12) < month || iden.substring(10, 12) === month) && iden.substring(12, 14) <= day) age++
-
         }
-        if(val===15){
-          age = myDate.getFullYear() - iden.substring(6, 8) - 1901;
-          sex = iden.substring(13,14);
-          birth = "19"+iden.substring(6,8)+"-"+iden.substring(8,10)+"-"+iden.substring(10,12);
+        if (val === 15) {
+          age = myDate.getFullYear() - iden.substring(6, 8) - 1901
+          sex = iden.substring(13, 14)
+          birth = '19' + iden.substring(6, 8) + '-' + iden.substring(8, 10) + '-' + iden.substring(10, 12)
           if ((iden.substring(8, 10) < month || iden.substring(8, 10) === month) && iden.substring(10, 12) <= day) age++
         }
         this.inputForm.age = age