中扬CRM客户关系管理系统
LSH
2023-08-17 1ca7b0411ab10ff36d7184d6a71c39be886d7af5
#报销申请第二版
5个文件已修改
16个文件已添加
1591 ■■■■■ 已修改文件
src/main/java/com/zy/crm/manager/controller/ReimburseCostTypesController.java 153 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/crm/manager/controller/ReimburseOnlineController.java 25 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/crm/manager/controller/ReimburseOnlineDetlController.java 125 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/crm/manager/entity/ReimburseCostTypes.java 38 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/crm/manager/entity/ReimburseOnline.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/crm/manager/entity/ReimburseOnlineDetl.java 277 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/crm/manager/entity/param/ReimburseOnlineDomainParam.java 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/crm/manager/entity/result/KeyValueVo.java 23 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/crm/manager/mapper/ReimburseCostTypesMapper.java 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/crm/manager/mapper/ReimburseOnlineDetlMapper.java 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/crm/manager/service/ReimburseCostTypesService.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/crm/manager/service/ReimburseOnlineDetlService.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/crm/manager/service/impl/ReimburseCostTypesServiceImpl.java 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/crm/manager/service/impl/ReimburseOnlineDetlServiceImpl.java 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/application.yml 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/ReimburseCostTypesMapper.xml 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/ReimburseOnlineDetlMapper.xml 36 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/static/js/reimburseCostTypes/reimburseCostTypes.js 246 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/static/js/reimburseOnline/reimburseOnline.js 364 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/views/reimburseCostTypes/reimburseCostTypes.html 92 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/views/reimburseOnline/reimburseOnline.html 97 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/crm/manager/controller/ReimburseCostTypesController.java
New file
@@ -0,0 +1,153 @@
package com.zy.crm.manager.controller;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
import com.zy.crm.common.web.BaseController;
import com.zy.crm.manager.entity.ReimburseCostTypes;
import com.zy.crm.manager.entity.ReimburseOnlineDetl;
import com.zy.crm.manager.entity.result.KeyValueVo;
import com.zy.crm.manager.service.ReimburseCostTypesService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@RestController
public class ReimburseCostTypesController extends BaseController {
    @Autowired
    private ReimburseCostTypesService reimburseCostTypesService;
    @RequestMapping(value = "/reimburseCostTypes/{id}/auth")
    @ManagerAuth
    public R get(@PathVariable("id") String id) {
        return R.ok(reimburseCostTypesService.selectById(String.valueOf(id)));
    }
    @RequestMapping(value = "/reimburseCostTypes/list/auth")
    @ManagerAuth
    public R list(@RequestParam(defaultValue = "1")Integer curr,
                  @RequestParam(defaultValue = "10")Integer limit,
                  @RequestParam(required = false)String orderByField,
                  @RequestParam(required = false)String orderByType,
                  @RequestParam(required = false)String condition,
                  @RequestParam Map<String, Object> param){
        EntityWrapper<ReimburseCostTypes> wrapper = new EntityWrapper<>();
        excludeTrash(param);
        convert(param, wrapper);
        allLike(ReimburseCostTypes.class, param.keySet(), wrapper, condition);
        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
        return R.ok(reimburseCostTypesService.selectPage(new Page<>(curr, limit), wrapper));
    }
    private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
        for (Map.Entry<String, Object> entry : map.entrySet()){
            String val = String.valueOf(entry.getValue());
            if (val.contains(RANGE_TIME_LINK)){
                String[] dates = val.split(RANGE_TIME_LINK);
                wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
                wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
            } else {
                wrapper.like(entry.getKey(), val);
            }
        }
    }
    @RequestMapping(value = "/reimburseCostTypes/add/auth")
    @ManagerAuth
    public R add(ReimburseCostTypes reimburseCostTypes) {
        reimburseCostTypesService.insert(reimburseCostTypes);
        return R.ok();
    }
    @RequestMapping(value = "/reimburseCostTypes/update/auth")
    @ManagerAuth
    public R update(ReimburseCostTypes reimburseCostTypes){
        if (Cools.isEmpty(reimburseCostTypes) || null==reimburseCostTypes.getId()){
            return R.error();
        }
        reimburseCostTypesService.updateById(reimburseCostTypes);
        return R.ok();
    }
    @RequestMapping(value = "/reimburseCostTypes/delete/auth")
    @ManagerAuth
    public R delete(@RequestParam(value="ids[]") Long[] ids){
         for (Long id : ids){
            reimburseCostTypesService.deleteById(id);
        }
        return R.ok();
    }
    @RequestMapping(value = "/reimburseCostTypes/export/auth")
    @ManagerAuth
    public R export(@RequestBody JSONObject param){
        EntityWrapper<ReimburseCostTypes> wrapper = new EntityWrapper<>();
        List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
        Map<String, Object> map = excludeTrash(param.getJSONObject("reimburseCostTypes"));
        convert(map, wrapper);
        List<ReimburseCostTypes> list = reimburseCostTypesService.selectList(wrapper);
        return R.ok(exportSupport(list, fields));
    }
    @RequestMapping(value = "/reimburseCostTypesQuery/auth")
    @ManagerAuth
    public R query(String condition) {
        EntityWrapper<ReimburseCostTypes> wrapper = new EntityWrapper<>();
        wrapper.like("id", condition);
        Page<ReimburseCostTypes> page = reimburseCostTypesService.selectPage(new Page<>(0, 10), wrapper);
        List<Map<String, Object>> result = new ArrayList<>();
        for (ReimburseCostTypes reimburseCostTypes : page.getRecords()){
            Map<String, Object> map = new HashMap<>();
            map.put("id", reimburseCostTypes.getId());
            map.put("value", reimburseCostTypes.getId());
            result.add(map);
        }
        return R.ok(result);
    }
    @RequestMapping(value = "/reimburseCostTypes/check/column/auth")
    @ManagerAuth
    public R query(@RequestBody JSONObject param) {
        Wrapper<ReimburseCostTypes> wrapper = new EntityWrapper<ReimburseCostTypes>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
        if (null != reimburseCostTypesService.selectOne(wrapper)){
            return R.parse(BaseRes.REPEAT).add(getComment(ReimburseCostTypes.class, String.valueOf(param.get("key"))));
        }
        return R.ok();
    }
    @RequestMapping(value = "/reimburseCostTypes/covert/{id}/auth")
    @ManagerAuth
    public R covert(@PathVariable("id") Integer id) {
        ReimburseOnlineDetl reimburseOnlineDetl = new ReimburseOnlineDetl(id);
        return R.ok().add(reimburseOnlineDetl);
    }
    // xm-select 搜索商品列表
    @RequestMapping("/reimburseCostTypes/all/get/kv")
    @ManagerAuth
    public R getReimburseCostTypesDataKV(@RequestParam(required = false) String condition) {
        Wrapper<ReimburseCostTypes> wrapper = new EntityWrapper<ReimburseCostTypes>()
                .andNew().like("type_name", condition);
        List<ReimburseCostTypes> reimburseCostTypesList = reimburseCostTypesService.selectPage(new Page<>(1, 30), wrapper).getRecords();
        List<KeyValueVo> valueVos = new ArrayList<>();
        for (ReimburseCostTypes reimburseCostTypes : reimburseCostTypesList) {
            KeyValueVo vo = new KeyValueVo();
            vo.setName(reimburseCostTypes.getTypeName());
            vo.setValue(reimburseCostTypes.getId());
            valueVos.add(vo);
        }
        return R.ok().add(valueVos);
    }
}
src/main/java/com/zy/crm/manager/controller/ReimburseOnlineController.java
@@ -14,9 +14,12 @@
import com.zy.crm.manager.entity.Plan;
import com.zy.crm.manager.entity.Reimburse;
import com.zy.crm.manager.entity.ReimburseOnline;
import com.zy.crm.manager.entity.ReimburseOnlineDetl;
import com.zy.crm.manager.entity.param.ReimburseOnlineDomainParam;
import com.zy.crm.manager.service.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.core.io.ClassPathResource;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ClassUtils;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@@ -37,6 +40,8 @@
    @Autowired
    private PlanService planService;
    @Autowired
    private ReimburseOnlineDetlService reimburseOnlineDetlService;
    @RequestMapping(value = "/reimburseOnline/{id}/auth")
    @ManagerAuth
