#

LSH

2023-11-08 fa3737fbe1a83ccf9e8ad8c6c8e81483f987ab5b

#

 src/main/java/com/zy/crm/manager/controller/ReimburseOnlineController.java

@@ -188,16 +188,16 @@
        }

        ProcessPermissions processPermissions3 = processPermissionsService.selectOne(new EntityWrapper<ProcessPermissions>().eq("process_memo", 3).eq("process", param.getCheckData().equals("否")? "3-1" : "3-2"));//3：报销流程
        User president3 = userService.selectById(processPermissions3.getUserId());       // 获取报价流程节点3确认人
        User president3 = userService.selectById(processPermissions3.getUserId());       // 获取流程节点3确认人

        ProcessPermissions processPermissions4 = processPermissionsService.selectOne(new EntityWrapper<ProcessPermissions>().eq("process_memo", 3).eq("process", "4-1"));//3：报销流程
        User president4 = userService.selectById(processPermissions4.getUserId());       // 获取报价流程节点4确认人
        User president4 = userService.selectById(processPermissions4.getUserId());       // 获取流程节点4确认人

        ProcessPermissions processPermissions5 = processPermissionsService.selectOne(new EntityWrapper<ProcessPermissions>().eq("process_memo", 3).eq("process", "5-1"));//3：报销流程
        User president5 = userService.selectById(processPermissions5.getUserId());       // 获取报价流程节点5确认人
        User president5 = userService.selectById(processPermissions5.getUserId());       // 获取流程节点5确认人

        ProcessPermissions processPermissions6 = processPermissionsService.selectOne(new EntityWrapper<ProcessPermissions>().eq("process_memo", 3).eq("process", "6-1"));//3：报销流程
        User president6 = userService.selectById(processPermissions6.getUserId());       // 获取报价流程节点6确认人
        User president6 = userService.selectById(processPermissions6.getUserId());       // 获取流程节点6确认人

        reimburseOnline.setSettleMsg(JSON.toJSONString(SettleDto.initPriQuote(reimburseOnline, manager,president3,president4,president5,president6,getUser())));
        reimburseOnline.setMemberId(manager.getId());

 src/main/java/com/zy/crm/manager/entity/ReimburseOnlineDetl.java

