Ver código fonte

单据状态控制不可编辑

zhuth 6 anos atrás
pai
commit
23057fa1ec

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

@@ -6,7 +6,7 @@ Ext.define('school.view.interaction.homework.Release', {
     xtype: 'interaction-homework-release',
 
     controller: 'interaction-homework-release',
-    // viewModel: 'purchase-purchase-formpanel',
+    viewModel: 'interaction-homework-release',
 
     //字段属性
     _title: '作业发布',
@@ -121,14 +121,6 @@ Ext.define('school.view.interaction.homework.Release', {
                 name: 'accessory',
                 fieldLabel: '附件'
             }],
-            applyBtns: [{
-                apply: true,
-                text: '保存',
-                bind: {
-                    hidden: '{!showSaveBtn || task_status == 1}',
-                    disabled: '{!base.valid}'
-                }
-            }],
             applyBtns: [{
                 apply: true,
                 text: '删除',

+ 15 - 0
frontend/pc-web/app/view/Interaction/homework/ReleaseModel.js

@@ -0,0 +1,15 @@
+Ext.define('school.view.interaction.homework.SchoolNoticeModel', {
+    extend: 'school.view.core.form.FormPanelModel',
+    alias: 'viewmodel.interaction-homework-release',
+
+    formulas: {
+        task_status_change: {
+            bind: '{task_status}',
+            get: function(v) {
+                let view = this.getView();
+                view.setEditable(v != 1);
+            }
+        }
+    }
+
+});

+ 7 - 1
frontend/pc-web/app/view/Interaction/notice/SchoolNotice.js

@@ -6,7 +6,7 @@ Ext.define('school.view.interaction.notice.SchoolNotice', {
     xtype: 'interaction-notice-schoolnotice',
 
     controller: 'interaction-notice-schoolnotice',
-    // viewModel: 'purchase-purchase-formpanel',
+    viewModel: 'interaction-notice-schoolnotice',
 
     //字段属性
     _title: '学校通知',
@@ -85,6 +85,12 @@ Ext.define('school.view.interaction.notice.SchoolNotice', {
                     hidden: '{!showSaveBtn || notify_status == 1}',
                     disabled: '{!base.valid}'
                 }
+            }, {
+                apply: true,
+                text: '删除',
+                bind: {
+                    hidden: '{!showDeleteBtn || !notify_id || notify_status == 1}'
+                },
             }],
             toolBtns: [{
                 xtype: 'button',

+ 15 - 0
frontend/pc-web/app/view/Interaction/notice/SchoolNoticeModel.js

@@ -0,0 +1,15 @@
+Ext.define('school.view.interaction.notice.SchoolNoticeModel', {
+    extend: 'school.view.core.form.FormPanelModel',
+    alias: 'viewmodel.interaction-notice-schoolnotice',
+
+    formulas: {
+        notify_status_change: {
+            bind: '{notify_status}',
+            get: function(v) {
+                let view = this.getView();
+                view.setEditable(v != 1);
+            }
+        }
+    }
+
+});

+ 15 - 1
frontend/pc-web/app/view/Interaction/timetable/Detail.js

@@ -35,7 +35,7 @@ Ext.define('school.view.interaction.timetable.Detail', {
                 xtype: 'textfield',
                 name: 'name',
                 fieldLabel: '课表名称',
-                emptyText: '请选择年级',
+                columnWidth: 0.5,
                 bind: {
                     emptyText: '{name_emptyText}'
                 }
@@ -365,6 +365,20 @@ Ext.define('school.view.interaction.timetable.Detail', {
                     hidden: true
                 }]
             }],
+            applyBtns: [{
+                apply: true,
+                text: '删除',
+                bind: {
+                    hidden: '{!showDeleteBtn || !id || status == 1}'
+                },
+            }, {
+                apply: true,
+                text: '保存',
+                bind: {
+                    hidden: '{!showSaveBtn || status == 1}',
+                    disabled: '{!base.valid}'
+                }
+            }],
             toolBtns: [{
                 xtype: 'button',
                 text: '启用',

+ 7 - 9
frontend/pc-web/app/view/Interaction/timetable/DetailModel.js

@@ -12,18 +12,16 @@ Ext.define('school.view.interaction.timetable.DetailModel', {
 
             if(!!gradeName && !!clazzName && !!termPart && !!termName) {
                 text =  gradeName + clazzName + termPart.split('-')[0] + '学年' + termName + '课表';
-                // this.set('name', text);
-            }else if(!gradeName) {
-                text = '请选择年级';
-            }else if(!clazzName) {
-                text = '请选择班级';
-            }else if(!termPart) {
-                text = '请选择学年';
-            }else if(!termName) {
-                text = '请选择学期';
             }
 
             return text;
+        },
+        status_change: {
+            bind: '{status}',
+            get: function(v) {
+                let view = this.getView();
+                view.setEditable(v != 1);
+            }
         }
     }
 

+ 1 - 0
frontend/pc-web/app/view/core/form/field/FileField.js

@@ -8,6 +8,7 @@ Ext.define('school.view.core.form.field.FileField', {
 	collapsible: true,
 	multi: true,
 	allowBlank:true,
+	isFormField: true,
 	initComponent: function() {
 		this.columnWidth = 1;//强制占一行
 		this.cls = '';