mula
/
fourcal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

master
OathK1per 2022-12-12 10:26:43 +08:00
parent 96d377d5ee d9d8bbb8a2
commit a2471198a7
8 changed files with 339 additions and 168 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/cn/palmte/work/controller/backend/ProjectController.java
View File

@ -145,10 +145,10 @@ public class ProjectController extends BaseController {
downloadHeader(httpServletResponse, Utils.generateExcelName("项目报表"), "application/octet-stream"); downloadHeader(httpServletResponse, Utils.generateExcelName("项目报表"), "application/octet-stream");
String[] headers = {"项目编号", "项目名称", "项目类型", "垫资模式", "垫资利息", "垫资峰值", "项目合同金额", "项目毛利", "项目毛利率", "项目把握度", "汇智产品金额", "华智产品金额", String[] headers = {"项目编号", "项目名称", "项目类型", "垫资模式", "垫资利息", "垫资峰值", "项目合同金额", "项目毛利", "项目毛利率", "项目把握度", "汇智产品金额", "华智产品金额",
"华三产品金额", "其他产品金额", "项目状态", "行业场景应用", "解决方案", "客户名称", "最终用户名称", "预计合同签订时间", "项目计划招标时间", "是否二次合作", "直签", "战略合作对象", "华三产品金额", "其他产品金额", "项目状态", "行业场景应用", "解决方案", "客户名称", "最终用户名称", "预计合同签订时间", "项目计划招标时间", "是否二次合作", "直签", "战略合作对象",
"项目负责人", "价值及风险", "主合同收款条款", "主合同具体解决方案", "计收计划", "审核状态", "当前审核人", "项目创建者", "部门名称", "项目开始时间", "项目结束时间", "最后更新时间"}; "项目负责人", "价值及风险", "主合同收款条款", "主合同具体解决方案", "计收计划", "审核状态", "当前审核人", "项目创建者", "部门名称","项目阶段", "项目开始时间", "项目结束时间", "最后更新时间"};
String[] exportColumns = {"projectNo", "name", "typeDesc", "underwrittenModeStr", "advanceInterestAmountRound", "advancePeakAmountRound", "contractRound", "grossProfitRound", "grossProfitMarginRound", "certaintyStr", "huizhiRound", "huazhiRound", String[] exportColumns = {"projectNo", "name", "typeDesc", "underwrittenModeStr", "advanceInterestAmountRound", "advancePeakAmountRound", "contractRound", "grossProfitRound", "grossProfitMarginRound", "certaintyStr", "huizhiRound", "huazhiRound",
"huasanRound", "ziguangRound", "statusDesc", "industryScenario", "resolvePlan", "customer", "terminalCustomer", "contractTime", "bidsTime", "isSecondStr", "signTypeStr", "collaborator", "huasanRound", "ziguangRound", "statusDesc", "industryScenario", "resolvePlan", "customer", "terminalCustomer", "contractTime", "bidsTime", "isSecondStr", "signTypeStr", "collaborator",
"principal", "valueRisk", "mainContractCollectionTerms", "mainContractResolvePlan", "calculationCollection", "approveStatusDesc", "approveName", "creatorName", "deptName", "startDate", "endDate", "lastUpdateTime"}; "principal", "valueRisk", "mainContractCollectionTerms", "mainContractResolvePlan", "calculationCollection", "approveStatusDesc", "approveName", "creatorName", "deptName","stageName", "startDate", "endDate", "lastUpdateTime"};
ExportUtils.exportToExcel(headers, exportColumns, 1, 10000, ExportUtils.exportToExcel(headers, exportColumns, 1, 10000,
httpServletResponse.getOutputStream(), (pN, pS) -> projectService.list(searchInfo, pN, pS).getList()); httpServletResponse.getOutputStream(), (pN, pS) -> projectService.list(searchInfo, pN, pS).getList());
} }
@ -854,7 +854,6 @@ public class ProjectController extends BaseController {
@RequestMapping("/info/{projectId}") @RequestMapping("/info/{projectId}")
public ResponseMsg info(@PathVariable int projectId,Map<String, Object> model) { public ResponseMsg info(@PathVariable int projectId,Map<String, Object> model) {
Project project = projectService.getProject(projectId); Project project = projectService.getProject(projectId);
model.put("info",project);
return ResponseMsg.buildSuccessData(project); return ResponseMsg.buildSuccessData(project);
} }

11
src/main/java/cn/palmte/work/model/Project.java
View File

@ -329,6 +329,9 @@ public class Project {
@Transient @Transient
private String actTaskName; private String actTaskName;
@Transient
private String stageName;
public int getId() { public int getId() {
return id; return id;
} }
@ -1025,4 +1028,12 @@ public class Project {
public void setStageRemark(String stageRemark) { public void setStageRemark(String stageRemark) {
this.stageRemark = stageRemark; this.stageRemark = stageRemark;
} }
public String getStageName() {
return stageName;
}
public void setStageName(String stageName) {
this.stageName = stageName;
}
} }

31
src/main/java/cn/palmte/work/service/ProjectService.java
View File

@ -286,11 +286,42 @@ public class ProjectService {
project.setAdvancePeakAmountRound(project.getAdvancePeakAmountRound2()); project.setAdvancePeakAmountRound(project.getAdvancePeakAmountRound2());
project.setAdvanceInterestAmountRound(project.getAdvanceInterestAmountRound2()); project.setAdvanceInterestAmountRound(project.getAdvanceInterestAmountRound2());
} }
if(null == project.getStage()){
project.setStageName(getStageName(-1));
}else {
project.setStageName(getStageName(project.getStage()));
}
} }
} }
return page; return page;
} }
public String getStageName(int stage){
if(stage == 0){
return "S0-概算立项";
}else if(stage == 1){
return "S1-项目调研";
}else if(stage == 2){
return "S2-方案设计";
}else if(stage == 3){
return "S3-预算评估";
}else if(stage == 4){
return "S4-招标期";
}else if(stage == 5){
return "S5-合同期";
}else if(stage == 6){
return "S6-交付期";
}else if(stage == 7){
return "S7-结算期";
}else if(stage == 8){
return "S8-决算期";
}else if(stage == 9){
return "L-项目丢失";
}else {
return "无项目阶段";
}
}
/** /**
* 找到待我审核项目 * 找到待我审核项目

26
src/main/resources/templates/admin/project_estimate_add.ftl
View File

@ -326,6 +326,32 @@
></textarea> ></textarea>
</td> </td>
</tr> </tr>
<tr class="am-text-nowrap">
<th class="table-title" colspan="1" ><span style="font-size: 15px">项目阶段:</span></th>
<td class="table-title" colspan="1" >
<select data-am-selected="{btnSize: 'sm',btnWidth: '80%',searchBox: 1}" id="stage" name="stage">
<option value="0">S0-概算立项</option>
<option value="1">S1-项目调研</option>
<option value="2">S2-方案设计</option>
<option value="3">S3-预算评估</option>
<option value="4">S4-招标期</option>
<option value="5">S5-合同期</option>
<option value="6">S6-交付期</option>
<option value="7">S7-结算期</option>
<option value="8">S8-决算期</option>
<option value="9">L-项目丢失</option>
</select>
</td>
</tr>
<tr class="am-text-nowrap">
<th class="table-title" colspan="1" ><span style="font-size: 15px">当前进度描述:</span></th>
<td class="table-title" colspan="5" >
<textarea rows="3" cols="20" id="stageRemark" name="stageRemark" maxlength="1000"
class="am-input" style="border-style:none;" data-validate-async data-validation-message="当前进度描述"
placeholder="当前进度描述"
></textarea>
</td>
</tr>
</table> </table>
<#-- <div class="am-tabs-bd">--> <#-- <div class="am-tabs-bd">-->
<#-- <div class="am-tab-panel am-fade am-in" id="tab2">--> <#-- <div class="am-tab-panel am-fade am-in" id="tab2">-->

26
src/main/resources/templates/admin/project_estimate_edit.ftl
View File

@ -371,6 +371,32 @@
>${project.calculationCollection!}</textarea> >${project.calculationCollection!}</textarea>
</td> </td>
</tr> </tr>
<tr class="am-text-nowrap">
<th class="table-title" colspan="1" ><span style="font-size: 15px">项目阶段:</span></th>
<td class="table-title" colspan="1" >
<select data-am-selected="{btnSize: 'sm',btnWidth: '80%',searchBox: 1}" id="stage" name="stage">
<option value="0" <#if project.stage?? && project.stage=0>selected</#if>>S0-概算立项</option>
<option value="1" <#if project.stage?? && project.stage=1>selected</#if>>S1-项目调研</option>
<option value="2" <#if project.stage?? && project.stage=2>selected</#if>>S2-方案设计</option>
<option value="3" <#if project.stage?? && project.stage=3>selected</#if>>S3-预算评估</option>
<option value="4" <#if project.stage?? && project.stage=4>selected</#if>>S4-招标期</option>
<option value="5" <#if project.stage?? && project.stage=5>selected</#if>>S5-合同期</option>
<option value="6" <#if project.stage?? && project.stage=6>selected</#if>>S6-交付期</option>
<option value="7" <#if project.stage?? && project.stage=7>selected</#if>>S7-结算期</option>
<option value="8" <#if project.stage?? && project.stage=8>selected</#if>>S8-决算期</option>
<option value="9" <#if project.stage?? && project.stage=9>selected</#if>>L-项目丢失</option>
</select>
</td>
</tr>
<tr class="am-text-nowrap">
<th class="table-title" colspan="1" ><span style="font-size: 15px">当前进度描述:</span></th>
<td class="table-title" colspan="5" >
<textarea rows="3" cols="20" id="stageRemark" name="stageRemark" maxlength="1000"
class="am-input" style="border-style:none;" data-validate-async data-validation-message="当前进度描述"
placeholder="当前进度描述"
>${project.stageRemark!}</textarea>
</td>
</tr>
</table> </table>
</div> </div>
</div> </div>

83
src/main/resources/templates/admin/project_list.ftl
View File

@ -64,7 +64,6 @@
.fixed-list table tbody tr { .fixed-list table tbody tr {
width: 100%; width: 100%;
} }
</style> </style>
<div class="admin-content"> <div class="admin-content">
@ -299,14 +298,14 @@
</div> </div>
</div> </div>
<div class="st-col expand-section <#if extend='1'> fold</#if>"> <div class="st-col expand-section <#if extend='1'> fold</#if>">
<div class="st-col-title">直签</div> <div class="st-col-title">直签</div>
<div class="st-col-field"> <div class="st-col-field">
<select data-am-selected="{btnSize: 'sm',btnWidth: '100%',maxHeight: 500}" id="signType" name="signType"> <select data-am-selected="{btnSize: 'sm',btnWidth: '100%',maxHeight: 500}" id="signType" name="signType">
<option value="-1">全部</option> <option value="-1">全部</option>
<option value="1" <#if signType?? && signType='1'>selected</#if>>是</option> <option value="1" <#if signType?? && signType='1'>selected</#if>>是</option>
<option value="2" <#if signType?? && signType='2'>selected</#if>>否</option> <option value="2" <#if signType?? && signType='2'>selected</#if>>否</option>
</select> </select>
</div> </div>
</div> </div>
</div> </div>
<!-- 第四行 --> <!-- 第四行 -->
@ -457,18 +456,18 @@
<div class="st-col st-col-4"> <div class="st-col st-col-4">
<div class="st-col-title">项目阶段</div> <div class="st-col-title">项目阶段</div>
<div class="st-col-field"> <div class="st-col-field">
<select data-am-selected="{btnSize: 'sm',btnWidth: '100%',maxHeight: 500,searchBox: 1}" id="qstage" name="qstage"> <select data-am-selected="{btnSize: 'sm',btnWidth: '100%',maxHeight: 500,searchBox: 1}" id="stage" name="stage">
<option value="-1">全部</option> <option value="-1">全部</option>
<option value="0" <#if qstage?? && qstage='0'>selected</#if>>S0-概算立项</option> <option value="0" <#if stage?? && stage='0'>selected</#if>>S0-概算立项</option>
<option value="1" <#if qstage?? && qstage='1'>selected</#if>>S1-项目调研</option> <option value="1" <#if stage?? && stage='1'>selected</#if>>S1-项目调研</option>
<option value="2" <#if qstage?? && qstage='2'>selected</#if>>S2-方案设计</option> <option value="2" <#if stage?? && stage='2'>selected</#if>>S2-方案设计</option>
<option value="3" <#if qstage?? && qstage='3'>selected</#if>>S3-预算评估</option> <option value="3" <#if stage?? && stage='3'>selected</#if>>S3-预算评估</option>
<option value="4" <#if qstage?? && qstage='4'>selected</#if>>S4-招标期</option> <option value="4" <#if stage?? && stage='4'>selected</#if>>S4-招标期</option>
<option value="5" <#if qstage?? && qstage='5'>selected</#if>>S5-合同期</option> <option value="5" <#if stage?? && stage='5'>selected</#if>>S5-合同期</option>
<option value="6" <#if qstage?? && qstage='6'>selected</#if>>S6-交付期</option> <option value="6" <#if stage?? && stage='6'>selected</#if>>S6-交付期</option>
<option value="7" <#if qstage?? && qstage='7'>selected</#if>>S7-结算期</option> <option value="7" <#if stage?? && stage='7'>selected</#if>>S7-结算期</option>
<option value="8" <#if qstage?? && qstage='8'>selected</#if>>S8-决算期</option> <option value="8" <#if stage?? && stage='8'>selected</#if>>S8-决算期</option>
<option value="9" <#if qstage?? && qstage='9'>selected</#if>>L-项目丢失</option> <option value="9" <#if stage?? && stage='9'>selected</#if>>L-项目丢失</option>
</select> </select>
</div> </div>
</div> </div>
@ -794,7 +793,7 @@
} }
</style> </style>
<table class="am-table am-table-striped am-table-hover table-main"> <table class="am-table am-table-striped am-table-hover table-main">
<thead style="display:block;width: 160vw;"> <thead style="display:block;width: 1888px;">
<tr class="am-text-nowrap"> <tr class="am-text-nowrap">
<th width="30px"> <th width="30px">
<input type="checkbox" id="allCheck"> <input type="checkbox" id="allCheck">
@ -832,11 +831,11 @@
<#--<th class="table-title">部门名称</th>--> <#--<th class="table-title">部门名称</th>-->
<#--<th class="table-title">项目周期</th>--> <#--<th class="table-title">项目周期</th>-->
<#--<th class="table-title">最后更新时间</th>--> <#--<th class="table-title">最后更新时间</th>-->
<th class="table-title" width="">操作</th> <th class="table-title" width="240px">操作</th>
</tr> </tr>
</thead> </thead>
<tbody style="display:block;width: 160vw;"> <tbody style="display:block;width: 1888px;">
<#list pager.list as list> <#list pager.list as list>
<tr> <tr>
<td width="30px"> <td width="30px">
@ -920,7 +919,7 @@
<#--最后更新时间--> <#--最后更新时间-->
<#--<td>${(list.lastUpdateTime?string("yyyy-MM-dd HH:mm:ss"))!}</td>--> <#--<td>${(list.lastUpdateTime?string("yyyy-MM-dd HH:mm:ss"))!}</td>-->
<#--操作--> <#--操作-->
<td width=""> <td width="240px">
<div class="am-btn-toolbar"> <div class="am-btn-toolbar">
<div class="am-btn-group am-btn-group-xs"> <div class="am-btn-group am-btn-group-xs">
<#if adminId==1> <#if adminId==1>
@ -1230,17 +1229,17 @@
<span style="color: red;">*</span>项目阶段</div> <span style="color: red;">*</span>项目阶段</div>
<div class="am-u-sm-6 am-u-md-6"> <div class="am-u-sm-6 am-u-md-6">
<select data-am-selected="{btnSize: 'sm',btnWidth: '150px',maxHeight: 300,searchBox: 1}" <select data-am-selected="{btnSize: 'sm',btnWidth: '150px',maxHeight: 300,searchBox: 1}"
id="stage" name="stage"> id="modalStage" name="modalStage">
<option value="0" <#if stage?? && stage='0'>selected</#if>>S0-概算立项</option> <option value="0" >S0-概算立项</option>
<option value="1" <#if stage?? && stage='1'>selected</#if>>S1-项目调研</option> <option value="1" >S1-项目调研</option>
<option value="2" <#if stage?? && stage='2'>selected</#if>>S2-方案设计</option> <option value="2" >S2-方案设计</option>
<option value="3" <#if stage?? && stage='3'>selected</#if>>S3-预算评估</option> <option value="3" >S3-预算评估</option>
<option value="4" <#if stage?? && stage='4'>selected</#if>>S4-招标期</option> <option value="4" >S4-招标期</option>
<option value="5" <#if stage?? && stage='5'>selected</#if>>S5-合同期</option> <option value="5" >S5-合同期</option>
<option value="6" <#if stage?? && stage='6'>selected</#if>>S6-交付期</option> <option value="6" >S6-交付期</option>
<option value="7" <#if stage?? && stage='7'>selected</#if>>S7-结算期</option> <option value="7" >S7-结算期</option>
<option value="8" <#if stage?? && stage='8'>selected</#if>>S8-决算期</option> <option value="8" >S8-决算期</option>
<option value="9" <#if stage?? && stage='9'>selected</#if>>L-项目丢失</option> <option value="9" >L-项目丢失</option>
</select> </select>
</div> </div>
<div class="am-u-sm-3 am-u-md-3 input-msg"></div> <div class="am-u-sm-3 am-u-md-3 input-msg"></div>
@ -1389,8 +1388,8 @@
keywordsObj.otherStart = $("#otherStart").val(); keywordsObj.otherStart = $("#otherStart").val();
if ($("#otherEnd").val()) if ($("#otherEnd").val())
keywordsObj.otherEnd = $("#otherEnd").val(); keywordsObj.otherEnd = $("#otherEnd").val();
if ($("#qstage").val()) if ($("#stage").val())
keywordsObj.stage = $("#qstage").val(); keywordsObj.stage = $("#stage").val();
} }
if ($("#customer").val()) if ($("#customer").val())
keywordsObj.customer = $("#customer").val(); keywordsObj.customer = $("#customer").val();
@ -1418,7 +1417,7 @@
$("#extend").text("扩展筛选项"); $("#extend").text("扩展筛选项");
} else { } else {
$(".extendCondition").show(); $(".extendCondition").show();
$('.expand-section').show() $('.expand-section').show();
$("#extend").val(0); $("#extend").val(0);
$("#extend").text("隐藏筛选项"); $("#extend").text("隐藏筛选项");
} }
@ -1531,6 +1530,8 @@
keywordsObj.otherStart = $("#otherStart").val(); keywordsObj.otherStart = $("#otherStart").val();
if ($("#otherEnd").val()) if ($("#otherEnd").val())
keywordsObj.otherEnd = $("#otherEnd").val(); keywordsObj.otherEnd = $("#otherEnd").val();
if ($("#stage").val())
keywordsObj.stage = $("#stage").val();
} }
if ($("#customer").val()) if ($("#customer").val())
keywordsObj.customer = $("#customer").val(); keywordsObj.customer = $("#customer").val();
@ -1636,8 +1637,7 @@
* 项目阶段更新保存 * 项目阶段更新保存
*/ */
var stageRefreshSave = function () { var stageRefreshSave = function () {
var stage = $("#stage").val(); var stage = $("#modalStage").val();
console.info("=============="+stage);
var stageRemark = $("#stageRemark").val(); var stageRemark = $("#stageRemark").val();
var projectId = $("#stageProjectId").val(); var projectId = $("#stageProjectId").val();
if (stage == '') { if (stage == '') {
@ -1809,7 +1809,8 @@
type: 'post', type: 'post',
async: false, async: false,
success: function (data) { success: function (data) {
$("#stage").val(data.data.stage); $("#modalStage").val(data.data.stage);
$("#modalStage option[value='"+data.data.stage+"']").attr("selected","selected");
$("#stageRemark").val(data.data.stageRemark); $("#stageRemark").val(data.data.stageRemark);
} }
}); });

