hz/ebiz-h5
1
0
Fork 0
mirror of http://112.124.100.131/GFRS/ebiz-h5.git synced 2025-12-22 07:06:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/GFRS-717【0402】人力发展-活动量管理' of http://112.124.100.131/GFRS/ebiz-h5 into feature/GFRS-717【0402】人力发展-活动量管理

Browse Source 
# Conflicts:
#	src/components/ebiz/manpower/TalentPoolItem.vue
#	src/views/ebiz/manpower/ActiveManagement.vue
This commit is contained in:
tian.guangyuan
2020-03-16 18:03:25 +08:00
parent 148e4381d9 dbcfdcc485
commit da9c2a2a2e
8 changed files with 265 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/components/ebiz/manpower/ActivityLogItem.vue
View File

@@ -1,10 +1,13 @@
<template>
<div>
<van-cell :title="ActivityLogInfo.name" :is-link="isEdit" :icon="ActivityLogInfo.avatarUrl" value-class="text-left">
<span class="mr20">{{ ActivityLogInfo.age }}</span>
<span>{{ ActivityLogInfo.flag }}</span>
<van-icon slot="right-icon" name="edit" style="line-height: inherit;" :color="isEdit ? '#1989fa' : 'transparent'" size="24" @click="toEdit" />
</van-cell>
<van-cell-group>
<van-cell :title="ActivityLogInfo.name" title-class="ml10" :is-link="isEdit" value-class="text-left">
<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-cell>
</van-cell-group>
</div>
</template>
<script>
@@ -23,18 +26,19 @@ export default {
required: true,
default: () => {
return {
recordCode: '',
name: '王辉',
avatarUrl: 'https://img.yzcdn.cn/vant/cat.jpeg',
// avatarUrl: 'https://img.yzcdn.cn/vant/cat.jpeg',
age: '35岁',
flag: '同业',
currentTime: ''
type: '同业',
recordDate: ''
}
}
}
},
data() {
return {
isEdit: true
defaultAcatarUrl: 'https://b.yzcdn.cn/vant/icon-demo-1126.png'
}
},
methods: {
@@ -45,23 +49,20 @@ export default {
this.$jump({
flag: 'h5',
extra: {
url: location.origin + `/#/manpower/ActivityLog/Edit`
url: location.origin + `/#/manpower/ActivityLog/Edit?code=${this.ActivityLogInfo.recordCode}`,
forbidSwipeBack: '1'
},
routerInfo: { path: '/manpower/ActivityLog/Edit' }
routerInfo: { path: `/manpower/ActivityLog/Edit?code=${this.ActivityLogInfo.recordCode}` }
})
}
},
computed: {
currentTime() {
return this.ActivityLogInfo.currentTime
}
},
watch: {
currentTime(newVal) {
if (newVal === formatDate.formatDate().split(' ')[0]) {
this.isEdit = true
isEdit() {
console.log(this.ActivityLogInfo.recordDate)
if (this.ActivityLogInfo.recordDate === formatDate.formatDate().split(' ')[0]) {
return true
} else {
this.isEdit = false
return false
}
}
}

12
src/components/ebiz/manpower/TalentPoolItem.vue
View File

@@ -1,11 +1,9 @@
<template>
<div>
<van-cell :title="talentPoolInfo.name" title-class="ml10" is-link value-class="text-left">
<van-icon slot="icon" :name="talentPoolInfo.avatarUrl || defaultAcatarUrl" style="line-height: inherit;" size="24" />
<span>{{ talentPoolInfo.sameCompany }}</span>
<van-icon slot="right-icon" name="edit" style="line-height: inherit;" color="#1989fa" size="24" @click="edit(talentPoolInfo.personnelCode)" />
</van-cell>
</div>
<van-cell :title="talentPoolInfo.name" title-class="ml10" is-link value-class="text-left">
<van-icon slot="icon" :name="talentPoolInfo.avatarUrl || defaultAcatarUrl" style="line-height: inherit;" size="24" />
<span>{{ talentPoolInfo.sameCompany }}</span>
<van-icon slot="right-icon" name="edit" style="line-height: inherit;" color="#1989fa" size="24" @click="edit(talentPoolInfo.personnelCode)" />
</van-cell>
</template>
<script>
import { Cell, CellGroup, Image } from 'vant'