Merge remote-tracking branch 'origin/dev' into dev

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

@@ -27,7 +27,7 @@
         and  companyId = #{companyId}
       </if>
     </where>
-    order by date desc
+    order by date, bankid desc
   </select>
 
 </mapper>

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

@@ -241,7 +241,7 @@
       <if test="companyId != null">
         and   Fundtransfer.companyId = #{companyId}
       </if>
-    </where>  order by ft_id
+    </where>  order by ft_date desc
   </select>
 
   <select id="selectFundtransferListByCondition" resultMap="BaseResultMap">
@@ -256,6 +256,6 @@
       <if test="companyId != null">
         and   fundtransfer.companyId = #{companyId}
       </if>
-    </where>  order by ft_id
+    </where>  order by ft_date desc
   </select>
 </mapper>

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

@@ -75,9 +75,9 @@
       <if test="ftd_detno != null" >
         ftd_detno,
       </if>
-      <if test="ftd_ym != null" >
-        ftd_ym,
-      </if>
+      <!--<if test="ft_date != null" >-->
+        <!--ftd_ym,-->
+      <!--</if>-->
       <if test="ftd_bankid != null" >
         ftd_bankid,
       </if>
@@ -140,9 +140,9 @@
       <if test="ftd_detno != null" >
         #{ftd_detno,jdbcType=INTEGER},
       </if>