@@ -102,6 +107,26 @@
            wrapper.eq("user_id", getUserId());
        }
    }
    @RequestMapping(value = "/reimburseOnline/from/add/auth")
    @Transactional
    public R formAdd(@RequestBody ReimburseOnlineDomainParam param){
        System.out.println(param);
        return R.ok();
    }
    @RequestMapping(value = "/reimburseOnline/from/modify/auth")
    @Transactional
    public R formModify(@RequestBody ReimburseOnlineDomainParam param){
        System.out.println(param);
        return R.ok();
    }
    @RequestMapping(value = "/reimburseOnline/detl/all/auth")
    @Transactional
    public R head(@RequestParam Integer reimburseId){
        List<ReimburseOnlineDetl> reimburseOnlineDetls = reimburseOnlineDetlService.selectList(new EntityWrapper<ReimburseOnlineDetl>().eq("reimburse_id", reimburseId));
        return R.ok().add(reimburseOnlineDetls);
    }
    @RequestMapping(value = "/reimburseOnline/add/auth")
    @ManagerAuth
src/main/java/com/zy/crm/manager/controller/ReimburseOnlineDetlController.java
New file
@@ -0,0 +1,125 @@
package com.zy.crm.manager.controller;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
import com.zy.crm.common.web.BaseController;
import com.zy.crm.manager.entity.ReimburseOnlineDetl;
import com.zy.crm.manager.service.ReimburseOnlineDetlService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@RestController
public class ReimburseOnlineDetlController extends BaseController {
    @Autowired
    private ReimburseOnlineDetlService reimburseOnlineDetlService;
    @RequestMapping(value = "/reimburseOnlineDetl/{id}/auth")
    @ManagerAuth
    public R get(@PathVariable("id") String id) {
        return R.ok(reimburseOnlineDetlService.selectById(String.valueOf(id)));
    }
    @RequestMapping(value = "/reimburseOnlineDetl/list/auth")
    @ManagerAuth
    public R list(@RequestParam(defaultValue = "1")Integer curr,
                  @RequestParam(defaultValue = "10")Integer limit,
                  @RequestParam(required = false)String orderByField,
                  @RequestParam(required = false)String orderByType,
                  @RequestParam Map<String, Object> param){
        EntityWrapper<ReimburseOnlineDetl> wrapper = new EntityWrapper<>();
        excludeTrash(param);
        convert(param, wrapper);
        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
        return R.ok(reimburseOnlineDetlService.selectPage(new Page<>(curr, limit), wrapper));
    }
    private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
        for (Map.Entry<String, Object> entry : map.entrySet()){
            String val = String.valueOf(entry.getValue());
            if (val.contains(RANGE_TIME_LINK)){
                String[] dates = val.split(RANGE_TIME_LINK);
                wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
                wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
            } else {
                wrapper.like(entry.getKey(), val);
            }
        }
    }
    @RequestMapping(value = "/reimburseOnlineDetl/add/auth")
    @ManagerAuth
    public R add(ReimburseOnlineDetl reimburseOnlineDetl) {
        reimburseOnlineDetlService.insert(reimburseOnlineDetl);
        return R.ok();
    }
    @RequestMapping(value = "/reimburseOnlineDetl/update/auth")
    @ManagerAuth
    public R update(ReimburseOnlineDetl reimburseOnlineDetl){
        if (Cools.isEmpty(reimburseOnlineDetl) || null==reimburseOnlineDetl.getId()){
            return R.error();
        }
        reimburseOnlineDetlService.updateById(reimburseOnlineDetl);
        return R.ok();
    }
    @RequestMapping(value = "/reimburseOnlineDetl/delete/auth")
    @ManagerAuth
    public R delete(@RequestParam(value="ids[]") Long[] ids){
         for (Long id : ids){
            reimburseOnlineDetlService.deleteById(id);
        }
        return R.ok();
    }
    @RequestMapping(value = "/reimburseOnlineDetl/export/auth")
    @ManagerAuth
    public R export(@RequestBody JSONObject param){
        EntityWrapper<ReimburseOnlineDetl> wrapper = new EntityWrapper<>();
        List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
        Map<String, Object> map = excludeTrash(param.getJSONObject("reimburseOnlineDetl"));
        convert(map, wrapper);
        List<ReimburseOnlineDetl> list = reimburseOnlineDetlService.selectList(wrapper);
        return R.ok(exportSupport(list, fields));
    }
    @RequestMapping(value = "/reimburseOnlineDetlQuery/auth")
    @ManagerAuth
    public R query(String condition) {
        EntityWrapper<ReimburseOnlineDetl> wrapper = new EntityWrapper<>();
        wrapper.like("id", condition);
        Page<ReimburseOnlineDetl> page = reimburseOnlineDetlService.selectPage(new Page<>(0, 10), wrapper);
        List<Map<String, Object>> result = new ArrayList<>();
        for (ReimburseOnlineDetl reimburseOnlineDetl : page.getRecords()){
            Map<String, Object> map = new HashMap<>();
            map.put("id", reimburseOnlineDetl.getId());
            map.put("value", reimburseOnlineDetl.getId());
            result.add(map);
        }
        return R.ok(result);
    }
    @RequestMapping(value = "/reimburseOnlineDetl/check/column/auth")
    @ManagerAuth
    public R query(@RequestBody JSONObject param) {
        Wrapper<ReimburseOnlineDetl> wrapper = new EntityWrapper<ReimburseOnlineDetl>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
        if (null != reimburseOnlineDetlService.selectOne(wrapper)){
            return R.parse(BaseRes.REPEAT).add(getComment(ReimburseOnlineDetl.class, String.valueOf(param.get("key"))));
        }
        return R.ok();
    }
}
src/main/java/com/zy/crm/manager/entity/ReimburseCostTypes.java
New file
@@ -0,0 +1,38 @@
package com.zy.crm.manager.entity;
import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.IdType;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
@Data
@TableName("man_reimburse_cost_types")
public class ReimburseCostTypes implements Serializable {
    private static final long serialVersionUID = 1L;
    /**
     * ID
     */
    @ApiModelProperty(value= "ID")
    @TableId(value = "id", type = IdType.AUTO)
    private Long id;
    /**
     * 名称
     */
    @ApiModelProperty(value= "名称")
    @TableField("type_name")
    private String typeName;
    public ReimburseCostTypes() {}
    public ReimburseCostTypes(String typeName) {
        this.typeName = typeName;
    }
}
src/main/java/com/zy/crm/manager/entity/ReimburseOnline.java
@@ -6,6 +6,7 @@
import com.baomidou.mybatisplus.enums.IdType;
import com.core.common.Cools;
import com.core.common.SpringUtils;
import com.zy.crm.manager.service.OrderService;
import com.zy.crm.manager.service.PlanService;
import com.zy.crm.system.entity.User;
import com.zy.crm.system.service.UserService;
@@ -138,10 +139,10 @@
//    }
    public String getPlanId$() {
        PlanService planService = SpringUtils.getBean(PlanService.class);
        Plan plan = planService.selectById(this.itemId);
        if (!Cools.isEmpty(plan)){
            return String.valueOf(plan.getUuid());
        OrderService orderService = SpringUtils.getBean(OrderService.class);
        Order order = orderService.selectById(this.itemId);
        if (!Cools.isEmpty(order)){
            return String.valueOf(order.getUuid());
        }
        return null;
    }
src/main/java/com/zy/crm/manager/entity/ReimburseOnlineDetl.java
New file
@@ -0,0 +1,277 @@
package com.zy.crm.manager.entity;
import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.enums.IdType;
import com.baomidou.mybatisplus.annotations.TableField;
import java.text.SimpleDateFormat;
import java.util.Date;
import com.core.common.SpringUtils;
import com.zy.crm.manager.service.ReimburseCostTypesService;
import org.springframework.format.annotation.DateTimeFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import com.baomidou.mybatisplus.annotations.TableName;
import java.io.Serializable;
@Data
@TableName("man_reimburse_online_detl")
public class ReimburseOnlineDetl implements Serializable {
    private static final long serialVersionUID = 1L;
    /**
     * ID
     */
    @ApiModelProperty(value= "ID")
    @TableId(value = "id", type = IdType.AUTO)
    private Long id;
    @ApiModelProperty(value= "事由")
    private String occupation;
    /**
     * 费用类型
     */
    @ApiModelProperty(value= "费用类型")
    @TableField("expense_type")
    private Integer expenseType;
    /**
     * 列支人员
     */
    @ApiModelProperty(value= "列支人员")
    @TableField("user_id")
    private Integer userId;
    /**
     * 列支部门
     */
    @ApiModelProperty(value= "列支部门")
    @TableField("dept_id")
    private Integer deptId;
    @ApiModelProperty(value= "")
    @TableField("host_id")
    private Integer hostId;
    /**
     * 项目ID,关联man_order表主键
     */
    @ApiModelProperty(value= "项目ID,关联man_order表主键")
    @TableField("order_id")
    private Integer orderId;
    /**
     * 税率
     */
    @ApiModelProperty(value= "税率")
    @TableField("tax_rate")
    private Long taxRate;
    /**
     * 未税本币金额
     */
    @ApiModelProperty(value= "未税本币金额")
    @TableField("untaxed_amount_in_local_currency")
    private Long untaxedAmountInLocalCurrency;
    /**
     * 未税金额
     */
    @ApiModelProperty(value= "未税金额")
    @TableField("untaxed_amount")
    private Long untaxedAmount;
    /**
     * 税额
     */
    @ApiModelProperty(value= "税额")
    @TableField("tax_amount")
    private Long taxAmount;
    /**
     * 发票金额
     */
    @ApiModelProperty(value= "发票金额")
    @TableField("invoice_value")
    private Long invoiceValue;
    /**
     * 发票本币金额
     */
    @ApiModelProperty(value= "发票本币金额")
    @TableField("invoice_amount_in_local_currency")
    private Long invoiceAmountInLocalCurrency;
    /**
     * 报销比例
     */
    @ApiModelProperty(value= "报销比例")
    @TableField("reimbursement_ratio")
    private Long reimbursementRatio;
    /**
     * 报销金额
     */
    @ApiModelProperty(value= "报销金额")
    @TableField("reimbursement_amount")
    private Long reimbursementAmount;
    /**
     * 报销本币金额
     */
    @ApiModelProperty(value= "报销本币金额")
    @TableField("reimbursement_amount_in_local_currency")
    private Long reimbursementAmountInLocalCurrency;
    /**
     * 出纳确认金额
     */
    @ApiModelProperty(value= "出纳确认金额")
    @TableField("cashier_confirmation_amount")
    private Long cashierConfirmationAmount;
    /**
     * 出纳币种
     */
    @ApiModelProperty(value= "出纳币种")
    @TableField("cashier_currency")
    private Integer cashierCurrency;
    /**
     * 出发日期
     */
    @ApiModelProperty(value= "出发日期")
    @TableField("departure_time")
    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
    private Date departureTime;
    /**
     * 更新日期
     */
    @ApiModelProperty(value= "更新日期")
    @TableField("update_time")
    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
    private Date updateTime;
    /**
     * 更新人员ID
     */
    @ApiModelProperty(value= "更新人员ID")
    @TableField("update_user_id")
    private Integer updateUserId;
    /**
     * 更新人员名字
     */
    @ApiModelProperty(value= "更新人员名字")
    @TableField("update_user_name")
    private String updateUserName;
    /**
     * 创建日期
     */
    @ApiModelProperty(value= "创建日期")
    @TableField("creation_time")
    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
    private Date creationTime;
    /**
     * 创建人员id
     */
    @ApiModelProperty(value= "创建人员id")
    @TableField("creation_user_id")
    private Integer creationUserId;
    /**
     * 创建人员名字
     */
    @ApiModelProperty(value= "创建人员名字")
    @TableField("creation_user_name")
    private String creationUserName;
    /**
     * 报销主表ID
     */
    @ApiModelProperty(value= "报销主表ID")
    @TableField("reimburse_id")
    private Integer reimburseId;
    public ReimburseOnlineDetl() {}
    public ReimburseOnlineDetl(String occupation,Integer expenseType,Integer userId,Integer deptId,Integer hostId,Integer 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) {
        this.occupation = occupation;
        this.expenseType = expenseType;
        this.userId = userId;
        this.deptId = deptId;
        this.hostId = hostId;
        this.orderId = orderId;
        this.taxRate = taxRate;
        this.untaxedAmountInLocalCurrency = untaxedAmountInLocalCurrency;
        this.untaxedAmount = untaxedAmount;
        this.taxAmount = taxAmount;
        this.invoiceValue = invoiceValue;
        this.invoiceAmountInLocalCurrency = invoiceAmountInLocalCurrency;
        this.reimbursementRatio = reimbursementRatio;
        this.reimbursementAmount = reimbursementAmount;
        this.reimbursementAmountInLocalCurrency = reimbursementAmountInLocalCurrency;
        this.cashierConfirmationAmount = cashierConfirmationAmount;
        this.cashierCurrency = cashierCurrency;
        this.departureTime = departureTime;
        this.updateTime = updateTime;
        this.updateUserId = updateUserId;
        this.updateUserName = updateUserName;
        this.creationTime = creationTime;
        this.creationUserId = creationUserId;
        this.creationUserName = creationUserName;
        this.reimburseId = reimburseId;
    }
    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;
    }
    public String getDepartureTime$(){
        if (Cools.isEmpty(this.departureTime)){
            return "";
        }
        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.departureTime);
    }
    public String getExpenseType$(){
        ReimburseCostTypesService reimburseCostTypesService = SpringUtils.getBean(ReimburseCostTypesService.class);
        ReimburseCostTypes reimburseCostTypes = reimburseCostTypesService.selectById(this.expenseType);
        if (!Cools.isEmpty(reimburseCostTypes)){
            return String.valueOf(reimburseCostTypes.getTypeName());
        }
        return null;
    }
    public String getUpdateTime$(){
        if (Cools.isEmpty(this.updateTime)){
            return "";
        }
        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
    }
    public String getCreationTime$(){
        if (Cools.isEmpty(this.creationTime)){
            return "";
        }
        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.creationTime);
    }
}
src/main/java/com/zy/crm/manager/entity/param/ReimburseOnlineDomainParam.java
New file
@@ -0,0 +1,16 @@
package com.zy.crm.manager.entity.param;
import com.zy.crm.manager.entity.ReimburseOnlineDetl;
import java.util.List;
public class ReimburseOnlineDomainParam {
    private Integer reimburseId;
    private Long docType;
    private String orderNo;
    private List<ReimburseOnlineDetl> reimburseOnlineDetls;
}
src/main/java/com/zy/crm/manager/entity/result/KeyValueVo.java
New file
@@ -0,0 +1,23 @@
package com.zy.crm.manager.entity.result;
import lombok.Data;
/**
 * Created by vincent on 2021/4/13
 */
