From 70913640b713905bcb23f41a969fbb9c3d6164df Mon Sep 17 00:00:00 2001 From: caicai8 <1149225589@qq.com> Date: Mon, 9 Sep 2019 17:26:43 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=AF=95=E8=AE=BE=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/react/src/modules/courses/Index.js | 2 +- .../courses/busyWork/CommonWorkPost.js | 1 - .../graduation/tasks/GraduateTaskItem.js | 2 +- .../graduation/tasks/GraduationTaskDetail.js | 15 +-- .../tasks/GraduationTasksSubmitedit.js | 9 +- .../tasks/GraduationTasksSubmitnew.js | 1 - .../tasks/GraduationTaskssetting.js | 8 +- .../tasks/GraduationTaskssettinglist.js | 2 + .../tasks/GraduationTaskssettingquestions.js | 101 ++---------------- .../courses/members/modal/AddTeacherModal.js | 9 +- 10 files changed, 39 insertions(+), 111 deletions(-) diff --git a/public/react/src/modules/courses/Index.js b/public/react/src/modules/courses/Index.js index de437bbe1..74e074d67 100644 --- a/public/react/src/modules/courses/Index.js +++ b/public/react/src/modules/courses/Index.js @@ -534,7 +534,7 @@ class CoursesIndex extends Component{ > {/* 修改作品 */} - () } diff --git a/public/react/src/modules/courses/busyWork/CommonWorkPost.js b/public/react/src/modules/courses/busyWork/CommonWorkPost.js index ed96914de..ce552fa50 100644 --- a/public/react/src/modules/courses/busyWork/CommonWorkPost.js +++ b/public/react/src/modules/courses/busyWork/CommonWorkPost.js @@ -131,7 +131,6 @@ class CommonWorkPost extends Component{ let coursesId=this.props.match.params.coursesId; window.location.href="courses/"+coursesId+"/graduation_tasks/"+workId+"/appraise"; - // window.location.href="/courses/"+coursesId+"/graduation/graduation_tasks/"+workId+"/"+workId+"/works/edit"; } handleSubmit=(e) => { diff --git a/public/react/src/modules/courses/graduation/tasks/GraduateTaskItem.js b/public/react/src/modules/courses/graduation/tasks/GraduateTaskItem.js index f3b98f927..671966c5d 100644 --- a/public/react/src/modules/courses/graduation/tasks/GraduateTaskItem.js +++ b/public/react/src/modules/courses/graduation/tasks/GraduateTaskItem.js @@ -318,7 +318,7 @@ class GraduateTaskItem extends Component{ {item==="修改作品"? - 修改作品 + 修改作品 :""} diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTaskDetail.js b/public/react/src/modules/courses/graduation/tasks/GraduationTaskDetail.js index 2c74547af..ab5869a1e 100644 --- a/public/react/src/modules/courses/graduation/tasks/GraduationTaskDetail.js +++ b/public/react/src/modules/courses/graduation/tasks/GraduationTaskDetail.js @@ -255,6 +255,7 @@ class GraduationTaskDetail extends Component{ avisible:false }) } + bindRef = ref => { this.child = ref } ; render(){ @@ -391,17 +392,17 @@ class GraduationTaskDetail extends Component{ {this.props.isAdmin()?
  • 导出
    • :""} {questionslist.work_status===undefined||questionslist.work_status===null||questionslist.work_status.length===0?"":questionslist.work_status.map((item,key)=>{ return( - + {item==="提交作品"?提交作品:""} {item==="补交作品"?补交作品:""} - {item==="修改作品"?修改作品:""} - {item==="查看作品"?查看作品 :""} + {item==="修改作品"?修改作品:""} + {item==="查看作品"?查看作品 :""} {item==="创建项目"?创建项目:""} {item==="关联项目"?关联项目:""} {item==="取消关联"?取消关联:""} @@ -428,13 +429,13 @@ class GraduationTaskDetail extends Component{ () + (props) => () } > () + (props) => () }> diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitedit.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitedit.js index 36ab0fbeb..7d2ec7173 100644 --- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitedit.js +++ b/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitedit.js @@ -496,7 +496,8 @@ class GraduationTasksSubmitedit extends Component{ Modalstype,Modalstopval,ModalCancel,ModalSave,memberslist,task_status,selectmemberslist,shixunsreplace} =this.state; let courseId=this.props.match.params.coursesId; - let category_id=this.props.match.params.category_id; + let task_Id=this.props.match.params.coursesId; + // let category_id=this.props.match.params.category_id; let work_Id=this.props.match.params.work_Id const uploadProps = { width: 600, @@ -570,7 +571,7 @@ class GraduationTasksSubmitedit extends Component{ {/*>*/} 毕设任务 > - 任务详情 + 任务详情 > {/**/} {/*{workslist&&workslist.task_name}*/} @@ -580,7 +581,7 @@ class GraduationTasksSubmitedit extends Component{

    -

    {workslist&&workslist.task_name}

    +

    { workslist && workslist.task_name }

    返回
    @@ -768,7 +769,7 @@ class GraduationTasksSubmitedit extends Component{
    {item.user_name}
    {item.group_name}
    {item.student_id}
    -
    {item.commit_status===false?已提交 :""}
    +
    {item.commit_status===true?已提交 :""}
    ) })} diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js index 4f9093709..be29d45a4 100644 --- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js +++ b/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js @@ -81,7 +81,6 @@ class GraduationTasksSubmitnew extends Component{ let coursesId=this.props.match.params.coursesId; window.location.href="/courses/"+coursesId+"/graduation_tasks/"+workId+"/appraise"; - // window.location.href="/courses/"+coursesId+"/graduation/graduation_tasks/"+task_Id+"/"+workId+"/works/edit"; } handleSubmit=(e) => { diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssetting.js b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssetting.js index 95d7a64cd..5bf7830d4 100644 --- a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssetting.js +++ b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssetting.js @@ -155,7 +155,11 @@ class GraduationTaskssettingapp extends Component{ let tab = this.props.tab; this.props.setTab && this.props.setTab(tab); - + try{ + this.props.triggerRef(this) + }catch(e){ + + } } @@ -846,6 +850,8 @@ class GraduationTaskssettingapp extends Component{ } /// 确认是否下载 confirmysl(url){ + debugger; + console.log(3); axios.get(url + '?export=true' ).then((response) => { if(response === undefined){ return diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js index 047946a6e..3733c2b51 100644 --- a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js +++ b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js @@ -646,6 +646,8 @@ class GraduationTaskssettinglist extends Component{ /// 确认是否下载 confirmysl(url){ + debugger; + console.log(1); let {teacher_comment, task_status, course_group, cross_comment, order, b_order, search,page} =this.state; let params ={ diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettingquestions.js b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettingquestions.js index 4df756d8c..ff455b59d 100644 --- a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettingquestions.js +++ b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettingquestions.js @@ -35,7 +35,12 @@ class GraduationTasksquestions extends Component{ let tab = this.props.tab; this.props.setTab && this.props.setTab(tab); - this.getdatas() + this.getdatas(); + try{ + this.props.triggerRef(this) + }catch(e){ + + } } getdatas=()=>{ const task_Id = this.props.match.params.task_Id; @@ -204,6 +209,8 @@ class GraduationTasksquestions extends Component{ /// 确认是否下载 confirmysl(url){ + debugger; + console.log(2); axios.get(url + '?export=true').then((response) => { if(response === undefined){ return @@ -299,82 +306,6 @@ class GraduationTasksquestions extends Component{ /> {questionslist&&questionslist?
    - - {/*

    - {questionslist.course_name} - > - {questionslist.graduation_name} - > - 任务详情 -

    - -
    -

    - {questionslist.task_name} -

    - - 返回 -
    */} - - - {/*
    -
    */} - - {/* 任务列表 - 毕设描述 - 设置 */} - - {/*导出成绩*/} - {/*{this.props.isAdmin()?导出成绩:""}*/} - {/*{this.props.isAdmin()?导出作品附件:""}*/} - - {/* - {this.props.isAdmin()?
  • - 导出 - -
    • :""} */} - - {/*项目在线质量检测*/} - {/* {this.props.isAdmin()?questionslist.status===1? { this.end()} }>立即截止:"":""} - {this.props.isAdmin()?questionslist.status===0? { this.publish()} }>立即发布:"":""} - {this.props.isAdmin()?编辑任务:""} -
    -
    */} - - -

    @@ -390,22 +321,6 @@ class GraduationTasksquestions extends Component{ }

    - {/*{questionslist&&questionslist.attachments.map((item,key)=>{*/} - {/*return(*/} - {/*
    */} - {/**/} - {/**/} - {/**/} - {/**/} - {/*{item.title}*/} - {/**/} - {/*{item.filesize}*/} - - {/*
    */} - {/*)*/} - - {/*})}*/}
    diff --git a/public/react/src/modules/courses/members/modal/AddTeacherModal.js b/public/react/src/modules/courses/members/modal/AddTeacherModal.js index b397f7838..dbcd587eb 100644 --- a/public/react/src/modules/courses/members/modal/AddTeacherModal.js +++ b/public/react/src/modules/courses/members/modal/AddTeacherModal.js @@ -109,6 +109,11 @@ class AddTeacherModal extends Component{ checkBoxValues: [] }) } + this.setState({ + name:undefined, + graduationGroup:undefined, + courseGroup:undefined + }) } onSendOk = () => { @@ -281,7 +286,7 @@ class AddTeacherModal extends Component{ { candidates && candidates.map( candidate => { return (

    - + {/* "color":"#4c4c4c" */} 12 }> @@ -299,7 +304,7 @@ class AddTeacherModal extends Component{ - +

    ) From 802c59f2b1798aeca9c10c6bc85a9d9d754073d4 Mon Sep 17 00:00:00 2001 From: caicai8 <1149225589@qq.com> Date: Tue, 10 Sep 2019 10:56:59 +0800 Subject: [PATCH 2/4] issue --- public/react/src/modules/courses/Index.js | 4 +- .../graduation/tasks/GraduateTaskItem.js | 4 +- .../graduation/tasks/GraduationTaskDetail.js | 37 +++++++++++++++---- .../tasks/GraduationTasksSubmitedit.js | 2 +- .../tasks/GraduationTaskssetting.js | 4 ++ .../tasks/GraduationTaskssettinglist.js | 11 +++++- .../tasks/GraduationTaskssettingquestions.js | 6 ++- 7 files changed, 53 insertions(+), 15 deletions(-) diff --git a/public/react/src/modules/courses/Index.js b/public/react/src/modules/courses/Index.js index 74e074d67..716a3583c 100644 --- a/public/react/src/modules/courses/Index.js +++ b/public/react/src/modules/courses/Index.js @@ -527,14 +527,14 @@ class CoursesIndex extends Component{ > {/* 新建作品 */} - () } > {/* 修改作品 */} - () } diff --git a/public/react/src/modules/courses/graduation/tasks/GraduateTaskItem.js b/public/react/src/modules/courses/graduation/tasks/GraduateTaskItem.js index 671966c5d..d45b7d60f 100644 --- a/public/react/src/modules/courses/graduation/tasks/GraduateTaskItem.js +++ b/public/react/src/modules/courses/graduation/tasks/GraduateTaskItem.js @@ -302,7 +302,7 @@ class GraduateTaskItem extends Component{ {item==="提交作品"? - 提交作品 + 提交作品 :""} @@ -310,7 +310,7 @@ class GraduateTaskItem extends Component{ {item==="补交作品"? - 补交作品 + 补交作品 :""} diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTaskDetail.js b/public/react/src/modules/courses/graduation/tasks/GraduationTaskDetail.js index ab5869a1e..0aff1a1bd 100644 --- a/public/react/src/modules/courses/graduation/tasks/GraduationTaskDetail.js +++ b/public/react/src/modules/courses/graduation/tasks/GraduationTaskDetail.js @@ -168,8 +168,29 @@ class GraduationTaskDetail extends Component{ typs:"end", }) } + coursetaskend=()=>{ + const coursesId = this.props.match.params.coursesId; + const task_Id = this.props.match.params.task_Id; + + let url = `/courses/${coursesId}/graduation_tasks/end_task.json`; + axios.post(url,{ + task_ids:[task_Id], + group_ids: this.state.course_groupslist, + }).then((response)=>{ + if (response.data.status == 0) { + this.props.showNotification(response.data.message); + this.cancelmodel(); + this.getdatas(); + this.child && this.child.reInit(); + } + + }).catch((error)=>{ + + }) + } // 取消 cancelmodel=()=>{ + debugger this.setState({ Modalstype:false, Loadtype:false, @@ -399,14 +420,14 @@ class GraduationTaskDetail extends Component{ {questionslist.work_status===undefined||questionslist.work_status===null||questionslist.work_status.length===0?"":questionslist.work_status.map((item,key)=>{ return( - {item==="提交作品"?提交作品:""} - {item==="补交作品"?补交作品:""} - {item==="修改作品"?修改作品:""} - {item==="查看作品"?查看作品 :""} - {item==="创建项目"?创建项目:""} - {item==="关联项目"?关联项目:""} - {item==="取消关联"?取消关联:""} - {item==="补交附件"?补交附件:""} + {item==="提交作品"?提交作品:""} + {item==="补交作品"?补交作品:""} + {item==="修改作品"?修改作品:""} + {item==="查看作品"?查看作品 :""} + {item==="创建项目"?创建项目:""} + {item==="关联项目"?关联项目:""} + {item==="取消关联"?取消关联:""} + {item==="补交附件"?补交附件:""} ) diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitedit.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitedit.js index 7d2ec7173..35d9cdad2 100644 --- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitedit.js +++ b/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitedit.js @@ -571,7 +571,7 @@ class GraduationTasksSubmitedit extends Component{ {/*>*/} 毕设任务 > - 任务详情 + 任务详情 > {/**/} {/*{workslist&&workslist.task_name}*/} diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssetting.js b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssetting.js index 5bf7830d4..874a69ca5 100644 --- a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssetting.js +++ b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssetting.js @@ -83,6 +83,10 @@ class GraduationTaskssettingapp extends Component{ } } + reInit=()=>{ + this.getsettings(); + } + getsettings=()=>{ let task_Id=this.props.match.params.task_Id; diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js index 3733c2b51..acfcbaa63 100644 --- a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js +++ b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js @@ -81,6 +81,15 @@ class GraduationTaskssettinglist extends Component{ this.props.history.replace(`/courses/${this.state.taskslistdata.course_id}/graduation_tasks/${this.state.taskslistdata.graduation_id}`); } + reInit=()=>{ + this.setState({ + course_groupslist:[], + checkAllValue:false + }) + let {teacher_comment, task_status, course_group, cross_comment, order, b_order, search} = this.state; + this.seacthdata(teacher_comment, task_status, course_group, cross_comment, order, b_order, search,this.state.page); + } + seacthdata=(teacher_comment,task_status,course_group,cross_comment,order,b_order,search,pages)=>{ let{page,limit}=this.state; // console.log(teacher_comment,task_status,course_group,cross_comment,order,b_order,search) @@ -97,7 +106,7 @@ class GraduationTaskssettinglist extends Component{ order:order===null?undefined:order, b_order:b_order===null?undefined:b_order, search:search===null?undefined:search, - page:pages===null?undefined:pages, + page:pages===null?undefined:page, limit:20, }, paramsSerializer: function(params) { diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettingquestions.js b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettingquestions.js index ff455b59d..06ed1eaa1 100644 --- a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettingquestions.js +++ b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettingquestions.js @@ -42,6 +42,11 @@ class GraduationTasksquestions extends Component{ } } + + reInit=()=>{ + this.getdatas(); + } + getdatas=()=>{ const task_Id = this.props.match.params.task_Id; let url="/graduation_tasks/"+task_Id+".json"; @@ -51,7 +56,6 @@ class GraduationTasksquestions extends Component{ this.setState({ questionslist:result.data }) - } }).catch((error)=>{ console.log(error) From 26797533aa5ca40b5534592f44813505419e00b9 Mon Sep 17 00:00:00 2001 From: caicai8 <1149225589@qq.com> Date: Tue, 10 Sep 2019 16:59:47 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=AD=A6=E7=94=9F=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=8E=92=E5=BA=8F=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/courses/members/studentsList.js | 48 +++++++++++++++---- 1 file changed, 38 insertions(+), 10 deletions(-) diff --git a/public/react/src/modules/courses/members/studentsList.js b/public/react/src/modules/courses/members/studentsList.js index e82d417c2..6e52cd279 100644 --- a/public/react/src/modules/courses/members/studentsList.js +++ b/public/react/src/modules/courses/members/studentsList.js @@ -7,7 +7,7 @@ import CourseLayoutcomponent from '../common/CourseLayoutComponent' import Titlesearchsection from '../common/titleSearch/TitleSearchSection' import ColorCountText from '../common/titleSearch/ColorCountText' -import { WordsBtn, trigger, on, off, getUrl, downloadFile } from 'educoder' +import { WordsBtn, trigger, on, off, getUrl, downloadFile , sortDirections } from 'educoder' import Modals from "../../modals/Modals"; import axios from 'axios' import _ from 'lodash' @@ -17,8 +17,9 @@ import CreateGroupByImportModal from './modal/CreateGroupByImportModal' const Search =Input.Search; -const buildColumns = (that) => { - const { course_groups } = that.state +const buildColumns = (that,isParent) => { + const { course_groups , sortedInfo } = that.state + let showSorter = isParent==true const columns=[{ title: '序号', dataIndex: 'id', @@ -59,6 +60,9 @@ const buildColumns = (that) => { align:'center', width:"10%", className:"color-grey-6", + sorter: true, + sortDirections: sortDirections, + sortOrder: sortedInfo.columnKey === 'student_id' && sortedInfo.order, render: (student_id, record) => { return 10 ? student_id : ''} style={{maxWidth: '160px'}} >{student_id} @@ -71,7 +75,10 @@ const buildColumns = (that) => { key: 'course_group_name', align:'center', width:"40%", - className:"color-grey-6" + className:"color-grey-6", + sorter:showSorter, + sortDirections: sortDirections, + sortOrder: sortedInfo.columnKey === 'course_group_name' && sortedInfo.order, }) } const isAdminOrStudent = that.props.isAdminOrStudent() @@ -124,6 +131,7 @@ class studentsList extends Component{ isSpin:false, DownloadType:false, DownloadMessageval:undefined, + sortedInfo: {order:'ascend',columnKey: 'student_id'} } } /// 确认是否下载 @@ -319,8 +327,19 @@ class studentsList extends Component{ this.setState({ page: argPage }) } let page = argPage || this.state.page - let { order, searchValue }=this.state - let url=`/courses/${id}/students.json?order=${order}&page=${page}&limit=20&course_group_id=${course_group_id}`; + let { searchValue , sortedInfo }=this.state + let order = 1; + if (sortedInfo.columnKey == 'student_id') { + order = 1; + } else if (sortedInfo.columnKey == 'course_group_name') { + order = 2; + } + let sort = 'desc'; + if (sortedInfo.order == 'ascend') { + sort = 'asc' + } + + let url=`/courses/${id}/students.json?order=${order}&sort=${sort}&page=${page}&limit=20&course_group_id=${course_group_id}`; if(!!searchValue){ url+='&search='+searchValue; } @@ -494,6 +513,15 @@ class studentsList extends Component{ this.props.showNotification('复制成功') } + onTableChange = (pagination, filters, sorter) =>{ + this.setState({ + sortedInfo: sorter, + }, () => { + this.fetchAll(); + }); + } + + render(){ const isAdmin = this.props.isAdmin() const isSuperAdmin = this.props.isSuperAdmin() @@ -653,7 +681,7 @@ class studentsList extends Component{ {isAdmin && 已选 {checkBoxValues.length} 个}
    {isAdmin &&
  • 删除
    • } - {isAdmin &&
  • + {isAdmin &&
  • 移动到...
      { @@ -687,7 +715,7 @@ class studentsList extends Component{
    • } -
  • + {/*
  • {currentOrderName} { course_groups && !!course_groups.length && @@ -698,13 +726,13 @@ class studentsList extends Component{ } -
    • + */}
    {!this.state.isSpin && -
    +
    }
    From 2d0794fc235c3bccee13ce78fa43593c0c1a8ab4 Mon Sep 17 00:00:00 2001 From: caicai8 <1149225589@qq.com> Date: Wed, 11 Sep 2019 09:29:50 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E7=BC=96=E8=BE=91=E5=9F=BA=E6=9C=AC?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/user/account/AccountBasicEdit.js | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/public/react/src/modules/user/account/AccountBasicEdit.js b/public/react/src/modules/user/account/AccountBasicEdit.js index bff4422ec..1f87454a5 100644 --- a/public/react/src/modules/user/account/AccountBasicEdit.js +++ b/public/react/src/modules/user/account/AccountBasicEdit.js @@ -421,7 +421,11 @@ class AccountBasic extends Component { identity }=this.state; const { getFieldDecorator } = this.props.form; - let{basicInfo}=this.props + let{ basicInfo }=this.props + + // 已职业认证的账户不能修改职业，学校/单位，院系/部门，产品还未确定，先默认为false--可以更改 + // basicInfo && basicInfo.professional_certification == "certified" + const professionalFlag = false; // form合并了 const propsWithoutForm = Object.assign({}, this.props) @@ -607,7 +611,7 @@ class AccountBasic extends Component { message: '请先选择职业', }], })( - @@ -628,7 +632,7 @@ class AccountBasic extends Component { message: '请先输入学号', }], })( - + )} } @@ -646,7 +650,7 @@ class AccountBasic extends Component { message: '请先选择职称', }], })( - @@ -669,7 +673,7 @@ class AccountBasic extends Component { message: '请先选择职称', }], })( - @@ -703,7 +707,7 @@ class AccountBasic extends Component { }], })( - + { filterSchoolList && filterSchoolList.map((item,key)=>{ return() @@ -741,7 +745,7 @@ class AccountBasic extends Component { // } }], })( - + { filterDepartments && filterDepartments.map((item,key)=>{ return(