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

frontend/pc-web/app/view/Interaction/mailbox/mailbox.js

@@ -0,0 +1,85 @@
+/**
+ * 校长信箱
+ */
+Ext.define('school.view.interaction.mailbox.mailbox', {
+    // extend: 'school.view.core.base.BasePanel',
+    extend: 'Ext.grid.Panel',
+    xtype: 'interaction-mailbox-mailbox',
+    // dataUrl: '/api/interact/timetable/list',
+    //字段属性
+    _title: '校长信箱',
+    _idField: 'id',
+    _codeField: 'pu_code',
+    _statusField: 'pu_status',
+    _statusCodeField: 'pu_statuscode',
+    _auditmanField: 'pu_auditman',
+    _auditdateField: 'pu_auditdate',
+    _relationColumn: 'pd_puid',
+    _readUrl: '/api/purchase/purchase/read',
+    _saveUrl: '/api/purchase/purchase/save',
+    _auditUrl: '/api/purchase/purchase/audit',
+    _unAuditUrl: '/api/purchase/purchase/unAudit',
+    _deleteUrl: '/api/purchase/purchase/delete',
+    _turnInUrl: '/api/purchase/purchase/turnProdin',
+    initId: 0,
+    initComponent: function() {
+        Ext.apply(this, {
+            // title: '校长信箱',
+            store: Ext.create('Ext.data.Store', {
+                fields:['code', 'content', 'Enclosure', 'time', 'name', 'Handle'],
+                data:[
+                    {code:"U001", content:"孩子作业太少了，回家每天玩王者荣耀，希望学校老师布置作业多一点，让我孩子忙起来", Enclosure:'无', time:"01/10/2004 16:00", name:'张三', Handle:'true'},
+                    {code:"U001", content:"学校课本费收入明细未公开，希望课本费明细能够向我们家长公开", Enclosure:'有', time:"01/10/2004 16:00", name:'张三', Handle:'false'},
+                    {code:"U001", content:"觉得十分激烈的交锋了", Enclosure:'无', time:"01/10/2004 16:00", name:'张三', Handle:'true'},
+                ]
+            }),
+            columns : [
+                {text: '编号',dataIndex: 'code', flex: 0.1}, 
+                {text: '内容',dataIndex: 'content', flex: 0.3},
+                {text: '附件',dataIndex: 'Enclosure', flex: 0.1}, 
+                {text: '日期',dataIndex: 'time',xtype: 'datecolumn',format:'Y-m-d H:i', flex: 0.2}, 
+                {text: '提出人',dataIndex: 'name', flex: 0.1}, 
+                {text: '处理', flex: 0.2, align:'center', dataIndex: 'Handle',
+                    renderer: function(val,meta,rec) {
+                        // 为元素生成唯一id
+                        var id = Ext.id();
+                        if (rec.data.Handle == 'false') {
+                            return Ext.String.format('<div>已回复</div>');
+                        } else if(rec.data.Handle == 'true'){
+                            Ext.defer(function() {
+                                Ext.widget('button', {
+                                    renderTo: id,
+                                    text: '回复',
+                                    handler: function() {//点击回复事件
+                                        Ext.MessageBox.show({
+                                            title: '回复处理',
+                                            msg: '回复对象：'+rec.data.code,
+                                            width:500,
+                                            height:600,
+                                            bbar: Ext.MessageBox.OKCANCEL,
+                                            multiline: true,
+                                            scope: this,
+                                            fn: this.showResultText,
+                                        });
+                                    }
+                                });
+                            }, 50);
+                            return Ext.String.format('<div id="{0}"></div>', id);
+                        }
+                    }
+                }
+            ],
+            tbar: ['->',{
+                xtype: 'button',
+                text: '导出'
+            }, {
+                xtype: 'button',
+                text: '删除'
+            }, {
+                xtype: 'button',
+                text: '批量回复'
+            }],
+        });
+        this.callParent();
+    },
+})

