病理人员档案修改

src/views/component/personnelFile/components/SCIwzglbTag.vue

@@ -128,7 +128,7 @@
           width="100"
         >
           <template slot-scope="scope">
-            <el-button type="text" size="small" @click="handleClick(scope.row)"
+            <el-button type="text" size="small" @click="handleClick(scope.row)" icon="ibps-icon-eye"
               >查阅</el-button
             >
           </template>

src/views/component/personnelFile/components/dialogDeltail.vue

@@ -181,7 +181,7 @@ export default {
       overflow-y: auto;
       padding-top: 15px !important;
       .el-row {
-        margin: 0 0 20px !important;
+        margin: 10px 10px 20px !important;
         display: flex;
         align-items: baseline;
         // &:last-child {
@@ -190,7 +190,7 @@ export default {
         .rowSty {
           display: flex;
           justify-content: space-between;
-          margin: 1%;
+          // margin: 1%;
           align-items: center;
           .nameSty {
             width: 120px;

src/views/component/personnelFile/components/gzjlTag.vue

@@ -320,7 +320,7 @@
                     class-name="handleSty"
                     width="150">
                     <template slot-scope="scope">
-                        <el-button @click="handleClick(scope.row)" type="text" size="small">查阅</el-button>
+                        <el-button @click="handleClick(scope.row)" type="text" size="small" icon="ibps-icon-eye">查阅</el-button>
                         <el-button type="text" size="small">编辑</el-button>
                     </template>
                 </el-table-column> -->

src/views/component/personnelFile/components/jxjyxmxshdglbTag.vue

@@ -151,7 +151,7 @@
           width="100"
         >
           <template slot-scope="scope">
-            <el-button type="text" size="small" @click="handleClick(scope.row)"
+            <el-button type="text" size="small" @click="handleClick(scope.row)" icon="ibps-icon-eye"
               >查阅</el-button
             >
           </template>

src/views/component/personnelFile/components/jyjlTag.vue

@@ -283,7 +283,7 @@
                     class-name="handleSty"
                     width="150">
                     <template slot-scope="scope">
-                        <el-button @click="handleClick(scope.row)" type="text" size="small">查阅</el-button>
+                        <el-button @click="handleClick(scope.row)" type="text" size="small" icon="ibps-icon-eye">查阅</el-button>
                         <el-button type="text" size="small">编辑</el-button>
                     </template>
                 </el-table-column> -->

src/views/component/personnelFile/components/kjhjcgglbTag.vue

@@ -106,7 +106,7 @@
           width="100"
         >
           <template slot-scope="scope">
-            <el-button type="text" size="small" @click="handleClick(scope.row)"
+            <el-button type="text" size="small" @click="handleClick(scope.row)" icon="ibps-icon-eye"
               >查阅</el-button
             >
           </template>

src/views/component/personnelFile/components/kphdglbTag.vue

@@ -2,7 +2,7 @@
   <div class="kphdglb20241107">
     <div class="titleAll">
       <el-divider direction="vertical" />
-      <span>科研项目</span>
+      <span>科普活动</span>
     </div>
     <div class="hand-btn" />
     <div class="contentAll">
@@ -150,7 +150,7 @@
           width="100"
         >
           <template slot-scope="scope">
-            <el-button type="text" size="small" @click="handleClick(scope.row)"
+            <el-button type="text" size="small" @click="handleClick(scope.row)" icon="ibps-icon-eye"
               >查阅</el-button
             >
           </template>

src/views/component/personnelFile/components/kyxmglbTag.vue

@@ -48,21 +48,16 @@
               :disabled="!isShowTooltip"
             >
               <div slot="content" style="max-width: 200px">
-                <div v-html="scope.row.xiangMuBianHao" />
+                <div v-html="scope.row.xiangMuLeiXing" />
               </div>
               <div class="ellipsis" @mouseover="inputOnMouseOver($event)">
                 {{
-                  scope.row.hasOwnProperty('xiangMuBianHao') > 0
-                    ? scope.row.xiangMuBianHao
+                  scope.row.hasOwnProperty('xiangMuLeiXing') > 0
+                    ? scope.row.xiangMuLeiXing
                     : '/'
                 }}
               </div>
             </el-tooltip>
-            {{
-              scope.row.hasOwnProperty('xiangMuLeiXing') > 0
-                ? scope.row.xiangMuLeiXing
-                : '/'
-            }}
           </template>
         </el-table-column>
         <el-table-column label="项目名称" min-width="15%">
@@ -153,7 +148,7 @@
           width="100"
         >
           <template slot-scope="scope">
-            <el-button type="text" size="small" @click="handleClick(scope.row)"
+            <el-button type="text" size="small" @click="handleClick(scope.row)" icon="ibps-icon-eye"
               >查阅</el-button
             >
           </template>

src/views/component/personnelFile/components/kyzlglbTag.vue

@@ -150,7 +150,7 @@
           width="100"
         >
           <template slot-scope="scope">
-            <el-button type="text" size="small" @click="handleClick(scope.row)"
+            <el-button type="text" size="small" @click="handleClick(scope.row)" icon="ibps-icon-eye"
               >查阅</el-button
             >
           </template>

src/views/component/personnelFile/components/kyzzglbTag.vue

@@ -106,7 +106,7 @@
           width="100"
         >
           <template slot-scope="scope">
-            <el-button type="text" size="small" @click="handleClick(scope.row)"
+            <el-button type="text" size="small" @click="handleClick(scope.row)" icon="ibps-icon-eye"
               >查阅</el-button
             >
           </template>

src/views/component/personnelFile/components/modulesTag.vue

@@ -250,7 +250,7 @@
         </div>
       </el-tab-pane>
       <el-tab-pane
-        v-if="judgeTagStair(['jyrykhjlb', 'lhrynlqr'])"
+        v-if="judgeTagStair(['jyrykhjlbsz','jyrykhjlb', 'lhrynlqr'], 'activeNameTabInnerRY')"
         label="人员考核与授权"
         name="rykhysq"
         class="tabPane"
@@ -262,6 +262,24 @@
             style="height: 100%"
             @tab-click="handleClickRY"
           >
+            <el-tab-pane
+              v-if="judgeTag('jyrykhjlbsz')"
+              label="考核记录"
+              name="jyrykhjlbsz"
+              class="tabPane shadowNone paddingInner"
+            >
+              <public-list
+                ref="jyrykhjlbsz"
+                class="paneAll"
+                :plane-data="judgeDataAll('jyrykhjlbsz')"
+                :tab-name="'jyrykhjlbsz'"
+                :button-type="buttonType"
+                :btn-show="btnShow"
+                :btn-type="btnType"
+                @changeButtonShow="changeButtonShow"
+                @changeBaseData="changeBaseData"
+              />
+            </el-tab-pane>
             <el-tab-pane
               v-if="judgeTag('jyrykhjlb')"
               label="考核记录"
@@ -302,7 +320,7 @@
         </div>
       </el-tab-pane>
       <el-tab-pane
-        v-if="judgeTagStair(['lhrypxjlb', 'lhpxsqb'])"
+        v-if="judgeTagStair(['lhrypxjlb', 'lhpxsqb'],'activeNameTabPXInnerRY')"
         label="培训"
         name="pxgl"
         class="tabPane"
@@ -476,8 +494,8 @@ export default {
       userId,
       activeNameTab: this.activeName,
       activeNameTabInner: 'kyxmglb',
-      activeNameTabInnerRY: 'jyrykhjlb',
-      activeNameTabPXInnerRY: 'lhrypxjlb',
+      activeNameTabInnerRY: '',
+      activeNameTabPXInnerRY: '',
       jurisdictionKYGL: {
         kyxmglb: 'reviewTableKYXM',
         kjhjcgglb: 'reviewTableHJCG',
@@ -529,10 +547,10 @@ export default {
       }
       switch (val.name) {
         case 'rykhysq':
-          this.handleClickRY({ name: 'jyrykhjlb' })
+          this.handleClickRY({ name: this.activeNameTabInnerRY })
           break
         case 'pxgl':
-          this.handleClickRY({ name: 'lhrypxjlb' })
+          this.handleClickRY({ name: this.activeNameTabPXInnerRY })
           break
         case 'kaoshijilu':
           this.handleClickRY({ name: 'kaoshijilu' })
@@ -546,6 +564,7 @@ export default {
     },
     handleClickRY(val) {
       const arr = [
+        'jyrykhjlbsz',
         'jyrykhjlb',
         'lhrynlqr',
         'lhrypxjlb',
@@ -594,7 +613,7 @@ export default {
         this.buttonType !== 4
       )
     },
-    judgeTagStair(val) {
+    judgeTagStair(val,name) {
       let disTF = false
       val.forEach((element) => {
         if (
@@ -602,6 +621,7 @@ export default {
           this.tagData[element].display === 'Y'
         ) {
           disTF = true
+          this[name] = this[name] === '' ? element : this[name]
         }
       })
       return !!(

src/views/component/personnelFile/components/publicList.vue

@@ -137,7 +137,7 @@
           width="100"
         >
           <template slot-scope="scope">
-            <el-button type="text" size="small" @click="handleClick(scope.row)"
+            <el-button type="text" size="small" @click="handleClick(scope.row)" icon="ibps-icon-eye"
               >查阅</el-button
             >
           </template>

src/views/component/personnelFile/components/zsbTag.vue

@@ -280,7 +280,7 @@
                     class-name="handleSty"
                     width="150">
                     <template slot-scope="scope">
-                        <el-button @click="handleClick(scope.row)" type="text" size="small">查阅</el-button>
+                        <el-button @click="handleClick(scope.row)" type="text" size="small" icon="ibps-icon-eye">查阅</el-button>
                         <el-button type="text" size="small">编辑</el-button>
                     </template>
                 </el-table-column> -->

src/views/component/personnelFile/components/zwlwglbTag.vue

@@ -150,7 +150,7 @@
           width="100"
         >
           <template slot-scope="scope">
-            <el-button type="text" size="small" @click="handleClick(scope.row)"
+            <el-button type="text" size="small" @click="handleClick(scope.row)" icon="ibps-icon-eye"
               >查阅</el-button
             >
           </template>

src/views/component/personnelFile/constants/simulated.js

@@ -425,6 +425,7 @@ export function correlationSql(type, val) {
   const parm = { key: '', params: [] }
   const col = {
     jyrykhjlb: 'bei_kao_he_ren_yu',
+    jyrykhjlbsz: 'kao_he_ren_',
     lhrynlqr: 'bei_shou_quan_ren',
     lhrypxjlb: 'peixunrenyuan',
     lhpxsqb: 'can_jia_ren_yuan_',
@@ -433,13 +434,19 @@ export function correlationSql(type, val) {
   }
   const colKey = {
     jyrykhjlb: 'blrydakhtabcx',
+    jyrykhjlbsz: 'blrydakhsztabcx',
     lhrynlqr: 'blrydasqtabcx',
     lhrypxjlb: 'blrydapxtabcx',
     lhpxsqb: 'blrydwbpxtabcx',
     kaoshijilu: 'blrydakstabcx',
     tjbgb: 'blrydasjcx'
   }
-  if (type === 'jyrykhjlb' || type === 'lhrynlqr' || type === 'lhpxsqb') {
+  if (
+    type === 'jyrykhjlb' ||
+    type === 'jyrykhjlbsz' ||
+    type === 'lhrynlqr' ||
+    type === 'lhpxsqb'
+  ) {
     // sql = `select * from t_${type} where FIND_IN_SET('${val}',${col[type]}) and shi_fou_guo_shen_ = '已完成' `
     parm.key = colKey[type]
     parm.params = [val]
@@ -506,6 +513,43 @@ export const correlationConfig = {
       [{ name: '表单', field: 'kuai_zhao_', type: 'file' }]
     ]
   },
+  jyrykhjlbsz: {
+    config: [
+      {
+        label: '编制时间',
+        width: '25%',
+        type: 'text',
+        field: 'bian_zhi_shi_jian'
+      },
+      {
+        label: '表单名称',
+        width: '30%',
+        type: 'text',
+        field: 'biao_dan_ming_che'
+      },
+      {
+        label: '表单模板',
+        width: '40%',
+        type: 'file',
+        field: 'biao_dan_mo_ban_'
+      },
+      {
+        label: '考核人',
+        width: '15%',
+        type: 'user',
+        field: 'kao_he_ren_'
+      }
+      // { label: '附件', width: '14%', type: 'file', field: 'shang_chuan_fu_ji' },
+    ],
+    dialog: [
+      [
+        { name: '考核人', field: 'kao_he_ren_', type: 'user' },
+        { name: '编制时间', field: 'bian_zhi_shi_jian', type: 'text' }
+      ],
+      [{ name: '表单名称', field: 'biao_dan_ming_che', type: 'text' }],
+      [{ name: '表单模板', field: 'biao_dan_mo_ban_', type: 'file' }]
+    ]
+  },
   lhrynlqr: {
     config: [
       {