@Data
public class KeyValueVo {
    private String name;
    private Object value;
    public KeyValueVo() {
    }
    public KeyValueVo(String name, Object value) {
        this.name = name;
        this.value = value;
    }
}
src/main/java/com/zy/crm/manager/mapper/ReimburseCostTypesMapper.java
New file
@@ -0,0 +1,13 @@
package com.zy.crm.manager.mapper;
import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.zy.crm.manager.entity.ReimburseCostTypes;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
@Mapper
@Repository
public interface ReimburseCostTypesMapper extends BaseMapper<ReimburseCostTypes> {
}
src/main/java/com/zy/crm/manager/mapper/ReimburseOnlineDetlMapper.java
New file
@@ -0,0 +1,13 @@
package com.zy.crm.manager.mapper;
import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.zy.crm.manager.entity.ReimburseOnlineDetl;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
@Mapper
@Repository
public interface ReimburseOnlineDetlMapper extends BaseMapper<ReimburseOnlineDetl> {
}
src/main/java/com/zy/crm/manager/service/ReimburseCostTypesService.java
New file
@@ -0,0 +1,9 @@
package com.zy.crm.manager.service;
import com.baomidou.mybatisplus.service.IService;
import com.zy.crm.manager.entity.ReimburseCostTypes;
public interface ReimburseCostTypesService extends IService<ReimburseCostTypes> {
}
src/main/java/com/zy/crm/manager/service/ReimburseOnlineDetlService.java
New file
@@ -0,0 +1,9 @@
package com.zy.crm.manager.service;
import com.baomidou.mybatisplus.service.IService;
import com.zy.crm.manager.entity.ReimburseOnlineDetl;
public interface ReimburseOnlineDetlService extends IService<ReimburseOnlineDetl> {
}
src/main/java/com/zy/crm/manager/service/impl/ReimburseCostTypesServiceImpl.java
New file
@@ -0,0 +1,12 @@
package com.zy.crm.manager.service.impl;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.zy.crm.manager.entity.ReimburseCostTypes;
import com.zy.crm.manager.mapper.ReimburseCostTypesMapper;
import com.zy.crm.manager.service.ReimburseCostTypesService;
import org.springframework.stereotype.Service;
@Service("reimburseCostTypesService")
public class ReimburseCostTypesServiceImpl extends ServiceImpl<ReimburseCostTypesMapper, ReimburseCostTypes> implements ReimburseCostTypesService {
}
src/main/java/com/zy/crm/manager/service/impl/ReimburseOnlineDetlServiceImpl.java
New file
@@ -0,0 +1,12 @@
package com.zy.crm.manager.service.impl;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.zy.crm.manager.entity.ReimburseOnlineDetl;
import com.zy.crm.manager.mapper.ReimburseOnlineDetlMapper;
import com.zy.crm.manager.service.ReimburseOnlineDetlService;
import org.springframework.stereotype.Service;
@Service("reimburseOnlineDetlService")
public class ReimburseOnlineDetlServiceImpl extends ServiceImpl<ReimburseOnlineDetlMapper, ReimburseOnlineDetl> implements ReimburseOnlineDetlService {
}
src/main/resources/application.yml
@@ -17,12 +17,12 @@
    name: @pom.build.finalName@
  datasource:
    driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
