fix:新增学习状态查询条件

This commit is contained in:
zxj
2025-11-17 14:45:25 +08:00
parent abd4b47ba6
commit 2ecec80bdd
2 changed files with 14 additions and 16 deletions

View File

@@ -64,7 +64,7 @@
<a-form-item title="学习状态:"> <a-form-item title="学习状态:">
<div class="select"> <div class="select">
<a-select <a-select
v-model:value="tableParam.approvalResults" v-model:value="tableParam.studyStatus"
style="width: 260px; height: 40px" style="width: 260px; height: 40px"
placeholder="学习状态" placeholder="学习状态"
:options="learnStatusList" :options="learnStatusList"
@@ -644,7 +644,7 @@ const tablecolumns = ref([
customCell: () => { return { style: { maxWidth: '200px', overflow: 'hidden', whiteSpace: 'nowrap', textOverflow: 'ellipsis', cursor: 'pointer' } } }, customCell: () => { return { style: { maxWidth: '200px', overflow: 'hidden', whiteSpace: 'nowrap', textOverflow: 'ellipsis', cursor: 'pointer' } } },
customRender: ({ record: { studentOrgName, studentDepartName } }) => customRender: ({ record: { studentOrgName, studentDepartName } }) =>
// <a-tooltip color="white" placement="topLeft" title={allDepartShow(studentOrgName)} >{allDepartShow(studentOrgName)}</a-tooltip> // <a-tooltip color="white" placement="topLeft" title={allDepartShow(studentOrgName)} >{allDepartShow(studentOrgName)}</a-tooltip>
<a-tooltip color="white" placement="topLeft" title={studentOrgName} >{studentDepartName}</a-tooltip> <a-tooltip overlayClassName="custom-tooltip" placement="topLeft" title={studentOrgName} >{studentDepartName}</a-tooltip>
}, },
{ {
title: "所属小组", title: "所属小组",
@@ -1465,6 +1465,11 @@ defineExpose({ getStuList, startLoading });
} }
} }
.custom-tooltip .ant-tooltip-inner {
background-color: #fff !important; /* 修改背景色 */
color: #000; /* 修改文字颜色 */
}
/*.delete { /*.delete {
z-index: 9999; z-index: 9999;
width: 424px; width: 424px;

View File

@@ -949,6 +949,10 @@
<a-button <a-button
v-if="isNewEmployee" v-if="isNewEmployee"
@click="downloadReport(record)" @click="downloadReport(record)"
:disabled="
record.approvalResults != 3 ||
record.finishTaskNum / record.totalTaskNum != 100
"
type="link" type="link"
>成绩单下载 >成绩单下载
</a-button> </a-button>
@@ -5346,19 +5350,8 @@ export default {
state.checkStuId = record.studentId; state.checkStuId = record.studentId;
} }
function downloadReport(record) { function downloadReport(record) {
// window.open(
// window.location.protocol +
// process.env.VUE_APP_BASE_API +'/stu/project/socialRecruit/report/download?projectId='+state.projectId+'&studentId='+record.studentId
// );
api.downloadTranscript({projectId:state.projectId,studentId:record.studentId}).then(async (res) => { api.downloadTranscript({projectId:state.projectId,studentId:record.studentId}).then(async (res) => {
console.log(res,"@@@");
// const binaryData = [];
// binaryData.push(res);
// console.log(binaryData);
// var pdfUrl = window.URL.createObjectURL(new Blob(binaryData, { type: 'application/pdf' }));
const pdfBlob = new Blob([res.data], { type: 'application/pdf' }); const pdfBlob = new Blob([res.data], { type: 'application/pdf' });
// 2. 生成前端临时预览 URL // 2. 生成前端临时预览 URL
const pdfUrl = URL.createObjectURL(pdfBlob); const pdfUrl = URL.createObjectURL(pdfBlob);
window.open(pdfUrl); window.open(pdfUrl);