Skip to content

B
biz.qingxiao.com
Commit 6593da87 authored by wangxuelai's avatar wangxuelai
Browse files
Options

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

parents 485a9133 b1607412
Hide whitespace changes
Inline Side-by-side
Showing with 59 additions and 58 deletions
src/components/CallStudents.js
View file @ 6593da87
......@@ -398,7 +398,7 @@ class CallStudentsForm extends React.Component {
{
title: '姓名',
dataIndex: 'name',
key: 'name',
key: '1',
render: (text, record, index) => {
return (
<div className={`${pageStyle.classNamebox} ${record.hassearch ? pageStyle.hasSearch : ''}`}>
......@@ -410,12 +410,12 @@ class CallStudentsForm extends React.Component {
{
title: '手机号',
dataIndex: 'mobile',
key: 'mobile',
key: '2',
},
{
title: '剩余课时',
dataIndex: 'surplus',
key: 'surplus',
key: '3',
render: (text, record, index) => {
return (
<div className={pageStyle.classNamebox}>
......@@ -427,7 +427,7 @@ class CallStudentsForm extends React.Component {
{
title: '到课状态',
dataIndex: 'course',
key: 'course',
key: '4',
render: (text, record, index) => {
return (
<div className={pageStyle.classNamebox}>
......@@ -470,7 +470,7 @@ class CallStudentsForm extends React.Component {
{
title: '姓名',
dataIndex: 'name',
key: 'name',
key: '5',
render: (text, record, index) => {
return (
<div className={pageStyle.classNamebox}>
......@@ -482,7 +482,7 @@ class CallStudentsForm extends React.Component {
{
title: '性别',
dataIndex: 'gender',
key: 'gender',
key: '6',
render: (text, record, index) => {
return (
<div className={pageStyle.classNamebox}>
......@@ -494,12 +494,12 @@ class CallStudentsForm extends React.Component {
{
title: '手机号',
dataIndex: 'mobile',
key: 'mobile',
key: '7',
},
{
title: '课程名',
dataIndex: 'course',
key: 'course',
key: '8',
render: (text, record, index) => {
return (
<div className={pageStyle.classNamebox}>
......@@ -511,14 +511,14 @@ class CallStudentsForm extends React.Component {
{
title: '年级',
dataIndex: 'grade',
key: 'grade',
key: '9',
},
];
const bukestudentColumns = [
{
title: '姓名',
dataIndex: 'name',
key: 'name',
key: '11',
render: (text, record, index) => {
return (
<div className={pageStyle.classNamebox}>
......@@ -530,7 +530,7 @@ class CallStudentsForm extends React.Component {
{
title: '班级名称',
dataIndex: 'gender',
key: 'gender',
key: '12',
render: (text, record, index) => {
return (
<div className={pageStyle.classNamebox}>
......@@ -542,7 +542,7 @@ class CallStudentsForm extends React.Component {
{
title: '上课时间',
dataIndex: 'start_time',
key: 'start_time',
key: '13',
render: (text, record, index) => {
return (
<div className={pageStyle.classNamebox}>
......@@ -554,7 +554,7 @@ class CallStudentsForm extends React.Component {
{
title: '上课老师',
dataIndex: 'course',
key: 'course',
key: '14',
render: (text, record, index) => {
return (
<div className={pageStyle.classNamebox}>
......@@ -568,7 +568,7 @@ class CallStudentsForm extends React.Component {
{
title: '缺课状态',
dataIndex: 'grade',
key: 'grade',
key: '15',
render: (text, record, index) => {
return (
<div className={pageStyle.classNamebox}>
......@@ -581,7 +581,7 @@ class CallStudentsForm extends React.Component {
{
title: '剩余课时',
dataIndex: 'surplus',
key: 'surplus',
key: '16',
render: (text, record, index) => {
return (
<div className={pageStyle.classNamebox}>{(record.student_course && record.student_course.surplus) || 0}</div>
......@@ -591,7 +591,7 @@ class CallStudentsForm extends React.Component {
{
title: '上课内容',
dataIndex: 'content',
key: 'content',
key: '17',
render: (text, record, index) => {
return (
<div className={pageStyle.classNamebox}>{record.schedule.content}</div>
......@@ -711,7 +711,7 @@ class CallStudentsForm extends React.Component {
</Col>
</Row>
<Table
rowKey={callStudentOperateList => callStudentOperateList.id}
rowKey="id"
dataSource={callStudentOperateList}
columns={studentcolumns}
scroll={{ x: 'max-content' }}
......@@ -746,7 +746,7 @@ class CallStudentsForm extends React.Component {
</Row>
<Row>
<Table
rowKey={linshiStudentList => linshiStudentList.id}
rowKey="id"
dataSource={linshiStudentList}
columns={addstudentColumns}
scroll={{ x: 'max-content' }}
......@@ -797,7 +797,7 @@ class CallStudentsForm extends React.Component {
</Row>
<Row>
<Table
rowKey={bukeStudentList => bukeStudentList.id}
rowKey="id"
dataSource={bukeStudentList}
columns={bukestudentColumns}
scroll={{ x: 'max-content' }}
......
src/pages/classdetail/AddCourseTime.less
View file @ 6593da87
......@@ -6,7 +6,7 @@
}
}
.timeitem {
width:160px;
width:170px;
height:32px;
background:rgba(255,255,255,1);
border-radius:4px;
......@@ -17,4 +17,4 @@
}
.itemContent {
padding-right: 40px;
}
\ No newline at end of file
}
src/pages/classdetail/ChangeCourse.js
View file @ 6593da87
......@@ -213,7 +213,7 @@ class ChangeCourse extends React.Component {
}
{changeScheduleIndex == 2 &&
<Table
rowKey={scheduleStudentList => scheduleStudentList.name}
rowKey="id"
dataSource={scheduleStudentList}
columns={schedulestudentcolumns}
scroll={{ x: 400 }}
......
src/pages/classdetail/index.js
View file @ 6593da87
......@@ -965,8 +965,8 @@ class ClassDetailForm extends React.Component {
const courseplancolumns = [
{
title: '排课方式',
dataIndex: 'name',
key: 'name',
dataIndex: 'is_repeat',
key: 'is_repeat',
render: (text, record, index) => {
return (
<div>
......@@ -979,8 +979,8 @@ class ClassDetailForm extends React.Component {
},
{
title: '上课日期',
dataIndex: 'age',
key: 'age',
dataIndex: 'week_day',
key: 'week_day',
render: (text, record, index) => {
return (
<div>
......@@ -1005,7 +1005,7 @@ class ClassDetailForm extends React.Component {
render: (text, record, index) => {
return (
<div>
{record.times && record.times.map(ele => <div key={ele}>{ele}</div>)}
{record.times && record.times.map(ele => <div>{ele}</div>)}
</div>
);
},
......@@ -1130,8 +1130,8 @@ class ClassDetailForm extends React.Component {
const studentChangeScheduleColumns = [
{
title: '上课时间',
dataIndex: 'coursetime',
key: 'coursetime',
dataIndex: 'start_time',
key: 'start_time',
render: (text, record, index) => {
return (
<div className={pageStyle.classNamebox}>
......@@ -1143,8 +1143,8 @@ class ClassDetailForm extends React.Component {
},
{
title: '上课老师',
dataIndex: 'teacher',
key: 'teacher',
dataIndex: 'nickname',
key: 'nickname',
render: (text, record, index) => {
return (
<div>
......@@ -1168,7 +1168,7 @@ class ClassDetailForm extends React.Component {
{
title: '上课内容',
dataIndex: 'content',
key: 'content',
key: 'j',
render: (text, record, index) => {
return (
<div>
......@@ -1182,7 +1182,7 @@ class ClassDetailForm extends React.Component {
{
title: '操作',
dataIndex: 'course',
key: 'course',
key: 'ra',
render: (text, record, index) => {
return (
<a href="javascript:;" onClick={() => this.sureChangeStudentSchedule(record)}>调课</a>
......@@ -1194,7 +1194,7 @@ class ClassDetailForm extends React.Component {
{
title: '姓名',
dataIndex: 'name',
key: 'name',
key: 'q',
render: (text, record, index) => {
return (
<div>
......@@ -1220,12 +1220,12 @@ class ClassDetailForm extends React.Component {
{
title: '手机号',
dataIndex: 'mobile',
key: 'mobile',
key: 'e',
},
{
title: '课程名',
dataIndex: 'course',
key: 'course',
key: 'r',
render: (text, record, index) => {
return (
<div>
......@@ -1237,14 +1237,14 @@ class ClassDetailForm extends React.Component {
{
title: '年级',
dataIndex: 'grade',
key: 'grade',
key: 'f',
},
];
const coursecolumns = [
{
title: '序号',
dataIndex: 'name',
key: 'name',
key: 'g',
render: (text, record, index) => {
return (
<div>
......@@ -1256,7 +1256,7 @@ class ClassDetailForm extends React.Component {
{
title: '上课时间',
dataIndex: 'coursetime',
key: 'coursetime',
key: 'h',
render: (text, record, index) => {
return (
<div>
......@@ -1278,7 +1278,7 @@ class ClassDetailForm extends React.Component {
{
title: '上课老师',
dataIndex: 'teacher',
key: 'teacher',
key: 'ja',
render: (text, record, index) => {
return (
<div>
......@@ -1290,7 +1290,7 @@ class ClassDetailForm extends React.Component {
{
title: '上课教室',
dataIndex: 'class_room',
key: 'class_room',
key: 'k',
render: (text, record, index) => {
return (
<div>
......@@ -1302,7 +1302,7 @@ class ClassDetailForm extends React.Component {
{
title: '上课内容',
dataIndex: 'content',
key: 'content',
key: 'z',
render: (text, record, index) => {
return (
<div style={{ maxWidth: '200px' }}>
......@@ -1316,7 +1316,7 @@ class ClassDetailForm extends React.Component {
{
title: '点名时间',
dataIndex: 'call_time',
key: 'call_time',
key: 'x',
render: (text, record, index) => {
return (
<div>
......@@ -1327,8 +1327,8 @@ class ClassDetailForm extends React.Component {
},
{
title: '操作',
dataIndex: 'c',
key: 'c',
dataIndex: 'd',
key: 'd',
render: (text, record, index) => {
return (
<div>
......@@ -1355,7 +1355,7 @@ class ClassDetailForm extends React.Component {
{
title: '姓名',
dataIndex: 'name',
key: 'name',
key: 'm',
render: (text, record) => {
return (
<div>
......@@ -1367,7 +1367,7 @@ class ClassDetailForm extends React.Component {
{
title: '性别',
dataIndex: 'gender',
key: 'gender',
key: 'n',
render: (text, record, index) => {
return (
<div>
......@@ -1381,12 +1381,12 @@ class ClassDetailForm extends React.Component {
{
title: '手机号',
dataIndex: 'mobile',
key: 'mobile',
key: 'o',
},
{
title: '课程名',
dataIndex: 'course',
key: 'course',
key: 'i',
render: (text, record, index) => {
return (
<div>
......@@ -1397,8 +1397,8 @@ class ClassDetailForm extends React.Component {
},
{
title: '操作',
dataIndex: 'c',
key: 'c',
dataIndex: 'd',
key: 'y',
render: (text, record, index) => {
return (
<div>
......@@ -1496,7 +1496,7 @@ class ClassDetailForm extends React.Component {
selectedRowKeys: selectedToDelPlansKey,
onChange: this.onDelPLanSelectChange,
}}
rowKey={coursePlansList => coursePlansList.id}
rowKey="id"
dataSource={coursePlansList}
columns={courseplancolumns}
scroll={{ x: 'max-content' }}
......@@ -1542,7 +1542,7 @@ class ClassDetailForm extends React.Component {
selectedRowKeys: selectedToDelStudentsKey,
onChange: this.onDelStudentsSelectChange,
}}
rowKey={classStudentList => classStudentList.id}
rowKey="id"
dataSource={classStudentList}
columns={studentcolumns}
scroll={{ x: 700 }}
......@@ -1582,7 +1582,7 @@ class ClassDetailForm extends React.Component {
</Row>
<div className={pageStyle.studenttablebox}>
<Table
rowKey={scheduleList => scheduleList.id}
rowKey="id"
dataSource={scheduleList}
columns={coursecolumns}
scroll={{ x: 'max-content' }}
......@@ -1624,7 +1624,7 @@ class ClassDetailForm extends React.Component {
>
<Row>
<Table
rowKey={classList => classList.id}
rowKey="id"
dataSource={classList}
columns={exchangeClassColumns}
scroll={{ x: 'max-content' }}
......@@ -1665,7 +1665,7 @@ class ClassDetailForm extends React.Component {
</Row>
<Row>
<Table
rowKey={toAddStudentList => toAddStudentList.id}
rowKey="id"
dataSource={toAddStudentList}
columns={addstudentColumns}
scroll={{ x: 'max-content' }}
......@@ -1706,7 +1706,7 @@ class ClassDetailForm extends React.Component {
>
<Row>
<Table
rowKey={studentChangeScheduleList => studentChangeScheduleList.id}
rowKey="id"
dataSource={studentChangeScheduleList}
columns={studentChangeScheduleColumns}
loading={studentChangeScheduleListLoading}
......
src/pages/classmgt/ClassStatusChangeModal.js
View file @ 6593da87
......@@ -144,6 +144,7 @@ class ClassStatusChangeModal extends React.Component {
<Row>
<Table
dataSource={statusChangeClassList}
rowKey="id"
columns={endclasscolumns}
scroll={{ x: 'max-content' }}
pagination={false}
......
src/pages/newtheme/jobclock/index.js
View file @ 6593da87
......@@ -263,7 +263,7 @@ class JobClockForm extends React.Component {
],
})(
<Select disabled={(jobParams.class_id && jobParams.class_id != undefined) && (isCopy === 0)} placeholder="请选择班级" style={{ width: 174 }} showSearch onChange={this.handleStudentChange}>
{classList.map(ele => <Option value={ele.id}>{ele.title}</Option>)}
{classList.map(ele => <Option key={ele.id} value={ele.id}>{ele.title}</Option>)}
</Select>,
)}
</FormItem>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment