Ver código fonte

bug-6962 人员档案相关

tianxinyu 3 meses atrás
pai
commit
c66a851bce

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

@@ -534,12 +534,12 @@ export default {
       handler: function (val, oldVal) {
         // eslint-disable-next-line no-undef
         this.nowData = structuredClone(val)
-        if(this.nowData.ruZhiShiJian){
-          this.calculateWorkYears(this.nowData.ruZhiShiJian, 'benZhuanYeGong')
-        }
-        if(this.nowData.canJiaGongZuo){
-          this.calculateWorkYears(this.nowData.canJiaGongZuo, 'gongZuoNianXia')
-        }
+        // if(this.nowData.ruZhiShiJian){
+          // this.calculateWorkYears(this.nowData.ruZhiShiJian, 'benZhuanYeGong')
+        // }
+        // if(this.nowData.canJiaGongZuo){
+          // this.calculateWorkYears(this.nowData.canJiaGongZuo, 'gongZuoNianXia')
+        // }
       },
       deep: true,
       immediate: true

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

@@ -97,10 +97,10 @@
         />
       </el-tab-pane>
       <el-tab-pane
-        v-if="judgeTag('kyxmglb')"
+        v-if="judgeTagStair(['kyxmglb','kjhjcgglb', 'SCIwzglb', 'zwlwglb', 'kyzzglb', 'kyzlglb', 'jxjyxmxshdglb', 'kphdglb'], 'activeNameTabInner')"
         v-model="activeNameTabInner"
         label="科研管理"
-        name="kyxmglb"
+        name="kygl"
         class="tabPane"
       >
         <div class="paneAll innerTabs">
@@ -511,7 +511,7 @@ export default {
     return {
       userId,
       activeNameTab: this.activeName,
-      activeNameTabInner: 'kyxmglb',
+      activeNameTabInner: '',
       activeNameTabInnerRY: '',
       activeNameTabPXInnerRY: '',
       jurisdictionKYGL: {
@@ -564,6 +564,9 @@ export default {
         }
       }
       switch (val.name) {
+        case 'kygl':
+          this.handleClick({ name: this.activeNameTabInner })
+          break;
         case 'rykhysq':
           this.handleClickRY({ name: this.activeNameTabInnerRY })
           break