dd

src/pages/classdetail/index.js

@@ -1102,8 +1102,8 @@ class ClassDetailForm extends React.Component {
         render: (text, record, index) => {
           return (
             <div>
-              {(record.gender && record.gender == 1) && '男'}
-              {(record.gender && record.gender == 2) && '女'}
+              {record.gender && record.gender == 1 ? '男' : ''}
+              {record.gender && record.gender == 2 ? '女' : ''}
               { !record.gender ? '-' : '' }
             </div>
           );

src/pages/student/RenewEdit.js

@@ -92,6 +92,11 @@ class RenewEdit extends React.Component {
       searchCourseRelateClass(selectedCourse.id || 0);
     }
   }
+  close = () => {
+    const { form, close } = this.props;
+    form.resetFields();
+    close();
+  }
   render() {
     const {
       visible,
@@ -105,9 +110,9 @@ class RenewEdit extends React.Component {
     return (
       <Modal
         visible={visible}
-        title="新增班级"
+        title="新增课程"
         okText="确定"
-        onCancel={() => close()}
+        onCancel={() => this.close()}
         onOk={this.renewCourse}
         className="modifyclassModal"
         zIndex={110}

src/utils/exportexcel.js

@@ -24,7 +24,7 @@ function exportExcel(headers, data, fileName = 'XXX.xlsx', type) {
         return {
           title: item.title,
           course: item.course.title,
-          teacher: item.school_teachers.nickname,
+          teacher: item.school_teachers ? item.school_teachers.map(ele => ele.nickname).join(',') : '',
           capacity: item.capacity,
           total: `${item.expend || 0}/${item.total}`,
         };