Merge remote-tracking branch 'origin/develop' into develop

# Conflicts:
#	src/components/student/TableModelStudent.vue
#	src/views/projectcenter/ProjectAdd.vue
#	src/views/projectcenter/ProjectManage.vue
This commit is contained in:
yuping
2023-01-31 17:32:10 +08:00
11 changed files with 1488 additions and 286 deletions

View File

@@ -1,15 +1,31 @@
<!--
* @Author: lixg lixg@dongwu-inc.com
* @Date: 2023-01-31 13:41:35
* @LastEditors: lixg lixg@dongwu-inc.com
* @LastEditTime: 2023-01-31 13:45:07
* @FilePath: /fe-manage/src/components/student/OwnerTableModelStudent.vue
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
-->
<template>
<TableModelStudent :types="types" :id="id" ref="tableModelRef">
<template #extension="{ data: { record } }">
<CommonStudent v-if="record.type===type" :type="type" :id="id" @finash="submitCall" :clear="true" :select-stu="true" :select-one="true">
<a-button type="link">转移归属权</a-button>
</CommonStudent>
<CommonStudent
v-if="record.type === type"
:type="type"
:id="id"
@finash="submitCall"
:clear="true"
:select-stu="true"
:select-one="true"
>
<a-button type="link">转移归属权</a-button>
</CommonStudent>
</template>
<slot></slot>
</TableModelStudent>
</template>
<script setup>
import {defineProps, ref} from "vue";
import { defineProps, ref } from "vue";
import TableModelStudent from "@/components/student/TableModelStudent";
import CommonStudent from "@/components/student/CommonStudent";
@@ -21,12 +37,11 @@ defineProps({
default: () => [],
},
});
const tableModelRef = ref()
console.log("props", props.types);
const tableModelRef = ref();
function submitCall(flag) {
tableModelRef.value.loading = true
tableModelRef.value.loading = true;
flag && tableModelRef.value.searchStu();
}
</script>