Merge branch 'feature/GFRS-717【0402】人力发展-活动量管理' into release/0407

src/views/ebiz/manpower/PersonalCenter.vue

@@ -15,7 +15,7 @@
           <van-cell title="直辖部人力" :value="teamInfo.jurisdictionDepartNum" />
           <van-cell title="直辖部主管数" :value="teamInfo.jurisdictionGroupManagerNum" />
           <van-cell title="大直辖人力" :value="teamInfo.majorJurisdictionNum" />
-          <van-cell title="直接增援人数" :value="teamInfo.directReinforceNum" />
+          <van-cell title="直接增员人数" :value="teamInfo.directReinforceNum" />
           <van-cell title="直接育成主管数量" :value="teamInfo.directBredManagerNum" />
           <van-cell title="直接育成部门数量" :value="teamInfo.directBredDepartNum" />
           <van-cell title="全辖团队人力" :value="teamInfo.allTeamNum" />

src/views/ebiz/manpower/activityLog/Edit.vue

@@ -19,7 +19,7 @@
         type="digit"
         label="年龄"
         placeholder="请输入年龄"
-        v-validate="'required|onlyNumber|maxAge'"
+        v-validate="'required|onlyNumber|onlyInteger|maxAge'"
         data-vv-name="年龄"
       />
       <select-radio :disabled="isDisable" :radios="typeArr" label="类型" name="类型" :value.sync="recordInfo.type" :required="true"></select-radio>
@@ -30,7 +30,7 @@
         type="digit"
         label="面谈次数"
         placeholder="请输入面谈次数"
-        v-validate="'required|onlyNumber'"
+        v-validate="'required|onlyNumber|onlyInteger'"
         data-vv-name="面谈次数"
       />
       <van-field

src/views/ebiz/manpower/increaseStaffTools/CompanyIntroduction.vue

@@ -73,8 +73,12 @@ export default {
   },
   mounted() {
     this.redisKey = this.$route.query.redisKey
-    if (this.redisKey) this.saveShareRecord('1')
-    else this.getShareKey()
+    if (this.redisKey) {
+      this.saveShareRecord('1')
+      localStorage.setItem('token', this.$route.query.token)
+    } else {
+      this.getShareKey()
+    }
     setTimeout(() => {
       // 右上角的显示
       this.$jump({
@@ -94,13 +98,14 @@ export default {
     appCallBack(data) {
       if (data.trigger == 'right_button_click') {
         this.saveShareRecord('0')
+        let token = window.localStorage.getItem('token')
         // eslint-disable-next-line no-undef
         EWebBridge.webCallAppInJs('bridge', {
           flag: 'share',
           extra: {
             title: '国富人寿保险股份有限公司',
             content: '公司介绍',
-            url: `${location.origin}/#/manpower/increaseStaffTools/CompanyIntroduction?redisKey=${this.redisKey}`,
+            url: `${location.origin}/#/manpower/increaseStaffTools/CompanyIntroduction?redisKey=${this.redisKey}&token=${token}`,
             img: this.$assetsUrl + 'images/logo.png'
           }
         })

src/views/ebiz/manpower/increaseStaffTools/PdfShare.vue

@@ -36,8 +36,12 @@ export default {
   mounted() {
     this.init()
     this.redisKey = this.$route.query.redisKey
-    if (this.redisKey) this.saveShareRecord('1')
-    else this.getShareKey()
+    if (this.redisKey) {
+      this.saveShareRecord('1')
+      localStorage.setItem('token', this.$route.query.token)
+    } else {
+      this.getShareKey()
+    }
   },
   methods: {
     init() {
@@ -60,13 +64,14 @@ export default {
       if (data.trigger == 'right_button_click') {
         this.saveShareRecord('0')
         let pdf = this.$route.query.pdf
+        let token = window.localStorage.getItem('token')
         // eslint-disable-next-line no-undef
         EWebBridge.webCallAppInJs('bridge', {
           flag: 'share',
           extra: {
             title: '国富人寿欢迎您！',
             content: this.shareContent,
-            url: `${location.origin}/#/manpower/increaseStaffTools/PdfShare?pdf=${pdf}&redisKey=${this.redisKey}`,
+            url: `${location.origin}/#/manpower/increaseStaffTools/PdfShare?pdf=${pdf}&redisKey=${this.redisKey}&token=${token}`,
             img: this.$assetsUrl + 'images/logo.png'
           }
         })