Merge branch 'dev' of ssh://10.10.100.21/source/saas-platform into dev

frontend/saas-web/app/view/document/kind/ChildForm.js

@@ -135,7 +135,7 @@ Ext.define('KitchenSink.view.binding.ChildForm', {
                 xtype:'datefield',
                 name:'bk_date',
                 fieldLabel:'建账日期',
-                format:'Y-m-d',
+                format:'Y-m-d H:i:s',
                 listeners:{
                     beforerender:function(d){
                         d.setValue(new Date())

frontend/saas-web/app/view/sys/config/FormPanel.js

@@ -62,6 +62,7 @@ Ext.define('saas.view.sys.config.FormPanel', {
         xtype: 'textfield',
         name: 'en_address',
         fieldLabel: '公司地址',
+        beforeLabelTextTpl : "<font color=\"red\" style=\"position:relative; top:2px;right:2px; font-weight: bolder;\">*</font>",
         allowBlank: false,
         width:600
     },{
@@ -69,6 +70,7 @@ Ext.define('saas.view.sys.config.FormPanel', {
         xtype: 'textfield',
         name: 'en_tel',
         fieldLabel: '电话',
+        beforeLabelTextTpl : "<font color=\"red\" style=\"position:relative; top:2px;right:2px; font-weight: bolder;\">*</font>",
         allowBlank: false,
         columnWidth: 0.25
     },{
@@ -98,14 +100,16 @@ Ext.define('saas.view.sys.config.FormPanel', {
         queryMode : "local", 
         valueField : "value", 
         xtype : "combo",
+        value:'WACC',
         store:{
             fields: ['display', 'value'],
             data : [
-                {"display":"加权平均法", "value":'1'},
-                {"display":"先进先出法", "value":'0'}
+                {"display":"加权平均法", "value":'WACC'},
+                {"display":"先进先出法", "value":'FIFO'}
             ]
         },
         name : "en_pricemethod", 
+        beforeLabelTextTpl : "<font color=\"red\" style=\"position:relative; top:2px;right:2px; font-weight: bolder;\">*</font>",
         fieldLabel : "库存计算方式", 
         allowBlank : false, 
         columnWidth : 0.25

frontend/saas-web/app/view/sys/power/GroupGrid.js

@@ -31,7 +31,7 @@ Ext.define('saas.view.sys.power.GroupGrid', {
         groupHeaderTpl: '{name}'+'模块'
 	})],
     initId:0,
-    dataUrl:'http://192.168.253.31:8560/api/account/role/power/resource',
+    dataUrl:'/api/account/role/power/resource',
     selModel:Ext.create('Ext.selection.CheckboxModel', {
         checkOnly: true,
         showHeaderCheckbox:false,