task-5533 人员档案新增字段

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

@@ -137,7 +137,56 @@
           </div>
         </div>
         <div class="colSty">
-          <div class="grid-content bg-purple">入职日期</div>
+          <div class="grid-content bg-purple">专业</div>
+        </div>
+        <div class="colSty">
+          <div v-if="judgeTag()" class="grid-content bg-purple-light">
+            <div>
+              {{
+                nowData.hasOwnProperty('xianCongShiZhua') > 0
+                  ? nowData.xianCongShiZhua
+                  : '/'
+              }}
+            </div>
+          </div>
+          <div v-else class="grid-content bg-purple-light">
+            <el-form-item prop="xianCongShiZhua">
+              <el-input
+                v-model="nowData.xianCongShiZhua"
+                type="text"
+                placeholder="请输入"
+              />
+            </el-form-item>
+          </div>
+        </div>
+      </div>
+      <div class="rowSty">
+        <div class="colSty">
+          <div class="grid-content bg-purple">参加工作时间</div>
+        </div>
+        <div class="colSty">
+          <div v-if="judgeTag()" class="grid-content bg-purple-light">
+            <div>
+              {{
+                nowData.hasOwnProperty('canJiaGongZuo') > 0
+                  ? nowData.canJiaGongZuo
+                  : '/'
+              }}
+            </div>
+          </div>
+          <div v-else class="grid-content bg-purple-light">
+            <el-form-item prop="canJiaGongZuo">
+              <el-date-picker
+                v-model="nowData.canJiaGongZuo"
+                type="date"
+                placeholder="参加工作时间"
+                value-format="yyyy-MM-dd"
+              />
+            </el-form-item>
+          </div>
+        </div>
+        <div class="colSty">
+          <div class="grid-content bg-purple">本单位入职日期</div>
         </div>
         <div class="colSty">
           <div v-if="judgeTag()" class="grid-content bg-purple-light">
@@ -154,11 +203,58 @@
               <el-date-picker
                 v-model="nowData.ruZhiShiJian"
                 type="date"
-                placeholder="入职日期"
+                placeholder="本单位入职日期"
+                value-format="yyyy-MM-dd"
+              />
+            </el-form-item>
+          </div>
+        </div>  
+      </div>
+      <div class="rowSty"> 
+        <div class="colSty">
+          <div class="grid-content bg-purple">本岗位任职时间</div>
+        </div>
+        <div class="colSty">
+          <div v-if="judgeTag()" class="grid-content bg-purple-light">
+            <div >
+              {{
+                nowData.hasOwnProperty('renZhiShiJian') > 0 ? nowData.renZhiShiJian : '/'
+              }}
+            </div>
+          </div>
+          <div v-else class="grid-content bg-purple-light">
+            <el-form-item prop="renZhiShiJian">
+              <el-date-picker
+                v-model="nowData.renZhiShiJian"
+                type="date"
+                placeholder="本岗位任职时间"
                 value-format="yyyy-MM-dd"
               />
             </el-form-item>
           </div>
+        </div>  
+        <div class="colSty">
+          <div class="grid-content bg-purple">职务</div>
+        </div>
+        <div class="colSty">
+          <div v-if="judgeTag()" class="grid-content bg-purple-light">
+            <div>
+              {{
+                nowData.hasOwnProperty('xingZhengZhiWu') > 0
+                  ? nowData.xingZhengZhiWu
+                  : '/'
+              }}
+            </div>
+          </div>
+          <div v-else class="grid-content bg-purple-light">
+            <el-form-item prop="xingZhengZhiWu">
+              <el-input
+                v-model="nowData.xingZhengZhiWu"
+                type="text"
+                placeholder="请输入"
+              />
+            </el-form-item>
+          </div>
         </div>
       </div>
       <div class="rowSty">
@@ -396,6 +492,8 @@ export default {
           { validator: option.checkLengthNull, trigger: 'blur' }
         ],
         ruZhiShiJian: [{ validator: option.checkTimeNull, trigger: 'blur' }],
+        canJiaGongZuo: [{ validator: option.checkTimeNull, trigger: 'blur' }],
+        renZhiShiJian: [{ validator: option.checkTimeNull, trigger: 'blur' }],
         zhiCheng: [{ validator: option.checkLengthNull, trigger: 'blur' }],
         qianZiTuWen: [
           { validator: option.attachmentsNumOne, trigger: 'change' }
@@ -410,10 +508,38 @@ export default {
     }
   },
   watch: {
+    // 监听入职日期变化
+    // 'nowData.ruZhiShiJian': {
+      // handler(newVal) {
+        // if (newVal) {
+          // this.calculateWorkYears(newVal, 'benZhuanYeGong')
+        // } else {
+          // this.nowData.benZhuanYeGong = 0
+        // }
+      // },
+      // immediate: true
+    // },
+    // 监听入职日期变化
+    // 'nowData.canJiaGongZuo': {
+      // handler(newVal) {
+        // if (newVal) {
+          // this.calculateWorkYears(newVal, 'gongZuoNianXia')
+        // } else {
+          // this.nowData.gongZuoNianXia = 0
+        // }
+      // },
+      // immediate: true
+    // },
     planeData: {
       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')
+        }
       },
       deep: true,
       immediate: true
