hz/fe-manage
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/fe-manage.git synced 2025-12-07 01:46:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'boe/zcwy-zsx0223' into zcwy-zsx0223

Browse Source
This commit is contained in:
zhangsir
2024-07-12 10:41:02 +08:00
parent 2ef976620f 6c49a8c276
commit e5107e42f8
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/student/CommonStudent.vue
View File

@@ -103,7 +103,7 @@
<a-tree v-model:selectedKeys="selectedOrgKeys" <a-tree v-model:selectedKeys="selectedOrgKeys"
:tree-data="searchOrgName.keyword ? orgData : treeOrgData" @select="onOrgSelectChange" :tree-data="searchOrgName.keyword ? orgData : treeOrgData" @select="onOrgSelectChange"
:loading="orgOrgLoading" :load-data="onLoadOrgData" :fieldNames="{ :loading="orgOrgLoading" :load-data="onLoadOrgData" :fieldNames="{
children: 'treeChildList', children: 'directChildList',
key: 'id', key: 'id',
title: 'name', title: 'name',
value: 'name', value: 'name',
@@ -542,7 +542,7 @@ function onLoadData(treeNode) {
function onLoadOrgData(treeNode) { function onLoadOrgData(treeNode) {
return request(ORG_CHILD_LIST, { keyword: "", orgId: treeNode.id }).then( return request(ORG_CHILD_LIST, { keyword: "", orgId: treeNode.id }).then(
(r) => { (r) => {
treeNode.dataRef.treeChildList = r.data; treeNode.dataRef.directChildList = r.data;
treeOrgData.value = [...treeOrgData.value]; treeOrgData.value = [...treeOrgData.value];
} }
); );

2
src/views/gratefulteacher/InstructorCertification.vue
View File

@@ -539,7 +539,7 @@ function handleOper(record, type, status = "") {
<div style="text-align: center; margin-top: 18px;"> <div style="text-align: center; margin-top: 18px;">
<a-pagination :defaultPageSize="pageSize" :showSizeChanger="false" v-model:current="current1" show-quick-jumper :total="total" @change="onChange" /> <a-pagination v-if="total>15" :defaultPageSize="pageSize" :showSizeChanger="false" v-model:current="current1" show-quick-jumper :total="total" @change="onChange" />
</div> </div>
<!--创建认证和编辑认证 --> <!--创建认证和编辑认证 -->
<a-modal v-model:visible="visible" :title="editId?'编辑认证':'创建认证'" @ok="!editId?handleOk():handleEdit()" width="610px"> <a-modal v-model:visible="visible" :title="editId?'编辑认证':'创建认证'" @ok="!editId?handleOk():handleEdit()" width="610px">