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

applications/money/money-server/src/main/java/com/usoftchina/saas/money/controller/MoneyReportColltroller.java

@@ -16,14 +16,43 @@ import org.springframework.web.bind.annotation.RestController;
  * @date 2018/11/9 14:21
  **/
 @RestController
-@RequestMapping("/repor")
+@RequestMapping("/report")
 public class MoneyReportColltroller {
     @Autowired
     private MoneyReportService moneyReportService;
 
+    //供应商对账
     @GetMapping("/vendorCheck")
     public Result vendorCheck(PageRequest page, ListReqDTO req) {
         PageInfo listData = moneyReportService.vendorCheck(page, req);
         return Result.success(listData);
     }
+
+    //应付账款明细
+    @GetMapping("/payDetail")
+    public Result payDetail(PageRequest page, ListReqDTO req) {
+        PageInfo listData = moneyReportService.payDetail(page, req);
+        return Result.success(listData);
+    }
+
+    //应收款明细表
+    @GetMapping("/recDetail")
+    public Result recDetail(PageRequest page, ListReqDTO req) {
+        PageInfo listData = moneyReportService.recDetail(page, req);
+        return Result.success(listData);
+    }
+
+    //资金账号余额表
+    @GetMapping("/accountBalance")
+    public Result acountBalance(PageRequest page, ListReqDTO req) {
+        PageInfo listData = moneyReportService.acountBalance(page, req);
+        return Result.success(listData);
+    }
+
+    //客户对账单
+    @GetMapping("/customercheck")
+    public Result customercheck(PageRequest page, ListReqDTO req) {
+        PageInfo listData = moneyReportService.customercheck(page, req);
+        return Result.success(listData);
+    }
 }

applications/money/money-server/src/main/java/com/usoftchina/saas/money/mapper/AcountbalanceViewMapper.java

@@ -0,0 +1,10 @@
+package com.usoftchina.saas.money.mapper;
+
+import com.usoftchina.saas.money.po.AcountbalanceView;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface AcountbalanceViewMapper {
+    List<AcountbalanceView> selectByCondition(@Param("con") String con, @Param("companyId") Long companyId);
+}

applications/money/money-server/src/main/java/com/usoftchina/saas/money/mapper/CustomerCheckViewMapper.java

@@ -0,0 +1,11 @@
+package com.usoftchina.saas.money.mapper;
+
+import com.usoftchina.saas.money.po.AcountbalanceView;
+import com.usoftchina.saas.money.po.CustomerCheckView;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface CustomerCheckViewMapper {
+    List<CustomerCheckView> selectByCondition(@Param("con") String con, @Param("companyId") Long companyId);
+}

applications/money/money-server/src/main/java/com/usoftchina/saas/money/mapper/PaydetailViewMapper.java

@@ -0,0 +1,10 @@
+package com.usoftchina.saas.money.mapper;
+
+import com.usoftchina.saas.money.po.PaydetailView;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface PaydetailViewMapper {
+    List<PaydetailView> selectByCondition(@Param("con") String con, @Param("companyId") Long companyId);
+}

applications/money/money-server/src/main/java/com/usoftchina/saas/money/mapper/RecdetailViewMapper.java

@@ -0,0 +1,10 @@
+package com.usoftchina.saas.money.mapper;
+
+import com.usoftchina.saas.money.po.RecdetailView;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface RecdetailViewMapper {
+    List<RecdetailView> selectByCondition(@Param("con") String con, @Param("companyId") Long companyId);
+}

applications/money/money-server/src/main/java/com/usoftchina/saas/money/mapper/VendorAcountViewMapper.java

@@ -0,0 +1,10 @@
+package com.usoftchina.saas.money.mapper;
+
+import com.usoftchina.saas.money.po.VendorAcountView;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface VendorAcountViewMapper {
+    List<VendorAcountView> selectByCondition(@Param("con")String con, @Param("companyId")Long companyId);
+}

applications/money/money-server/src/main/java/com/usoftchina/saas/money/mapper/forms/VendorAcountViewMapper.java

@@ -1,10 +0,0 @@
-package com.usoftchina.saas.money.mapper.forms;
-
-import com.usoftchina.saas.money.po.forms.VendorAcountView;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-public interface VendorAcountViewMapper {
-    List<VendorAcountView> selectByCondition(@Param("con") String con, @Param("companyId") Long companyId);
-}

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

@@ -0,0 +1,134 @@
+package com.usoftchina.saas.money.po;
+
+import java.util.Date;
+
+public class AcountbalanceView {
+    private String bankcode;
+
+    private String bankname;
+
+    private Integer bankid;
+
+    private Date date;
+
+    private String kind;
+
+    private Double outamount;
+
+    private Double inamount;
+
+    private Double thisamount;
+
+    private String bcode;
+
+    private String bname;
+
+    private String bmanname;
+
+    private String remark;
+    private Integer companyId;
+
+    public Integer getCompanyId() {
+        return companyId;
+    }
+
+    public void setCompanyId(Integer companyId) {
+        this.companyId = companyId;
+    }
+
+    public String getBankcode() {
+        return bankcode;
+    }
+
+    public void setBankcode(String bankcode) {
+        this.bankcode = bankcode == null ? null : bankcode.trim();
+    }
+
+    public String getBankname() {
+        return bankname;
+    }
+
+    public void setBankname(String bankname) {
+        this.bankname = bankname == null ? null : bankname.trim();
+    }
+
+    public Integer getBankid() {
+        return bankid;
+    }
+
+    public void setBankid(Integer bankid) {
+        this.bankid = bankid;
+    }
+
+    public Date getDate() {
+        return date;
+    }
+
+    public void setDate(Date date) {
+        this.date = date;
+    }
+
+    public String getKind() {
+        return kind;
+    }
+
+    public void setKind(String kind) {
+        this.kind = kind == null ? null : kind.trim();
+    }
+
+    public Double getOutamount() {
+        return outamount;
+    }
+
+    public void setOutamount(Double outamount) {
+        this.outamount = outamount;
+    }
+
+    public Double getInamount() {
+        return inamount;
+    }
+
+    public void setInamount(Double inamount) {
+        this.inamount = inamount;
+    }
+
+    public Double getThisamount() {
+        return thisamount;
+    }
+
+    public void setThisamount(Double thisamount) {
+        this.thisamount = thisamount;
+    }
+
+    public String getBcode() {
+        return bcode;
+    }
+
+    public void setBcode(String bcode) {
+        this.bcode = bcode == null ? null : bcode.trim();
+    }
+
+    public String getBname() {
+        return bname;
+    }
+
+    public void setBname(String bname) {
+        this.bname = bname == null ? null : bname.trim();
+    }
+
+    public String getBmanname() {
+        return bmanname;
+    }
+
+    public void setBmanname(String bmanname) {
+        this.bmanname = bmanname == null ? null : bmanname.trim();
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark == null ? null : remark.trim();
+    }
+}

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

@@ -0,0 +1,165 @@
+package com.usoftchina.saas.money.po;
+
+import java.util.Date;
+
+public class CustomerCheckView {
+    private String pi_inoutno;
+
+    private String pi_class;
+
+    private String pi_custcode;
+
+    private String pi_custname;
+
+    private Date pi_date;
+
+    private Integer pd_pdno;
+
+    private String pr_code;
+
+    private String pr_detail;
+
+    private String pr_spec;
+
+    private String pd_unit;
+
+    private Double qty;
+
+    private Double pd_orderprice;
+
+    private Double pd_taxrate;
+
+    private Double pd_total;
+
+    private Double pd_netprice;
+
+    private Double pd_nettotal;
+
+    public String getPi_inoutno() {
+        return pi_inoutno;
+    }
+
+    public void setPi_inoutno(String pi_inoutno) {
+        this.pi_inoutno = pi_inoutno;
+    }
+
+    public String getPi_class() {
+        return pi_class;
+    }
+
+    public void setPi_class(String pi_class) {
+        this.pi_class = pi_class;
+    }
+
+    public String getPi_custcode() {
+        return pi_custcode;
+    }
+
+    public void setPi_custcode(String pi_custcode) {
+        this.pi_custcode = pi_custcode;
+    }
+
+    public String getPi_custname() {
+        return pi_custname;
+    }
+
+    public void setPi_custname(String pi_custname) {
+        this.pi_custname = pi_custname;
+    }
+
+    public Date getPi_date() {
+        return pi_date;
+    }
+
+    public void setPi_date(Date pi_date) {
+        this.pi_date = pi_date;
+    }
+
+    public Integer getPd_pdno() {
+        return pd_pdno;
+    }
+
+    public void setPd_pdno(Integer pd_pdno) {
+        this.pd_pdno = pd_pdno;
+    }
+
+    public String getPr_code() {
+        return pr_code;
+    }
+
+    public void setPr_code(String pr_code) {
+        this.pr_code = pr_code;
+    }
+
+    public String getPr_detail() {
+        return pr_detail;
+    }
+
+    public void setPr_detail(String pr_detail) {
+        this.pr_detail = pr_detail;
+    }
+
+    public String getPr_spec() {
+        return pr_spec;
+    }
+
+    public void setPr_spec(String pr_spec) {
+        this.pr_spec = pr_spec;
+    }
+
+    public String getPd_unit() {
+        return pd_unit;
+    }
+
+    public void setPd_unit(String pd_unit) {
+        this.pd_unit = pd_unit;
+    }
+
+    public Double getQty() {
+        return qty;
+    }
+
+    public void setQty(Double qty) {
+        this.qty = qty;
+    }
+
+    public Double getPd_orderprice() {
+        return pd_orderprice;
+    }
+
+    public void setPd_orderprice(Double pd_orderprice) {
+        this.pd_orderprice = pd_orderprice;
+    }
+
+    public Double getPd_taxrate() {
+        return pd_taxrate;
+    }
+
+    public void setPd_taxrate(Double pd_taxrate) {
+        this.pd_taxrate = pd_taxrate;
+    }
+
+    public Double getPd_total() {
+        return pd_total;
+    }
+
+    public void setPd_total(Double pd_total) {
+        this.pd_total = pd_total;
+    }
+
+    public Double getPd_netprice() {
+        return pd_netprice;
+    }
+
+    public void setPd_netprice(Double pd_netprice) {
+        this.pd_netprice = pd_netprice;
+    }
+
+    public Double getPd_nettotal() {
+        return pd_nettotal;
+    }
+
+    public void setPd_nettotal(Double pd_nettotal) {
+        this.pd_nettotal = pd_nettotal;
+    }
+}

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

