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

applications/purchase/purchase-server/src/main/resources/mapper/PurchasedetailMapper.xml

@@ -399,7 +399,7 @@
       PD_QTY = #{item.pd_qty},
       PD_PRICE = #{item.pd_price},
       PD_TOTAL = #{item.pd_total},
-      PD_TAXRATE = #{item.pd_taxrate}
+      PD_TAXRATE = #{item.pd_taxrate},
       PD_TAXTOTAL = #{item.pd_taxtotal},
       PD_ACCEPTQTY = #{item.pd_acceptqty},
       PD_DELIVERY = #{item.pd_delivery},

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

@@ -118,13 +118,13 @@ Ext.define('saas.view.document.customer.FormPanel', {
         allowBlank : true, 
         columnWidth : 0.25   
     },{
-        xtype : "numberfield", 
-        name : "cu_ta", 
-        fieldLabel : "应收款余额", 
-        allowBlank : true, 
-        readOnly:true,
-        editable:false,
-        columnWidth : 0.25     
+        // xtype : "numberfield", 
+        // name : "cu_ta", 
+        // fieldLabel : "应收款余额", 
+        // allowBlank : true, 
+        // readOnly:true,
+        // editable:false,
+        // columnWidth : 0.25     
     },{
         xtype:'textfield',
         name : "cu_uu", 

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

@@ -92,14 +92,14 @@ Ext.define('saas.view.document.vendor.FormPanel', {
     },{ 
         xtype : "numberfield", 
         hideTrigger:true,
-        name : "ve_beginaramount", 
+        name : "ve_beginapamount", 
         fieldLabel : "期初应收", 
         allowBlank : true, 
         columnWidth : 0.25
     },{ 
         xtype : "numberfield", 
-        hideTrigger:true,
-        name : "ve_beginprerecamount", 
+        hideTrigger:true, 
+        name : "ve_beginprepayamount", 
         fieldLabel : "期初预收", 
         allowBlank : true, 
         columnWidth : 0.25    
@@ -117,13 +117,13 @@ Ext.define('saas.view.document.vendor.FormPanel', {
         allowBlank : true, 
         columnWidth : 0.25   
     },{
-        xtype : "numberfield", 
-        name : "ve_ta", 
-        fieldLabel : "应收款余额", 
-        allowBlank : true, 
-        readOnly:true,
-        editable:false,
-        columnWidth : 0.25     
+        // xtype : "numberfield", 
+        // name : "ve_ta", 
+        // fieldLabel : "应收款余额", 
+        // allowBlank : true, 
+        // readOnly:true,
+        // editable:false,
+        // columnWidth : 0.25     
     },{
         xtype:'textfield',
         name : "ve_uu",