frontend/pc-web/resources/json/navigation.json

@@ -54,9 +54,9 @@
         "text": "成绩发布",
         "view": "grade"
     }, {
-        "id": "mailbox",
+        "id": "interaction-mailbox-mailbox",
         "text": "校长信箱",
-        "view": "mailbox"
+        "view": "interaction-mailbox-mailbox"
     }, {
         "id": "interaction-access-access",
         "text": "出入校记录",

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

@@ -42,8 +42,7 @@ export const API = {
     CONSUME_RECODE: _baseURL + '/payRank/consumeRecode',
     //获取组织架构
     USER_GETOBJECT: _baseURL + '/user/getObject',
-    //删除校长信箱历史投递
-    NOTIFY_DELETEMAIL: _baseURL + '/notify/deleteMail',
+
     //修改学生人脸照
     UPDATE_STU_PHOTO: _baseURL + '/user/updateStuPhoto',
 
@@ -55,8 +54,7 @@ export const API = {
     notifyMessage: _baseURL + '/notify/getMeetingList',
 
 
-    //发布作业
-    homeWorkAdd: _baseURL + "/notify/issueNotification",
+
     homeWorkList: _baseURL + "/notify/getMeetingList",
     homeWorkDetail: _baseURL + "/notify/taskDetail",
 
@@ -123,18 +121,21 @@ export const API = {
     //创建投票单
     voteCreate: _baseURL + '/wxSchool/vote/voteCreate',//投票创建
     voteListStu: _baseURL + "/wxSchool/vote/voteListStu",//教师端投票单列表
-    voteListTeacher: _baseURL + "/wxSchool/vote/voteListForTeacher",//教师端投票单详情
+    voteListTeacher: _baseURL + "/wxSchool/vote/voteListForTeacher",//教师端投票单列表
 
     voteDetailParent: _baseURL + "/wxSchool/vote/voteDetailStu",//家长投票单详情
     voteDetailTeacher: _baseURL + "/wxSchool/vote/voteDetailTeacher",//教师端投票单详情
     voteActionTeacher: _baseURL + "/wxSchool/vote/voteActionTeacher",//老师投票
     voteActionParent: _baseURL + "/wxSchool/vote/voteActionParent",//家长投票
+    //创建作业发布
+    homeWorkAdd: _baseURL + "/wxSchool/taskNotify/createTask",
 
     //分页显示校长信箱（校长端）
     MailboxListTeacher :_baseURL + '/wxSchool/principalMailbox/principalMailboxListTeacher',
     //分页显示校长信箱（家长端）
     MailboxListParent:_baseURL+'/wxSchool/principalMailbox/principalMailboxListParent',
-
+    //删除校长信箱历史投递
+    NOTIFY_DELETEMAIL: _baseURL + '/wxSchool/principalMailbox/deleteMailParent',
     //出入校单次记录详情
 
 

frontend/wechat-web/src/modules/hiPages/field-trip/FieldTrip.js

@@ -246,7 +246,7 @@ class FieldTrip extends Component {
             approver: this.state.votePerson[0],
             startDate: moment(this.state.startValue).format('YYYY-MM-DD HH:mm:ss'),
             endDate: moment(this.state.endValue).format('YYYY-MM-DD HH:mm:ss'),
-            approveFiles: approveFiles
+            approveFiles: JSON.stringify(approveFiles)
         }
         console.log('param', {
             oaString: params

frontend/wechat-web/src/modules/hiPages/res_apply/ResApply.js

@@ -258,7 +258,7 @@ class ResApply extends Component{
             proposer: this.props.userInfo.user.userFunId,
             approveStatus:1,
             approver: this.state.votePerson[0],
-            approveFiles:approveFiles,
+            approveFiles:JSON.stringify(approveFiles),
             oaArticlesDOS:this.state.selectContentArray
         }
         console.log('param',{

frontend/wechat-web/src/modules/homework/ReleaseAssignmentPage.js

@@ -176,10 +176,21 @@ class ReleaseAssignmentPage extends React.Component {
             })
         }
         Toast.loading('正在发布...', 0)
+        // String taskString{
+        //     "subjectId": 1,
+        //         "taskTitle": "今晚做完",
+        //         "taskContext": "第一单元第三课默写",
+        //         "taskFiles": "[]",
+        //         "taskStatus": 1,
+        //         "startDate": "2019-01-23 18:25:32",
+        //         "endDate": "2019-01-24 08:30:00",
+        //         "taskCreator": 10001,
+        //         "taskNotifier": "[10001,10002]"
+        // }
         fetchPost(API.homeWorkAdd, {
-            notifyName: this.state.data.notifyName,//标题
+            taskTitle: this.state.data.notifyName,//标题
             notifyType: '3',//作业发布
-            notifyDetails: this.state.data.notifyDetails,//内容
+            taskContext: this.state.data.notifyDetails,//内容
             notifyCreator: this.props.userInfo.userId,//创建者
             notifyStatus: '2',//状态
             endDate: moment(this.state.endDate).format('YYYY-MM-DD HH:mm:ss'),

frontend/wechat-web/src/modules/leave/LeaveAddCPage.js

@@ -184,7 +184,7 @@ class LeaveAddCPage extends Component {
             proposer: this.props.userInfo.user.userFunId,
             approveStatus:1,
             approver: JSON.stringify(this.state.votePerson[0]),
-            approveFiles: approveFiles,
+            approveFiles: JSON.stringify(approveFiles),
             startDate: moment(this.state.startValue).format('YYYY-MM-DD HH:mm:ss'),
             endDate: moment(this.state.endValue).format('YYYY-MM-DD HH:mm:ss'),
 

frontend/wechat-web/src/modules/leave/LeaveAddPage.js

@@ -162,7 +162,7 @@ class LeaveAddPage extends Component{
             endDate: moment(this.state.endDate).format('YYYY-MM-DD HH:mm:ss'),
             lvRemarks: "备注",
             lvNotifier:JSON.stringify(this.state.votePerson),
-            lvFiles:approveFiles,
+            lvFiles:JSON.stringify(approveFiles),
         }
         console.log('param', params)
         fetchPost(API.leaveCreate, {

frontend/wechat-web/src/modules/principalMailbox/PrincipalHistory.jsx

@@ -81,29 +81,29 @@ class PrincipalHistory extends Component {
         }
 
         fetchPost(API.MailboxListParent, {
-            stuId: this.props.userInfo.user.student.stuId,
+            parentId: this.props.userInfo.user.userFunId,
             pageIndex: mPageIndex,
             pageSize: mPageSize
         }).then(response => {
             Toast.hide()
 
-            if (isObjEmpty(response, response.data, response.data.creat)) {
+            if (isObjEmpty(response, response.data)) {
                 if (mPageIndex > 1) {
                     mPageIndex--
                 }
             } else {
-                console.log(response.data.creat)
-                response.data.creat.forEach((item, index) => {
+                // console.log(response.data)
+                response.data.forEach((item, index) => {
                     let rechargeBean = {}
 
-                    rechargeBean.notifyId = getIntValue(item, 'notifyId')
-                    rechargeBean.time = getStrValue(item, 'creatDate')
-                    if (getIntValue(item, 'isreading') == 1) {
-                        rechargeBean.status = '未查阅'
-                    } else {
+                    rechargeBean.notifyId = getIntValue(item, 'mailboxId')
+                    rechargeBean.time = getStrValue(item, 'createDate')
+                    if (getIntValue(item, 'mailboxStatus') == 2) {
                         rechargeBean.status = '已查阅'
+                    } else {
+                        rechargeBean.status = '未查阅'
                     }
-                    rechargeBean.suggest = getStrValue(item, 'notifyDetails')
+                    rechargeBean.suggest = getStrValue(item, 'mailboxContext')
                     rechargeBean.enclosure = getArrayValue(item, 'enclosure')
 
                     if (!isObjEmpty(item.leaveMessages)) {
@@ -143,11 +143,13 @@ class PrincipalHistory extends Component {
     onDeleteItem = index => {
         const {principalList} = this.state
 
+        const params = {
+            mailboxId: principalList[index].notifyId+"",
+            parentId: this.props.userInfo.user.userFunId+""
+        }
         Toast.loading('', 0)
-        fetchGet(API.NOTIFY_DELETEMAIL, {
-            notifyId: principalList[index].notifyId,
-            userId: this.props.userInfo.userId
-        }).then(response => {
+        console.log('params',params)
+        fetchPost(API.NOTIFY_DELETEMAIL,params,{} ).then(response => {
             principalList.splice(index, 1)
             this.setState({principalList})
             Toast.success('删除成功', 2)

frontend/wechat-web/src/modules/vote/VoteDetailPage.js

@@ -74,6 +74,7 @@ class VoteDetailPage extends React.Component {
         fetchPost(url_detail, params).then((response) => {
             Toast.hide();
             if (response.data) {
+                console.log("getVoteDetail",response)
                 this.state.data.title = response.data.voteTopicDOS[0].topicName;
                 this.state.data.voter = response.data.teacherName;
 
@@ -242,8 +243,8 @@ class VoteDetailPage extends React.Component {
 
 
     render() {
-        return <div className="container-fluid">
-            <div className="row">
+        return (
+            <div className="common-column-layout">
                 <div className="col-xs-12">
                     <div className="row" id="pager_header">
                         <div className="flex_row">
@@ -309,13 +310,14 @@ class VoteDetailPage extends React.Component {
                                 投票</Button>
                         ) : (
                             <Button className='commonButton'
-                                    block
                                     style={{
+                                        width:350,
+                                        height:35,
                                         backgroundColor: "#9D9D9D",
                                         color: "#ffffff",
                                         border: "1px solid #ffffff",
                                         margin: '30px 10px'
-                                    }} block>已投票</Button>
+                                    }} >已投票</Button>
                         )
                         }
                     </div>
@@ -327,8 +329,7 @@ class VoteDetailPage extends React.Component {
                         </div>
                     </div>)}
                 </div>
-            </div>
-        </div>
+            </div>)
     }
 }
 

frontend/wechat-web/src/modules/vote/VoteListTeacher.jsx

@@ -50,7 +50,7 @@ class VoteListTeacher extends Component {
 
         document.title = '投票助手'
         const that = this
-        console.log(this.props.listState)
+        // console.log(this.props.listState)
 
         this.mySwiper = new Swiper('.swiper-container', {
             autoplay: false,
@@ -162,11 +162,12 @@ class VoteListTeacher extends Component {
         }
 
         fetchPost(API.voteListTeacher, {
-            userId: this.props.userInfo.user.userFunId,
-            voteType: '1',
+            teacherId: this.props.userInfo.user.userFunId,
+            voteType:1,
             pageIndex: mReleaseIndex,
             pageSize: mPageSize
         }).then(response => {
+            console.log('loadReleaseList',response)
             if (response && response.data && response.data.create.length > 0) {
                 response.data.create.forEach((item, index) => {
                     let voteBean = {}
@@ -233,10 +234,11 @@ class VoteListTeacher extends Component {
 
         fetchPost(API.voteListTeacher, {
             teacherId: this.props.userInfo.user.userFunId,
-            voteType: '1',
+            voteType: 1,
             pageIndex: mReceiveIndex,
             pageSize: mPageSize
         }).then(response => {
+            console.log('loadReceiveList',response)
             if (response && response.data && response.data.notify.length > 0) {
                 response.data.notify.forEach((item, index) => {
                     let voteBean = {}