@@ -0,0 +1,155 @@
+package com.usoftchina.saas.money.po;
+
+import java.util.Date;
+
+public class PaydetailView {
+    private String pi_inoutno;
+
+    private String pi_vendcode;
+
+    private String pi_vendname;
+
+    private String pi_class;
+
+    private String PU_BUYERCODE;
+
+    private String PU_BUYERNAME;
+
+    private Date pb_date;
+
+    private Double ve_beginapamount;
+
+    private Double pb_pdamount;
+
+    private Double pb_pbdamount;
+
+    private Double mustpay;
+
+    private Long mustdate;
+
+    private Double pi_total;
+
+    private String pi_remark;
+
+    private Integer companyId;
+
+    public Integer getCompanyId() {
+        return companyId;
+    }
+
+    public void setCompanyId(Integer companyId) {
+        this.companyId = companyId;
+    }
+
+    public String getPi_inoutno() {
+        return pi_inoutno;
+    }
+
+    public void setPi_inoutno(String pi_inoutno) {
+        this.pi_inoutno = pi_inoutno == null ? null : pi_inoutno.trim();
+    }
+
+    public String getPi_vendcode() {
+        return pi_vendcode;
+    }
+
+    public void setPi_vendcode(String pi_vendcode) {
+        this.pi_vendcode = pi_vendcode == null ? null : pi_vendcode.trim();
+    }
+
+    public String getPi_vendname() {
+        return pi_vendname;
+    }
+
+    public void setPi_vendname(String pi_vendname) {
+        this.pi_vendname = pi_vendname == null ? null : pi_vendname.trim();
+    }
+
+    public String getPi_class() {
+        return pi_class;
+    }
+
+    public void setPi_class(String pi_class) {
+        this.pi_class = pi_class == null ? null : pi_class.trim();
+    }
+
+    public String getPU_BUYERCODE() {
+        return PU_BUYERCODE;
+    }
+
+    public void setPU_BUYERCODE(String PU_BUYERCODE) {
+        this.PU_BUYERCODE = PU_BUYERCODE == null ? null : PU_BUYERCODE.trim();
+    }
+
+    public String getPU_BUYERNAME() {
+        return PU_BUYERNAME;
+    }
+
+    public void setPU_BUYERNAME(String PU_BUYERNAME) {
+        this.PU_BUYERNAME = PU_BUYERNAME == null ? null : PU_BUYERNAME.trim();
+    }
+
+    public Date getPb_date() {
+        return pb_date;
+    }
+
+    public void setPb_date(Date pb_date) {
+        this.pb_date = pb_date;
+    }
+
+    public Double getVe_beginapamount() {
+        return ve_beginapamount;
+    }
+
+    public void setVe_beginapamount(Double ve_beginapamount) {
+        this.ve_beginapamount = ve_beginapamount;
+    }
+
+    public Double getPb_pdamount() {
+        return pb_pdamount;
+    }
+
+    public void setPb_pdamount(Double pb_pdamount) {
+        this.pb_pdamount = pb_pdamount;
+    }
+
+    public Double getPb_pbdamount() {
+        return pb_pbdamount;
+    }
+
+    public void setPb_pbdamount(Double pb_pbdamount) {
+        this.pb_pbdamount = pb_pbdamount;
+    }
+
+    public Double getMustpay() {
+        return mustpay;
+    }
+
+    public void setMustpay(Double mustpay) {
+        this.mustpay = mustpay;
+    }
+
+    public Long getMustdate() {
+        return mustdate;
+    }
+
+    public void setMustdate(Long mustdate) {
+        this.mustdate = mustdate;
+    }
+
+    public Double getPi_total() {
+        return pi_total;
+    }
+
+    public void setPi_total(Double pi_total) {
+        this.pi_total = pi_total;
+    }
+
+    public String getPi_remark() {
+        return pi_remark;
+    }
+
+    public void setPi_remark(String pi_remark) {
+        this.pi_remark = pi_remark == null ? null : pi_remark.trim();
+    }
+}

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

@@ -0,0 +1,154 @@
+package com.usoftchina.saas.money.po;
+
+import java.util.Date;
+
+public class RecdetailView {
+    private String pi_inoutno;
+
+    private String pi_custcode;
+
+    private String pi_custname;
+
+    private String pi_class;
+
+    private String PU_BUYERCODE;
+
+    private String PU_BUYERNAME;
+
+    private Date pb_date;
+
+    private Double cu_beginaramount;
+
+    private Double pb_pdamount;
+
+    private Double pb_pbdamount;
+
+    private Double mustpay;
+
+    private Double mustdate;
+
+    private Double pi_total;
+
+    private String pi_remark;
+    private Integer companyId;
+
+    public Integer getCompanyId() {
+        return companyId;
+    }
+
+    public void setCompanyId(Integer companyId) {
+        this.companyId = companyId;
+    }
+
+    public String getPi_inoutno() {
+        return pi_inoutno;
+    }
+
+    public void setPi_inoutno(String pi_inoutno) {
+        this.pi_inoutno = pi_inoutno == null ? null : pi_inoutno.trim();
+    }
+
+    public String getPi_custcode() {
+        return pi_custcode;
+    }
+
+    public void setPi_custcode(String pi_custcode) {
+        this.pi_custcode = pi_custcode == null ? null : pi_custcode.trim();
+    }
+
+    public String getPi_custname() {
+        return pi_custname;
+    }
+
+    public void setPi_custname(String pi_custname) {
+        this.pi_custname = pi_custname == null ? null : pi_custname.trim();
+    }
+
+    public String getPi_class() {
+        return pi_class;
+    }
+
+    public void setPi_class(String pi_class) {
+        this.pi_class = pi_class == null ? null : pi_class.trim();
+    }
+
+    public String getPU_BUYERCODE() {
+        return PU_BUYERCODE;
+    }
+
+    public void setPU_BUYERCODE(String PU_BUYERCODE) {
+        this.PU_BUYERCODE = PU_BUYERCODE == null ? null : PU_BUYERCODE.trim();
+    }
+
+    public String getPU_BUYERNAME() {
+        return PU_BUYERNAME;
+    }
+
+    public void setPU_BUYERNAME(String PU_BUYERNAME) {
+        this.PU_BUYERNAME = PU_BUYERNAME == null ? null : PU_BUYERNAME.trim();
+    }
+
+    public Date getPb_date() {
+        return pb_date;
+    }
+
+    public void setPb_date(Date pb_date) {
+        this.pb_date = pb_date;
+    }
+
+    public Double getCu_beginaramount() {
+        return cu_beginaramount;
+    }
+
+    public void setCu_beginaramount(Double cu_beginaramount) {
+        this.cu_beginaramount = cu_beginaramount;
+    }
+
+    public Double getPb_pdamount() {
+        return pb_pdamount;
+    }
+
+    public void setPb_pdamount(Double pb_pdamount) {
+        this.pb_pdamount = pb_pdamount;
+    }
+
+    public Double getPb_pbdamount() {
+        return pb_pbdamount;
+    }
+
+    public void setPb_pbdamount(Double pb_pbdamount) {
+        this.pb_pbdamount = pb_pbdamount;
+    }
+
+    public Double getMustpay() {
+        return mustpay;
+    }
+
+    public void setMustpay(Double mustpay) {
+        this.mustpay = mustpay;
+    }
+
+    public Double getMustdate() {
+        return mustdate;
+    }
+
+    public void setMustdate(Double mustdate) {
+        this.mustdate = mustdate;
+    }
+
+    public Double getPi_total() {
+        return pi_total;
+    }
+
+    public void setPi_total(Double pi_total) {
+        this.pi_total = pi_total;
+    }
+
+    public String getPi_remark() {
+        return pi_remark;
+    }
+
+    public void setPi_remark(String pi_remark) {
+        this.pi_remark = pi_remark == null ? null : pi_remark.trim();
+    }
+}

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

@@ -1,4 +1,4 @@
-package com.usoftchina.saas.money.po.forms;
+package com.usoftchina.saas.money.po;
 
 import java.util.Date;
 

applications/money/money-server/src/main/java/com/usoftchina/saas/money/service/MoneyReportService.java

@@ -10,4 +10,8 @@ import com.usoftchina.saas.page.PageRequest;
  **/
 public interface MoneyReportService {
     PageInfo vendorCheck(PageRequest page, ListReqDTO req);
+    PageInfo payDetail(PageRequest page, ListReqDTO req);
+    PageInfo recDetail(PageRequest page, ListReqDTO req);
+    PageInfo acountBalance(PageRequest page, ListReqDTO req);
+    PageInfo customercheck(PageRequest page, ListReqDTO req);
 }

applications/money/money-server/src/main/java/com/usoftchina/saas/money/service/impl/MoneyReportServiceImpl.java

@@ -4,7 +4,7 @@ import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.usoftchina.saas.commons.dto.ListReqDTO;
 import com.usoftchina.saas.context.BaseContextHolder;
