diff --git a/src/military/task/agreementList/index.jsx b/src/military/task/agreementList/index.jsx index 8abd3c3d9..e4c0e8d12 100644 --- a/src/military/task/agreementList/index.jsx +++ b/src/military/task/agreementList/index.jsx @@ -114,7 +114,7 @@ export default Form.create()(({ form, history, showNotification }) => { }, { title: '胜出者姓名', - dataIndex: 'winnerName', + dataIndex: 'winnerUserName', }, { title: '协议', diff --git a/src/military/task/agreementManageNew/index.jsx b/src/military/task/agreementManageNew/index.jsx index a23f49bf4..fa6c6ce50 100644 --- a/src/military/task/agreementManageNew/index.jsx +++ b/src/military/task/agreementManageNew/index.jsx @@ -160,8 +160,8 @@ export default Form.create()(({ current_user, form, showNotification, match, his return record.signatureFormUnsignedFile ?
{ record.signatureFormUnsignedFile.fileName } - 下载 - 预览 + 下载 + 预览
: '-' } @@ -173,15 +173,15 @@ export default Form.create()(({ current_user, form, showNotification, match, his return record.agreementFile ?
{ record.agreementFile.fileName } - 下载 - 预览 + 下载 + 预览
: '-' } }, { title: '审核时间', - dataIndex: 'createdAt', + dataIndex: 'firstDraftCheckTime', }, { title: '操作', @@ -193,10 +193,11 @@ export default Form.create()(({ current_user, form, showNotification, match, his {record.firstDraftCheckStatus === 0 && 未通过} { - record.firstDraftCheckStatus === 2 && + ( record.firstDraftCheckStatus === 2 && record.signatureFormUnsignedFile && record.agreementFile ) ? + : 暂未上传文件 } diff --git a/src/military/task/agreementSign/index.jsx b/src/military/task/agreementSign/index.jsx index 24367efd2..4d6253517 100644 --- a/src/military/task/agreementSign/index.jsx +++ b/src/military/task/agreementSign/index.jsx @@ -109,6 +109,10 @@ export default Form.create()(({ current_user, form, showNotification, match, his title: '任务名称', dataIndex: 'taskName', }, + { + title: '胜出者姓名', + dataIndex: 'winnerUserName', + }, { title: '发布主体', dataIndex: 'publisher',