解决冲突

applications/money/money-server/src/main/resources/mapper/CustmonthMapper.xml

@@ -32,7 +32,7 @@
         and  companyId = #{companyId} and (cm_endamount +cm_nowamount+ cm_nowpreamount + cm_beginamount) != 0
       </if>
     </where>
-    order by cm_id desc, cm_yearmonth desc
+    order by cm_yearmonth desc,cm_custcode
   </select>
 
 

applications/money/money-server/src/main/resources/mapper/VendmonthMapper.xml

@@ -32,7 +32,7 @@
         and  companyid = #{companyId} and (vm_endamount+ vm_nowamount+vm_nowpreamount+vm_beginamount) != 0
       </if>
     </where>
-    order by vm_id desc, vm_yearmonth desc
+    order by vm_yearmonth desc,vm_vendcode
   </select>
 
   <parameterMap id="ymParamMap" type="java.util.Map">

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

@@ -128,8 +128,14 @@ Ext.define('saas.view.document.product.FormPanel', {
         fieldLabel : "标准单价(元)", 
         allowBlank : true, 
         columnWidth : 0.25,
-        decimalPrecision: 8,
-        minValue:0
+        decimalPrecision: 4,
+        minValue:0,
+        renderer: function (v) {
+            var arr = (v + '.').split('.');
+            var xr = (new Array(arr[1].length > 4 ? 4 : arr[1].length)).fill('0');
+            var format = '0,000.' + xr.join('');
+            return Ext.util.Format.number(v, format);
+        }
     },{
         xtype : "numberfield", 
         name : "pr_zxbzs", 
@@ -172,16 +178,28 @@ Ext.define('saas.view.document.product.FormPanel', {
         fieldLabel : "最新采购单价(元)", 
         allowBlank : true, 
         columnWidth : 0.25,
-        decimalPrecision: 8,
-        minValue:0
+        decimalPrecision: 4,
+        minValue:0,
+        renderer: function (v) {
+            var arr = (v + '.').split('.');
+            var xr = (new Array(arr[1].length > 4 ? 4 : arr[1].length)).fill('0');
+            var format = '0,000.' + xr.join('');
+            return Ext.util.Format.number(v, format);
+        }
     },{
         ignore:true,
         readOnly:true,
         xtype : "numberfield", 
         name : "pr_saleprice", 
         fieldLabel : "最新出货单价(元)", 
-        decimalPrecision: 8,
-        minValue:0
+        decimalPrecision: 4,
+        minValue:0,
+        renderer: function (v) {
+            var arr = (v + '.').split('.');
+            var xr = (new Array(arr[1].length > 4 ? 4 : arr[1].length)).fill('0');
+            var format = '0,000.' + xr.join('');
+            return Ext.util.Format.number(v, format);
+        }
     },{  
         hidden:true,
         xtype : "datefield", 

frontend/saas-web/app/view/home/infoCardList/Payment.js

@@ -120,7 +120,7 @@ Ext.define('saas.view.home.infoCardList.Payment', {
         hidden: true,
         renderer: function (v) {
             var arr = (v + '.').split('.');
-            var xr = (new Array(arr[1].length)).fill('0');
+            var xr = (new Array(arr[1].length > 4 ? 4 : arr[1].length)).fill('0');
             var format = '0,000.' + xr.join('');
             return Ext.util.Format.number(v, format);
         },

frontend/saas-web/app/view/home/infoCardList/PurchaseIn.js

@@ -86,7 +86,7 @@ Ext.define('saas.view.home.infoCardList.PurchaseIn', {
         width: 110,
         renderer: function (v) {
             var arr = (v + '.').split('.');
-            var xr = (new Array(arr[1].length > 8 ? 8 : arr[1].length)).fill('0');
+            var xr = (new Array(arr[1].length > 4 ? 4 : arr[1].length)).fill('0');
             var format = '0,000.' + xr.join('');
             return Ext.util.Format.number(v, format);
         }

frontend/saas-web/app/view/home/infoCardList/Recment.js

@@ -111,7 +111,7 @@ Ext.define('saas.view.home.infoCardList.Recment', {
         width: 110,
         renderer : function(v) {
             var arr = (v + '.').split('.');
-            var xr = (new Array(arr[1].length > 8 ? 8 : arr[1].length)).fill('0');
+            var xr = (new Array(arr[1].length > 4 ? 4 : arr[1].length)).fill('0');
             var format = '0.' + xr.join('');
             return Ext.util.Format.number(v, format);
         }
@@ -137,14 +137,14 @@ Ext.define('saas.view.home.infoCardList.Recment', {
             return Ext.util.Format.number(v, '0');
         }
     }, {
-        text: '成本单价',
+        text: '成本单价(元)',
         dataIndex: 'pd_price',
         xtype:'numbercolumn',
         width: 110,
         hidden:true,
         renderer : function(v) {
             var arr = (v + '.').split('.');
-            var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
+            var xr = (new Array(arr[1].length > 4 ? 4 : arr[1].length)).fill('0');
             var format = '0.' + xr.join('');
             return Ext.util.Format.number(v, format);
         }

frontend/saas-web/app/view/home/infoCardList/SaleOut.js

@@ -77,7 +77,7 @@ Ext.define('saas.view.home.infoCardList.SaleOut', {
         width: 110,
         renderer: function (v) {
             var arr = (v + '.').split('.');
-            var xr = (new Array(arr[1].length > 8 ? 8 : arr[1].length)).fill('0');
+            var xr = (new Array(arr[1].length > 4 ? 4 : arr[1].length)).fill('0');
             var format = '0,000.' + xr.join('');
             return Ext.util.Format.number(v, format);
         },

frontend/saas-web/app/view/home/infoCardList/UnauditCheckIn.js

@@ -120,7 +120,7 @@ Ext.define('saas.view.home.infoCardList.UnauditCheckIn', {
         xtype: 'numbercolumn',
         renderer: function (v) {
             var arr = (v + '.').split('.');
-            var xr = (new Array(arr[1].length)).fill('0');
+            var xr = (new Array(arr[1].length > 4 ? 4 : arr[1].length)).fill('0');
             var format = '0,000.' + xr.join('');
             return Ext.util.Format.number(v, format);
         },

frontend/saas-web/app/view/home/infoCardList/UnauditSaleOut.js

@@ -101,14 +101,14 @@ Ext.define('saas.view.home.infoCardList.UnauditSaleOut', {
             return Ext.util.Format.number(v, format);
         }
     }, {
-        text: '销售单价',
+        text: '销售单价(元)',
         dataIndex: 'pd_sendprice',
         xtype:'numbercolumn',
         width: 110,
         hidden:true,
         renderer : function(v) {
             var arr = (v + '.').split('.');
-            var xr = (new Array(arr[1].length > 8 ? 8 : arr[1].length)).fill('0');
+            var xr = (new Array(arr[1].length > 4 ? 4 : arr[1].length)).fill('0');
             var format = '0.' + xr.join('');
             return Ext.util.Format.number(v, format);
         }
@@ -134,14 +134,14 @@ Ext.define('saas.view.home.infoCardList.UnauditSaleOut', {
             return Ext.util.Format.number(v, '0');
         }
     }, {
-        text: '成本单价',
+        text: '成本单价(元)',
         dataIndex: 'pd_price',
         xtype:'numbercolumn',
         width: 110,
         hidden:true,
         renderer : function(v) {
             var arr = (v + '.').split('.');
-            var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
+            var xr = (new Array(arr[1].length > 4 ? 4 : arr[1].length)).fill('0');
             var format = '0.' + xr.join('');
             return Ext.util.Format.number(v, format);
         }

frontend/saas-web/app/view/money/report/CustomerCheck.js

@@ -92,7 +92,7 @@ Ext.define('saas.view.money.report.CustomerCheckCheck', {
         width: 110,
         renderer: function(v) {
             var arr = (v + '.').split('.');
-            var xr = (new Array(arr[1].length > 8 ? 8 : arr[1].length)).fill('0');
+            var xr = (new Array(arr[1].length > 4 ? 4 : arr[1].length)).fill('0');
             var format = '0,000.' + xr.join('');
             return Ext.util.Format.number(v, format);
         }
@@ -132,7 +132,7 @@ Ext.define('saas.view.money.report.CustomerCheckCheck', {
         xtype: 'numbercolumn',
         renderer: function(v) {
             var arr = (v + '.').split('.');
-            var xr = (new Array(arr[1].length > 8 ? 8 : arr[1].length)).fill('0');
+            var xr = (new Array(arr[1].length > 4 ? 4 : arr[1].length)).fill('0');
             var format = '0,000.' + xr.join('');
             return Ext.util.Format.number(v, format);
         }

frontend/saas-web/app/view/money/report/TotalPayDetail.js

@@ -33,7 +33,12 @@ Ext.define('saas.view.money.report.TotalPayDetail', {
         columnWidth: 0.4
     }],
 
-    reportColumns: [{
+    reportColumns: [
+        {
+        text: '期间',
+        dataIndex: 'vm_yearmonth',
+        width: 110,
+        },{
         text: '供应商编号',
         dataIndex: 'vm_vendcode',
         width: 190
@@ -42,10 +47,6 @@ Ext.define('saas.view.money.report.TotalPayDetail', {
         dataIndex: 'vm_vendname',
         width: 210,
     }, {
-        fieldLabel: '期间',
-        dataIndex: 'vm_yearmonth',
-        width: 110,
-    },{
         text: '期初预付',
         xtype: 'numbercolumn',
         exportFormat: 'Amount',

frontend/saas-web/app/view/money/report/TotalRecDetail.js

@@ -33,7 +33,12 @@ Ext.define('saas.view.money.report.TotalRecDetail', {
         columnWidth: 0.4
     }],
 
-    reportColumns: [{
+    reportColumns: [
+    {
+        text: '期间',
+        dataIndex: 'cm_yearmonth',
+        width: 110
+    },{
         text: '客户编号',
         dataIndex: 'cm_custcode',
         width: 190
@@ -41,10 +46,6 @@ Ext.define('saas.view.money.report.TotalRecDetail', {
         text: '客户名称',
         dataIndex: 'cm_custname',
         width: 210,
-    }, {
-        fieldLabel: '期间',
-        dataIndex: 'cm_yearmonth',
-        width: 110
     },{
         text: '期初预收',
         dataIndex: 'cm_beginpreamount',

frontend/saas-web/app/view/money/report/VendorCheck.js

@@ -102,7 +102,7 @@ Ext.define('saas.view.money.report.VendorCheck', {
         width: 110,
         renderer: function(v) {
             var arr = (v + '.').split('.');
-            var xr = (new Array(arr[1].length > 8 ? 8 : arr[1].length)).fill('0');
+            var xr = (new Array(arr[1].length > 4 ? 4 : arr[1].length)).fill('0');
             var format = '0,000.' + xr.join('');
             return Ext.util.Format.number(v, format);
         }
@@ -142,7 +142,7 @@ Ext.define('saas.view.money.report.VendorCheck', {
         width: 150,
         renderer: function(v) {
             var arr = (v + '.').split('.');
-            var xr = (new Array(arr[1].length > 8 ? 8 : arr[1].length)).fill('0');
+            var xr = (new Array(arr[1].length > 4 ? 4 : arr[1].length)).fill('0');
             var format = '0,000.' + xr.join('');
             return Ext.util.Format.number(v, format);
         }

frontend/saas-web/app/view/purchase/purchase/FormPanel.js

@@ -198,12 +198,12 @@ Ext.define('saas.view.purchase.purchase.FormPanel', {
                         width : 110.0,
                         editor : {
                             xtype : "numberfield",
-                            decimalPrecision: 8,
+                            decimalPrecision: 4,
                             minValue:0
                         },
                         renderer : function(v) {
                             var arr = (v + '.').split('.');
-                            var xr = (new Array(arr[1].length > 8 ? 8 :(arr[1].length < 2? 2 : arr[1].length))).fill('0');
+                            var xr = (new Array(arr[1].length > 4 ? 4 :(arr[1].length < 2? 2 : arr[1].length))).fill('0');
                             var format = '0,000.' + xr.join('');
                             return Ext.util.Format.number(v, format);
                         },

frontend/saas-web/app/view/purchase/purchase/QueryPanel.js

@@ -217,7 +217,7 @@ Ext.define('saas.view.purchase.purchase.QueryPanel', {
             width: 110,
             renderer : function(v) {
                 var arr = (v + '.').split('.');
-                var xr = (new Array(arr[1].length > 8 ? 8 : arr[1].length)).fill('0');
+                var xr = (new Array(arr[1].length > 4 ? 4 : arr[1].length)).fill('0');
                 var format = '0,000.' + xr.join('');
                 return Ext.util.Format.number(v, format);
             }

frontend/saas-web/app/view/purchase/purchaseIn/FormPanel.js

@@ -219,14 +219,14 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanel', {
                 width : 110.0,
                 editor : {
                     xtype : "numberfield",
-                    decimalPrecision: 8,
+                    decimalPrecision: 4,
                     minValue:0
                 },
                 dataIndex : "pd_orderprice", 
                 width : 120.0,
                 renderer : function(v) {
                     var arr = (v + '.').split('.');
-                    var xr = (new Array(arr[1].length > 8 ? 8 : arr[1].length)).fill('0');
+                    var xr = (new Array(arr[1].length > 4 ? 4 : arr[1].length)).fill('0');
                     var format = '0,000.' + xr.join('');
                     return Ext.util.Format.number(v, format);
                 },

frontend/saas-web/app/view/purchase/purchaseIn/QueryPanel.js

@@ -225,7 +225,7 @@ Ext.define('saas.view.purchase.purchaseIn.QueryPanel', {
             xtype:'numbercolumn',
             renderer : function(v) {
                 var arr = (v + '.').split('.');
-                var xr = (new Array(arr[1].length)).fill('0');
+                var xr = (new Array(arr[1].length > 4 ? 4 : arr[1].length)).fill('0');
                 var format = '0,000.' + xr.join('');
                 return Ext.util.Format.number(v, format);
             },            

frontend/saas-web/app/view/purchase/purchaseOut/FormPanel.js

@@ -213,14 +213,14 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanel', {
                 width : 110.0,
                 editor : {
                     xtype : "numberfield",
-                    decimalPrecision: 8,
+                    decimalPrecision: 4,
                     minValue:0
                 },
                 dataIndex : "pd_orderprice", 
                 width : 120.0,
                 renderer : function(v) {
                     var arr = (v + '.').split('.');
-                    var xr = (new Array(arr[1].length > 8 ? 8 : arr[1].length)).fill('0');
+                    var xr = (new Array(arr[1].length > 4 ? 4 : arr[1].length)).fill('0');
                     var format = '0,000.' + xr.join('');
                     return Ext.util.Format.number(v, format);
                 },

frontend/saas-web/app/view/purchase/purchaseOut/QueryPanel.js

@@ -248,7 +248,7 @@ Ext.define('saas.view.purchase.purchaseOut.QueryPanel', {
                 xtype:'numbercolumn',
                 renderer : function(v) {
                     var arr = (v + '.').split('.');
-                    var xr = (new Array(arr[1].length)).fill('0');
+                    var xr = (new Array(arr[1].length > 4 ? 4 : arr[1].length)).fill('0');
                     var format = '0,000.' + xr.join('');
                     return Ext.util.Format.number(v, format);
                 },            

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

@@ -122,7 +122,7 @@ Ext.define('saas.view.purchase.report.Purchase', {
         xtype: 'numbercolumn',
         renderer: function(v) {
             var arr = (v + '.').split('.');
-            var xr = (new Array(arr[1].length > 8 ? 8 : arr[1].length)).fill('0');
+            var xr = (new Array(arr[1].length > 4 ? 4 : arr[1].length)).fill('0');
             var format = '0,000.' + xr.join('');
             return Ext.util.Format.number(v, format);
         }
@@ -162,7 +162,7 @@ Ext.define('saas.view.purchase.report.Purchase', {
         xtype: 'numbercolumn',
         renderer: function(v) {
             var arr = (v + '.').split('.');
-            var xr = (new Array(arr[1].length > 8 ? 8 : arr[1].length)).fill('0');
+            var xr = (new Array(arr[1].length > 4 ? 4 : arr[1].length)).fill('0');
             var format = '0,000.' + xr.join('');
             return Ext.util.Format.number(v, format);
         }

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

@@ -123,7 +123,7 @@ Ext.define('saas.view.sale.report.Sale', {
         xtype: 'numbercolumn',
         renderer : function(v) {
             var arr = (v + '.').split('.');
-            var xr = (new Array(arr[1].length > 8 ? 8 : arr[1].length)).fill('0');
+            var xr = (new Array(arr[1].length > 4 ? 4 : arr[1].length)).fill('0');
             var format = '0,000.' + xr.join('');
             return Ext.util.Format.number(v, format);
         }
@@ -135,7 +135,7 @@ Ext.define('saas.view.sale.report.Sale', {
         width: 150,
         renderer : function(v) {
             var arr = (v + '.').split('.');
-            var xr = (new Array(arr[1].length > 8 ? 8 : arr[1].length)).fill('0');
+            var xr = (new Array(arr[1].length > 4 ? 4 : arr[1].length)).fill('0');
             var format = '0,000.' + xr.join('');
             return Ext.util.Format.number(v, format);
         }

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

@@ -100,7 +100,7 @@ Ext.define('saas.view.sale.report.SaleProfit', {
         width: 150,
         renderer: function(v) {
             var arr = (v + '.').split('.');
-            var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
+            var xr = (new Array(arr[1].length > 4 ? 4 : arr[1].length)).fill('0');
             var format = '0,000.' + xr.join('');
             return Ext.util.Format.number(v, format);
         }
@@ -127,12 +127,24 @@ Ext.define('saas.view.sale.report.SaleProfit', {
         text: '不含税单价(元)',
         exportFormat: 'Price',
         dataIndex: 'pd_netprice',
-        xtype: 'numbercolumn'
+        xtype: 'numbercolumn',
+        renderer : function(v) {
+            var arr = (v + '.').split('.');
+            var xr = (new Array(arr[1].length > 4 ? 4 : arr[1].length)).fill('0');
+            var format = '0,000.' + xr.join('');
+            return Ext.util.Format.number(v, format);
+        }
     }, {
-        text: '成本单价',
+        text: '成本单价(元)',
         dataIndex: 'pw_costprice',
         exportFormat: 'Price',
-        xtype: 'numbercolumn'
+        xtype: 'numbercolumn',
+        renderer : function(v) {
+            var arr = (v + '.').split('.');
+            var xr = (new Array(arr[1].length > 4 ? 4 : arr[1].length)).fill('0');
+            var format = '0,000.' + xr.join('');
+            return Ext.util.Format.number(v, format);
+        }
     }, {
         text: '成本金额',
         dataIndex: 'pd_total',

frontend/saas-web/app/view/sale/sale/FormPanel.js

@@ -218,12 +218,12 @@ Ext.define('saas.view.sale.sale.FormPanel', {
                         width : 110.0,
                         editor : {
                             xtype : "numberfield",
-                            decimalPrecision: 8,
+                            decimalPrecision: 4,
                             minValue:0
                         },
                         renderer : function(v) {
                             var arr = (v + '.').split('.');
-                            var xr = (new Array(arr[1].length > 8 ? 8 :(arr[1].length < 2? 2 : arr[1].length))).fill('0');
+                            var xr = (new Array(arr[1].length > 4 ? 4 :(arr[1].length < 2? 2 : arr[1].length))).fill('0');
                             var format = '0,000.' + xr.join('');
                             return Ext.util.Format.number(v, format);
                        }

frontend/saas-web/app/view/sale/sale/QueryPanel.js

@@ -229,7 +229,7 @@ Ext.define('saas.view.sale.sale.QueryPanel', {
             width: 120,
             renderer : function(v) {
                 var arr = (v + '.').split('.');
-                var xr = (new Array(arr[1].length > 8 ? 8 : arr[1].length)).fill('0');
+                var xr = (new Array(arr[1].length > 4 ? 4 : arr[1].length)).fill('0');
                 var format = '0,000.' + xr.join('');
                 return Ext.util.Format.number(v, format);
             },

frontend/saas-web/app/view/sale/saleIn/FormPanel.js

@@ -228,12 +228,12 @@ Ext.define('saas.view.sale.saleIn.FormPanel', {
                 width : 110.0, 
                 editor : {
                     xtype : "numberfield",
-                    decimalPrecision: 8,
+                    decimalPrecision: 4,
                     minValue:0
                 },
                 renderer : function(v) {
                     var arr = (v + '.').split('.');
-                    var xr = (new Array(arr[1].length > 8 ? 8 : arr[1].length)).fill('0');
+                    var xr = (new Array(arr[1].length > 4 ? 4 : arr[1].length)).fill('0');
                     var format = '0,000.' + xr.join('');
                     return Ext.util.Format.number(v, format);
                 },

frontend/saas-web/app/view/sale/saleIn/QueryPanel.js

@@ -243,13 +243,13 @@ Ext.define('saas.view.sale.saleIn.QueryPanel', {
             dataIndex: 'pr_unit',
             width: 80
         }, {
-            text: '销售单价',
+            text: '销售单价(元)',
             dataIndex: 'pd_sendprice',
             xtype:'numbercolumn',
             width: 110,
             renderer : function(v) {
                 var arr = (v + '.').split('.');
-                var xr = (new Array(arr[1].length > 8 ? 8 : arr[1].length)).fill('0');
+                var xr = (new Array(arr[1].length > 4 ? 4 : arr[1].length)).fill('0');
                 var format = '0.' + xr.join('');
                 return Ext.util.Format.number(v, format);
             }
@@ -273,13 +273,13 @@ Ext.define('saas.view.sale.saleIn.QueryPanel', {
                 return Ext.util.Format.number(v, '0');
             }
         }, {
-            text: '成本单价',
+            text: '成本单价(元)',
             dataIndex: 'pd_price',
             xtype:'numbercolumn',
             width: 110,
             renderer : function(v) {
                 var arr = (v + '.').split('.');
-                var xr = (new Array(arr[1].length > 8 ? 8 : arr[1].length)).fill('0');
+                var xr = (new Array(arr[1].length > 4 ? 4 : arr[1].length)).fill('0');
                 var format = '0.' + xr.join('');
                 return Ext.util.Format.number(v, format);
             }

frontend/saas-web/app/view/sale/saleOut/FormPanel.js

@@ -239,12 +239,12 @@ Ext.define('saas.view.sale.saleout.FormPanel', {
                 width : 110.0,
                 editor : {
                     xtype : "numberfield",
-                    decimalPrecision: 8,
+                    decimalPrecision: 4,
                     minValue:0
                 },
                 renderer : function(v) {
                     var arr = (v + '.').split('.');
-                    var xr = (new Array(arr[1].length > 8 ? 8 : arr[1].length)).fill('0');
+                    var xr = (new Array(arr[1].length > 4 ? 4 : arr[1].length)).fill('0');
                     var format = '0,000.' + xr.join('');
                     return Ext.util.Format.number(v, format);
                 },

frontend/saas-web/app/view/sale/saleOut/QueryPanel.js

@@ -235,13 +235,13 @@ Ext.define('saas.view.sale.saleout.QueryPanel', {
             dataIndex: 'pr_unit',
             width: 80
         }, {
-            text: '销售单价',
+            text: '销售单价(元)',
             dataIndex: 'pd_sendprice',
             xtype:'numbercolumn',
             width: 110,
             renderer : function(v) {
                 var arr = (v + '.').split('.');
-                var xr = (new Array(arr[1].length > 8 ? 8 : arr[1].length)).fill('0');
+                var xr = (new Array(arr[1].length > 4 ? 4 : arr[1].length)).fill('0');
                 var format = '0.' + xr.join('');
                 return Ext.util.Format.number(v, format);
             }
@@ -265,13 +265,13 @@ Ext.define('saas.view.sale.saleout.QueryPanel', {
                 return Ext.util.Format.number(v, '0');
             }
         }, {
-            text: '成本单价',
+            text: '成本单价(元)',
             dataIndex: 'pd_price',
             xtype:'numbercolumn',
             width: 110,
             renderer : function(v) {
                 var arr = (v + '.').split('.');
-                var xr = (new Array(arr[1].length > 8 ? 8 : arr[1].length)).fill('0');
+                var xr = (new Array(arr[1].length > 4 ? 4 : arr[1].length)).fill('0');
                 var format = '0.' + xr.join('');
                 return Ext.util.Format.number(v, format);
             }

frontend/saas-web/app/view/stock/make/FormPanel.js

@@ -113,8 +113,14 @@ Ext.define('saas.view.stock.make.FormPanel', {
         fieldLabel : "单价(元)",
         readOnly:true,
         editable:false,
-        decimalPrecision:8,
-        columnWidth: 0.25
+        decimalPrecision:4,
+        columnWidth: 0.25,
+        renderer : function(v) {
+            var arr = (v + '.').split('.');
+            var xr = (new Array(arr[1].length > 4 ? 4 : arr[1].length)).fill('0');
+            var format = '0.' + xr.join('');
+            return Ext.util.Format.number(v, format);
+        }
     },{
         xtype : "numberfield", 
         name : "ma_total",
@@ -250,13 +256,13 @@ Ext.define('saas.view.stock.make.FormPanel', {
                     return v;
                 }
             },{
-                text : "成本单价", 
+                text : "成本单价(元)", 
                 dataIndex : "mm_price", 
                 xtype: 'numbercolumn',
                 width : 110.0,
                 editor : {
                     xtype : "numberfield",
-                    decimalPrecision: 8,
+                    decimalPrecision: 4,
                     minValue:0
                 },
                 listeners:{
@@ -264,8 +270,8 @@ Ext.define('saas.view.stock.make.FormPanel', {
                 },
                 renderer : function(v) {
                     var arr = (v + '.').split('.');
-                    var xr = (new Array(arr[1].length)).fill('0');
-                    var format = '0,000.' + xr.join('');
+                    var xr = (new Array(arr[1].length > 4 ? 4 : arr[1].length)).fill('0');
+                    var format = '0.' + xr.join('');
                     return Ext.util.Format.number(v, format);
                 }
             },

frontend/saas-web/app/view/stock/otherIn/FormPanel.js

@@ -214,15 +214,15 @@ Ext.define('saas.view.stock.otherIn.FormPanel', {
                 width : 110.0,
                 editor : {
                     xtype : "numberfield",
-                    decimalPrecision: 8,
+                    decimalPrecision: 4,
                     minValue:0
                 },
                 renderer : function(v) {
                     var arr = (v + '.').split('.');
-                    var xr = (new Array(arr[1].length)).fill('0');
-                    var format = '0,000.' + xr.join('');
+                    var xr = (new Array(arr[1].length > 4 ? 4 : arr[1].length)).fill('0');
+                    var format = '0.' + xr.join('');
                     return Ext.util.Format.number(v, format);
-                },
+                }
             },{
                 text : "仓库id", 
                 dataIndex : "pd_whid", 

frontend/saas-web/app/view/stock/otherIn/QueryPanel.js

@@ -202,10 +202,10 @@ Ext.define('saas.view.stock.otherIn.QueryPanel', {
             width: 110,
             renderer : function(v) {
                 var arr = (v + '.').split('.');
-                var xr = (new Array(arr[1].length)).fill('0');
-                var format = '0,000.' + xr.join('');
+                var xr = (new Array(arr[1].length > 4 ? 4 : arr[1].length)).fill('0');
+                var format = '0.' + xr.join('');
                 return Ext.util.Format.number(v, format);
-            }         
+            }        
         },{
             text: '仓库',
             dataIndex: 'pd_whname',

frontend/saas-web/app/view/stock/otherOut/FormPanel.js

@@ -198,13 +198,13 @@ Ext.define('saas.view.stock.otherOut.FormPanel', {
                 width : 110.0,
                 editor : {
                     xtype : "numberfield",
-                    decimalPrecision: 8,
+                    decimalPrecision: 4,
                     minValue:0
                 },
                 renderer : function(v) {
                     var arr = (v + '.').split('.');
-                    var xr = (new Array(arr[1].length)).fill('0');
-                    var format = '0,000.' + xr.join('');
+                    var xr = (new Array(arr[1].length > 4 ? 4 : arr[1].length)).fill('0');
+                    var format = '0.' + xr.join('');
                     return Ext.util.Format.number(v, format);
                 }
             },{

frontend/saas-web/app/view/stock/otherOut/QueryPanel.js

@@ -202,10 +202,10 @@ Ext.define('saas.view.stock.otherOut.QueryPanel', {
             width: 110,
             renderer : function(v) {
                 var arr = (v + '.').split('.');
-                var xr = (new Array(arr[1].length)).fill('0');
-                var format = '0,000.' + xr.join('');
+                var xr = (new Array(arr[1].length > 4 ? 4 : arr[1].length)).fill('0');
+                var format = '0.' + xr.join('');
                 return Ext.util.Format.number(v, format);
-            }         
+            }       
         },{
             text: '仓库',
             dataIndex: 'pd_whname',

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

@@ -96,7 +96,7 @@ Ext.define('saas.view.stock.report.DataList', {
         width: 120,
         renderer: function (v) {
             var arr = (v + '.').split('.');
-            var xr = (new Array(arr[1].length > 8 ? 8 : arr[1].length)).fill('0');
+            var xr = (new Array(arr[1].length > 4 ? 4 : arr[1].length)).fill('0');
             var format = '0,000.' + xr.join('');
             return Ext.util.Format.number(v, format);
         }

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

@@ -117,13 +117,13 @@ Ext.define('saas.view.stock.report.Prodiodetail', {
             return Ext.util.Format.number(v, format);
         }
     }, {
-        text: '成本单价',
+        text: '成本单价(元)',
         xtype: 'numbercolumn',
         exportFormat: 'Price',
         dataIndex: 'pd_price',
         renderer: function(v) {
             var arr = (v + '.').split('.');
-            var xr = (new Array(arr[1].length > 8 ? 8 : arr[1].length)).fill('0');
+            var xr = (new Array(arr[1].length > 4 ? 4 : arr[1].length)).fill('0');
             var format = '0,000.' + xr.join('');
             return Ext.util.Format.number(v, format);
         }