#    url: jdbc:sqlserver://localhost:1433;databasename=zy_crm
#    username: sa
#    password: sa@123
    url: jdbc:sqlserver://47.97.1.152:51433;databasename=zy_crm
    url: jdbc:sqlserver://localhost:1433;databasename=zy_crm
    username: sa
    password: Zoneyung@zy56$
    password: sa@123
#    url: jdbc:sqlserver://47.97.1.152:51433;databasename=zy_crm
#    username: sa
#    password: Zoneyung@zy56$
  mvc:
    static-path-pattern: /**
  redis:
src/main/resources/mapper/ReimburseCostTypesMapper.xml
New file
@@ -0,0 +1,12 @@
<?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.zy.crm.manager.mapper.ReimburseCostTypesMapper">
    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.zy.crm.manager.entity.ReimburseCostTypes">
        <id column="id" property="id" />
        <result column="type_name" property="typeName" />
    </resultMap>
</mapper>
src/main/resources/mapper/ReimburseOnlineDetlMapper.xml
New file
@@ -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.zy.crm.manager.mapper.ReimburseOnlineDetlMapper">
    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.zy.crm.manager.entity.ReimburseOnlineDetl">
        <id column="id" property="id" />
        <result column="occupation" property="occupation" />
        <result column="expense_type" property="expenseType" />
        <result column="user_id" property="userId" />
        <result column="dept_id" property="deptId" />
        <result column="host_id" property="hostId" />
        <result column="order_id" property="orderId" />
        <result column="tax_rate" property="taxRate" />
        <result column="untaxed_amount_in_local_currency" property="untaxedAmountInLocalCurrency" />
        <result column="untaxed_amount" property="untaxedAmount" />
        <result column="tax_amount" property="taxAmount" />
        <result column="invoice_value" property="invoiceValue" />
        <result column="invoice_amount_in_local_currency" property="invoiceAmountInLocalCurrency" />
        <result column="reimbursement_ratio" property="reimbursementRatio" />
        <result column="reimbursement_amount" property="reimbursementAmount" />
        <result column="reimbursement_amount_in_local_currency" property="reimbursementAmountInLocalCurrency" />
        <result column="cashier_confirmation_amount" property="cashierConfirmationAmount" />
        <result column="cashier_currency" property="cashierCurrency" />
        <result column="departure_time" property="departureTime" />
        <result column="update_time" property="updateTime" />
        <result column="update_user_id" property="updateUserId" />
        <result column="update_user_name" property="updateUserName" />
        <result column="creation_time" property="creationTime" />
        <result column="creation_user_id" property="creationUserId" />
        <result column="creation_user_name" property="creationUserName" />
        <result column="reimburse_id" property="reimburseId" />
    </resultMap>
</mapper>
src/main/webapp/static/js/reimburseCostTypes/reimburseCostTypes.js
New file
@@ -0,0 +1,246 @@
var pageCurr;
layui.config({
    base: baseUrl + "/static/layui/lay/modules/"
}).use(['table','laydate', 'form', 'admin'], function(){
    var table = layui.table;
    var $ = layui.jquery;
    var layer = layui.layer;
    var layDate = layui.laydate;
    var form = layui.form;
    var admin = layui.admin;
    // 数据渲染
    tableIns = table.render({
        elem: '#reimburseCostTypes',
        headers: {token: localStorage.getItem('token')},
        url: baseUrl+'/reimburseCostTypes/list/auth',
        page: true,
        limit: 15,
        limits: [15, 30, 50, 100, 200, 500],
        toolbar: '#toolbar',
        cellMinWidth: 50,
        height: 'full-120',
        cols: [[
            {type: 'checkbox'}
            ,{field: 'id', align: 'center',title: 'ID'}
            ,{field: 'typeName', align: 'center',title: '名称'}
            ,{fixed: 'right', title:'操作', align: 'center', toolbar: '#operate', width:120}
        ]],
        request: {
            pageName: 'curr',
            pageSize: 'limit'
        },
        parseData: function (res) {
            return {
                'code': res.code,
                'msg': res.msg,
                'count': res.data.total,
                'data': res.data.records
            }
        },
        response: {
            statusCode: 200
        },
        done: function(res, curr, count) {
            if (res.code === 403) {
                top.location.href = baseUrl+"/";
            }
            pageCurr=curr;
            limit();
        }
    });
    // 监听排序事件
    table.on('sort(reimburseCostTypes)', function (obj) {
        var searchData = {};
        $.each($('#search-box [name]').serializeArray(), function() {
            searchData[this.name] = this.value;
        });
        searchData['orderByField'] = obj.field;
        searchData['orderByType'] = obj.type;
        tableIns.reload({
            where: searchData,
            page: {curr: 1}
        });
    });
    // 监听头工具栏事件
    table.on('toolbar(reimburseCostTypes)', function (obj) {
        var checkStatus = table.checkStatus(obj.config.id).data;
        switch(obj.event) {
            case 'addData':
                showEditModel();
                break;
            case 'deleteData':
               if (checkStatus.length === 0) {
                   layer.msg('请选择要删除的数据', {icon: 2});
                   return;
               }
               del(checkStatus.map(function (d) {
                   return d.id;
               }));
               break;
            case 'exportData':
                admin.confirm('确定导出Excel吗', {shadeClose: true}, function(){
                    var titles=[];
                    var fields=[];
                    obj.config.cols[0].map(function (col) {
                        if (col.type === 'normal' && col.hide === false && col.toolbar == null) {
                            titles.push(col.title);
                            fields.push(col.field);
                        }
                    });
                    var exportData = {};
                    $.each($('#search-box [name]').serializeArray(), function() {
                        exportData[this.name] = this.value;
                    });
                    var param = {
                        'reimburseCostTypes': exportData,
                        'fields': fields
                    };
                    $.ajax({
                        url: baseUrl+"/reimburseCostTypes/export/auth",
                        headers: {'token': localStorage.getItem('token')},
                        data: JSON.stringify(param),
                        dataType:'json',
                        contentType:'application/json;charset=UTF-8',
                        method: 'POST',
                        success: function (res) {
                            layer.closeAll();
                            if (res.code === 200) {
                                table.exportFile(titles,res.data,'xls');
                            } else if (res.code === 403) {
                                top.location.href = baseUrl+"/";
                            } else {
                                layer.msg(res.msg, {icon: 2})
                            }
                        }
                    });
                });
                break;
        }
    });
    // 监听行工具事件
    table.on('tool(reimburseCostTypes)', function(obj){
        var data = obj.data;
        switch (obj.event) {
            case 'edit':
                showEditModel(data);
                break;
            case "del":
                del([data.id]);
                break;
        }
    });
    /* 弹窗 - 新增、修改 */
    function showEditModel(mData) {
        admin.open({
            type: 1,
            area: '600px',
            title: (mData ? '修改' : '添加') + '订单状态',
            content: $('#editDialog').html(),
            success: function (layero, dIndex) {
                layDateRender(mData);
                form.val('detail', mData);
                form.on('submit(editSubmit)', function (data) {
                    var loadIndex = layer.load(2);
                    $.ajax({
                        url: baseUrl+"/reimburseCostTypes/"+(mData?'update':'add')+"/auth",
                        headers: {'token': localStorage.getItem('token')},
                        data: data.field,
                        method: 'POST',
                        success: function (res) {
                            layer.close(loadIndex);
                            if (res.code === 200){
                                layer.close(dIndex);
                                layer.msg(res.msg, {icon: 1});
                                tableReload();
                            } else if (res.code === 403){
                                top.location.href = baseUrl+"/";
                            }else {
                                layer.msg(res.msg, {icon: 2});
                            }
                        }
                    })
                    return false;
                });
                $(layero).children('.layui-layer-content').css('overflow', 'visible');
                layui.form.render('select');
            }
        });
    }
    /* 删除 */
    function del(ids) {
        layer.confirm('确定要删除选中数据吗?', {
            skin: 'layui-layer-admin',
            shade: .1
        }, function (i) {
            layer.close(i);
            var loadIndex = layer.load(2);
            $.ajax({
                url: baseUrl+"/reimburseCostTypes/delete/auth",
                headers: {'token': localStorage.getItem('token')},
                data: {ids: ids},
                method: 'POST',
                success: function (res) {
                    layer.close(loadIndex);
                    if (res.code === 200){
                        layer.msg(res.msg, {icon: 1});
                        tableReload();
                    } else if (res.code === 403){
                        top.location.href = baseUrl+"/";
                    } else {
                        layer.msg(res.msg, {icon: 2});
                    }
                }
            })
        });
    }
    // 搜索
    form.on('submit(search)', function (data) {
        pageCurr = 1;
        tableReload(false);
    });
    // 重置
    form.on('submit(reset)', function (data) {
        pageCurr = 1;
        clearFormVal($('#search-box'));
        tableReload(false);
    });
    // 时间选择器
    function layDateRender(data) {
        setTimeout(function () {
            layDate.render({
                elem: '.layui-laydate-range'
                ,type: 'datetime'
                ,range: true
            });
        }, 300);
    }
    layDateRender();
});
// 关闭动作
$(document).on('click','#data-detail-close', function () {
    parent.layer.closeAll();
});
function tableReload(child) {
    var searchData = {};
    $.each($('#search-box [name]').serializeArray(), function() {
        searchData[this.name] = this.value;
    });
    tableIns.reload({
        where: searchData,
        page: {curr: pageCurr}
     });
}
src/main/webapp/static/js/reimburseOnline/reimburseOnline.js
@@ -84,16 +84,17 @@
        cols: [[
            {type: 'checkbox', fixed: 'left'}
            ,{field: 'id', title: 'ID', sort: true,align: 'center', fixed: 'left', width: 80,hide: true}
            ,{field: 'templateName', align: 'center',title: '报销名',hide: false}
            ,{field: 'templateName', align: 'center',title: '报销类型',hide: false}
            ,{field: 'orderNum', align: 'center',title: '报销单号'}
            ,{field: 'planId$', align: 'center',title: '规划单号'}
            ,{field: 'orderId$', align: 'center',title: '项目号'}
            ,{field: 'createTime$', align: 'center',title: '创建时间'}
            ,{field: 'updateTime$', align: 'center',title: '更新时间'}
            ,{field: 'status$', align: 'center',title: '状态'}
            ,{field: 'memberId$', align: 'center',title: '业务员'}
            ,{field: 'user$', align: 'center',title: '创建人员'}
            ,{field: 'updateUserId$', align: 'center',title: '更新人员'}
            ,{field: 'checkDataStatus$', align: 'center',title: '报价数据'}
            // // ,{field: 'checkDataStatus$', align: 'center',title: '报价数据'}
            ,{align: 'center', title: '报销明细', toolbar: '#tbLook', minWidth: 160, width: 160}
            ,{fixed: 'right', title:'操作', align: 'center', toolbar: '#operate', width:350}
        ]],
        request: {
@@ -365,6 +366,78 @@
                    }
                });
                break;
            case "look":
                var $a = $(obj.tr).find('a[lay-event="look"]');
                var offset = $a.offset();
                var top = offset.top;
                var left = offset.left;
                layer.open({
                    type: 1,
                    title: false,
                    area: '2100px',
                    offset: [top + 'px', (left - 1730 + $a.outerWidth()) + 'px'],
                    shade: .01,
                    shadeClose: true,
                    fixed: false,
                    content: '<table id="lookSSXMTable" lay-filter="lookSSXMTable"></table>',
                    success: function (layero) {
                        table.render({
                            elem: '#lookSSXMTable',
                            headers: {token: localStorage.getItem('token')},
                            url: baseUrl+'/reimburseOnlineDetl/list/auth',
                            where: {
                                order_id: data.id
                            },
                            page: true,
                            cellMinWidth: 100,
                            cols: [[
                                // {type: 'numbers'},
                                {field: 'occupation', title: '事由', width: 100},
                                // {field: 'expenseType', title: '费用类型', width: 100},
                                {field: 'expenseType$', title: '费用类型', width: 100},
                                {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: '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: 'cashierConfirmationAmount', title: '出纳确认金额', width: 120},
                                {field: 'userId', title: '列支人员', width: 120},
                                {field: 'deptId', title: '列支部门', width: 120},
                                {field: 'updateTime', title: '更新日期', width: 100},
                                // {field: 'updateUserId', title: '更新人员ID', width: 160},
                                {field: 'updateUserName', title: '更新人员名字'},
                                // {field: 'creationTime', title: '创建日期', width: 160}
                            ]],
                            request: {
                                pageName: 'curr',
                                pageSize: 'limit'
                            },
                            parseData: function (res) {
                                return {
                                    'code': res.code,
                                    'msg': res.msg,
                                    'count': res.data.total,
                                    'data': res.data.records
                                }
                            },
                            response: {
                                statusCode: 200
                            },
                            done: function () {
                                $(layero).find('.layui-table-view').css('margin', '0');
                            },
                            size: ''
                        });
                    }
                });
                break;
        }
    });
