消课增加备注

src/models/classdetail.js

@@ -55,7 +55,6 @@ export default {
       page: 1,
       perPage: 10,
       class_id: 0,
-      status: 1,
     },
     queryToAddStudentListParams: {
       school_id: 0,
@@ -64,6 +63,7 @@ export default {
       course_id: 0,
       exclude_class_id: 0,
       keyword: '',
+      status: 1,
     },
     queryScheduleStudentListParams: {
       school_id: 0,
@@ -1359,7 +1359,6 @@ export default {
             page: 1,
             perPage: 10,
             class_id: 0,
-            status: 1,
           },
           queryToAddStudentListParams: {
             school_id: 0,
@@ -1368,13 +1367,13 @@ export default {
             course_id: 0,
             exclude_class_id: 0,
             keyword: '',
+            status: 1,
           },
           queryScheduleStudentListParams: {
             school_id: 0,
             page: 1,
             perPage: 10,
             schedule_id: 0,
-            status: 1,
           },
           scheduleStudentTotal: 0,
           scheduleStudentList: [],

src/models/students.js

@@ -698,6 +698,7 @@ export default {
         student_id: selectdeStudent.id,
         student_course_id: values.student_course_id,
         expend: values.expend,
+        remark: values.remark,
         mode_type: values.course_mode || 1,
       });
       yield put({

src/pages/student/eliminateEdit.js

@@ -196,6 +196,20 @@ class eliminateEdit extends React.Component {
               ) : (
                 ''
               )}
+              <Form.Item
+                label="备注"
+                labelCol={{
+                  xs: { span: 24 },
+                  sm: { span: 5 },
+                }}
+                wrapperCol={{
+                  xs: { span: 24 },
+                  sm: { span: 19 },
+                }}
+              >
+                {getFieldDecorator('remark', {
+                })(<TextArea style={{ width: 300 }} maxLength={20} placeholder="请输入备注,最多20个字噢~" rows={2} />)}
+              </Form.Item>
               <Form.Item
                 label={<span>&nbsp;&nbsp;操&nbsp;&nbsp;作&nbsp;&nbsp;人</span>}
                 labelCol={{

src/pages/studentinfo/index.js

@@ -869,11 +869,11 @@ class StudentMgt extends React.Component {
                                 case 8:
                                   return <div className={pageStyle.logitem}> {item.created_at} 老师：<span className={pageStyle.logTeacherName}>{item.data.teacher_name || '-'}</span> 将学员 <span className={pageStyle.logTeacherName}>{item.data.student_name || '-'}</span> 的课程 <span className={pageStyle.logTeacherName}>{item.data.from_course_title || '-'}</span> <span className={pageStyle.logAction}>转到</span>课程 <span className={pageStyle.logTeacherName}>{item.data.to_course_title || '-'}</span>    <span>{item.data.course_mode == 1 && '课时：'}{item.data.course_mode == 2 && '时段：'}</span>   <span>{item.data.course_num}{item.data.course_mode == 1 && '课时'}{item.data.course_mode == 2 && '天'}</span></div>;
                                 case 9:
-                                  return <div className={pageStyle.logitem}>{item.created_at} 老师：<span className={pageStyle.logTeacherName}>{item.data.teacher_name || '-'}</span> 为学员：<span className={pageStyle.logTeacherName}>{item.data.student_name || '-'}</span> <span className={pageStyle.logAction}>消除课时</span>：{item.data.expend || '-'}{item.data.mode_type == 2 && '天'} (<span className={pageStyle.logTeacherName}>{item.data.course_title || '-'}</span> )</div>;
+                                  return <div className={pageStyle.logitem}>{item.created_at} 老师：<span className={pageStyle.logTeacherName}>{item.data.teacher_name || '-'}</span> 为学员：<span className={pageStyle.logTeacherName}>{item.data.student_name || '-'}</span> <span className={pageStyle.logAction}>消除课时</span>：{item.data.expend || '-'}{item.data.mode_type == 2 && '天'} (<span className={pageStyle.logTeacherName}>{item.data.course_title || '-'}</span> ){item.data.remark ? `，备注：${item.data.remark}` : ''}</div>;
                                 case 10:
                                   return <div className={pageStyle.logitem}>{item.created_at} 老师：<span className={pageStyle.logTeacherName}>{item.data.teacher_name || '-'}</span> <span className={pageStyle.logAction}>点名学员</span>：<span className={pageStyle.logTeacherName}>{item.data.student_name || '-'}</span> 状态: <span className={pageStyle.logAction}>{item.data.type == 1 && '到课'}{item.data.type == 3 && '请假'}{item.data.type == 2 && '迟到'}{item.data.type == 4 && '未到'}</span> {item.data.course_mode == 1 && `扣除课时${item.data.expend}课时`}</div>;
                                 case 11:
-                                  return <div className={pageStyle.logitem}> {item.created_at} 老师：<span className={pageStyle.logTeacherName}>{item.data.teacher_name || '-'}</span> 为学员：<span className={pageStyle.logTeacherName}>{item.data.student_name || '-'}</span>转为<span className={pageStyle.logAction}>历史在读学员</span>  &nbsp;并清除<span className={pageStyle.logTeacherName}>{item.data.student_name || '-'}</span>在机构中的历史课程数据</div>;
+                                  return <div className={pageStyle.logitem}> {item.created_at} 老师：<span className={pageStyle.logTeacherName}>{item.data.teacher_name || '-'}</span> 为学员：<span className={pageStyle.logTeacherName}>{item.data.student_name || '-'}</span>转为<span className={pageStyle.logAction}>历史在读学员</span>  &nbsp;{Number(item.data.stat_time_status) === 1 ? '没有清除' : '并清除'}<span className={pageStyle.logTeacherName}>{item.data.student_name || '-'}</span>在机构中的历史课程数据</div>;
                                 case 12:
                                   return <div className={pageStyle.logitem}> {item.created_at} 老师：<span className={pageStyle.logTeacherName}>{item.data.teacher_name || '-'}</span> 为学员：<span className={pageStyle.logTeacherName}>{item.data.student_name || '-'}</span>转为<span className={pageStyle.logAction}>在读学员</span></div>;
                                 default: return null;