lingling
/
welfare-admin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: 合并远端代码

This commit is contained in:
cgd_mac 2022-02-22 17:54:23 +08:00
parent f797c6a418 47c0781065
commit 812220855c
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/views/mycourse/mycourseList/MyCourseList.vue
View File

@ -30,9 +30,9 @@
<a-tag v-if="record.trainType === 2" color="blue">选修课</a-tag> <a-tag v-if="record.trainType === 2" color="blue">选修课</a-tag>
</span> </span>
<span slot="status" slot-scope="text, record"> <span slot="status" slot-scope="text, record">
<a-tag v-if="record.status === 0" color="red">未开始</a-tag> <a-tag v-if="record.status === 1" color="red">未开始</a-tag>
<a-tag v-if="record.status === 1" color="blue">进行中</a-tag> <a-tag v-if="record.status === 2" color="blue">进行中</a-tag>
<a-tag v-if="record.status === 2" color="green">已完成</a-tag> <a-tag v-if="record.status === 3" color="green">已完成</a-tag>
</span> </span>
<template slot="schedule" slot-scope="text, record"> <template slot="schedule" slot-scope="text, record">
<a-progress :percent="record.schedule" /> <a-progress :percent="record.schedule" />
@ -42,7 +42,7 @@
</template> </template>
<span slot="action" slot-scope="text, record"> <span slot="action" slot-scope="text, record">
<a-popconfirm <a-popconfirm
v-if="record.status === 0" v-if="record.status === 1"
:title="`确定要添加${record.name}课程吗?`" :title="`确定要添加${record.name}课程吗?`"
ok-text="添加" ok-text="添加"
cancel-text="取消" cancel-text="取消"
@ -50,8 +50,8 @@
> >
<a>添加课程</a> <a>添加课程</a>
</a-popconfirm> </a-popconfirm>
<a v-if="record.status === 1" @click="handlerContinue(record)">继续学习</a> <a v-if="record.status === 2" @click="handlerContinue(record)">继续学习</a>
<a v-if="record.status === 2" @click="handlerContinue(record)">已完成学习</a> <a v-if="record.status === 3">已完成学习</a>
</span> </span>
</s-table> </s-table>
<MycourseDetail ref="aycourseDetail"></MycourseDetail> <MycourseDetail ref="aycourseDetail"></MycourseDetail>

2
src/views/project/ProjectList.vue
View File

@ -42,7 +42,7 @@
<a-divider type="vertical" v-if="hasPerm(power.edit) && hasPerm('project:list')" /> <a-divider type="vertical" v-if="hasPerm(power.edit) && hasPerm('project:list')" />
<a v-if="hasPerm('project:list')" href="javascript:;" @click="getDetail(record)">详情</a> <a v-if="hasPerm('project:list')" href="javascript:;" @click="getDetail(record)">详情</a>
<a-divider type="vertical" v-if="hasPerm(power.edit) && hasPerm('project:list')" /> <a-divider type="vertical" v-if="hasPerm(power.edit) && hasPerm('project:list')" />
<a v-if="hasPerm(power.edit)" href="javascript:;" @click="handledCreate(record)">修改</a> <a v-if="hasPerm(power.edit) && ['1','2'].includes(record.status)" href="javascript:;" @click="handledCreate(record)">修改</a>
<a-divider type="vertical" v-if="hasPerm(power.del) && hasPerm('project:list')" /> <a-divider type="vertical" v-if="hasPerm(power.del) && hasPerm('project:list')" />
<a-popconfirm title="是否删除?" @confirm="() => handleDelete(record)"> <a-popconfirm title="是否删除?" @confirm="() => handleDelete(record)">
<a v-if="hasPerm(power.del)" href="javascript:;">删除</a> <a v-if="hasPerm(power.del)" href="javascript:;">删除</a>