diff --git a/src/military/components/adminRouter/index.jsx b/src/military/components/adminRouter/index.jsx index 2328006a8..3325c868e 100644 --- a/src/military/components/adminRouter/index.jsx +++ b/src/military/components/adminRouter/index.jsx @@ -38,7 +38,7 @@ export default props => { 行业信息 职位信息 需求导入模板 - 签订协议内容 + 协议签订模板 应征投稿协议内容 diff --git a/src/military/managements.js b/src/military/managements.js index 098b8f023..dacec72e7 100644 --- a/src/military/managements.js +++ b/src/military/managements.js @@ -44,6 +44,12 @@ const AgreementManage = Loadable({ loading: Loading, }); +// 协议签订模板 +const AgreementContent = Loadable({ + loader: () => import("./task/agreementContent"), + loading: Loading, +}); + const PayProof = Loadable({ loader: () => import("./task/payProof"), loading: Loading, @@ -146,6 +152,14 @@ const Managements = (propsF) => { )} > + {/* 协议内容 */} + ( + + )} + > + {/* 管理员上传支付凭证 */} { + const { getFieldDecorator, validateFields, setFieldsValue } = form; + + useEffect(()=>{ + getAgreement().then(res=>{ + console.log(res); + }) + },[]) + + // 保存wiki文件,包括新增和修改 + function saveFile() { + validateFields((err, values) => { + if (!err) { + let regEn = /[\[\]`\/:*?''<>|%-+_]/g; + if (regEn.test(values.name)) { + message.error("文件名不能有特殊字符"); + return; + } + agreementEdit({ + owner, + repo: projectsId, + projectId: project.id, + pagename: wikiName, + ...values, + commit_message: "", + }).then((res) => dealRes(res)); + } + }); + } + + const helper = useCallback( + (label, name, rules, widget, initialValue, rightComponent) => ( + + {getFieldDecorator(name, { rules, initialValue, validateFirst: true })( + widget + )} + {rightComponent} + + ), + [] + ); + + return ( +
+ {/* {helper( + "协议名称", + "name", + [ + { required: true, message: "请输入协议名称" }, + // { pattern: /[^`\[\]\/:*?''<>|%-+_]/g, message: '不允许部分特殊字符' } + ], + "协议模板", + + )} */} + + {/* + + {getFieldDecorator("content", { + rules: [{ required: true, message: "请输入协议内容" }], + validateFirst: true, + })()} + */} + + +
+ ); +}); diff --git a/src/military/task/api.js b/src/military/task/api.js index 016550301..64c2bf83b 100644 --- a/src/military/task/api.js +++ b/src/military/task/api.js @@ -288,12 +288,28 @@ export function checkHavePaper(taskId) { }); } +// 新增协议 +export function agreementAdd() { + return fetch({ + url: '/api/paper/agreementSettings/', + method: 'post' + }); +} + +// 修改协议 +export function agreementEdit() { + return fetch({ + url: '/api/paper/agreementSettings/', + method: 'put' + }); +} // 获取协议 -export function getAgreement() { +export function getAgreement(params) { return fetch({ - url: '/api/paper/agreementSettings/1', - method: 'get' + url: `/api/paper/agreementSettings/${params==1?params:''}`, + method: 'get', + params:params!=1?params:null }); } diff --git a/src/military/task/components/agreementModal/index.jsx b/src/military/task/components/agreementModal/index.jsx index 294df42f3..5c3fd217a 100644 --- a/src/military/task/components/agreementModal/index.jsx +++ b/src/military/task/components/agreementModal/index.jsx @@ -55,8 +55,8 @@ export default Form.create()(props => {
{/* paperAuditing */} {checkedItem.paperAuditing &&

审核意见:{checkedItem.paperAuditing.message}

} - 协议样板.word - + 协议模板.word + { - applyModal && getAgreement().then(res => { + applyModal && getAgreement(1).then(res => { if (res && res.data) { setApplyContent({ title: res.data.title,