'校长信箱/出入校记录'

frontend/pc-web/app/view/Interaction/access/List.js

@@ -5,7 +5,7 @@ Ext.define('school.view.interaction.access.List', {
     extend: 'school.view.core.base.BasePanel',
     xtype: 'interaction-access-list',
 
-    dataUrl: '/api/interaction/access/list',
+    dataUrl: '/api/school/record/list',
     initComponent: function () {
         var me = this;
         Ext.apply(this, {
@@ -13,11 +13,6 @@ Ext.define('school.view.interaction.access.List', {
                 xtype: 'textfield',
                 name: 'keyword',
                 fieldLabel: '姓名'
-            }, {
-                xtype: 'condatefield',
-                name: 'term',
-                columnWidth: 0.5,
-                fieldLabel: '日期'
             }],
 
             caller: null,
@@ -46,14 +41,15 @@ Ext.define('school.view.interaction.access.List', {
                 hiddenTools: true,
                 toolBtns: [],
                 columns: [{
-                    text: '头像',
-                    dataIndex: 'portrait'
+                    text: 'id',
+                    dataIndex: 'record_id',
+                    hidden: true
                 }, {
-                    text: '姓名',
-                    dataIndex: 'name'
+                    text: '类型',
+                    dataIndex: 'record_name'
                 }, {
-                    text: '性别',
-                    dataIndex: 'sex'
+                    text: '学生',
+                    dataIndex: 'stu_id'
                 }, {
                     text: '班级',
                     dataIndex: 'class'
@@ -65,10 +61,18 @@ Ext.define('school.view.interaction.access.List', {
                     dataIndex: 'state'
                 }, {
                     text: '时间',
-                    dataIndex: 'time',
+                    dataIndex: 'in_date',
                     xtype: 'datecolumn',
-                    format: 'Y-m-d H:i'
-                }, ]
+                    format: 'Y-m-d H:i:s',
+                    width: 150,
+                    renderer: function(v, m, r) {
+                        if(r.get('record_name') == '入校记录') {
+                            return r.get('in_date');
+                        }else {
+                            return r.get('out_date');
+                        }
+                    }
+                }]
             },
         });
         this.callParent(arguments);

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

@@ -5,7 +5,7 @@ Ext.define('school.view.interaction.mailbox.List', {
     extend: 'school.view.core.base.BasePanel',
     xtype: 'interaction-mailbox-list',
 
-    dataUrl: '/api/interaction/mailbox/list',
+    dataUrl: '/api/school/principal/list',
     initComponent: function() {
         var me = this;
         Ext.apply(this, {
@@ -13,21 +13,8 @@ Ext.define('school.view.interaction.mailbox.List', {
                 xtype: 'textfield',
                 name: 'keyword',
                 fieldLabel: '关键字'
-            }, {
-                xtype: 'condatefield',
-                name: 'term',
-                columnWidth: 0.5,
-                fieldLabel: '日期'
             }],
 
-            caller: null,
-            _formXtype: null,
-            _title: null,
-            _deleteUrl: null,
-            _batchOpenUrl: null,
-            _batchCloseUrl: null,
-            _batchDeleteUrl: null,
-        
             gridConfig: {
                 idField: null,
                 codeField: null,
@@ -55,30 +42,21 @@ Ext.define('school.view.interaction.mailbox.List', {
                     text: '删除'
                 }],
                 columns : [{
-                    text: '编号',
-                    dataIndex: 'code',
-                    width: 150
-                }, {
                     text: '标题',
-                    dataIndex: 'name',
+                    dataIndex: 'mailboxTitle',
                     width: 120
                 }, {
                     text: '内容',
-                    dataIndex: 'gender',
-                    width: 120
-                }, {
-                    text: '附件',
-                    dataIndex: 'grade'
+                    dataIndex: 'mailboxContext',
+                    width: 300
                 }, {
+                    xtype: 'datecolumn',
                     text: '日期',
-                    dataIndex: 'class'
+                    dataIndex: 'createDate'
                 }, {
                     text: '提出人',
-                    dataIndex: 'birth',
+                    dataIndex: 'mailboxCreator',
                     width: 120
-                }, {
-                    text: '处理',
-                    dataIndex: 'open'
                 }]
             },
         });