tongChong
/
forgeplus-react
forked from Gitlink/forgeplus-react
1
0
Fork 1
Code Issues Pull Requests 1 Releases Wiki Activity

Merge branch 'expert_review' of https://code.gitlink.org.cn/durian/forgeplus-react into dev_military_osredm

This commit is contained in:
何童崇 2022-01-19 17:27:46 +08:00
parent 9711945393 c8fd59d101
commit bf80860f78
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/military/expert/reviewResult/gradesModal/index.jsx
View File

@ -109,7 +109,7 @@ function GradesModal({ setVisible, visible, taskId, opsDetail }) {
let params = {
opsId: opsDetail && opsDetail.opsId,
opsType: opsDetail && opsDetail.opsType,
orderBy: '',
orderBy: 'gradesAverageDesc',
containerId: taskId,
containerType: 1,
};

10
src/military/expert/reviewRules/index.jsx
View File

@ -114,7 +114,7 @@ function ReviewRules({form, history, match}) {
{getFieldDecorator('criteriaOne', {
rules: [{ required: true, message: '请输入一个评分标准' }],
})(
<WordsInput placeholder="请输入评分项对应分值及评分标准" rows={3} maxLength='100'/>,
<WordsInput placeholder="请输入评分项对应的评分标准" rows={3} maxLength='100'/>,
)}
</Form.Item>
<Form.Item
@ -123,7 +123,7 @@ function ReviewRules({form, history, match}) {
{getFieldDecorator('criteriaTwo', {
rules: [{}],
})(
<WordsInput placeholder="请输入评分项对应分值及评分标准" rows={3} maxLength='100' />,
<WordsInput placeholder="请输入评分项对应的评分标准" rows={3} maxLength='100' />,
)}
</Form.Item>
<Form.Item
@ -132,7 +132,7 @@ function ReviewRules({form, history, match}) {
{getFieldDecorator('criteriaThree', {
rules: [{}],
})(
<WordsInput placeholder="请输入评分项对应分值及评分标准" rows={3} maxLength='100'/>,
<WordsInput placeholder="请输入评分项对应的评分标准" rows={3} maxLength='100'/>,
)}
</Form.Item>
<Form.Item
@ -141,7 +141,7 @@ function ReviewRules({form, history, match}) {
{getFieldDecorator('criteriaFour', {
rules: [{}],
})(
<WordsInput placeholder="请输入评分项对应分值及评分标准" rows={3} maxLength='100'/>,
<WordsInput placeholder="请输入评分项对应的评分标准" rows={3} maxLength='100'/>,
)}
</Form.Item>
<Form.Item
@ -150,7 +150,7 @@ function ReviewRules({form, history, match}) {
{getFieldDecorator('criteriaFive', {
rules: [{}],
})(
<WordsInput placeholder="请输入评分项对应分值及评分标准" rows={3} maxLength='100'/>,
<WordsInput placeholder="请输入评分项对应的评分标准" rows={3} maxLength='100'/>,
)}
</Form.Item>
<p className="rules_bar"></p>

2
src/military/task/taskDetail/index.jsx
View File

@ -483,7 +483,7 @@ export default Form.create()(
{detailData.status === 4 && dataList.length && (!detailData.isProofBoolean) && (!detailData.expertReview) && detailData.user && (current_user.admin || current_user.login === detailData.user.login) ?
<a className="line_1 color-blue fr ml20" onClick={() => { setVisibleProofs(true) }}>上传佐证材料</a> : ''}
{dataList.length > 0 && taskLimit && <a className="line_1 color-blue fr ml20" onClick={() => { window.open(`${httpUrl}/api/paper/papers/download/${id}`) }}>一键导出成果物 &gt;&gt;</a>}
{(!detailData.showUserStatus) && taskLimit && <a className="fr color-orange ml20" onClick={showUser}>应征者名单公示 &gt;&gt;</a>}
{(!detailData.showUserStatus) && !detailData.expertReview && taskLimit && <a className="fr color-orange ml20" onClick={showUser}>应征者名单公示 &gt;&gt;</a>}
{/* [添加专家评审流程]按钮入口，仅管理员可见 */}
{taskLimit && !detailData.expertReview && detailData.status<4 && <a className="fr color-orange ml20" onClick={addExpertReviewModal}>添加专家评审流程</a>}
</div>