Просмотр исходного кода

个人档案维护人员考核和授权表名和字段变化修改

shenqilong 1 год назад
Родитель
Сommit
f2a0442029

+ 6 - 6
src/views/component/personnelFile/components/modulesTag.vue

@@ -71,11 +71,11 @@
                     </el-tabs>
                 </div>
             </el-tab-pane>
-            <el-tab-pane v-if="judgeTagStair(['jyrykhjlb','lhrynlqr'])" label="人员考核与授权" name="rykhysq" class="tabPane">
+            <el-tab-pane v-if="judgeTagStair(['khjlqrb','khjlqrb'])" label="人员考核与授权" name="rykhysq" class="tabPane">
                 <div class="paneAll innerTabs">
                     <el-tabs v-model="activeNameTabInnerRY" tab-position="left" style="height:100%" @tab-click="handleClickRY">
-                        <el-tab-pane v-if="judgeTag('jyrykhjlb')" label="考核记录" name="jyrykhjlb" class="tabPane shadowNone paddingInner">
-                            <public-list ref="jyrykhjlb" class="paneAll" :plane-data="judgeDataAll('jyrykhjlb')" :tab-name="'jyrykhjlb'" :button-type="buttonType" :btn-show="btnShow" :btn-type="btnType" @changeButtonShow="changeButtonShow" @changeBaseData="changeBaseData" />
+                        <el-tab-pane v-if="judgeTag('khjlqrb')" label="考核记录" name="khjlqrb" class="tabPane shadowNone paddingInner">
+                            <public-list ref="khjlqrb" class="paneAll" :plane-data="judgeDataAll('khjlqrb')" :tab-name="'khjlqrb'" :button-type="buttonType" :btn-show="btnShow" :btn-type="btnType" @changeButtonShow="changeButtonShow" @changeBaseData="changeBaseData" />
                         </el-tab-pane>
                         <el-tab-pane v-if="judgeTag('lhrynlqr')" label="人员岗位授权" name="lhrynlqr" class="tabPane shadowNone paddingInner">
                             <public-list ref="lhrynlqr" class="paneAll" :plane-data="judgeDataAll('lhrynlqr')" :tab-name="'lhrynlqr'" :button-type="buttonType" :btn-show="btnShow" :btn-type="btnType" @changeButtonShow="changeButtonShow" @changeBaseData="changeBaseData" />
