Merge remote-tracking branch 'origin/bww-v2' into webpack-change

src/components/CallStudents.js

@@ -711,13 +711,13 @@ class CallStudentsForm extends React.Component {
             </Col>
           </Row>
           <Table
+            rowKey="student_id"
             dataSource={callStudentOperateList}
             columns={studentcolumns}
             scroll={{ x: 'max-content' }}
             loading={callStudentListLoading}
             pagination={false}
             footer={() => <div className="tablefooterbox" style={fontSize14}>共有{callStudentTotal}个学生</div>}
-            rowKey="id"
           />
         </Modal>
         <Modal
@@ -797,7 +797,7 @@ class CallStudentsForm extends React.Component {
           </Row>
           <Row>
             <Table
-              rowKey="id"
+              rowKey={bukeStudentList => bukeStudentList.id}
               dataSource={bukeStudentList}
               columns={bukestudentColumns}
               scroll={{ x: 'max-content' }}

src/pages/studentinfo/index.js

@@ -382,7 +382,7 @@ class StudentMgt extends React.Component {
       (ele) => {
         if (arr.indexOf(ele.course.id) < 0) {
           arr.push(ele.course.id);
-          return <Option value={ele.course.id}>{ele.course.title}</Option>;
+          return <Option key={ele.id} value={ele.course.id}>{ele.course.title}</Option>;
         }
         return false;
       });
@@ -484,6 +484,8 @@ class StudentMgt extends React.Component {
       erpCountdown,
       erpCounting,
     } = this.props;
+    console.log(this.props, 'this.props');
+    console.log(classRecordsList, 'classRecordsList');
     const { getFieldDecorator } = this.props.form;
     const { logCourseId } = this.state;
     const dateFormat = 'YYYY/MM/DD';
@@ -764,6 +766,7 @@ class StudentMgt extends React.Component {
                 </div>
                 <div className={pageStyle.tablebox}>
                   <Table
+                    rowKey="id"
                     dataSource={studentCurrentCourses}
                     columns={columns}
                     pagination={false}
@@ -790,7 +793,7 @@ class StudentMgt extends React.Component {
                   <span>选择班级：</span>
                   <Select placeholder="所有班级" style={{ width: 233 }} onChange={this.classChange}>
                     <Option value="">所有班级</Option>
-                    {studentsClassList.map(ele => <Option value={ele.id}>{ele.title}</Option>)}
+                    {studentsClassList.map(ele => <Option key={ele.id} value={ele.id}>{ele.title}</Option>)}
                   </Select>
                 </div>
                 <div className={pageStyle.tablebox}>