feat:合并

This commit is contained in:
lixg
2023-02-01 17:33:42 +08:00
22 changed files with 752 additions and 1306 deletions

View File

@@ -79,6 +79,7 @@
type="flex"
gutter="12"
style="padding-left: 20px; margin-right: 0px"
v-button-per="permissions"
>
<a-col :span="1.5">
<CommonStudent
@@ -217,18 +218,20 @@
<slot name="extension" v-bind:data="{ record }"></slot>
<a-button
v-button-per="permissions"
v-if="type === 3 && record.status !== 0"
@click="updateStatus(0, record.id)"
type="link"
>通过</a-button
>
<a-button
v-button-per="permissions"
v-if="type === 3 && record.status !== 0"
@click="updateStatus(2, record.id)"
type="link"
>拒绝</a-button
>
<a-button @click="del(record.id)" type="link" danger>删除</a-button>
<a-button v-button-per="permissions" @click="del(record.id)" type="link" danger>删除</a-button>
</a-space>
</template>
</a-table>
@@ -354,6 +357,10 @@ import { ExclamationCircleOutlined } from "@ant-design/icons-vue";
const props = defineProps({
type: Number,
permissions:{
type: String,
default: ''
},
id: String,
columns: {
type: Array,