@@ -437,6 +563,23 @@ export default {
     }
   },
   methods: {
+    // calculateWorkYears(entryDate, type) {
+    //  const startDate = new Date(entryDate)
+    //  const now = new Date()
+    //  
+    //  let years = now.getFullYear() - startDate.getFullYear()
+    //  const monthDiff = now.getMonth() - startDate.getMonth()
+    //  
+    //  if (monthDiff < 0 || (monthDiff === 0 && now.getDate() < startDate.getDate())) {
+      //  years--
+    //  }
+    //  console.log('calculateWorkYears', years)
+      // if(type == 'benZhuanYeGong'){
+        // this.$set(this.nowData, 'benZhuanYeGong', years > 0 ? years : '0')
+      // }else{
+        // this.$set(this.nowData, 'gongZuoNianXia', years > 0 ? years : '0')
+      // }
+    // },
     judgeTag() {
       // return this.planeData.length>0&& this.btnShow === true && this.buttonType!==1 ? true : false
       return !!(

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

@@ -33,7 +33,11 @@ export const baseDataObj = {
       chengNuoHan: '1305918421677899776',
       sheBao: '1305918421677899776',
       renYuanLeiXing: '提供支持性服务的外部人员',
-      fujIan: '1305918421677899776'
+      fujIan: '1305918421677899776',
+      xianCongShiZhua: '',   //专业
+      xingZhengZhiWu: '',//职务
+      canJiaGongZuo: '2024-11-11',  //参加工作时间
+      renZhiShiJian: '0', //本岗位任职时间
     }
   },
   jyjl: {
@@ -407,7 +411,7 @@ export const tabName = {
   bmsm: 'bmsm'
 }
 export const data =
-  '{"id":"","diDian":"1257660949100232704","shiFouGuoShen":"已编制","jiaoYuId":"1315704890411974656,1309159909132075008","gongZuoId":"1309159909136269313,1315700904648769536,1309159909136269312","neiBuId":"1304386884142628865","waiBuId":"","kaoHeId":"","keYanId":"1278845812985561088","huoJiangId":"1313555341203472384,1314646912695009280","scIid":"","zhongWenId":"1313562201641975808","zhuanZhuoId":"1314884868894621696","zhuanLiId":"1313563580292923392","jiXuId":"","zhengShuId":"1309159909136269315,1309159909136269314,1315704890915291136","kaoShiId":"","bianZhiBuMen":"1259815242628595712","bianZhiRen":"702117247933480960","bianZhiShiJian":"2024-12-10 11:16","buMen":"1257661032474607616,1259815242628595712,1259815355627339776,1259815408806920192,1259815458987573248,1259815511915495424,1259815603112247296,1259815645608935424","dianHua":"18373382991","mingCheng":"702117247933480960","youXiang":"938764563@qq.com","yuanGongBianHao":"12231","diZhi":"2222","xingBie":"male","gangWei":"466555953945247744","jianDangRiQi":"","zuiGaoXueLiXueWei":"博士","zhiChengDengJi":"中级","shenFenZhengHaoMa":"","chuShengRiQi":"1996-07-11","nianLing":28,"biYeYuanXiao":"","ruZhiShiJian":"","zhiCheng":"","qianZiTuWen":"","baoMiXieYi":"","chengNuoHan":"","sheBao":"","jyjl":[],"gzjl":[],"xygpx":[],"pxjl":[],"rykhda":[],"kyxm":[],"kjhjcg":[],"SCIwztjb":[],"zwlw":[],"kyzz":[],"kyzl":[],"jxjyxmxshd":[],"zsb":[],"ksjlb":[]}'
+  '{"id":"","diDian":"1257660949100232704","shiFouGuoShen":"已编制","jiaoYuId":"1315704890411974656,1309159909132075008","gongZuoId":"1309159909136269313,1315700904648769536,1309159909136269312","neiBuId":"1304386884142628865","waiBuId":"","kaoHeId":"","keYanId":"1278845812985561088","huoJiangId":"1313555341203472384,1314646912695009280","scIid":"","zhongWenId":"1313562201641975808","zhuanZhuoId":"1314884868894621696","zhuanLiId":"1313563580292923392","jiXuId":"","zhengShuId":"1309159909136269315,1309159909136269314,1315704890915291136","kaoShiId":"","bianZhiBuMen":"1259815242628595712","bianZhiRen":"702117247933480960","bianZhiShiJian":"2024-12-10 11:16","buMen":"1257661032474607616,1259815242628595712,1259815355627339776,1259815408806920192,1259815458987573248,1259815511915495424,1259815603112247296,1259815645608935424","dianHua":"18373382991","mingCheng":"702117247933480960","youXiang":"938764563@qq.com","yuanGongBianHao":"12231","diZhi":"2222","xingBie":"male","gangWei":"466555953945247744","jianDangRiQi":"","zuiGaoXueLiXueWei":"博士","zhiChengDengJi":"中级","shenFenZhengHaoMa":"","chuShengRiQi":"1996-07-11","canJiaGongZuo": "2023-11-11","nianLing":28,"biYeYuanXiao":"","ruZhiShiJian":"","zhiCheng":"","qianZiTuWen":"","baoMiXieYi":"","chengNuoHan":"","sheBao":"","jyjl":[],"gzjl":[],"xygpx":[],"pxjl":[],"rykhda":[],"kyxm":[],"kjhjcg":[],"SCIwztjb":[],"zwlw":[],"kyzz":[],"kyzl":[],"jxjyxmxshd":[],"zsb":[],"ksjlb":[]}'
 
 // export const baseName = {
 //     ryjbqk: 'kphd',