merge

frontend/saas-web/app/view/core/form/FormPanel.js

@@ -34,7 +34,8 @@ Ext.define('saas.view.core.form.FormPanel', {
     toolBtns: [], // 自定义按钮
 
     initComponent: function() {
-        var me = this,
+
+        var me = this;
 
         //判断是否加载数据
         if(me.initId&&me.initId!=0){
@@ -63,7 +64,11 @@ Ext.define('saas.view.core.form.FormPanel', {
                 style: {
                     'border-bottom': '1px solid #35baf6 !important'
                 },
-                items: me.toolBtns.concat(['->', {
+                items: ['->'].concat(me.toolBtns.map(function(btn){
+                    btn.cls += ' x-formpanel-btn-blue';
+                    return btn;
+                }).concat([{
+                    cls:'x-formpanel-btn-orange',
                     xtype: 'button',
                     text: '新增',
                     handler: 'add'
@@ -75,7 +80,7 @@ Ext.define('saas.view.core.form.FormPanel', {
                     xtype: 'button',
                     text: '审核',
                     handler: "audit"
-                }])
+                }]))
             }]
         });
         

frontend/saas-web/app/view/test/order/FormPanel.js

@@ -4,20 +4,17 @@ Ext.define('saas.view.test.order.FormPanel', {
 
     controller: 'test-order-formcontroller',
     viewModel: 'test-order-formmodel',
-<<<<<<< HEAD
     
     _codeField: 'puCode',
     _statusField: 'puStatuscode',
     _idField: 'puId',
-    initId : 11
-=======
+    initId : 11,
 
     toolBtns: [{
         xtype: 'button',
-        text: '测试',
+        text: '转单按钮',
         handler: function() {
             console.log('11');
         }
     }]
->>>>>>> 201b642dc3fc73db186b7f07f0350aacfd94aee4
 });