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

applications/sale/sale-dto/src/main/java/com/usoftchina/saas/sale/dto/SaleDTO.java

@@ -63,4 +63,6 @@ public class SaleDTO extends CommonBaseDTO{
     private Integer sa_sellerid;
 
     private String sa_currency;
+
+    private Double sa_nettotal;
 }

applications/sale/sale-server/src/main/java/com/usoftchina/saas/sale/po/Sale.java

@@ -62,4 +62,6 @@ public class Sale extends CommonBaseEntity{
     private Integer sa_sellerid;
 
     private String sa_currency;
+
+    private Double sa_nettotal;
 }

applications/sale/sale-server/src/main/java/com/usoftchina/saas/sale/po/SaleList.java

@@ -69,6 +69,8 @@ public class SaleList implements Serializable {
 
     private Integer sa_sellerid;
 
+    private Double sa_nettotal;
+
     private Integer sd_id;
 
     private Integer sd_said;

applications/sale/sale-server/src/main/resources/mapper/SaleListMapper.xml

@@ -9,6 +9,7 @@
         <result column="sa_custname" property="sa_custname" jdbcType="VARCHAR" />
         <result column="sa_toplace" property="sa_toplace" jdbcType="VARCHAR" />
         <result column="sa_total" property="sa_total" jdbcType="DOUBLE" />
+        <result column="sa_nettotal" property="sa_nettotal" jdbcType="DOUBLE" />
         <result column="sa_totalupper" property="sa_totalupper" jdbcType="VARCHAR" />
         <result column="sa_remark" property="sa_remark" jdbcType="VARCHAR" />
         <result column="sa_status" property="sa_status" jdbcType="VARCHAR" />

applications/sale/sale-server/src/main/resources/mapper/SaleMapper.xml

@@ -35,6 +35,7 @@
     <result column="createTime" property="createTime" jdbcType="TIMESTAMP"/>
     <result column="sa_sellerid" property="sa_sellerid" jdbcType="INTEGER" />
     <result column="sa_currency" property="sa_currency" jdbcType="VARCHAR" />
+    <result column="sa_nettotal" property="sa_nettotal" jdbcType="DOUBLE" />
   </resultMap>
   <sql id="Base_Column_List" >
     sa_id, sa_code, sa_custid, sa_custcode, sa_custname, sa_toplace, sa_total, sa_totalupper, 
@@ -155,6 +156,9 @@
       <if test="sa_currency != null">
         sa_currency,
       </if>
+      <if test="sa_nettotal != null">
+        sa_nettotal,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
       <if test="sa_code != null" >
@@ -238,6 +242,9 @@
       <if test="sa_currency != null" >
         #{sa_currency,jdbcType=VARCHAR},
       </if>
+      <if test="sa_nettotal != null" >
+        #{sa_nettotal,jdbcType=DOUBLE},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.usoftchina.saas.sale.po.Sale" >
@@ -330,6 +337,9 @@
       <if test="sa_currency != null" >
         sa_currency = #{sa_currency,jdbcType=VARCHAR},
       </if>
+      <if test="sa_nettotal != null" >
+        sa_nettotal = #{sa_nettotal,jdbcType=DOUBLE},
+      </if>
     </set>
     where sa_id = #{id,jdbcType=INTEGER}
   </update>

framework/core/src/main/java/com/usoftchina/saas/context/SpringContextHolder.java

@@ -42,7 +42,7 @@ public class SpringContextHolder {
      */
     public static String getActiveProfile() {
         Assert.notNull(context, "spring context not ready");
-        return context.getEnvironment().getActiveProfiles()[0];
+        return context.getEnvironment().getActiveProfiles().length > 0 ? context.getEnvironment().getActiveProfiles()[0] : "local-dev";
     }
 
     /**

frontend/saas-web/app/model/purchase/ProdInDetail.js

@@ -16,14 +16,14 @@ Ext.define('saas.model.purchase.ProdInDetail', {
         { name: 'pd_orderprice', type: 'float', // 含税单价
             convert: function(v, rec) {
                 var t = rec.get('pd_netprice') * (1 + rec.get('pd_taxrate') / 100);
-                return saas.util.BaseUtil.numberFormat(t, 4, true);
+                return Number(saas.util.BaseUtil.numberFormat(t, 4, false));
             },
             depends: ['pd_netprice', 'pd_taxrate']
         },
         { name: 'pd_nettotal', type: 'float', // 金额
             convert: function(v, rec) {
                 var t = rec.get('pd_netprice') * rec.get('pd_inqty');
-                return saas.util.BaseUtil.numberFormat(t, 2, true);
+                return Number(saas.util.BaseUtil.numberFormat(t, 2, false));
             },
             depends: ['pd_netprice', 'pd_inqty']
         },
@@ -31,14 +31,14 @@ Ext.define('saas.model.purchase.ProdInDetail', {
         { name: 'pd_taxamount', type: 'float', // 税额
             convert: function(v, rec) {
                 var t = rec.get('pd_ordertotal') - rec.get('pd_nettotal');
-                return saas.util.BaseUtil.numberFormat(t, 2, true);
+                return Number(saas.util.BaseUtil.numberFormat(t, 2, false));
             },
             depends: ['pd_ordertotal', 'pd_nettotal']
         },
         { name: 'pd_ordertotal', type: 'float', // 价税合计
             convert: function(v, rec) {
                 var t = rec.get('pd_orderprice') * rec.get('pd_inqty');
-                return saas.util.BaseUtil.numberFormat(t, 2, true);
+                return Number(saas.util.BaseUtil.numberFormat(t, 2, false));
             },
             depends: ['pd_orderprice', 'pd_inqty']
         },

frontend/saas-web/app/model/purchase/ProdOutDetail.js

@@ -16,14 +16,14 @@ Ext.define('saas.model.purchase.ProdOutDetail', {
         { name: 'pd_orderprice', type: 'float', // 含税单价
             convert: function(v, rec) {
                 var t = rec.get('pd_netprice') * (1 + rec.get('pd_taxrate') / 100);
-                return saas.util.BaseUtil.numberFormat(t, 4, true);
+                return Number(saas.util.BaseUtil.numberFormat(t, 4, false));
             },
             depends: ['pd_netprice', 'pd_taxrate']
         },
         { name: 'pd_nettotal', type: 'float', // 金额
             convert: function(v, rec) {
                 var t = rec.get('pd_netprice') * rec.get('pd_outqty');
-                return saas.util.BaseUtil.numberFormat(t, 2, true);
+                return Number(saas.util.BaseUtil.numberFormat(t, 2, false));
             },
             depends: ['pd_netprice', 'pd_outqty']
         },
@@ -31,14 +31,14 @@ Ext.define('saas.model.purchase.ProdOutDetail', {
         { name: 'pd_taxamount', type: 'float', // 税额
             convert: function(v, rec) {
                 var t = rec.get('pd_ordertotal') - rec.get('pd_nettotal');
-                return saas.util.BaseUtil.numberFormat(t, 2, true);
+                return Number(saas.util.BaseUtil.numberFormat(t, 2, false));
             },
             depends: ['pd_ordertotal', 'pd_nettotal']
         },
         { name: 'pd_ordertotal', type: 'float', // 价税合计
             convert: function(v, rec) {
                 var t = rec.get('pd_orderprice') * rec.get('pd_outqty');
-                return saas.util.BaseUtil.numberFormat(t, 2, true);
+                return Number(saas.util.BaseUtil.numberFormat(t, 2, false));
             },
             depends: ['pd_orderprice', 'pd_outqty']
         },

frontend/saas-web/app/model/purchase/purchasedetail.js

@@ -16,14 +16,14 @@ Ext.define('saas.model.purchase.Purchasedetail', {
         { name: 'pd_price', type: 'float', // 含税单价
             convert: function(v, rec) {
                 var t = rec.get('pd_taxprice') * (1 + rec.get('pd_taxrate') / 100);
-                return saas.util.BaseUtil.numberFormat(t, 4, true);
+                return Number(saas.util.BaseUtil.numberFormat(t, 4, false));
             },
             depends: ['pd_taxprice', 'pd_taxrate']
         },
         { name: 'pd_taxtotal', type: 'float', // 金额
             convert: function(v, rec) {
                 var t = rec.get('pd_taxprice') * rec.get('pd_qty');
-                return saas.util.BaseUtil.numberFormat(t, 2, true);
+                return Number(saas.util.BaseUtil.numberFormat(t, 2, false));
             },
             depends: ['pd_taxprice', 'pd_qty']
         },
@@ -31,14 +31,14 @@ Ext.define('saas.model.purchase.Purchasedetail', {
         { name: 'pd_taxamount', type: 'float', // 税额
             convert: function(v, rec) {
                 var t = rec.get('pd_total') - rec.get('pd_taxtotal');
-                return saas.util.BaseUtil.numberFormat(t, 2, true);
+                return Number(saas.util.BaseUtil.numberFormat(t, 2, false));
             },
             depends: ['pd_total', 'pd_taxtotal']
         },
         { name: 'pd_total', type: 'float', // 价税合计
             convert: function(v, rec) {
                 var t = rec.get('pd_price') * rec.get('pd_qty');
-                return saas.util.BaseUtil.numberFormat(t, 2, true);
+                return Number(saas.util.BaseUtil.numberFormat(t, 2, false));
             },
             depends: ['pd_price', 'pd_qty']
         },

frontend/saas-web/app/model/sale/SaleInDetail.js

@@ -16,14 +16,14 @@ Ext.define('saas.model.sale.SaleInDetail', {
         { name: 'pd_sendprice', type: 'float', // 含税单价
             convert: function(v, rec) {
                 var t = rec.get('pd_netprice') * (1 + rec.get('pd_taxrate') / 100);
-                return saas.util.BaseUtil.numberFormat(t, 4, true);
+                return Number(saas.util.BaseUtil.numberFormat(t, 4, false));
             },
             depends: ['pd_netprice', 'pd_taxrate']
         },
         { name: 'pd_nettotal', type: 'float', // 金额
             convert: function(v, rec) {
                 var t = rec.get('pd_netprice') * rec.get('pd_inqty');
-                return saas.util.BaseUtil.numberFormat(t, 2, true);
+                return Number(saas.util.BaseUtil.numberFormat(t, 2, false));
             },
             depends: ['pd_netprice', 'pd_inqty']
         },
@@ -31,14 +31,14 @@ Ext.define('saas.model.sale.SaleInDetail', {
         { name: 'pd_taxamount', type: 'float', // 税额
             convert: function(v, rec) {
                 var t = rec.get('pd_ordertotal') - rec.get('pd_nettotal');
-                return saas.util.BaseUtil.numberFormat(t, 2, true);
+                return Number(saas.util.BaseUtil.numberFormat(t, 2, false));
             },
             depends: ['pd_ordertotal', 'pd_nettotal']
         },
         { name: 'pd_ordertotal', type: 'float',// 价税合计
             convert: function(v, rec) {
                 var t = rec.get('pd_sendprice') * rec.get('pd_inqty');
-                return saas.util.BaseUtil.numberFormat(t, 2, true);
+                return Number(saas.util.BaseUtil.numberFormat(t, 2, false));
             },
             depends: ['pd_sendprice', 'pd_inqty']
         },
@@ -46,7 +46,7 @@ Ext.define('saas.model.sale.SaleInDetail', {
         { name: 'pd_whcode', type: 'string' }, // 仓库编号
         { name: 'pd_whname', type: 'string' }, // 仓库
         { name: 'pd_sdid', type: 'int' }, // 销售订单明细id
-        { name: 'pd_ordercode', type: 'int' }, // 销售单号
+        { name: 'pd_ordercode', type: 'string' }, // 销售单号
         { name: 'pd_orderdetno', type: 'int' }, // 销售序号
         { name: 'pd_remark', type: 'string' }, // 备注
     ],

frontend/saas-web/app/model/sale/SaleOutDetail.js

@@ -20,28 +20,28 @@ Ext.define('saas.model.sale.SaleOutDetail', {
         { name: 'pd_sendprice', type: 'float', // 含税单价
             convert: function(v, rec) {
                 var t = rec.get('pd_netprice') * (1 + rec.get('pd_taxrate') / 100);
-                return saas.util.BaseUtil.numberFormat(t, 4, true);
+                return Number(saas.util.BaseUtil.numberFormat(t, 4, false));
             },
             depends: ['pd_netprice', 'pd_taxrate']
         },
         { name: 'pd_nettotal', type: 'float', // 金额
             convert: function(v, rec) {
                 var t = rec.get('pd_netprice') * rec.get('pd_outqty');
-                return saas.util.BaseUtil.numberFormat(t, 2, true);
+                return Number(saas.util.BaseUtil.numberFormat(t, 2, false));
             },
             depends: ['pd_netprice', 'pd_outqty']
         },
         { name: 'pd_ordertotal', type: 'float', // 价税合计
             convert: function(v, rec) {
                 var t = rec.get('pd_sendprice') * rec.get('pd_outqty');
-                return saas.util.BaseUtil.numberFormat(t, 2, true);
+                return Number(saas.util.BaseUtil.numberFormat(t, 2, false));
             },
             depends: ['pd_sendprice', 'pd_outqty']
         },
         { name: 'pd_taxamount', type: 'float', // 税额
             convert: function(v, rec) {
                 var t = rec.get('pd_ordertotal') - rec.get('pd_nettotal');
-                return saas.util.BaseUtil.numberFormat(t, 2, true);
+                return Number(saas.util.BaseUtil.numberFormat(t, 2, false));
             },
             depends: ['pd_ordertotal', 'pd_nettotal']
         },

frontend/saas-web/app/model/sale/Saledetail.js

@@ -16,14 +16,14 @@ Ext.define('saas.model.sale.Saledetail', {
         { name: 'sd_price', type: 'float', // 含税单价
             convert: function(v, rec) {
                 var t = rec.get('sd_netprice') * (1 + rec.get('sd_taxrate') / 100);
-                return saas.util.BaseUtil.numberFormat(t, 4, true);
+                return Number(saas.util.BaseUtil.numberFormat(t, 4, false));
             },
             depends: ['sd_netprice', 'sd_taxrate']
         },
         { name: 'sd_nettotal', type: 'float', // 金额
             convert: function(v, rec) {
                 var t = rec.get('sd_netprice') * rec.get('sd_qty');
-                return saas.util.BaseUtil.numberFormat(t, 2, true);
+                return Number(saas.util.BaseUtil.numberFormat(t, 2, false));
             },
             depends: ['sd_netprice', 'sd_qty']
         },
@@ -31,14 +31,14 @@ Ext.define('saas.model.sale.Saledetail', {
         { name: 'sd_taxamount', type: 'float', // 税额
             convert: function(v, rec) {
                 var t = rec.get('sd_total') - rec.get('sd_nettotal');
-                return saas.util.BaseUtil.numberFormat(t, 2, true);
+                return Number(saas.util.BaseUtil.numberFormat(t, 2, false));
             },
             depends: ['sd_total', 'sd_nettotal']
         },
         { name: 'sd_total', type: 'float',// 价税合计
             convert: function(v, rec) {
                 var t = rec.get('sd_price') * rec.get('sd_qty');
-                return saas.util.BaseUtil.numberFormat(t, 2, true);
+                return Number(saas.util.BaseUtil.numberFormat(t, 2, false));
             },
             depends: ['sd_price', 'sd_qty']
         },

frontend/saas-web/app/view/core/query/QueryGridPanel.js

@@ -135,8 +135,10 @@ Ext.define('saas.view.core.query.QueryGridPanel', {
 
                         if(mode=="MAIN"){
                             me.reconfigure(store, me.initColumns(me.baseColumn));
+                            me.applyScrollable(true)
                         }else{
                             me.reconfigure(store, me.initColumns(me.relativeColumn));
+                            me.applyScrollable(true)
                         }
                     }
                 }

frontend/saas-web/app/view/core/report/ReportPanel.scss

@@ -18,6 +18,9 @@ $border-color: #999;
 
                     .x-column-header-text-inner {
                         font-weight: bold;
+                        &:after {
+                            display: none;
+                        }
                     }
                 }
             }

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

@@ -110,7 +110,7 @@ Ext.define('saas.view.document.product.BasePanel', {
                 return Ext.util.Format.number(v, format);
             }
         }, {
-            text : "标准定价(元)", 
+            text : "标准单价(元)", 
             dataIndex : "pr_standardprice",
             xtype: 'numbercolumn',
             width : 120.0,
@@ -132,7 +132,7 @@ Ext.define('saas.view.document.product.BasePanel', {
                 return Ext.util.Format.number(v, format);
             }
         }, {
-            text : "最新售价(元)", 
+            text : "最新出货单价(元)", 
             dataIndex : "pr_saleprice",
             xtype: 'numbercolumn',
             width : 120.0,

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

@@ -155,7 +155,8 @@ Ext.define('saas.view.document.product.FormPanel', {
         xtype : "textfield", 
         name : "pr_whname", 
         fieldLabel : "仓库名称", 
-        allowBlank : true, 
+        allowBlank : true,
+        readOnly: true,
         columnWidth : 0.25
     },{
         xtype : "hidden", 

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

@@ -206,7 +206,7 @@ Ext.define('saas.view.purchase.purchase.FormPanel', {
                             var r = grid.getSelection()[0],
                                 pd_taxrate = r.get('pd_taxrate');
                             var v = value / (1 + pd_taxrate / 100);
-                            r.set('pd_taxprice', saas.util.BaseUtil.numberFormat(v, 4, true));
+                            r.set('pd_taxprice', Number(saas.util.BaseUtil.numberFormat(v, 4, false)));
                         }
                     }
                 }, {
@@ -236,7 +236,7 @@ Ext.define('saas.view.purchase.purchase.FormPanel', {
                         return Ext.util.Format.number(v, '0');
                     }
                 }, {
-                    text: "税额",
+                    text: "税额(元)",
                     xtype: 'numbercolumn',
                     dataIndex: "pd_taxamount",
                     width: 120,

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

@@ -234,11 +234,11 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanel', {
                     var r = grid.getSelection()[0],
                         pd_taxrate = r.get('pd_taxrate');
                     var v = value / (1 + pd_taxrate / 100);
-                    r.set('pd_netprice', saas.util.BaseUtil.numberFormat(v, 4, true));
+                    r.set('pd_netprice', Number(saas.util.BaseUtil.numberFormat(v, 4, false)));
                 }
             }
         }, {
-            text: "金额",
+            text: "金额(元)",
             xtype: 'numbercolumn',
             dataIndex: "pd_nettotal",
             width: 120,
@@ -264,7 +264,7 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanel', {
                 return Ext.util.Format.number(v, '0');
             },
         }, {
-            text: "税额",
+            text: "税额(元)",
             xtype: 'numbercolumn',
             dataIndex: "pd_taxamount",
             width: 120,
@@ -276,7 +276,7 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanel', {
                 return saas.util.BaseUtil.numberFormat(v, 2, true);
             }
         }, {
-            text: "价税合计",
+            text: "价税合计(元)",
             xtype: 'numbercolumn',
             dataIndex: "pd_ordertotal",
             width: 120,

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

@@ -227,11 +227,11 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanel', {
                     var r = grid.getSelection()[0],
                         pd_taxrate = r.get('pd_taxrate');
                     var v = value / (1 + pd_taxrate / 100);
-                    r.set('pd_netprice', saas.util.BaseUtil.numberFormat(v, 4, true));
+                    r.set('pd_netprice', Number(saas.util.BaseUtil.numberFormat(v, 4, false)));
                 }
             }
         }, {
-            text: "金额",
+            text: "金额(元)",
             xtype: 'numbercolumn',
             dataIndex: "pd_nettotal",
             width: 120,
@@ -257,7 +257,7 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanel', {
                 return Ext.util.Format.number(v, '0');
             },
         }, {
-            text: "税额",
+            text: "税额(元)",
             xtype: 'numbercolumn',
             dataIndex: "pd_taxamount",
             width: 120,
@@ -269,7 +269,7 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanel', {
                 return saas.util.BaseUtil.numberFormat(v, 2, true);
             }
         }, {
-            text: "价税合计",
+            text: "价税合计(元)",
             xtype: 'numbercolumn',
             dataIndex: "pd_ordertotal",
             width: 120,

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

@@ -231,7 +231,7 @@ Ext.define('saas.view.sale.sale.FormPanel', {
                             var r = grid.getSelection()[0],
                                 sd_taxrate = r.get('sd_taxrate');
                             var v = value / (1 + sd_taxrate / 100);
-                            r.set('sd_netprice', saas.util.BaseUtil.numberFormat(v, 4, true));
+                            r.set('sd_netprice', Number(saas.util.BaseUtil.numberFormat(v, 4, false)));
                         }
                     }
                 }, {
@@ -261,7 +261,7 @@ Ext.define('saas.view.sale.sale.FormPanel', {
                         return Ext.util.Format.number(v, '0');
                     }
                 }, {
-                    text: "税额",
+                    text: "税额(元)",
                     xtype: 'numbercolumn',
                     dataIndex: "sd_taxamount",
                     width: 120,

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

@@ -246,11 +246,11 @@ Ext.define('saas.view.sale.saleIn.FormPanel', {
                         var r = grid.getSelection()[0],
                         pd_taxrate = r.get('pd_taxrate');
                         var v = value / (1 + pd_taxrate / 100);
-                        r.set('pd_netprice', saas.util.BaseUtil.numberFormat(v, 4, true));
+                        r.set('pd_netprice', Number(saas.util.BaseUtil.numberFormat(v, 4, false)));
                     }
                 }
             }, {
-                text : "金额", 
+                text : "金额(元)", 
                 xtype: 'numbercolumn',
                 dataIndex : "pd_nettotal", 
                 width : 120, 
@@ -276,7 +276,7 @@ Ext.define('saas.view.sale.saleIn.FormPanel', {
                     return Ext.util.Format.number(v, '0');
                 },
             }, {
-                text: "税额",
+                text: "税额(元)",
                 xtype: 'numbercolumn',
                 dataIndex: "pd_taxamount",
                 width: 120,
@@ -288,7 +288,7 @@ Ext.define('saas.view.sale.saleIn.FormPanel', {
                     return saas.util.BaseUtil.numberFormat(v, 2, true);
                 }
             }, {
-                text : "价税合计", 
+                text : "价税合计(元)", 
                 xtype: 'numbercolumn',
                 dataIndex : "pd_ordertotal", 
                 width : 120, 

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

@@ -243,7 +243,7 @@ Ext.define('saas.view.sale.saleIn.QueryPanel', {
             dataIndex: 'pr_unit',
             width: 80
         }, {
-            text: '销售单价(元)',
+            text: '出货单价(元)',
             dataIndex: 'pd_sendprice',
             xtype:'numbercolumn',
             width: 140,

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

@@ -253,11 +253,11 @@ Ext.define('saas.view.sale.saleout.FormPanel', {
                     var r = grid.getSelection()[0],
                         pd_taxrate = r.get('pd_taxrate');
                     var v = value / (1 + pd_taxrate / 100);
-                    r.set('pd_netprice', saas.util.BaseUtil.numberFormat(v, 4, true));
+                    r.set('pd_netprice', Number(saas.util.BaseUtil.numberFormat(v, 4, false)));
                 }
             }
         }, {
-            text: "金额",
+            text: "金额(元)",
             xtype: 'numbercolumn',
             dataIndex: "pd_nettotal",
             width: 120,
@@ -283,7 +283,7 @@ Ext.define('saas.view.sale.saleout.FormPanel', {
                 return Ext.util.Format.number(v, '0');
             }
         }, {
-            text: "税额",
+            text: "税额(元)",
             xtype: 'numbercolumn',
             dataIndex: "pd_taxamount",
             width: 120,
@@ -295,7 +295,7 @@ Ext.define('saas.view.sale.saleout.FormPanel', {
                 return saas.util.BaseUtil.numberFormat(v, 2, true);
             }
         }, {
-            text: "价税合计",
+            text: "价税合计(元)",
             xtype: 'numbercolumn',
             dataIndex: "pd_ordertotal",
             width: 120,

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

@@ -235,7 +235,7 @@ Ext.define('saas.view.sale.saleout.QueryPanel', {
             dataIndex: 'pr_unit',
             width: 80
         }, {
-            text: '销售单价(元)',
+            text: '出货单价(元)',
             dataIndex: 'pd_sendprice',
             xtype:'numbercolumn',
             width: 140,

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

@@ -98,6 +98,7 @@ Ext.define('saas.view.stock.make.FormPanel', {
         fieldLabel : "数量",
         columnWidth: 0.25,
         allowBlank : false,
+        decimalPrecision:3,
         vtype: 'positiveNumber',
     },{
         xtype : "hidden", 

frontend/saas-web/app/view/sys/account/AddWindow.js

@@ -106,8 +106,8 @@ Ext.define('saas.view.sys.account.AddWindow', {
                 xtype:'textfield',
                 fieldLabel: '真实姓名',
                 name: 'realname',
-                regex:/^[\u4e00-\u9fa5]+$/,
-                regexText:'请输入汉字',
+                // regex:/^[\u4e00-\u9fa5]+$/,
+                // regexText:'请输入汉字',
                 allowBlank:false,
                 maxLength: 30,
                 columnWidth:0.5