139
src/main/resources/templates/admin/project_list_approve.ftl
View File

@ -64,7 +64,6 @@
.fixed-list table tbody tr { .fixed-list table tbody tr {
width: 100%; width: 100%;
} }
</style> </style>
<div class="admin-content"> <div class="admin-content">
<div class="am-cf am-padding" style="padding:1rem 1.6rem 1.6rem 1rem;margin:0px;"> <div class="am-cf am-padding" style="padding:1rem 1.6rem 1.6rem 1rem;margin:0px;">
@ -449,6 +448,27 @@
</div> </div>
</div> </div>
</div> </div>
<!-- 第六行 -->
<div class="flex-row st-row">
<div class="st-col st-col-4">
<div class="st-col-title">项目阶段</div>
<div class="st-col-field">
<select data-am-selected="{btnSize: 'sm',btnWidth: '100%',maxHeight: 500,searchBox: 1}" id="stage" name="stage">
<option value="-1">全部</option>
<option value="0" <#if stage?? && stage='0'>selected</#if>>S0-概算立项</option>
<option value="1" <#if stage?? && stage='1'>selected</#if>>S1-项目调研</option>
<option value="2" <#if stage?? && stage='2'>selected</#if>>S2-方案设计</option>
<option value="3" <#if stage?? && stage='3'>selected</#if>>S3-预算评估</option>
<option value="4" <#if stage?? && stage='4'>selected</#if>>S4-招标期</option>
<option value="5" <#if stage?? && stage='5'>selected</#if>>S5-合同期</option>
<option value="6" <#if stage?? && stage='6'>selected</#if>>S6-交付期</option>
<option value="7" <#if stage?? && stage='7'>selected</#if>>S7-结算期</option>
<option value="8" <#if stage?? && stage='8'>selected</#if>>S8-决算期</option>
<option value="9" <#if stage?? && stage='9'>selected</#if>>L-项目丢失</option>
</select>
</div>
</div>
</div>
</div> </div>
<!-- 按钮 --> <!-- 按钮 -->
@ -481,44 +501,45 @@
} }
</style> </style>
<table class="am-table am-table-striped am-table-hover table-main"> <table class="am-table am-table-striped am-table-hover table-main">
<thead style="display:block;width: 4200px;"> <thead style="display:block;width: 1888px;">
<tr class="am-text-nowrap"> <tr class="am-text-nowrap">
<th class="table-title" width="60px">序号</th> <th class="table-title" width="60px">序号</th>
<th class="table-title" width="120px">项目编号</th> <th class="table-title" width="120px">项目编号</th>
<th class="table-title" width="200px">项目名称</th> <th class="table-title" width="200px">项目名称</th>
<th class="table-title">项目类型</th> <th class="table-title">项目类型</th>
<th class="table-title">垫资模式</th> <#--<th class="table-title">垫资模式</th>-->
<th class="table-title">垫资利息</th> <#--<th class="table-title">垫资利息</th>-->
<th class="table-title">垫资峰值</th> <#--<th class="table-title">垫资峰值</th>-->
<th class="table-title">项目合同金额</th> <th class="table-title">项目合同金额</th>
<th class="table-title">项目毛利</th> <th class="table-title">项目阶段</th>
<th class="table-title">项目毛利率</th> <#--<th class="table-title">项目毛利</th>-->
<th class="table-title">项目把握度</th> <#--<th class="table-title">项目毛利率</th>-->
<th class="table-title">汇智产品金额</th> <#--<th class="table-title">项目把握度</th>-->
<th class="table-title">华智产品金额</th> <#-- <th class="table-title">汇智产品金额</th>-->
<th class="table-title">华三产品金额</th> <#--<th class="table-title">华智产品金额</th>-->
<th class="table-title">其他产品金额</th> <#--<th class="table-title">华三产品金额</th>-->
<th class="table-title">项目状态</th> <#--<th class="table-title">其他产品金额</th>-->
<th class="table-title">行业场景应用</th> <#--<th class="table-title">项目状态</th>-->
<th class="table-title">解决方案</th> <#--<th class="table-title">行业场景应用</th>-->
<th class="table-title">客户名称</th> <#--<th class="table-title">解决方案</th>-->
<th class="table-title">最终用户名称</th> <#--<th class="table-title">客户名称</th>-->
<th class="table-title">预计合同签订时间</th> <#--<th class="table-title">最终用户名称</th>-->
<th class="table-title">项目计划招标时间</th> <#--<th class="table-title">预计合同签订时间</th>-->
<th class="table-title">是否二次合作</th> <#--<th class="table-title">项目计划招标时间</th>-->
<th class="table-title">直签</th> <#--<th class="table-title">是否二次合作</th>-->
<th class="table-title">战略合作对象</th> <#--<th class="table-title">直签</th>-->
<th class="table-title">项目负责人</th> <#--<th class="table-title">战略合作对象</th>-->
<th class="table-title">审核状态</th> <#--<th class="table-title">项目负责人</th>-->
<#--<th class="table-title">审核状态</th>-->
<th class="table-title">当前审核人</th> <th class="table-title">当前审核人</th>
<th class="table-title">项目创建者</th> <th class="table-title">项目创建者</th>
<th class="table-title">部门名称</th> <#--<th class="table-title">部门名称</th>-->
<th class="table-title">项目周期</th> <#--<th class="table-title">项目周期</th>-->
<th class="table-title">最后更新时间</th> <#--<th class="table-title">最后更新时间</th>-->
<th class="table-title" width="240px">操作</th> <th class="table-title" width="240px">操作</th>
</tr> </tr>
</thead> </thead>
<tbody style="display:block;width: 4200px;"> <tbody style="display:block;width: 1888px;">
<#list pager.list as list> <#list pager.list as list>
<tr> <tr>
<#--序号--> <#--序号-->
@ -532,63 +553,68 @@
<#--项目类型--> <#--项目类型-->
<td>${list.typeDesc!}</td> <td>${list.typeDesc!}</td>
<#--垫资模式--> <#--垫资模式-->
<td>${list.underwrittenModeStr!}</td> <#--<td>${list.underwrittenModeStr!}</td>-->
<#--垫资利息--> <#--垫资利息-->
<td>${Utils.format(list.advanceInterestAmount, "0.00")}</td> <#--<td>${Utils.format(list.advanceInterestAmount, "0.00")}</td>-->
<#--垫资峰值--> <#--垫资峰值-->
<td>${Utils.format(list.advancePeakAmount, "0.00")}</td> <#--<td>${Utils.format(list.advancePeakAmount, "0.00")}</td>-->
<#--项目合同金额--> <#--项目合同金额-->
<td>${Utils.format(list.contractAmount, "0.00")}</td> <td>${Utils.format(list.contractAmount, "0.00")}</td>
<#--项目阶段-->
<td>
找后端要字段
<#--${Utils.format(list.contractAmount, "0.00")}-->
</td>
<#--项目毛利--> <#--项目毛利-->
<td>${Utils.format(list.grossProfit, "0.00")}</td> <#--<td>${Utils.format(list.grossProfit, "0.00")}</td>-->
<#--项目毛利率--> <#--项目毛利率-->
<td>${Utils.format(list.grossProfitMargin, "0.00")}</td> <#--<td>${Utils.format(list.grossProfitMargin, "0.00")}</td>-->
<#--项目把握度--> <#--项目把握度-->
<td>${list.certaintyStr!}</td> <#--<td>${list.certaintyStr!}</td>-->
<#--汇智产品金额--> <#--汇智产品金额-->
<td>${Utils.format(list.huizhiProductAmount, "0.00")}</td> <#--<td>${Utils.format(list.huizhiProductAmount, "0.00")}</td>-->
<#--华智产品金额--> <#--华智产品金额-->
<td>${Utils.format(list.huazhiProductAmount, "0.00")}</td> <#--<td>${Utils.format(list.huazhiProductAmount, "0.00")}</td>-->
<#--华三产品金额--> <#--华三产品金额-->
<td>${Utils.format(list.huasanProductAmount, "0.00")}</td> <#--<td>${Utils.format(list.huasanProductAmount, "0.00")}</td>-->
<#--其他产品金额--> <#--其他产品金额-->
<td>${Utils.format(list.ziguangOtherAmount, "0.00")}</td> <#--<td>${Utils.format(list.ziguangOtherAmount, "0.00")}</td>-->
<#--项目状态--> <#--项目状态-->
<td>${list.statusDesc!}</td> <#--<td>${list.statusDesc!}</td>-->
<#--行业场景应用--> <#--行业场景应用-->
<td>${list.industryScenario!}</td> <#--<td>${list.industryScenario!}</td>-->
<#--解决方案--> <#--解决方案-->
<td>${list.resolvePlanStr!}</td> <#--<td>${list.resolvePlanStr!}</td>-->
<#--客户名称--> <#--客户名称-->
<td>${list.customer!}</td> <#--<td>${list.customer!}</td>-->
<#--最终用户名称--> <#--最终用户名称-->
<td>${list.terminalCustomer!}</td> <#--<td>${list.terminalCustomer!}</td>-->
<#--预计合同签订时间--> <#--预计合同签订时间-->
<td>${(list.contractTime?string("yyyy-MM-dd"))!}</td> <#--<td>${(list.contractTime?string("yyyy-MM-dd"))!}</td>-->
<#--项目计划招标时间--> <#--项目计划招标时间-->
<td>${(list.bidsTime?string("yyyy-MM-dd"))!}</td> <#--<td>${(list.bidsTime?string("yyyy-MM-dd"))!}</td>-->
<#--是否二次合作--> <#--是否二次合作-->
<td>${list.isSecondStr!}</td> <#--<td>${list.isSecondStr!}</td>-->
<#--直签--> <#--直签-->
<td>${list.signTypeStr!}</td> <#--<td>${list.signTypeStr!}</td>-->
<#--战略合作对象--> <#--战略合作对象-->
<td>${list.collaborator!}</td> <#--<td>${list.collaborator!}</td>-->
<#--项目负责人--> <#--项目负责人-->
<td>${list.principal!}</td> <#--<td>${list.principal!}</td>-->
<#--审核状态--> <#--审核状态-->
<td>${list.approveStatusDesc!}</td> <#--<td>${list.approveStatusDesc!}</td>-->
<#--当前审核人--> <#--当前审核人-->
<td>${list.approveName!}</td> <td>${list.approveName!}</td>
<#--项目创建者--> <#--项目创建者-->
<td>${list.creatorName!}</td> <td>${list.creatorName!}</td>
<#--部门名称--> <#--部门名称-->
<td>${list.deptName!}</td> <#--<td>${list.deptName!}</td>-->
<#--项目周期--> <#--项目周期-->
<td>${(list.startDate?string("yyyy-MM"))!} ~ ${(list.endDate?string("yyyy-MM"))!}</td> <#--<td>${(list.startDate?string("yyyy-MM"))!} ~ ${(list.endDate?string("yyyy-MM"))!}</td>-->
<#--最后更新时间--> <#--最后更新时间-->
<td>${(list.lastUpdateTime?string("yyyy-MM-dd HH:mm:ss"))!}</td> <#--<td>${(list.lastUpdateTime?string("yyyy-MM-dd HH:mm:ss"))!}</td>-->
<#--操作--> <#--操作-->
<td> <td width="240px">
<div class="am-btn-toolbar"> <div class="am-btn-toolbar">
<div class="am-btn-group am-btn-group-xs"> <div class="am-btn-group am-btn-group-xs">
<#--<button type="button" <#--<button type="button"
@ -634,7 +660,6 @@
</div> </div>
</#if> </#if>
</div> </div>
</footer> </footer>
</div> </div>
</@defaultLayout.layout> </@defaultLayout.layout>
@ -733,6 +758,8 @@
keywordsObj.otherStart = $("#otherStart").val(); keywordsObj.otherStart = $("#otherStart").val();
if ($("#otherEnd").val()) if ($("#otherEnd").val())
keywordsObj.otherEnd = $("#otherEnd").val(); keywordsObj.otherEnd = $("#otherEnd").val();
if ($("#stage").val())
keywordsObj.stage = $("#stage").val();
} }
if ($("#customer").val()) if ($("#customer").val())
keywordsObj.customer = $("#customer").val(); keywordsObj.customer = $("#customer").val();