@@ -375,38 +448,283 @@
        tableReload();
    });
    /* 弹窗 - 新增、修改 */
    function showEditModel(mData) {
    // 显示表单弹窗
    function showEditModel(expTpe) {
        admin.open({
            type: 1,
            area: '800px',
            title: (mData ? '修改' : '添加') + '核价',
            title: (expTpe ? '修改' : '添加') + '报销审批',
            content: $('#editDialog').html(),
            area: '2200px',
            success: function (layero, dIndex) {
                form.val('detail', mData);
                form.on('submit(editSubmit)', function (data) {
                    var loadIndex = layer.load(2);
                    layer.close(loadIndex);
                    layer.close(dIndex);
                    layer.open({
                        type: 2,
                        title: '新增',
                        maxmin: true,
                        area: [top.detailWidth, top.detailHeight],
                        shadeClose: false,
                        content: 'reimburseOnline_detail.html?item_id=' + data.field.planId + "&pri_id=" + data.field.priId,
                        success: function(layero, index){
                            clearFormVal(layer.getChildFrame('#detail', index));
                            // layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
                $(layero).children('.layui-layer-content').css('overflow', 'visible');
                var isExpAdd = !expTpe;
                // 回显数据
                form.val('editForm', expTpe);
                if (expTpe) {
                    // $('#orderNo').attr("disabled", "disabled");
                        }
                    });
                // 表单提交事件
                form.on('submit(orderEditSubmit)', function (data) {
                    // 组装数据
                    if (xxDataList.length <= 0) {
                        layer.tips('请添加报销明细', '#matAddBtnComment', {tips: [1, '#ff4c4c']});
                        return false;
                    }
                    let nList = admin.util.deepClone(xxDataList);
                    for (let xi = 0; xi < nList.length; xi++) {
                        // if (nList[xi].anfme <= 0){
                        //     layer.msg('明细修改数量不合法', {icon: 2});
                        //     return false;
                        // }
                    }
                    layer.load(2);
                    $.ajax({
                        url: baseUrl+"/reimburseOnline/from/" + (isExpAdd?"add":"modify") + "/auth",
                        headers: {'token': localStorage.getItem('token')},
                        data: JSON.stringify({
                            orderId: Number(data.field.id),
                            docType: Number(data.field.docType),
                            orderNo: data.field.orderNo,
                            orderDetlList: nList
                        }),
                        contentType:'application/json;charset=UTF-8',
                        method: 'POST',
                        success: function (res) {
                            layer.closeAll('loading');
                            if (res.code === 200){
                                layer.close(dIndex);
                                $(".layui-laypage-btn")[0].click();
                                layer.msg(res.msg, {icon: 1});
                            } else if (res.code === 403){
                                top.location.href = baseUrl+"/";
                            }else {
                                layer.msg(res.msg, {icon: 2});
                            }
                        }
                    })
                    return false;
                });
                // 明细表格
                var xxDataList = [];
                var tbOptions = {
                    elem: '#formSSXMTable',
                    headers: {token: localStorage.getItem('token')},
                    data: xxDataList,
                    page: true,
                    height: '350px;',
                    cellMinWidth: 100,
                    cols: [[
                        {type: 'numbers', title: '#'},
                        {field: 'occupation', title: '事由', width: 100},
                        // {field: 'expenseType', title: '费用类型', width: 100},
                        {field: 'expenseType$', title: '费用类型', width: 100},
                        {field: 'taxRate', title: '税率', width: 60},
                        {field: 'untaxedAmountInLocalCurrency', title: '未税本币金额', width: 120},
                        {field: 'untaxedAmount', title: '未税金额', width: 100},
                        {field: 'taxAmount', title: '税额', width: 60},
                        {field: 'invoiceValue', title: '发票金额', width: 100},
                        {field: 'invoiceAmountInLocalCurrency', title: '发票本币金额', width: 120},
                        {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: 'cashierConfirmationAmount', title: '出纳确认金额', width: 120},
                        {field: 'userId', title: '列支人员', width: 120},
                        {field: 'deptId', title: '列支部门', width: 120},
                        {field: 'updateTime', title: '更新日期', width: 100},
                        // {field: 'updateUserId', title: '更新人员ID', width: 160},
                        {field: 'updateUserName', title: '更新人员名字'},
                        // {field: 'creationTime', title: '创建日期', width: 160}
                    ]],
                    done: function (res) {
                        $(layero).find('.layui-table-view').css('margin', '0');
                    },
                    size: ''
                };
                if (!isExpAdd) {
                    $.ajax({
                        url: baseUrl+"/reimburseOnline/detl/all/auth?reimburseId=" + expTpe.id,
                        headers: {'token': localStorage.getItem('token')},
                        method: 'GET',
                        async: false,
                        success: function (res) {
                            if (res.code === 200){
                                xxDataList = res.data;
                                tbOptions.data = xxDataList;
                            } else if (res.code === 403){
                                top.location.href = baseUrl+"/";
                            }else {
                                layer.msg(res.msg, {icon: 2})
                            }
                        }
                    })
                }
                var insTbSSXM = table.render(tbOptions);
                // 工具条点击事件
                table.on('tool(formSSXMTable)', function (obj) {
                    var data = obj.data;
                    var layEvent = obj.event;
                    if (layEvent === 'edit') {
                        showEditModel2(data);
                    } else if (layEvent === 'del') {
                        layer.confirm('确定要删除吗?', {
                            shade: .1,
                            skin: 'layui-layer-admin'
                        }, function (i) {
                            layer.close(i);
                            for (var j = 0; j < xxDataList.length; j++) {
                                if (xxDataList[j].matnr === data.matnr && xxDataList[j].batch === data.batch) {
                                    xxDataList.splice(j, 1);
                                    break;
                                }
                            }
                            insTbSSXM.reload({data: xxDataList, page: {curr: 1}});
                        });
                    }
                });
                // 明细数据修改
                table.on('edit(formSSXMTable)', function (obj) {
                    let index = obj.tr.attr("data-index");
                    let data = xxDataList[index];
                    if (obj.field === 'anfme'){
                        let vle = Number(obj.value);
                        if (isNaN(vle)) {
                            layer.msg("请输入数字", {icon: 2});
                            return false;
                        } else {
                            if (vle <= 0) {
                                layer.msg("数量必须大于零", {icon: 2});
                                return false;
                            }
                        }
                    }
                    data[obj.field] = obj.value;
                    insTbSSXM.reload({data: xxDataList});
                });
                $('#matAddBtnComment').click(function () {
                    showEditModel2();
                });
                // 显示添加明细表单弹窗
                function showEditModel2(exp) {
                    admin.open({
                        type: 1,
                        offset: '150px',
                        area: '680px',
                        title: (exp ? '修改' : '添加') + '明细',
                        content: $('#matEditDialog').html(),
                        success: function (layero, dIndex) {
                            // 回显数据
                            form.val('matEditForm', exp);
                            // 表单提交事件
                            form.on('submit(matEditSubmit)', function (data) {
                                let selectList = matXmSelect.getValue();
                                for (let i = 0; i<selectList.length; i++) {
                                    let item = selectList[i];
                                    // 查询物料详情
                                    $.ajax({
                                        url: baseUrl+"/reimburseCostTypes/covert/"+item.value+"/auth",
                                        headers: {'token': localStorage.getItem('token')},
                                        method: 'GET',
                                        async: false,
                                        success: function (res) {
                                            if (res.code === 200){
                                                var bige=true;
                                                for (var j = 0; j < xxDataList.length; j++) {
                                                    if (xxDataList[j].matnr === res.data.matnr && xxDataList[j].batch === res.data.batch) {
                                                        bige=false;
                                                        break;
                                                    }
                                                }
                                                if (bige){
                                                    xxDataList.push(res.data);
                                                    insTbSSXM.reload({data: xxDataList, page: {curr: 1}});
                                                }
                                            } else if (res.code === 403){
                                                top.location.href = baseUrl+"/";
                                            }else {
                                                layer.msg(res.msg, {icon: 2})
                                            }
                                        }
                                    })
                                }
                                layer.close(dIndex);
                                return false;
                            });
                            // 渲染物料选择
                            var matXmSelect = xmSelect.render({
                                el: '#reimburseCostTypes',
                                style: {
                                    width: '340px',
                                },
                                autoRow: true,
                                toolbar: { show: true },
                                filterable: true,
                                remoteSearch: true,
                                remoteMethod: function(val, cb, show){
                                    $.ajax({
                                        url: baseUrl+"/reimburseCostTypes/all/get/kv",
                                        headers: {'token': localStorage.getItem('token')},
                                        data: {
                                            condition: val
                                        },
                                        method: 'POST',
                                        success: function (res) {
                                            if (res.code === 200){
                                                cb(res.data)
                                            } else {
                                                cb([]);
                                                layer.msg(res.msg, {icon: 2});
                                            }
                                        }
                                    });
                                }
                            })
                            // 弹窗不出现滚动条
                $(layero).children('.layui-layer-content').css('overflow', 'visible');
                layui.form.render('select');
            }
        });
    }
            }
        });
    }
    /* 弹窗 - 新增、修改 */
    // function showEditModel(mData) {
    //     admin.open({
    //         type: 1,
    //         area: '800px',
    //         title: (mData ? '修改' : '添加') + '核价',
    //         content: $('#editDialog').html(),
    //         success: function (layero, dIndex) {
    //             form.val('detail', mData);
    //             form.on('submit(editSubmit)', function (data) {
    //                 var loadIndex = layer.load(2);
    //                 layer.close(loadIndex);
    //                 layer.close(dIndex);
    //                 layer.open({
    //                     type: 2,
    //                     title: '新增',
    //                     maxmin: true,
    //                     area: [top.detailWidth, top.detailHeight],
    //                     shadeClose: false,
    //                     content: 'reimburseOnline_detail.html?item_id=' + data.field.planId + "&pri_id=" + data.field.priId,
    //                     success: function(layero, index){
    //                         clearFormVal(layer.getChildFrame('#detail', index));
    //                         // layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
    //                     }
    //                 });
    //                 return false;
    //             });
    //             $(layero).children('.layui-layer-content').css('overflow', 'visible');
    //             layui.form.render('select');
    //         }
    //     });
    // }
    //更新form
    function showEditForm(mData) {
src/main/webapp/views/reimburseCostTypes/reimburseCostTypes.html
New file
@@ -0,0 +1,92 @@
<!DOCTYPE html>
<html lang="en">
<head>
    <meta charset="utf-8">
    <title></title>
    <meta name="renderer" content="webkit">
    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
    <link rel="stylesheet" href="../../static/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../static/css/admin.css?v=318" media="all">
    <link rel="stylesheet" href="../../static/css/cool.css" media="all">
</head>
<body>
<div class="layui-fluid">
    <div class="layui-card">
        <div class="layui-card-body">
            <div class="layui-form toolbar" id="search-box">
                <div class="layui-form-item">
                    <div class="layui-inline">
                        <div class="layui-input-inline">
                            <input class="layui-input" type="text" name="id" placeholder="编号" autocomplete="off">
                        </div>
                    </div>
                     <div class="layui-inline" style="width: 300px">
                        <div class="layui-input-inline">
                            <input class="layui-input layui-laydate-range" name="create_time" type="text" placeholder="起始时间 - 终止时间" autocomplete="off" style="width: 300px">
                        </div>
                    </div>
                    <div class="layui-inline">
                        <div class="layui-input-inline">
                            <input class="layui-input" type="text" name="condition" placeholder="请输入" autocomplete="off">
                        </div>
                    </div>
                    <div class="layui-inline">&emsp;
                        <button class="layui-btn icon-btn" lay-filter="search" lay-submit>
                            <i class="layui-icon">&#xe615;</i>搜索
                        </button>
                        <button class="layui-btn icon-btn" lay-filter="reset" lay-submit>
                            <i class="layui-icon">&#xe666;</i>重置
                        </button>
                    </div>
                </div>
            </div>
            <table class="layui-hide" id="reimburseCostTypes" lay-filter="reimburseCostTypes"></table>
        </div>
    </div>
</div>
<script type="text/html" id="toolbar">
    <div class="layui-btn-container">
        <button class="layui-btn layui-btn-sm" id="btn-add" lay-event="addData">新增</button>
        <button class="layui-btn layui-btn-sm layui-btn-danger" id="btn-delete" lay-event="deleteData">删除</button>
        <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData" style="float: right">导出</button>
    </div>
</script>
<script type="text/html" id="operate">
    <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">修改</a>
    <a class="layui-btn layui-btn-danger layui-btn-xs btn-edit" lay-event="del">删除</a>
</script>
<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/reimburseCostTypes/reimburseCostTypes.js" charset="utf-8"></script>
</body>
<!-- 表单弹窗 -->
<script type="text/html" id="editDialog">
    <form id="detail" lay-filter="detail" class="layui-form admin-form model-form">
        <input name="id" type="hidden">
        <div class="layui-row">
            <div class="layui-col-md12">
                <div class="layui-form-item">
                    <label class="layui-form-label">名称: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="typeName" placeholder="请输入名称">
                    </div>
                </div>
             </div>
        </div>
        <hr class="layui-bg-gray">
        <div class="layui-form-item text-right">
            <button class="layui-btn" lay-filter="editSubmit" lay-submit="">保存</button>
            <button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">取消</button>
        </div>
    </form>
</script>
</html>
src/main/webapp/views/reimburseOnline/reimburseOnline.html
@@ -59,9 +59,18 @@
  </div>
</div>
<!-- 表格操作列 -->
<script type="text/html" id="tbLook">
  <span class="layui-text">
        <a href="javascript:;" lay-event="look">
            <i class="layui-icon" style="font-size: 12px;">&#xe61a;</i> 查看报销明细
        </a>
    </span>
</script>
<script type="text/html" id="toolbar">
  <div class="layui-btn-container">
    <button class="layui-btn layui-btn-sm" lay-event="addBlank">新增报销</button>
    <button class="layui-btn layui-btn-sm" lay-event="addBlank">申请报销</button>
    <button class="layui-btn layui-btn-sm layui-btn-danger" lay-event="deleteData">删除</button>
  </div>
</script>
@@ -89,12 +98,39 @@
<script type="text/javascript" src="../../static/js/luckysheet_js/pako.es5.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/luckysheet_js/base64.min.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/reimburseOnline/reimburseOnline.js" charset="utf-8"></script>
<!--&lt;!&ndash; 表单弹窗 &ndash;&gt;-->
<!--<script type="text/html" id="editDialog">-->
<!--  <div id="detail" lay-filter="detail" class="layui-form admin-form model-form">-->
<!--    <input name="id" type="hidden">-->
<!--    <div class="layui-row">-->
<!--      <div class="layui-col-md12">-->
<!--        <div class="layui-form-item">-->
<!--          <label class="layui-form-label layui-form-required">报销模板名: </label>-->
<!--          <div class="layui-input-block cool-auto-complete">-->
<!--            <input class="layui-input" name="priId" placeholder="请输入模板名" style="display: none" lay-verify="required">-->
<!--            <input id="priId$" name="priId$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="请输入模板名" onfocus=this.blur()>-->
<!--            <div class="cool-auto-complete-window">-->
<!--              <input class="cool-auto-complete-window-input" data-key="reimburseQueryBypri" onkeyup="autoLoad(this.getAttribute('data-key'))">-->
<!--              <select class="cool-auto-complete-window-select" data-key="reimburseQueryBypriSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">-->
<!--              </select>-->
<!--            </div>-->
<!--          </div>-->
<!--        </div>-->
<!--      </div>-->
<!--    </div>-->
<!--    <hr class="layui-bg-gray">-->
<!--    <div class="layui-form-item text-right">-->
<!--      <button class="layui-btn" lay-filter="editSubmit" lay-submit="">保存</button>-->
<!--      <button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">取消</button>-->
<!--    </div>-->
<!--  </div>-->
<!--</script>-->
<!-- 表单弹窗 -->
<script type="text/html" id="editDialog">
  <div id="detail" lay-filter="detail" class="layui-form admin-form model-form">
    <input name="id" type="hidden">
    <div class="layui-row">
      <div class="layui-col-md12">
  <form id="editForm" lay-filter="editForm" class="layui-form model-form">
    <input name="id" type="hidden"/>
        <div class="layui-form-item">
          <label class="layui-form-label layui-form-required">项目名: </label>
          <div class="layui-input-block cool-auto-complete">
@@ -107,27 +143,47 @@
            </div>
          </div>
        </div>
        <div class="layui-form-item">
          <label class="layui-form-label layui-form-required">报销模板名: </label>
          <div class="layui-input-block cool-auto-complete">
            <input class="layui-input" name="priId" placeholder="请输入模板名" style="display: none" lay-verify="required">
            <input id="priId$" name="priId$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="请输入模板名" onfocus=this.blur()>
            <div class="cool-auto-complete-window">
              <input class="cool-auto-complete-window-input" data-key="reimburseQueryBypri" onkeyup="autoLoad(this.getAttribute('data-key'))">
              <select class="cool-auto-complete-window-select" data-key="reimburseQueryBypriSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
              </select>
    <div class="layui-form-item" style="position: relative;">
      <label class="layui-form-label">报销明细:</label>
      <div class="layui-input-block">
        <table id="formSSXMTable" lay-filter="formSSXMTable"></table>
            </div>
      <button class="layui-btn layui-btn-sm icon-btn" id="matAddBtnComment"
              style="position: absolute; left: 20px;top: 60px;padding: 0 5px;" type="button">
        <i class="layui-icon">&#xe654;</i>添加明细
      </button>
          </div>
        </div>
      </div>
    </div>
    <hr class="layui-bg-gray">
    <div class="layui-form-item text-right">
      <button class="layui-btn" lay-filter="editSubmit" lay-submit="">保存</button>
      <button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">取消</button>
      <button class="layui-btn" lay-filter="orderEditSubmit" lay-submit>保存</button>
    </div>
  </form>
</script>
<!-- 表格操作列 -->
<script type="text/html" id="formSSXMTableBar">
  <!--    <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="edit">修改</a>-->
  <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">删除</a>
</script>
<!-- 表单弹窗 -->
<script type="text/html" id="matEditDialog">
  <form id="matEditForm" lay-filter="matEditForm" class="layui-form model-form">
    <input name="experimentId" type="hidden"/>
    <div class="layui-form-item" style="float: left">
      <label class="layui-form-label">费用类型 - 多选</label>
      <div class="layui-input-block">
        <div id="reimburseCostTypes" name="reimburseCostTypes">
    </div>
  </div>
    </div>
    <div class="layui-form-item text-right" style="display: inline-block; margin-left: 35px">
      <button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">取消</button>
      <button class="layui-btn" lay-filter="matEditSubmit" lay-submit>保存</button>
    </div>
  </form>
</script>
<!-- 表单弹窗 -->
@@ -136,6 +192,7 @@
    <input name="id" type="hidden">
    <div class="layui-row">
      <div class="layui-col-md12">
        <div class="layui-form-item">
          <label class="layui-form-label layui-form-required">状态: </label>
          <div class="layui-input-block">