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

Merge branch 'zcwy_0712' into 'master-0705'

Browse Source 
Zcwy 0712

See merge request !187
This commit is contained in:
joshen
2024-07-12 18:32:33 +08:00
parent 0d223eb2e5 78dc7ecb5f
commit 69b253deba
10 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/drawers/CheckStu.vue
View File

@@ -141,7 +141,7 @@
"
/>
</div>
<div class="altext">{{ item.status === 0 ? "进行中" : item.status === 1 ? "已完成" : "未开始" }}</div>
<div class="altext">{{ item.status === 2 ? "进行中" : item.status === 1 ? "已完成" : "未开始" }}</div>
</div>
</div>

2
src/components/drawers/project/ProjectExamManage.vue
View File

@@ -314,7 +314,7 @@ export default {
align: "center",
ellipsis: true,
className: "h",
customRender: ({record:{status}}) => ({2:'进行中',1:'未开始',9:'已完成'}[status] || '未开始'),
customRender: ({record:{status}}) => ({1:'进行中',0:'未开始',9:'已完成'}[status] || '未开始'),
},
{
title: "操作",

2
src/components/drawers/project/ProjectExternalExamManage.vue
View File

@@ -327,7 +327,7 @@
align: "center",
ellipsis: true,
className: "h",
customRender: ({record:{status}}) => ({0:'未开始',1:'进行中',null:'进行中',2:'已完成'}[status] || '未开始'),
customRender: ({record:{status}}) => ({0:'未开始',1:'已完成',null:'未开始',2:'进行中'}[status] || '未开始'),
},
],
loadingData: true

2
src/components/drawers/project/ProjectVoteManage.vue
View File

@@ -292,7 +292,7 @@
customRender: (text) => {
return (
<div class="racona">
<span> {text.record.finishStatus == 1 || text.record.finishStatus == 0 || text.record.finishStatus==null ? "未开始" :text.record.finishStatus == 2 ?"进行中":text.record.finishStatus == 3 ? "已完成" :"未完成"}</span>
<span> { text.record.finishStatus == 0 || text.record.finishStatus==null ? "未开始" :text.record.finishStatus == 2 ?"进行中":text.record.finishStatus == 1 ? "已完成" :"未完成"}</span>
</div>
);
},

2
src/components/drawers/router/RouterExaminationExternalManage.vue
View File

@@ -340,7 +340,7 @@
align: "center",
ellipsis: true,
className: "h",
customRender: ({record:{status}}) => ({0:'未开始',1:'进行中',null:'进行中',2:'已完成'}[status] || '未开始'),
customRender: ({record:{status}}) => ({0:'未开始',1:'已完成',null:'未开始',2:'进行中'}[status] || '未开始'),
},
],
loadingData: true

2
src/components/drawers/router/RouterExaminationManage.vue
View File

@@ -295,7 +295,7 @@ export default {
align: "center",
ellipsis: true,
className: "h",
customRender: ({record:{status}}) => ({1:'已完成',0:'未开始',9:'已完成'}[status] || '未开始'),
customRender: ({record:{status}}) => ({9:'已完成',0:'未开始',1:'进行中'}[status] || '未开始'),
},
{
title: "操作",

2
src/components/drawers/router/RouterVoteManage.vue
View File

@@ -312,7 +312,7 @@
customRender: (text) => {
return (
<div class="racona">
<span> {text.record.finishStatus == 1 || text.record.finishStatus == 0 || text.record.finishStatus==null ? "未开始" :text.record.finishStatus == 2 ?"进行中":text.record.finishStatus == 3 ? "已完成" :"未完成"}</span>
<span> { text.record.finishStatus == 0 || text.record.finishStatus==null ? "未开始" :text.record.finishStatus == 2 ?"进行中":text.record.finishStatus == 1 ? "已完成" :"未完成"}</span>
</div>
);
},

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

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

4
src/views/courselibrary/CoursewareManage.vue
View File

@@ -1909,8 +1909,8 @@ const columns2 = [
<span>
{" "}
{text.record.finishStatus == 0 || text.record.finishStatus == null
? "未开始"
: "已完成"}
? "未开始" :text.record.finishStatus == 1?"已完成"
: '进行中'}
</span>
</div>
);

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;">
<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>
<!--创建认证和编辑认证 -->
<a-modal v-model:visible="visible" :title="editId?'编辑认证':'创建认证'" @ok="!editId?handleOk():handleEdit()" width="610px">