186
src/main/resources/templates/admin/space_list.ftl
View File

@ -191,84 +191,91 @@
</div> </div>
</div> </div>
</div> </div>
<!-- 第二行 --> <!-- 扩展区域 -->
<div class="flex-row st-row"> <div class="expand-section <#if extend!'1' == '1'> fold</#if>">
<div class="st-col"> <!-- 第二行 -->
<div class="st-col-title">项目负责人</div> <div class="flex-row st-row">
<div class="st-col-field"> <div class="st-col">
<input type="text" id="principal" class="am-form-field am-input-sm" value="${principal!}"/> <div class="st-col-title">项目负责人</div>
</div> <div class="st-col-field">
</div> <input type="text" id="principal" class="am-form-field am-input-sm" value="${principal!}"/>
<div class="st-col">
<div class="st-col-title">审核状态</div>
<div class="st-col-field">
<select data-am-selected="{btnSize: 'sm',btnWidth: '100%',maxHeight: 500,searchBox: 1}" id="approveStatus" name="approveStatus">
<option value="-1">全部</option>
<option value="0" <#if approveStatus?? && approveStatus='0'>selected</#if>>草稿</option>
<option value="1" <#if approveStatus?? && approveStatus='1'>selected</#if>>待审核</option>
<option value="2" <#if approveStatus?? && approveStatus='2'>selected</#if>>审核通过</option>
<option value="3" <#if approveStatus?? && approveStatus='3'>selected</#if>>审核不通过</option>
</select>
</div>
</div>
<div class="st-col">
<div class="st-col-title">是否二次合作</div>
<div class="st-col-field">
<select data-am-selected="{btnSize: 'sm',btnWidth: '100%',maxHeight: 500}" id="isSecond" name="isSecond">
<option value="-1">全部</option>
<option value="1" <#if isSecond?? && isSecond='1'>selected</#if>>是</option>
<option value="2" <#if isSecond?? && isSecond='2'>selected</#if>>否</option>
</select>
</div>
</div>
<div class="st-col">
<div class="st-col-title">项目解决方案</div>
<div class="st-col-field">
<select data-am-selected="{btnSize: 'sm',btnWidth: '100%',maxHeight: 500}" id="resolvePlan" name="resolvePlan">
<option value="-1">全部</option>
<option value="1" <#if resolvePlan?? && resolvePlan='1'>selected</#if>>公共服务(智慧交通、雪亮工程、治安防控体系等)</option>
<option value="2" <#if resolvePlan?? && resolvePlan='2'>selected</#if>>泛行业(智慧园区、智慧医疗、智慧工地等)</option>
<option value="3" <#if resolvePlan?? && resolvePlan='3'>selected</#if>>其他生态</option>
</select>
</div>
</div>
</div>
<!-- 第三行 -->
<div class="flex-row st-row">
<div class="st-col st-col-4">
<div class="st-col-title">项目周期</div>
<div class="flex-row st-col-field">
<div class="am-form-icon">
<i class="am-icon-calendar"></i>
<input type="text" class="am-form-field am-input-sm" id="startDate"
value="${startDate!}" placeholder="开始日期" autocomplete="off" data-am-datepicker>
</div> </div>
<div class="mid-connect">至</div> </div>
<div class="am-form-icon"> <div class="st-col">
<i class="am-icon-calendar"></i> <div class="st-col-title">审核状态</div>
<input type="text" class="am-form-field am-input-sm" id="endDate" <div class="st-col-field">
value="${endDate!}" placeholder="结束日期" autocomplete="off" data-am-datepicker> <select data-am-selected="{btnSize: 'sm',btnWidth: '100%',maxHeight: 500,searchBox: 1}" id="approveStatus" name="approveStatus">
<option value="-1">全部</option>
<option value="0" <#if approveStatus?? && approveStatus='0'>selected</#if>>草稿</option>
<option value="1" <#if approveStatus?? && approveStatus='1'>selected</#if>>待审核</option>
<option value="2" <#if approveStatus?? && approveStatus='2'>selected</#if>>审核通过</option>
<option value="3" <#if approveStatus?? && approveStatus='3'>selected</#if>>审核不通过</option>
</select>
</div>
</div>
<div class="st-col">
<div class="st-col-title">是否二次合作</div>
<div class="st-col-field">
<select data-am-selected="{btnSize: 'sm',btnWidth: '100%',maxHeight: 500}" id="isSecond" name="isSecond">
<option value="-1">全部</option>
<option value="1" <#if isSecond?? && isSecond='1'>selected</#if>>是</option>
<option value="2" <#if isSecond?? && isSecond='2'>selected</#if>>否</option>
</select>
</div>
</div>
<div class="st-col">
<div class="st-col-title">项目解决方案</div>
<div class="st-col-field">
<select data-am-selected="{btnSize: 'sm',btnWidth: '100%',maxHeight: 500}" id="resolvePlan" name="resolvePlan">
<option value="-1">全部</option>
<option value="1" <#if resolvePlan?? && resolvePlan='1'>selected</#if>>公共服务(智慧交通、雪亮工程、治安防控体系等)</option>
<option value="2" <#if resolvePlan?? && resolvePlan='2'>selected</#if>>泛行业(智慧园区、智慧医疗、智慧工地等)</option>
<option value="3" <#if resolvePlan?? && resolvePlan='3'>selected</#if>>其他生态</option>
</select>
</div> </div>
</div> </div>
</div> </div>
<div class="st-col st-col-4"> <!-- 第三行 -->
<div class="st-col-title">预计合同签订时间</div> <div class="flex-row st-row">
<div class="flex-row st-col-field"> <div class="st-col st-col-4">
<div class="am-form-icon"> <div class="st-col-title">项目周期</div>
<i class="am-icon-calendar"></i> <div class="flex-row st-col-field">
<input type="text" class="am-form-field am-input-sm" id="contractStartTime" <div class="am-form-icon">
value="${contractStartTime!}" placeholder="开始日期" autocomplete="off" data-am-datepicker> <i class="am-icon-calendar"></i>
<input type="text" class="am-form-field am-input-sm" id="startDate"
value="${startDate!}" placeholder="开始日期" autocomplete="off" data-am-datepicker>
</div>
<div class="mid-connect">至</div>
<div class="am-form-icon">
<i class="am-icon-calendar"></i>
<input type="text" class="am-form-field am-input-sm" id="endDate"
value="${endDate!}" placeholder="结束日期" autocomplete="off" data-am-datepicker>
</div>
</div> </div>
<div class="mid-connect">至</div> </div>
<div class="am-form-icon"> <div class="st-col st-col-4">
<i class="am-icon-calendar"></i> <div class="st-col-title">预计合同签订时间</div>
<input type="text" class="am-form-field am-input-sm" id="contractEndTime" <div class="flex-row st-col-field">
value="${contractEndTime!}" placeholder="结束日期" autocomplete="off" data-am-datepicker> <div class="am-form-icon">
<i class="am-icon-calendar"></i>
<input type="text" class="am-form-field am-input-sm" id="contractStartTime"
value="${contractStartTime!}" placeholder="开始日期" autocomplete="off" data-am-datepicker>
</div>
<div class="mid-connect">至</div>
<div class="am-form-icon">
<i class="am-icon-calendar"></i>
<input type="text" class="am-form-field am-input-sm" id="contractEndTime"
value="${contractEndTime!}" placeholder="结束日期" autocomplete="off" data-am-datepicker>
</div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<div class="flex-row tools-row"> <div class="flex-row tools-row">
<button type="button" class="am-btn am-btn-default am-btn-sm am-text-secondary"
id="extend" value="${extend!}">扩展筛选项
</button>
<button type="button" class="am-btn am-btn-default am-btn-sm am-text-secondary" <button type="button" class="am-btn am-btn-default am-btn-sm am-text-secondary"
id="submit-btn">搜索 id="submit-btn">搜索
</button> </button>
@ -296,6 +303,8 @@
<th class="table-title" width="120px">项目编号</th> <th class="table-title" width="120px">项目编号</th>
<th class="table-title" width="480px">项目名称</th> <th class="table-title" width="480px">项目名称</th>
<th class="table-title">项目类型</th> <th class="table-title">项目类型</th>
<th class="table-title">合作类型</th>
<th class="table-title">项目阶段</th>
<th class="table-title">垫资模式</th> <th class="table-title">垫资模式</th>
<th class="table-title">华智产品金额</th> <th class="table-title">华智产品金额</th>
<th class="table-title">华三产品金额</th> <th class="table-title">华三产品金额</th>
@ -320,34 +329,61 @@
<tbody style="display:block;width: 4200px;"> <tbody style="display:block;width: 4200px;">
<#list pager.list as list> <#list pager.list as list>
<tr> <tr>
<#--序号-->
<td width="60px">${list.tempId!}</td> <td width="60px">${list.tempId!}</td>
<#--项目编号-->
<td class="huanhang" width="120px">${list.projectNo!}</td> <td class="huanhang" width="120px">${list.projectNo!}</td>
<#--项目名称-->
<td class="huanhang" width="480px"><a style="cursor: pointer;text-decoration:none" onclick="approve(${list.id})">${list.name!}</a></td> <td class="huanhang" width="480px"><a style="cursor: pointer;text-decoration:none" onclick="approve(${list.id})">${list.name!}</a></td>
<#--项目类型-->
<td>${list.typeDesc!}</td> <td>${list.typeDesc!}</td>
<#--合作类型-->
<td>${'找后端要字段'!}</td>
<#--项目阶段-->
<td>${'找后端要字段'!}</td>
<#--垫资模式-->
<td>${list.underwrittenModeStr!}</td> <td>${list.underwrittenModeStr!}</td>
<#--华智产品金额-->
<td>${list.huazhiRound!}</td> <td>${list.huazhiRound!}</td>
<#--华三产品金额-->
<td>${list.huasanRound!}</td> <td>${list.huasanRound!}</td>
<#--汇智产品金额-->
<td>${list.huizhiRound!}</td> <td>${list.huizhiRound!}</td>
<#--其他产品金额-->
<td>${list.ziguangRound!}</td> <td>${list.ziguangRound!}</td>
<#-- <td>${Utils.format(list.huazhiProductAmount, "0.00")}</td>--> <#-- <td>${Utils.format(list.huazhiProductAmount, "0.00")}</td>-->
<#-- <td>${Utils.format(list.huasanProductAmount, "0.00")}</td>--> <#-- <td>${Utils.format(list.huasanProductAmount, "0.00")}</td>-->
<#-- <td>${Utils.format(list.huizhiProductAmount, "0.00")}</td>--> <#-- <td>${Utils.format(list.huizhiProductAmount, "0.00")}</td>-->
<#-- <td>${Utils.format(list.ziguangOtherAmount, "0.00")}</td>--> <#-- <td>${Utils.format(list.ziguangOtherAmount, "0.00")}</td>-->
<#--项目把握度-->
<td>${list.certaintyStr!}</td> <td>${list.certaintyStr!}</td>
<#--项目计划招标时间-->
<td>${(list.bidsTime?string("yyyy-MM-dd"))!}</td> <td>${(list.bidsTime?string("yyyy-MM-dd"))!}</td>
<#--预计合同签订时间-->
<td>${(list.contractTime?string("yyyy-MM-dd"))!}</td> <td>${(list.contractTime?string("yyyy-MM-dd"))!}</td>
<#--计收计划-->
<td>${list.calculationCollection!}</td> <td>${list.calculationCollection!}</td>
<#--项目毛利-->
<td>${list.grossProfitRound!}</td> <td>${list.grossProfitRound!}</td>
<#--合同金额-->
<td>${list.contractRound!}</td> <td>${list.contractRound!}</td>
<#-- <td>${Utils.format(list.grossProfit, "0.00")}</td>--> <#-- <td>${Utils.format(list.grossProfit, "0.00")}</td>-->
<#-- <td>${Utils.format(list.contractAmount, "0.00")}</td>--> <#-- <td>${Utils.format(list.contractAmount, "0.00")}</td>-->
<#--项目解决方案-->
<td>${list.resolvePlanStr!}</td> <td>${list.resolvePlanStr!}</td>
<#--具体解决方案-->
<td>${list.mainContractResolvePlan!}</td> <td>${list.mainContractResolvePlan!}</td>
<#--是否二次签单-->
<td>${list.isSecondStr!}</td> <td>${list.isSecondStr!}</td>
<#--最终用户名称-->
<td>${list.terminalCustomer!}</td> <td>${list.terminalCustomer!}</td>
<#--客户名称-->
<td>${list.customer!}</td> <td>${list.customer!}</td>
<#--紫光汇智直接投标/集成商转签-->
<td>${list.signTypeStr!}</td> <td>${list.signTypeStr!}</td>
<#--负责人-->
<td>${list.principal!}</td> <td>${list.principal!}</td>
<#--备注-->
<td>${list.remark!}</td> <td>${list.remark!}</td>
</tr> </tr>
</#list> </#list>
@ -394,6 +430,20 @@
}; };
$(function () { $(function () {
$("#extend").on("click", function () {
var extend = $("#extend").val();
if (extend === '0') {
// $(".extendCondition").hide();
$('.expand-section').hide()
$("#extend").val(1);
$("#extend").text("扩展筛选项");
} else {
// $(".extendCondition").show();
$('.expand-section').show();
$("#extend").val(0);
$("#extend").text("隐藏筛选项");
}
});
$("#submit-btn").on("click", function () { $("#submit-btn").on("click", function () {
$("#pageNumber").val(1); $("#pageNumber").val(1);