收付款备注字段

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

@@ -321,7 +321,7 @@ Ext.define('saas.view.money.payBalance.FormPanel', {
             hidden: true
         }]
     }, {
-        xtype: 'hidden',
+        xtype: 'textfield',
         name: 'pb_remark',
         columnWidth: 1,
         fieldLabel: '备注'

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

@@ -73,11 +73,6 @@ Ext.define('saas.view.money.recBalance.FormPanel', {
         xtype: "textfield",
         name: "rb_manname",
         fieldLabel: "收款人"
-    }, {
-        xtype: 'hidden',
-        name: 'rb_remark',
-        fieldLabel: '备注',
-        columnWidth: 1
     }, {
         xtype: "numberfield",
         name: "rb_discounts",
@@ -128,6 +123,7 @@ Ext.define('saas.view.money.recBalance.FormPanel', {
         }, {
             text: '资金账户',
             dataIndex: 'rd_bankname',
+            width: 200,
             editor:{
                 xtype:'dbfindtrigger'
             }
@@ -179,6 +175,7 @@ Ext.define('saas.view.money.recBalance.FormPanel', {
             text: "备注",
             dataIndex: "rd_remark",
             width: 250,
+            flex:1,
             editor: {
                 xtype: 'textfield'
             }
@@ -210,6 +207,7 @@ Ext.define('saas.view.money.recBalance.FormPanel', {
         }, {
             text: '来源单号',
             dataIndex: 'rbd_slcode',
+            width: 200,
             editor:{
                 displayField : "display",
                 editable : true,
@@ -290,6 +288,7 @@ Ext.define('saas.view.money.recBalance.FormPanel', {
             text: "本次核销金额",
             xtype: 'numbercolumn',
             dataIndex: "rbd_nowbalance",
+            width:200,
             editor : {
                 xtype : "numberfield",
                 decimalPrecision: 2
@@ -309,6 +308,11 @@ Ext.define('saas.view.money.recBalance.FormPanel', {
                 return Ext.util.Format.number(v, format);
             }
         }]
+    }, {
+        xtype: 'textfield',
+        name: 'rb_remark',
+        fieldLabel: '备注',
+        columnWidth: 1
     }, {
         xtype: 'numberfield',
         name: 'rb_recorderid',

frontend/saas-web/app/view/purchase/report/PurchasePay.js

@@ -67,7 +67,7 @@ Ext.define('saas.view.purchase.report.PurchasePay', {
         summaryType: 'sum',
         summaryRenderer: function(v) {
             var arr = (v + '.').split('.');
-            var xr = (new Array(arr[1].length)).fill('0');
+            var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
             var format = '0,000.' + xr.join();
             return Ext.util.Format.number(v, format);
         }
@@ -79,7 +79,7 @@ Ext.define('saas.view.purchase.report.PurchasePay', {
         summaryType: 'sum',
         summaryRenderer: function(v) {
             var arr = (v + '.').split('.');
-            var xr = (new Array(arr[1].length)).fill('0');
+            var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
             var format = '0,000.' + xr.join();
             return Ext.util.Format.number(v, format);
         }
@@ -89,13 +89,19 @@ Ext.define('saas.view.purchase.report.PurchasePay', {
         dataIndex: 'pb_pbdamount',
         xtype: 'numbercolumn'
     }, {
-        text: '付款比例',
+        text: '付款比例%',
         //本次付款/采购金额*100%
         dataIndex: 'pb_payrate',
-        xtype: 'numbercolumn'
+        xtype: 'numbercolumn',
+        renderer : function(v) {
+            var arr = (v*100 + '.').split('.');
+            var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
+            var format = '0.' + xr.join();
+            return Ext.util.Format.number(v*100, format);
+        }
     }, {
         text: '备注',
-        dataIndex: 'pd_remark',
+        dataIndex: 'pb_remark',
         width: 200
     }]
 

frontend/saas-web/app/view/sale/report/SaleRec.js

@@ -50,26 +50,65 @@ Ext.define('saas.view.sale.report.SaleRec', {
         xtype: 'datecolumn'
     }, {
         text: '来源单号',
-        dataIndex: 'rbd_slcode'
+        dataIndex: 'rbd_slcode',
+        width: 200
     }, {
         text: '类型',
         dataIndex: 'rbd_slkind'
     }, {
         text: '销售金额',
         xtype: 'numbercolumn',
-        dataIndex: 'rbd_amount'
+        dataIndex: 'rbd_amount',
+        renderer : function(v) {
+            var arr = (v + '.').split('.');
+            var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
+            var format = '0,000.' + xr.join();
+            return Ext.util.Format.number(v, format);
+        },
+        summaryType: 'sum',
+        summaryRenderer: function(v) {
+            var arr = (v + '.').split('.');
+            var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
+            var format = '0,000.' + xr.join();
+            return Ext.util.Format.number(v, format);
+        }
     }, {
         text: '本次收款',
         xtype: 'numbercolumn',
-        dataIndex: 'rbd_nowbalance'
+        dataIndex: 'rbd_nowbalance',
+        renderer : function(v) {
+            var arr = (v + '.').split('.');
+            var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
+            var format = '0,000.' + xr.join();
+            return Ext.util.Format.number(v, format);
+        },
+        summaryType: 'sum',
+        summaryRenderer: function(v) {
+            var arr = (v + '.').split('.');
+            var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
+            var format = '0,000.' + xr.join();
+            return Ext.util.Format.number(v, format);
+        }
     }, {
         text: '应收余额',
         xtype: 'numbercolumn',
-        dataIndex: 'rb_rbdamount'
+        dataIndex: 'rb_rbdamount',
+        renderer : function(v) {
+            var arr = (v + '.').split('.');
+            var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
+            var format = '0,000.' + xr.join();
+            return Ext.util.Format.number(v, format);
+        }
     }, {
-        text: '回款比例',
+        text: '回款比例%',
+        dataIndex: 'rb_backrate',
         xtype: 'numbercolumn',
-        dataIndex: 'rb_backrate'
+        renderer : function(v) {
+            var arr = (v*100 + '.').split('.');
+            var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
+            var format = '0.' + xr.join();
+            return Ext.util.Format.number(v*100, format);
+        }
     }, {
         text: '备注',
         dataIndex: 'rb_remark'

frontend/saas-web/app/view/stock/report/Prodiodetail.js

@@ -26,6 +26,7 @@ Ext.define('saas.view.stock.report.Prodiodetail', {
             ["销售退货单", "销售退货单"],
             ["完工入库单", "完工入库单"],
             ["生产领料单", "生产领料单"],
+            ["拆件领料单", "拆件领料单"],
             ["其它入库单", "其它入库单"],
             ["其它出库单", "其它出库单"],
             ["调拨单", "调拨单"],