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

applications/school/school-server/src/main/java/com/usoftchina/smartschool/school/exception/BizExceptionCode.java

@@ -17,7 +17,7 @@ public enum BizExceptionCode implements BaseExceptionCode {
     NONCLAZZ(500005, "班级名称不存在"),
     REPEAT_TEACHER_NUMBER(500006, "教师工号重复"),
     NONSTU(500006, "学生不存在"),
-    EXISTS_TEACHER(500004,"存在教师,无法删除"),
+    EXISTS_TEACHER(500004,"存在任课教师,无法删除"),
     EXISTS_CURRICULUM(500005,"存在课表,无法删除"),
     EXISTS_TEACHER_CLASS(500006,"存在任课班级,无法删除"),
     TEACHERS_EXISTS_CLASS(500006,"%s存在任课班级,无法删除"),

applications/school/school-server/src/main/java/com/usoftchina/smartschool/school/wxschool/basic/service/impl/WxClazzCurriculumServiceImpl.java

@@ -14,10 +14,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 
 @Service
@@ -123,23 +120,34 @@ public class WxClazzCurriculumServiceImpl implements WxClazzCurriculumService {
 	private Map<String,Object> getDetail(ClazzCurriculumDO cc,Long subjectId){
 		SimpleDateFormat dateFormat = new SimpleDateFormat("HH:mm");
 		Map<String, Object> hashMap = new HashMap<>();
-		hashMap.put("startTime",dateFormat.format(cc.getCurStartTime()));
-		hashMap.put("endTime",dateFormat.format(cc.getCurEndTime()));
+		Date curStartTime = cc.getCurStartTime();
+		if (ObjectUtils.isNotEmpty(curStartTime)){
+			hashMap.put("startTime",dateFormat.format(curStartTime));
+		}
+		Date curEndTime = cc.getCurEndTime();
+		if (ObjectUtils.isNotEmpty(curEndTime)){
+			hashMap.put("endTime",dateFormat.format(curEndTime));
+		}
+
 		SubjectDO subjectDO = subjectMapper.get(subjectId);
 		if (ObjectUtils.isNotEmpty(subjectDO)){
 			hashMap.put("subjectName",subjectDO.getSubjectName());
 		}
-		TeacherClazzDO teacher1 = wxTeacherClazzMapper.getTeacher(cc.getClazzId(), subjectId);
-		if (ObjectUtils.isNotEmpty(teacher1)){
-			Long teacherId = teacher1.getTeacherId();
-			if (ObjectUtils.isNotEmpty(teacherId)){
-				TeacherDO teacherDO1 = wxTeacherMapper.get(teacherId);
-				if (ObjectUtils.isNotEmpty(teacherDO1)){
-					hashMap.put("teacherName",teacherDO1.getTeacherName());
-					hashMap.put("teacherPhoto",teacherDO1.getTeacherPhoto());
+		Long clazzId = cc.getClazzId();
+		if (ObjectUtils.isNotEmpty(clazzId)){
+			TeacherClazzDO teacher1 = wxTeacherClazzMapper.getTeacher(clazzId, subjectId);
+			if (ObjectUtils.isNotEmpty(teacher1)){
+				Long teacherId = teacher1.getTeacherId();
+				if (ObjectUtils.isNotEmpty(teacherId)){
+					TeacherDO teacherDO1 = wxTeacherMapper.get(teacherId);
+					if (ObjectUtils.isNotEmpty(teacherDO1)){
+						hashMap.put("teacherName",teacherDO1.getTeacherName());
+						hashMap.put("teacherPhoto",teacherDO1.getTeacherPhoto());
+					}
 				}
 			}
 		}
+
 		return hashMap;
 	}
 }

applications/school/school-server/src/main/java/com/usoftchina/smartschool/school/wxschool/basic/service/impl/WxMeetingServiceImpl.java

@@ -49,11 +49,14 @@ public class WxMeetingServiceImpl implements WxMeetingService {
 	public String createMeeting(String jsonMeeting) throws Exception {
 		JSONObject json = JSONObject.parseObject(jsonMeeting);
 		MeetingDO meetingDO = new MeetingDO();
-		meetingDO.setMeetingName(json.getString("meetingName"));
-		meetingDO.setMeetingDetails(json.getString("meetingDetails"));
+		String meetingName = json.getString("meetingName");
+		meetingDO.setMeetingName(meetingName);
+		String meetingDetails = json.getString("meetingDetails");
+		meetingDO.setMeetingDetails(meetingDetails);
 		Long creator = json.getLong("meetingCreator");
 		meetingDO.setMeetingCreator(creator);
-		meetingDO.setMeetingAddress(json.getString("meetingAddress"));
+		String meetingAddress = json.getString("meetingAddress");
+		meetingDO.setMeetingAddress(meetingAddress);
 		meetingDO.setCreateDate(new Date());
 		Date startDate = DateFormatUtil.string2Date(json.getString("startDate"));
 		meetingDO.setStartDate(startDate);
@@ -98,7 +101,7 @@ public class WxMeetingServiceImpl implements WxMeetingService {
 							TemplateDO templateDO = wxTemplateMapper.getByAppid(schoolAppid);
 							if (ObjectUtils.isNotEmpty(templateDO)){
 								String temMeeting = templateDO.getTemMeeting();
-								wxPushApi.wxPush(schoolDO.getSchoolAppid(), schoolDO.getSchoolSecret(),openid , temMeeting, "您好，您有一条新的会议通知", meetingDO.getMeetingName(), simpleDateFormat.format(meetingDO.getStartDate()), meetingDO.getMeetingAddress(), "-", "点击查看详情",  wechatUrl + "/meet-detail/" + meetingDO.getMeetingId()+"?teacherId="+l);
+								wxPushApi.wxPush(schoolDO.getSchoolAppid(), schoolDO.getSchoolSecret(),openid , temMeeting, "您好，您有一条新的会议通知", meetingName, simpleDateFormat.format(meetingDO.getStartDate()), meetingAddress, "-", "点击查看详情",  wechatUrl + "/meet-detail/" + meetingDO.getMeetingId()+"?teacherId="+l);
 
 							}
 

applications/school/school-server/src/main/java/com/usoftchina/smartschool/school/wxschool/basic/service/impl/WxNotifyServiceImpl.java

@@ -102,6 +102,7 @@ public class WxNotifyServiceImpl implements WxNotifyService {
 					notifyrecordsMapper.save(notifyrecordsDO);
 					TeacherDO teacherDO = teacherMapper.get(l);
 					SchoolDO schoolDO = wxSchoolMapper.get(teacherDO.getSchoolId());
+					String schoolName = schoolDO.getSchoolName();
 					String teacherName = teacherMapper.get(notifyCreator).getTeacherName();
 					if (ObjectUtils.isNotEmpty(schoolDO)){
 						String schoolAppid = schoolDO.getSchoolAppid();
@@ -110,7 +111,7 @@ public class WxNotifyServiceImpl implements WxNotifyService {
 							if (ObjectUtils.isNotEmpty(templateDO)){
 								String temNotify = templateDO.getTemNotify();
 								try {
-									wxPushApi.wxPush(schoolDO.getSchoolAppid(),schoolDO.getSchoolSecret(),teacherDO.getOpenid(), temNotify, "您好，您有一条通知", schoolDO.getSchoolName(),teacherName,format.format(new Date()),notifyDetails, "点击查看详情", wechatUrl + "/notifyDetail/teacher/"+notifyDO.getNotifyId()+"?teacherId="+l);
+									wxPushApi.wxPush(schoolDO.getSchoolAppid(),schoolDO.getSchoolSecret(),teacherDO.getOpenid(), temNotify, "您好，您有一条通知",schoolName ,teacherName,format.format(new Date()),notifyDetails, "点击查看详情", wechatUrl + "/notifyDetail/teacher/"+notifyDO.getNotifyId()+"?teacherId="+l);
 								}catch (Exception e){
 									e.printStackTrace();
 								}

applications/school/school-server/src/main/java/com/usoftchina/smartschool/school/wxschool/basic/service/impl/WxOaLeaveServiceImpl.java

@@ -41,6 +41,9 @@ public class WxOaLeaveServiceImpl implements WxOaLeaveService {
     @Autowired
     private WxTemplateMapper wxTemplateMapper;
 
+    @Autowired
+    private WxClazzMapper wxClazzMapper;
+
     @Value("${smartschool.domain.wechat}")
     private String wechatUrl;
 
@@ -87,7 +90,9 @@ public class WxOaLeaveServiceImpl implements WxOaLeaveService {
                 for (Long teacherId : longs) {
                     TeacherDO teacherDO = teacherMapper.get(teacherId);
                     SchoolDO schoolDO = wxSchoolMapper.get(teacherDO.getSchoolId());
-                    String stuName = studentMapper.get(lvProposer).getStuName();
+                    StudentDO studentDO = studentMapper.get(lvProposer);
+                    String stuName = studentDO.getStuName();
+                    String clazzName = wxClazzMapper.get(studentDO.getClazzId()).getClazzName();
                     SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm");
                     String date =format.format(leave.getStartDate())  + "至" + format.format(leave.getEndDate());
                     if (ObjectUtils.isNotEmpty(schoolDO)){
@@ -97,7 +102,7 @@ public class WxOaLeaveServiceImpl implements WxOaLeaveService {
                             if (ObjectUtils.isNotEmpty(templateDO)){
                                 String temLeave = templateDO.getTemLeave();
                                 try {
-                                    wxPushApi.wxPush(schoolDO.getSchoolAppid(), schoolDO.getSchoolSecret(), teacherDO.getOpenid(), temLeave,"您好，学生的请假申请", stuName+"；", date+"；", leave.getLvDetails()+"；", "-", "点击查看详情", wechatUrl + "/leavedetail/teacher/" + leave.getLvId());
+                                    wxPushApi.wxPush(schoolDO.getSchoolAppid(), schoolDO.getSchoolSecret(), teacherDO.getOpenid(), temLeave,"您好，学生的请假申请", format.format(new Date()),clazzName , stuName, lvDetails, "点击查看详情", wechatUrl + "/leavedetail/teacher/" + leave.getLvId());
                                 }catch (Exception e){
                                     e.printStackTrace();
                                 }

applications/school/school-server/src/main/java/com/usoftchina/smartschool/school/wxschool/basic/service/impl/WxUserServiceImpl.java

@@ -352,6 +352,18 @@ public class WxUserServiceImpl implements WxUserService {
 		hashMap.put("openid",openid);
 		List<TeacherDO> teacherDOS = teacherMapper.list(hashMap);
 		if (ObjectUtils.isNotEmpty(teacherDOS)){
+			Long userId = teacherDOS.get(0).getUserId();
+			HashMap<String, Object> stringObjectHashMap = new HashMap<>();
+			stringObjectHashMap.put("userId",userId);
+			List<ParentsDO> list = parentsMapper.list(stringObjectHashMap);
+			if (ObjectUtils.isNotEmpty(list)){
+				for (ParentsDO pt:list) {
+					if (ObjectUtils.isEmpty(pt.getOpenid())){
+						pt.setOpenid(openid);
+						parentsMapper.update(pt);
+					}
+				}
+			}
 			for (TeacherDO tc:teacherDOS) {
 				tc.setTeacherPhoto(headimgurl);
 				teacherMapper.update(tc);
@@ -368,6 +380,18 @@ public class WxUserServiceImpl implements WxUserService {
 		}
 		List<ParentsDO> parentsDOS = parentsMapper.list(hashMap);
 		if (ObjectUtils.isNotEmpty(parentsDOS)){
+			Long userId = parentsDOS.get(0).getUserId();
+			HashMap<String, Object> stringObjectHashMap = new HashMap<>();
+			stringObjectHashMap.put("userId",userId);
+			List<TeacherDO> list = teacherMapper.list(stringObjectHashMap);
+			if (ObjectUtils.isNotEmpty(list)){
+				for (TeacherDO tc:list) {
+					if (ObjectUtils.isEmpty(tc.getOpenid())){
+						tc.setOpenid(openid);
+						teacherMapper.update(tc);
+					}
+				}
+			}
 			for (ParentsDO pt:parentsDOS) {
 				pt.setParentsPhoto(headimgurl);
 				parentsMapper.update(pt);

applications/school/school-server/src/main/java/com/usoftchina/smartschool/school/wxschool/support/RemindTask.java

@@ -66,6 +66,7 @@ public class RemindTask extends TimerTask {
         String meetingNotifier = meetingDO.getMeetingNotifier();
         List<Long> longs = JSON.parseArray(meetingNotifier, Long.class);
         List<Long> list = removeDuplicate(longs);
+            String meetingName = meetingDO.getMeetingName();
         for (Long teacherId:list) {
             SchoolDO schoolDO = wxSchoolMapper.get(meetingDO.getSchoolId());
             String openid = teacherMapper.get(teacherId).getOpenid();
@@ -76,7 +77,7 @@ public class RemindTask extends TimerTask {
                     if (ObjectUtils.isNotEmpty(byAppid)){
                         String temMeeting = byAppid.getTemMeeting();
                         try {
-                            wxPushApi.wxPush(schoolDO.getSchoolAppid(), schoolDO.getSchoolSecret(),openid , temMeeting, "您好，您有一条新的会议通知", meetingDO.getMeetingName(), simpleDateFormat.format(meetingDO.getStartDate()), meetingDO.getMeetingAddress(), "-", "点击查看详情", wechatUrl + "/meet-detail/" + meetingDO.getMeetingId()+"?teacherId="+teacherId);
+                            wxPushApi.wxPush(schoolDO.getSchoolAppid(), schoolDO.getSchoolSecret(),openid , temMeeting, "您好，您有一条新的会议通知",meetingName , simpleDateFormat.format(meetingDO.getStartDate()), meetingDO.getMeetingAddress(), "-", "点击查看详情", wechatUrl + "/meet-detail/" + meetingDO.getMeetingId()+"?teacherId="+teacherId);
                         } catch (Exception e) {
                             e.printStackTrace();
                         }

applications/school/school-server/src/main/resources/mapper/HomeWorkMapper.xml

@@ -260,7 +260,7 @@
     </select>
 
     <select id="homeWorkRelease" parameterType="long" resultType="integer">
-      select count(1) from sys_clazz left join task_notify on sys_clazz.clazz_name=task_notify.classz_name
+      select count(1) from sys_clazz left join task_notify on sys_clazz.clazz_nickname= concat (task_notify.grade_name,task_notify.classz_name)
       where sys_clazz.clazz_id = #{id} and task_notify.task_status=1
   </select>
 </mapper>

applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/controller/WxPushController.java

@@ -3,10 +3,9 @@ package com.usoftchina.smartschool.wechat.controller;
 import com.usoftchina.smartschool.wechat.auth.annotation.IgnoreOpenApiAuth;
 import com.usoftchina.smartschool.wechat.dto.MessageInfoDTO;
 import com.usoftchina.smartschool.wechat.service.SendService;
-import com.usoftchina.smartschool.wechat.service.WxPushService;
-import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * @author: guq

applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/service/impl/WxPushServiceImpl.java

@@ -2,14 +2,12 @@ package com.usoftchina.smartschool.wechat.service.impl;
 
 import com.alibaba.fastjson.JSON;
 import com.github.kevinsawicki.http.HttpRequest;
-import com.sun.org.apache.bcel.internal.generic.IF_ACMPEQ;
 import com.usoftchina.smartschool.base.Result;
 import com.usoftchina.smartschool.wechat.po.MessageInfo;
 import com.usoftchina.smartschool.wechat.service.WxPushService;
 import com.usoftchina.smartschool.wechat.wxUtils.ObjectUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Service;
 
 import java.util.HashMap;
@@ -28,13 +26,12 @@ public class WxPushServiceImpl implements WxPushService{
      */
     @Override
     public String wxPush(String appId,String secret,String openid, String templateId, String title, String keyword1, String keyword2, String keyword3, String keyword4, String remark, String url) {
-            if (ObjectUtils.isNotEmpty(openid)){
+        if (ObjectUtils.isNotEmpty(openid)){
                 String json="{\"touser\":\""+openid+"\","
                         + "\"template_id\":\""+templateId+"\","
                         + "\"url\":\""+""+url+""+"\","
                         + "\"data\":{"
-                        + "\"first\":{\"value\":\""+title+"\","
-                        +"\"color\":\"#173177\"},"
+                        + "\"first\":{\"value\":\""+title+"\",\"color\":\"#173177\"},"
                         + "\"keyword1\":{\"value\":\""+keyword1+"\",\"color\":\"#173177\"},"
                         + "\"keyword2\":{\"value\":\""+keyword2+"\",\"color\":\"#173177\"},"
                         + "\"keyword3\":{\"value\":\""+keyword3+"\",\"color\":\"#173177\"},"

frontend/pc-web/app/view/Interaction/homework/Release.js

@@ -6,7 +6,7 @@ Ext.define('school.view.interaction.homework.Release', {
     xtype: 'interaction-homework-release',
 
     controller: 'interaction-homework-release',
-    // viewModel: 'purchase-purchase-formpanel',
+    viewModel: 'interaction-homework-release',
 
     //字段属性
     _title: '作业发布',
@@ -121,14 +121,6 @@ Ext.define('school.view.interaction.homework.Release', {
                 name: 'accessory',
                 fieldLabel: '附件'
             }],
-            applyBtns: [{
-                apply: true,
-                text: '保存',
-                bind: {
-                    hidden: '{!showSaveBtn || task_status == 1}',
-                    disabled: '{!base.valid}'
-                }
-            }],
             applyBtns: [{
                 apply: true,
                 text: '删除',

frontend/pc-web/app/view/Interaction/homework/ReleaseModel.js

@@ -0,0 +1,15 @@
+Ext.define('school.view.interaction.homework.SchoolNoticeModel', {
+    extend: 'school.view.core.form.FormPanelModel',
+    alias: 'viewmodel.interaction-homework-release',
+
+    formulas: {
+        task_status_change: {
+            bind: '{task_status}',
+            get: function(v) {
+                let view = this.getView();
+                view.setEditable(v != 1);
+            }
+        }
+    }
+
+});

frontend/pc-web/app/view/Interaction/notice/SchoolNotice.js

@@ -6,7 +6,7 @@ Ext.define('school.view.interaction.notice.SchoolNotice', {
     xtype: 'interaction-notice-schoolnotice',
 
     controller: 'interaction-notice-schoolnotice',
-    // viewModel: 'purchase-purchase-formpanel',
+    viewModel: 'interaction-notice-schoolnotice',
 
     //字段属性
     _title: '学校通知',
@@ -85,6 +85,12 @@ Ext.define('school.view.interaction.notice.SchoolNotice', {
                     hidden: '{!showSaveBtn || notify_status == 1}',
                     disabled: '{!base.valid}'
                 }
+            }, {
+                apply: true,
+                text: '删除',
+                bind: {
+                    hidden: '{!showDeleteBtn || !notify_id || notify_status == 1}'
+                },
             }],
             toolBtns: [{
                 xtype: 'button',

frontend/pc-web/app/view/Interaction/notice/SchoolNoticeModel.js

@@ -0,0 +1,15 @@
+Ext.define('school.view.interaction.notice.SchoolNoticeModel', {
+    extend: 'school.view.core.form.FormPanelModel',
+    alias: 'viewmodel.interaction-notice-schoolnotice',
+
+    formulas: {
+        notify_status_change: {
+            bind: '{notify_status}',
+            get: function(v) {
+                let view = this.getView();
+                view.setEditable(v != 1);
+            }
+        }
+    }
+
+});

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

@@ -35,7 +35,7 @@ Ext.define('school.view.interaction.timetable.Detail', {
                 xtype: 'textfield',
                 name: 'name',
                 fieldLabel: '课表名称',
-                emptyText: '请选择年级',
+                columnWidth: 0.5,
                 bind: {
                     emptyText: '{name_emptyText}'
                 }
@@ -365,6 +365,20 @@ Ext.define('school.view.interaction.timetable.Detail', {
                     hidden: true
                 }]
             }],
+            applyBtns: [{
+                apply: true,
+                text: '删除',
+                bind: {
+                    hidden: '{!showDeleteBtn || !id || status == 1}'
+                },
+            }, {
+                apply: true,
+                text: '保存',
+                bind: {
+                    hidden: '{!showSaveBtn || status == 1}',
+                    disabled: '{!base.valid}'
+                }
+            }],
             toolBtns: [{
                 xtype: 'button',
                 text: '启用',

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

@@ -12,18 +12,16 @@ Ext.define('school.view.interaction.timetable.DetailModel', {
 
             if(!!gradeName && !!clazzName && !!termPart && !!termName) {
                 text =  gradeName + clazzName + termPart.split('-')[0] + '学年' + termName + '课表';
-                // this.set('name', text);
-            }else if(!gradeName) {
-                text = '请选择年级';
-            }else if(!clazzName) {
-                text = '请选择班级';
-            }else if(!termPart) {
-                text = '请选择学年';
-            }else if(!termName) {
-                text = '请选择学期';
             }
 
             return text;
+        },
+        status_change: {
+            bind: '{status}',
+            get: function(v) {
+                let view = this.getView();
+                view.setEditable(v != 1);
+            }
         }
     }
 

frontend/pc-web/app/view/basic/staff/StaffDetail.js

@@ -84,7 +84,7 @@ Ext.define('school.view.basic.staff.StaffDetail', {
                 fieldLabel: '政治面貌',
                 displayField: 'name',
                 valueField: 'name',
-                editable: false,
+                editable: true,
                 store: Ext.create('Ext.data.ArrayStore', {
                     fields: ['name'],
                     data: [['中共党员'], ['中共预备党员'], ['共青团员'], ['群众']]
@@ -101,7 +101,7 @@ Ext.define('school.view.basic.staff.StaffDetail', {
                 fieldLabel: '学历',
                 displayField: 'name',
                 valueField: 'name',
-                editable: false,
+                editable: true,
                 store: Ext.create('Ext.data.ArrayStore', {
                     fields: ['name'],
                     data: [['博士后'], ['博士'], ['硕士'], ['研究生'], ['本科（统招）'], ['本科（成人高考）'], ['本科（专升本）'], ['大专'], ['高中'], ['职高'], ['初中'], ['小学']]

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

@@ -64,7 +64,7 @@ Ext.define('school.view.basic.student.StudentDetail', {
                 fieldLabel: '政治面貌',
                 displayField: 'name',
                 valueField: 'name',
-                editable: false,
+                editable: true,
                 store: Ext.create('Ext.data.ArrayStore', {
                     fields: ['name'],
                     data: [

frontend/pc-web/app/view/core/form/field/DetailGridField.js

@@ -64,7 +64,7 @@ Ext.define('school.view.core.form.field.DetailGridField', {
                     y: true
                 },
                 deferEmptyText: false,
-                emptyText: '<div style="width: 100%; text-align: center; cursor: pointer; color: green;" class="fa fa-plus" title="新增行" onclick="addRows(\'' + me.id + '\')"></div>',
+                emptyText: (me.readOnly || !me.editable) ? '' : '<div style="width: 100%; text-align: center; cursor: pointer; color: green;" class="fa fa-plus" title="新增行" onclick="addRows(\'' + me.id + '\')"></div>',
             },
             listeners: {
                 boxready: function(g) {
@@ -395,6 +395,10 @@ Ext.define('school.view.core.form.field.DetailGridField', {
 
         me.editable = able;
 
+        lockGridEmptyText = !me.readOnly && able ? '<div style="width: 100%; text-align: center; cursor: pointer; color: green;" class="fa fa-plus" title="新增行" onclick="addRows(\'' + me.id + '\')"></div>' : '';
+
+        me.lockedGrid.setEmptyText(lockGridEmptyText)
+
         Ext.Array.each(columns, function(c) {
             if(typeof c.getEditor != 'undefined'){
                 var e = c.getEditor();

frontend/pc-web/app/view/core/form/field/FileField.js

@@ -8,6 +8,7 @@ Ext.define('school.view.core.form.field.FileField', {
 	collapsible: true,
 	multi: true,
 	allowBlank:true,
+	isFormField: true,
 	initComponent: function() {
 		this.columnWidth = 1;//强制占一行
 		this.cls = '';

frontend/pc-web/overrides/form/field/ComboBox.js

@@ -9,18 +9,21 @@ Ext.define("school.override.form.field.ComboBox", {
                 weight: -1,
                 cls: 'fa-times',
                 hidden: true,
+                lazyVisible: true,
                 onFieldFocus: function() {
-                    if(this.field.clearable) {
+                    var field = this.field;
+                    if(!field.readOnly && field.clearable) {
                         this.setHidden(false);
                     }
                 },
                 onFieldBlur: function() {
-                    if(this.field.clearable) {
+                    var field = this.field;
+                    if(!field.readOnly && field.clearable) {
                         this.setHidden(true);
                     }
                 },
                 handler: function() {
-                    if(this.clearable) {
+                    if(!this.readOnly && this.clearable) {
                         this.setValue(null)
                         this.triggers.clear.setHidden(true)
                         this.fireEvent('clear', this);
@@ -35,4 +38,51 @@ Ext.define("school.override.form.field.ComboBox", {
         }
     },
 
+    setReadOnly: function(readOnly) {
+        var me = this,
+            triggers = me.getTriggers(),
+            hideTriggers = me.getHideTrigger(),
+            oVisible = {},
+            trigger,
+            id;
+ 
+        readOnly = !!readOnly;
+ 
+        if (triggers) {
+            for (id in triggers) {
+                oVisible[id] = triggers[id].isVisible();
+            }
+        }
+
+        me.callParent([readOnly]);
+        if (me.rendered) {
+            me.setReadOnlyAttr(readOnly || !me.editable);
+        }
+ 
+        if (triggers) {
+            for (id in triggers) {
+                trigger = triggers[id];
+
+                /**
+                 * if trigger's 'lazyVisible' is true,this trigger's 'visible' will not controlled beed 'setReadOnly'
+                 */
+                if(trigger.lazyVisible) {
+                    trigger.setVisible(oVisible[id]);
+                    continue;
+                }
+
+                /*
+                 * Controlled trigger visibility state is only managed fully when 'hideOnReadOnly' is falsy.
+                 * Truth table:
+                 *   - If the trigger is configured/defaulted as 'hideOnReadOnly : true', it's readOnly-visibility
+                 *     is determined solely by readOnly state of the Field.
+                 *   - If 'hideOnReadOnly : false/undefined', the Fields.{link #hideTrigger hideTrigger} is honored.
+                 */
+                if (trigger.hideOnReadOnly === true || (trigger.hideOnReadOnly !== false && !hideTriggers)) {
+                    trigger.setVisible(!readOnly);
+                }
+            }
+        }
+    },
+
 });

frontend/wechat-web/src/configs/router.config.js

@@ -63,6 +63,7 @@ import ScoreNotification from '../modules/hiPages/scorenotification/ScoreNotific
 import AccessNoticeDetail from '../modules/hiPages/accessnoticedetail/AccessNoticeDetail';
 import ChartDemo from "../modules/chart/ChartDemo";
 import {connect} from "react-redux";
+import AccessNoticeDetail1 from "../modules/hiPages/accessnoticedetail/AccessNoticeDetail1";
 
 class RouteConfig extends Component {
 
@@ -137,7 +138,7 @@ class RouteConfig extends Component {
                         <Route path='/leavedetail/:role/:lvId' component={LeaveDetail}/> {/*学生请假详情*/}
                         <Route path="/changephonenumber" component={ChangePhoneNumber}/> {/*更换手机号码*/}
                         <Route path="/scorenotification/:stuId?" component={ScoreNotification}/> {/*成绩通知*/}
-                        <Route path="/accessnoticedetail/:stuId/:anId?" component={AccessNoticeDetail}/> {/*出入校通知详情*/}
+                        <Route path="/accessnoticedetail/:stuId/:anId?" component={AccessNoticeDetail1}/> {/*出入校通知详情*/}
                         {/*<Route path="/accessnoticedetail" component={AccessNoticeDetail}/> /!*出入校通知详情*!/*/}
                         <Route path='/leaveAddC' component={LeaveAddCPage}/>{/*老师请假*/}
                         <Route path='/leaveAdd' component={LeaveAddPage}/> {/*学生请假*/}

frontend/wechat-web/src/modules/hiPages/accessnoticedetail/AccessNoticeDetail.css

@@ -1,17 +1,90 @@
-.an_student_name{
+.an_student_name {
     font-family: PingFangSC-Regular;
     color: #222222;
-    margin:20px 40px 10px 40px;text-align: left;
+    margin: 20px 40px 10px 40px;
+    text-align: left;
 }
-.an_student_photo{
-    height: 199px;border-radius: 10px;width: 300px;
+
+.an_student_photo {
+    height: 199px;
+    border-radius: 10px;
+    width: 300px;
 }
-.an_student_type{
+
+.an_student_type {
     font-family: PingFangSC-Regular;
     font-size: 15px;
     color: #666666;
-    letter-spacing: 1.25px;text-align: left;margin: 30px;
+    letter-spacing: 1.25px;
+    text-align: left;
+    margin: 30px;
 }
-.an_student_foot_time{
-    background-color: #F7F7F7;text-align: left;padding-left: 25px;
+
+.an_student_foot_time {
+    background-color: #F7F7F7;
+    text-align: left;
+    padding-left: 25px;
+}
+
+.access-notice-top-layout {
+    display: flex;
+    flex-direction: row;
+    padding: 15px;
+    background: white;
+    align-items: center;
+}
+
+.access-notice-icon-in, .access-notice-icon-out {
+    color: white;
+    font-size: 14px;
+    width: 36px;
+    height: 36px;
+    display: inline-block;
+    border-radius: 50%;
+    text-align: center;
+    line-height: 34px;
+    padding-bottom: 2px;
+}
+
+.access-notice-icon-in {
+    background: #43CEAF;
+}
+
+.access-notice-icon-out {
+    background: #589CFE;
+}
+
+.access-notice-name {
+    font-family: MicrosoftYaHei;
+    font-size: 18px;
+    color: #333333;
+    letter-spacing: 2.25px;
+    padding-left: 10px;
+}
+
+.access-notice-time {
+    font-family: MicrosoftYaHei;
+    font-size: 22px;
+    color: #222222;
+    letter-spacing: 2px;
+}
+
+.access-notice-date {
+    font-family: MicrosoftYaHei;
+    font-size: 12px;
+    color: #999999;
+    letter-spacing: 1px;
+    padding-left: 10px;
+}
+
+.access-notice-img-layout {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    padding: 10px 15px;
+}
+
+.access-notice-img {
+    max-width: 100%;
+    max-height: 200px;
 }

frontend/wechat-web/src/modules/hiPages/accessnoticedetail/AccessNoticeDetail.js

@@ -28,15 +28,12 @@ class AccessNoticeDetail extends Component {
 
     componentDidMount() {
         let stuId = this.props.match.params.stuId
-        let role = this.props.match.params.role
         let anId = this.props.match.params.anId
 
-        console.log("stuId", stuId)
         if (!isObjEmpty(stuId)) {
             this.getANDetail(stuId, anId)
         }
 
-
         let curDay = new Date().getDay()
         if (curDay == 1) {
             curDay = '星期一'

frontend/wechat-web/src/modules/hiPages/accessnoticedetail/AccessNoticeDetail1.jsx

@@ -0,0 +1,55 @@
+/**
+ * Created by RaoMeng on 2019/3/13
+ * Desc:出入校通知详情
+ */
+
+import React, {Component} from 'react'
+import {connect} from 'react-redux';
+
+class AccessNoticeDetail1 extends Component {
+
+    constructor() {
+        super()
+
+        this.state = {}
+    }
+
+    componentDidMount() {
+        document.title = '出入校通知'
+    }
+
+    componentWillUnmount() {
+
+    }
+
+    render() {
+        return (
+            <div className='common-flex-column' style={{background: 'white'}}>
+                <div className='access-notice-top-layout'>
+                    <div className='access-notice-icon-in'>进</div>
+                    <span className='access-notice-name'>陈小龙</span>
+                </div>
+
+                <div style={{padding: '6px 15px', background: '#f7f7f7'}}>
+                    <span className='access-notice-time'>12:07:06</span>
+                    <span className='access-notice-date'>2019-1-30</span>
+                    <span className='access-notice-date'>星期天</span>
+                </div>
+
+                <div className='access-notice-img-layout'>
+                    <img className='access-notice-img'
+                         src='http://pic.vjshi.com/2018-08-28/8b163ad1a98e567f26cea40f34d56a27/00001.jpg?x-oss-process=style/watermark'/>
+                </div>
+            </div>
+        )
+    }
+}
+
+
+let mapStateToProps = (state) => ({
+    userInfo: {...state.redUserInfo}
+})
+
+let mapDispatchToProps = (dispatch) => ({})
+
+export default connect(mapStateToProps, mapDispatchToProps)(AccessNoticeDetail1)