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

applications/commons/commons-dto/src/main/java/com/usoftchina/saas/commons/exception/BizExceptionCode.java

@@ -51,6 +51,7 @@ public enum BizExceptionCode implements BaseExceptionCode {
     BIZ_NOCUST_SAVE(79356, "选择的客户不存在或已禁用"),
     BIZ_SAMEVENDAP_SAVE(79357, "已存在相同供应商和币别的期初数据，不能新增"),
     BIZ_SAMECUSTAR_SAVE(79358, "已存在相同客户和币别的期初数据，不能新增"),
+    BIZ_MAINCURRENCY_DELETE(79359, "该币别为本位币，不能删除"),
 
     NO_OPRATIONDATA(79400,"无可操作单据"),
     NULL_DATA(23232,"无数据"),

applications/commons/commons-dto/src/main/java/com/usoftchina/saas/commons/po/BillCodeSeq.java

@@ -72,7 +72,9 @@ public enum  BillCodeSeq {
 
     PRODUCTUNIT("物料单位", "ProductUnit"),
 
-    VENDAPAMOUNT("供应商期初", "VendApamount");
+    VENDAPAMOUNT("供应商期初", "VendApamount"),
+
+    CUSTARAMOUNT("客户期初", "CustAramount");
 
 
 

applications/document/document-server/src/main/java/com/usoftchina/saas/document/controller/CurrencyController.java

@@ -4,16 +4,22 @@ import com.github.pagehelper.PageInfo;
 import com.usoftchina.saas.base.Result;
 import com.usoftchina.saas.commons.dto.DocReqDTO;
 import com.usoftchina.saas.commons.dto.ListReqDTO;
+import com.usoftchina.saas.commons.exception.BizExceptionCode;
 import com.usoftchina.saas.context.BaseContextHolder;
 import com.usoftchina.saas.document.dto.CurrencyDTO;
 import com.usoftchina.saas.document.entities.Currency;
+import com.usoftchina.saas.document.mapper.CurrencyMapper;
 import com.usoftchina.saas.document.service.CurrencyService;
+import com.usoftchina.saas.exception.BizException;
 import com.usoftchina.saas.page.PageDefault;
 import com.usoftchina.saas.page.PageRequest;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 
 /**
@@ -26,6 +32,8 @@ public class CurrencyController {
 
     @Autowired
     private CurrencyService currencyService;
+    @Autowired
+    private CurrencyMapper currencyMapper;
 
     @GetMapping("/list")
     public Result getAll(@PageDefault(number = 1, size = 10) PageRequest pageRequest, ListReqDTO listReqDTO){
@@ -52,8 +60,24 @@ public class CurrencyController {
 
     @PostMapping("/delete/{id}")
     public Result delete(@PathVariable("id") Long id){
+        Currency currency = currencyService.findByPrimaryKey(id);
+        if(currency.getCr_standard()==1){
+            //本位币无法删除
+            throw new BizException(BizExceptionCode.BIZ_MAINCURRENCY_DELETE);
+        }
+        //校验是否可以删除币别
+        Map<String, Object> map = new HashMap<String, Object>();
+        map.put("v_type","currency");
+        map.put("v_id",0);
+        map.put("v_code",currency.getCr_name());
+        map.put("v_companyid",BaseContextHolder.getCompanyId());
+        map.put("v_res","");
+        currencyMapper.check(map);
+        Object result =  map.get("v_res");
+        if(!StringUtils.isEmpty(result)){
+            throw new BizException(-999999,result.toString());
+        }
         currencyService.removeByPrimaryKey(id);
         return Result.success();
     }
-
 }

applications/document/document-server/src/main/java/com/usoftchina/saas/document/controller/CustAramountController.java

@@ -67,4 +67,10 @@ public class CustAramountController {
         return Result.success();
     }
 
+    //根据客户编号+币别查询 客户期初数据
+    @RequestMapping("/getCustArByCustCodeAndCurrency")
+    public Result getCustArByCustCodeAndCurrency(String custCode, String currency) {
+        return Result.success(custAramountService.getCustArByCustCodeAndCurrency(custCode, currency));
+    }
+
 }

applications/document/document-server/src/main/java/com/usoftchina/saas/document/controller/VendApamountController.java

@@ -75,4 +75,10 @@ public class VendApamountController {
         return Result.success();
     }
 
+    //根据客户编号+币别查询 客户期初数据
+    @RequestMapping("/getVendApByVendCodeAndCurrency")
+    public Result getVendApByVendCodeAndCurrency(String vendCode, String currency) {
+        return Result.success(vendApamountService.getVendApByVendCodeAndCurrency(vendCode, currency));
+    }
+
 }

applications/document/document-server/src/main/java/com/usoftchina/saas/document/mapper/CurrencyMapper.java

@@ -6,6 +6,7 @@ import com.usoftchina.saas.document.entities.Currency;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 public interface CurrencyMapper extends CommonBaseMapper<Currency> {
 
@@ -17,5 +18,7 @@ public interface CurrencyMapper extends CommonBaseMapper<Currency> {
 
     int selectCountByName(@Param("name") String name, @Param("companyId") Long companyId);
 
+    void check(Map<String, Object> map);
+
     CurrencyDTO getStandard(@Param("companyId") Long companyId);
 }

applications/document/document-server/src/main/java/com/usoftchina/saas/document/service/CustAramountService.java

@@ -25,4 +25,6 @@ public interface CustAramountService extends CommonBaseService<CustAramountMappe
     void deleteById(Long id);
 
     void saveToFormal(Integer id, boolean update);
+
+    CustAramount getCustArByCustCodeAndCurrency(String custCode, String currency);
 }

applications/document/document-server/src/main/java/com/usoftchina/saas/document/service/VendApamountService.java

@@ -27,4 +27,6 @@ public interface VendApamountService extends CommonBaseService<VendApamountMappe
     void deleteById(Long id);
 
     void saveToFormal(Integer id, boolean update);
+
+    VendApamount getVendApByVendCodeAndCurrency(String vendCode, String currency);
 }

applications/document/document-server/src/main/java/com/usoftchina/saas/document/service/impl/CustAramountServiceImpl.java

@@ -118,6 +118,11 @@ public class CustAramountServiceImpl extends CommonBaseServiceImpl<CustAramountM
         }
     }
 
+    public CustAramount getCustArByCustCodeAndCurrency(String custCode,String currency){
+        CustAramount custAramount = getMapper().getCustAramountByCustCodeAndCurrency(custCode,BaseContextHolder.getCompanyId(),currency,0L);
+        return custAramount;
+    }
+
     public DocBaseDTO saveData(CustAramount custAramount){
         DocBaseDTO docBaseDTO = null;
         if(custAramount.getId()==null){custAramount.setId(0L);}

applications/document/document-server/src/main/java/com/usoftchina/saas/document/service/impl/VendApamountServiceImpl.java

@@ -117,6 +117,11 @@ public class VendApamountServiceImpl extends CommonBaseServiceImpl<VendApamountM
         }
     }
 
+    public VendApamount getVendApByVendCodeAndCurrency(String vendCode, String currency){
+        VendApamount vendApamount = getMapper().getVendApamountByVendCodeAndCurrency(vendCode,BaseContextHolder.getCompanyId(),currency,0L);
+        return vendApamount;
+    }
+
     public DocBaseDTO saveData(VendApamount vendApamount){
         DocBaseDTO docBaseDTO = null;
         if(vendApamount.getId()==null){vendApamount.setId(0L);}

applications/document/document-server/src/main/resources/mapper/CurrencyMapper.xml

@@ -142,4 +142,16 @@
     <select id="getStandard" resultType="com.usoftchina.saas.document.dto.CurrencyDTO">
       select * from CURRENCYS where cr_standard = '1' and companyId = #{companyId}
     </select>
+
+    <select id="check" parameterMap="checkParamMap" statementType="CALLABLE">
+        CALL SP_LIMITBASE(?, ?, ?, ?,?)
+    </select>
+    <parameterMap id="checkParamMap" type="java.util.Map">
+        <parameter property="v_type" jdbcType="VARCHAR" mode="IN" />
+        <parameter property="v_id" jdbcType="INTEGER" mode="IN" />
+        <parameter property="v_code" jdbcType="VARCHAR" mode="IN" />
+        <parameter property="v_companyid" jdbcType="INTEGER" mode="IN" />
+        <parameter property="v_res" jdbcType="VARCHAR" mode="OUT" />
+    </parameterMap>
+
 </mapper>

applications/money/money-server/src/main/java/com/usoftchina/saas/money/po/AcountbalanceView.java

@@ -28,6 +28,16 @@ public class AcountbalanceView {
     private String remark;
     private Integer companyId;
 
+    private String currency;
+
+    public String getCurrency() {
+        return currency;
+    }
+
+    public void setCurrency(String currency) {
+        this.currency = currency;
+    }
+
     public Integer getCompanyId() {
         return companyId;
     }

applications/money/money-server/src/main/java/com/usoftchina/saas/money/po/Banksubledger.java

@@ -48,6 +48,16 @@ public class Banksubledger extends CommonBaseEntity implements Serializable {
 
     private String bl_item;
 
+    private String bk_currency;
+
+    public String getBk_currency() {
+        return bk_currency;
+    }
+
+    public void setBk_currency(String bk_currency) {
+        this.bk_currency = bk_currency;
+    }
+
     public Double getBl_orderamount() {
         return bl_orderamount;
     }

applications/money/money-server/src/main/java/com/usoftchina/saas/money/po/CustomerCheckView.java

@@ -11,6 +11,8 @@ public class CustomerCheckView {
 
     private String pi_custname;
 
+    private  String pi_currency;
+
     private Date pi_date;
 
     private Integer pd_pdno;
@@ -200,4 +202,12 @@ public class CustomerCheckView {
     public void setPd_nettotal(Double pd_nettotal) {
         this.pd_nettotal = pd_nettotal;
     }
+
+    public String getPi_currency() {
+        return pi_currency;
+    }
+
+    public void setPi_currency(String pi_currency) {
+        this.pi_currency = pi_currency;
+    }
 }

applications/money/money-server/src/main/java/com/usoftchina/saas/money/po/VendorAcountView.java

@@ -11,6 +11,8 @@ public class VendorAcountView {
 
     private String pi_vendname;
 
+    private String pi_currency;
+
     private Date pi_date;
 
     private Integer pd_pdno;
@@ -215,4 +217,12 @@ public class VendorAcountView {
     public void setPd_nettotal(Double pd_nettotal) {
         this.pd_nettotal = pd_nettotal;
     }
+
+    public String getPi_currency() {
+        return pi_currency;
+    }
+
+    public void setPi_currency(String pi_currency) {
+        this.pi_currency = pi_currency;
+    }
 }

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

@@ -4,6 +4,7 @@
   <resultMap id="BaseResultMap" type="com.usoftchina.saas.money.po.AcountbalanceView" >
     <result column="bankcode" property="bankcode" jdbcType="VARCHAR" />
     <result column="bankname" property="bankname" jdbcType="VARCHAR" />
+    <result column="currency" property="currency" jdbcType="VARCHAR" />
     <result column="bankid" property="bankid" jdbcType="INTEGER" />
     <result column="date" property="date" jdbcType="TIMESTAMP" />
     <result column="kind" property="kind" jdbcType="VARCHAR" />

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

@@ -7,6 +7,7 @@
         <result column="bl_bankid" jdbcType="INTEGER" property="bl_bankid" />
         <result column="bl_bankcode" jdbcType="VARCHAR" property="bl_bankcode" />
         <result column="bl_bankname" jdbcType="VARCHAR" property="bl_bankname" />
+        <result column="bk_currency" jdbcType="VARCHAR" property="bk_currency" />
         <result column="bl_code" jdbcType="VARCHAR" property="bl_code" />
         <result column="bl_kind" jdbcType="VARCHAR" property="bl_kind" />
         <result column="bl_date" jdbcType="TIMESTAMP" property="bl_date" />
@@ -457,14 +458,14 @@
     <select id="selectByCondition" resultMap="BaseResultMap">
         select *
         from
-        (select  bl_date, bl_code, bl_kind,bl_bankcode,bl_bankid, bl_bankname, bl_income, bl_spending, bl_assname, bl_remark, companyid
-        from banksubledger where bl_kind in ('其他收入单', '其他支出单'))a
+        (select  bk_currency,bl_date, bl_code, bl_kind,bl_bankcode,bl_bankid, bl_bankname, bl_income, bl_spending, bl_assname, bl_remark, banksubledger.companyid
+        from banksubledger left join bankinformation on bk_id = bl_bankid where bl_kind in ('其他收入单', '其他支出单'))a
         <where>
             <if test="con != null">
-            ${con}
+                ${con}
             </if>
             <if test="companyId != null">
-            and  companyId = #{companyId}
+                and  companyId = #{companyId}
             </if>
         </where>
         order by bl_bankname asc, bl_date desc,bl_bankcode desc

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

@@ -6,6 +6,7 @@
         <result column="pi_class" property="pi_class" jdbcType="VARCHAR" />
         <result column="pi_custcode" property="pi_custcode" jdbcType="VARCHAR" />
         <result column="pi_custname" property="pi_custname" jdbcType="VARCHAR" />
+        <result column="pi_custname" property="pi_custname" jdbcType="VARCHAR" />
         <result column="pi_date" property="pi_date" jdbcType="TIMESTAMP" />
         <result column="pd_pdno" property="pd_pdno" jdbcType="INTEGER" />
         <result column="pr_code" property="pr_code" jdbcType="VARCHAR" />

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

@@ -6,6 +6,7 @@
     <result column="pi_class" property="pi_class" jdbcType="VARCHAR" />
     <result column="pi_vendcode" property="pi_vendcode" jdbcType="VARCHAR" />
     <result column="pi_vendname" property="pi_vendname" jdbcType="VARCHAR" />
+    <result column="pi_currency" property="pi_currency" jdbcType="VARCHAR" />
     <result column="pi_date" property="pi_date" jdbcType="TIMESTAMP" />
     <result column="pd_pdno" property="pd_pdno" jdbcType="INTEGER" />
     <result column="pr_code" property="pr_code" jdbcType="VARCHAR" />

frontend/saas-web/app/view/core/chart/ChartBase.js

@@ -27,7 +27,6 @@ Ext.define('saas.view.core.chart.ChartBase', {
                 width: '100%',
                 // listeners: {
                 //     boxready: function() {
-                //         debugger
                 //     }
                 // }
             }),

frontend/saas-web/app/view/core/dbfind/DbfindTrigger.js

@@ -129,7 +129,7 @@ Ext.define('saas.view.core.dbfind.DbfindTrigger', {
         if (!this.fireEvent('beforetriggerclick', this)) {
             return;
         };
-        f.blur(f);
+        f.blur(f,null,null,true);
         //判断dbfindtrigger归属
         f.judge(f); //form
         var panel = f.up('core-tab-panel') || Ext.getCmp('mainView'),
@@ -192,7 +192,7 @@ Ext.define('saas.view.core.dbfind.DbfindTrigger', {
     },
 
     listeners: {
-        blur: function (f, e) {
+        blur: function (f, e, op, isTrigger) {
             var me = f;
             var dbfinds = me.dbfinds,
                 data;
@@ -270,6 +270,15 @@ Ext.define('saas.view.core.dbfind.DbfindTrigger', {
                         me.setValue(null);
                     }
                 }
+                if(!isTrigger){
+                    let rec = {
+                        data:{},
+                        get:function(name){
+                            return this.data[name]
+                        }
+                    }
+                    f.aftertrigger(f,rec);
+                }
             } else if (data.length == 1) {
                 me.dbValues = data[0];
                 var dbfinds = me.dbfinds;
@@ -302,6 +311,15 @@ Ext.define('saas.view.core.dbfind.DbfindTrigger', {
                         }
                     }
                 }
+                if(!isTrigger){
+                    let rec = {
+                        data:data[0],
+                        get:function(name){
+                            return this.data[name]
+                        }
+                    }
+                    f.aftertrigger(f,rec);
+                }
             }
         },
         select: function (combo, record, eOpts) {

frontend/saas-web/app/view/document/currencys/DatalistController.js

@@ -4,24 +4,6 @@
 Ext.define('saas.view.document.currencys.DatalistController', {
     extend: 'saas.view.document.kind.KindController',
     alias: 'controller.document-currencys-datalist',
-    
-    insertActionColumn:function(columns){
-        var me=this;
-        if(columns.length>0 && columns[0].xtype!='actioncolumn'){
-            return Ext.Array.insert(columns,0,[{
-                xtype:'actioncolumn',
-                text:'操作',
-                align: 'center',
-                items: [{
-                    tooltip: '编辑',
-                    iconCls: 'x-fa fa-pencil fa-fw',
-                    handler: me.onEdit,
-                    scope:this
-                }]
-            }]);
-        }
-        return columns;
-    },
     onEdit:function(grid,row,col){
         var dk = grid.ownerCt.ownerCt;
         var dataKind=dk.getViewModel().getData()['dataKind'].value,

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

@@ -53,6 +53,43 @@ Ext.define('saas.view.money.payBalance.FormPanel', {
                 columnWidth: 0.5,
                 listeners: {
                     change: 'clearDetails'
+                },
+                aftertrigger:function(f,record){
+                    let form = f.ownerCt
+                    let vendName = f.value
+                    let currency = form.down('[xtype=condbfindtrigger]').items.items[0].value
+                    if(vendName&&vendName!=''&&currency&&currency!=''&&record.get('ve_code')&&record.get('ve_code')!=''){
+                        Ext.Ajax.request({
+                            url: '/api/document/vendapamount/getVendApByVendCodeAndCurrency',
+                            params:{
+                                vendCode:record.get('ve_code'),
+                                currency:currency
+                            },
+                            method: 'post',
+                            headers: {
+                                'Access-Control-Allow-Origin': '*',
+                                'Authorization':  saas.util.State.get('session').token,
+                                "Content-Type": 'application/x-www-form-urlencoded;charset=UTF-8'
+                            },
+                            success: function (response, opts) {
+                                var res = Ext.decode(response.responseText);
+                                if(res.success&&res.data){
+                                    let va_leftamount = res.data.va_leftamount
+                                    form.down('[name=ve_leftamount]').setValue(va_leftamount)
+                                }else{
+                                    //清除总欠款
+                                    form.down('[name=ve_leftamount]').setValue(0)
+                                }
+                            },
+                            failure: function (response, opts) {
+                                var res = Ext.decode(response.responseText);
+                                saas.util.BaseUtil.showErrorToast('查询总欠款失败: ' + res.message);
+                            }
+                        });
+                    }else{
+                        //清除总欠款
+                        form.down('[name=ve_leftamount]').setValue(0)
+                    }
                 }
             }, {
                 xtype: 'condbfindtrigger',
@@ -67,6 +104,44 @@ Ext.define('saas.view.money.payBalance.FormPanel', {
                 listeners: {
                     change: 'clearDetails'
                 },
+                mainFieldConfig:{
+                    aftertrigger:function(f,record){
+                        let form = f.ownerCt.ownerCt
+                        let currency = f.value
+                        let vendCode = form.down('[name=pb_vendcode]').value
+                        if(vendCode&&vendCode!=''&&currency&&currency!=''){
+                            Ext.Ajax.request({
+                                url: '/api/document/vendapamount/getVendApByVendCodeAndCurrency',
+                                params:{
+                                    vendCode:vendCode,
+                                    currency:currency
+                                },
+                                method: 'post',
+                                headers: {
+                                    'Access-Control-Allow-Origin': '*',
+                                    'Authorization':  saas.util.State.get('session').token,
+                                    "Content-Type": 'application/x-www-form-urlencoded;charset=UTF-8'
+                                },
+                                success: function (response, opts) {
+                                    var res = Ext.decode(response.responseText);
+                                    if(res.success&&res.data){
+                                        let va_leftamount = res.data.va_leftamount
+                                        form.down('[name=ve_leftamount]').setValue(va_leftamount)
+                                    }else{
+                                        form.down('[name=ve_leftamount]').setValue(0)
+                                    }
+                                },
+                                failure: function (response, opts) {
+                                    var res = Ext.decode(response.responseText);
+                                    saas.util.BaseUtil.showErrorToast('查询总欠款失败: ' + res.message);
+                                }
+                            });
+                        }else{
+                            //清除总欠款
+                            form.down('[name=ve_leftamount]').setValue(0)
+                        }
+                    }
+                },
                 supFieldConfig: {
                     xtype: 'numberfield',
                     readOnly: false,

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

@@ -15,9 +15,6 @@ Ext.define('saas.view.money.payBalance.FormPanelController', {
                         }, {
                             from: 've_name',
                             to: 'pb_vendname'
-                        },{
-                            from: 've_leftamount',
-                            to: 've_leftamount'
                         },{
                             from: 'id',
                             to: 'pb_vendid',

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

@@ -52,6 +52,43 @@ Ext.define('saas.view.money.recBalance.FormPanel', {
                 columnWidth: 0.5,
                 listeners: {
                     change: 'clearDetails'
+                },
+                aftertrigger:function(f,record){
+                    let form = f.ownerCt
+                    let custName = f.value
+                    let currency = form.down('[xtype=condbfindtrigger]').items.items[0].value
+                    if(custName&&custName!=''&&currency&&currency!=''&&record.get('cu_code')&&record.get('cu_code')!=''){
+                        Ext.Ajax.request({
+                            url: '/api/document/custaramount/getCustArByCustCodeAndCurrency',
+                            params:{
+                                custCode:record.get('cu_code'),
+                                currency:currency
+                            },
+                            method: 'post',
+                            headers: {
+                                'Access-Control-Allow-Origin': '*',
+                                'Authorization':  saas.util.State.get('session').token,
+                                "Content-Type": 'application/x-www-form-urlencoded;charset=UTF-8'
+                            },
+                            success: function (response, opts) {
+                                var res = Ext.decode(response.responseText);
+                                if(res.success&&res.data){
+                                    let ca_leftamount = res.data.ca_leftamount
+                                    form.down('[name=cu_leftamount]').setValue(ca_leftamount)
+                                }else{
+                                    //清除总欠款
+                                    form.down('[name=cu_leftamount]').setValue(0)
+                                }
+                            },
+                            failure: function (response, opts) {
+                                var res = Ext.decode(response.responseText);
+                                saas.util.BaseUtil.showErrorToast('查询总欠款失败: ' + res.message);
+                            }
+                        });
+                    }else{
+                        //清除总欠款
+                        form.down('[name=cu_leftamount]').setValue(0)
+                    }
                 }
             }, {
                 xtype: 'condbfindtrigger',
@@ -66,6 +103,44 @@ Ext.define('saas.view.money.recBalance.FormPanel', {
                 listeners: {
                     change: 'clearDetails'
                 },
+                mainFieldConfig:{
+                    aftertrigger:function(f,record){
+                        let form = f.ownerCt.ownerCt
+                        let currency = f.value
+                        let custCode = form.down('[name=rb_custcode]').value
+                        if(custCode&&custCode!=''&&currency&&currency!=''){
+                            Ext.Ajax.request({
+                                url: '/api/document/custaramount/getCustArByCustCodeAndCurrency',
+                                params:{
+                                    custCode:custCode,
+                                    currency:currency
+                                },
+                                method: 'post',
+                                headers: {
+                                    'Access-Control-Allow-Origin': '*',
+                                    'Authorization':  saas.util.State.get('session').token,
+                                    "Content-Type": 'application/x-www-form-urlencoded;charset=UTF-8'
+                                },
+                                success: function (response, opts) {
+                                    var res = Ext.decode(response.responseText);
+                                    if(res.success&&res.data){
+                                        let ca_leftamount = res.data.ca_leftamount
+                                        form.down('[name=cu_leftamount]').setValue(ca_leftamount)
+                                    }else{
+                                        form.down('[name=cu_leftamount]').setValue(0)
+                                    }
+                                },
+                                failure: function (response, opts) {
+                                    var res = Ext.decode(response.responseText);
+                                    saas.util.BaseUtil.showErrorToast('查询总欠款失败: ' + res.message);
+                                }
+                            });
+                        }else{
+                            //清除总欠款
+                            form.down('[name=cu_leftamount]').setValue(0)
+                        }
+                    }
+                },
                 supFieldConfig: {
                     xtype: 'numberfield',
                     readOnly: false,

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

@@ -16,8 +16,6 @@ Ext.define('saas.view.money.recBalance.FormPanelController', {
                             from:'cu_code', to:'rb_custcode'
                         },{
                             from:'cu_name', to:'rb_custname'
-                        },{
-                            from:'cu_leftamount', to:'cu_leftamount'
                         },{
                             from:'cu_currency',to:'rb_currency'
                         },{
@@ -26,7 +24,6 @@ Ext.define('saas.view.money.recBalance.FormPanelController', {
                     }) ;   
                 }
             },
-
             // 资金账户
             'dbfindtrigger[name=rd_bankname]':{
                 beforerender:function(f){

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

@@ -69,6 +69,10 @@ Ext.define('saas.view.money.report.AccountBalance', {
         summaryRenderer: function(v, d, f, m) {
             return saas.util.BaseUtil.numberFormat(v, 2, true);
         }
+    },{
+        text: '币别',
+        dataIndex: 'currency',
+        width: 80,
     }, {
         text: '往来单位',
         dataIndex: 'bname',

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

@@ -160,6 +160,10 @@ Ext.define('saas.view.money.report.CustomerCheckCheck', {
         summaryRenderer: function(v) {
             return saas.util.BaseUtil.numberFormat(v, 2, true);
         }
+    },{
+        text: '币别',
+        dataIndex: 'pi_currency',
+        width: 80
     }],
 
     listeners: {

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

@@ -107,6 +107,10 @@ Ext.define('saas.view.money.report.OtherIODetail', {
             return saas.util.BaseUtil.numberFormat(v, 2, true);
         }
     }, {
+        text: '币别',
+        dataIndex: 'bk_currency',
+        width: 80,
+    },{
         text: '往来单位',
         dataIndex: 'bl_assname',
         width: 200,

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

@@ -161,6 +161,10 @@ Ext.define('saas.view.money.report.VendorCheck', {
         summaryRenderer: function(v) {
             return saas.util.BaseUtil.numberFormat(v, 2, true);
         }
+    },{
+        text: '币别',
+        dataIndex: 'pi_currency',
+        width: 80
     }],
 
     listeners: {

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

@@ -624,9 +624,9 @@ Ext.define('saas.view.money.verification.FormPanel', {
                             from: 'cr_rate',
                             to: 'vc_rate'
                         }],
-                        // listeners: {
-                        //     change: 'clearDetails'
-                        // },
+                        listeners: {
+                            change: 'clearDetails'
+                        },
                         supFieldConfig: {
                             xtype: 'numberfield',
                             readOnly: false,