作业发布添加【科目】字段/学生信息添加【校园卡通号】字段

frontend/pc-web/app/model/Subject.js

@@ -5,7 +5,7 @@ Ext.define('school.model.Subject', {
     extend: 'school.model.Base',
     fields: [{
         name: 'subject_id', // 学科代码
-        type: 'string'
+        type: 'int'
     }, {
         name: 'subject_name', // 学科名称
         type: 'string'

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

@@ -174,19 +174,26 @@ Ext.define('school.view.interaction.homework.List', {
                 }, {
                     text: '班级',
                     dataIndex: 'classz_name'
+                }, {
+                    text: '学科',
+                    dataIndex: 'subject_id',
+                    renderer: function(v) {
+                        let store = Ext.StoreMgr.get('store_subject');
+                        let idx = store.findBy(function(r) {
+                            return r.get('subject_id') == v
+                        });
+                        let record;
+                        if(idx >= 0) {
+                            record = store.getAt(idx);
+                            return record.get('subject_name')
+                        }else {
+                            return v;
+                        }
+                    }
                 }, {
                     text: '标题',
                     dataIndex: 'task_title',
-                    width: 120,
-                    // tdCls: 'x-detail-column',
-                    // listeners: {
-                    //     click: function (view, td, row, col, e, record, tr, eOpts, event) {
-                    //         let gridConfig = me.gridConfig;
-                    //         school.util.BaseUtil.openTab(gridConfig.addXtype, gridConfig.addTitle + '(' + record.get('task_title') + ')', gridConfig.addXtype + '-' + record.get(gridConfig.idField), {
-                    //             initId: record.get(gridConfig.idField)
-                    //         });
-                    //     }
-                    // }
+                    width: 120
                 }, {
                     text: '内容',
                     dataIndex: 'task_context',
@@ -205,7 +212,7 @@ Ext.define('school.view.interaction.homework.List', {
                 }, {
                     text: '发布时间',
                     dataIndex: 'publish_date',
-                    width: 120
+                    width: 150,
                 }, ]
             },
         });
@@ -213,6 +220,7 @@ Ext.define('school.view.interaction.homework.List', {
     },
 
     refresh: function() {
+        Ext.StoreMgr.get('store_subject').load();
         Ext.StoreMgr.get('store_grade').load();
         Ext.StoreMgr.get('store_class').load();
         this.items.items[0].store.load();

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

@@ -86,6 +86,10 @@ Ext.define('school.view.interaction.homework.Release', {
                     }
                 },
                 allowBlank: false
+            }, {
+                xtype: 'subjectcombo',
+                name: 'subject_id',
+                fieldLabel: '学科'
             }, {
                 xtype: 'datefield',
                 name: 'start_date',
@@ -171,6 +175,7 @@ Ext.define('school.view.interaction.homework.Release', {
     },
 
     refresh: function() {
+        Ext.StoreMgr.get('store_subject').load();
         Ext.StoreMgr.get('store_grade').load();
         Ext.StoreMgr.get('store_class').load();
     }

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

@@ -13,7 +13,7 @@ Ext.define('school.view.basic.student.StudentDetail', {
     _statusCodeField: null,
     _auditmanField: null,
     _auditdateField: null,
-    // _readUrl: 'http://10.1.80.47:9560/student/read',
+    // _readUrl: 'http://10.1.80.47:9520/api/shcool/student/read',
     _readUrl: '/api/school/student/read',
     // _saveUrl: 'http://10.1.80.36:9520/api/school/student/save',
     _saveUrl: '/api/school/student/save',
@@ -140,6 +140,10 @@ Ext.define('school.view.basic.student.StudentDetail', {
                     }
                 },
                 allowBlank: false
+            }, {
+                xtype: 'textfield',
+                name: 'stu_cardNo',
+                fieldLabel: '校园卡通号',
             }, {
                 name: "parent",
                 xtype: "detailGridField",

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

@@ -5,8 +5,8 @@ Ext.define('school.view.basic.student.StudentList', {
     extend: 'school.view.core.base.BasePanel',
     xtype: 'basic-student-studentlist',
 
+    // dataUrl: 'http://10.1.80.47:9560/student/list',
     dataUrl: '/api/school/student/list',
-    // dataUrl: 'http:/api/school/student/list',
     _title: '学生信息',
     caller: 'Student',
     pathKey: 'student',
@@ -183,6 +183,9 @@ Ext.define('school.view.basic.student.StudentList', {
                     width: 120,
                     xtype: 'datecolumn',
                     format: 'Y-m-d'
+                }, {
+                    text: '校园卡通号',
+                    dataIndex: 'stu_cardNo'
                 }]
             },
         });

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

@@ -11,7 +11,6 @@ Ext.define('school.view.core.form.field.SubjectComboBox', {
     initComponent: function() {
         var me = this;
         var store = Ext.StoreMgr.get('store_subject');
-        store.load();
         Ext.apply(me, {
             store: store,
         });