# ycq

whycq0520

2022-03-24 03b41fa7164bb7dc5a8bd17a06cfceed43e65617

# ycq

 src/main/java/zy/cloud/wms/manager/controller/ProjectPlanController.java

@@ -307,6 +307,7 @@
                flows.add(flowsDTO);
            }
            itemsDTO.setNodes(flows);
            itemsDTO.setItems(items);
            itemsDTOs.add(itemsDTO);
        }
        return R.ok().add(itemsDTOs);

 src/main/java/zy/cloud/wms/manager/entity/ItemsDTO.java

@@ -13,4 +13,5 @@
    private String startDay;
    private String endDay;
    private List<FlowsDTO> nodes;
    private List<Item> items;
}

 src/main/webapp/static/js/tableData.js

@@ -7,29 +7,36 @@
    },5000)
    
    
    var proData = ["项目名称","开始时间","结束时间",]
    var proData = ["项目名称","售前金额核算","开始时间","结束时间",
        "合约签订","图面会签","BOM设计/二级BOM下发",
        "材料采购","生产制作","内部安装调整（研发物料）","进场安装","程序调试","系统联调","上线运行","项目验收","运费"]
    var getTheaddData = function(){
        $.ajax({
            url:baseurl+'/pms/projectPlan/flowStatus',
            type:'GET',
            dataType:'JSON',
            data:{},
            success:function(res){
                if(res.code==200){
                    data=res.data
                    var headStr = []
                    for(var i = 0;i<data.length;i++){
                        headStr.push(data[i].name)
                    }
                    proData = proData.concat(headStr)
                    // 表头
                    for(var i = 0;i<proData.length;i++){
                        var str = "<th class='xiangmu'>"+proData[i]+"</th>"
                        $("#tab-header").append(str)
                    }
                }
            },
            })
            for (var i = 0;i < proData.length; i++) {
                var str = "<th class='xiangmu'>"+proData[i]+"</th>"
                $("#tab-header").append(str)
            }

        // $.ajax({
        //     url:baseurl+'/pms/projectPlan/flowStatus',
        //     type:'GET',
        //     dataType:'JSON',
        //     data:{},
        //     success:function(res){
        //         if(res.code==200){
        //             data=res.data
        //             var headStr = []
        //             for(var i = 0;i<data.length;i++){
        //                 headStr.push(data[i].name)
        //             }
        //             proData = proData.concat(headStr)
        //             // 表头
        //             for(var i = 0;i<proData.length;i++){
        //                 var str = "<th class='xiangmu'>"+proData[i]+"</th>"
        //                 $("#tab-header").append(str)
        //             }
        //         }
        //     },
        //     })
            }
    
/*****************************************************************************************************************************************************************************/
@@ -39,7 +46,8 @@
            type:'GET',
            dataType:'JSON',
            data:{},
            success:function(res){				
            success:function(res){
                console.log(res)
                if(res.code==200){
                    data=res.data
                    // 判断时间是否有null  有null的改为 ""
@@ -73,6 +81,7 @@
                        var str2 = '<tr id="row'+i+'" class="row">'
                            +'<th class="projects">'+data[i].id+'</th>'
                            +'<td class="nor-mal">'+data[i].startDay.substring(0,10)+'</td>'
                            +'<td class="nor-mal">'+data[i].startDay.substring(0,10)+'</td>'
                            +'<td class="nor-mal">'+data[i].endDay.substring(0,10)+'</td>'
                        var str3 =  str2 +str +'</tr>'
                        $('#tab-body').append(str3)