@@ -68,70 +68,70 @@
     */
    @ApiModelProperty(value= "税率")
    @TableField("tax_rate")
    private Long taxRate;
    private Double taxRate;

    /**
     * 未税本币金额
     */
    @ApiModelProperty(value= "未税本币金额")
    @TableField("untaxed_amount_in_local_currency")
    private Long untaxedAmountInLocalCurrency;
    private Double untaxedAmountInLocalCurrency;

    /**
     * 未税金额
     */
    @ApiModelProperty(value= "未税金额")
    @TableField("untaxed_amount")
    private Long untaxedAmount;
    private Double untaxedAmount;

    /**
     * 税额
     */
    @ApiModelProperty(value= "税额")
    @TableField("tax_amount")
    private Long taxAmount;
    private Double taxAmount;

    /**
     * 发票金额
     */
    @ApiModelProperty(value= "发票金额")
    @TableField("invoice_value")
    private Long invoiceValue;
    private Double invoiceValue;

    /**
     * 发票本币金额
     */
    @ApiModelProperty(value= "发票本币金额")
    @TableField("invoice_amount_in_local_currency")
    private Long invoiceAmountInLocalCurrency;
    private Double invoiceAmountInLocalCurrency;

    /**
     * 报销比例
     */
    @ApiModelProperty(value= "报销比例")
    @TableField("reimbursement_ratio")
    private Long reimbursementRatio;
    private Double reimbursementRatio;

    /**
     * 报销金额
     */
    @ApiModelProperty(value= "报销金额")
    @TableField("reimbursement_amount")
    private Long reimbursementAmount;
    private Double reimbursementAmount;

    /**
     * 报销本币金额
     */
    @ApiModelProperty(value= "报销本币金额")
    @TableField("reimbursement_amount_in_local_currency")
    private Long reimbursementAmountInLocalCurrency;
    private Double reimbursementAmountInLocalCurrency;

    /**
     * 出纳确认金额
     */
    @ApiModelProperty(value= "出纳确认金额")
    @TableField("cashier_confirmation_amount")
    private Long cashierConfirmationAmount;
    private Double cashierConfirmationAmount;

    /**
     * 出纳币种
@@ -201,7 +201,7 @@

    public ReimburseOnlineDetl() {}

    public ReimburseOnlineDetl(String occupation,Integer expenseType,Integer userId,Integer deptId,Integer hostId,Long orderId,Long taxRate,Long untaxedAmountInLocalCurrency,Long untaxedAmount,Long taxAmount,Long invoiceValue,Long invoiceAmountInLocalCurrency,Long reimbursementRatio,Long reimbursementAmount,Long reimbursementAmountInLocalCurrency,Long cashierConfirmationAmount,Integer cashierCurrency,Date departureTime,Date updateTime,Integer updateUserId,String updateUserName,Date creationTime,Integer creationUserId,String creationUserName,Integer reimburseId) {
    public ReimburseOnlineDetl(String occupation,Integer expenseType,Integer userId,Integer deptId,Integer hostId,Long orderId,Double taxRate,Double untaxedAmountInLocalCurrency,Double untaxedAmount,Double taxAmount,Double invoiceValue,Double invoiceAmountInLocalCurrency,Double reimbursementRatio,Double reimbursementAmount,Double reimbursementAmountInLocalCurrency,Double cashierConfirmationAmount,Integer cashierCurrency,Date departureTime,Date updateTime,Integer updateUserId,String updateUserName,Date creationTime,Integer creationUserId,String creationUserName,Integer reimburseId) {
        this.occupation = occupation;
        this.expenseType = expenseType;
        this.userId = userId;
@@ -231,16 +231,16 @@
    public ReimburseOnlineDetl(Integer reminburseCostTypeId) {
        this.occupation = "";
        this.expenseType = reminburseCostTypeId;
        this.taxRate = (long)0.0;
        this.untaxedAmountInLocalCurrency = (long)0.0;
        this.untaxedAmount = (long)0.0;
        this.taxAmount = (long)0.0;
        this.invoiceValue = (long)0.0;
        this.invoiceAmountInLocalCurrency = (long)0.0;
        this.reimbursementRatio = (long)0.0;
        this.reimbursementAmount = (long)0.0;
        this.reimbursementAmountInLocalCurrency = (long)0.0;
        this.cashierConfirmationAmount = (long)0.0;
        this.taxRate = 0.0;
        this.untaxedAmountInLocalCurrency = 0.0;
        this.untaxedAmount = 0.0;
        this.taxAmount = 0.0;
        this.invoiceValue = 0.0;
        this.invoiceAmountInLocalCurrency = 0.0;
        this.reimbursementRatio = 0.0;
        this.reimbursementAmount = 0.0;
        this.reimbursementAmountInLocalCurrency = 0.0;
        this.cashierConfirmationAmount = 0.0;
    }


@@ -274,4 +274,30 @@
        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.creationTime);
    }

    public void setTaxRate(String taxRate){
        String[] splitTaxRate = taxRate.split("%");
        this.taxRate=Double.parseDouble(splitTaxRate[0]);
    }

    public void setTaxRate(Double taxRate){
        this.taxRate=taxRate;
    }

    public String getTaxRate$(){
        return taxRate.toString()+"%";
    }

    public void setReimbursementRatio(String reimbursementRatio){
        String[] splitReimbursementRatio = reimbursementRatio.split("%");
        this.reimbursementRatio=Double.parseDouble(splitReimbursementRatio[0]);
    }

    public void setReimbursementRatio(Double reimbursementRatio){
        this.reimbursementRatio=reimbursementRatio;
    }

    public String getReimbursementRatio$(){
        return reimbursementRatio.toString()+"%";
    }

}

 src/main/webapp/static/js/reimburseOnline/reimburseOnline.js

@@ -330,18 +330,18 @@
                                {field: 'occupation', title: '事由', width: 200},
                                // {field: 'expenseType', title: '费用类型', width: 100},
                                {field: 'expenseType$', title: '费用类型', width: 100},
                                {field: 'taxRate', title: '税率', width: 60},
                                {field: 'taxRate$', title: '税率', width: 60},
                                {field: 'untaxedAmountInLocalCurrency', title: '未税本币金额', style: 'color: blue;font-weight: bold', edit: true, minWidth: 110, width: 110},
                                {field: 'untaxedAmount', title: '未税金额', width: 100},
                                {field: 'taxAmount', title: '税额', width: 60},
                                {field: 'invoiceValue', title: '发票金额',  style: 'color: blue;font-weight: bold', edit: true, minWidth: 110, width: 110},
                                {field: 'invoiceAmountInLocalCurrency', title: '发票本币金额',  style: 'color: blue;font-weight: bold', edit: true, minWidth: 110, width: 110},
                                {field: 'reimbursementRatio', title: '报销比例', width: 100},
                                {field: 'reimbursementRatio$', title: '报销比例', width: 100},
                                {field: 'reimbursementAmount', title: '报销金额', width: 100},
                                {field: 'reimbursementAmountInLocalCurrency', title: '报销本币金额', width: 120},
                                {field: 'cashierConfirmationAmount', title: '出纳确认金额', width: 120},
                                {field: 'cashierCurrency', title: '出纳币种', width: 100},
                                {field: 'departureTime', title: '出发日期', width: 100},
                                // {field: 'cashierCurrency', title: '出纳币种', width: 100},
                                // {field: 'departureTime', title: '出发日期', width: 100},
                                {field: 'cashierConfirmationAmount', title: '出纳确认金额', width: 120},
                                {field: 'userId', title: '列支人员', width: 120},
                                {field: 'deptId', title: '列支部门', width: 120},
@@ -467,8 +467,8 @@
                        {field: 'reimbursementAmount', title: '报销金额', width: 100, edit: true},
                        {field: 'reimbursementAmountInLocalCurrency', title: '报销本币金额', width: 120, edit: true},
                        {field: 'cashierConfirmationAmount', title: '出纳确认金额', width: 120, edit: true},
                        {field: 'cashierCurrency', title: '出纳币种', width: 100, edit: true},
                        {field: 'departureTime', title: '出发日期', width: 100},
                        // {field: 'cashierCurrency', title: '出纳币种', width: 100, edit: true},
                        // {field: 'departureTime', title: '出发日期', width: 100},
                        {field: 'cashierConfirmationAmount', title: '出纳确认金额', width: 120, edit: true},
                        {field: 'userId', title: '列支人员', width: 120},
                        {field: 'deptId', title: '列支部门', width: 120},