看板生效设置方式改为下拉框/调整看板设置保存代码

kanban-console/src/main/webapp/resources/app/view/desktop/BoardManageMainPanel.js

@@ -181,14 +181,6 @@ Ext.define('erp.view.desktop.BoardManageMainPanel', {
 						});
 					}
 				}
-			// }, '->', {
-			// 	xtype: 'button',
-			// 	text: '刷新',
-			// 	disabled: true,
-			// 	handler: function() {
-			// 		var grid =this.up('grid');
-			// 		grid.loadGridData();
-			// 	}
 			}],
 			plugins: [
 				Ext.create('Ext.grid.plugin.CellEditing', {

kanban-console/src/main/webapp/resources/app/view/desktop/BoardManageRightPanel.js

@@ -9,6 +9,24 @@ Ext.define('erp.view.desktop.BoardManageRightPanel',{
 	hideBorders: true, 
 	initComponent:function(){
 		var me = this;
+
+		var enabledStore = Ext.create('Ext.data.Store', {
+            fields: ['value', 'name'],
+            data: [
+                { "value": true, "name": "是" },
+				{ "value": false, "name": "否" }
+            ]
+        });
+		var enabledCombo = new Ext.form.ComboBox({
+            store: enabledStore,
+            valueField: 'value',
+            displayField: 'name',
+            mode: 'local',
+            forceSelection: true,
+            editable: false,
+            triggerAction: 'all',
+			selectOnFocus: true
+        });
 		me.items = [{
 			xtype: 'grid',
 			id:'tplGrid',
@@ -31,7 +49,7 @@ Ext.define('erp.view.desktop.BoardManageRightPanel',{
 					}
 				},
 				{
-					text: '是否生效', dataIndex: 'enabled', width: 80, editor: 'checkbox', renderer: function(value) {
+					text: '是否生效', dataIndex: 'enabled', width: 80, editor: enabledCombo, renderer: function(value) {
 						return value ? '是' : '否'
 					}
 				},
@@ -96,14 +114,6 @@ Ext.define('erp.view.desktop.BoardManageRightPanel',{
 						});
 					}
                 }
-			// }, '->', {
-			// 	xtype: 'button',
-			// 	text: '刷新',
-			// 	disabled: true,
-			// 	handler: function() {
-			// 		var grid = this.up('grid');
-			// 		grid.loadGridData();
-            //     }
 			}],
 			plugins: [
 				Ext.create('Ext.grid.plugin.CellEditing', {
@@ -135,6 +145,7 @@ Ext.define('erp.view.desktop.BoardManageRightPanel',{
 							grid.selectedIndex = 1;
 							res = res instanceof Array ? res : [res];
 							grid.getStore().loadData(res);
+							grid.getStore().sort('enabled', 'DESC');
 						}else {
 							Ext.Msg.alert('失败', res.message);
 						}

kanban-console/src/main/webapp/resources/app/view/template/templateeditpanel.js

@@ -245,9 +245,8 @@ Ext.define('erp.view.template.templateeditpanel',{
 		if(extraParams){
 			Ext.apply(json,extraParams);
 		}
-		var buildpanel = Ext.getCmp('templatebuilderpanel');
-		json.name = buildpanel.modelName;
-		json.panelCode = buildpanel.panelCode;
+		json.name = modelName;
+		json.panelCode = panelCode;
 		Ext.Ajax.request({
         	url:'kanban/'+type,
         	method:'POST',