-import com.usoftchina.saas.money.mapper.forms.VendorAcountViewMapper;
+import com.usoftchina.saas.money.mapper.*;
 import com.usoftchina.saas.money.service.MoneyReportService;
 import com.usoftchina.saas.page.PageRequest;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -20,12 +20,40 @@ import java.util.List;
 public class MoneyReportServiceImpl implements MoneyReportService {
     @Autowired
     private VendorAcountViewMapper vendorAcountViewMapper;
+    @Autowired
+    private PaydetailViewMapper paydetailViewMapper;
+    @Autowired
+    private RecdetailViewMapper recdetailViewMapper;
+    @Autowired
+    private AcountbalanceViewMapper acountbalanceViewMapper;
+    @Autowired
+    private CustomerCheckViewMapper customerCheckViewMapper;
 
     @Override
     public PageInfo vendorCheck(PageRequest page, ListReqDTO req) {
         return getListDATA(page, req, "Supplier");
     }
 
+    @Override
+    public PageInfo payDetail(PageRequest page, ListReqDTO req) {
+        return getListDATA(page, req, "payDetail");
+    }
+
+    @Override
+    public PageInfo recDetail(PageRequest page, ListReqDTO req) {
+        return getListDATA(page, req, "recDetail");
+    }
+
+    @Override
+    public PageInfo acountBalance(PageRequest page, ListReqDTO req) {
+        return getListDATA(page, req, "acountBalance");
+    }
+
+    @Override
+    public PageInfo customercheck(PageRequest page, ListReqDTO req) {
+        return getListDATA(page, req, "customercheck");
+    }
+
     private PageInfo getListDATA(PageRequest page, ListReqDTO req, String type) {
         //设置默认分页
         if (null == page || page.getSize() == 0 || page.getNumber() == 0) {
@@ -52,10 +80,15 @@ public class MoneyReportServiceImpl implements MoneyReportService {
         }
         if ("Supplier".equals(type)) {
             list = vendorAcountViewMapper.selectByCondition(con, companyId);
+        } else if("payDetail".equals(type)){
+            list = paydetailViewMapper.selectByCondition(con, companyId);
+        }else if("recDetail".equals(type)){
+            list = recdetailViewMapper.selectByCondition(con, companyId);
+        }else if ("acountBalance".equals(type)){
+            list = acountbalanceViewMapper.selectByCondition(con, companyId);
+        }else if ("customercheck".equals(type)){
+            list = customerCheckViewMapper.selectByCondition(con, companyId);
         }
-//        } else if ("SaleRec".equals(type)){
-//            list = salerecViewMapper.selectByCondition(con, companyId);
-//        }
         return list;
     }
 }

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

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.usoftchina.saas.money.mapper.AcountbalanceViewMapper" >
+  <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="bankid" property="bankid" jdbcType="INTEGER" />
+    <result column="date" property="date" jdbcType="TIMESTAMP" />
+    <result column="kind" property="kind" jdbcType="VARCHAR" />
+    <result column="outamount" property="outamount" jdbcType="DOUBLE" />
+    <result column="inamount" property="inamount" jdbcType="DOUBLE" />
+    <result column="thisamount" property="thisamount" jdbcType="DOUBLE" />
+    <result column="bcode" property="bcode" jdbcType="VARCHAR" />
+    <result column="bname" property="bname" jdbcType="VARCHAR" />
+    <result column="bmanname" property="bmanname" jdbcType="VARCHAR" />
+    <result column="remark" property="remark" jdbcType="VARCHAR" />
+    <result column="companyId" property="companyId" jdbcType="INTEGER" />
+  </resultMap>
+
+  <select id="selectByCondition" resultMap="BaseResultMap">
+    select  *  from acountbalance_view
+    <where>
+      <if test="con != null">
+        ${con}
+      </if>
+      <if test="companyId != null">
+        and  companyId = #{companyId}
+      </if>
+    </where>
+    order by date desc
+  </select>
+
+</mapper>

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

@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.usoftchina.saas.money.mapper.CustomerCheckViewMapper" >
+    <resultMap id="BaseResultMap" type="com.usoftchina.saas.money.po.CustomerCheckView" >
+        <result column="pi_inoutno" property="pi_inoutno" jdbcType="VARCHAR" />
+        <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_date" property="pi_date" jdbcType="TIMESTAMP" />
+        <result column="pd_pdno" property="pd_pdno" jdbcType="INTEGER" />
+        <result column="pr_code" property="pr_code" jdbcType="VARCHAR" />
+        <result column="pr_detail" property="pr_detail" jdbcType="VARCHAR" />
+        <result column="pr_spec" property="pr_spec" jdbcType="VARCHAR" />
+        <result column="pd_unit" property="pd_unit" jdbcType="VARCHAR" />
+        <result column="qty" property="qty" jdbcType="DOUBLE" />
+        <result column="pd_orderprice" property="pd_orderprice" jdbcType="DOUBLE" />
+        <result column="pd_taxrate" property="pd_taxrate" jdbcType="DOUBLE" />
+        <result column="pd_total" property="pd_total" jdbcType="DOUBLE" />
+        <result column="pd_netprice" property="pd_netprice" jdbcType="DOUBLE" />
+        <result column="pd_nettotal" property="pd_nettotal" jdbcType="DOUBLE" />
+    </resultMap>
+
+    <select id="selectByCondition" resultMap="BaseResultMap">
+        select  *  from customer_amount_view
+        <where>
+            <if test="con != null">
+                ${con}
+            </if>
+            <if test="companyId != null">
+                and  companyId = #{companyId}
+            </if>
+        </where>
+        order by pi_date desc
+    </select>
+
+</mapper>

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

@@ -70,9 +70,7 @@
       <if test="ft_recorder != null" >
         ft_recorder,
       </if>
-      <if test="ft_recorddate != null" >
         ft_recorddate,
-      </if>
       <if test="ft_status != null" >
         ft_status,
       </if>
@@ -117,9 +115,7 @@
       <if test="ft_recorder != null" >
         #{ft_recorder,jdbcType=VARCHAR},
       </if>
-      <if test="ft_recorddate != null" >
-        #{ft_recorddate,jdbcType=TIMESTAMP},
-      </if>
+        now(),
       <if test="ft_status != null" >
         #{ft_status,jdbcType=VARCHAR},
       </if>
@@ -188,7 +184,6 @@
       <if test="updaterId != null" >
         updaterId = #{updaterId,jdbcType=INTEGER},
       </if>
-      updatedate = now(),
       <if test="ft_text1 != null" >
         ft_text1 = #{ft_text1,jdbcType=VARCHAR},
       </if>

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

@@ -106,9 +106,7 @@
       <if test="or_recorder != null" >
         or_recorder,
       </if>
-      <if test="or_recorddate != null" >
         or_recorddate,
-      </if>
       <if test="or_status != null" >
         or_status,
       </if>
@@ -124,9 +122,6 @@
       <if test="updaterId != null" >
         updaterId,
       </if>
-      <if test="updatedate != null" >
-        updatedate,
-      </if>
       <if test="or_text1 != null" >
         or_text1,
       </if>
@@ -177,9 +172,7 @@
       <if test="or_recorder != null" >
         #{or_recorder,jdbcType=VARCHAR},
       </if>
-      <if test="or_recorddate != null" >
-        #{or_recorddate,jdbcType=TIMESTAMP},
-      </if>
+      now(),
       <if test="or_status != null" >
         #{or_status,jdbcType=VARCHAR},
       </if>
@@ -195,9 +188,6 @@
       <if test="updaterId != null" >
         #{updaterId,jdbcType=INTEGER},
       </if>
-      <if test="updatedate != null" >
-        #{updatedate,jdbcType=TIMESTAMP},
-      </if>
       <if test="or_text1 != null" >
         #{or_text1,jdbcType=VARCHAR},
       </if>
@@ -272,7 +262,6 @@
       <if test="updaterId != null" >
         updaterId = #{updaterId,jdbcType=INTEGER},
       </if>
-      updatedate = now(),
       <if test="or_text1 != null" >
         or_text1 = #{or_text1,jdbcType=VARCHAR},
       </if>

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

@@ -100,9 +100,7 @@
       <if test="os_recorder != null" >
         os_recorder,
       </if>
-      <if test="os_recorddate != null" >
         os_recorddate,
-      </if>
       <if test="os_status != null" >
         os_status,
       </if>
@@ -118,9 +116,6 @@
       <if test="updaterId != null" >
         updaterId,
       </if>
-      <if test="updatedate != null" >
-        updatedate,
-      </if>
       <if test="os_text1 != null" >
         os_text1,
       </if>
@@ -165,9 +160,7 @@
       <if test="os_amount != null" >
         #{os_amount,jdbcType=DOUBLE},
       </if>
-      <if test="os_recorderid != null" >
-        #{os_recorderid,jdbcType=INTEGER},
-      </if>
+      now(),
       <if test="os_recorder != null" >
         #{os_recorder,jdbcType=VARCHAR},
       </if>
@@ -189,9 +182,6 @@
       <if test="updaterId != null" >
         #{updaterId,jdbcType=INTEGER},
       </if>
-      <if test="updatedate != null" >
-        #{updatedate,jdbcType=TIMESTAMP},
-      </if>
       <if test="os_text1 != null" >
         #{os_text1,jdbcType=VARCHAR},
       </if>

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

@@ -183,9 +183,7 @@
       <if test="pb_recorder != null">
         pb_recorder,
       </if>
-      <if test="pb_recorddate != null">
         pb_recorddate,
-      </if>
       <if test="pb_status != null">
         pb_status,
       </if>
@@ -201,9 +199,6 @@
       <if test="updaterId != null">
         updaterId,
       </if>
-      <if test="updatedate != null">
-        updatedate,
-      </if>
       <if test="pb_text1 != null">
         pb_text1,
       </if>
@@ -263,9 +258,7 @@
       <if test="pb_recorder != null">
         #{pb_recorder,jdbcType=VARCHAR},
       </if>
-      <if test="pb_recorddate != null">
-        #{pb_recorddate,jdbcType=TIMESTAMP},
-      </if>
+      now(),
       <if test="pb_status != null">
         #{pb_status,jdbcType=INTEGER},
       </if>
@@ -281,9 +274,6 @@
       <if test="updaterId != null">
         #{updaterId,jdbcType=INTEGER},
       </if>
-      <if test="updatedate != null">
-        #{updatedate,jdbcType=TIMESTAMP},
-      </if>
       <if test="pb_text1 != null">
         #{pb_text1,jdbcType=VARCHAR},
       </if>
@@ -374,7 +364,6 @@
       <if test="updaterId != null">
         updaterId = #{updaterId,jdbcType=INTEGER},
       </if>
-      updatedate = now(),
       <if test="pb_text1 != null">
         pb_text1 = #{pb_text1,jdbcType=VARCHAR},
       </if>

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

@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.usoftchina.saas.money.mapper.PaydetailViewMapper" >
+  <resultMap id="BaseResultMap" type="com.usoftchina.saas.money.po.PaydetailView" >
+    <result column="pi_inoutno" property="pi_inoutno" jdbcType="VARCHAR" />
+    <result column="pi_vendcode" property="pi_vendcode" jdbcType="VARCHAR" />
+    <result column="pi_vendname" property="pi_vendname" jdbcType="VARCHAR" />
+    <result column="pi_class" property="pi_class" jdbcType="VARCHAR" />
+    <result column="PU_BUYERCODE" property="PU_BUYERCODE" jdbcType="VARCHAR" />
+    <result column="PU_BUYERNAME" property="PU_BUYERNAME" jdbcType="VARCHAR" />
+    <result column="pb_date" property="pb_date" jdbcType="TIMESTAMP" />
+    <result column="ve_beginapamount" property="ve_beginapamount" jdbcType="DOUBLE" />
+    <result column="pb_pdamount" property="pb_pdamount" jdbcType="DOUBLE" />
+    <result column="pb_pbdamount" property="pb_pbdamount" jdbcType="DOUBLE" />
+    <result column="mustpay" property="mustpay" jdbcType="DOUBLE" />
+    <result column="mustdate" property="mustdate" jdbcType="DECIMAL" />
+    <result column="pi_total" property="pi_total" jdbcType="DOUBLE" />
+    <result column="pi_remark" property="pi_remark" jdbcType="VARCHAR" />
+    <result column="companyId" property="companyId" jdbcType="INTEGER" />
+  </resultMap>
+
+  <select id="selectByCondition" resultMap="BaseResultMap">
+    select  *  from paydetail_view
+    <where>
+      <if test="con != null">
+        ${con}
+      </if>
+      <if test="companyId != null">
+        and  companyId = #{companyId}
+      </if>
+    </where>
+    order by pb_date desc
+  </select>
+
+</mapper>

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

@@ -23,7 +23,7 @@
     <result column="rb_remark" jdbcType="VARCHAR" property="rb_remark" />
     <result column="companyId" jdbcType="INTEGER" property="companyId" />
     <result column="updaterId" jdbcType="INTEGER" property="updaterId" />
-    <result column="updatedate" jdbcType="TIMESTAMP" property="updateTime" />
+    <result column="updatedate" jdbcType="TIMESTAMP" property="updatedate" />
     <result column="rb_text1" jdbcType="VARCHAR" property="rb_text1" />
     <result column="rb_text2" jdbcType="VARCHAR" property="rb_text2" />
     <result column="rb_text3" jdbcType="VARCHAR" property="rb_text3" />
@@ -224,9 +224,7 @@
       <if test="rb_recorder != null">
         rb_recorder,
       </if>
-      <if test="rb_recorddate != null">
         rb_recorddate,
-      </if>
       <if test="rb_status != null">
         rb_status,
       </if>
@@ -242,9 +240,6 @@
       <if test="updaterId != null">
         updaterId,
       </if>
-      <if test="updateTime != null">
-        updateTime,
-      </if>
       <if test="rb_text1 != null">
         rb_text1,
       </if>
@@ -304,9 +299,7 @@
       <if test="rb_recorder != null">
         #{rb_recorder,jdbcType=VARCHAR},
       </if>
-      <if test="rb_recorddate != null">
-        #{rb_recorddate,jdbcType=TIMESTAMP},
-      </if>
+      now(),
       <if test="rb_status != null">
         #{rb_status,jdbcType=INTEGER},
       </if>
@@ -322,9 +315,6 @@
       <if test="updaterId != null">
         #{updaterId,jdbcType=INTEGER},
       </if>
-      <if test="updateTime != null">
-        #{updateTime,jdbcType=TIMESTAMP},
-      </if>
       <if test="rb_text1 != null">
         #{rb_text1,jdbcType=VARCHAR},
       </if>
@@ -536,7 +526,6 @@
       <if test="updaterId != null">
         updaterId = #{updaterId,jdbcType=INTEGER},
       </if>
-      updatedate = now(),
       <if test="rb_text1 != null">
         rb_text1 = #{rb_text1,jdbcType=VARCHAR},
       </if>

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

@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.usoftchina.saas.money.mapper.RecdetailViewMapper" >
+  <resultMap id="BaseResultMap" type="com.usoftchina.saas.money.po.RecdetailView" >
+    <result column="pi_inoutno" property="pi_inoutno" jdbcType="VARCHAR" />
+    <result column="pi_custcode" property="pi_custcode" jdbcType="VARCHAR" />
+    <result column="pi_custname" property="pi_custname" jdbcType="VARCHAR" />
+    <result column="pi_class" property="pi_class" jdbcType="VARCHAR" />
+    <result column="PU_BUYERCODE" property="PU_BUYERCODE" jdbcType="VARCHAR" />
+    <result column="PU_BUYERNAME" property="PU_BUYERNAME" jdbcType="VARCHAR" />
+    <result column="pb_date" property="pb_date" jdbcType="TIMESTAMP" />
+    <result column="cu_beginaramount" property="cu_beginaramount" jdbcType="DOUBLE" />
+    <result column="pb_pdamount" property="pb_pdamount" jdbcType="DOUBLE" />
+    <result column="pb_pbdamount" property="pb_pbdamount" jdbcType="DOUBLE" />
+    <result column="mustpay" property="mustpay" jdbcType="DOUBLE" />
+    <result column="mustdate" property="mustdate" jdbcType="DOUBLE" />
+    <result column="pi_total" property="pi_total" jdbcType="DOUBLE" />
+    <result column="pi_remark" property="pi_remark" jdbcType="VARCHAR" />
+  <result column="companyId" property="companyId" jdbcType="INTEGER" />
+  </resultMap>
+
+  <select id="selectByCondition" resultMap="BaseResultMap">
+    select  *  from recdetail_view
+    <where>
+      <if test="con != null">
+        ${con}
+      </if>
+      <if test="companyId != null">
+        and  companyId = #{companyId}
+      </if>
+    </where>
+    order by pb_date desc
+  </select>
+</mapper>

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

@@ -33,5 +33,4 @@
     </where>
     order by pi_date desc
   </select>
-
 </mapper>

applications/sale/sale-server/src/main/java/com/usoftchina/saas/sale/service/impl/SaleServiceImpl.java

@@ -472,8 +472,8 @@ public class SaleServiceImpl implements SaleService{
             Map<String, Object> warehouse = getWareHouseByCode(saleDetail.getSd_prodcode());
             if (null != warehouse) {
                 prodIODetail.setPd_whid(warehouse.get("pr_whid") == null ? 0 : Integer.valueOf(warehouse.get("pr_whid").toString()));
-                prodIODetail.setPd_whcode(String.valueOf(warehouse.get("pr_whcode")));
-                prodIODetail.setPd_whname(String.valueOf(warehouse.get("pr_whname")));
+                prodIODetail.setPd_whcode(warehouse.get("pr_whcode") == null ? null : warehouse.get("pr_whcode").toString());
+                prodIODetail.setPd_whname(warehouse.get("pr_whname") == null ? null : warehouse.get("pr_whname").toString());
             }
             prodIODetailMapper.insertSelective(prodIODetail);
             //更新已转数

frontend/saas-web/app/Application.scss

@@ -83,12 +83,13 @@ body.launching {
 .x-form-text-default,
 .x-column-header,
 .x-grid-item,
-.x-grid-row-summary .x-grid-cell, .x-grid-row-summary .x-grid-rowwrap, .x-grid-row-summary .x-grid-cell-rowbody {
-  font-family: 'pingFangSC-Regular';
+.x-grid-row-summary .x-grid-cell, .x-grid-row-summary .x-grid-rowwrap, .x-grid-row-summary .x-grid-cell-rowbody,
+.x-boundlist-item {
+  // font-family: 'pingFangSC-Regular';
 }
 
 .x-form-item-label-default {
-  font-family: PingFangSC-Medium;
+  // font-family: PingFangSC-Medium;
   font-size: 14px;
   color: #505363;
   text-align: right;
@@ -108,6 +109,21 @@ body.launching {
   }
 }
 
+.x-form-item-default.x-form-readonly {
+  opacity: 1;
+
+  .x-form-item-label-default {
+    color: #8C97B2;
+  }
+
+  .x-form-text-default {
+    background: #EEF1F7;
+  }
+  .x-form-trigger {
+    background: #EEF1F7;
+  }
+}
+
 .x-btn.x-btn-menu-active.x-btn-default-toolbar-small,
 .x-btn.x-btn-pressed.x-btn-default-toolbar-small,
 .x-btn-over.x-btn-default-toolbar-small {
@@ -118,6 +134,10 @@ body.launching {
 .x-keyboard-mode .x-btn-focus.x-btn-default-toolbar-small {
   background: #34BAF6;
   opacity: 0.72;
+  box-shadow: none;
+}
+.x-keyboard-mode .x-btn-focus.x-btn-over.x-btn-default-toolbar-small {
+  box-shadow: none;
 }
 
 .x-btn-wrap-default-toolbar-small.x-btn-arrow-right:after {
@@ -172,7 +192,7 @@ body.launching {
   letter-spacing: 0;
   text-align: center;
   line-height: 20px;
-  font-family: PingFangSC-Medium;
+  // font-family: PingFangSC-Medium;
   font-weight: normal;
 }
 

frontend/saas-web/app/util/FormUtil.js

@@ -170,6 +170,7 @@ Ext.define('saas.util.FormUtil', {
             me.loadData(form);
         })
         .catch(function(response) {
+            showToast('错误：' + response.message);
             console.error(response);
         });
 
@@ -226,15 +227,14 @@ Ext.define('saas.util.FormUtil', {
                         var o = {};
                         o[form._codeField] = code;
 
-                        var formData = {
-                            main: o
-                        };
-                        Ext.Array.each(detailGrids, function(grid, index) {
+                        var formData = form.initData || {main: {}};
+                        Ext.apply(formData.main, o);
+                        form.initData || Ext.Array.each(detailGrids, function(grid, index) {
                             var detno = 0;
                             var detnoColumn = grid.detnoColumn;
                             var datas = [];
                             
-                            Ext.Array.each(new Array(10), function() {
+                            Ext.Array.each(new Array(5), function() {
                                 detno += 1;
                                 var data = {};
                                 data[detnoColumn] = detno;

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

@@ -21,7 +21,7 @@ Ext.define('saas.view.core.form.ConDateField', {
             width: 100,
             editable: false,
             hidden: !me.showscope,
-            fieldStyle: 'background:#C1CDC1',
+            fieldStyle: 'background:#eef1f7',
             store: Ext.create('Ext.data.Store', {
                 fields: ['display', 'value'],
                 data : [

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

@@ -63,6 +63,13 @@ Ext.define('saas.view.core.form.FormPanel', {
                 hidden: '{!id}'
             },
             handler: 'add'
+        }, {
+            xtype: 'button',
+            text: '复制',
+            handler: 'onCopy',
+            bind: {
+                hidden: '{!'+ me._idField + '}',
+            }
         }, {
             xtype: 'button',
             text: '保存',
@@ -366,8 +373,8 @@ Ext.define('saas.view.core.form.FormPanel', {
         });
 
         Ext.Array.each(items, function(item) {
-            if(typeof item.setEditable == 'function') {
-                typeof item.setDisabled == 'function' && item.setDisabled(!able);
+            if(typeof item.setReadOnly  == 'function') {
+               item.setReadOnly (!able);
             }
         });
     },

frontend/saas-web/app/view/core/form/FormPanel.scss

@@ -1,11 +1,14 @@
 .x-core-form {
-    padding: 10px;
+    padding: 24px;
 
     .x-tb {
         color: #A2A2A2;
         letter-spacing: 0.72px;
         text-align: left;
-        font: 400 18px/16px 'PingFangSC-Regular';
+        font-size: 18px;
+        line-height: 16px;
+        font-weight: 400;
+        // font: 400 18px/16px 'PingFangSC-Regular';
     }
     .x-codeeditor {
         top: -2px !important;
@@ -22,7 +25,10 @@
                 letter-spacing: 0.72px;
                 font-size: 18px;
                 min-height: inherit;
-                font: 400 18px/16px 'PingFangSC-Regular';
+                font-size: 18px;
+                line-height: 16px;
+                font-weight: 400;
+                // font: 400 18px/16px 'PingFangSC-Regular';
             }
         }
     }
@@ -50,7 +56,7 @@
         }
     }
     .x-audited {
-        border: 1px solid #FF0000;
-        color: #FF0000;
+        border: 1px solid #FF002B;
+        color: #FF002B;
     }
 }

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

@@ -20,6 +20,53 @@ Ext.define('saas.view.core.form.FormPanelController', {
         var id = form.xtype + '-add';
         openTab(form.xtype,'新增' + form._title, id);
     },
+
+    onCopy: function() {
+        var me = this;
+        var form = this.getView();
+        var id = form.xtype + '-add';
+
+        var formData = me.initCopyData(form.getFormData());
+
+        openTab(form.xtype,'新增' + form._title, id, {initData: formData});
+    },
+
+    initCopyData: function(formData) {
+        var form = this.getView();
+        var detailCount = form.detailCount;
+        var main = formData.main;
+        var auditTexts = form.auditTexts;
+
+        // 单号、id清空
+        main[form._idField] = 0;
+        main[form._codeField] = '';
+        // 单据状态为录入状态（未审核）
+        main[form._statusCodeField] = auditTexts.unAuditCode;
+        main[form._statusField] = auditTexts.unAuditText;
+
+        for(var k in main) {
+            // 主表日期改为当前日期
+            if(isDateString(main[k])) {
+                main[k] = Ext.Date.format(new Date, 'Y-m-d H:i:s');
+            }
+        }
+
+        for(var j = 0; j < detailCount; j++) {
+            var detail = formData['detail' + j];
+            for(var x = 0; x < detail.length; x ++) {
+                var d = detail[x];
+
+                for(var k in d) {
+                    // 从表日期清空
+                    if(isDateString(main[k])) {
+                        main[k] = '';
+                    }
+                }
+            }
+        }
+
+        return formData;
+    },
     
     delete: function(){
         var me = this;

frontend/saas-web/app/view/core/form/field/DetailGridField.js

@@ -8,7 +8,7 @@ Ext.define('saas.view.core.form.field.DetailGridField', {
 
     border: 1,
     margin: '0 5 5 0', // formpanel的fieldDefaults未生效
-    height: 300,
+    height: 245,
     columnWidth : 1.0, 
 
     requires: [

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

@@ -18,7 +18,7 @@ Ext.define('saas.view.core.query.QueryPanel', {
         width: '100%',
     }, {
         margin: '32 0 0 0',
-        padding: '16 16 16 16',
+        padding: '24',
         reference: 'querygrid',
         xtype: 'core-query-querygridpanel',
         width: '100%',

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: 'codefield',
+    _codeField: 'bo_mothercode',
     _statusField: 'bo_status',
     _statusCodeField: 'bo_statuscode',
     _readUrl:'/api/document/bom/read/',

frontend/saas-web/app/view/document/kind/ChildForm.js

@@ -96,14 +96,17 @@ Ext.define('KitchenSink.view.binding.ChildForm', {
                 mouseWheelEnabled: false,
                 minValue: 0
             },{
-                xtype:'textfield',
+                xtype:'combo',
                 name:'bk_type',
                 allowBlank:false,
                 fieldLabel:'账户类别',
+                store: [
+                    '现金',
+                    '银行'
+                ]
             },{
                 xtype:'datefield',
                 name:'bk_date',
-                readOnly:true,
                 fieldLabel:'建账日期',
                 format:'Y-m-d H:i:s',
                 listeners:{
@@ -111,6 +114,11 @@ Ext.define('KitchenSink.view.binding.ChildForm', {
                         d.setValue(new Date())
                     }
                 }
+            }, {
+                xtype:'textfield',
+                name:'bk_remark',
+                allowBlank:true,
+                fieldLabel:'备注',
             }]
         },
         productbrand:{

frontend/saas-web/app/view/document/kind/Kind.js

@@ -143,7 +143,7 @@ Ext.define('saas.view.document.kind.Kind', {
             },{
                 text: '账户类别',
                 dataIndex: 'bk_type',
-                flex: 1
+                flex: 1,
             },{
                 text: '账户期初金额',
                 dataIndex: 'bk_beginamount',
@@ -152,6 +152,10 @@ Ext.define('saas.view.document.kind.Kind', {
                 text: '账户期末余额',
                 dataIndex: 'bk_thisamount',
                 flex: 1
+            }, {
+                text: '备注',
+                dataIndex: 'bk_remark',
+                flex: 1
             }],
             keyField:'id',
             reqUrl: '/api/document/bankinformation/save',

frontend/saas-web/app/view/main/Main.scss

@@ -72,7 +72,7 @@ $treelist-nav-ui: (
         }
 
         .logo-text {
-            font-family: 'pingFangSC-Regular';
+            // font-family: 'pingFangSC-Regular';
             font-size: 18px;
             color: #FFFFFF;
             text-align: left;

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

@@ -183,7 +183,7 @@ Ext.define('saas.view.money.fundtransfer.FormPanel', {
         readOnly:true
     }, {
         xtype : "datefield", 
-        name : "ft_recorddate", 
+        name : "ft_date",
         fieldLabel : "录入日期",
         readOnly:true
     }

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

@@ -30,7 +30,7 @@ Ext.define('saas.view.money.fundtransfer.QueryPanel', {
             dataIndex: 'ft_code',
             width: 200
         }, {
-            text: '单据状态',
+            text: '审核状态',
             dataIndex: 'ft_status',
             width: 120
         }, {

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

@@ -56,7 +56,7 @@ Ext.define('saas.view.money.othreceipts.QueryPanel', {
             dataIndex: 'or_code',
             width: 200
         }, {
-            text: '单据状态',
+            text: '审核状态',
             dataIndex: 'or_status',
             width: 120
         }, {

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

@@ -56,7 +56,7 @@ Ext.define('saas.view.money.othspendings.QueryPanel', {
             dataIndex: 'os_code',
             width: 200
         }, {
-            text: '单据状态',
+            text: '审核状态',
             dataIndex: 'os_status',
             width: 120
         }, {

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

@@ -32,11 +32,11 @@ Ext.define('saas.view.money.paybalance.QueryPanel', {
             dataIndex: 'pb_code',
             width: 200
         }, {
-            text: '状态',
+            text: '审核状态',
             dataIndex: 'pb_status',
             width: 120
         }, {
-            text: '日期',
+            text: '单据日期',
             dataIndex: 'pb_date',
             width: 160
         }, {

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

@@ -45,11 +45,11 @@ Ext.define('saas.view.money.recBalance.QueryPanel', {
             dataIndex: 'rb_code',
             width: 200
         }, {
-            text: '单据状态',
+            text: '审核状态',
             dataIndex: 'rb_status',
             width: 120
         }, {
-            text: '日期',
+            text: '单据日期',
             dataIndex: 'rb_date',
             xtype: 'datecolumn',
             width: 200

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

@@ -0,0 +1,64 @@
+Ext.define('saas.view.money.report.AccountBalance', {
+    extend: 'saas.view.core.report.ReportPanel',
+    xtype: 'monry-report-accountbalance',
+
+    controller: 'money-report-accountbalance',
+    viewModel: 'money-report-accountbalance',
+
+    viewName: '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,
+    //筛选：账户、日期（必填）
+    searchItems: [ {
+        xtype: 'dbfindtrigger',
+        name: 'bankcode',
+        fieldLabel: '账户名称',
+        columnWidth: 0.2
+    }, {
+        xtype: 'condatefield',
+        name: 'date',
+        fieldLabel: '日期',
+        columnWidth: 0.5
+    }],
+
+    reportColumns: [
+         {
+            text: '账户编号',
+            dataIndex: 'bankcode',
+            width: 200
+        }, {
+            text: '账户名称',
+            dataIndex: 'bankname',
+            width: 200
+        }, {
+            text: '日期',
+            dataIndex: 'date',
+            width: 200
+        }, {
+            text: '业务类型',
+            dataIndex: 'kind'
+        },{
+            text:'收入',
+            dataIndex:'outamount'
+        },{
+            text:'支出',
+            dataIndex:'thisamount'
+        },{
+            text: '账户余额',
+            dataIndex: 'pr_code'
+        }, {
+            text: '往来单位',
+            dataIndex: 'bcode'
+        }, {
+            text: '收付款人',
+            dataIndex: 'bmanname'
+        }, {
+            text: '备注',
+            dataIndex: 'remark'
+        }]
+});

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

@@ -0,0 +1,74 @@
+Ext.define('saas.view.money.report.AccountBalanceController', {
+    extend: 'saas.view.core.report.ReportPanelController',
+    alias: 'controller.money-report-accountbalance',
+    init: function (form) {
+        this.control({
+            //账户资料
+            'dbfindtrigger[name=bankname]':{
+                beforerender:function(f){
+                    Ext.apply(f,{
+                        dataUrl:'/api/document/bankinformation/list',
+                        addXtype: 'other-bankinformation',
+                        addTitle:'账户资料',
+                        dbfinds:[
+                            {
+                                from:'bk_bankname',to:'bankname'
+                            }],
+                        dbtpls:[{
+                            field:'bk_bankcode',width:100
+                        },{
+                            field:'bk_bankname',width:100
+                        }],
+                        dbSearchFields:[{
+                            xtype : "textfield",
+                            name: 'name',
+                            getCondition: function(v) {
+                                return "(upper(bk_bankcode) like '%"+v.toUpperCase()+"%' or upper(bk_bankname) like '%"+v.toUpperCase()+"%')";
+                            },
+                            emptyText : "请输入账户编号或名称",
+                            columnWidth : 0.25
+                        }],
+                        dbColumns:[{
+                            "text": "账户ID",
+                            "flex": 0,
+                            "dataIndex": "id",
+                            "width": 0,
+                            "xtype": ""
+                        },{
+                            "text": "账户编号",
+                            "flex": 1,
+                            "dataIndex": "bk_bankcode",
+                            "width": 120,
+                            "xtype": ""
+                        }, {
+                            "text": "账户名称",
+                            "flex": 1,
+                            "dataIndex": "bk_bankname",
+                            "width": 150,
+                            "xtype": ""
+                        }, {
+                            "text": "账户类型",
+                            "flex": 1,
+                            "dataIndex": "bk_type",
+                            "width": 120,
+                            "xtype": ""
+                        }, {
+                            "text": "账户余额",
+                            "flex": 1,
+                            "dataIndex": "bk_thisamount",
+                            "width": 120,
+                            align:'right',
+                            "xtype": ""
+                        }, {
+                            "text": "建帐日期",
+                            "flex": 1,
+                            "dataIndex": "bk_date",
+                            "width": 120,
+                            "xtype": "datecolumn"
+                        }]
+                    }) ;
+                }
+            }
+        });
+    }
+});

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

@@ -0,0 +1,4 @@
+Ext.define('saas.view.money.report.AccountBalanceModel', {
+    extend: 'saas.view.core.report.ReportPanelModel',
+    alias: 'viewmodel.money-report-accountbalance'
+});

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

@@ -0,0 +1,94 @@
+Ext.define('saas.view.money.report.CustomerCheckCheck', {
+    extend: 'saas.view.core.report.ReportPanel',
+    xtype: 'monry-report-customercheck',
+
+    controller: 'money-report-customercheck',
+    viewModel: 'money-report-customercheck',
+
+    viewName: 'money-report-customercheck',
+
+    groupField: null,
+    listUrl: '/api/money/report/customercheck',
+    // listUrl: 'http://192.168.253.35:8880/report/customercheck',
+    defaultCondition: null,
+    reportTitle: '客户对账单',
+    QueryWidth:0.1,
+    //筛选：客户、日期（必填）
+    searchItems: [ {
+        xtype: 'dbfindtrigger',
+        name: 'pi_custname',
+        fieldLabel: '客户名称',
+        columnWidth: 0.2
+    }, {
+        xtype: 'condatefield',
+        name: 'pi_date',
+        fieldLabel: '单据日期',
+        columnWidth: 0.5
+    }],
+
+    reportColumns: [
+        {
+            text: 'id',
+            dataIndex: 'pi_id',
+            hidden: true
+        }, {
+            text: '单号',
+            dataIndex: 'pi_inoutno',
+            width: 200
+        }, {
+            text: '单据类型',
+            dataIndex: 'pi_class',
+            width: 200
+        }, {
+            text: '单据日期',
+            dataIndex: 'pi_date',
+            width: 200
+        }, {
+            text: '序号',
+            dataIndex: 'pd_pdno'
+        },{
+            text:'客户编号',
+            dataIndex:'pi_vendcode',
+            hidden: true
+        },{
+            text:'客户名称',
+            dataIndex:'pi_vendname',
+            hidden: true
+        },{
+            text: '物料编号',
+            dataIndex: 'pr_code'
+        }, {
+            text: '物料名称',
+            dataIndex: 'pr_detail'
+        }, {
+            text: '物料规格',
+            dataIndex: 'pr_spec'
+        }, {
+            text: '单位',
+            dataIndex: 'pd_unit'
+        }, {
+            text: '数量',
+            dataIndex: 'qty',
+            summaryType: 'count'
+        }, {
+            text: '单价',
+            dataIndex: 'pd_orderprice'
+        }, {
+            text: '税率',
+            dataIndex: 'pd_taxrate'
+        }, {
+            text: '金额',
+            dataIndex: 'pd_total',
+            summaryType: 'count'
+        }, {
+            text: '不含税单价',
+            dataIndex: 'pd_netprice'
+        }, {
+            text: '不含税金额',
+            dataIndex: 'pd_nettotal',
+            summaryType: 'count'
+        }, {
+            text: '备注',
+            dataIndex: 'pd_remark'
+        }]
+});

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

@@ -0,0 +1,82 @@
+Ext.define('saas.view.money.report.CustomerCheckController', {
+    extend: 'saas.view.core.report.ReportPanelController',
+    alias: 'controller.money-report-customercheck',
+    init: function (form) {
+        this.control({
+            'dbfindtrigger[name=pi_custname]':{
+                beforerender:function(f){
+                    Ext.apply(f,{
+                        //数据接口
+                        dataUrl: '/api/document/customer/list',
+                        addXtype: 'document-customer-formpanel',
+                        addTitle: '客户资料',
+                        //赋值
+                        dbfinds:[{
+                            from: 'cu_name', to: 'pi_custname'
+                        }],
+                        //联想设置
+                        dbtpls:[{
+                            field:'cu_code',width:100
+                        },{
+                            field:'cu_name',width:100
+                        }],
+                        defaultCondition: 'cu_statuscode="OPEN"',
+                        dbSearchFields:[{
+                            emptyText:'输入客户编号或名称',
+                            xtype : "textfield",
+                            name : "search",
+                            getCondition: function(v) {
+                                return "(upper(cu_code) like '%"+v.toUpperCase()+"%' or upper(cu_name) like '%"+v.toUpperCase()+"%')";
+                            },
+                            allowBlank : true,
+                            columnWidth : 0.25
+                        }],
+                        //放大镜窗口列表
+                        dbColumns:[{
+                            "text": "客户ID",
+                            "hidden": true,
+                            "dataIndex": "id",
+                        },{
+                            "text": "客户编号",
+                            "dataIndex": "cu_code",
+                            "width": 200,
+                        }, {
+                            "text": "客户名称",
+                            "dataIndex": "cu_name",
+                            "width": 200
+                        },{
+                            "text": "客户类型",
+                            "dataIndex": "cu_name",
+                            "width": 100
+                        },{
+                            "text": "业务员",
+                            "dataIndex": "cu_sellername",
+                            "width": 100
+                        },{
+                            "text": "应收款余额",
+                            "dataIndex": "cu_leftamount",
+                            "width": 100,
+                            align:'right'
+                        },{
+                            "text": "税率",
+                            "dataIndex": "cu_taxrate",
+                            "width": 100,
+                            align:'right'
+                        },{
+                            "text": "承付天数",
+                            "dataIndex": "cu_promisedays",
+                            "width": 100,
+                            align:'right'
+                        },{
+                            "text": "额度",
+                            "dataIndex": "cu_credit",
+                            "width": 100,
+                            align:'right'
+                        }]
+                    }) ;
+
+                }
+            }
+        });
+    }
+});

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

@@ -0,0 +1,4 @@
+Ext.define('saas.view.money.report.CustomerCheckModel', {
+    extend: 'saas.view.core.report.ReportPanelModel',
+    alias: 'viewmodel.money-report-customercheck'
+});

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

@@ -0,0 +1,81 @@
+Ext.define('saas.view.money.report.PayDetail', {
+    extend: 'saas.view.core.report.ReportPanel',
+    xtype: 'monry-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,
+    //筛选：供应商、日期（必填）
+    searchItems: [ {
+        xtype: 'dbfindtrigger',
+        name: 'pi_vendname',
+        fieldLabel: '供应商名称',
+        columnWidth: 0.2
+    }, {
+        xtype: 'condatefield',
+        name: 'pb_date',
+        fieldLabel: '单据日期',
+        columnWidth: 0.5
+    }],
+
+    reportColumns: [
+        {
+            text: 'id',
+            dataIndex: 'pi_id',
+            hidden: true
+        }, {
+            text: '单号',
+            dataIndex: 'pi_inoutno',
+            width: 200
+        },{
+            text:'供应商编号',
+            dataIndex:'pi_vendcode'
+        },{
+            text:'供应商名称',
+            dataIndex:'pi_vendname'
+        }, {
+            text: '单据类型',
+            dataIndex: 'pi_class',
+            width: 200
+        }, {
+            text: '单据日期',
+            dataIndex: 'pb_date',
+            width: 200
+        }, {
+            text: '采购员',
+            dataIndex: 'pu_buyercode'
+        },{
+            text: '单据日期',
+            dataIndex: 'pb_date'
+        }, {
+            text: '期初应付余额',
+            dataIndex: 've_beginapamount',
+            summaryType: 'count'
+        }, {
+            text: '本期付款金额',
+            dataIndex: 'pb_pdamount',
+            summaryType: 'count'
+        }, {
+            text: '应付余额',
+            dataIndex: 'mustpay',
+            summaryType: 'count'
+        }, {
+            text: '应付日期',
+            dataIndex: 'mustdate',
+        }, {
+            text: '单据总金额',
+            dataIndex: 'pi_total',
+            summaryType: 'count'
+        }, {
+            text: '备注',
+            dataIndex: 'pi_remark'
+        }]
+});

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

@@ -0,0 +1,79 @@
+Ext.define('saas.view.money.report.PayDetailController', {
+    extend: 'saas.view.core.report.ReportPanelController',
+    alias: 'controller.money-report-paydetail',
+    init: function (form) {
+        this.control({
+            // 供应商编号
+            'dbfindtrigger[name=pi_vendname]':{
+                beforerender:function(f){
+                    Ext.apply(f,{
+                        dataUrl:'/api/document/vendor/list',
+                        addXtype: 'document-vendor-formpanel',
+                        addTitle: '供应商资料',
+                        dbfinds:[{
+                            from:'ve_name',to:'pi_vendname'
+                        }],
+                        dbtpls:[{
+                            field:'ve_code',width:100
+                        },{
+                            field:'ve_name',width:100
+                        }],
+                        defaultCondition: "ve_statuscode='OPEN'",
+                        dbSearchFields:[{
+                            emptyText:'输入供应商编号或名称',
+                            xtype : "textfield",
+                            name : "search",
+                            getCondition: function(v) {
+                                return "(upper(ve_code) like '%"+v.toUpperCase()+"%' or upper(ve_name) like '%"+v.toUpperCase()+"%')";
+                            },
+                            allowBlank : true,
+                            columnWidth : 0.25
+                        }],
+                        dbColumns:[
+                            {
+                                "text": "供应商ID",
+                                "hidden": true,
+                                "dataIndex": "id",
+                                "width": 100,
+                                "xtype": "numbercolumn"
+                            },{
+                                "text": "供应商编号",
+                                "dataIndex": "ve_code",
+                                "width": 200
+                            }, {
+                                "text": "供应商名称",
+                                "dataIndex": "ve_name",
+                                "width": 200
+                            }, {
+                                "text": "供应商类型",
+                                "dataIndex": "ve_type",
+                                "width": 180,
+                                "items": null
+                            }, {
+                                "text": "税率",
+                                "dataIndex": "ve_taxrate",
+                                "width": 100
+                            }, {
+                                "text": "承付天数",
+                                "dataIndex": "ve_promisedays",
+                                "width": 100
+                            }, {
+                                "text": "纳税人识别号",
+                                "dataIndex": "ve_bankaccount",
+                                "width": 150
+                            }, {
+                                "text": "开户银行",
+                                "dataIndex": "ve_bankaccount",
+                                "width": 100
+                            }, {
+                                "text": "银行账户",
+                                "dataIndex": "ve_bankcode",
+                                "width": 100
+                            }]
+                    }) ;
+
+                }
+            }
+        });
+    }
+});

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

@@ -0,0 +1,4 @@
+Ext.define('saas.view.money.report.PayDetailModel', {
+    extend: 'saas.view.core.report.ReportPanelModel',
+    alias: 'viewmodel.money-report-paydetail'
+});

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

@@ -0,0 +1,83 @@
+Ext.define('saas.view.money.report.RecDetail', {
+    extend: 'saas.view.core.report.ReportPanel',
+    xtype: 'monry-report-recdetail',
+
+    controller: 'money-report-recdetail',
+    viewModel: 'money-report-recdetail',
+
+    viewName: '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,
+    //筛选：客户、日期（必填）
+    searchItems: [ {
+        xtype: 'dbfindtrigger',
+        name: 'pi_custname',
+        fieldLabel: '客户名称',
+        columnWidth: 0.2
+    }, {
+        xtype: 'condatefield',
+        name: 'pb_date',
+        fieldLabel: '单据日期',
+        columnWidth: 0.5
+    }],
+
+    reportColumns: [
+        {
+            text: 'id',
+            dataIndex: 'pi_id',
+            hidden: true
+        }, {
+            text: '单号',
+            dataIndex: 'pi_inoutno',
+            width: 200
+        }, {
+            text: '客户编号',
+            dataIndex: 'pi_custcode',
+            width: 200
+        }, {
+            text: '客户名称',
+            dataIndex: 'pi_custname',
+            width: 200
+        }, {
+            text: '单据类型',
+            dataIndex: 'pi_class',
+            width: 200
+        },{
+            text: '业务员',
+            dataIndex: 'PU_BUYERNAME',
+            width: 200
+        }, {
+            text: '单据日期',
+            dataIndex: 'pb_date',
+            width: 200,
+        }, {
+            text: '序号',
+            dataIndex: 'pd_pdno'
+        },{
+            text:'期初应收',
+            dataIndex:'cu_beginaramount',
+            summaryType: 'count'
+        },{
+            text:'本期收款金额',
+            dataIndex:'pb_pdamount',
+            summaryType: 'count'
+        },{
+            text: '应收余额',
+            dataIndex: 'mustpay',
+            summaryType: 'count'
+        }, {
+            text: '应收日期',
+            dataIndex: 'mustdate'
+        }, {
+            text: '单据总金额',
+            dataIndex: 'pi_total'
+        }, {
+            text: '备注',
+            dataIndex: 'pd_unit'
+        }]
+});

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

@@ -0,0 +1,82 @@
+Ext.define('saas.view.money.report.RecDetailController', {
+    extend: 'saas.view.core.report.ReportPanelController',
+    alias: 'controller.money-report-recdetail',
+    init: function (form) {
+        this.control({
+            'dbfindtrigger[name=pi_custname]':{
+                beforerender:function(f){
+                    Ext.apply(f,{
+                        //数据接口
+                        dataUrl: '/api/document/customer/list',
+                        addXtype: 'document-customer-formpanel',
+                        addTitle: '客户资料',
+                        //赋值
+                        dbfinds:[{
+                            from: 'cu_name', to: 'pi_custname'
+                        }],
+                        //联想设置
+                        dbtpls:[{
+                            field:'cu_code',width:100
+                        },{
+                            field:'cu_name',width:100
+                        }],
+                        defaultCondition: 'cu_statuscode="OPEN"',
+                        dbSearchFields:[{
+                            emptyText:'输入客户编号或名称',
+                            xtype : "textfield",
+                            name : "search",
+                            getCondition: function(v) {
+                                return "(upper(cu_code) like '%"+v.toUpperCase()+"%' or upper(cu_name) like '%"+v.toUpperCase()+"%')";
+                            },
+                            allowBlank : true,
+                            columnWidth : 0.25
+                        }],
+                        //放大镜窗口列表
+                        dbColumns:[{
+                            "text": "客户ID",
+                            "hidden": true,
+                            "dataIndex": "id",
+                        },{
+                            "text": "客户编号",
+                            "dataIndex": "cu_code",
+                            "width": 200,
+                        }, {
+                            "text": "客户名称",
+                            "dataIndex": "cu_name",
+                            "width": 200
+                        },{
+                            "text": "客户类型",
+                            "dataIndex": "cu_name",
+                            "width": 100
+                        },{
+                            "text": "业务员",
+                            "dataIndex": "cu_sellername",
+                            "width": 100
+                        },{
+                            "text": "应收款余额",
+                            "dataIndex": "cu_leftamount",
+                            "width": 100,
+                            align:'right'
+                        },{
+                            "text": "税率",
+                            "dataIndex": "cu_taxrate",
+                            "width": 100,
+                            align:'right'
+                        },{
+                            "text": "承付天数",
+                            "dataIndex": "cu_promisedays",
+                            "width": 100,
+                            align:'right'
+                        },{
+                            "text": "额度",
+                            "dataIndex": "cu_credit",
+                            "width": 100,
+                            align:'right'
+                        }]
+                    }) ;
+
+                }
+            }
+        });
+    }
+});

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

@@ -0,0 +1,4 @@
+Ext.define('saas.view.money.report.RecDetailModel', {
+    extend: 'saas.view.core.report.ReportPanelModel',
+    alias: 'viewmodel.money-report-recdetail'
+});

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

@@ -0,0 +1,91 @@
+Ext.define('saas.view.money.report.VendorCheck', {
+    extend: 'saas.view.core.report.ReportPanel',
+    xtype: 'monry-report-vendorcheck',
+
+    controller: 'money-report-vendorcheck',
+    viewModel: 'money-report-vendorcheck',
+
+    viewName: '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,
+    //筛选：供应商、日期（必填）
+    searchItems: [ {
+        xtype: 'dbfindtrigger',
+        name: 'pi_vendname',
+        fieldLabel: '供应商名称',
+        columnWidth: 0.2
+    }, {
+        xtype: 'condatefield',
+        name: 'pi_date',
+        fieldLabel: '单据日期',
+        columnWidth: 0.5
+    }],
+
+    reportColumns: [
+        {
+            text: 'id',
+            dataIndex: 'pi_id',
+            hidden: true
+        }, {
+            text: '单号',
+            dataIndex: 'pi_inoutno',
+            width: 200
+        }, {
+            text: '单据类型',
+            dataIndex: 'pi_class',
+            width: 200
+        }, {
+            text: '单据日期',
+            dataIndex: 'pi_date',
+            width: 200
+        }, {
+            text: '序号',
+            dataIndex: 'pd_pdno'
+        },{
+            text:'供应商编号',
+            dataIndex:'pi_vendcode'
+        },{
+            text:'供应商名称',
+            dataIndex:'pi_vendname'
+        },{
+            text: '物料编号',
+            dataIndex: 'pr_code'
+        }, {
+            text: '物料名称',
+            dataIndex: 'pr_detail'
+        }, {
+            text: '物料规格',
+            dataIndex: 'pr_spec'
+        }, {
+            text: '单位',
+            dataIndex: 'pd_unit'
+        }, {
+            text: '采购数量',
+            dataIndex: 'qty',
+            summaryType: 'count'
+        }, {
+            text: '单价',
+            dataIndex: 'pd_orderprice'
+        }, {
+            text: '税率',
+            dataIndex: 'pd_taxrate'
+        }, {
+            text: '金额',
+            dataIndex: 'pd_total',
+            summaryType: 'count'
+        }, {
+            text: '不含税单价',
+            dataIndex: 'pd_netprice'
+        }, {
+            text: '不含税金额',
+            dataIndex: 'pd_nettotal'
+        }, {
+            text: '备注',
+            dataIndex: 'pd_remark'
+        }]
+});

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

@@ -0,0 +1,79 @@
+Ext.define('saas.view.money.report.VendorCheckController', {
+    extend: 'saas.view.core.report.ReportPanelController',
+    alias: 'controller.money-report-vendorcheck',
+    init: function (form) {
+        this.control({
+            // 供应商编号
+            'dbfindtrigger[name=pi_vendname]':{
+                beforerender:function(f){
+                    Ext.apply(f,{
+                        dataUrl:'/api/document/vendor/list',
+                        addXtype: 'document-vendor-formpanel',
+                        addTitle: '供应商资料',
+                        dbfinds:[{
+                            from:'ve_name',to:'pi_vendname'
+                        }],
+                        dbtpls:[{
+                            field:'ve_code',width:100
+                        },{
+                            field:'ve_name',width:100
+                        }],
+                        defaultCondition: "ve_statuscode='OPEN'",
+                        dbSearchFields:[{
+                            emptyText:'输入供应商编号或名称',
+                            xtype : "textfield",
+                            name : "search",
+                            getCondition: function(v) {
+                                return "(upper(ve_code) like '%"+v.toUpperCase()+"%' or upper(ve_name) like '%"+v.toUpperCase()+"%')";
+                            },
+                            allowBlank : true,
+                            columnWidth : 0.25
+                        }],
+                        dbColumns:[
+                            {
+                                "text": "供应商ID",
+                                "hidden": true,
+                                "dataIndex": "id",
+                                "width": 100,
+                                "xtype": "numbercolumn"
+                            },{
+                                "text": "供应商编号",
+                                "dataIndex": "ve_code",
+                                "width": 200
+                            }, {
+                                "text": "供应商名称",
+                                "dataIndex": "ve_name",
+                                "width": 200
+                            }, {
+                                "text": "供应商类型",
+                                "dataIndex": "ve_type",
+                                "width": 180,
+                                "items": null
+                            }, {
+                                "text": "税率",
+                                "dataIndex": "ve_taxrate",
+                                "width": 100
+                            }, {
+                                "text": "承付天数",
+                                "dataIndex": "ve_promisedays",
+                                "width": 100
+                            }, {
+                                "text": "纳税人识别号",
+                                "dataIndex": "ve_bankaccount",
+                                "width": 150
+                            }, {
+                                "text": "开户银行",
+                                "dataIndex": "ve_bankaccount",
+                                "width": 100
+                            }, {
+                                "text": "银行账户",
+                                "dataIndex": "ve_bankcode",
+                                "width": 100
+                            }]
+                    }) ;
+
+                }
+            }
+        });
+    }
+});

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

@@ -0,0 +1,4 @@
+Ext.define('saas.view.money.report.VendorCheckModel', {
+    extend: 'saas.view.core.report.ReportPanelModel',
+    alias: 'viewmodel.money-report-vendorcheck'
+});

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

@@ -70,7 +70,7 @@ Ext.define('saas.view.purchase.purchase.FormPanel', {
         name : "pu_shipaddresscode", 
         fieldLabel : "交货地址", 
         allowBlank : false, 
-        columnWidth : 0.25,
+        columnWidth : 0.5,
         hiddenBtn:false,//true 则会关闭新增按钮功能
         addHandler:function(b){
             var document = Ext.create('saas.view.document.kind.Kind',{});

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

@@ -107,7 +107,7 @@ Ext.define('saas.view.purchase.purchase.QueryPanel', {
             dataIndex: 'pu_vendname',
             width: 120
         }, {
-            text: '单据状态',
+            text: '审核状态',
             dataIndex: 'pu_status',
             width: 120
         },{
@@ -147,7 +147,7 @@ Ext.define('saas.view.purchase.purchase.QueryPanel', {
             dataIndex: 'pu_code',
             width: 200
         }, {
-            text: '单据状态',
+            text: '审核状态',
             dataIndex: 'pu_status',
             width: 120
         }, {

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

@@ -329,6 +329,11 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanel', {
                 }
             }
         ]
+    },{
+        xtype : "textfield", 
+        name : "pi_remark", 
+        fieldLabel : "备注", 
+        columnWidth : 1
     },{
         xtype : "textfield", 
         name : "pi_recordman", 

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

@@ -112,7 +112,7 @@ Ext.define('saas.view.purchase.purchaseIn.QueryPanel', {
             xtype:'datecolumn',
             width: 200
         },{
-            text: '状态',
+            text: '审核状态',
             dataIndex: 'pi_status',
             width: 120
         },{
@@ -142,11 +142,11 @@ Ext.define('saas.view.purchase.purchaseIn.QueryPanel', {
             dataIndex: 'pd_inoutno',
             width: 200
         }, {
-            text: '单据状态',
+            text: '审核状态',
             dataIndex: 'pi_status',
             width: 120
         }, {
-            text: '下单日期',
+            text: '单据日期',
             dataIndex: 'pi_date',
             xtype:'datecolumn',
             width: 200

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

@@ -308,6 +308,11 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanel', {
                 }
             }
         ]
+    },{
+        xtype : "textfield", 
+        name : "pi_remark", 
+        fieldLabel : "备注", 
+        columnWidth : 1
     }, {
         xtype : "textfield", 
         name : "pi_recordman", 

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

@@ -120,7 +120,7 @@ Ext.define('saas.view.purchase.purchaseOut.QueryPanel', {
             xtype:'datecolumn',
             width: 200
         },{
-            text: '状态',
+            text: '审核状态',
             dataIndex: 'pi_status',
             width: 120
         },{
@@ -150,11 +150,11 @@ Ext.define('saas.view.purchase.purchaseOut.QueryPanel', {
             dataIndex: 'pd_inoutno',
             width: 200
         }, {
-            text: '单据状态',
+            text: '审核状态',
             dataIndex: 'pi_status',
             width: 120
         }, {
-            text: '下单日期',
+            text: '单据日期',
             dataIndex: 'pi_date',
             xtype:'datecolumn',
             width: 200

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

@@ -46,6 +46,7 @@ Ext.define('saas.view.sale.saleIn.QueryPanel', {
         columnWidth: 0.25,
         queryMode: 'local',
         displayField: 'pi_status',
+        editable:false,
         valueField: 'pi_statuscode',
         store: Ext.create('Ext.data.ArrayStore', {
             fields: ['pi_statuscode', 'pi_status'],
@@ -89,7 +90,7 @@ Ext.define('saas.view.sale.saleIn.QueryPanel', {
             dataIndex: 'pi_class',
             width: 120
         }, {
-            text: '下单日期',
+            text: '单据日期',
             dataIndex: 'pi_date',
             xtype:'datecolumn',
             width: 200
@@ -130,7 +131,7 @@ Ext.define('saas.view.sale.saleIn.QueryPanel', {
             dataIndex: 'pd_inoutno',
             width: 200
         }, {
-            text: '单据状态',
+            text: '审核状态',
             dataIndex: 'pi_status',
             width: 120
         }, {

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

@@ -127,7 +127,7 @@ Ext.define('saas.view.sale.saleout.QueryPanel', {
             dataIndex: 'pd_inoutno',
             width: 200
         }, {
-            text: '单据状态',
+            text: '审核状态',
             dataIndex: 'pi_status',
             width: 120
         }, {

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

@@ -127,7 +127,7 @@ Ext.define('saas.view.stock.appropriationInOut.QueryPanel', {
             dataIndex: 'pi_class',
             width: 120
         }, {
-            text: '下单日期',
+            text: '单据日期',
             dataIndex: 'pi_date',
             xtype:'datecolumn',
             width: 200
@@ -164,7 +164,7 @@ Ext.define('saas.view.stock.appropriationInOut.QueryPanel', {
             dataIndex: 'pi_status',
             width: 120
         }, {
-            text: '下单日期',
+            text: '单据日期',
             dataIndex: 'pi_date',
             xtype:'datecolumn',
             width: 200

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

@@ -31,28 +31,25 @@ Ext.define('saas.view.stock.otherIn.QueryPanel', {
     }, {
         xtype: 'textfield',
         name: 'pi_vendcode',
-        bind: '{pi_vendcode}',
         fieldLabel: '供应商编号',
         allowBlank: true,
         hidden:true,
         columnWidth: 0.25
     }, {
-        xtype: 'textfield',
+        xtype: 'dbfindtrigger',
         name: 'pi_vendname',
-        bind: '{pi_vendname}',
         fieldLabel: '供应商名称',
         allowBlank: true,
         columnWidth: 0.25
     }, {
-        xtype: 'dbfindtrigger',
+        xtype: 'textfield',
         name: 'pd_prodcode',
-        bind: '{pd_prodcode}',
         fieldLabel: '物料编号',
+        hidden: true,
         showDetail: true
     }, {
-        xtype: 'textfield',
+        xtype: 'dbfindtrigger',
         name: 'pr_detail',
-        bind: '{pr_detail}',
         fieldLabel: '物料名称',
         showDetail: true
     }, {
@@ -108,7 +105,7 @@ Ext.define('saas.view.stock.otherIn.QueryPanel', {
             xtype:'datecolumn',
             width: 200
         },{
-            text: '状态',
+            text: '审核状态',
             dataIndex: 'pi_status',
             width: 120
         },{
@@ -138,11 +135,11 @@ Ext.define('saas.view.stock.otherIn.QueryPanel', {
             dataIndex: 'pd_inoutno',
             width: 200
         }, {
-            text: '单据状态',
+            text: '审核状态',
             dataIndex: 'pi_status',
             width: 120
         }, {
-            text: '下单日期',
+            text: '单据日期',
             dataIndex: 'pi_date',
             xtype:'datecolumn',
             width: 200

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

@@ -6,16 +6,16 @@ Ext.define('saas.view.stock.otherIn.QueryPanelController', {
         var me = this;
         this.control({
             //放大镜赋值关系 以及 tpl模板
-            'dbfindtrigger[name=pu_vendname]':{
+            'dbfindtrigger[name=pi_vendname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
                         dataUrl:'/api/document/vendor/list',
                         addXtype: 'document-vendor-formpanel',
                         addTitle: '供应商资料',
                         dbfinds:[{
-                            from:'ve_code',to:'pu_vendcode'
+                            from:'ve_code',to:'pi_vendcode'
                         },{
-                            from:'ve_name',to:'pu_vendname'
+                            from:'ve_name',to:'pi_vendname'
                         }],
                         dbtpls:[{
                             field:'ve_code',width:100
@@ -77,8 +77,8 @@ Ext.define('saas.view.stock.otherIn.QueryPanelController', {
 
                 }
             },
-            //放大镜赋值关系 以及 tpl模板
-            'dbfindtrigger[name=pd_prodcode]':{
+            // 物料名称
+            'dbfindtrigger[name=pr_detail]':{
                 beforerender:function(f){
                     Ext.apply(f,{
                         conditionCode:'pr_code',
@@ -87,7 +87,8 @@ Ext.define('saas.view.stock.otherIn.QueryPanelController', {
                         addTitle: '物料资料',
                         dbfinds:[{
                             from:'pr_code',to:'pd_prodcode',
-                            from:'pr_unit',to:'pd_unit'
+                        }, {
+                            from:'pr_detail',to:'pr_detail'
                         }],
                         dbtpls:[{
                             field:'pr_code',width:100
@@ -166,7 +167,7 @@ Ext.define('saas.view.stock.otherIn.QueryPanelController', {
                             "text": "L/T",
                             "dataIndex": "pr_leadtime",
                             "width": 100,
-                        }]
+                        }]   
                     }) ;   
 
                 }

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

@@ -37,22 +37,21 @@ Ext.define('saas.view.stock.otherOut.QueryPanel', {
         hidden:true,
         columnWidth: 0.25
     }, {
-        xtype: 'textfield',
+        xtype: 'dbfindtrigger',
         name: 'pi_vendname',
         bind: '{pi_vendname}',
         fieldLabel: '供应商名称',
         allowBlank: true,
         columnWidth: 0.25
     }, {
-        xtype: 'dbfindtrigger',
+        xtype: 'textfield',
         name: 'pd_prodcode',
-        bind: '{pd_prodcode}',
         fieldLabel: '物料编号',
+        hidden: true,
         showDetail: true
     }, {
-        xtype: 'textfield',
+        xtype: 'dbfindtrigger',
         name: 'pr_detail',
-        bind: '{pr_detail}',
         fieldLabel: '物料名称',
         showDetail: true
     }, {
@@ -108,7 +107,7 @@ Ext.define('saas.view.stock.otherOut.QueryPanel', {
             xtype:'datecolumn',
             width: 200
         },{
-            text: '状态',
+            text: '审核状态',
             dataIndex: 'pi_status',
             width: 120
         },{
@@ -138,11 +137,11 @@ Ext.define('saas.view.stock.otherOut.QueryPanel', {
             dataIndex: 'pd_inoutno',
             width: 200
         }, {
-            text: '单据状态',
+            text: '审核状态',
             dataIndex: 'pi_status',
             width: 120
         }, {
-            text: '下单日期',
+            text: '单据日期',
             dataIndex: 'pi_date',
             xtype:'datecolumn',
             width: 200

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

@@ -5,17 +5,17 @@ Ext.define('saas.view.stock.otherOut.QueryPanelController', {
     init: function (form) {
         var me = this;
         this.control({
-            //放大镜赋值关系 以及 tpl模板
-            'dbfindtrigger[name=pu_vendname]':{
+            // 供应商名称
+            'dbfindtrigger[name=pi_vendname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
                         dataUrl:'/api/document/vendor/list',
                         addXtype: 'document-vendor-formpanel',
                         addTitle: '供应商资料',
                         dbfinds:[{
-                            from:'ve_code',to:'pu_vendcode'
+                            from:'ve_code',to:'pi_vendname'
                         },{
-                            from:'ve_name',to:'pu_vendname'
+                            from:'ve_name',to:'pi_vendname'
                         }],
                         dbtpls:[{
                             field:'ve_code',width:100
@@ -77,17 +77,18 @@ Ext.define('saas.view.stock.otherOut.QueryPanelController', {
 
                 }
             },
-            //放大镜赋值关系 以及 tpl模板
-            'dbfindtrigger[name=pd_prodcode]':{
+            // 物料名称
+            'dbfindtrigger[name=pr_detail]':{
                 beforerender:function(f){
                     Ext.apply(f,{
+                        conditionCode:'pr_code',
                         dataUrl:'/api/document/product/list',
                         addXtype: 'document-product-formpanel',
                         addTitle: '物料资料',
                         dbfinds:[{
-                            from:'pr_code',to:'pd_prodcode'
+                            from:'pr_code',to:'pd_prodcode',
                         }, {
-                            from:'pr_unit',to:'pd_unit'
+                            from:'pr_detail',to:'pr_detail'
                         }],
                         dbtpls:[{
                             field:'pr_code',width:100
@@ -166,7 +167,7 @@ Ext.define('saas.view.stock.otherOut.QueryPanelController', {
                             "text": "L/T",
                             "dataIndex": "pr_leadtime",
                             "width": 100,
-                        }]
+                        }]   
                     }) ;   
 
                 }

frontend/saas-web/overrides/i18n.js

@@ -25,23 +25,6 @@ function openTab(xtype, title, id, config) {
     }
 }
 
-/**
- * 显示toast提示
- * @param content: 内容
- * @param title: 标题
- * 
- */
-function showToast(content, title) {
-    Ext.toast({
-        html: content,
-        title: title,
-        closable: false,
-        align: 't',
-        slideDUration: 400,
-        maxWidth: 400
-    });
-}
-
 /**
  * 重设tab标题
  */
@@ -61,6 +44,29 @@ function getCurrentTab() {
     return currentTab;
 }
 
+/**
+ * 显示toast提示（无需用户操作）
+ * @param content: 内容
+ * @param title: 标题
+ * 
+ */
+function showToast(content, title) {
+    Ext.toast({
+        html: content,
+        title: title,
+        closable: false,
+        align: 't',
+        slideDUration: 400,
+        maxWidth: 400
+    });
+}
+
+/**
+ * 显示警告（需要选择是、否）
+ * @param title: 标题
+ * @param message: 内容
+ * @return : Promise
+ */
 function showConfirm(title, message) {
     return new Ext.Promise(function (resolve, reject) {
         Ext.MessageBox.confirm(title, message, function(buttonId) {
@@ -88,4 +94,15 @@ function deleteWarn(msg, fn){
          fn: fn,
          renderTo: Ext.getCmp('main-tab-panel').getActiveTab().getEl()
 	});
+}
+
+/**
+ * 判断字符串是否日期字符串
+ * 需要满足格式 yyyy-MM-dd hh:mm:ss
+ * 或者yyyy-M-d h:m:s
+ * @param str: 字符串
+ * @returns Boolean
+ */
+function isDateString(str) {
+    return (/^(\d{4})-(\d{1,2})-(\d{1,2}) (\d{1,2}):(\d{1,2}):(\d{1,2})$/).test(str);
 }

frontend/saas-web/resources/json/navigation.json

@@ -160,15 +160,25 @@
     }, {
         "text": "报表",
         "items": [{
-            "text": "供应商对账单"
+            "text": "供应商对账单",
+            "id": "monry-report-vendorcheck",
+            "viewType":"monry-report-vendorcheck"
         }, {
-            "text": "应付账款明细表"
+            "text": "应付账款明细表",
+            "id": "monry-report-paydetail",
+            "viewType":"monry-report-paydetail"
         }, {
-            "text": "客户对账单"
+            "text": "客户对账单",
+            "id": "monry-report-customercheck",
+            "viewType":"monry-report-customercheck"
         }, {
-            "text": "应收款明细表"
+            "text": "应收款明细表",
+            "id": "monry-report-recdetail",
+            "viewType":"monry-report-recdetail"
         }, {
-            "text": "资金账户余额表"
+            "text": "资金账户余额表",
+            "id": "monry-report-accountbalance",
+            "viewType":"monry-report-accountbalance"
         }]
     }]
 }, {