pull gitlink_server

src/glcc/apply/editInfo.jsx

@@ -27,7 +27,7 @@ function EditRepoApplyInfo(props) {
       const taskCountArr = []
       registrationTaskList.map((item, index)=>{
         taskCountArr.push(index+1);
-        const{taskName, taskUrl, taskDifficulty, taskReward, tutorName, tutorMail, taskDesc, tutorPhone} = item;
+        const{taskName, taskUrl, taskDifficulty, taskReward, tutorName, tutorMail, taskDesc, tutorPhone, id} = item;
         taskInfo[`taskName${index+1}`] = taskName;
         taskInfo[`taskUrl${index+1}`] = taskUrl;
         taskInfo[`taskDifficulty${index+1}`] = taskDifficulty;
@@ -36,6 +36,7 @@ function EditRepoApplyInfo(props) {
         taskInfo[`tutorMail${index+1}`] = tutorMail;
         taskInfo[`taskDesc${index+1}`] = taskDesc;
         taskInfo[`tutorPhone${index+1}`] = tutorPhone;
+        taskInfo[`taskId${index+1}`] = id;
       })
       setTaskCount(taskCountArr);
       setTimeout(() => {
@@ -76,6 +77,7 @@ function EditRepoApplyInfo(props) {
         const registrationTaskList = []
         taskCount && taskCount.map(item=>{
           registrationTaskList.push({
+            id: values[`taskId${item}`],
             taskName: values[`taskName${item}`],
             taskUrl: values[`taskUrl${item}`],
             taskDifficulty: values[`taskDifficulty${item}`],
@@ -267,7 +269,7 @@ function EditRepoApplyInfo(props) {
               <div className='taskApplyTitle font-16'>课题信息（<span>{index+1}</span>/5)</div>
               {index>0 && <Button type="link" onClick={()=>{deleteTaskApply(item)}}><i className='iconfont icon-shanchuicon3 mr5 font-15'></i>删除</Button>}
             </FlexAJ>
-            <TaskApply helper={helper} taskKey={item} phonereg={phonereg} emailreg={emailreg}/>
+            <TaskApply helper={helper} taskKey={item} phonereg={phonereg} emailreg={emailreg} getFieldDecorator={getFieldDecorator}/>
           </div>
         })}
         {taskCount && taskCount.length<5 && <div>

src/glcc/apply/taskApply.jsx

@@ -4,7 +4,7 @@ import TextArea from 'antd/lib/input/TextArea';
 const Option = Select.Option;
 // 课题信息编辑
 function TaskApply(props) {
-  const {helper, disabled, taskKey, phonereg, emailreg} = props;
+  const {helper, disabled, taskKey, phonereg, emailreg, getFieldDecorator} = props;
   // 低、中、高
   const difficultyList = [
     {id: 1, name: "低"},
@@ -26,6 +26,9 @@ function TaskApply(props) {
   return(
     <div className="taskApplyForm">
       <div className="pt20 glcc_info_form">
+        <Form.Item label="课题id" hidden>
+          {getFieldDecorator(`taskId${taskKey}`, {})(<Input/>)}
+        </Form.Item>
         {helper('课题名称',
           '',
           `taskName${taskKey}`,