mirror of
https://gitee.com/elegant_wings/dbd-meeting-html.git
synced 2025-06-21 04:29:36 +08:00
Merge remote-tracking branch 'origin/master' into master
This commit is contained in:
commit
e4dcdf448c
@ -45,12 +45,12 @@
|
|||||||
<a @click='handleInfo(record)'>详情</a>
|
<a @click='handleInfo(record)'>详情</a>
|
||||||
<a-divider type='vertical' />
|
<a-divider type='vertical' />
|
||||||
<a v-if='editEnabel && (record.statusValue == 0 || record.statusValue == 1)' @click='handleEdit(record)'>修改</a>
|
<a v-if='editEnabel && (record.statusValue == 0 || record.statusValue == 1)' @click='handleEdit(record)'>修改</a>
|
||||||
<a-divider type='vertical' v-if='record.statusValue == 0 || record.statusValue == 1'/>
|
<a-divider type='vertical'/>
|
||||||
<a v-if='removeEnable' @click='delByIds([record.id])'>删除</a>
|
<a v-if='removeEnable' @click='delByIds([record.id])'>删除</a>
|
||||||
<a-divider type='vertical' v-if='record.statusValue == 0' />
|
<a-divider type='vertical'/>
|
||||||
<a-tag @click='verifySuccess(record.id)' v-if='editEnabel && record.statusValue == 0' color='green'>通过</a-tag>
|
<a-tag @click='verifySuccess(record.id)' v-if='successEnable && record.statusValue == 0' color='green'>通过</a-tag>
|
||||||
<a-divider type='vertical' v-if='record.statusValue == 0 || record.statusValue == 1' />
|
<a-divider type='vertical'/>
|
||||||
<a-tag @click='verifyReject(record.id)' v-if=' editEnabel && record.statusValue == 0 || record.statusValue == 1'
|
<a-tag @click='verifyReject(record.id)' v-if=' rejectEnable && (record.statusValue == 0 || record.statusValue == 1) '
|
||||||
color='volcano'>驳回</a-tag>
|
color='volcano'>驳回</a-tag>
|
||||||
</span>
|
</span>
|
||||||
</s-table>
|
</s-table>
|
||||||
@ -171,6 +171,8 @@ export default {
|
|||||||
addEnable: checkPermission('meeting:reservation:add'),
|
addEnable: checkPermission('meeting:reservation:add'),
|
||||||
editEnabel: checkPermission('meeting:reservation:edit'),
|
editEnabel: checkPermission('meeting:reservation:edit'),
|
||||||
removeEnable: checkPermission('meeting:reservation:remove'),
|
removeEnable: checkPermission('meeting:reservation:remove'),
|
||||||
|
rejectEnable: checkPermission('meeting:reservation:reject'),
|
||||||
|
successEnable: checkPermission('meeting:reservation:success'),
|
||||||
rejectModalVisible: false,
|
rejectModalVisible: false,
|
||||||
rejectConfirmLoading: false,
|
rejectConfirmLoading: false,
|
||||||
rejectModalId: null,
|
rejectModalId: null,
|
||||||
|
Loading…
x
Reference in New Issue
Block a user