''

a0b030aa · wangxuelai · cef4e8b6 · a0b030aa · a0b030aa · a0b030aa
Commit a0b030aa authored Dec 04, 2019 by wangxuelai
7 changed files
--- a/index.html
+++ b/index.html
@@ -17,6 +17,6 @@
 </head>
 <body>
  <div id="root"></div>
-  <script src="dist/main.js?1575359807220" charset="utf-8"></script>
+  <script src="dist/main.js?1575374432412" charset="utf-8"></script>
 </body>
 </html>
\ No newline at end of file
--- a/src/components/CallStudents.js
+++ b/src/components/CallStudents.js
@@ -77,20 +77,28 @@ class CallStudentsForm extends React.Component {
      }, delay);
    };
  }
+  checkData = (value) => {
+    let str = value.replace(/[^\d\.]/g, '');
+    const pointIndex = str.search(/\./);
+    if (pointIndex !== -1) {
+      str = str.substr(0, pointIndex + 1).replace(/\./, '.5');
+    }
+    return str;
+  }
  changeExpand = (e) => {
    const { dispatch } = this.props;
    (this.debounce(() => {
      dispatch({
        type: 'callstudents/changeExpandA', // 更新点名状态是到课或迟到学生为输入的课时数
        payload: {
-          value: e,
+          value: this.checkData(String(e)),
        },
      });
    }, 300))();
    dispatch({
      type: 'callstudents/changeExpand',
      payload: {
-        value: e,
+        value: this.checkData(String(e)),
      },
    });
  }
@@ -99,7 +107,7 @@ class CallStudentsForm extends React.Component {
    dispatch({
      type: 'callstudents/callStudentExpendChange',
      payload: {
-        value: e,
+        value: this.checkData(String(e)),
        index,
      },
    });

--- a/src/models/callstudents.js
+++ b/src/models/callstudents.js
@@ -511,6 +511,7 @@ export default {
    },
    * changeExpandA({ payload }, { call, put, select }) {
      const { value } = payload;
+      console.log(value);
      const { callStudentOperateList, copyExpend } = yield select(state => state.callstudents);
      let newValue = copyExpend;
      if (value >= copyExpend) {

--- a/src/pages/classmgt/EditClassModal.js
+++ b/src/pages/classmgt/EditClassModal.js
@@ -66,6 +66,19 @@ class EditClassModal extends React.Component {
      title: e.target.value,
    });
  }
+  checkData = (value) => {
+    let str = value.replace(/[^\d\.]/g, '');
+    const pointIndex = str.search(/\./);
+    if (pointIndex !== -1) {
+      str = str.substr(0, pointIndex + 1).replace(/\./, '.5');
+    }
+    return str;
+  }
+  changeValue = (e, type) => {
+    this.props.form.setFieldsValue({
+      [type]: this.checkData(e.target.value),
+    });
+  }
  render() {
    const {
      visible,
@@ -223,13 +236,9 @@ class EditClassModal extends React.Component {
                {getFieldDecorator('expend', {
                  initialValue: editClassInfo.expend,
                  rules: [
-                    {
-                      pattern: /^\d+$/,
-                      message: '请输入大于0的整数',
-                    },
                    { required: true, message: '课次消耗不能为空' },
                  ],
-                })(<InputNumber placeholder="请输入课次消耗" style={{ width: '100%' }} />)}
+                })(<InputNumber min={0} onBlur={e => this.changeValue(e, 'expend')} placeholder="请输入课次消耗" style={{ width: '100%' }} />)}
              </Col>
              <Col span={5} style={{ color: '#000000', fontSize: '14px' }}>
                课时

--- a/src/pages/student/RenewEdit.js
+++ b/src/pages/student/RenewEdit.js
@@ -210,12 +210,12 @@ class RenewEdit extends React.Component {
                        {getFieldDecorator('buy', {
                            rules: [
                              {
-                                required: false,
+                                required: true,
                                message: '请输入购买课时',
                              },
                            ],
                          })(
-                            <InputNumber onBlur={e => this.changeValue(e, 'buy')} placeholder="请输入购买课时" style={{ width: 200 }} />,
+                            <InputNumber min={0} onBlur={e => this.changeValue(e, 'buy')} placeholder="请输入购买课时" style={{ width: 200 }} />,
                          )}
                      </Form.Item>
                    </Col>

--- a/src/pages/student/eliminateEdit.js
+++ b/src/pages/student/eliminateEdit.js
@@ -31,7 +31,7 @@ class eliminateEdit extends React.Component {
    const { currentCourse } = this.state;
    this.props.form.validateFields((err, values) => {
      if (!err) {
-        if (currentCourse.surplus <= 0 && Number(currentCourse.give) < 0) {
+        if (Number(currentCourse.surplus) <= 0) {
          Modal.warn({
            title: '学生的这个课程已经没有课时了，请提醒续费',
          });
@@ -219,8 +219,13 @@ class eliminateEdit extends React.Component {
              >
                {getFieldDecorator('expend', {
                  rules: [
+                    { required: false, message: currentCourse.course_mode == 1 ? '消耗课时不能为空' : '消耗时段不能为空' },
                    {
                      validator: (rule, value, callback) => {
+                        if (currentCourse.course_mode == 1 && value == '') {
+                          callback('消耗课时不能为空');
+                          return;
+                        }
                        if (currentCourse.course_mode == 2 && !/^[1-9]\d*$/.test(value)) {
                          callback('请输入大于0的整数');
                          return;

--- a/src/pages/studentinfo/index.js
+++ b/src/pages/studentinfo/index.js
@@ -634,7 +634,7 @@ class StudentMgt extends React.Component {
            children:
  <div className={pageStyle.classNamebox}>
    {record.course_mode == 1 && <span>{record.expend_buy}/{record.expend_give}</span>}
-    {record.course_mode == 2 && <div style={{ textAlign: 'center' }}>剩余天数： {record.expend} 天</div>}
+    {record.course_mode == 2 && <div style={{ textAlign: 'center' }}>剩余天数： {record.surplus} 天</div>}
    {record.course_mode == 3 && '-'}
  </div>,
            props: {},