-      <if test="ftd_ym != null" >
-        #{ftd_ym,jdbcType=INTEGER},
-      </if>
+      <!--<if test="ft_date != null" >-->
+        <!--CONVERT(date_format(#{ft_date,jdbcType=TIMESTAMP},'%Y%m'),SIGNED),-->
+      <!--</if>-->
       <if test="ftd_bankid != null" >
         #{ftd_bankid,jdbcType=INTEGER},
       </if>

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

@@ -326,7 +326,7 @@
       <if test="companyId != null">
         and   othreceipts.companyId = #{companyId}
       </if>
-    </where>  order by or_id
+    </where>  order by or_date desc
   </select>
 
   <select id="selectOthreceiptsListByCondition" resultMap="BaseResultMap">
@@ -341,6 +341,6 @@
       <if test="companyId != null">
         and   othreceipts.companyId = #{companyId}
       </if>
-    </where>  order by or_id
+    </where>  order by or_date desc
   </select>
 </mapper>

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

@@ -62,9 +62,9 @@
       <if test="ord_detno != null" >
         ord_detno,
       </if>
-      <if test="ord_ym != null" >
-        ord_ym,
-      </if>
+      <!--<if test="or_date != null" >-->
+        <!--ord_ym,-->
+      <!--</if>-->
       <if test="ord_type != null" >
         ord_type,
       </if>
@@ -106,9 +106,9 @@
       <if test="ord_detno != null" >
         #{ord_detno,jdbcType=INTEGER},
       </if>
-      <if test="ord_ym != null" >
-        #{ord_ym,jdbcType=INTEGER},
-      </if>
+      <!--<if test="or_date != null" >-->
+        <!--CONVERT(date_format(#{or_date,jdbcType=TIMESTAMP},'%Y%m'),SIGNED),-->
+      <!--</if>-->
       <if test="ord_type != null" >
         #{ord_type,jdbcType=VARCHAR},
       </if>

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

@@ -321,7 +321,7 @@
       <if test="companyId != null">
         and   othspendings.companyId = #{companyId}
       </if>
-    </where>  order by os_id
+    </where>  order by os_date desc
   </select>
 
   <select id="selectOthspendingsListByCondition" resultMap="BaseResultMap">
@@ -336,6 +336,6 @@
       <if test="companyId != null">
         and   othspendings.companyId = #{companyId}
       </if>
-    </where>  order by os_id
+    </where>  order by os_date desc
   </select>
 </mapper>

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

@@ -62,9 +62,9 @@
       <if test="osd_detno != null" >
         osd_detno,
       </if>
-      <if test="osd_ym != null" >
-        osd_ym,
-      </if>
+      <!--<if test="os_date != null" >-->
+        <!--osd_ym,-->
+      <!--</if>-->
       <if test="osd_type != null" >
         osd_type,
       </if>
@@ -106,9 +106,9 @@
       <if test="osd_detno != null" >
         #{osd_detno,jdbcType=INTEGER},
       </if>
-      <if test="osd_ym != null" >
-        #{osd_ym,jdbcType=INTEGER},
-      </if>
+      <!--<if test="os_date != null" >-->
+        <!--CONVERT(date_format(#{os_date,jdbcType=TIMESTAMP},'%Y%m'),SIGNED),-->
+      <!--</if>-->
       <if test="osd_type != null" >
         #{osd_type,jdbcType=VARCHAR},
       </if>

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

@@ -424,7 +424,7 @@
       <if test="companyId != null">
         and   paybalance.companyId = #{companyId}
       </if>
-    </where>  order by pb_id
+    </where>  order by pb_date desc
   </select>
 
   <select id="selectPaybalanceListByCondition" resultMap="BaseResultMap">
@@ -439,7 +439,7 @@
       <if test="companyId != null">
         and   paybalance.companyId = #{companyId}
       </if>
-    </where>  order by pb_id
+    </where>  order by pb_date desc
   </select>
 
   <select id="validateCodeWhenInsert" resultType="int">

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

@@ -6,6 +6,7 @@
     <result column="pd_pbid" property="pd_pbid" jdbcType="INTEGER" />
     <result column="pd_detno" property="pd_detno" jdbcType="INTEGER" />
     <result column="pd_ym" property="pd_ym" jdbcType="INTEGER" />
+    <result column="pb_date" property="pb_date" jdbcType="TIMESTAMP" />
     <result column="pd_bankid" property="pd_bankid" jdbcType="INTEGER" />
     <result column="pd_bankcode" property="pd_bankcode" jdbcType="VARCHAR" />
     <result column="pd_bankname" property="pd_bankname" jdbcType="VARCHAR" />
@@ -70,9 +71,9 @@
       <if test="pd_detno != null" >
         pd_detno,
       </if>
-      <if test="pd_ym != null" >
-        pd_ym,
-      </if>
+      <!--<if test="pb_date != null" >-->
+        <!--pd_ym,-->
+      <!--</if>-->
       <if test="pd_bankid != null" >
         pd_bankid,
       </if>
@@ -126,9 +127,9 @@
       <if test="pd_detno != null" >
         #{pd_detno,jdbcType=INTEGER},
       </if>
-      <if test="pd_ym != null" >
-        #{pd_ym,jdbcType=INTEGER},
-      </if>
+      <!--<if test="pb_date != null" >-->
+        <!--CONVERT(date_format(#{pb_date,jdbcType=TIMESTAMP},'%Y%m'),SIGNED),-->
+      <!--</if>-->
       <if test="pd_bankid != null" >
         #{pd_bankid,jdbcType=INTEGER},
       </if>
@@ -185,8 +186,8 @@
       <if test="pd_detno != null" >
         pd_detno = #{pd_detno,jdbcType=INTEGER},
       </if>
-      <if test="pd_ym != null" >
-        pd_ym = #{pd_ym,jdbcType=INTEGER},
+      <if test="pb_date != null" >
+        pd_ym = CONVERT(date_format(#{pb_date,jdbcType=TIMESTAMP},'%Y%m'),SIGNED),
       </if>
       <if test="pd_bankid != null" >
         pd_bankid = #{pd_bankid,jdbcType=INTEGER},

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

@@ -6,6 +6,7 @@
     <result column="pbd_pbid" property="pbd_pbid" jdbcType="INTEGER" />
     <result column="pbd_detno" property="pbd_detno" jdbcType="INTEGER" />
     <result column="pbd_ym" property="pbd_ym" jdbcType="INTEGER" />
+    <result column="pb_date" property="pb_date" jdbcType="TIMESTAMP" />
     <result column="pbd_slid" property="pbd_slid" jdbcType="INTEGER" />
     <result column="pbd_slcode" property="pbd_slcode" jdbcType="VARCHAR" />
     <result column="pbd_slkind" property="pbd_slkind" jdbcType="VARCHAR" />
@@ -68,9 +69,9 @@
       <if test="pbd_detno != null" >
         pbd_detno,
       </if>
-      <if test="pbd_ym != null" >
-        pbd_ym,
-      </if>
+      <!--<if test="pb_date != null" >-->
+        <!--pbd_ym,-->
+      <!--</if>-->
       <if test="pbd_slid != null" >
         pbd_slid,
       </if>
@@ -124,9 +125,9 @@
       <if test="pbd_detno != null" >
         #{pbd_detno,jdbcType=INTEGER},
       </if>
-      <if test="pbd_ym != null" >
-        #{pbd_ym,jdbcType=INTEGER},
-      </if>
+      <!--<if test="pb_date != null" >-->
+        <!--CONVERT(date_format(#{pb_date,jdbcType=TIMESTAMP},'%Y%m'),SIGNED),-->
+      <!--</if>-->
       <if test="pbd_slid != null" >
         #{pbd_slid,jdbcType=INTEGER},
       </if>
@@ -183,8 +184,8 @@
       <if test="pbd_detno != null" >
         pbd_detno = #{pbd_detno,jdbcType=INTEGER},
       </if>
-      <if test="pbd_ym != null" >
-        pbd_ym = #{pbd_ym,jdbcType=INTEGER},
+      <if test="pb_date != null" >
+        pbd_ym = CONVERT(date_format(#{pb_date,jdbcType=TIMESTAMP},'%Y%m'),SIGNED),
       </if>
       <if test="pbd_slid != null" >
         pbd_slid = #{pbd_slid,jdbcType=INTEGER},

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

@@ -126,7 +126,7 @@
       <if test="companyId != null">
         and   recbalance.companyId = #{companyId}
       </if>
-    </where>  order by rb_id
+    </where>  order by rb_date desc
   </select>
 
   <select id="selectRecbalanceListByCondition" resultMap="BaseResultMap">
@@ -141,7 +141,7 @@
       <if test="companyId != null">
         and   recbalance.companyId = #{companyId}
       </if>
-    </where>  order by rb_id
+    </where>  order by rb_date desc
   </select>
 
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">

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

@@ -6,6 +6,7 @@
     <result column="rd_rbid" jdbcType="INTEGER" property="rd_rbid" />
     <result column="rd_detno" jdbcType="INTEGER" property="rd_detno" />
     <result column="rd_ym" jdbcType="INTEGER" property="rd_ym" />
+    <result column="pb_date" property="pb_date" jdbcType="TIMESTAMP" />
     <result column="rd_bankid" jdbcType="INTEGER" property="rd_bankid" />
     <result column="rd_bankcode" jdbcType="VARCHAR" property="rd_bankcode" />
     <result column="rd_bankname" jdbcType="VARCHAR" property="rd_bankname" />
@@ -126,9 +127,9 @@
       <if test="rd_detno != null">
         rd_detno,
       </if>
-      <if test="rd_ym != null">
-        rd_ym,
-      </if>
+      <!--<if test="pb_date != null">-->
+        <!--rd_ym,-->
+      <!--</if>-->
       <if test="rd_bankid != null">
         rd_bankid,
       </if>
@@ -182,9 +183,9 @@
       <if test="rd_detno != null">
         #{rd_detno,jdbcType=INTEGER},
       </if>
-      <if test="rd_ym != null">
-        #{rd_ym,jdbcType=INTEGER},
-      </if>
+      <!--<if test="pb_date != null">-->
+        <!--CONVERT(date_format(#{pb_date,jdbcType=TIMESTAMP},'%Y%m'),SIGNED),-->
+      <!--</if>-->
       <if test="rd_bankid != null">
         #{rd_bankid,jdbcType=INTEGER},
       </if>
@@ -241,8 +242,8 @@
       <if test="rd_detno != null">
         rd_detno = #{rd_detno,jdbcType=INTEGER},
       </if>
-      <if test="rd_ym != null">
-        rd_ym = #{rd_ym,jdbcType=INTEGER},
+      <if test="pb_date != null">
+        rd_ym = CONVERT(date_format(#{pb_date,jdbcType=TIMESTAMP},'%Y%m'),SIGNED),
       </if>
       <if test="rd_bankid != null">
         rd_bankid = #{rd_bankid,jdbcType=INTEGER},

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

@@ -6,6 +6,7 @@
     <result column="rbd_rbid" property="rbd_rbid" jdbcType="INTEGER" />
     <result column="rbd_detno" property="rbd_detno" jdbcType="INTEGER" />
     <result column="rbd_ym" property="rbd_ym" jdbcType="INTEGER" />
+    <result column="pb_date" property="pb_date" jdbcType="TIMESTAMP" />
     <result column="rbd_slid" property="rbd_slid" jdbcType="INTEGER" />
     <result column="rbd_slcode" property="rbd_slcode" jdbcType="VARCHAR" />
     <result column="rbd_slkind" property="rbd_slkind" jdbcType="VARCHAR" />
@@ -68,9 +69,9 @@
       <if test="rbd_detno != null" >
         rbd_detno,
       </if>
-      <if test="rbd_ym != null" >
-        rbd_ym,
-      </if>
+      <!--<if test="pb_date != null" >-->
+        <!--rbd_ym,-->
+      <!--</if>-->
       <if test="rbd_slid != null" >
         rbd_slid,
       </if>
@@ -124,9 +125,9 @@
       <if test="rbd_detno != null" >
         #{rbd_detno,jdbcType=INTEGER},
       </if>
-      <if test="rbd_ym != null" >
-        #{rbd_ym,jdbcType=INTEGER},
-      </if>
+      <!--<if test="pb_date != null" >-->
+        <!--CONVERT(date_format(#{pb_date,jdbcType=TIMESTAMP},'%Y%m'),SIGNED),-->
+      <!--</if>-->
       <if test="rbd_slid != null" >
         #{rbd_slid,jdbcType=INTEGER},
       </if>
@@ -183,8 +184,8 @@
       <if test="rbd_detno != null" >
         rbd_detno = #{rbd_detno,jdbcType=INTEGER},
       </if>
-      <if test="rbd_ym != null" >
-        rbd_ym = #{rbd_ym,jdbcType=INTEGER},
+      <if test="pb_date != null" >
+        rbd_ym = CONVERT(date_format(#{pb_date,jdbcType=TIMESTAMP},'%Y%m'),SIGNED),
       </if>
       <if test="rbd_slid != null" >
         rbd_slid = #{rbd_slid,jdbcType=INTEGER},

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

@@ -238,7 +238,7 @@
       <if test="companyId != null">
         and   subledger.companyId = #{companyId}
       </if>
-    </where>  order by sl_id
+    </where>  order by sl_date desc
   </select>
 
   <select id="selectCode" parameterType="java.lang.String" resultMap="BaseResultMap">

applications/purchase/purchase-server/src/main/java/com/usoftchina/saas/purchase/po/PurchaseList.java

@@ -118,5 +118,33 @@ public class PurchaseList extends CommonBaseEntity implements Serializable {
 
     private Double pd_yqty;
 
-    private ProductDTO productDTO;
+    //private ProductDTO productDTO;
+    private Long pr_id;
+    private String pr_code;
+    private String pr_detail;
+    private String pr_spec;
+    private String pr_unit;
+    private String pr_kind;
+    private String pr_orispeccode;
+    private long pr_whid;
+    private String pr_whcode;
+    private String pr_whname;
+    private long pr_zxbzs;
+    private long pr_leadtime;
+    private String pr_brand;
+    private String pr_standardprice;
+    private String pr_purcprice;
+    private String pr_saleprice;
+    private long pr_vendid;
+    private String pr_vendname;
+    private String pr_vendcode;
+    private Date pr_docdate;
+    private long pr_recordmanid;
+    private String pr_recordman;
+    private String pr_status;
+    private String pr_statuscode;
+    private String pr_text1;
+    private String pr_text2;
+    private String pr_text3;
+    private String pr_text4;
 }

applications/purchase/purchase-server/src/main/resources/application.yml

@@ -47,7 +47,7 @@ eureka:
   client:
     registryFetchIntervalSeconds: 5
     serviceUrl:
-      defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@127.0.0.1:8500/eureka/
+      defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@192.168.0.181:8510/eureka/
 management:
   endpoints:
     web:

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

@@ -54,36 +54,34 @@
         <result column="pd_text4" property="pd_text4" jdbcType="VARCHAR" />
         <result column="pd_text5" property="pd_text5" jdbcType="VARCHAR" />
         <result column="pd_yqty" property="pd_yqty" jdbcType="DOUBLE" />
-        <association property="productDTO" javaType="com.usoftchina.saas.document.dto.ProductDTO">
-            <id column="pr_id" property="id"/>
-            <result column="pr_code" property="pr_code"/>
-            <result column="pr_detail" property="pr_detail"/>
-            <result column="pr_spec" property="pr_spec"/>
-            <result column="pr_unit" property="pr_unit"/>
-            <result column="pr_kind" property="pr_kind"/>
-            <result column="pr_orispeccode" property="pr_orispeccode"/>
-            <result column="pr_whid" property="pr_whid"/>
-            <result column="pr_whcode" property="pr_whcode"/>
-            <result column="pr_whname" property="pr_whname"/>
-            <result column="pr_zxbzs" property="pr_zxbzs"/>
-            <result column="pr_leadtime" property="pr_leadtime"/>
-            <result column="pr_brand" property="pr_brand"/>
-            <result column="pr_standardprice" property="pr_standardprice"/>
-            <result column="pr_purcprice" property="pr_purcprice"/>
-            <result column="pr_saleprice" property="pr_saleprice"/>
-            <result column="pr_vendid" property="pr_vendid"/>
-            <result column="pr_vendname" property="pr_vendname"/>
-            <result column="pr_vendcode" property="pr_vendcode"/>
-            <result column="pr_docdate" property="pr_docdate"/>
-            <result column="pr_recordmanid" property="pr_recordmanid"/>
-            <result column="pr_recordman" property="pr_recordman"/>
-            <result column="pr_status" property="pr_status"/>
-            <result column="pr_statuscode" property="pr_statuscode"/>
-            <result column="pr_text1" property="pr_text1"/>
-            <result column="pr_text2" property="pr_text2"/>
-            <result column="pr_text3" property="pr_text3"/>
-            <result column="pr_text4" property="pr_text4"/>
-        </association>
+        <result column="pr_id" property="pr_id"/>
+        <result column="pr_code" property="pr_code"/>
+        <result column="pr_detail" property="pr_detail"/>
+        <result column="pr_spec" property="pr_spec"/>
+        <result column="pr_unit" property="pr_unit"/>
+        <result column="pr_kind" property="pr_kind"/>
+        <result column="pr_orispeccode" property="pr_orispeccode"/>
+        <result column="pr_whid" property="pr_whid"/>
+        <result column="pr_whcode" property="pr_whcode"/>
+        <result column="pr_whname" property="pr_whname"/>
+        <result column="pr_zxbzs" property="pr_zxbzs"/>
+        <result column="pr_leadtime" property="pr_leadtime"/>
+        <result column="pr_brand" property="pr_brand"/>
+        <result column="pr_standardprice" property="pr_standardprice"/>
+        <result column="pr_purcprice" property="pr_purcprice"/>
+        <result column="pr_saleprice" property="pr_saleprice"/>
+        <result column="pr_vendid" property="pr_vendid"/>
+        <result column="pr_vendname" property="pr_vendname"/>
+        <result column="pr_vendcode" property="pr_vendcode"/>
+        <result column="pr_docdate" property="pr_docdate"/>
+        <result column="pr_recordmanid" property="pr_recordmanid"/>
+        <result column="pr_recordman" property="pr_recordman"/>
+        <result column="pr_status" property="pr_status"/>
+        <result column="pr_statuscode" property="pr_statuscode"/>
+        <result column="pr_text1" property="pr_text1"/>
+        <result column="pr_text2" property="pr_text2"/>
+        <result column="pr_text3" property="pr_text3"/>
+        <result column="pr_text4" property="pr_text4"/>
     </resultMap>
 
     <select id="selectPurchaseListByCondition"  resultMap="BaseResultMap">
@@ -109,7 +107,7 @@
                and  companyId = #{companyId}
             </if>
         </where>
-        order by pu_id desc
+        order by pu_date desc
     </select>
 
 </mapper>

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

@@ -106,5 +106,33 @@ public class SaleList implements Serializable{
 
     private String sd_text5;
 
-    private ProductDTO productDTO;
+    //private ProductDTO productDTO;级联属性会导致分页查询出现BUG，设置数与查询数量不一致
+    private Long pr_id;
+    private String pr_code;
+    private String pr_detail;
+    private String pr_spec;
+    private String pr_unit;
+    private String pr_kind;
+    private String pr_orispeccode;
+    private long pr_whid;
+    private String pr_whcode;
+    private String pr_whname;
+    private long pr_zxbzs;
+    private long pr_leadtime;
+    private String pr_brand;
+    private String pr_standardprice;
+    private String pr_purcprice;
+    private String pr_saleprice;
+    private long pr_vendid;
+    private String pr_vendname;
+    private String pr_vendcode;
+    private Date pr_docdate;
+    private long pr_recordmanid;
+    private String pr_recordman;
+    private String pr_status;
+    private String pr_statuscode;
+    private String pr_text1;
+    private String pr_text2;
+    private String pr_text3;
+    private String pr_text4;
 }

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

@@ -49,36 +49,34 @@
         <result column="sd_text3" property="sd_text3" jdbcType="VARCHAR" />
         <result column="sd_text4" property="sd_text4" jdbcType="VARCHAR" />
         <result column="sd_text5" property="sd_text5" jdbcType="VARCHAR" />
-        <association property="productDTO" javaType="com.usoftchina.saas.document.dto.ProductDTO">
-            <id column="pr_id" property="id"/>
-            <result column="pr_code" property="pr_code"/>
-            <result column="pr_detail" property="pr_detail"/>
-            <result column="pr_spec" property="pr_spec"/>
-            <result column="pr_unit" property="pr_unit"/>
-            <result column="pr_kind" property="pr_kind"/>
-            <result column="pr_orispeccode" property="pr_orispeccode"/>
-            <result column="pr_whid" property="pr_whid"/>
-            <result column="pr_whcode" property="pr_whcode"/>
-            <result column="pr_whname" property="pr_whname"/>
-            <result column="pr_zxbzs" property="pr_zxbzs"/>
-            <result column="pr_leadtime" property="pr_leadtime"/>
-            <result column="pr_brand" property="pr_brand"/>
-            <result column="pr_standardprice" property="pr_standardprice"/>
-            <result column="pr_purcprice" property="pr_purcprice"/>
-            <result column="pr_saleprice" property="pr_saleprice"/>
-            <result column="pr_vendid" property="pr_vendid"/>
-            <result column="pr_vendname" property="pr_vendname"/>
-            <result column="pr_vendcode" property="pr_vendcode"/>
-            <result column="pr_docdate" property="pr_docdate"/>
-            <result column="pr_recordmanid" property="pr_recordmanid"/>
-            <result column="pr_recordman" property="pr_recordman"/>
-            <result column="pr_status" property="pr_status"/>
-            <result column="pr_statuscode" property="pr_statuscode"/>
-            <result column="pr_text1" property="pr_text1"/>
-            <result column="pr_text2" property="pr_text2"/>
-            <result column="pr_text3" property="pr_text3"/>
-            <result column="pr_text4" property="pr_text4"/>
-        </association>
+        <result column="pr_id" property="pr_id"/>
+        <result column="pr_code" property="pr_code"/>
+        <result column="pr_detail" property="pr_detail"/>
+        <result column="pr_spec" property="pr_spec"/>
+        <result column="pr_unit" property="pr_unit"/>
+        <result column="pr_kind" property="pr_kind"/>
+        <result column="pr_orispeccode" property="pr_orispeccode"/>
+        <result column="pr_whid" property="pr_whid"/>
+        <result column="pr_whcode" property="pr_whcode"/>
+        <result column="pr_whname" property="pr_whname"/>
+        <result column="pr_zxbzs" property="pr_zxbzs"/>
+        <result column="pr_leadtime" property="pr_leadtime"/>
+        <result column="pr_brand" property="pr_brand"/>
+        <result column="pr_standardprice" property="pr_standardprice"/>
+        <result column="pr_purcprice" property="pr_purcprice"/>
+        <result column="pr_saleprice" property="pr_saleprice"/>
+        <result column="pr_vendid" property="pr_vendid"/>
+        <result column="pr_vendname" property="pr_vendname"/>
+        <result column="pr_vendcode" property="pr_vendcode"/>
+        <result column="pr_docdate" property="pr_docdate"/>
+        <result column="pr_recordmanid" property="pr_recordmanid"/>
+        <result column="pr_recordman" property="pr_recordman"/>
+        <result column="pr_status" property="pr_status"/>
+        <result column="pr_statuscode" property="pr_statuscode"/>
+        <result column="pr_text1" property="pr_text1"/>
+        <result column="pr_text2" property="pr_text2"/>
+        <result column="pr_text3" property="pr_text3"/>
+        <result column="pr_text4" property="pr_text4"/>
     </resultMap>
 
     <select id="selectSaleListByCondition" resultMap="BaseResultMap">

frontend/saas-web/app/Application.scss

@@ -272,4 +272,71 @@ div::-webkit-scrollbar-track {
   background: #fff;
   border: 1px solid #e5e5e5;
   border-radius: 8px;
+}
+/**date-picker*/
+.x-datepicker-month .x-btn-inner {
+  font-size: 12px;
+}
+.x-datepicker {
+  width: 212px;
+}
+.x-datepicker-column-header {
+  width: 30px;
+}
+.x-datepicker-column-header-inner {
+  line-height: 25px;
+  padding: 0 9px 0 0;
+}
+.x-datepicker-cell {
+  text-align: right;
+  border: 1px solid #fff;
+}
+.x-datepicker-date {
+  padding: 0 7px 0 0;
+  cursor: pointer;
+  line-height: 23px;
+}
+.x-datepicker-footer, .x-monthpicker-buttons {
+  padding: 3px 0;
+  text-align: center;
+}
+.x-monthpicker {
+  width: 212px;
+  border-width: 1px;
+}
+.x-monthpicker-months {
+  width: 105px;
+}
+.x-monthpicker-item-inner {
+  margin: 0 5px 0 5px;
+  line-height: 22px;
+}
+.x-monthpicker-months .x-monthpicker-item {
+  width: 52px;
+}
+.x-monthpicker-years {
+  width: 105px;
+}
+.x-monthpicker-years .x-monthpicker-item {
+  width: 52px;
+}
+.x-monthpicker-yearnav {
+  height: 34px;
+}
+.x-monthpicker-yearnav-button-ct {
+  width: 52px;
+}
+.x-monthpicker-yearnav-button {
+  height: 12px;
+  width: 12px;
+  cursor: pointer;
+  margin-top: 11px;
+}
+.x-datepicker-footer .x-btn-default-toolbar-small{
+  padding: 2px 2px 2px 2px;
+  min-width: 56px;
+}
+.x-monthpicker-buttons .x-btn-default-toolbar-small{
+  padding: 2px 2px 2px 2px;
+  min-width: 56px;
 }

frontend/saas-web/app/view/core/form/ConDateField.js

@@ -57,6 +57,7 @@ Ext.define('saas.view.core.form.ConDateField', {
             allowBlank: allowBlank,
             flex: 1,
             fieldStyle: me.fieldStyle,
+            //matchFieldWidth:true,
             listeners: {
                 change: function(f){
                     var from =me.from.value,to = me.to.value;

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

@@ -247,6 +247,16 @@ Ext.define('saas.view.core.report.ReportPanel', {
                 Ext.applyIf(c, {
                     format: 'Y-m-d'
                 })
+            }else if(c.xtype == 'numbercolumn') {
+                Ext.applyIf(c, {
+                    align: 'end',
+                    renderer : function(v) {
+                        var arr = (v + '.').split('.');
+                        var xr = (new Array(arr[1].length)).fill('0');
+                        var format = '0.' + xr.join();
+                        return Ext.util.Format.number(v, format);
+                    }
+                });
             }
         })
 

frontend/saas-web/app/view/document/bom/FormController.js

@@ -75,7 +75,8 @@ Ext.define('saas.view.document.bom.FormController', {
                             "text": "总库存数",
                             "dataIndex": "po_onhand",
                             "width": 100,
-                            align:'right'
+                            xtype: 'numbercolumn',
+                            align:'end'
                         },{
                             "text": "类型",
                             "dataIndex": "pr_kind",
@@ -96,7 +97,7 @@ Ext.define('saas.view.document.bom.FormController', {
                             "text": "最小包装",
                             "dataIndex": "pr_zxbzs",
                             "width": 100,
-                            align:'right'
+                            align:'end'
                         },{
                             "text": "L/T",
                             "dataIndex": "pr_leadtime",
@@ -169,7 +170,8 @@ Ext.define('saas.view.document.bom.FormController', {
                             "text": "最新采购单价",
                             "dataIndex": "pr_purcprice",
                             "width": 0,
-                            align:'right'
+                            xtype: 'numbercolumn',
+                            align:'end'
                         },{
                             "text": "仓库id",
                             "dataIndex": "pr_whid",
@@ -186,7 +188,8 @@ Ext.define('saas.view.document.bom.FormController', {
                             "text": "总库存数",
                             "dataIndex": "po_onhand",
                             "width": 100,
-                            align:'right'
+                            xtype: 'numbercolumn',
+                            align:'end'
                         },{
                             "text": "类型",
                             "dataIndex": "pr_kind",
@@ -207,7 +210,7 @@ Ext.define('saas.view.document.bom.FormController', {
                             "text": "最小包装",
                             "dataIndex": "pr_zxbzs",
                             "width": 100,
-                            align:'right'
+                            align:'end'
                         },{
                             "text": "L/T",
                             "dataIndex": "pr_leadtime",
@@ -277,6 +280,7 @@ Ext.define('saas.view.document.bom.FormController', {
                             "text": "最新采购单价",
                             "dataIndex": "pr_purcprice",
                             "width": 0,
+                            xtype: 'numbercolumn',
                         },{
                             "text": "仓库id",
                             "dataIndex": "pr_whid",
@@ -292,6 +296,7 @@ Ext.define('saas.view.document.bom.FormController', {
                         },{
                             "text": "总库存数",
                             "dataIndex": "po_onhand",
+                            xtype: 'numbercolumn',
                             "width": 100,
                         },{
                             "text": "类型",
@@ -313,6 +318,7 @@ Ext.define('saas.view.document.bom.FormController', {
                             "text": "最小包装",
                             "dataIndex": "pr_zxbzs",
                             "width": 100,
+                            xtype: 'numbercolumn',
                         },{
                             "text": "L/T",
                             "dataIndex": "pr_leadtime",

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

@@ -10,7 +10,7 @@ Ext.define('saas.view.document.bom.FormPanel', {
     //字段属性
     _title:'BOM资料',
     _idField: 'id',
-    _codeField: 'bo_mothercode',
+    _codeField: 'codefied',
     _statusField: 'bo_status',
     _statusCodeField: 'bo_statuscode',
     _readUrl:'/api/document/bom/read/',
@@ -71,12 +71,6 @@ Ext.define('saas.view.document.bom.FormPanel', {
         fieldLabel: '产品规格',
         reddOnly:true,
         ignore:true
-    },{
-        xtype: 'textfield',
-        name: 'bo_status',
-        fieldLabel: '产品状态',
-        reddOnly:true
-
     },{
         xtype: 'hidden',
         name: 'bo_statuscode',
@@ -195,6 +189,11 @@ Ext.define('saas.view.document.bom.FormPanel', {
                     xtype : "textfield"
                 },
             }]
+    },{
+        xtype: 'textfield',
+        name: 'bo_status',
+        fieldLabel: '产品状态',
+        reddOnly:true
     },{  
         xtype : "textfield", 
         name : "bo_recorder", 

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

@@ -71,13 +71,13 @@ Ext.define('saas.view.document.vendor.BasePanel', {
             dataIndex : "ve_taxrate", 
             width : 120.0, 
             xtype : "",
-            align:'right'
+            align:'end'
         }, {
             text : "承付天数", 
+            xtype: 'numbercolumn',
             dataIndex : "ve_promisedays", 
             width : 120.0, 
-            xtype : "",
-            align:'right'
+            align:'end'
         }, {
             text : "纳税人识别号", 
             dataIndex : "ve_nsrzh", 

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

@@ -109,6 +109,7 @@ Ext.define('saas.view.money.fundtransfer.FormPanel', {
                 }
             }, {
                 text : "金额", 
+                xtype: 'numbercolumn',
                 dataIndex : "ftd_nowbalance", 
                 width : 120.0, 
                 editor : {

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

@@ -62,8 +62,8 @@ Ext.define('saas.view.money.fundtransfer.FormPanelController', {
                             "flex": 1,
                             "dataIndex": "bk_thisamount",
                             "width": 120,
-                            align:'right',
-                            "xtype": ""
+                            xtype: 'numbercolumn',
+                            align:'end',
                         }, {
                             "text": "建帐日期",
                             "flex": 1,
@@ -131,8 +131,8 @@ Ext.define('saas.view.money.fundtransfer.FormPanelController', {
                             "flex": 1,
                             "dataIndex": "bk_thisamount",
                             "width": 120,
-                            align:'right',
-                            "xtype": ""
+                            xtype: 'numbercolumn',
+                            align:'end',
                         }, {
                             "text": "建帐日期",
                             "flex": 1,

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

@@ -57,6 +57,7 @@ Ext.define('saas.view.money.fundtransfer.QueryPanel', {
             width: 120
         }, {
             text: '金额',
+            xtype: 'numbercolumn',
             dataIndex: 'ftd_nowbalance',
             width: 120,
             renderer : function(v) {

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

@@ -108,6 +108,7 @@ Ext.define('saas.view.money.othreceipts.FormPanel', {
                 }
             }, {
                 text : "金额", 
+                xtype: 'numbercolumn',
                 dataIndex : "ord_nowbalance", 
                 width : 120.0, 
                 editor : {

frontend/saas-web/app/view/money/othreceipts/FormPanelController.js

@@ -85,19 +85,22 @@ Ext.define('saas.view.money.othreceipts.FormPanelController', {
                             "flex": 1,
                             "dataIndex": "cu_taxrate",
                             "width": 100,
-                            align:'right'
+                            xtype: 'numbercolumn',
+                            align:'end'
                         }, {
                             "text": "承付天数",
                             "flex": 1,
                             "dataIndex": "cu_promisedays",
                             "width": 100,
-                            align:'right'
+                            xtype: 'numbercolumn',
+                            align:'end'
                         }, {
                             "text": "额度",
                             "flex": 1,
                             "dataIndex": "cu_credit",
                             "width": 100,
-                            align:'right'
+                            xtype: 'numbercolumn',
+                            align:'end'
                         }, {
                             "text": "客户地址",
                             "flex": 1,
@@ -171,7 +174,7 @@ Ext.define('saas.view.money.othreceipts.FormPanelController', {
                             "flex": 1,
                             "dataIndex": "bk_thisamount",
                             "width": 120,
-                            "xtype": ""
+                            xtype: 'numbercolumn',
                         }, {
                             "text": "建帐日期",
                             "flex": 1,

frontend/saas-web/app/view/money/othreceipts/QueryPanel.js

@@ -74,6 +74,7 @@ Ext.define('saas.view.money.othreceipts.QueryPanel', {
             width: 120
         }, {
             text: '金额',
+            xtype: 'numbercolumn',
             dataIndex: 'or_amount',
             width: 120
         }, {

frontend/saas-web/app/view/money/othreceipts/QueryPanelController.js

@@ -69,17 +69,21 @@ Ext.define('saas.view.money.othreceipts.QueryPanelController', {
                                 "text": "税率",
                                 "flex": 1,
                                 "dataIndex": "cu_taxrate",
-                                "width": 100
+                                "width": 100,
+                                xtype: 'numbercolumn',
                             }, {
                                 "text": "承付天数",
                                 "flex": 1,
                                 "dataIndex": "cu_promisedays",
+                                align: 'end',
+                                xtype: 'numbercolumn',
                                 "width": 100
                             }, {
                                 "text": "额度",
                                 "flex": 1,
                                 "dataIndex": "cu_credit",
-                                "width": 100
+                                "width": 100,
+                                xtype: 'numbercolumn',
                             }, {
                                 "text": "客户地址",
                                 "flex": 1,
@@ -136,7 +140,7 @@ Ext.define('saas.view.money.othreceipts.QueryPanelController', {
                             "flex": 1,
                             "dataIndex": "bk_thisamount",
                             "width": 120,
-                            "xtype": ""
+                            xtype: 'numbercolumn',
                         }, {
                             "text": "建帐日期",
                             "flex": 1,

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

@@ -108,6 +108,7 @@ Ext.define('saas.view.money.othspendings.FormPanel', {
                 }
             }, {
                 text : "金额", 
+                xtype: 'numbercolumn',
                 dataIndex : "osd_nowbalance", 
                 width : 120.0,
                 editor : {

frontend/saas-web/app/view/money/othspendings/FormPanelController.js

@@ -62,12 +62,14 @@ Ext.define('saas.view.money.othspendings.FormPanelController', {
                             "text": "税率",
                             "dataIndex": "ve_taxrate",
                             "width": 100,
-                            align:'right'
+                            xtype: 'numbercolumn',
+                            align:'end'
                         }, {
                             "text": "承付天数",
                             "dataIndex": "ve_promisedays",
                             "width": 100,
-                            align:'right'
+                            xtype: 'numbercolumn',
+                            align:'end'
                         }, {
                             "text": "纳税人识别号",
                             "dataIndex": "ve_bankaccount",
@@ -148,8 +150,8 @@ Ext.define('saas.view.money.othspendings.FormPanelController', {
                             "flex": 1,
                             "dataIndex": "bk_thisamount",
                             "width": 120,
-                            "xtype": "",
-                            align:'right'
+                            xtype: 'numbercolumn',
+                            align:'end'
                         }, {
                             "text": "建帐日期",
                             "flex": 1,

frontend/saas-web/app/view/money/othspendings/QueryPanel.js

@@ -74,6 +74,7 @@ Ext.define('saas.view.money.othspendings.QueryPanel', {
             width: 120
         }, {
             text: '金额',
+            xtype: 'numbercolumn',
             dataIndex: 'os_amount',
             width: 120,
             renderer : function(v) {

frontend/saas-web/app/view/money/othspendings/QueryPanelController.js

@@ -61,11 +61,15 @@ Ext.define('saas.view.money.othspendings.QueryPanelController', {
                         }, {
                             "text": "税率",
                             "dataIndex": "ve_taxrate",
-                            "width": 100
+                            "width": 100,
+                            xtype: 'numbercolumn',
+                            align: 'end'
                         }, {
                             "text": "承付天数",
                             "dataIndex": "ve_promisedays",
-                            "width": 100
+                            "width": 100,
+                            xtype: 'numbercolumn',
+                            align: 'end'
                         }, {
                             "text": "纳税人识别号",
                             "dataIndex": "ve_bankaccount",
@@ -130,7 +134,7 @@ Ext.define('saas.view.money.othspendings.QueryPanelController', {
                             "flex": 1,
                             "dataIndex": "bk_thisamount",
                             "width": 120,
-                            "xtype": ""
+                            xtype: 'numbercolumn',
                         }, {
                             "text": "建帐日期",
                             "flex": 1,

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

@@ -124,6 +124,7 @@ Ext.define('saas.view.money.payBalance.FormPanel', {
             hidden: true
         }, {
             text: "付款金额",
+            xtype: 'numbercolumn',
             dataIndex: "pd_amount",
             editor : {
                 xtype : "numberfield",
@@ -216,6 +217,7 @@ Ext.define('saas.view.money.payBalance.FormPanel', {
             xtype: 'datecolumn'
         }, {
             text: "单据金额",
+            xtype: 'numbercolumn',
             dataIndex: "pbd_amount",
             // editor : {
             //     xtype : "numberfield",
@@ -236,6 +238,7 @@ Ext.define('saas.view.money.payBalance.FormPanel', {
             }
         }, {
             text: "已核销金额",
+            xtype: 'numbercolumn',
             dataIndex: "pb_havebalance",
             // editor : {
             //     xtype : "numberfield",
@@ -256,6 +259,7 @@ Ext.define('saas.view.money.payBalance.FormPanel', {
             }
         }, {
             text: "未核销金额",
+            xtype: 'numbercolumn',
             dataIndex: "pb_pbdamount",
             // editor : {
             //     xtype : "numberfield",
@@ -276,6 +280,7 @@ Ext.define('saas.view.money.payBalance.FormPanel', {
             }
         }, {
             text: "本次核销金额",
+            xtype: 'numbercolumn',
             dataIndex: "pbd_nowbalance",
             editor : {
                 xtype : "numberfield",

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

@@ -65,13 +65,11 @@ Ext.define('saas.view.money.payBalance.FormPanelController', {
                         }, {
                             "text": "税率",
                             "dataIndex": "ve_taxrate",
-                            "width": 100,
-                            align:'right'
+                            "width": 100
                         }, {
                             "text": "承付天数",
                             "dataIndex": "ve_promisedays",
-                            "width": 100,
-                            align:'right'
+                            "width": 100
                         }, {
                             "text": "纳税人识别号",
                             "dataIndex": "ve_bankaccount",
@@ -152,26 +150,29 @@ Ext.define('saas.view.money.payBalance.FormPanelController', {
                             "flex": 1,
                             "dataIndex": "sl_orderamount",
                             "width": 100,
-                            align:'right'
+                            xtype: 'numbercolumn',
+                            align:'end'
                         }, {
                             "text": "已核销金额",
                             "flex": 0,
                             "dataIndex": "sl_yamount",
                             "width": 200,
-                            align:'right',
+                            xtype: 'numbercolumn',
+                            align:'end',
                             "items": null
                         }, {
                             "text": "未核销金额",
                             "flex": 1,
                             "dataIndex": "sl_namount",
                             "width": 100,
-                            align:'right'
+                            xtype: 'numbercolumn',
+                            align:'end'
                         },{
                             "text": "单据日期",
                             "flex": 1,
                             "dataIndex": "sl_date",
                             "width": 100,
-                            align:'right'
+                            align:'end'
                         }]
                     });
 

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

@@ -70,11 +70,13 @@ Ext.define('saas.view.money.paybalance.QueryPanel', {
             width: 120,
         }, {
             text: '付款金额',
+            xtype: 'numbercolumn',
             dataIndex: 'pb_pdamount',
             width: 120,
             hidden:true
         }, {
             text: '本次核销金额',
+            xtype: 'numbercolumn',
             dataIndex: 'pb_pbdamount',
             width: 120,
             hidden:true
@@ -90,6 +92,7 @@ Ext.define('saas.view.money.paybalance.QueryPanel', {
             hidden:true
         }, {
             text: '已核销金额',
+            xtype: 'numbercolumn',
             dataIndex: 'pb_havebalance',
             width: 120,
             hidden:true

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

@@ -59,7 +59,9 @@ Ext.define('saas.view.money.paybalance.QueryPanelController', {
                         }, {
                             "text": "承付天数",
                             "dataIndex": "ve_promisedays",
-                            "width": 100
+                            "width": 100,
+                            xtype: 'numbercolumn',
+                            align: 'end'
                         }, {
                             "text": "纳税人识别号",
                             "dataIndex": "ve_bankaccount",
@@ -143,6 +145,8 @@ Ext.define('saas.view.money.paybalance.QueryPanelController', {
                             "text": "总库存数",
                             "dataIndex": "po_onhand",
                             "width": 100,
+                            xtype: 'numbercolumn',
+                            align: 'end'
                         },{
                             "text": "类型",
                             "dataIndex": "pr_kind",
@@ -163,6 +167,7 @@ Ext.define('saas.view.money.paybalance.QueryPanelController', {
                             "text": "最小包装",
                             "dataIndex": "pr_zxbzs",
                             "width": 100,
+                            xtype: 'numbercolumn',
                         },{
                             "text": "L/T",
                             "dataIndex": "pr_leadtime",

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

@@ -126,6 +126,7 @@ Ext.define('saas.view.money.recBalance.FormPanel', {
             }
         }, {
             text: "收款金额",
+            xtype: 'numbercolumn',
             dataIndex: "rd_amount",
             editor : {
                 xtype : "numberfield",
@@ -224,6 +225,7 @@ Ext.define('saas.view.money.recBalance.FormPanel', {
             xtype: 'datecolumn'
         }, {
             text: "单据金额",
+            xtype: 'numbercolumn',
             dataIndex: "rbd_amount",
             renderer : function(v) {
                 var arr = (v + '.').split('.');
@@ -240,6 +242,7 @@ Ext.define('saas.view.money.recBalance.FormPanel', {
             }
         }, {
             text: "已核销金额",
+            xtype: 'numbercolumn',
             dataIndex: "rbd_nowbalance",
             renderer : function(v) {
                 var arr = (v + '.').split('.');
@@ -256,6 +259,7 @@ Ext.define('saas.view.money.recBalance.FormPanel', {
             }
         }, {
             text: "未核销金额",
+            xtype: 'numbercolumn',
             dataIndex: "pbd_nowbalance",
             renderer : function(v) {
                 var arr = (v + '.').split('.');
@@ -272,6 +276,7 @@ Ext.define('saas.view.money.recBalance.FormPanel', {
             }
         }, {
             text: "本次核销金额",
+            xtype: 'numbercolumn',
             dataIndex: "pbd_nowbalance",
             editor : {
                 xtype : "numberfield",

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

@@ -66,22 +66,26 @@ Ext.define('saas.view.money.recBalance.FormPanelController', {
                             "text": "应收款余额",
                             "dataIndex": "cu_leftamount",
                             "width": 100,
-                            align:'right'
+                            xtype: 'numbercolumn',
+                            align:'end'
                         },{
                             "text": "税率",
                             "dataIndex": "cu_taxrate",
                             "width": 100,
-                            align:'right'
+                            xtype: 'numbercolumn',
+                            align:'end'
                         },{
                             "text": "承付天数",
                             "dataIndex": "cu_promisedays",
                             "width": 100,
-                            align:'right'
+                            xtype: 'numbercolumn',
+                            align:'end'
                         },{
                             "text": "额度",
                             "dataIndex": "cu_credit",
                             "width": 100,
-                            align:'right'
+                            xtype: 'numbercolumn',
+                            align:'end'
                         }]
                     }) ;   
 
@@ -145,17 +149,20 @@ Ext.define('saas.view.money.recBalance.FormPanelController', {
                             "text": "税率",
                             "dataIndex": "cu_taxrate",
                             "width": 100,
-                            align:'right'
+                            xtype: 'numbercolumn',
+                            align:'end'
                         },{
                             "text": "承付天数",
                             "dataIndex": "cu_promisedays",
                             "width": 100,
-                            align:'right'
+                            xtype: 'numbercolumn',
+                            align:'end'
                         },{
                             "text": "额度",
                             "dataIndex": "cu_credit",
                             "width": 100,
-                            align:'right'
+                            xtype: 'numbercolumn',
+                            align:'end'
                         }]
                     }) ;   
 
@@ -224,26 +231,29 @@ Ext.define('saas.view.money.recBalance.FormPanelController', {
                             "flex": 1,
                             "dataIndex": "sl_orderamount",
                             "width": 100,
-                            align:'right'
+                            xtype: 'numbercolumn',
+                            align:'end'
                         }, {
                             "text": "已核销金额",
                             "flex": 0,
                             "dataIndex": "sl_yamount",
                             "width": 200,
                             "items": null,
-                            align:'right'
+                            xtype: 'numbercolumn',
+                            align:'end'
                         }, {
                             "text": "未核销金额",
                             "flex": 1,
                             "dataIndex": "sl_namount",
                             "width": 100,
-                            align:'right'
+                            xtype: 'numbercolumn',
+                            align:'end'
                         },{
                             "text": "单据日期",
                             "flex": 1,
                             "dataIndex": "sl_date",
                             "width": 100,
-                            align:'right'
+                            align:'end'
                         }]
                     });
 

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

@@ -55,11 +55,14 @@ Ext.define('saas.view.money.recBalance.QueryPanelController', {
                         }, {
                             "text": "税率",
                             "dataIndex": "ve_taxrate",
-                            "width": 100
+                            "width": 100,
+                            xtype: 'numbercolumn',
                         }, {
                             "text": "承付天数",
                             "dataIndex": "ve_promisedays",
-                            "width": 100
+                            "width": 100,
+                            xtype: 'numbercolumn',
+                            align: 'end'
                         }, {
                             "text": "纳税人识别号",
                             "dataIndex": "ve_bankaccount",
@@ -143,6 +146,8 @@ Ext.define('saas.view.money.recBalance.QueryPanelController', {
                             "text": "总库存数",
                             "dataIndex": "po_onhand",
                             "width": 100,
+                            xtype: 'numbercolumn',
+                            align: 'end'
                         },{
                             "text": "类型",
                             "dataIndex": "pr_kind",
@@ -163,6 +168,7 @@ Ext.define('saas.view.money.recBalance.QueryPanelController', {
                             "text": "最小包装",
                             "dataIndex": "pr_zxbzs",
                             "width": 100,
+                            xtype: 'numbercolumn',
                         },{
                             "text": "L/T",
                             "dataIndex": "pr_leadtime",

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

@@ -9,7 +9,6 @@ Ext.define('saas.view.money.report.AccountBalance', {
 
     groupField: null,
     listUrl: '/api/money/report/accountBalance',
-    // listUrl: 'http://192.168.253.35:8880/report/accountBalance',
     defaultCondition: null,
     reportTitle: '资金账户收支明细',
     QueryWidth:0.1,
@@ -44,13 +43,16 @@ Ext.define('saas.view.money.report.AccountBalance', {
             dataIndex: 'kind'
         },{
             text:'收入',
-            dataIndex:'outamount'
+            dataIndex:'outamount',
+            xtype: 'numbercolumn'
         },{
             text:'支出',
-            dataIndex:'thisamount'
+            dataIndex:'thisamount',
+            xtype: 'numbercolumn'
         },{
             text: '账户余额',
-            dataIndex: 'pr_code'
+            dataIndex: 'pr_code',
+            xtype: 'numbercolumn'
         }, {
             text: '往来单位',
             dataIndex: 'bcode'

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

@@ -57,8 +57,8 @@ Ext.define('saas.view.money.report.AccountBalanceController', {
                             "flex": 1,
                             "dataIndex": "bk_thisamount",
                             "width": 120,
-                            align:'right',
-                            "xtype": ""
+                            align:'end',
+                            xtype: 'numbercolumn',
                         }, {
                             "text": "建帐日期",
                             "flex": 1,

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

@@ -9,7 +9,6 @@ Ext.define('saas.view.money.report.CustomerCheckCheck', {
 
     groupField: null,
     listUrl: '/api/money/report/customercheck',
-    // listUrl: 'http://192.168.253.35:8880/report/customercheck',
     defaultCondition: null,
     reportTitle: '客户对账单',
     QueryWidth:0.1,
@@ -45,7 +44,8 @@ Ext.define('saas.view.money.report.CustomerCheckCheck', {
             width: 200
         }, {
             text: '序号',
-            dataIndex: 'pd_pdno'
+            dataIndex: 'pd_pdno',
+            xtype: 'numbercolumn'
         },{
             text:'客户编号',
             dataIndex:'pi_vendcode',
@@ -68,25 +68,45 @@ Ext.define('saas.view.money.report.CustomerCheckCheck', {
             dataIndex: 'pd_unit'
         }, {
             text: '数量',
+            xtype: 'numbercolumn',
             dataIndex: 'qty',
-            summaryType: 'count'
+            xtype: 'numbercolumn'
         }, {
             text: '单价',
-            dataIndex: 'pd_orderprice'
+            dataIndex: 'pd_orderprice',
+            xtype: 'numbercolumn'
         }, {
             text: '税率',
-            dataIndex: 'pd_taxrate'
+            dataIndex: 'pd_taxrate',
+            xtype: 'numbercolumn'
         }, {
             text: '金额',
+            xtype: 'numbercolumn',
             dataIndex: 'pd_total',
-            summaryType: 'count'
+            xtype: 'numbercolumn',
+            summaryType: 'sum',
+            summaryRenderer: function(v) {
+                var arr = (v + '.').split('.');
+                var xr = (new Array(arr[1].length)).fill('0');
+                var format = '0.' + xr.join();
+                return Ext.util.Format.number(v, format);
+            }
         }, {
             text: '不含税单价',
-            dataIndex: 'pd_netprice'
+            dataIndex: 'pd_netprice',
+            xtype: 'numbercolumn'
         }, {
             text: '不含税金额',
+            xtype: 'numbercolumn',
             dataIndex: 'pd_nettotal',
-            summaryType: 'count'
+            xtype: 'numbercolumn',
+            summaryType: 'sum',
+            summaryRenderer: function(v) {
+                var arr = (v + '.').split('.');
+                var xr = (new Array(arr[1].length)).fill('0');
+                var format = '0,000.' + xr.join();
+                return Ext.util.Format.number(v, format);
+            }
         }, {
             text: '备注',
             dataIndex: 'pd_remark'

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

@@ -56,22 +56,26 @@ Ext.define('saas.view.money.report.CustomerCheckController', {
                             "text": "应收款余额",
                             "dataIndex": "cu_leftamount",
                             "width": 100,
-                            align:'right'
+                            xtype: 'numbercolumn',
+                            align:'end'
                         },{
                             "text": "税率",
                             "dataIndex": "cu_taxrate",
                             "width": 100,
-                            align:'right'
+                            xtype: 'numbercolumn',
+                            align:'end'
                         },{
                             "text": "承付天数",
                             "dataIndex": "cu_promisedays",
                             "width": 100,
-                            align:'right'
+                            xtype: 'numbercolumn',
+                            align:'end'
                         },{
                             "text": "额度",
                             "dataIndex": "cu_credit",
                             "width": 100,
-                            align:'right'
+                            xtype: 'numbercolumn',
+                            align:'end'
                         }]
                     }) ;
 

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

@@ -4,12 +4,10 @@ Ext.define('saas.view.money.report.PayDetail', {
 
     controller: 'money-report-paydetail',
     viewModel: 'money-report-paydetail',
-
     viewName: 'money-report-paydetail',
 
     groupField: null,
     listUrl: '/api/money/report/payDetail',
-    // listUrl: 'http://192.168.253.35:8880/report/payDetail',
     defaultCondition: null,
     reportTitle: '应付账款明细表',
     QueryWidth:0.1,
@@ -57,23 +55,51 @@ Ext.define('saas.view.money.report.PayDetail', {
             dataIndex: 'pb_date'
         }, {
             text: '期初应付余额',
+            xtype: 'numbercolumn',
             dataIndex: 've_beginapamount',
-            summaryType: 'count'
+            xtype: 'numbercolumn',
+            summaryType: 'sum',
+            summaryRenderer: function(v) {
+                var arr = (v + '.').split('.');
+                var xr = (new Array(arr[1].length)).fill('0');
+                var format = '0.' + xr.join();
+            }
         }, {
             text: '本期付款金额',
+            xtype: 'numbercolumn',
             dataIndex: 'pb_pdamount',
-            summaryType: 'count'
+            xtype: 'numbercolumn',
+            summaryType: 'sum',
+            summaryRenderer: function(v) {
+                var arr = (v + '.').split('.');
+                var xr = (new Array(arr[1].length)).fill('0');
+                var format = '0.' + xr.join();
+            }
         }, {
             text: '应付余额',
+            xtype: 'numbercolumn',
             dataIndex: 'mustpay',
-            summaryType: 'count'
+            xtype: 'numbercolumn',
+            summaryType: 'sum',
+            summaryRenderer: function(v) {
+                var arr = (v + '.').split('.');
+                var xr = (new Array(arr[1].length)).fill('0');
+                var format = '0.' + xr.join();
+            }
         }, {
             text: '应付日期',
             dataIndex: 'mustdate',
         }, {
             text: '单据总金额',
+            xtype: 'numbercolumn',
             dataIndex: 'pi_total',
-            summaryType: 'count'
+            xtype: 'numbercolumn',
+            summaryType: 'sum',
+            summaryRenderer: function(v) {
+                var arr = (v + '.').split('.');
+                var xr = (new Array(arr[1].length)).fill('0');
+                var format = '0.' + xr.join();
+            }
         }, {
             text: '备注',
             dataIndex: 'pi_remark'

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

@@ -52,11 +52,15 @@ Ext.define('saas.view.money.report.PayDetailController', {
                             }, {
                                 "text": "税率",
                                 "dataIndex": "ve_taxrate",
-                                "width": 100
+                                "width": 100,
+                                xtype: 'numbercolumn',
+                                align: 'end'
                             }, {
                                 "text": "承付天数",
                                 "dataIndex": "ve_promisedays",
-                                "width": 100
+                                "width": 100,
+                                xtype: 'numbercolumn',
+                                align: 'end'
                             }, {
                                 "text": "纳税人识别号",
                                 "dataIndex": "ve_bankaccount",

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

@@ -9,7 +9,6 @@ Ext.define('saas.view.money.report.RecDetail', {
 
     groupField: null,
     listUrl: '/api/money/report/recDetail',
-    // listUrl: 'http://192.168.253.35:8880/report/recDetail',
     defaultCondition: null,
     reportTitle: '应收账款明细',
     QueryWidth:0.1,
@@ -49,7 +48,7 @@ Ext.define('saas.view.money.report.RecDetail', {
             width: 200
         },{
             text: '业务员',
-            dataIndex: 'PU_BUYERNAME',
+            dataIndex: 'pu_buyername',
             width: 200
         }, {
             text: '单据日期',
@@ -57,25 +56,47 @@ Ext.define('saas.view.money.report.RecDetail', {
             width: 200,
         }, {
             text: '序号',
-            dataIndex: 'pd_pdno'
+            dataIndex: 'pd_pdno',
+            xtype: 'numbercolumn'
         },{
             text:'期初应收',
             dataIndex:'cu_beginaramount',
-            summaryType: 'count'
+            xtype: 'numbercolumn',
+            summaryType: 'sum',
+            summaryRenderer: function(v) {
+                var arr = (v + '.').split('.');
+                var xr = (new Array(arr[1].length)).fill('0');
+                var format = '0.' + xr.join();
+            }
         },{
             text:'本期收款金额',
+            xtype: 'numbercolumn',
             dataIndex:'pb_pdamount',
-            summaryType: 'count'
+            xtype: 'numbercolumn',
+            summaryType: 'sum',
+            summaryRenderer: function(v) {
+                var arr = (v + '.').split('.');
+                var xr = (new Array(arr[1].length)).fill('0');
+                var format = '0,000.' + xr.join();
+            }
         },{
             text: '应收余额',
+            xtype: 'numbercolumn',
             dataIndex: 'mustpay',
-            summaryType: 'count'
+            xtype: 'numbercolumn',
+            summaryType: 'sum',
+            summaryRenderer: function(v) {
+                var arr = (v + '.').split('.');
+                var xr = (new Array(arr[1].length)).fill('0');
+                var format = '0.' + xr.join();
+            }
         }, {
             text: '应收日期',
             dataIndex: 'mustdate'
         }, {
             text: '单据总金额',
-            dataIndex: 'pi_total'
+            dataIndex: 'pi_total',
+            xtype: 'numbercolumn'
         }, {
             text: '备注',
             dataIndex: 'pd_unit'

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

@@ -56,22 +56,26 @@ Ext.define('saas.view.money.report.RecDetailController', {
                             "text": "应收款余额",
                             "dataIndex": "cu_leftamount",
                             "width": 100,
-                            align:'right'
+                            xtype: 'numbercolumn',
+                            align:'end'
                         },{
                             "text": "税率",
                             "dataIndex": "cu_taxrate",
                             "width": 100,
-                            align:'right'
+                            xtype: 'numbercolumn',
+                            align:'end'
                         },{
                             "text": "承付天数",
                             "dataIndex": "cu_promisedays",
                             "width": 100,
-                            align:'right'
+                            xtype: 'numbercolumn',
+                            align:'end'
                         },{
                             "text": "额度",
                             "dataIndex": "cu_credit",
                             "width": 100,
-                            align:'right'
+                            xtype: 'numbercolumn',
+                            align:'end'
                         }]
                     }) ;
 

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

@@ -9,7 +9,6 @@ Ext.define('saas.view.money.report.VendorCheck', {
 
     groupField: null,
     listUrl: '/api/money/report/vendorCheck',
-    // listUrl: 'http://192.168.253.35:8880/report/vendorCheck',
     defaultCondition: null,
     reportTitle: '供应商对账单',
     QueryWidth:0.1,
@@ -66,24 +65,42 @@ Ext.define('saas.view.money.report.VendorCheck', {
             dataIndex: 'pd_unit'
         }, {
             text: '采购数量',
+            xtype: 'numbercolumn',
             dataIndex: 'qty',
-            summaryType: 'count'
+            xtype: 'numbercolumn',
+            summaryType: 'sum',
+            summaryRenderer: function(v) {
+                var arr = (v + '.').split('.');
+                var xr = (new Array(arr[1].length)).fill('0');
+                var format = '0.' + xr.join();
+            }
         }, {
             text: '单价',
-            dataIndex: 'pd_orderprice'
+            dataIndex: 'pd_orderprice',
+            xtype: 'numbercolumn'
         }, {
             text: '税率',
-            dataIndex: 'pd_taxrate'
+            dataIndex: 'pd_taxrate',
+            xtype: 'numbercolumn'
         }, {
             text: '金额',
+            xtype: 'numbercolumn',
             dataIndex: 'pd_total',
-            summaryType: 'count'
+            xtype: 'numbercolumn',
+            summaryType: 'sum',
+            summaryRenderer: function(v) {
+                var arr = (v + '.').split('.');
+                var xr = (new Array(arr[1].length)).fill('0');
+                var format = '0,000.' + xr.join();
+            }
         }, {
             text: '不含税单价',
-            dataIndex: 'pd_netprice'
+            dataIndex: 'pd_netprice',
+            xtype: 'numbercolumn'
         }, {
             text: '不含税金额',
-            dataIndex: 'pd_nettotal'
+            dataIndex: 'pd_nettotal',
+            xtype: 'numbercolumn'
         }, {
             text: '备注',
             dataIndex: 'pd_remark'

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

@@ -52,11 +52,15 @@ Ext.define('saas.view.money.report.VendorCheckController', {
                             }, {
                                 "text": "税率",
                                 "dataIndex": "ve_taxrate",
-                                "width": 100
+                                "width": 100,
+                                xtype: 'numbercolumn',
+                                align: 'end'
                             }, {
                                 "text": "承付天数",
                                 "dataIndex": "ve_promisedays",
-                                "width": 100
+                                "width": 100,
+                                xtype: 'numbercolumn',
+                                align: 'end'
                             }, {
                                 "text": "纳税人识别号",
                                 "dataIndex": "ve_bankaccount",

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

@@ -22,14 +22,6 @@ Ext.define('saas.view.purchase.purchase.FormPanel', {
      _unAuditUrl: '/api/purchase/purchase/unAudit/',
      _deleteUrl:'/api/purchase/purchase/delete/',
      _turnInUrl:'/api/purchase/purchase/turnProdin/',
-
-    // _readUrl:'http://localhost:8800/purchase/read/',
-    // _saveUrl:'http://localhost:8800/purchase/save',
-    // _auditUrl:'http://localhost:8800/purchase/audit',
-    // _unAuditUrl:'http://localhost:8800/purchase/unAudit/',
-    // _deleteUrl:'http://localhost:8800/purchase/delete/',
-    // _turnInUrl:'http://localhost:8800/purchase/turnProdin/',
-
      initId:0,
  
      toolBtns: [{
@@ -139,7 +131,6 @@ Ext.define('saas.view.purchase.purchase.FormPanel', {
                 dataIndex : "pr_detail",
                 ignore:true,
                 renderer: function (v, m, r) {
-                    debugger
                     if(!v){
                         return r.data["productDTO"]?r.data["productDTO"][m.column.dataIndex]:null; 
                     }                     
@@ -163,7 +154,9 @@ Ext.define('saas.view.purchase.purchase.FormPanel', {
             },
             {
                 text : "最小包装数", 
+                xtype: 'numbercolumn',
                 dataIndex : "pr_zxbzs",
+                align: 'end',
                 ignore:true,
                 renderer: function (v, m, r) {
                     if(!v){
@@ -175,6 +168,7 @@ Ext.define('saas.view.purchase.purchase.FormPanel', {
             {
                 text : "数量", 
                 dataIndex : "pd_qty", 
+                xtype: 'numbercolumn',
                 width : 120.0,
                 allowBlank : false,
                 editor : {
@@ -199,6 +193,7 @@ Ext.define('saas.view.purchase.purchase.FormPanel', {
             {
                 text : "已转数", 
                 dataIndex : "pd_yqty", 
+                xtype: 'numbercolumn',
                 width : 120.0,
                 hidden:true,
                 editor : {
@@ -222,6 +217,7 @@ Ext.define('saas.view.purchase.purchase.FormPanel', {
             },
             {
                 text : "单价", 
+                xtype: 'numbercolumn',
                 dataIndex : "pd_price", 
                 width : 120.0,
                 editor : {
@@ -238,6 +234,7 @@ Ext.define('saas.view.purchase.purchase.FormPanel', {
             }, 
             {
                 text : "税率", 
+                xtype: 'numbercolumn',
                 dataIndex : "pd_taxrate", 
                 width : 120.0,
                 editor : {
@@ -249,6 +246,7 @@ Ext.define('saas.view.purchase.purchase.FormPanel', {
             },
             {
                 text : "含税金额", 
+                xtype: 'numbercolumn',
                 dataIndex : "pd_total", 
                 width : 120.0, 
                 editor : {
@@ -272,6 +270,7 @@ Ext.define('saas.view.purchase.purchase.FormPanel', {
             }, 
             {
                 text : "未税金额", 
+                xtype: 'numbercolumn',
                 dataIndex : "pd_taxtotal", 
                 width : 120.0,
                 editor : {
@@ -312,7 +311,7 @@ Ext.define('saas.view.purchase.purchase.FormPanel', {
     },
     {
         xtype : "textfield", 
-        name : "PU_REMARK", 
+        name : "pu_remark", 
         fieldLabel : "备注", 
         columnWidth : 1
     },
@@ -325,7 +324,8 @@ Ext.define('saas.view.purchase.purchase.FormPanel', {
         xtype : "datefield", 
         name : "createTime", 
         fieldLabel : "录入日期",
-        readOnly:true
+        readOnly:true, 
+        defaultValue: new Date()
     }, {
         xtype : "textfield", 
         name : "pu_auditman", 

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

@@ -62,11 +62,14 @@ Ext.define('saas.view.purchase.purchase.FormPanelController', {
                             "text": "税率",
                             "dataIndex": "ve_taxrate",
                             "width": 100,
-                            align:'right'
+                            xtype: 'numbercolumn',
+                            align:'end'
                         }, {
                             "text": "承付天数",
                             "dataIndex": "ve_promisedays",
-                            "width": 100
+                            "width": 100,
+                            xtype: 'numbercolumn',
+                            align: 'end'
                         }, {
                             "text": "纳税人识别号",
                             "dataIndex": "ve_bankaccount",
@@ -156,7 +159,8 @@ Ext.define('saas.view.purchase.purchase.FormPanelController', {
                         }, {
                             "text": "最新采购单价",
                             "dataIndex": "pr_purcprice",
-                            align:'right',
+                            align:'end',
+                            xtype: 'numbercolumn',
                             "width": 0,
                         },{
                             "text": "仓库id",
@@ -174,7 +178,8 @@ Ext.define('saas.view.purchase.purchase.FormPanelController', {
                             "text": "总库存数",
                             "dataIndex": "po_onhand",
                             "width": 100,
-                            align:'right'
+                            xtype: 'numbercolumn',
+                            align:'end'
                         },{
                             "text": "类型",
                             "dataIndex": "pr_kind",
@@ -195,6 +200,7 @@ Ext.define('saas.view.purchase.purchase.FormPanelController', {
                             "text": "最小包装",
                             "dataIndex": "pr_zxbzs",
                             "width": 100,
+                            xtype: 'numbercolumn'
                         },{
                             "text": "L/T",
                             "dataIndex": "pr_leadtime",

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

@@ -59,7 +59,9 @@ Ext.define('saas.view.purchase.purchase.QueryPanelController', {
                         }, {
                             "text": "承付天数",
                             "dataIndex": "ve_promisedays",
-                            "width": 100
+                            "width": 100,
+                            xtype: 'numbercolumn',
+                            align: 'end'
                         }, {
                             "text": "纳税人识别号",
                             "dataIndex": "ve_bankaccount",
@@ -143,6 +145,8 @@ Ext.define('saas.view.purchase.purchase.QueryPanelController', {
                             "text": "总库存数",
                             "dataIndex": "po_onhand",
                             "width": 100,
+                            xtype: 'numbercolumn',
+                            align: 'end'
                         },{
                             "text": "类型",
                             "dataIndex": "pr_kind",
@@ -163,6 +167,8 @@ Ext.define('saas.view.purchase.purchase.QueryPanelController', {
                             "text": "最小包装",
                             "dataIndex": "pr_zxbzs",
                             "width": 100,
+                            xtype: 'numbercolumn',
+                            align: 'end'
                         },{
                             "text": "L/T",
                             "dataIndex": "pr_leadtime",

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

@@ -22,17 +22,6 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanel', {
     _unAuditUrl:'/api/purchase/prodinout/unAudit/',
     _deleteUrl:'/api/purchase/prodinout/delete/',
     _turnOutUrl:'/api/purchase/prodinout/turnProdOut/',
-
-    // _relationColumn: 'pd_piid',
-    // _readUrl:'http://localhost:8800/prodinout/read/',
-    // _saveUrl:'http://localhost:8800/prodinout/save',
-    // _auditUrl:'http://localhost:8800/prodinout/audit',
-    // _unAuditUrl:'http://localhost:8800/prodinout/unAudit/',
-    // _deleteUrl:'http://localhost:8800/prodinout/delete/',
-    // _turnOutUrl:'http://localhost:8800/prodinout/turnProdOut/',
-
-
-
     initId:0,
 
     toolBtns: [{
@@ -46,14 +35,12 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanel', {
     defaultItems: [{
         xtype: 'hidden',
         name: 'id',
-        bind: '{id}',
         fieldLabel: 'id',
         allowBlank: true,
         columnWidth: 0
     },{
         xtype : "textfield", 
         name : "pi_class", 
-        bind : "{pi_class}", 
         fieldLabel : "单据类型", 
         readOnly:true,
         allowBlank : true, 
@@ -61,25 +48,21 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanel', {
     }, {
         xtype : "hidden", 
         name : "pi_vendid", 
-        bind : "{pi_vendid}", 
         fieldLabel : "供应商ID", 
         allowBlank : true, 
         columnWidth : 0.0
     },{
         xtype: 'hidden',
         name: 'pi_vendcode',
-        bind: '{pi_vendcode}',
         fieldLabel: '供应商编号'
     }, {
         xtype: 'dbfindtrigger',
         name: 'pi_vendname',
-        bind: '{pi_vendname}',
         fieldLabel: '供应商名称',
         allowBlank : false,
     },{
         xtype : "datefield", 
         name : "pi_date", 
-        bind : "{pi_date}", 
         fieldLabel : "单据日期", 
         allowBlank : false, 
         columnWidth : 0.25,
@@ -87,7 +70,6 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanel', {
     },{
         xtype : "textfield", 
         name : "pi_total", 
-        bind : "{pi_total}", 
         fieldLabel : "总额", 
         allowBlank : true,
         readOnly: true,
@@ -95,14 +77,12 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanel', {
     }, {
         xtype : "hidden", 
         name : "pi_puid", 
-        bind : "{pi_puid}", 
         fieldLabel : "采购单id", 
         allowBlank : true, 
         columnWidth : 0.25
     },{
         xtype : "hidden", 
         name : "pi_pucode", 
-        bind : "{pi_pucode}", 
         fieldLabel : "采购单号", 
         allowBlank : true, 
         columnWidth : 0.25
@@ -110,7 +90,6 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanel', {
         name : "detailGridField", 
         xtype : "detailGridField",
         storeModel:'saas.model.purchase.ProdIODetail',
-        // deleteDetailUrl:'http://localhost:8800/prodinout/deleteDetail/',
         deleteDetailUrl:'/api/purchase/prodinout/deleteDetail/',
         detnoColumn:  'pd_pdno',
         columns : [
@@ -175,6 +154,7 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanel', {
             {
                 text : "数量", 
                 dataIndex : "pd_inqty", 
+                xtype: 'numbercolumn',
                 width : 120.0,
                 allowBlank : false,
                 editor : {
@@ -195,9 +175,10 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanel', {
                     var format = '0.' + xr.join();
                     return Ext.util.Format.number(v, format);
                 }
-            },            {
+            }, {
                 text : "已转数", 
                 dataIndex : "pd_yqty",
+                xtype: 'numbercolumn',
                 hidden:true, 
                 width : 120.0,
                 editor : {
@@ -250,6 +231,7 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanel', {
             },
             {
                 text : "单价",
+                xtype: 'numbercolumn',
                 editor : {
                     xtype : "numberfield",
                     decimalPrecision: 8,
@@ -264,6 +246,7 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanel', {
                     return Ext.util.Format.number(v, format);
                 },
             }, {
+                xtype: 'numbercolumn',
                 text : "税率", 
                 dataIndex : "pd_taxrate", 
                 width : 120.0,
@@ -275,6 +258,7 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanel', {
                 }
             },{
                 text : "含税金额", 
+                xtype: 'numbercolumn',
                 dataIndex : "pd_total", 
                 width : 120.0, 
                 editor : {
@@ -298,6 +282,7 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanel', {
             },
             {
                 text : "未税金额", 
+                xtype: 'numbercolumn',
                 dataIndex : "pd_nettotal", 
                 editor : {
                     xtype : "numberfield",

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

@@ -67,12 +67,14 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanelController', {
                             "text": "税率",
                             "dataIndex": "ve_taxrate",
                             "width": 100,
-                            align:'right'
+                            xtype: 'numbercolumn',
+                            align:'end'
                         }, {
                             "text": "承付天数",
                             "dataIndex": "ve_promisedays",
                             "width": 100,
-                            align:'right'
+                            xtype: 'numbercolumn',
+                            align:'end'
                         }, {
                             "text": "纳税人识别号",
                             "dataIndex": "ve_bankaccount",
@@ -171,7 +173,8 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanelController', {
                             "text": "总库存数",
                             "dataIndex": "po_onhand",
                             "width": 100,
-                            align:'right'
+                            xtype: 'numbercolumn',
+                            align:'end'
                         },{
                             "text": "类型",
                             "dataIndex": "pr_kind",
@@ -192,6 +195,7 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanelController', {
                             "text": "最小包装",
                             "dataIndex": "pr_zxbzs",
                             "width": 100,
+                            xtype: 'numbercolumn',
                         },{
                             "text": "L/T",
                             "dataIndex": "pr_leadtime",

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

@@ -55,11 +55,15 @@ Ext.define('saas.view.purchase.purchaseIn.QueryPanelController', {
                         }, {
                             "text": "税率",
                             "dataIndex": "ve_taxrate",
-                            "width": 100
+                            "width": 100,
+                            xtype: 'numbercolumn',
+                            align: 'end'
                         }, {
                             "text": "承付天数",
                             "dataIndex": "ve_promisedays",
-                            "width": 100
+                            "width": 100,
+                            xtype: 'numbercolumn',
+                            align: 'end'
                         }, {
                             "text": "纳税人识别号",
                             "dataIndex": "ve_bankaccount",
@@ -145,6 +149,8 @@ Ext.define('saas.view.purchase.purchaseIn.QueryPanelController', {
                             "text": "总库存数",
                             "dataIndex": "po_onhand",
                             "width": 100,
+                            xtype: 'numbercolumn',
+                            align: 'end'
                         },{
                             "text": "类型",
                             "dataIndex": "pr_kind",
@@ -165,6 +171,8 @@ Ext.define('saas.view.purchase.purchaseIn.QueryPanelController', {
                             "text": "最小包装",
                             "dataIndex": "pr_zxbzs",
                             "width": 100,
+                            xtype: 'numbercolumn',
+                            align: 'end'
                         },{
                             "text": "L/T",
                             "dataIndex": "pr_leadtime",

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

@@ -21,30 +21,17 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanel', {
     _auditUrl:'/api/purchase/prodinout/audit',
     _unAuditUrl:'/api/purchase/prodinout/unAudit/',
     _deleteUrl:'/api/purchase/prodinout/delete/',
-
-    // _relationColumn: 'pd_piid',
-    // _readUrl:'http://localhost:8800/prodinout/read/',
-    // _saveUrl:'http://localhost:8800/prodinout/save',
-    // _auditUrl:'http://localhost:8800/prodinout/audit',
-    // _deleteUrl:'http://localhost:8800/prodinout/delete/',
-
-
-
     initId:0,
-
     toolBtns: [],
-
     defaultItems: [{
         xtype: 'hidden',
         name: 'id',
-        bind: '{id}',
         fieldLabel: 'id',
         allowBlank: true,
         columnWidth: 0
     },{
         xtype : "textfield", 
         name : "pi_class", 
-        bind : "{pi_class}", 
         fieldLabel : "单据类型", 
         readOnly:true,
         allowBlank : true, 
@@ -52,7 +39,6 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanel', {
     }, {
         xtype : "hidden", 
         name : "pi_vendid", 
-        bind : "{pi_vendid}", 
         fieldLabel : "供应商ID", 
         allowBlank : true, 
         hidden:true,
@@ -60,18 +46,15 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanel', {
     },{
         xtype: 'hidden',
         name: 'pi_vendcode',
-        bind: '{pi_vendcode}',
         fieldLabel: '供应商编号'
     }, {
         xtype: 'dbfindtrigger',
         name: 'pi_vendname',
-        bind: '{pi_vendname}',
         fieldLabel: '供应商名称',
         allowBlank : false,
     },{
         xtype : "datefield", 
         name : "pi_date", 
-        bind : "{pi_date}", 
         fieldLabel : "单据日期", 
         allowBlank : false, 
         columnWidth : 0.25,
@@ -166,7 +149,8 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanel', {
             },
             {
                 text : "数量", 
-                dataIndex : "pd_outqty", 
+                dataIndex : "pd_outqty",
+                xtype: 'numbercolumn',
                 allowBlank : false,
                 editor : {
                     xtype : "numberfield",
@@ -229,6 +213,7 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanel', {
             },
             {
                 text : "单价",
+                xtype: 'numbercolumn',
                 editor : {
                     xtype : "numberfield",
                     decimalPrecision: 8,
@@ -244,6 +229,7 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanel', {
                 },
             },{
                 text : "税率", 
+                xtype: 'numbercolumn',
                 dataIndex : "pd_taxrate", 
                 width : 120.0,
                 editor : {
@@ -255,6 +241,7 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanel', {
             }, 
             {
                 text : "含税金额", 
+                xtype: 'numbercolumn',
                 dataIndex : "pd_total", 
                 width : 120.0, 
                 editor : {
@@ -278,6 +265,7 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanel', {
             },
             {
                 text : "未税金额", 
+                xtype: 'numbercolumn',
                 dataIndex : "pd_nettotal", 
                 editor : {
                     xtype : "numberfield",

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

@@ -66,12 +66,14 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanelController', {
                             "text": "税率",
                             "dataIndex": "ve_taxrate",
                             "width": 100,
-                            align:'right'
+                            xtype: 'numbercolumn',
+                            align:'end'
                         }, {
                             "text": "承付天数",
                             "dataIndex": "ve_promisedays",
                             "width": 100,
-                            align:'right'
+                            xtype: 'numbercolumn',
+                            align:'end'
                         }, {
                             "text": "纳税人识别号",
                             "dataIndex": "ve_bankaccount",
@@ -170,7 +172,8 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanelController', {
                             "text": "总库存数",
                             "dataIndex": "po_onhand",
                             "width": 100,
-                            align:'right'
+                            xtype: 'numbercolumn',
+                            align:'end'
                         },{
                             "text": "类型",
                             "dataIndex": "pr_kind",
@@ -191,7 +194,8 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanelController', {
                             "text": "最小包装",
                             "dataIndex": "pr_zxbzs",
                             "width": 100,
-                            align:'right'
+                            xtype: 'numbercolumn',
+                            align:'end'
                         },{
                             "text": "L/T",
                             "dataIndex": "pr_leadtime",

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

@@ -55,11 +55,14 @@ Ext.define('saas.view.purchase.purchaseOut.QueryPanelController', {
                         }, {
                             "text": "税率",
                             "dataIndex": "ve_taxrate",
-                            "width": 100
+                            "width": 100,
+                            xtype: 'numbercolumn',
                         }, {
                             "text": "承付天数",
                             "dataIndex": "ve_promisedays",
-                            "width": 100
+                            "width": 100,
+                            xtype: 'numbercolumn',
+                            align: 'end'
                         }, {
                             "text": "纳税人识别号",
                             "dataIndex": "ve_bankaccount",
@@ -142,6 +145,8 @@ Ext.define('saas.view.purchase.purchaseOut.QueryPanelController', {
                             "text": "总库存数",
                             "dataIndex": "po_onhand",
                             "width": 100,
+                            xtype: 'numbercolumn',
+                            align: 'end'
                         },{
                             "text": "类型",
                             "dataIndex": "pr_kind",
@@ -162,6 +167,8 @@ Ext.define('saas.view.purchase.purchaseOut.QueryPanelController', {
                             "text": "最小包装",
                             "dataIndex": "pr_zxbzs",
                             "width": 100,
+                            xtype: 'numbercolumn',
+                            align: 'end'
                         },{
                             "text": "L/T",
                             "dataIndex": "pr_leadtime",

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

@@ -65,7 +65,8 @@ Ext.define('saas.view.purchase.report.Purchase', {
         dataIndex: 'pu_date'
     }, {
         text: '序号',
-        dataIndex: 'pd_detno'
+        dataIndex: 'pd_detno',
+        xtype: 'numbercolumn'
     }, {
         text: '物料编号',
         dataIndex: 'pd_prodcode'
@@ -96,29 +97,49 @@ Ext.define('saas.view.purchase.report.Purchase', {
     }, {
         text: '采购数量',
         dataIndex: 'pd_qty',
-        summaryType: 'count'
+        xtype: 'numbercolumn',
+        summaryType: 'sum',
+        summaryRenderer: function(v) {
+            var arr = (v + '.').split('.');
+            var xr = (new Array(arr[1].length)).fill('0');
+            var format = '0.' + xr.join();
+            return Ext.util.Format.number(v, format);
+        }
     }, {
         text: '单价',
-        dataIndex: 'pd_price'
+        dataIndex: 'pd_price',
+        xtype: 'numbercolumn'
     }, {
         text: '税率',
-        dataIndex: 'pd_taxrate'
+        dataIndex: 'pd_taxrate',
+        xtype: 'numbercolumn'
     }, {
         text: '金额',
         dataIndex: 'pd_total',
-        summaryType: 'count'
+        xtype: 'numbercolumn',
+        summaryType: 'sum',
+        summaryRenderer: function(v) {
+            var arr = (v + '.').split('.');
+            var xr = (new Array(arr[1].length)).fill('0');
+            var format = '0,000.' + xr.join();
+            return Ext.util.Format.number(v, format);
+        }
     }, {
         text: '不含税单价',
-        dataIndex: 'pd_taxprice'
+        dataIndex: 'pd_taxprice',
+        xtype: 'numbercolumn'
     }, {
         text: '不含税金额',
-        dataIndex: 'pd_taxtotal'
+        dataIndex: 'pd_taxtotal',
+        xtype: 'numbercolumn'
     }, {
         text: '收货数量',
-        dataIndex: 'pd_acceptqty'
+        dataIndex: 'pd_acceptqty',
+        xtype: 'numbercolumn'
     }, {
         text: '收货金额',
-        dataIndex: 'pd_accepttotal'
+        dataIndex: 'pd_accepttotal',
+        xtype: 'numbercolumn'
     }, {
         text: '备注'
     }]

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

@@ -52,11 +52,15 @@ Ext.define('saas.view.purchase.report.PurchaseController', {
                         }, {
                             "text": "税率",
                             "dataIndex": "ve_taxrate",
-                            "width": 100
+                            "width": 100,
+                            xtype: 'numbercolumn',
+                            align: 'end'
                         }, {
                             "text": "承付天数",
                             "dataIndex": "ve_promisedays",
-                            "width": 100
+                            "width": 100,
+                            xtype: 'numbercolumn',
+                            align: 'end'
                         }, {
                             "text": "纳税人识别号",
                             "dataIndex": "ve_bankaccount",

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

@@ -60,14 +60,10 @@ Ext.define('saas.view.purchase.report.PurchasePay', {
         width: 200
     }, {//∑求和
         text: '采购金额',
+        xtype: 'numbercolumn',
         dataIndex: 'pbd_amount',
+        xtype: 'numbercolumn',
         width: 200,
-        renderer : function(v) {
-            var arr = (v + '.').split('.');
-            var xr = (new Array(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('.');
@@ -78,13 +74,8 @@ Ext.define('saas.view.purchase.report.PurchasePay', {
     }, {//∑求和
         text: '本次付款',
         dataIndex: 'pbd_nowbalance',
+        xtype: 'numbercolumn',
         width: 200,
-        renderer : function(v) {
-            var arr = (v + '.').split('.');
-            var xr = (new Array(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('.');
@@ -94,19 +85,14 @@ Ext.define('saas.view.purchase.report.PurchasePay', {
         }
     }, {
         text: '应付余额',
+        xtype: 'numbercolumn',
         dataIndex: 'pb_pbdamount',
-        width: 200,
-        renderer : function(v) {
-            var arr = (v + '.').split('.');
-            var xr = (new Array(arr[1].length)).fill('0');
-            var format = '0,000.' + xr.join();
-            return Ext.util.Format.number(v, format);
-        },
+        xtype: 'numbercolumn'
     }, {
         text: '付款比例',
         //本次付款/采购金额*100%
         dataIndex: 'pb_payrate',
-        width: 200
+        xtype: 'numbercolumn'
     }, {
         text: '备注',
         dataIndex: 'pd_remark',

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

@@ -53,11 +53,15 @@ Ext.define('saas.view.purchase.report.PurchasePayController', {
                         }, {
                             "text": "税率",
                             "dataIndex": "ve_taxrate",
-                            "width": 100
+                            "width": 100,
+                            xtype: 'numbercolumn',
+                            align: 'end'
                         }, {
                             "text": "承付天数",
                             "dataIndex": "ve_promisedays",
-                            "width": 100
+                            "width": 100,
+                            xtype: 'numbercolumn',
+                            align: 'end'
                         }, {
                             "text": "纳税人识别号",
                             "dataIndex": "ve_bankaccount",

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

@@ -70,7 +70,8 @@ Ext.define('saas.view.sale.report.Sale', {
         dataIndex: 'sa_date'
     }, {
         text: '序号',
-        dataIndex: 'sd_detno'
+        dataIndex: 'sd_detno',
+        xtype: 'numbercolumn'
     }, {
         text: '物料编号',
         dataIndex: 'sd_prodcode',
@@ -103,6 +104,7 @@ Ext.define('saas.view.sale.report.Sale', {
     }, {//∑数量
         text: '数量',
         dataIndex: 'sd_qty',
+        xtype: 'numbercolumn',
         renderer : function(v) {
             var arr = (v + '.').split('.');
             var xr = (new Array(arr[1].length)).fill('0');
@@ -118,25 +120,18 @@ Ext.define('saas.view.sale.report.Sale', {
         }
     }, {
         text: '单价',
+        xtype: 'numbercolumn',
         dataIndex: 'sd_price',
-        renderer : function(v) {
-            var arr = (v + '.').split('.');
-            var xr = (new Array(arr[1].length)).fill('0');
-            var format = '0,000.' + xr.join();
-            return Ext.util.Format.number(v, format);
-        }
+        xtype: 'numbercolumn'
     }, {
         text: '税率',
-        dataIndex: 'sd_taxrate'
+        dataIndex: 'sd_taxrate',
+        xtype: 'numbercolumn'
     }, {//∑金额
         text: '金额',
+        xtype: 'numbercolumn',
         dataIndex: 'sd_total',
-        renderer : function(v) {
-            var arr = (v + '.').split('.');
-            var xr = (new Array(arr[1].length)).fill('0');
-            var format = '0,000.' + xr.join();
-            return Ext.util.Format.number(v, format);
-        },
+        xtype: 'numbercolumn',
         summaryType: 'sum',
         summaryRenderer: function(v) {
             var arr = (v + '.').split('.');
@@ -146,13 +141,9 @@ Ext.define('saas.view.sale.report.Sale', {
         }
     }, {//∑不含税金额
         text: '不含税金额',
+        xtype: 'numbercolumn',
         dataIndex: 'sd_nettotal',
-        renderer : function(v) {
-            var arr = (v + '.').split('.');
-            var xr = (new Array(arr[1].length)).fill('0');
-            var format = '0,000.' + xr.join();
-            return Ext.util.Format.number(v, format);
-        },
+        xtype: 'numbercolumn',
         summaryType: 'sum',
         summaryRenderer: function(v) {
             var arr = (v + '.').split('.');
@@ -163,6 +154,7 @@ Ext.define('saas.view.sale.report.Sale', {
     }, {
         text: '出货数量',
         dataIndex: 'sd_sendqty',
+        xtype: 'numbercolumn',
         renderer : function(v) {
             var arr = (v + '.').split('.');
             var xr = (new Array(arr[1].length)).fill('0');

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

@@ -82,17 +82,21 @@ Ext.define('saas.view.sale.report.SaleController', {
                                 "text": "税率",
                                 "flex": 1,
                                 "dataIndex": "cu_taxrate",
-                                "width": 100
+                                "width": 100,
+                                xtype: 'numbercolumn',
                             }, {
                                 "text": "承付天数",
                                 "flex": 1,
                                 "dataIndex": "cu_promisedays",
-                                "width": 100
+                                "width": 100,
+                                xtype: 'numbercolumn',
+                                align: 'end'
                             }, {
                                 "text": "额度",
                                 "flex": 1,
                                 "dataIndex": "cu_credit",
-                                "width": 100
+                                "width": 100,
+                                xtype: 'numbercolumn',
                             }, {
                                 "text": "客户地址",
                                 "flex": 1,

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

@@ -77,28 +77,36 @@ Ext.define('saas.view.sale.report.SaleProfit', {
         dataIndex: 'pr_spec'
     }, {
         text: '单位',
+        xtype: 'numbercolumn',
         dataIndex: 'pr_unit'
     }, {
         text: '数量',
-        dataIndex: 'pd_outqty'
+        dataIndex: 'pd_outqty',
+        xtype: 'numbercolumn'
     }, {
         text: '单价',
-        dataIndex: 'pd_sendprice'
+        dataIndex: 'pd_sendprice',
+        xtype: 'numbercolumn'
     }, {
         text: '税率%',
-        dataIndex: 'pd_taxrate'
+        dataIndex: 'pd_taxrate',
+        xtype: 'numbercolumn'
     }, {
         text: '含税金额',
-        dataIndex: 'pd_ordertotal'
+        dataIndex: 'pd_ordertotal',
+        xtype: 'numbercolumn'
     }, {
         text: '成本金额',
-        dataIndex: 'pd_total'
+        dataIndex: 'pd_total',
+        xtype: 'numbercolumn'
     }, {
         text: '毛利润',
-        dataIndex: 'pd_profit'
+        dataIndex: 'pd_profit',
+        xtype: 'numbercolumn'
     }, {
         text: '毛利率%',
-        dataIndex: 'pd_profitpresent'
+        dataIndex: 'pd_profitpresent',
+        xtype: 'numbercolumn'
     }, {
         text : "备注", 
         dataIndex : "pd_remark",

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

@@ -82,17 +82,23 @@ Ext.define('saas.view.sale.report.SaleProfitController', {
                                 "text": "税率",
                                 "flex": 1,
                                 "dataIndex": "cu_taxrate",
-                                "width": 100
+                                "width": 100,
+                                xtype: 'numbercolumn',
+                                align: 'end'
                             }, {
                                 "text": "承付天数",
                                 "flex": 1,
                                 "dataIndex": "cu_promisedays",
-                                "width": 100
+                                "width": 100,
+                                xtype: 'numbercolumn',
+                                align: 'end'
                             }, {
                                 "text": "额度",
                                 "flex": 1,
                                 "dataIndex": "cu_credit",
-                                "width": 100
+                                "width": 100,
+                                xtype: 'numbercolumn',
+                                align: 'end'
                             }, {
                                 "text": "客户地址",
                                 "flex": 1,
@@ -170,7 +176,8 @@ Ext.define('saas.view.sale.report.SaleProfitController', {
                             "text": "总库存数",
                             "dataIndex": "po_onhand",
                             "width": 100,
-                            align:'right'
+                            xtype: 'numbercolumn',
+                            align:'end'
                         },{
                             "text": "类型",
                             "dataIndex": "pr_kind",
@@ -191,7 +198,8 @@ Ext.define('saas.view.sale.report.SaleProfitController', {
                             "text": "最小包装",
                             "dataIndex": "pr_zxbzs",
                             "width": 100,
-                            align:'right'
+                            xtype: 'numbercolumn',
+                            align:'end'
                         },{
                             "text": "L/T",
                             "dataIndex": "pr_leadtime",

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

@@ -56,17 +56,23 @@ Ext.define('saas.view.sale.report.SaleRec', {
         dataIndex: 'rbd_slkind'
     }, {
         text: '销售金额',
+        xtype: 'numbercolumn',
         dataIndex: 'rbd_amount'
     }, {
         text: '本次收款',
+        xtype: 'numbercolumn',
         dataIndex: 'rbd_nowbalance'
     }, {
-        text: '应收余额'
+        text: '应收余额',
+        xtype: 'numbercolumn',
+        dataIndex: 'rb_rbdamount'
     }, {
-        text: '回款比例'
+        text: '回款比例',
+        xtype: 'numbercolumn',
+        dataIndex: 'rb_backrate'
     }, {
         text: '备注',
-        dataIndex: 'rbd_remark'
+        dataIndex: 'rb_remark'
     }]
 
 });

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

@@ -82,17 +82,23 @@ Ext.define('saas.view.sale.report.SaleRecController', {
                                 "text": "税率",
                                 "flex": 1,
                                 "dataIndex": "cu_taxrate",
-                                "width": 100
+                                "width": 100,
+                                xtype: 'numbercolumn',
+                                align: 'end'
                             }, {
                                 "text": "承付天数",
                                 "flex": 1,
                                 "dataIndex": "cu_promisedays",
-                                "width": 100
+                                "width": 100,
+                                xtype: 'numbercolumn',
+                                align: 'end'
                             }, {
                                 "text": "额度",
                                 "flex": 1,
                                 "dataIndex": "cu_credit",
-                                "width": 100
+                                "width": 100,
+                                xtype: 'numbercolumn',
+                                align: 'end'
                             }, {
                                 "text": "客户地址",
                                 "flex": 1,

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

@@ -54,7 +54,9 @@ Ext.define('saas.view.sale.sale.FormPanel', {
     }, {
         xtype : "datefield", 
         name : "sa_date", 
-        fieldLabel : "单据日期"
+        fieldLabel : "单据日期", 
+        allowBlank : false, 
+        defaultValue: new Date()
     }, {
         xtype : "textfield", 
         name : "sa_toplace", 
@@ -125,6 +127,7 @@ Ext.define('saas.view.sale.sale.FormPanel', {
             }, {
                 text : "数量", 
                 dataIndex : "sd_qty",
+                xtype: 'numbercolumn',
                 allowBlank:false, 
                 editor : {
                     xtype : "numberfield",
@@ -146,6 +149,7 @@ Ext.define('saas.view.sale.sale.FormPanel', {
                 }
             },  {
                 text : "已转数", 
+                xtype: 'numbercolumn',
                 dataIndex : "sd_yqty", 
                 width : 120.0, 
                 hidden : true,
@@ -169,6 +173,7 @@ Ext.define('saas.view.sale.sale.FormPanel', {
             },
             {
                 text : "单价", 
+                xtype: 'numbercolumn',
                 dataIndex : "sd_price", 
                 width : 120.0,
                 editor : {
@@ -185,6 +190,7 @@ Ext.define('saas.view.sale.sale.FormPanel', {
             }, 
             {
                 text : "税率", 
+                xtype: 'numbercolumn',
                 dataIndex : "sd_taxrate", 
                 width : 120.0, 
                 editor : {
@@ -196,6 +202,7 @@ Ext.define('saas.view.sale.sale.FormPanel', {
             },
             {
                 text : "含税金额", 
+                xtype: 'numbercolumn',
                 dataIndex : "sd_total", 
                 width : 120.0,
                 renderer : function(v) {
@@ -214,6 +221,7 @@ Ext.define('saas.view.sale.sale.FormPanel', {
             }, 
             {
                 text : "未税金额", 
+                xtype: 'numbercolumn',
                 dataIndex : "sd_nettotal",
                 renderer : function(v) {
                     var arr = (v + '.').split('.');
@@ -278,7 +286,8 @@ Ext.define('saas.view.sale.sale.FormPanel', {
         xtype : "datefield", 
         name : "sa_recorddate", 
         fieldLabel : "录入日期",
-        readOnly:true
+        readOnly:true, 
+        defaultValue: new Date()
     }, {
         xtype : "textfield", 
         name : "sa_auditman", 

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

@@ -84,19 +84,22 @@ Ext.define('saas.view.sale.sale.FormPanelController', {
                                 "flex": 1,
                                 "dataIndex": "cu_taxrate",
                                 "width": 100,
-                                align:'right'
+                                xtype: 'numbercolumn',
+                                align:'end'
                             }, {
                                 "text": "承付天数",
                                 "flex": 1,
                                 "dataIndex": "cu_promisedays",
                                 "width": 100,
-                                align:'right'
+                                xtype: 'numbercolumn',
+                                align:'end'
                             }, {
                                 "text": "额度",
                                 "flex": 1,
                                 "dataIndex": "cu_credit",
                                 "width": 100,
-                                align:'right'
+                                xtype: 'numbercolumn',
+                                align:'end'
                             }, {
                                 "text": "客户地址",
                                 "flex": 1,
@@ -177,7 +180,8 @@ Ext.define('saas.view.sale.sale.FormPanelController', {
                             "text": "总库存数",
                             "dataIndex": "po_onhand",
                             "width": 100,
-                            align:'right'
+                            xtype: 'numbercolumn',
+                            align:'end'
                         },{
                             "text": "类型",
                             "dataIndex": "pr_kind",
@@ -198,7 +202,8 @@ Ext.define('saas.view.sale.sale.FormPanelController', {
                             "text": "最小包装",
                             "dataIndex": "pr_zxbzs",
                             "width": 100,
-                            align:'right'
+                            xtype: 'numbercolumn',
+                            align:'end'
                         },{
                             "text": "L/T",
                             "dataIndex": "pr_leadtime",

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

@@ -80,17 +80,22 @@ Ext.define('saas.view.sale.sale.QueryPanelController', {
                                 "text": "税率",
                                 "flex": 1,
                                 "dataIndex": "cu_taxrate",
-                                "width": 100
+                                "width": 100,
+                                xtype: 'numbercolumn',
                             }, {
                                 "text": "承付天数",
                                 "flex": 1,
                                 "dataIndex": "cu_promisedays",
-                                "width": 100
+                                "width": 100,
+                                xtype: 'numbercolumn',
+                                align: 'end'
                             }, {
                                 "text": "额度",
                                 "flex": 1,
                                 "dataIndex": "cu_credit",
-                                "width": 100
+                                "width": 100,
+                                xtype: 'numbercolumn',
+                                align: 'end'
                             }, {
                                 "text": "客户地址",
                                 "flex": 1,
@@ -166,6 +171,8 @@ Ext.define('saas.view.sale.sale.QueryPanelController', {
                             "text": "总库存数",
                             "dataIndex": "po_onhand",
                             "width": 100,
+                            xtype: 'numbercolumn',
+                            align: 'end'
                         },{
                             "text": "类型",
                             "dataIndex": "pr_kind",
@@ -186,6 +193,8 @@ Ext.define('saas.view.sale.sale.QueryPanelController', {
                             "text": "最小包装",
                             "dataIndex": "pr_zxbzs",
                             "width": 100,
+                            xtype: 'numbercolumn',
+                            align: 'end'
                         },{
                             "text": "L/T",
                             "dataIndex": "pr_leadtime",

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

@@ -49,6 +49,13 @@ Ext.define('saas.view.sale.saleIn.FormPanel', {
         name : "pi_custname", 
         fieldLabel : "客户名称",
         allowBlank:false,
+    }, {
+        xtype : "datefield", 
+        name : "pi_date", 
+        fieldLabel : "单据日期", 
+        allowBlank : false, 
+        columnWidth : 0.25,
+        defaultValue: new Date()
     }, {
         xtype : "textfield", 
         name : "pi_address", 
@@ -116,6 +123,7 @@ Ext.define('saas.view.sale.saleIn.FormPanel', {
                 }
             }, {
                 text : "数量", 
+                xtype: 'numbercolumn',
                 dataIndex : "pd_inqty", 
                 allowBlank:false,
                 width : 120.0,
@@ -166,6 +174,7 @@ Ext.define('saas.view.sale.saleIn.FormPanel', {
             },
             {
                 text : "单价", 
+                xtype: 'numbercolumn',
                 dataIndex : "pd_sendprice", 
                 width : 120.0, 
                 editor : {
@@ -182,6 +191,7 @@ Ext.define('saas.view.sale.saleIn.FormPanel', {
             }, 
            {
                 text : "含税金额", 
+                xtype: 'numbercolumn',
                 dataIndex : "pd_ordertotal", 
                 width : 120.0, 
                 renderer : function(v) {
@@ -199,6 +209,7 @@ Ext.define('saas.view.sale.saleIn.FormPanel', {
                 }
             }, {
                 text : "税率", 
+                xtype: 'numbercolumn',
                 dataIndex : "pd_taxrate", 
                 width : 120.0, 
                 editor : {
@@ -210,6 +221,7 @@ Ext.define('saas.view.sale.saleIn.FormPanel', {
             },
             {
                 text : "未税金额", 
+                xtype: 'numbercolumn',
                 dataIndex : "pd_nettotal", 
                 renderer : function(v) {
                     var arr = (v + '.').split('.');
@@ -265,7 +277,8 @@ Ext.define('saas.view.sale.saleIn.FormPanel', {
         xtype : "datefield", 
         name : "pi_recorddate", 
         fieldLabel : "录入日期",
-        readOnly:true
+        readOnly:true,
+        defaultValue: new Date()
     }, {
         xtype : "textfield", 
         name : "pi_auditman", 

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

@@ -85,19 +85,22 @@ Ext.define('saas.view.sale.saleIn.FormPanelController', {
                             "flex": 1,
                             "dataIndex": "cu_taxrate",
                             "width": 100,
-                            align:'right'
+                            xtype: 'numbercolumn',
+                            align:'end'
                         }, {
                             "text": "承付天数",
                             "flex": 1,
                             "dataIndex": "cu_promisedays",
                             "width": 100,
-                            align:'right'
+                            xtype: 'numbercolumn',
+                            align:'end'
                         }, {
                             "text": "额度",
                             "flex": 1,
                             "dataIndex": "cu_credit",
                             "width": 100,
-                            align:'right'
+                            xtype: 'numbercolumn',
+                            align:'end'
                         }, {
                             "text": "客户地址",
                             "flex": 1,
@@ -177,7 +180,8 @@ Ext.define('saas.view.sale.saleIn.FormPanelController', {
                             "text": "总库存数",
                             "dataIndex": "po_onhand",
                             "width": 100,
-                            align:'right'
+                            xtype: 'numbercolumn',
+                            align:'end'
                         },{
                             "text": "类型",
                             "dataIndex": "pr_kind",
@@ -198,7 +202,8 @@ Ext.define('saas.view.sale.saleIn.FormPanelController', {
                             "text": "最小包装",
                             "dataIndex": "pr_zxbzs",
                             "width": 100,
-                            align:'right'
+                            xtype: 'numbercolumn',
+                            align:'end'
                         },{
                             "text": "L/T",
                             "dataIndex": "pr_leadtime",

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

@@ -110,12 +110,14 @@ Ext.define('saas.view.sale.saleIn.QueryPanel', {
             text: '含税金额',
             dataIndex: 'pi_total',
             xtype:'numbercolumn',
-            width: 120
+            width: 120,
+            align:'right'
         },{
             text: '未税金额',
             dataIndex: 'pi_nettotal',
             xtype:'numbercolumn',
-            width: 120
+            width: 120,
+            align:'right'
         }, {
             text: '备注',
             dataIndex: 'pi_remark',
@@ -165,22 +167,26 @@ Ext.define('saas.view.sale.saleIn.QueryPanel', {
             text: '销售单价',
             dataIndex: 'pd_sendprice',
             xtype:'numbercolumn',
-            width: 120
+            width: 120,
+            align:'right'
         },{
             text: '金额',
             dataIndex: 'pd_total',
             xtype:'numbercolumn',
-            width: 120
+            width: 120,
+            align:'right'
         },{
             text: '税率',
             dataIndex: 'pd_taxrate',
             xtype:'numbercolumn',
-            width: 120
+            width: 120,
+            align:'right'
         },{
             text: '成本单价',
             dataIndex: 'pd_price',
             xtype:'numbercolumn',
-            width: 120
+            width: 120,
+            align:'right'
         }, {
             text: '备注',
             dataIndex: 'pd_remark',

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

@@ -72,17 +72,23 @@ Ext.define('saas.view.sale.saleIn.QueryPanelController', {
                                 "text": "税率",
                                 "flex": 1,
                                 "dataIndex": "cu_taxrate",
-                                "width": 100
+                                "width": 100,
+                                xtype: 'numbercolumn',
+                                align: 'end'
                             }, {
                                 "text": "承付天数",
                                 "flex": 1,
                                 "dataIndex": "cu_promisedays",
-                                "width": 100
+                                "width": 100,
+                                xtype: 'numbercolumn',
+                                align: 'end'
                             }, {
                                 "text": "额度",
                                 "flex": 1,
                                 "dataIndex": "cu_credit",
-                                "width": 100
+                                "width": 100,
+                                xtype: 'numbercolumn',
+                                align: 'end'
                             }, {
                                 "text": "客户地址",
                                 "flex": 1,
@@ -160,6 +166,8 @@ Ext.define('saas.view.sale.saleIn.QueryPanelController', {
                             "text": "总库存数",
                             "dataIndex": "po_onhand",
                             "width": 100,
+                            xtype: 'numbercolumn',
+                            align: 'end'
                         },{
                             "text": "类型",
                             "dataIndex": "pr_kind",
@@ -180,6 +188,8 @@ Ext.define('saas.view.sale.saleIn.QueryPanelController', {
                             "text": "最小包装",
                             "dataIndex": "pr_zxbzs",
                             "width": 100,
+                            xtype: 'numbercolumn',
+                            align: 'end'
                         },{
                             "text": "L/T",
                             "dataIndex": "pr_leadtime",

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

@@ -57,6 +57,13 @@ Ext.define('saas.view.sale.saleout.FormPanel', {
         name : "pi_custname", 
         fieldLabel : "客户名称",
         allowBlank:false,
+    }, {
+        xtype : "datefield", 
+        name : "pi_date", 
+        fieldLabel : "单据日期", 
+        allowBlank : false, 
+        columnWidth : 0.25,
+        defaultValue: new Date()
     }, {
         xtype : "textfield", 
         name : "pi_address", 
@@ -126,6 +133,7 @@ Ext.define('saas.view.sale.saleout.FormPanel', {
                 }
             },  {
                 text : "出货数量", 
+                xtype: 'numbercolumn',
                 dataIndex : "pd_outqty", 
                 width : 120.0, 
                 allowBlank:false,
@@ -177,6 +185,7 @@ Ext.define('saas.view.sale.saleout.FormPanel', {
             },
             {
                 text : "单价", 
+                xtype: 'numbercolumn',
                 dataIndex : "pd_sendprice", 
                 width : 120.0,
                 editor : {
@@ -193,6 +202,7 @@ Ext.define('saas.view.sale.saleout.FormPanel', {
             }, 
            {
                 text : "含税金额", 
+                xtype: 'numbercolumn',
                 dataIndex : "pd_ordertotal", 
                 width : 120.0, 
                 renderer : function(v) {
@@ -210,6 +220,7 @@ Ext.define('saas.view.sale.saleout.FormPanel', {
                 }
             }, {
                 text : "税率", 
+                xtype: 'numbercolumn',
                 dataIndex : "pd_taxrate", 
                 width : 120.0, 
                 editor : {
@@ -221,6 +232,7 @@ Ext.define('saas.view.sale.saleout.FormPanel', {
             },
             {
                 text : "未税金额", 
+                xtype: 'numbercolumn',
                 dataIndex : "pd_nettotal", 
                 renderer : function(v) {
                     var arr = (v + '.').split('.');
@@ -270,7 +282,8 @@ Ext.define('saas.view.sale.saleout.FormPanel', {
         xtype : "datefield", 
         name : "pi_recorddate", 
         fieldLabel : "录入日期",
-        readOnly:true
+        readOnly:true,
+        defaultValue: new Date()
     }, {
         xtype : "textfield", 
         name : "pi_auditman", 

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

@@ -82,19 +82,22 @@ Ext.define('saas.view.sale.saleout.FormPanelController', {
                                 "flex": 1,
                                 "dataIndex": "cu_taxrate",
                                 "width": 100,
-                                align:'right'
+                                xtype: 'numbercolumn',
+                                align:'end'
                             }, {
                                 "text": "承付天数",
                                 "flex": 1,
                                 "dataIndex": "cu_promisedays",
                                 "width": 100,
-                                align:'right'
+                                xtype: 'numbercolumn',
+                                align:'end'
                             }, {
                                 "text": "额度",
                                 "flex": 1,
                                 "dataIndex": "cu_credit",
                                 "width": 100,
-                                align:'right'
+                                xtype: 'numbercolumn',
+                                align:'end'
                             }, {
                                 "text": "客户地址",
                                 "flex": 1,
@@ -174,6 +177,8 @@ Ext.define('saas.view.sale.saleout.FormPanelController', {
                             "text": "总库存数",
                             "dataIndex": "po_onhand",
                             "width": 100,
+                            xtype: 'numbercolumn',
+                            align: 'end'
                         },{
                             "text": "类型",
                             "dataIndex": "pr_kind",
@@ -194,6 +199,8 @@ Ext.define('saas.view.sale.saleout.FormPanelController', {
                             "text": "最小包装",
                             "dataIndex": "pr_zxbzs",
                             "width": 100,
+                            xtype: 'numbercolumn',
+                            align: 'end'
                         },{
                             "text": "L/T",
                             "dataIndex": "pr_leadtime",

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

@@ -81,17 +81,23 @@ Ext.define('saas.view.sale.saleout.QueryPanelController', {
                                 "text": "税率",
                                 "flex": 1,
                                 "dataIndex": "cu_taxrate",
-                                "width": 100
+                                "width": 100,
+                                xtype: 'numbercolumn',
+                                align: 'end'
                             }, {
                                 "text": "承付天数",
                                 "flex": 1,
                                 "dataIndex": "cu_promisedays",
-                                "width": 100
+                                "width": 100,
+                                xtype: 'numbercolumn',
+                                align: 'end'
                             }, {
                                 "text": "额度",
                                 "flex": 1,
                                 "dataIndex": "cu_credit",
-                                "width": 100
+                                "width": 100,
+                                xtype: 'numbercolumn',
+                                align: 'end'
                             }, {
                                 "text": "客户地址",
                                 "flex": 1,
@@ -168,6 +174,8 @@ Ext.define('saas.view.sale.saleout.QueryPanelController', {
                             "text": "总库存数",
                             "dataIndex": "po_onhand",
                             "width": 100,
+                            xtype: 'numbercolumn',
+                            align: 'end'
                         },{
                             "text": "类型",
                             "dataIndex": "pr_kind",
@@ -188,6 +196,8 @@ Ext.define('saas.view.sale.saleout.QueryPanelController', {
                             "text": "最小包装",
                             "dataIndex": "pr_zxbzs",
                             "width": 100,
+                            xtype: 'numbercolumn',
+                            align: 'end'
                         },{
                             "text": "L/T",
                             "dataIndex": "pr_leadtime",

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

@@ -139,6 +139,7 @@ Ext.define('saas.view.stock.appropriationInOut.FormPanel', {
             },
             {
                 text : "数量", 
+                xtype: 'numbercolumn',
                 dataIndex : "pd_inqty", 
                 width : 120.0,
                 allowBlank:false,

frontend/saas-web/app/view/stock/appropriationInOut/FormPanelController.js

@@ -65,12 +65,14 @@ Ext.define('saas.view.stock.appropriationInOut.FormPanelController', {
                             "text": "税率",
                             "dataIndex": "ve_taxrate",
                             "width": 100,
-                            align:'right'
+                            xtype: 'numbercolumn',
+                            align:'end'
                         }, {
                             "text": "承付天数",
                             "dataIndex": "ve_promisedays",
                             "width": 100,
-                            align:'right'
+                            xtype: 'numbercolumn',
+                            align:'end'
                         }, {
                             "text": "纳税人识别号",
                             "dataIndex": "ve_bankaccount",
@@ -144,17 +146,20 @@ Ext.define('saas.view.stock.appropriationInOut.FormPanelController', {
                             "text": "税率",
                             "dataIndex": "cu_taxrate",
                             "width": 100,
-                            align:'right'
+                            xtype: 'numbercolumn',
+                            align:'end'
                         },{
                             "text": "承付天数",
                             "dataIndex": "cu_promisedays",
                             "width": 100,
-                            align:'right'
+                            xtype: 'numbercolumn',
+                            align:'end'
                         },{
                             "text": "额度",
                             "dataIndex": "cu_credit",
                             "width": 100,
-                            align:'right'
+                            xtype: 'numbercolumn',
+                            align:'end'
                         }]
                     }) ;   
 
@@ -238,7 +243,8 @@ Ext.define('saas.view.stock.appropriationInOut.FormPanelController', {
                             "text": "总库存数",
                             "dataIndex": "po_onhand",
                             "width": 100,
-                            align:'right'
+                            xtype: 'numbercolumn',
+                            align:'end'
                         },{
                             "text": "类型",
                             "dataIndex": "pr_kind",
@@ -259,7 +265,8 @@ Ext.define('saas.view.stock.appropriationInOut.FormPanelController', {
                             "text": "最小包装",
                             "dataIndex": "pr_zxbzs",
                             "width": 100,
-                            align:'right'
+                            xtype: 'numbercolumn',
+                            align:'end'
                         },{
                             "text": "L/T",
                             "dataIndex": "pr_leadtime",

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

@@ -84,7 +84,7 @@ Ext.define('saas.view.stock.appropriationInOut.QueryPanel', {
         baseColumn: [{
             text: 'id',
             dataIndex: 'id',
-            width: 100,
+            width: 0,
             xtype: 'numbercolumn'
         }, {
             text: '单据编号',

frontend/saas-web/app/view/stock/appropriationInOut/QueryPanelController.js

@@ -55,11 +55,15 @@ Ext.define('saas.view.stock.appropriationInOut.QueryPanelController', {
                         }, {
                             "text": "税率",
                             "dataIndex": "ve_taxrate",
-                            "width": 100
+                            "width": 100,
+                            xtype: 'numbercolumn',
+                            align: 'end'
                         }, {
                             "text": "承付天数",
                             "dataIndex": "ve_promisedays",
-                            "width": 100
+                            "width": 100,
+                            xtype: 'numbercolumn',
+                            align: 'end'
                         }, {
                             "text": "纳税人识别号",
                             "dataIndex": "ve_bankaccount",
@@ -141,6 +145,8 @@ Ext.define('saas.view.stock.appropriationInOut.QueryPanelController', {
                             "text": "总库存数",
                             "dataIndex": "po_onhand",
                             "width": 100,
+                            xtype: 'numbercolumn',
+                            align: 'end'
                         },{
                             "text": "类型",
                             "dataIndex": "pr_kind",
@@ -161,6 +167,8 @@ Ext.define('saas.view.stock.appropriationInOut.QueryPanelController', {
                             "text": "最小包装",
                             "dataIndex": "pr_zxbzs",
                             "width": 100,
+                            xtype: 'numbercolumn',
+                            align: 'end'
                         },{
                             "text": "L/T",
                             "dataIndex": "pr_leadtime",

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

@@ -194,6 +194,7 @@ Ext.define('saas.view.stock.make.FormPanel', {
             },            
             {
                 text : "需求数量", 
+                xtype: 'numbercolumn',
                 dataIndex : "mm_qty", 
                 width : 120.0,
                 editor : {
@@ -217,6 +218,7 @@ Ext.define('saas.view.stock.make.FormPanel', {
             },
             {
                 text : "单位用量", 
+                xtype: 'numbercolumn',
                 dataIndex : "mm_oneuseqty", 
                 width : 120.0,
                 // hidden:true,
@@ -273,6 +275,7 @@ Ext.define('saas.view.stock.make.FormPanel', {
             },{
                 text : "出库单位成本", 
                 dataIndex : "mm_price", 
+                xtype: 'numbercolumn',
                 width : 120.0,
                 editor : {
                     xtype : "numberfield",
@@ -290,6 +293,7 @@ Ext.define('saas.view.stock.make.FormPanel', {
                 }
             },            {
                 text : "出库成本", 
+                xtype: 'numbercolumn',
                 dataIndex : "mm_amount", 
                 width : 120.0, 
                 editor : {

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

@@ -205,7 +205,8 @@ Ext.define('saas.view.stock.make.FormPanelController', {
                             "text": "总库存数",
                             "dataIndex": "po_onhand",
                             "width": 100,
-                            align:'right'
+                            xtype: 'numbercolumn',
+                            align:'end'
                         },{
                             "text": "类型",
                             "dataIndex": "pr_kind",
@@ -226,7 +227,8 @@ Ext.define('saas.view.stock.make.FormPanelController', {
                             "text": "最小包装",
                             "dataIndex": "pr_zxbzs",
                             "width": 100,
-                            align:'right'
+                            xtype: 'numbercolumn',
+                            align:'end'
                         },{
                             "text": "L/T",
                             "dataIndex": "pr_leadtime",
@@ -323,7 +325,7 @@ Ext.define('saas.view.stock.make.FormPanelController', {
                         //     "text": "总库存数",
                         //     "dataIndex": "po_onhand",
                         //     "width": 100,
-                        //     align:'right'
+                        //     align:'end'
                         // },{
                         //     "text": "类型",
                         //     "dataIndex": "pr_kind",
@@ -344,7 +346,7 @@ Ext.define('saas.view.stock.make.FormPanelController', {
                         //     "text": "最小包装",
                         //     "dataIndex": "pr_zxbzs",
                         //     "width": 100,
-                        //     align:'right'
+                        //     align:'end'
                         // },{
                         //     "text": "L/T",
                         //     "dataIndex": "pr_leadtime",
@@ -437,6 +439,7 @@ Ext.define('saas.view.stock.make.FormPanelController', {
                             "text": "总库存数",
                             "dataIndex": "po_onhand",
                             "width": 100,
+                            align: 'end'
                         },{
                             "text": "类型",
                             "dataIndex": "pr_kind",
@@ -457,6 +460,7 @@ Ext.define('saas.view.stock.make.FormPanelController', {
                             "text": "最小包装",
                             "dataIndex": "pr_zxbzs",
                             "width": 100,
+                            align: 'end'
                         },{
                             "text": "L/T",
                             "dataIndex": "pr_leadtime",

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

@@ -10,7 +10,6 @@ Ext.define('saas.view.stock.make.QueryPanel', {
     queryFormItems: [{
         xtype: 'hidden',
         name: 'ma_id',
-        bind: '{ma_id}',
         fieldLabel: 'ID',
         allowBlank: true,
         getCondition: function(value) {
@@ -19,17 +18,14 @@ Ext.define('saas.view.stock.make.QueryPanel', {
     },{
         xtype: 'textfield',
         name: 'ma_code',
-        bind: '{ma_code}',
         fieldLabel: '单据编号'
     },{
         xtype: 'textfield',
         name: 'ma_type',
-        bind: '{ma_type}',
         fieldLabel: '类型'
     },{
         xtype: 'textfield',
         name: 'ma_prodcode',
-        bind: '{ma_prodcode}',
         fieldLabel: '产品编号'
     }],
     moreQueryFormItems: [],

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

@@ -55,11 +55,15 @@ Ext.define('saas.view.stock.make.QueryPanelController', {
                         }, {
                             "text": "税率",
                             "dataIndex": "ve_taxrate",
-                            "width": 100
+                            "width": 100,
+                            xtype: 'numbercolumn',
+                            align: 'end'
                         }, {
                             "text": "承付天数",
                             "dataIndex": "ve_promisedays",
-                            "width": 100
+                            "width": 100,
+                            xtype: 'numbercolumn',
+                            align: 'end'
                         }, {
                             "text": "纳税人识别号",
                             "dataIndex": "ve_bankaccount",
@@ -143,6 +147,8 @@ Ext.define('saas.view.stock.make.QueryPanelController', {
                             "text": "总库存数",
                             "dataIndex": "po_onhand",
                             "width": 100,
+                            xtype: 'numbercolumn',
+                            align: 'end'
                         },{
                             "text": "类型",
                             "dataIndex": "pr_kind",
@@ -163,6 +169,8 @@ Ext.define('saas.view.stock.make.QueryPanelController', {
                             "text": "最小包装",
                             "dataIndex": "pr_zxbzs",
                             "width": 100,
+                            xtype: 'numbercolumn',
+                            align: 'end'
                         },{
                             "text": "L/T",
                             "dataIndex": "pr_leadtime",

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

@@ -167,6 +167,7 @@ Ext.define('saas.view.stock.otherIn.FormPanel', {
             },
             {
                 text : "数量", 
+                xtype: 'numbercolumn',
                 dataIndex : "pd_inqty", 
                 width : 120.0,
                 allowBlank : false,
@@ -220,6 +221,7 @@ Ext.define('saas.view.stock.otherIn.FormPanel', {
             },
             {
                 text : "单价", 
+                xtype: 'numbercolumn',
                 dataIndex : "pd_orderprice",
                 width : 120.0,
                 editor : {
@@ -236,6 +238,7 @@ Ext.define('saas.view.stock.otherIn.FormPanel', {
             }, 
            {
                 text : "含税金额", 
+                xtype: 'numbercolumn',
                 dataIndex : "pd_total", 
                 width : 120.0,
                 editor : {
@@ -258,6 +261,7 @@ Ext.define('saas.view.stock.otherIn.FormPanel', {
                 }
             }, {
                 text : "税率", 
+                xtype: 'numbercolumn',
                 dataIndex : "pd_taxrate",
                 editor : {
                     xtype : "numberfield",
@@ -268,6 +272,7 @@ Ext.define('saas.view.stock.otherIn.FormPanel', {
             },
             {
                 text : "未税金额", 
+                xtype: 'numbercolumn',
                 dataIndex : "pd_nettotal", 
                 editor : {
                     xtype : "numberfield",

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

@@ -60,12 +60,14 @@ Ext.define('saas.view.stock.otherIn.FormPanelController', {
                             "text": "税率",
                             "dataIndex": "ve_taxrate",
                             "width": 100,
-                            align:'right'
+                            xtype: 'numbercolumn',
+                            align:'end'
                         }, {
                             "text": "承付天数",
                             "dataIndex": "ve_promisedays",
                             "width": 100,
-                            align:'right'
+                            xtype: 'numbercolumn',
+                            align:'end'
                         }, {
                             "text": "纳税人识别号",
                             "dataIndex": "ve_bankaccount",
@@ -144,17 +146,20 @@ Ext.define('saas.view.stock.otherIn.FormPanelController', {
                             "text": "税率",
                             "dataIndex": "cu_taxrate",
                             "width": 100,
-                            align:'right'
+                            xtype: 'numbercolumn',
+                            align:'end'
                         },{
                             "text": "承付天数",
                             "dataIndex": "cu_promisedays",
                             "width": 100,
-                            align:'right'
+                            xtype: 'numbercolumn',
+                            align:'end'
                         },{
                             "text": "额度",
                             "dataIndex": "cu_credit",
                             "width": 100,
-                            align:'right'
+                            xtype: 'numbercolumn',
+                            align:'end'
                         }]
                     });
 
@@ -247,6 +252,8 @@ Ext.define('saas.view.stock.otherIn.FormPanelController', {
                             "text": "总库存数",
                             "dataIndex": "po_onhand",
                             "width": 100,
+                            xtype: 'numbercolumn',
+                            align: 'end'
                         },{
                             "text": "类型",
                             "dataIndex": "pr_kind",
@@ -267,6 +274,8 @@ Ext.define('saas.view.stock.otherIn.FormPanelController', {
                             "text": "最小包装",
                             "dataIndex": "pr_zxbzs",
                             "width": 100,
+                            xtype: 'numbercolumn',
+                            align: 'end'
                         },{
                             "text": "L/T",
                             "dataIndex": "pr_leadtime",

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

@@ -55,11 +55,15 @@ Ext.define('saas.view.stock.otherIn.QueryPanelController', {
                         }, {
                             "text": "税率",
                             "dataIndex": "ve_taxrate",
-                            "width": 100
+                            "width": 100,
+                            xtype: 'numbercolumn',
+                            align: 'end'
                         }, {
                             "text": "承付天数",
                             "dataIndex": "ve_promisedays",
-                            "width": 100
+                            "width": 100,
+                            xtype: 'numbercolumn',
+                            align: 'end'
                         }, {
                             "text": "纳税人识别号",
                             "dataIndex": "ve_bankaccount",
@@ -143,6 +147,8 @@ Ext.define('saas.view.stock.otherIn.QueryPanelController', {
                             "text": "总库存数",
                             "dataIndex": "po_onhand",
                             "width": 100,
+                            xtype: 'numbercolumn',
+                            align: 'end'
                         },{
                             "text": "类型",
                             "dataIndex": "pr_kind",
@@ -163,6 +169,8 @@ Ext.define('saas.view.stock.otherIn.QueryPanelController', {
                             "text": "最小包装",
                             "dataIndex": "pr_zxbzs",
                             "width": 100,
+                            xtype: 'numbercolumn',
+                            align: 'end'
                         },{
                             "text": "L/T",
                             "dataIndex": "pr_leadtime",

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

@@ -157,6 +157,7 @@ Ext.define('saas.view.stock.otherOut.FormPanel', {
             },
             {
                 text: "数量",
+                xtype: 'numbercolumn',
                 dataIndex: "pd_outqty",
                 allowBlank : false,
                 width: 120.0,
@@ -210,6 +211,7 @@ Ext.define('saas.view.stock.otherOut.FormPanel', {
             },
             {
                 text: "单价",
+                xtype: 'numbercolumn',
                 dataIndex: "pd_orderprice",
                 editor : {
                     xtype : "numberfield",
@@ -232,6 +234,7 @@ Ext.define('saas.view.stock.otherOut.FormPanel', {
             },
             {
                 text: "含税金额",
+                xtype: 'numbercolumn',
                 dataIndex: "pd_total",
                 width: 120.0,
                 editor : {
@@ -254,6 +257,7 @@ Ext.define('saas.view.stock.otherOut.FormPanel', {
                 }
             }, {
                 text: "税率",
+                xtype: 'numbercolumn',
                 dataIndex: "pd_taxrate",
                 editor : {
                     xtype : "numberfield",
@@ -264,6 +268,7 @@ Ext.define('saas.view.stock.otherOut.FormPanel', {
             },
             {
                 text: "未税金额",
+                xtype: 'numbercolumn',
                 dataIndex: "pd_nettotal",
                 editor : {
                     xtype : "numberfield",

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

@@ -60,12 +60,14 @@ Ext.define('saas.view.stock.otherOut.FormPanelController', {
                             "text": "税率",
                             "dataIndex": "ve_taxrate",
                             "width": 100,
-                            align:'right'
+                            xtype: 'numbercolumn',
+                            align:'end'
                         }, {
                             "text": "承付天数",
                             "dataIndex": "ve_promisedays",
                             "width": 100,
-                            align:'right'
+                            xtype: 'numbercolumn',
+                            align:'end'
                         }, {
                             "text": "纳税人识别号",
                             "dataIndex": "ve_bankaccount",
@@ -139,17 +141,20 @@ Ext.define('saas.view.stock.otherOut.FormPanelController', {
                             "text": "税率",
                             "dataIndex": "cu_taxrate",
                             "width": 100,
-                            align:'right'
+                            xtype: 'numbercolumn',
+                            align:'end'
                         },{
                             "text": "承付天数",
                             "dataIndex": "cu_promisedays",
                             "width": 100,
-                            align:'right'
+                            xtype: 'numbercolumn',
+                            align:'end'
                         },{
                             "text": "额度",
                             "dataIndex": "cu_credit",
                             "width": 100,
-                            align:'right'
+                            xtype: 'numbercolumn',
+                            align:'end'
                         }]
                     }) ;   
 
@@ -235,7 +240,8 @@ Ext.define('saas.view.stock.otherOut.FormPanelController', {
                             "text": "总库存数",
                             "dataIndex": "po_onhand",
                             "width": 100,
-                            align:'right'
+                            xtype: 'numbercolumn',
+                            align:'end'
                         },{
                             "text": "类型",
                             "dataIndex": "pr_kind",
@@ -256,7 +262,8 @@ Ext.define('saas.view.stock.otherOut.FormPanelController', {
                             "text": "最小包装",
                             "dataIndex": "pr_zxbzs",
                             "width": 100,
-                            align:'right'
+                            xtype: 'numbercolumn',
+                            align:'end'
                         },{
                             "text": "L/T",
                             "dataIndex": "pr_leadtime",

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

@@ -55,11 +55,13 @@ Ext.define('saas.view.stock.otherOut.QueryPanelController', {
                         }, {
                             "text": "税率",
                             "dataIndex": "ve_taxrate",
-                            "width": 100
+                            "width": 100,
+                            align: 'end'
                         }, {
                             "text": "承付天数",
                             "dataIndex": "ve_promisedays",
-                            "width": 100
+                            "width": 100,
+                            align: 'end'
                         }, {
                             "text": "纳税人识别号",
                             "dataIndex": "ve_bankaccount",
@@ -143,6 +145,7 @@ Ext.define('saas.view.stock.otherOut.QueryPanelController', {
                             "text": "总库存数",
                             "dataIndex": "po_onhand",
                             "width": 100,
+                            align: 'end'
                         },{
                             "text": "类型",
                             "dataIndex": "pr_kind",
@@ -163,6 +166,7 @@ Ext.define('saas.view.stock.otherOut.QueryPanelController', {
                             "text": "最小包装",
                             "dataIndex": "pr_zxbzs",
                             "width": 100,
+                            align: 'end'
                         },{
                             "text": "L/T",
                             "dataIndex": "pr_leadtime",

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

@@ -8,27 +8,27 @@ Ext.define('saas.view.stock.report.ProdinoutCount', {
     viewName: 'stock-report-prodinoutCount',
     //按物料分组
     groupField: null,
-    listUrl: '/api/stock/report/prodinoutCount',
+    listUrl: '/api/storage/report/prodinoutCount',
     defaultCondition: null,
     reportTitle: '物料收发汇总表',
-    QueryWidth:0.25,
+    QueryWidth:0.1,
     //筛选：仓库、物料、物料类型、时间			
     searchItems: [{		
         xtype: 'dbfindtrigger',
-        name: 'pd_whcode',
-        fieldLabel: '仓库编号',
-        columnWidth: 0.25
+        name: 'wh_description',
+        fieldLabel: '仓库',
+        columnWidth: 0.2
     }, {		
         xtype: 'dbfindtrigger',
         name: 'pd_prodcode',
         fieldLabel: '物料编号',
-        columnWidth: 0.25
+        columnWidth: 0.2
     }, {		
         xtype: 'remotecombo',
         editable:false,
         name: 'pd_prodcode',
         fieldLabel: '物料类型',
-        columnWidth: 0.25,
+        columnWidth: 0.2,
         storeUrl:'/api/document/producttype/getCombo',
         addHandler:function(b){
             var document = Ext.create('saas.view.document.kind.Kind',{});
@@ -76,30 +76,46 @@ Ext.define('saas.view.stock.report.ProdinoutCount', {
     }, {
         text: '期初',
         columns: [{
-            text: '数量'
+            text: '数量',
+            dataIndex:'pwm_beginqty',
+            xtype: 'numbercolumn'
         },{
-            text: '成本'
+            text: '成本',
+            dataIndex:'pwm_beginamount',
+            xtype: 'numbercolumn'
         }]
     }, {
         text: '入库合计',
         columns: [{
-            text: '数量'
+            text: '数量',
+            dataIndex:'pwm_nowinqty',
+            xtype: 'numbercolumn'
         },{
-            text: '成本'
+            text: '成本',
+            dataIndex:'pwm_nowinamount',
+            xtype: 'numbercolumn'
         }]
     }, {
         text: '出库合计',
         columns: [{
-            text: '数量'
+            text: '数量',
+            dataIndex:'pwm_nowoutqty',
+            xtype: 'numbercolumn'
         },{
-            text: '成本'
+            text: '成本',
+            dataIndex:'pwm_nowoutamount',
+            xtype: 'numbercolumn'
         }]
     }, {
         text: '结存',
         columns: [{
-            text: '数量'
+            text: '数量',
+            dataIndex:'pwm_endqty',
+            xtype: 'numbercolumn'
         },{
-            text: '成本'
+            text: '成本',
+            dataIndex:'pwm_endamount',
+            xtype: 'numbercolumn'
         }]
     }]
 });

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

@@ -1,6 +1,6 @@
 Ext.define('saas.view.stock.report.ProdinoutCountController', {
     extend: 'saas.view.core.report.ReportPanelController',
-    alias: 'stock-report-prodinoutCount',
+    alias: 'controller.stock-report-prodinoutCount',
     init: function (form) {
         this.control({
            //放大镜赋值关系 以及 tpl模板
@@ -71,7 +71,8 @@ Ext.define('saas.view.stock.report.ProdinoutCountController', {
                             "text": "总库存数",
                             "dataIndex": "po_onhand",
                             "width": 100,
-                            align:'right'
+                            xtype: 'numbercolumn',
+                            align:'end'
                         },{
                             "text": "类型",
                             "dataIndex": "pr_kind",
@@ -92,7 +93,8 @@ Ext.define('saas.view.stock.report.ProdinoutCountController', {
                             "text": "最小包装",
                             "dataIndex": "pr_zxbzs",
                             "width": 100,
-                            align:'right'
+                            xtype: 'numbercolumn',
+                            align:'end'
                         },{
                             "text": "L/T",
                             "dataIndex": "pr_leadtime",
@@ -102,7 +104,7 @@ Ext.define('saas.view.stock.report.ProdinoutCountController', {
 
                 }
             },
-            'dbfindtrigger[name=pd_whcode]':{
+            'dbfindtrigger[name=wh_description]':{
                 beforerender:function(f){
                     Ext.apply(f,{
                         conditionCode:'wh_code',
@@ -112,7 +114,7 @@ Ext.define('saas.view.stock.report.ProdinoutCountController', {
                         dbfinds:[{
                             from:'id',to:'id',ignore:true 
                         }, { 
-                            from:'wh_code',to:'pd_whcode'
+                            from:'wh_code',to:'wh_code'
                         }, {
                             from:'wh_description',to:'wh_description'
                         }],

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

@@ -1,4 +1,4 @@
 Ext.define('saas.view.stock.report.ProdinoutCountModel', {
     extend: 'saas.view.core.report.ReportPanelModel',
-    alias: 'stock-report-prodinoutCount'
+    alias: 'viewmodel.stock-report-prodinoutCount'
 });

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

@@ -8,17 +8,17 @@ Ext.define('saas.view.stock.report.Prodiodetail', {
     viewName: 'stock-report-prodiodetail',
   //  按物料分组
     groupField: 'pd_prodcode',
-    listUrl: '/api/stock/report/prodiodetail',
+    listUrl: '/api/storage/report/prodioDetail',
     defaultCondition: null,
     reportTitle: '物料出入库明细表',
-    QueryWidth:0.25,
+    QueryWidth:0.1,
     //筛选：单据类型、物料、日期
     searchItems: [{
         xtype: 'multicombo',
         name: 'pi_class',
         fieldLabel: '单据类型',
         allowBlank: true,
-        columnWidth: 0.25,
+        columnWidth: 0.2,
         datas: [
             ["采购验收单", "采购验收单"],
             ["采购验退单", "采购验退单"],
@@ -35,7 +35,7 @@ Ext.define('saas.view.stock.report.Prodiodetail', {
         xtype: 'dbfindtrigger',
         name: 'pd_prodcode',
         fieldLabel: '物料编号',
-        columnWidth: 0.25
+        columnWidth: 0.2
     }, {
         xtype: 'condatefield',
         name: 'pi_date',
@@ -70,7 +70,8 @@ Ext.define('saas.view.stock.report.Prodiodetail', {
         xtype: 'datecolumn'
     }, {
         text: '序号',
-        dataIndex: 'pd_pdno'
+        dataIndex: 'pd_pdno',
+        xtype: 'numbercolumn'
     }, {
         text: '物料类型',
         dataIndex: 'pr_kind'
@@ -90,13 +91,9 @@ Ext.define('saas.view.stock.report.Prodiodetail', {
         dataIndex: 'pd_unit'
     }, {
         text: '入库数量',
+        xtype: 'numbercolumn',
         dataIndex: 'inqty',
-        renderer : function(v) {
-            var arr = (v + '.').split('.');
-            var xr = (new Array(arr[1].length)).fill('0');
-            var format = '0.' + xr.join();
-            return Ext.util.Format.number(v, format);
-        },
+        xtype: 'numbercolumn',
         summaryType: 'sum',
         summaryRenderer: function(v) {
             var arr = (v + '.').split('.');
@@ -106,13 +103,9 @@ Ext.define('saas.view.stock.report.Prodiodetail', {
         }
     }, {
         text: '出库数量',
+        xtype: 'numbercolumn',
         dataIndex: 'outqty',
-        renderer : function(v) {
-            var arr = (v + '.').split('.');
-            var xr = (new Array(arr[1].length)).fill('0');
-            var format = '0.' + xr.join();
-            return Ext.util.Format.number(v, format);
-        },
+        xtype: 'numbercolumn',
         summaryType: 'sum',
         summaryRenderer: function(v) {
             var arr = (v + '.').split('.');
@@ -122,13 +115,9 @@ Ext.define('saas.view.stock.report.Prodiodetail', {
         }
     }, {
         text: '成本单价',
+        xtype: 'numbercolumn',
         dataIndex: 'pd_price',
-        renderer : function(v) {
-            var arr = (v + '.').split('.');
-            var xr = (new Array(arr[1].length)).fill('0');
-            var format = '0,000.' + xr.join();
-            return Ext.util.Format.number(v, format);
-        }
+        xtype: 'numbercolumn'
     }, {
         text: '备注',
         dataIndex: 'pd_remark',