#
mrzhssss
2022-04-07 501fde46aac0cd02a6b7fe61cddfe1d08cfe8d1e
#
4个文件已修改
36 ■■■■■ 已修改文件
src/main/java/zy/cloud/wms/manager/controller/ItemController.java 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/zy/cloud/wms/manager/entity/Item.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/static/js/itemManager/itemManager.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/views/itemManager/itemManager.html 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/zy/cloud/wms/manager/controller/ItemController.java
@@ -32,6 +32,8 @@
    private FlowStatusService flowStatusService;
    @Autowired
    private CstmrService cstmrService;
    @Autowired
    private ProjectStatusService projectStatusService;
    @RequestMapping(value = "/item/{id}/auth")
    @ManagerAuth
@@ -284,5 +286,19 @@
        return R.ok();
    }
    @RequestMapping(value = "/progressRate/auth")
    @ManagerAuth
    public R queryProgressRate(String condition) {
        List<Map<String, Object>> result = new ArrayList<>();
        List<ProjectStatus> projectStatuses = projectStatusService.selectList(null);
        for (ProjectStatus projectStatus : projectStatuses) {
            Map<String, Object> map = new HashMap<>();
            map.put("id", projectStatus.getId());
            map.put("value", projectStatus.getStatusName());
            result.add(map);
        }
        return R.ok(result);
    }
}
src/main/java/zy/cloud/wms/manager/entity/Item.java
@@ -400,6 +400,16 @@
//            null    // 备注
//    );
    public String getProgressRate$(){
        ProjectStatusService bean = SpringUtils.getBean(ProjectStatusService.class);
        ProjectStatus id = bean.selectOne(new EntityWrapper<ProjectStatus>()
                .eq("id", this.progressRate));
        if (!Cools.isEmpty(id)) {
            return id.getStatusName();
        }
        return "";
    }
    public String getProjectStatus$(){
        ProjectStatusService bean = SpringUtils.getBean(ProjectStatusService.class);
        ProjectStatus id = bean.selectOne(new EntityWrapper<ProjectStatus>().eq("id", this.projectStatus));
src/main/webapp/static/js/itemManager/itemManager.js
@@ -28,7 +28,7 @@
            ,{field: 'name', align: 'center',title: '项目名称', width: 130}
            ,{field: 'inUuid', align: 'center',title: '项目编号', hide: true}
            // ,{field: 'cstmrUuid', align: 'center',title: '客户编号'}
            ,{field: 'progressRate', align: 'center',title: '进度'}
            ,{field: 'progressRate$', align: 'center',title: '进度'}
            ,{field: 'planCarInfo', align: 'center', title: '预计车辆大小', width: 115}
            ,{field: 'planCarnumber', align: 'center', title: '预计车辆数量', width: 115}
            // ,{field: 'member', align: 'center',title: '项目成员'}
src/main/webapp/views/itemManager/itemManager.html
@@ -148,7 +148,13 @@
                <div class="layui-form-item">
                    <label class="layui-form-label">进度: </label>
                    <div class="layui-input-block cool-auto-complete">
                        <input id="projectStatus" class="layui-input" name="progressRate" placeholder="请输入进度" lay-vertype="tips">
                        <input id="progressRate" class="layui-input" name="progressRate" placeholder="请输入进度" style="display: none" lay-vertype="tips" >
                        <input id="progressRate$" name="progressRate$" 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="progressRateByprogressRate" onkeyup="autoLoad(this.getAttribute('data-key'))">
                            <select class="cool-auto-complete-window-select" data-key="progressRateByprogressRateSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
                            </select>
                        </div>
                    </div>
                </div>