Browse Source

班级组织添加班级信息从表

zhuth 6 years ago
parent
commit
7385c4c1d2

+ 28 - 0
frontend/pc-web/app/model/basic/Student.js

@@ -0,0 +1,28 @@
+/**
+ * 学生
+ */
+Ext.define('school.model.basic.Student', {
+    extend: 'school.model.Base',
+    fields: [{
+        name: 'student_id', // id
+        type: 'int'
+    }, {
+        name: 'student_number', // 学号
+        type: 'string'
+    }, {
+        name: 'student_name', // 姓名
+        type: 'string'
+    }, {
+        name: 'student_gender', // 性别
+        type: 'string'
+    }, {
+        name: 'student_birth', // 出生日期
+        type: 'date'
+    }, {
+        name: 'student_age', // 年龄
+        type: 'int'
+    }, {
+        name: 'student_address', // 家庭住址
+        type: 'string'
+    }],
+});

+ 46 - 6
frontend/pc-web/app/view/basic/class/ClassDetail.js

@@ -23,12 +23,14 @@ Ext.define('school.view.basic.class.ClassDetail', {
             defaultItems: [{
                 xtype: 'hidden',
                 name: 'currentDetail.id',
-                fieldLabel: 'id'
+                fieldLabel: 'id',
+                group: '班级信息',
             }, {
                 xtype: "textfield",
                 name: "currentDetail.name",
                 fieldLabel: "班级名称",
-                columnWidth: 0.5
+                columnWidth: 0.5,
+                group: '班级信息',
             }, {
             //     xtype: 'textfield',
             //     name: 'code',
@@ -37,22 +39,60 @@ Ext.define('school.view.basic.class.ClassDetail', {
                 xtype: 'textfield',
                 name: 'currentDetail.grade',
                 fieldLabel: '所属年级',
-                columnWidth: 0.5
+                columnWidth: 0.5,
+                group: '班级信息',
             }, {
                 xtype: "textfield",
                 name: "address",
                 fieldLabel: "班级地址",
-                columnWidth: 1
+                columnWidth: 1,
+                group: '班级信息',
             }, {
                 xtype: "textfield",
                 name: 'status',
                 fieldLabel: "状态",
-                columnWidth: 0.5
+                columnWidth: 0.5,
+                group: '班级信息',
             }, {
                 xtype: "textfield",
                 name: 'remark',
                 fieldLabel: '备注',
-                columnWidth: 0.5
+                columnWidth: 0.5,
+                group: '班级信息',
+            }, {
+                name: "detailGridField",
+                xtype: "detailGridField",
+                detnoColumn: 'sd_detno',
+                storeModel: 'school.model.basic.Student',
+                deleteDetailUrl: '/api/sale/sale/deleteDetail',
+                allowEmpty: true,
+                showCount: false,
+                group: '学生信息',
+                columns: [{
+                    text: 'id',
+                    dataIndex: 'student_id',
+                    hidden: true
+                }, {
+                    text: '学号',
+                    dataIndex: 'student_number'
+                }, {
+                    text: '姓名',
+                    dataIndex: 'student_name'
+                }, {
+                    text: '性别',
+                    dataIndex: 'student_gender'
+                }, {
+                    text: '出生日期',
+                    dataIndex: 'student_birth',
+                    xtype: 'datecolumn',
+                    format: 'Y-m-d'
+                }, {
+                    text: '年龄',
+                    dataIndex: 'student_age'
+                }, {
+                    text: '家庭住址',
+                    dataIndex: 'student_address'
+                }]
             }]
         });
         this.callParent();

+ 4 - 1
frontend/pc-web/app/view/basic/class/ClassInfo.js

@@ -1,5 +1,5 @@
 /**
- * 班级信息
+ * 班级组织信息
  */
 Ext.define('school.view.basic.class.ClassInfo', {
     extend: 'Ext.panel.Panel',
@@ -59,8 +59,11 @@ Ext.define('school.view.basic.class.ClassInfo', {
     }, {
         region: 'center',
         bodyPadding: 10,
+        layout: 'fit',
         items: [{
             xtype: 'panel',
+            layout: 'fit',
+            scrollable: true,
             tbar: [{
                 padding: '7 0 7 0',
                 ui: 'header',

+ 0 - 4
frontend/pc-web/resources/json/navigation.json

@@ -13,10 +13,6 @@
         "id": "basic-staff-stafflist",
         "text": "教职工信息",
         "view": "basic-staff-stafflist"
-    }, {
-        "id": "student-info",
-        "text": "学生信息",
-        "view": "student-info"
     }]
 }, {
     "text": "系统设置",