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

applications/purchase/purchase-server/src/main/java/com/usoftchina/saas/purchase/service/impl/PurchaseServiceImpl.java

@@ -178,6 +178,8 @@ public class PurchaseServiceImpl extends CommonBaseServiceImpl<PurchaseMapper, P
                 purchasedetailMapper.batchInsert(insertDetails);
             }
             baseDTO = getBaseDTOById(pu_id);
+            //明细需求日期为空时==主表交货日期
+            getMapper().updateDelivery(pu_id);
             //计算金额，未税单价，未税金额等
             calcPurchase(pu_id);
             //日志记录

frontend/saas-web/app/view/document/customer/FormPanel.js

@@ -138,6 +138,15 @@ Ext.define('saas.view.document.customer.FormPanel', {
                 allowBlank: false,
                 columnWidth: 0.25,
                 group: '交易信息',
+            }, {
+                xtype: "numberfield",
+                name: "cu_taxrate",
+                fieldLabel: "税率(%)",
+                allowBlank: false,
+                columnWidth: 0.25,
+                minValue: 0,
+                maxValue: 100,
+                group: '交易信息',
             },{
                 xtype: "numberfield",
                 hideTrigger: true,
@@ -179,15 +188,6 @@ Ext.define('saas.view.document.customer.FormPanel', {
                 renderer: function(v, m, r) {
                     return saas.util.BaseUtil.numberFormat(v, 2, true);
                 },
-            }, {
-                xtype: "numberfield",
-                name: "cu_taxrate",
-                fieldLabel: "税率(%)",
-                allowBlank: false,
-                columnWidth: 0.25,
-                minValue: 0,
-                maxValue: 100,
-                group: '交易信息',
             }, {
                 xtype: "numberfield",
                 hideTrigger: true,

frontend/saas-web/app/view/document/vendor/FormPanel.js

@@ -144,6 +144,16 @@ Ext.define('saas.view.document.vendor.FormPanel', {
                 allowBlank: false,
                 columnWidth: 0.25,
                 group: '交易信息',
+            }, {
+                xtype: "numberfield",
+                name: "ve_taxrate",
+                hideTrigger: true,
+                fieldLabel: "税率(%)",
+                allowBlank: false,
+                columnWidth: 0.25,
+                minValue: 0,
+                maxValue: 100,
+                group: '交易信息',
             },{
                 xtype: "numberfield",
                 hideTrigger: true,
@@ -186,16 +196,6 @@ Ext.define('saas.view.document.vendor.FormPanel', {
                 renderer: function(v, m, r) {
                     return saas.util.BaseUtil.numberFormat(v, 2, true);
                 },
-            }, {
-                xtype: "numberfield",
-                name: "ve_taxrate",
-                hideTrigger: true,
-                fieldLabel: "税率(%)",
-                allowBlank: false,
-                columnWidth: 0.25,
-                minValue: 0,
-                maxValue: 100,
-                group: '交易信息',
             }, {
                 xtype: "numberfield",
                 hideTrigger: true,
@@ -262,7 +262,7 @@ Ext.define('saas.view.document.vendor.FormPanel', {
                 name: "ve_address",
                 fieldLabel: "公司地址",
                 allowBlank: true,
-                columnWidth: 0.75
+                columnWidth: 0.5
             }, {
                 fieldLabel: "备注",
                 xtype: 'textfield',

frontend/saas-web/app/view/money/fundtransfer/FormPanel.js

@@ -87,6 +87,7 @@ Ext.define('saas.view.money.fundtransfer.FormPanel', {
                     }
                 }, {
                     text: "转出账户余额(元)",
+                    width: 200.0,
                     dataIndex: "bk_outthisamount",
                     ignore: true
                 }, {