#报销完善

LSH

2023-08-22 b46fcd19ae06a89f230c0d53ef51780404f494c9

#报销完善

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

@@ -111,9 +111,15 @@
    @ManagerAuth(memo = "报销")
    @Transactional
    public R formAdd(@RequestBody ReimburseOnlineDomainParam param){
        long planId = 0;
        if (!param.getTemplateName().equals("非项目型报销")){
            if (Cools.isEmpty(param.getOrderNo())){
                return R.error("添加失败！"+param.getTemplateName()+"需要关联项目号");
            }
            String[] split = param.getOrderNo().split("---");
            planId = Long.parseLong(split[1]);
        }
        Date now = new Date();
        String[] split = param.getOrderNo().split("---");
        long planId = Long.parseLong(split[1]);
        Rule rule = ruleService.selectById(1);
        ReimburseOnline reimburseOnline = new ReimburseOnline(planId,RuleUtils.rule(rule),now,getUser());
        reimburseOnline.setMemberId(getUserId());

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

@@ -153,9 +153,9 @@
        OrderService orderService = SpringUtils.getBean(OrderService.class);
        Order order = orderService.selectById(this.itemId);
        if (!Cools.isEmpty(order)){
            return String.valueOf(order.getUuid());
            return String.valueOf(order.getUuid()+"---"+order.getName());
        }
        return null;
        return "非项目型报销";
    }

    public String getUser$() {

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

@@ -87,7 +87,7 @@
            ,{field: 'templateName', align: 'center',title: '报销类型',hide: false}
            ,{field: 'checkData', align: 'center',title: '是否冲账',hide: false}
            ,{field: 'orderNum', align: 'center',title: '报销单号',width: 320, hide:false}
            ,{field: 'itemId', align: 'center',title: '项目号',hide: false}
            ,{field: 'planId$', align: 'center',title: '项目号',hide: false}
            ,{field: 'createTime$', align: 'center',title: '创建时间',hide: false}
            ,{field: 'updateTime$', align: 'center',title: '更新时间',hide: false}
            ,{field: 'status$', align: 'center',title: '状态',hide: false}

 src/main/webapp/views/reimburseOnline/reimburseOnline.html

@@ -132,9 +132,9 @@
  <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>
      <label class="layui-form-label">项目名: </label>
      <div class="layui-input-block cool-auto-complete">
        <input class="layui-input" name="planId" placeholder="请输入项目名" style="display: none" lay-verify="required">
        <input class="layui-input" name="planId" placeholder="请输入项目名" style="display: none">
        <input id="planId$" name="planId" 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="planQueryNameBydirector" onkeyup="autoLoad(this.getAttribute('data-key'))">