From 03b41fa7164bb7dc5a8bd17a06cfceed43e65617 Mon Sep 17 00:00:00 2001
From: whycq0520 <91384184@qq.com>
Date: 星期四, 24 三月 2022 12:56:44 +0800
Subject: [PATCH] # ycq
---
src/main/webapp/static/js/tableData.js | 55 ++++++++++++++++++++++++++++++++-----------------------
src/main/java/zy/cloud/wms/manager/controller/ProjectPlanController.java | 1 +
src/main/java/zy/cloud/wms/manager/entity/ItemsDTO.java | 1 +
3 files changed, 34 insertions(+), 23 deletions(-)
diff --git a/src/main/java/zy/cloud/wms/manager/controller/ProjectPlanController.java b/src/main/java/zy/cloud/wms/manager/controller/ProjectPlanController.java
index e0baa20..a21352c 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/ProjectPlanController.java
+++ b/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);
diff --git a/src/main/java/zy/cloud/wms/manager/entity/ItemsDTO.java b/src/main/java/zy/cloud/wms/manager/entity/ItemsDTO.java
index 1beaa1f..274a6dd 100644
--- a/src/main/java/zy/cloud/wms/manager/entity/ItemsDTO.java
+++ b/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;
}
diff --git a/src/main/webapp/static/js/tableData.js b/src/main/webapp/static/js/tableData.js
index eab15a0..e08c097 100644
--- a/src/main/webapp/static/js/tableData.js
+++ b/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
// 鍒ゆ柇鏃堕棿鏄惁鏈塶ull 鏈塶ull鐨勬敼涓� ""
@@ -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)
--
Gitblit v1.9.1