From 0e64db50651f13f11f70892d126c7ca7831ec63a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8F=B2=E6=97=AD=E6=96=87?= <shi.xuwen@ebiz-fooge.com>
Date: Mon, 16 Mar 2020 18:04:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A2=9E=E5=91=98=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E5=8F=AF=E7=BC=96=E8=BE=91=E7=9B=B8=E5=85=B3=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/ebiz/manpower/ActivityLogItem.vue | 12 ++++--------
 src/views/ebiz/manpower/ActiveManagement.vue     |  8 ++++----
 src/views/ebiz/manpower/activityLog/Edit.vue     |  4 +++-
 src/views/ebiz/manpower/activityLog/List.vue     |  4 ++--
 4 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/src/components/ebiz/manpower/ActivityLogItem.vue b/src/components/ebiz/manpower/ActivityLogItem.vue
index c771f39fa..fb8c0e28b 100644
--- a/src/components/ebiz/manpower/ActivityLogItem.vue
+++ b/src/components/ebiz/manpower/ActivityLogItem.vue
@@ -1,11 +1,11 @@
 <template>
   <div>
     <van-cell-group>
-      <van-cell :title="ActivityLogInfo.name" title-class="ml10" :is-link="isEdit" value-class="text-left">
+      <van-cell :title="ActivityLogInfo.name" title-class="ml10" :is-link="isEdit" value-class="text-left" @click="toEdit">
         <van-icon slot="icon" :name="ActivityLogInfo.avatarUrl || defaultAcatarUrl" style="line-height: inherit;" size="22" />
         <span class="mr20">{{ ActivityLogInfo.age }}</span>
         <span>{{ ActivityLogInfo.type == 0 ? '同业' : '白板' }}</span>
-        <van-icon slot="right-icon" name="edit" style="line-height: inherit;" :color="isEdit ? '#1989fa' : 'transparent'" size="24" @click="toEdit" />
+        <van-icon slot="right-icon" name="edit" style="line-height: inherit;" :color="isEdit ? '#1989fa' : 'transparent'" size="24" />
       </van-cell>
     </van-cell-group>
   </div>
@@ -43,22 +43,18 @@ export default {
   },
   methods: {
     toEdit() {
-      if (!this.isEdit) {
-        return false
-      }
       this.$jump({
         flag: 'h5',
         extra: {
-          url: location.origin + `/#/manpower/ActivityLog/Edit?code=${this.ActivityLogInfo.recordCode}`,
+          url: location.origin + `/#/manpower/ActivityLog/Edit?code=${this.ActivityLogInfo.recordCode}&isEdit=${this.isEdit ? '0' : '1'}`,
           forbidSwipeBack: '1'
         },
-        routerInfo: { path: `/manpower/ActivityLog/Edit?code=${this.ActivityLogInfo.recordCode}` }
+        routerInfo: { path: `/manpower/ActivityLog/Edit?code=${this.ActivityLogInfo.recordCode}&isEdit=${this.isEdit ? '0' : '1'}` }
       })
     }
   },
   computed: {
     isEdit() {
-      console.log(this.ActivityLogInfo.recordDate)
       if (this.ActivityLogInfo.recordDate === formatDate.formatDate().split(' ')[0]) {
         return true
       } else {
diff --git a/src/views/ebiz/manpower/ActiveManagement.vue b/src/views/ebiz/manpower/ActiveManagement.vue
index 5af772956..0a759c80f 100644
--- a/src/views/ebiz/manpower/ActiveManagement.vue
+++ b/src/views/ebiz/manpower/ActiveManagement.vue
@@ -122,7 +122,7 @@ export default {
         .then(res => {
           console.log(res)
           if (res.result == 0) {
-            this.personnelsList = res.content.personnels
+            this.personnelsList = res.content.personnels.slice(0, 5)
           } else {
             this.$toast(res.resultMessage)
           }
@@ -140,7 +140,7 @@ export default {
         .then(res => {
           console.log(res)
           if (res.result == 0) {
-            this.recordList = res.content.records
+            this.recordList = res.content.records.slice(0, 5)
           } else {
             this.$toast(res.resultMessage)
           }
@@ -163,10 +163,10 @@ export default {
       this.$jump({
         flag: 'h5',
         extra: {
-          url: location.origin + `/#/manpower/ActivityLog/Edit`,
+          url: location.origin + `/#/manpower/ActivityLog/Edit?isEdit=1`,
           forbidSwipeBack: '1'
         },
-        routerInfo: { path: '/manpower/ActivityLog/Edit' }
+        routerInfo: { path: '/manpower/ActivityLog/Edit?isEdit=1' }
       })
     }
   }
diff --git a/src/views/ebiz/manpower/activityLog/Edit.vue b/src/views/ebiz/manpower/activityLog/Edit.vue
index 282eb9d9e..d1aeb444c 100644
--- a/src/views/ebiz/manpower/activityLog/Edit.vue
+++ b/src/views/ebiz/manpower/activityLog/Edit.vue
@@ -54,7 +54,7 @@
         data-vv-name="过往职业"
       />
     </van-cell-group>
-    <van-button color="#1989fa" type="primary" class="bottom-btn" size="large" @click="subInfo">保存</van-button>
+    <van-button color="#1989fa" type="primary" class="bottom-btn" size="large" v-no-more-click="1000" v-if="isEdit == 0" @click="subInfo">保存</van-button>
     <van-popup v-model="showResultArr" position="bottom" :style="{ height: '30%' }">
       <van-picker show-toolbar :columns="resultArr" @cancel="showResultArr = false" @confirm="selectResult" />
     </van-popup>
@@ -89,6 +89,7 @@ export default {
         pastOccu: '' // 过往职业
       },
       recordCode: '',
+      isEdit: '',
       // 面试结果
       showResultArr: false,
       // 职业选择
@@ -112,6 +113,7 @@ export default {
   },
   mounted() {
     this.recordCode = this.$route.query.code || ''
+    this.isEdit = this.$route.query.isEdit
     this.queryRecordDetail()
   },
   computed: {
diff --git a/src/views/ebiz/manpower/activityLog/List.vue b/src/views/ebiz/manpower/activityLog/List.vue
index 0d97cadc3..9eb1698ac 100644
--- a/src/views/ebiz/manpower/activityLog/List.vue
+++ b/src/views/ebiz/manpower/activityLog/List.vue
@@ -72,10 +72,10 @@ export default {
       this.$jump({
         flag: 'h5',
         extra: {
-          url: location.origin + `/#/manpower/ActivityLog/Edit`,
+          url: location.origin + `/#/manpower/ActivityLog/Edit?isEdit=1`,
           forbidSwipeBack: '1'
         },
-        routerInfo: { path: '/manpower/ActivityLog/Edit' }
+        routerInfo: { path: '/manpower/ActivityLog/Edit?isEdit=1' }
       })
     },
     openCalendar() {