From bcb45bf51f7b072653386af838a2c3427f3771ff Mon Sep 17 00:00:00 2001
From: "tian.guangyuan" <tian.guangyuan@ebiz-fooge.com>
Date: Wed, 18 Mar 2020 14:28:27 +0800
Subject: [PATCH] =?UTF-8?q?[fix]=20=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E9=97=AE=E9=A2=98=20=EF=BC=8C=20=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=E6=B4=BB=E5=8A=A8=E6=97=A5=E5=BF=97=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E3=80=81=E4=BF=AE=E6=94=B9=E3=80=81=E8=AF=A6=E6=83=85=E4=B8=8B?=
 =?UTF-8?q?=E7=9A=84=E5=91=88=E7=8E=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ebiz/manpower/ActivityLogItem.vue         |  2 +-
 src/views/ebiz/manpower/activityLog/Edit.vue  | 25 +++++++++++++++++--
 src/views/ebiz/manpower/activityLog/List.vue  |  7 +++---
 3 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/src/components/ebiz/manpower/ActivityLogItem.vue b/src/components/ebiz/manpower/ActivityLogItem.vue
index bdd1c43be..feb0bfb01 100644
--- a/src/components/ebiz/manpower/ActivityLogItem.vue
+++ b/src/components/ebiz/manpower/ActivityLogItem.vue
@@ -3,7 +3,7 @@
     <van-cell-group>
       <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 class="mr20">{{ ActivityLogInfo.age }}岁</span>
         <span>{{ ActivityLogInfo.type == 0 ? '同业' : '白板' }}</span>
         <van-icon slot="right-icon" name="edit" style="line-height: inherit;" :color="isEdit ? '#ee0a24' : 'transparent'" size="24" />
       </van-cell>
diff --git a/src/views/ebiz/manpower/activityLog/Edit.vue b/src/views/ebiz/manpower/activityLog/Edit.vue
index 840bb1049..a7d8384ea 100644
--- a/src/views/ebiz/manpower/activityLog/Edit.vue
+++ b/src/views/ebiz/manpower/activityLog/Edit.vue
@@ -3,8 +3,17 @@
   <div>
     <van-cell-group>
       <van-field readonly v-model="recordInfo.recordDate" label="日期" />
-      <van-field required v-model="recordInfo.name" label="姓名" placeholder="请输入姓名" v-validate="'required|name'" data-vv-name="姓名" />
       <van-field
+        :readonly="isDisable"
+        required
+        v-model="recordInfo.name"
+        label="姓名"
+        placeholder="请输入姓名"
+        v-validate="'required|name'"
+        data-vv-name="姓名"
+      />
+      <van-field
+        :readonly="isDisable"
         required
         v-model="recordInfo.age"
         type="digit"
@@ -13,8 +22,9 @@
         v-validate="'required|onlyNumber|maxAge'"
         data-vv-name="年龄"
       />
-      <select-radio :radios="typeArr" label="类型" name="类型" :value.sync="recordInfo.type" :required="true"></select-radio>
+      <select-radio :disabled="isDisable" :radios="typeArr" label="类型" name="类型" :value.sync="recordInfo.type" :required="true"></select-radio>
       <van-field
+        :readonly="isDisable"
         required
         v-model="recordInfo.interviewNum"
         type="digit"
@@ -81,6 +91,7 @@ export default {
       },
       recordCode: '',
       isEdit: '',
+      isDisable: '',
       // 面试结果
       showResultArr: false,
       // 职业选择
@@ -114,6 +125,7 @@ export default {
   mounted() {
     this.recordCode = this.$route.query.code || ''
     this.isEdit = this.$route.query.isEdit
+    this.isDisable = this.isEdit == '1'
     this.queryRecordDetail()
   },
   computed: {
@@ -134,6 +146,9 @@ export default {
   },
   methods: {
     queryRecordDetail() {
+      if (!this.recordCode) {
+        return false
+      }
       let data = {
         recordCode: this.recordCode
       }
@@ -194,9 +209,15 @@ export default {
       this.recordInfo.type = type.id
     },
     handleRsult() {
+      if (this.isDisable) {
+        return false
+      }
       this.showResultArr = true
     },
     handleOccupation() {
+      if (this.isDisable) {
+        return false
+      }
       this.showOccupationArr = true
     },
     selectResult(val) {
diff --git a/src/views/ebiz/manpower/activityLog/List.vue b/src/views/ebiz/manpower/activityLog/List.vue
index 73975cc54..9379e147a 100644
--- a/src/views/ebiz/manpower/activityLog/List.vue
+++ b/src/views/ebiz/manpower/activityLog/List.vue
@@ -9,9 +9,10 @@
       <p @click="openCalendar">{{ showTime }}</p>
     </div>
     <ActivityLogItem :ActivityLogInfo="item" v-for="(item, index) in recordList" :key="index"></ActivityLogItem>
-    <div class="bottom-btn text-center">
-      <van-icon name="add-square" size="50" color="#1989fa" @click="toEdit" />
-    </div>
+    <!-- <div class="bottom-btn text-center">
+      <van-icon name="add-square" size="50" color="#ee0a24" @click="toEdit" />
+    </div> -->
+    <van-button type="danger" class="bottom-btn" size="large" @click="toEdit" v-no-more-click="1000">新增</van-button>
     <van-popup v-model="showDateTime" position="bottom" :style="{ height: '30%' }">
       <van-datetime-picker v-model="selectTime" type="date" :max-date="maxDate" @confirm="confirm" @cancel="cancel" />
     </van-popup>