成绩发布新增修改

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

@@ -4,13 +4,19 @@
 Ext.define('school.model.Score', {
     extend: 'school.model.Base',
     fields: [{
-        name: 'number', // 学号
-        type: 'int'
+        name: 'sd_stuNumber', // 学号
+        type: 'string'
+    }, {
+        name: 'sd_stu', // 姓名
+        type: 'string'
     }, {
-        name: 'name', // 姓名
+        name: 'sd_subject',
         type: 'string'
     }, {
-        name: 'score', // 成绩
+        name: 'sd_score',
         type: 'float'
+    }, {
+        name: 'sd_remark',
+        type: 'string'
     }]
 });

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

@@ -12,7 +12,7 @@ Ext.define('school.view.interaction.score.Detail', {
     // _readUrl: 'http://10.1.80.36:9520/api/school/score/read',
     _readUrl: '/api/school/score/read',
     // _saveUrl: 'http://10.1.80.47:9520/api/school/score/save',
-    // _saveUrl: '/api/sale/sss/update',
+    _saveUrl: '/api/school/score/save',
     // _deleteUrl: 'http://10.1.80.47:9520/api/school/score/delete',
     _deleteUrl: '/api/school/score/delete',
     
@@ -74,16 +74,69 @@ Ext.define('school.view.interaction.score.Detail', {
                     dataIndex: 'sd_stuNumber'
                 }, {
                     text: '姓名',
-                    dataIndex: 'sd_stu'
+                    dataIndex: 'sd_stu',
+                    editor: {
+                        xtype: 'dbfindtrigger',
+                        //数据接口
+                        dataUrl:'/api/school/student/list',
+                        //联想设置
+                        dbtpls:[{
+                            field:'stu_name',width:150
+                        }],
+                        dbfinds:[{
+                            from: 'stu_name', to: 'sd_stu',
+                        }, {
+                            from: 'stu_number', to: 'sd_stuNumber'
+                        }],
+                        defaultCondition: "1=1",
+                        dbSearchFields:[{
+                            emptyText:'请输入学生学号或姓名',
+                            xtype : "textfield", 
+                            name : "search", 
+                            getCondition: function(v) {
+                                return "(upper(stu_name) like '%"+v.toUpperCase()+"%' or upper(stu_number) like '%"+v.toUpperCase()+"%')";
+                            },
+                            allowBlank : true, 
+                            width:300
+                        }],
+                        //放大镜窗口列表
+                        dbColumns:[{
+                            text: "ID",
+                            dataIndex: "stu_id",
+                            hidden:true,
+                            xtype: "numbercolumn"
+                        }, {
+                            text: '工号',
+                            dataIndex: 'stu_number',
+                            width: 110
+                        }, {
+                            text: "姓名",
+                            dataIndex: "stu_name",
+                            width: 110
+                        }]
+                    }
                 }, {
                     text: '科目',
-                    dataIndex: 'sd_subject'
+                    dataIndex: 'sd_subject',
+                    editor: {
+                        xtype: 'subjectcombo',
+                        valueField: 'subject_name',
+                        hideLabel: true
+                    }
                 }, {
                     text: '成绩',
-                    dataIndex: 'sd_score'
+                    dataIndex: 'sd_score',
+                    editor: {
+                        xtype: 'numberfield',
+                        minValue: 0
+                    }
                 }, {
                     text: '备注',
-                    dataIndex: 'sd_remark'
+                    dataIndex: 'sd_remark',
+                    editor: {
+                        xtype: 'textfield'
+                    },
+                    width: 200
                 }]
             }],
             applyBtns: [{
@@ -108,6 +161,7 @@ Ext.define('school.view.interaction.score.Detail', {
     },
 
     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/Interaction/score/DetailModel.js

@@ -3,10 +3,10 @@ Ext.define('school.view.interaction.score.DetailModel', {
     alias: 'viewmodel.interaction-score-detail',
 
     data: {
-        showAddBtn: false,
+        showAddBtn: true,
         showRefreshBtn: true,
         showCopyBtn: false,
-        showSaveBtn: false,
+        showSaveBtn: true,
         showDeleteBtn: true,
         showLogBtn: false
     },

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

@@ -97,10 +97,10 @@ Ext.define('school.view.interaction.score.List', {
                 },
                 hiddenTools: false,
                 toolBtns: [{
-                //     xtype: 'button',
-                //     text: '新增',
-                //     handler: 'onAddClick'
-                // }, {
+                    xtype: 'button',
+                    text: '新增',
+                    handler: 'onAddClick'
+                }, {
                     xtype: 'importbutton',
                     text: '导入',
                     belong: me,
@@ -241,6 +241,7 @@ Ext.define('school.view.interaction.score.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/score/ListController.js

@@ -3,6 +3,6 @@ Ext.define('school.view.interaction.score.ListController', {
     alias: 'controller.interaction-score-list',
 
     onAddClick: function() {
-        school.util.BaseUtil.openTab('interaction-score-detail', '录入成绩', 'interaction-score-detail-add'); 
+        school.util.BaseUtil.openTab('interaction-score-detail', '成绩录入', 'interaction-score-detail-add'); 
     }
 });

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

@@ -196,6 +196,9 @@ Ext.define('school.view.core.form.field.dbfind.Trigger', {
             var me = f;
             var dbfinds = me.dbfinds,
                 data;
+            if(!me.strict) {
+                return;
+            }
             if (f.value && f.value != '') {
                 //添加默认条件
                 var searchField = null;