@@ -182,7 +182,7 @@ export default {
             userId,
             activeNameTab: this.activeName,
             activeNameTabInner: 'kyxmglb',
-            activeNameTabInnerRY: 'jyrykhjlb',
+            activeNameTabInnerRY: 'khjlqrb',
             activeNameTabPXInnerRY: 'lhrypxjlb',
             jurisdictionKYGL: {
                 kyxmglb: 'reviewTableKYXM',
@@ -231,7 +231,7 @@ export default {
             }
             switch (val.name) {
                 case 'rykhysq':
-                    this.handleClickRY({ name: 'jyrykhjlb' })
+                    this.handleClickRY({ name: 'khjlqrb' })
                     break
                 case 'pxgl':
                     this.handleClickRY({ name: 'lhrypxjlb' })
@@ -247,7 +247,7 @@ export default {
             }
         },
         handleClickRY (val) {
-            const arr = ['jyrykhjlb', 'lhrynlqr', 'lhrypxjlb', 'lhpxsqb', 'kaoshijilu', 'tjbgb']
+            const arr = ['khjlqrb', 'lhrynlqr', 'lhrypxjlb', 'lhpxsqb', 'kaoshijilu', 'tjbgb']
             arr.forEach(item => {
                 if (typeof this.$refs[item] !== 'undefined' && typeof this.$refs[item].$refs['reviewTable' + item] !== 'undefined') {
                     setTimeout(() => {

+ 19 - 19
src/views/component/personnelFile/constants/simulated.js

@@ -422,14 +422,14 @@ export const data = '{"id":"","shiFouGuoShen":"已编制","jiaoYuId":"1315704890
 export function correlationSql (type, val) {
     let sql = ``
     const col = {
-        jyrykhjlb: 'bei_kao_he_ren_yu',
+        khjlqrb: 'bei_kao_he_ren_',
         lhrynlqr: 'bei_shou_quan_ren',
         lhrypxjlb: 'peixunrenyuan',
         lhpxsqb: 'can_jia_ren_yuan_',
         kaoshijilu: 'examinee',
         tjbgb: 'xing_ming_'
     }
-    if (type === 'jyrykhjlb' || type === 'lhrynlqr' || type === 'lhpxsqb') {
+    if (type === 'khjlqrb' || type === 'lhrynlqr' || type === 'lhpxsqb') {
         sql = `select * from t_${type} where FIND_IN_SET('${val}',${col[type]}) and shi_fou_guo_shen_ = '已完成' `
     } else if (type === 'kaoshijilu') {
         sql = `select * from v_examination where FIND_IN_SET('${val}',${col[type]}) and paperState = '已完成' ORDER BY createTime asc`
@@ -441,41 +441,41 @@ export function correlationSql (type, val) {
     return sql
 }
 export const correlationConfig = {
-    jyrykhjlb: {
+    khjlqrb: {
         config: [
-            { label: '考核时机', width: '15%', type: 'text', field: 'kao_he_shi_ji_' },
-            { label: '岗位类型', width: '10%', type: 'text', field: 'gang_wei_lei_xing' },
+            // { label: '考核时机', width: '15%', type: 'text', field: 'kao_he_shi_ji_' },
+            { label: '考核类型', width: '10%', type: 'text', field: 'kao_he_lei_bie_' },
             { label: '考核时间', width: '15%', type: 'text', field: 'bian_zhi_shi_jian' },
-            { label: '总分', width: '10%', type: 'text', field: 'zong_fen_' },
+            // { label: '总分', width: '10%', type: 'text', field: 'zong_fen_' },
             { label: '考核结果', width: '12%', type: 'text', field: 'kao_he_jie_guo_' },
-            { label: '附件', width: '14%', type: 'file', field: 'shang_chuan_fu_ji' },
+            { label: '附件', width: '14%', type: 'file', field: 'fu_jian_' },
             { label: '表单', width: '14%', type: 'file', field: 'kuai_zhao_' }
 
         ],
         dialog: [
-            [{ name: '被考核人员', field: 'bei_kao_he_ren_yu', type: 'user' }, { name: '考核时间', field: 'bian_zhi_shi_jian', type: 'text' }],
-            [{ name: '考核时机', field: 'kao_he_shi_ji_', type: 'text' }, { name: '总分', field: 'zong_fen_', type: 'text' }],
-            [{ name: '岗位类型', field: 'gang_wei_lei_xing', type: 'text' }, { name: '考核结果', field: 'kao_he_jie_guo_', type: 'text' }],
+            [{ name: '被考核人员', field: 'bei_kao_he_ren_', type: 'user' }, { name: '编制时间', field: 'bian_zhi_shi_jian', type: 'text' }],
+            // [{ name: '考核时机', field: 'kao_he_shi_ji_', type: 'text' }, { name: '总分', field: 'zong_fen_', type: 'text' }],
+            [{ name: '考核类型', field: 'kao_he_lei_bie_', type: 'text' }, { name: '考核结果', field: 'kao_he_jie_guo_', type: 'text' }],
             [{ name: '附件', field: 'shang_chuan_fu_ji', type: 'file' }],
             [{ name: '表单', field: 'kuai_zhao_', type: 'file' }]
         ]
     },
     lhrynlqr: {
         config: [
-            { label: '授权使用设备', width: '20%', type: 'dialog', field: 'shou_quan_shi_yon', dialogKey: 'sbwxdhk' },
-            { label: '授权岗位', width: '16%', type: 'dialog', field: 'shou_quan_gang_we', dialogKey: 'gwzzdhkrysqy' },
-            { label: '审核人', width: '10%', type: 'user', field: 'shen_he_ren_' },
-            { label: '检验专业', width: '10%', type: 'text', field: 'jian_yan_zhuan_ye' },
-            { label: '能力评估结果', width: '10%', type: 'text', field: 'kao_he_jie_guo_' },
+            { label: '授权使用设备', width: '20%', type: 'dialog', field: 'shou_quan_shi_yon', dialogKey: 'mjsbdjmcdhk' },
+            { label: '授权岗位', width: '16%', type: 'dialog', field: 'shou_quan_gang_we', dialogKey: 'gwzzdhk' },
+            // { label: '审核人', width: '10%', type: 'user', field: 'shen_he_ren_' },
+            // { label: '检验专业', width: '10%', type: 'text', field: 'jian_yan_zhuan_ye' },
+            { label: '能力确认', width: '10%', type: 'text', field: 'neng_li_que_ren_' },
             { label: '附件', width: '12%', type: 'file', field: 'shang_chuan_fu_ji' },
             { label: '表单', width: '12%', type: 'file', field: 'kuai_zhao_' }
 
         ],
         dialog: [
-            [{ name: '授权使用设备', field: 'shou_quan_shi_yon', type: 'dialog', dialogKey: 'sbwxdhk' }, { name: '能力评估结果', field: 'kao_he_jie_guo_', type: 'text' }],
-            [{ name: '授权岗位', field: 'shou_quan_gang_we', type: 'dialog', dialogKey: 'gwzzdhkrysqy' }, { name: '考核日期', field: 'kao_he_shi_jian_', type: 'text' }],
-            [{ name: '审核人', field: 'shen_he_ren_', type: 'user' }, { name: '检验专业', field: 'jian_yan_zhuan_ye', type: 'text' }],
-            [{ name: '考核记录', field: 'xuan_ze_kao_he_ji', type: 'dialog', dialogKey: 'jyrykhdhkrysqy' }, { name: '是否合格', field: 'shi_fou_he_ge_', type: 'text' }],
+            [{ name: '授权使用设备', field: 'shou_quan_shi_yon', type: 'dialog', dialogKey: 'mjsbdjmcdhk' }, { name: '能力确认', field: 'kao_he_jie_guo_', type: 'text' }],
+            [{ name: '授权岗位', field: 'shou_quan_gang_we', type: 'dialog', dialogKey: 'gwzzdhk' }, { name: '编制时间', field: 'bian_zhi_shi_jian', type: 'text' }],
+            // [{ name: '审核人', field: 'shen_he_ren_', type: 'user' }, { name: '检验专业', field: 'jian_yan_zhuan_ye', type: 'text' }],
+            // [{ name: '考核记录', field: 'xuan_ze_kao_he_ji', type: 'dialog', dialogKey: 'jyrykhdhkrysqy' }, { name: '是否合格', field: 'shi_fou_he_ge_', type: 'text' }],
             [{ name: '附件', field: 'shang_chuan_fu_ji', type: 'file' }],
             [{ name: '表单', field: 'kuai_zhao_', type: 'file' }]
         ]

+ 1 - 1
src/views/component/personnelFile/index.vue

@@ -164,7 +164,7 @@ export default {
             getInfo({ id: val }).then(res => {
                 this.personInfoData = res.data
                 console.log(this.personInfoData, '111')
-                this.stauts = this.personInfoData.ryjbqkInfoPoList[0].shiFouGuoShen
+                this.stauts = this.personInfoData.ryjbqkInfoPoList[0]?.shiFouGuoShen
                 // 保存基本数据
                 simulated.baseDataObj.ryjbqk.data = res.data.ryjbqkInfoPoList[0]
                 this.$set(this.baseData, 'ryjbqk', simulated.baseDataObj.ryjbqk)