mirror of
https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/fe-manage.git
synced 2025-12-14 21:36:44 +08:00
fix:公用模块任务状态显示模块字段同步
This commit is contained in:
@@ -273,15 +273,15 @@ export default {
|
|||||||
|
|
||||||
{
|
{
|
||||||
title: "任务状态",
|
title: "任务状态",
|
||||||
dataIndex: "status",
|
dataIndex: "finishStatus",
|
||||||
key: "status",
|
key: "finishStatus",
|
||||||
width: 60,
|
width: 60,
|
||||||
align: "center",
|
align: "center",
|
||||||
className: "h",
|
className: "h",
|
||||||
customRender: (text) => {
|
customRender: (text) => {
|
||||||
return (
|
return (
|
||||||
<div class="racona">
|
<div class="racona">
|
||||||
<span> {text.record.status == 0 || text.record.status==null ? "未开始" :text.record.status == 1 ?"已完成":"进行中"}</span>
|
<span> {text.record.finishStatus == 0 || text.record.finishStatus==null ? "未开始" :text.record.finishStatus == 1 ?"已完成":"进行中"}</span>
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -288,15 +288,15 @@ export default {
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
title: "任务状态",
|
title: "任务状态",
|
||||||
dataIndex: "status",
|
dataIndex: "finishStatus",
|
||||||
key: "status",
|
key: "finishStatus",
|
||||||
width: 60,
|
width: 60,
|
||||||
align: "center",
|
align: "center",
|
||||||
className: "h",
|
className: "h",
|
||||||
customRender: (text) => {
|
customRender: (text) => {
|
||||||
return (
|
return (
|
||||||
<div class="racona">
|
<div class="racona">
|
||||||
<span> {text.record.status == 0 || text.record.status==null ? "未开始" :text.record.status == 1 ?"已完成":"进行中"}</span>
|
<span> {text.record.finishStatus == 0 || text.record.finishStatus==null ? "未开始" :text.record.finishStatus == 1 ?"已完成":"进行中"}</span>
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
},
|
},
|
||||||
@@ -403,7 +403,7 @@ export default {
|
|||||||
studentDepartName: res.data.data.studyDetailList[i].studentDepartName,
|
studentDepartName: res.data.data.studyDetailList[i].studentDepartName,
|
||||||
studentJobName: res.data.data.studyDetailList[i].studentJobName,
|
studentJobName: res.data.data.studyDetailList[i].studentJobName,
|
||||||
lastStudyTime: res.data.data.studyDetailList[i].finishedTime,
|
lastStudyTime: res.data.data.studyDetailList[i].finishedTime,
|
||||||
status: res.data.data.studyDetailList[i].status?res.data.data.studyDetailList[i].status:0
|
finishStatus: res.data.data.studyDetailList[i].status?res.data.data.studyDetailList[i].status:0
|
||||||
}
|
}
|
||||||
newData.push(obj)
|
newData.push(obj)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -288,15 +288,15 @@ export default {
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
title: "任务状态",
|
title: "任务状态",
|
||||||
dataIndex: "status",
|
dataIndex: "finishStatus",
|
||||||
key: "status",
|
key: "finishStatus",
|
||||||
width: 60,
|
width: 60,
|
||||||
align: "center",
|
align: "center",
|
||||||
className: "h",
|
className: "h",
|
||||||
customRender: (text) => {
|
customRender: (text) => {
|
||||||
return (
|
return (
|
||||||
<div class="racona">
|
<div class="racona">
|
||||||
<span> {text.record.status == 0 || text.record.status==null ? "未开始" :text.record.status == 1 ?"已完成":"进行中"}</span>
|
<span> {text.record.finishStatus == 0 || text.record.finishStatus==null ? "未开始" :text.record.finishStatus == 1 ?"已完成":"进行中"}</span>
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
},
|
},
|
||||||
@@ -402,7 +402,7 @@ export default {
|
|||||||
studentDepartName: res.data.data.studyDetailList[i].studentDepartName,
|
studentDepartName: res.data.data.studyDetailList[i].studentDepartName,
|
||||||
studentJobName: res.data.data.studyDetailList[i].studentJobName,
|
studentJobName: res.data.data.studyDetailList[i].studentJobName,
|
||||||
lastStudyTime: res.data.data.studyDetailList[i].finishedTime,
|
lastStudyTime: res.data.data.studyDetailList[i].finishedTime,
|
||||||
status: res.data.data.studyDetailList[i].status?res.data.data.studyDetailList[i].status:0
|
finishStatus: res.data.data.studyDetailList[i].status?res.data.data.studyDetailList[i].status:0
|
||||||
}
|
}
|
||||||
newData.push(obj)
|
newData.push(obj)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -274,15 +274,15 @@
|
|||||||
|
|
||||||
{
|
{
|
||||||
title: "任务状态",
|
title: "任务状态",
|
||||||
dataIndex: "status",
|
dataIndex: "finishStatus",
|
||||||
key: "status",
|
key: "finishStatus",
|
||||||
width: 60,
|
width: 60,
|
||||||
align: "center",
|
align: "center",
|
||||||
className: "h",
|
className: "h",
|
||||||
customRender: (text) => {
|
customRender: (text) => {
|
||||||
return (
|
return (
|
||||||
<div class="racona">
|
<div class="racona">
|
||||||
<span> {text.record.status == 0 || text.record.status==null ? "未开始" :text.record.status == 1 ?"已完成":"进行中"}</span>
|
<span> {text.record.finishStatus == 0 || text.record.finishStatus==null ? "未开始" :text.record.finishStatus == 1 ?"已完成":"进行中"}</span>
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
},
|
},
|
||||||
|
|||||||
Reference in New Issue
Block a user