#

Junjie

2023-09-06 fae5b7ce29b94017025535a2a4e94eb2541637a0

#

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

@@ -92,7 +92,7 @@
                  @RequestParam(required = false)String condition,
                  @RequestParam Map<String, Object> param){
        EntityWrapper<ReimburseOnline> wrapper = new EntityWrapper<>();
        wrapper.setSqlSelect("id,settle,title,create_time as createTime,filepath,item_id as itemId,order_num as orderNum,template_name as templateName,user_id as userId,dept_id as deptId,status,update_time as updateTime,check_data as checkData,update_user_id as updateUserId,member_id as memberId");
        wrapper.setSqlSelect("id,settle,title,create_time as createTime,filepath,item_id as itemId,order_num as orderNum,template_name as templateName,user_id as userId,dept_id as deptId,status,update_time as updateTime,check_data as checkData,update_user_id as updateUserId,member_id as memberId,name");
//        wrapper.in("member_id", getUserRoleBelongsToUserId());
        wrapper.andNew();
        excludeTrash(param);
@@ -157,6 +157,7 @@
        ReimburseOnline reimburseOnline = new ReimburseOnline(planId,RuleUtils.rule(rule),now,getUser());
        reimburseOnline.setCheckData(param.getCheckData());
        reimburseOnline.setTemplateName(param.getTemplateName());
        reimburseOnline.setName(param.getName());

        reimburseOnline.setSettle(0);  // 0.创建
        User manager = userService.getDeptManager(getHostId(), getUser().getDeptId());        // 获取部门领导
@@ -181,6 +182,7 @@
        map.put("orderNo",param.getOrderNo());
        map.put("templateName",param.getTemplateName());
        map.put("checkData",param.getCheckData());
        map.put("name",param.getName());
        reimburseOnline.setForm(JSON.toJSONString(map));
        reimburseOnline.setMemberId(getUser().getId());

@@ -222,6 +224,7 @@
        reimburseOnline.setCheckData(param.getCheckData());
        reimburseOnline.setTemplateName(param.getTemplateName());
        reimburseOnline.setItemId(planId);
        reimburseOnline.setName(param.getName());
        reimburseOnline.setUpdateTime(new Date());

        Map<String, Object> map = new HashMap<>();
@@ -231,6 +234,7 @@
        map.put("orderNo",param.getOrderNo());
        map.put("templateName",param.getTemplateName());
        map.put("checkData",param.getCheckData());
        map.put("name",param.getName());
        reimburseOnline.setForm(JSON.toJSONString(map));

        if (!reimburseOnlineService.updateById(reimburseOnline)){

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

@@ -122,6 +122,13 @@
    @TableField("settle_msg")
    private String settleMsg;

    /**
     * 客户名称
     */
    @ApiModelProperty(value= "客户名称")
    @TableField("name")
    private String name;

    public ReimburseOnline() {}

    public ReimburseOnline(String title, String sheetData, Date createTime, String filepath) {

 src/main/java/com/zy/crm/manager/entity/param/ReimburseOnlineDomainParam.java

@@ -18,5 +18,7 @@

    private String checkData;

    private String name;

    private List<ReimburseOnlineDetl> reimburseOnlineDetls;
}

 src/main/resources/mapper/ReimburseOnlineMapper.xml

@@ -20,6 +20,7 @@
        <result column="form" property="form" />
        <result column="settle" property="settle" />
        <result column="settle_msg" property="settleMsg" />
        <result column="name" property="name" />
    </resultMap>

    <!-- 查询结果不包含excel数据data，以免结果集过大 -->
@@ -35,6 +36,7 @@
        <result column="dept_id" property="deptId" />
        <result column="status" property="status" />
        <result column="update_time" property="updateTime" />
        <result column="name" property="name" />
    </resultMap>

    <select id="listByPage" resultMap="NoDataResultMap">

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

@@ -89,6 +89,7 @@
            ,{field: 'checkData', align: 'center',title: '是否冲账',hide: false}
            ,{field: 'orderNum', align: 'center',title: '报销单号',width: 320, style: 'color: #1890ff;cursor:pointer', event: 'more',hide: false}
            ,{field: 'planId$', align: 'center',title: '项目号',hide: false}
            ,{field: 'name', align: 'center',title: '客户信息',hide: false}
            ,{field: 'settle', align: 'center',title: '进度',hide: false}
            ,{field: 'createTime$', align: 'center',title: '创建时间',hide: false}
            ,{field: 'updateTime$', align: 'center',title: '更新时间',hide: false}
@@ -394,6 +395,7 @@
                var isExpAdd = !expTpe;
                // 回显数据
                form.val('editForm', expTpe);
                console.log(expTpe)
                if (expTpe) {
                    // $('#orderNo').attr("disabled", "disabled");
                }
@@ -421,7 +423,8 @@
                            orderNo: data.field.planId,
                            templateName: data.field.templateName,
                            checkData: data.field.checkData,
                            reimburseOnlineDetls: nList
                            reimburseOnlineDetls: nList,
                            name: data.field.name
                        }),
                        contentType:'application/json;charset=UTF-8',
                        method: 'POST',

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

@@ -159,6 +159,21 @@
            </div>
        </div>
        <div class="layui-form-item">
            <label class="layui-form-label">客户信息: </label>
            <div class="layui-input-block cool-auto-complete">
                <input class="layui-input" name="name" placeholder="请输入客户信息" style="display: none">
                <input id="name" name="name" 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="cstmrQueryBydirector"
                           onkeyup="autoLoad(this.getAttribute('data-key'))">
                    <select class="cool-auto-complete-window-select" data-key="cstmrQueryBydirectorSelect"
                            onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
                    </select>
                </div>
            </div>
        </div>
        <div class="layui-form-item">
            <label class="layui-form-label layui-form-required">报销类型: </label>
            <div class="layui-input-inline">
                <select class="layui-input" name="templateName" lay-vertype="tips" lay-verify="required">