Merge branch 'dev' of ssh://10.10.100.21/source/smartschool-platform into dev

frontend/pc-web/app/view/Interaction/score/Detail.js

@@ -48,7 +48,7 @@ Ext.define('school.view.interaction.score.Detail', {
                 store: Ext.create('Ext.data.Store', {
                     fields: ['name'],
                     data: [
-                        {name: '年级'},
+                        {name: '全年级'},
                         {name: '班级'}
                     ]
                 }),
@@ -78,9 +78,6 @@ Ext.define('school.view.interaction.score.Detail', {
                 xtype: 'classcombo',
                 name: 'si_class',
                 fieldLabel: '班级',
-                bind: {
-                    hidden: '{hideClass}'
-                },
                 listeners: {
                     expand: function (combo, eOpts) {
                         combo.store.clearFilter();

frontend/pc-web/app/view/Interaction/score/DetailController.js

@@ -72,27 +72,15 @@ Ext.define('school.view.interaction.score.DetailController', {
 
     getDefaultCondition: function(idx) {
         var me = this,
-        form = me.getView(),
-        formItems = form.formItems,
         viewModel = me.getViewModel(),
-        hideClass = viewModel.get('hideClass'),
         gradeName = viewModel.get('si_grade'),
         clazzName = viewModel.get('si_class');
 
-        if(hideClass) {
-            if(gradeName) {
-                return 'stu_grade=\'' + gradeName + '\'';
-            }else {
-                school.util.BaseUtil.showErrorToast('请先选择【' + '<span style="color: red;">年级</span>】');
-                return null;
-            }
+        if(gradeName && clazzName) {
+            return 'stu_grade=\'' + gradeName + '\' and stu_class = \'' + clazzName + '\'';
         }else {
-            if(gradeName && clazzName) {
-                return 'stu_grade=\'' + gradeName + '\' and stu_class = \'' + clazzName + '\'';
-            }else {
-                school.util.BaseUtil.showErrorToast('请先选择【' + '<span style="color: red;">班级</span>】');
-                return null;
-            }
+            school.util.BaseUtil.showErrorToast('请先选择【' + '<span style="color: red;">班级</span>】');
+            return null;
         }
     },
 

frontend/pc-web/app/view/Interaction/score/DetailModel.js

@@ -18,12 +18,6 @@ Ext.define('school.view.interaction.score.DetailModel', {
                 let view = this.getView();
                 view.setEditable(v != 1);
             }
-        },
-        hideClass: {
-            bind: '{si_examscope}',
-            get: function(v) {
-                return v == '年级';
-            }
         }
     }
 });

frontend/pc-web/app/view/basic/student/StudentDetail.js

@@ -177,7 +177,9 @@ Ext.define('school.view.basic.student.StudentDetail', {
                     dataIndex: 'pa_phone',
                     width: 180,
                     editor: {
-                        xtype: 'numberfield'
+                        xtype: 'numberfield',
+                        maxLength: 11,
+                        minLength: 11,
                     }
                 }, {
                     text: '关系',

frontend/pc-web/ext/packages/modern-locale/overrides/zh_CN/field/Text.js

@@ -5,7 +5,8 @@
 Ext.define('Ext.locale.zh_CN.field.Text', {
     override: 'Ext.form.field.Text',
 
-    maxLengthText: '字段长度不能超过 {0}个字符',
+    maxLengthText: '字段长度不能大于 {0}个字符',
+    minLengthText: '字段长度不能小于 {0}个字符',
 
     config: {
         requiredMessage: '必填项',

frontend/wechat-web/src/modules/hiPages/LeaveDetail/LeaveDetail.js

@@ -15,6 +15,7 @@ import LazyLoad from 'react-lazyload';
 import ImagesViewer from '../../../components/imagesVIewer/index';
 import {Toast} from 'antd-mobile';
 import {getIntValue, getStrValue, isObjEmpty,getSearchParams} from "../../../utils/common";
+import {saveListState} from "../../../redux/actions/listState";
 
 class LeaveDetail extends Component {
     constructor(props) {
@@ -188,6 +189,13 @@ class LeaveDetail extends Component {
                 // this.backTask = setTimeout(() => {
                 //     this.props.history.goBack();
                 // }, 2000)
+
+                if (this.props.listState && !isObjEmpty(this.props.listState.listData)) {
+                    this.props.listState.listData[this.props.listState.itemIndex].leaveMessages = this.state.messageContent
+                    saveListState({
+                        listData: this.props.listState.listData,
+                    })()
+                }
             }
         }).catch((error) => {
             Toast.fail(error)
@@ -243,6 +251,7 @@ class LeaveDetail extends Component {
 }
 
 let mapStateToProps = (state) => ({
+    listState: {...state.redListState},
     userInfo: {...state.redUserInfo}
 })
 

frontend/wechat-web/src/modules/hiPages/approvel-detail/ApprovelDetail.js

@@ -179,6 +179,11 @@ class ApprovelDetail extends Component{
         if(order == 0){
             return
         }
+        if(this.state.approveOpinion.length == 0 || this.state.approveOpinion == ''){
+            this.setState({
+                approveOpinion:'-'
+            })
+        }
         let params = {
             teacherId:this.teacherId,
             approveId:this.state.approveId,

frontend/wechat-web/src/modules/hiPages/approvel-detail/ItemApprovel.js

@@ -21,7 +21,7 @@ export default class ItemApprovel extends Component{
                     <div style={{width:10,height:10,background:'#BDBDBD',borderRadius:'30px'}}></div>
                     <div style={{marginLeft:10,width:"62%"}}>
                         <div ><span style={{color:'#000000',fontSize:15}}>{this.props.itemdata.value }</span><span style={{color:'#666666',fontSize:12,marginLeft:10}}>{this.props.approveDate}</span></div>
-                        <div style={{color:"#666666",fontSize:12,marginTop:5,wordWrap:'break-word'}}><span>{(this.props.suggest.value==null || this.props.suggest.value==undefined)?"":"(审批语:"+this.props.suggest.value+")"}</span></div>
+                        <div style={{color:"#666666",fontSize:12,marginTop:5,wordWrap:'break-word'}}><span>{(this.props.suggest.value == null || this.props.suggest.value == undefined)?"":"(审批语:"+this.props.suggest.value+")"}</span></div>
                     </div>
                     <div style={{fontSize:12,textAlign:'right'}} className={this.props.approveStatus == 1?'doing':'done'}>
                         {this.props.approveStatus == 1 ? '等待审批' : (this.props.approveStatus == 2 ? '已同意' : '已拒绝')}</div>

frontend/wechat-web/src/modules/user/UserInfo.js

@@ -126,9 +126,9 @@ class UserInfo extends Component {
         const {userInfo} = this.props
 
         let pictureUrls = []
-        if (!isObjEmpty(userInfo.parent, userInfo.parent.student, userInfo.parent.student.stuPhoto)) {
+        /*if (!isObjEmpty(userInfo.parent, userInfo.parent.student, userInfo.parent.student.stuPhoto)) {
             pictureUrls.push(userInfo.parent.student.stuPhoto)
-        }
+        }*/
 
         let userPhone = ''
         if (this.type == 1) {