diff --git a/src/military/task/agreementList/index.jsx b/src/military/task/agreementList/index.jsx index 868c92737..8f97f2a31 100644 --- a/src/military/task/agreementList/index.jsx +++ b/src/military/task/agreementList/index.jsx @@ -18,7 +18,7 @@ const checkStatusArr = []; for (const item of paperCheckStatusArr) { checkStatusArr[item.dicItemCode] = item.dicItemName; } -export default Form.create()(({ form, history }) => { +export default Form.create()(({ form, history, showNotification }) => { const { getFieldDecorator, setFieldsValue, getFieldsValue } = form; @@ -81,7 +81,11 @@ export default Form.create()(({ form, history }) => { signatureFormSignTaskId: item.checkedAgreementSignTaskId } getSignUrl(params).then(data => { - history.push({ pathname: '/managements/iframe', state: { url: data.data } }) + if (data.data) { + history.push({ pathname: '/managements/iframe', state: { url: data.data } }) + } else { + showNotification('签署链接获取失败,请联系管理员'); + } }).finally(() => { setSignLoading(false); }) @@ -110,10 +114,7 @@ export default Form.create()(({ form, history }) => { }, { title: '胜出者姓名', - dataIndex: 'user', - render: (text, record) => { - return record.nickname || record.login - } + dataIndex: 'winnerName', }, { title: '协议', @@ -159,14 +160,6 @@ export default Form.create()(({ form, history }) => { , signStatus.unsigned )} - {helper( - "任务编号", - "number", - [{ max: 20, message: '长度不能超过20个字符' }], - - )} {helper( "任务名称", @@ -176,15 +169,6 @@ export default Form.create()(({ form, history }) => { placeholder="请输入任务名称" /> )} - - {helper( - "胜出者姓名", - "number", - [{ max: 20, message: '长度不能超过20个字符' }], - - )} diff --git a/src/military/task/agreementSign/index.jsx b/src/military/task/agreementSign/index.jsx index bff768678..24367efd2 100644 --- a/src/military/task/agreementSign/index.jsx +++ b/src/military/task/agreementSign/index.jsx @@ -82,7 +82,11 @@ export default Form.create()(({ current_user, form, showNotification, match, his signatureFormSignTaskId: item.signatureFormSignTaskId } getSignUrl(params).then(data => { - history.push({ pathname: '/managements/iframe', state: { url: data.data } }); + if (data.data) { + history.push({ pathname: '/managements/iframe', state: { url: data.data } }); + } else { + showNotification('签署链接获取失败,请联系管理员'); + } }).finally(() => { setSignLoading(false); }) @@ -107,10 +111,7 @@ export default Form.create()(({ current_user, form, showNotification, match, his }, { title: '发布主体', - dataIndex: 'user', - render: (text, record) => { - return record.nickname || record.login - } + dataIndex: 'publisher', }, { title: '发布时间', diff --git a/src/military/task/api.js b/src/military/task/api.js index 0933d3f5d..40beff87a 100644 --- a/src/military/task/api.js +++ b/src/military/task/api.js @@ -813,4 +813,13 @@ export function getUserSignUrl(params) { method: 'get', params, }); +} + +// 查询当前任务文件上传情况 +export function getUploadStatus(params) { + return fetch({ + url: `/api/taskOnlineSign/firstDraftUploadStatus`, + method: 'get', + params, + }); } \ No newline at end of file diff --git a/src/military/task/components/agreementModal/index.jsx b/src/military/task/components/agreementModal/index.jsx index c8690a1bb..d05e2f488 100644 --- a/src/military/task/components/agreementModal/index.jsx +++ b/src/military/task/components/agreementModal/index.jsx @@ -101,12 +101,12 @@ export default Form.create()(props => {
审核意见:{checkedItem.paperAuditing.message}
} -