待我审核页面与项目列表页同步
OathK1per
parent
840ca47154
commit
211b7fc91a
|
|
@ -511,11 +511,35 @@ public class ProjectController extends BaseController {
|
|||
@RequestParam(value = PAGE_NUMBER, defaultValue = DEFAULT_PAGE_NUMBER) int pageNumber,
|
||||
@RequestParam(value = PAGE_SIZE, defaultValue = DEFAULT_PAGE_SIZE) int pageSize,
|
||||
Map<String, Object> model) {
|
||||
// //当前登录人的角色类型
|
||||
// model.put("keywords", keywords);
|
||||
// model.put("deptList", deptService.findAll());
|
||||
// ConcurrentHashMap<String, String> searchInfo = getSearchInfo(keywords, model);
|
||||
// model.put("pager", projectService.findMyApproveProjects(searchInfo, InterfaceUtil.getAdminId(), pageNumber, pageSize));
|
||||
//当前登录人的角色类型
|
||||
model.put("keywords", keywords);
|
||||
model.put("adminId", InterfaceUtil.getAdminId());
|
||||
model.put("admin", InterfaceUtil.getAdmin());
|
||||
model.put("deptList", deptService.findAll());
|
||||
ConcurrentHashMap<String, String> searchInfo = getSearchInfo(keywords, model);
|
||||
model.put("pager", projectService.findMyApproveProjects(searchInfo, InterfaceUtil.getAdminId(), pageNumber, pageSize));
|
||||
model.putIfAbsent("extend", "0");
|
||||
Page<Project> page = projectService.list(searchInfo, pageNumber, pageSize);
|
||||
List<Project> list = page.getList();
|
||||
if(CollectionUtil.isNotEmpty(list)){
|
||||
|
||||
//查询项目当前审批任务节点
|
||||
for (Project project : list) {
|
||||
Task currentTask = actUtil.getCurrentTask(project.getId());
|
||||
String actTaskName = currentTask == null ? "" : currentTask.getName();
|
||||
project.setActTaskName(actTaskName);
|
||||
}
|
||||
|
||||
int offset = (pageNumber - 1) * pageSize;
|
||||
for (int i = 0 , size = list.size(); i < size; i++) {
|
||||
list.get(i).setTempId(i+1 + offset);
|
||||
}
|
||||
}
|
||||
model.put("pager", page);
|
||||
model.put("Utils", FreeMarkerUtil.fromStaticPackage("cn.palmte.work.utils.Utils"));
|
||||
return "admin/project_list_approve";
|
||||
}
|
||||
|
|
@ -527,8 +551,12 @@ public class ProjectController extends BaseController {
|
|||
public void exportApprove(@RequestParam(value = "keywords", required = false) String keywords, HttpServletResponse httpServletResponse) throws IOException {
|
||||
Map<String, String> searchInfo = getSearchInfo(keywords);
|
||||
downloadHeader(httpServletResponse, Utils.generateExcelName("待我审核项目报表"), "application/octet-stream");
|
||||
String[] headers = {"项目编号", "项目名称", "项目类型", "项目合同金额", "华智产品金额", "其他产品金额", "项目状态", "审核状态", "当前审核人", "项目创建者", "部门名称", "项目开始时间", "项目结束时间", "最后更新时间"};
|
||||
String[] exportColumns = {"projectNo", "name", "typeDesc", "contractRound", "huazhiRound", "ziguangRound", "statusDesc", "approveStatusDesc", "approveName", "creatorName", "deptName", "startDate", "endDate", "lastUpdateTime"};
|
||||
String[] headers = {"项目编号", "项目名称", "项目类型", "垫资模式", "垫资利息", "垫资峰值", "项目合同金额", "项目毛利", "项目毛利率", "项目把握度", "汇智产品金额", "华智产品金额",
|
||||
"华三产品金额", "其他产品金额", "项目状态", "行业场景应用", "解决方案", "客户名称", "终端客户名称", "预计合同签订时间", "项目计划招标时间", "是否二次合作", "签单方式", "合作对象",
|
||||
"项目负责人", "价值及风险", "主合同收款条款", "主合同具体解决方案", "计收计划", "审核状态", "当前审核人", "项目创建者", "部门名称", "项目开始时间", "项目结束时间", "最后更新时间"};
|
||||
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",
|
||||
"principal", "valueRisk", "mainContractCollectionTerms", "mainContractResolvePlan", "calculationCollection", "approveStatusDesc", "approveName", "creatorName", "deptName", "startDateYM", "endDateYM", "lastUpdateTime"};
|
||||
ExportUtils.exportToExcel(headers, exportColumns, 1, 10000,
|
||||
httpServletResponse.getOutputStream(), (pN, pS) -> projectService.findMyApproveProjects(searchInfo, InterfaceUtil.getAdminId(), pN, pS).getList());
|
||||
}
|
||||
|
|
|
|||
|
|
@ -23,53 +23,24 @@
|
|||
<table class="am-table am-table-bordered am-table-radius table-main" style="padding:0;">
|
||||
<tbody>
|
||||
<tr>
|
||||
<th class="am-text-middle">项目名称</th>
|
||||
<td>
|
||||
<th class="am-text-middle" style="width: 10%">项目编号</th>
|
||||
<td style="width: 15%">
|
||||
<div class="am-u-sm-10">
|
||||
<input type="text" id="projectNo" class="am-form-field am-input-sm"
|
||||
value="${projectNo!}"/>
|
||||
</div>
|
||||
</td>
|
||||
<th class="am-text-middle" style="width: 10%">项目名称</th>
|
||||
<td style="width: 15%">
|
||||
<div class="am-u-sm-10">
|
||||
<input type="text" id="name" class="am-form-field am-input-sm"
|
||||
value="${name!}"/>
|
||||
</div>
|
||||
</td>
|
||||
<th class="am-text-middle">项目创建者</th>
|
||||
<td>
|
||||
<th class="am-text-middle" style="width: 10%">项目状态</th>
|
||||
<td style="width: 15%">
|
||||
<div class="am-u-sm-10">
|
||||
<input type="text" id="creatorName" class="am-form-field am-input-sm"
|
||||
value="${creatorName!}"/>
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<th class="am-text-middle">项目类型</th>
|
||||
<td>
|
||||
<div class="am-u-sm-10">
|
||||
<select data-am-selected id="type" name="type">
|
||||
<option value="-1">全部</option>
|
||||
<option value="1" <#if type?? && type='1'>selected</#if>>工程集成类</option>
|
||||
<option value="2" <#if type?? && type='2'>selected</#if>>设备集成类</option>
|
||||
<option value="3" <#if type?? && type='3'>selected</#if>>战略合作类</option>
|
||||
</select>
|
||||
</div>
|
||||
</td>
|
||||
<th class="am-text-middle">部门名称</th>
|
||||
<td>
|
||||
<div class="am-u-sm-10">
|
||||
<select data-am-selected id="deptId" name="deptId">
|
||||
<option value="-1">全部</option>
|
||||
<#list deptList as dept>
|
||||
<option value=${dept.id!} <#if deptId! =="${dept.id}" >
|
||||
selected
|
||||
</#if>>${dept.name!}</option>
|
||||
</#list>
|
||||
</select>
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th class="am-text-middle">项目状态</th>
|
||||
<td>
|
||||
<div class="am-u-sm-10">
|
||||
<select data-am-selected id="status" name="status">
|
||||
<select data-am-selected="{btnSize: 'sm',btnWidth: '150px',maxHeight: 500,searchBox: 1}" id="status" name="status">
|
||||
<option value="-1">全部</option>
|
||||
<option value="1" <#if status?? && status='1'>selected</#if>>项目创建(概算)</option>
|
||||
<option value="5" <#if status?? && status='5'>selected</#if>>预算</option>
|
||||
|
|
@ -78,73 +49,216 @@
|
|||
</select>
|
||||
</div>
|
||||
</td>
|
||||
<th class="am-text-middle">审核状态</th>
|
||||
<td>
|
||||
<th class="am-text-middle" style="width: 10%">项目创建者</th>
|
||||
<td style="width: 15%">
|
||||
<div class="am-u-sm-10">
|
||||
<select data-am-selected id="approveStatus" name="approveStatus">
|
||||
<input type="text" id="creatorName" class="am-form-field am-input-sm"
|
||||
value="${creatorName!}"/>
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<th class="am-text-middle" style="width: 10%">部门名称</th>
|
||||
<td style="width: 15%">
|
||||
<div class="am-u-sm-10">
|
||||
<select data-am-selected="{btnSize: 'sm',btnWidth: '150px',maxHeight: 500,searchBox: 1}" id="deptId" name="deptId">
|
||||
<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>-->
|
||||
<#list deptList as dept>
|
||||
<option value=${dept.id!} <#if deptId! =="${dept.id}" >
|
||||
selected
|
||||
</#if>>${dept.name!}</option>
|
||||
</#list>
|
||||
</select>
|
||||
</div>
|
||||
</td>
|
||||
<th class="am-text-middle" style="width: 10%">项目类型</th>
|
||||
<td style="width: 15%">
|
||||
<div class="am-u-sm-10">
|
||||
<select data-am-selected="{btnSize: 'sm',btnWidth: '150px',maxHeight: 500,searchBox: 1}" id="type" name="type">
|
||||
<option value="-1">全部</option>
|
||||
<option value="1" <#if type?? && type='1'>selected</#if>>工程集成类</option>
|
||||
<option value="2" <#if type?? && type='2'>selected</#if>>设备集成类</option>
|
||||
<option value="3" <#if type?? && type='3'>selected</#if>>战略合作类</option>
|
||||
</select>
|
||||
</div>
|
||||
</td>
|
||||
<th class="am-text-middle" style="width: 10%">垫资模式</th>
|
||||
<td style="width: 15%">
|
||||
<div class="am-u-sm-10">
|
||||
<select data-am-selected="{btnSize: 'sm',btnWidth: '150px',maxHeight: 500,searchBox: 1}" id="underwrittenMode" name="underwrittenMode">
|
||||
<option value="-1">全部</option>
|
||||
<option value="1" <#if underwrittenMode?? && underwrittenMode='1'>selected</#if>>A类-不垫资（战略合作）</option>
|
||||
<option value="2" <#if underwrittenMode?? && underwrittenMode='2'>selected</#if>>B类-不垫资（背靠背）</option>
|
||||
<option value="3" <#if underwrittenMode?? && underwrittenMode='3'>selected</#if>>C类-垫资（账期覆盖）</option>
|
||||
<option value="4" <#if underwrittenMode?? && underwrittenMode='4'>selected</#if>>D类-垫资（账期不覆盖）</option>
|
||||
</select>
|
||||
</div>
|
||||
</td>
|
||||
<th class="am-text-middle" style="width: 10%">项目把握度</th>
|
||||
<td style="width: 15%">
|
||||
<div class="am-u-sm-10">
|
||||
<select data-am-selected="{btnSize: 'sm',btnWidth: '150px',maxHeight: 500,searchBox: 1}" id="certainty" name="certainty">
|
||||
<option value="-1">全部</option>
|
||||
<option value="1" <#if certainty?? && certainty='1'>selected</#if>>A：基本确定中标，待签合同，合同签订中</option>
|
||||
<option value="2" <#if certainty?? && certainty='2'>selected</#if>>B：客户产品参数、商务评分、商务资质引导成功</option>
|
||||
<option value="3" <#if certainty?? && certainty='3'>selected</#if>>C：项目初期引导阶段</option>
|
||||
</select>
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<th class="am-text-middle">项目周期</th>
|
||||
<td>
|
||||
<th class="am-text-middle" style="width: 10%">客户名称</th>
|
||||
<td style="width: 15%">
|
||||
<div class="am-u-sm-10">
|
||||
<div class="am-form am-form-inline">
|
||||
<div class="am-form-group am-form-icon">
|
||||
<i class="am-icon-calendar"></i>
|
||||
<input type="text" class="am-form-field am-input-sm" id="startDate"
|
||||
value="${startDate!}" autocomplete="off"
|
||||
placeholder="开始日期" data-am-datepicker>
|
||||
</div>
|
||||
<div class="am-form-group">至</div>
|
||||
<div class="am-form-group am-form-icon">
|
||||
<i class="am-icon-calendar"></i>
|
||||
<input type="text" class="am-form-field am-input-sm" id="endDate"
|
||||
value="${endDate!}" autocomplete="off"
|
||||
placeholder="结束日期" data-am-datepicker>
|
||||
</div>
|
||||
</div>
|
||||
<input type="text" id="customer" class="am-form-field am-input-sm"
|
||||
value="${customer!}"/>
|
||||
</div>
|
||||
</td>
|
||||
<th class="am-text-middle">最后更新时间</th>
|
||||
<td>
|
||||
<th class="am-text-middle" style="width: 10%">终端客户名称</th>
|
||||
<td style="width: 15%">
|
||||
<div class="am-u-sm-10">
|
||||
<input type="text" id="terminalCustomer" class="am-form-field am-input-sm"
|
||||
value="${terminalCustomer!}"/>
|
||||
</div>
|
||||
</td>
|
||||
<th class="am-text-middle" style="width: 10%">项目负责人</th>
|
||||
<td style="width: 15%">
|
||||
<div class="am-u-sm-10">
|
||||
<input type="text" id="principal" class="am-form-field am-input-sm"
|
||||
value="${principal!}"/>
|
||||
</div>
|
||||
</td>
|
||||
<th class="am-text-middle" style="width: 10%">审核状态</th>
|
||||
<td style="width: 15%">
|
||||
<div class="am-u-sm-10">
|
||||
<select data-am-selected="{btnSize: 'sm',btnWidth: '150px',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>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
<tr class="extendCondition" <#if extend='1'> hidden</#if>>
|
||||
<th class="am-text-middle" style="width: 10%">是否二次合作</th>
|
||||
<td style="width: 15%">
|
||||
<div class="am-u-sm-10">
|
||||
<select data-am-selected="{btnSize: 'sm',btnWidth: '150px',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>
|
||||
</td>
|
||||
<th class="am-text-middle" style="width: 10%">签单方式</th>
|
||||
<td style="width: 15%">
|
||||
<div class="am-u-sm-10">
|
||||
<select data-am-selected="{btnSize: 'sm',btnWidth: '150px',maxHeight: 500}" id="signType" name="signType">
|
||||
<option value="-1">全部</option>
|
||||
<option value="1" <#if signType?? && signType='1'>selected</#if>>紫光汇智直接投标</option>
|
||||
</select>
|
||||
</div>
|
||||
</td>
|
||||
<th class="am-text-middle" style="width: 10%">行业场景</th>
|
||||
<td style="width: 15%">
|
||||
<div class="am-u-sm-10">
|
||||
<input type="text" id="industryScenario" class="am-form-field am-input-sm"
|
||||
value="${industryScenario!}"/>
|
||||
</div>
|
||||
</td>
|
||||
<th class="am-text-middle" style="width: 10%">项目解决方案</th>
|
||||
<td style="width: 15%">
|
||||
<div class="am-u-sm-10">
|
||||
<select data-am-selected="{btnSize: 'sm',btnWidth: '150px',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>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
<tr class="extendCondition" <#if extend='1'> hidden</#if>>
|
||||
<th class="am-text-middle" style="width: 10%">最后更新时间</th>
|
||||
<td style="width: 15%">
|
||||
<div class="am-u-sm-10">
|
||||
<div class="am-form am-form-inline">
|
||||
<div class="am-form-group am-form-icon">
|
||||
<i class="am-icon-calendar"></i>
|
||||
<input type="text" class="am-form-field am-input-sm" id="startUpdateDate"
|
||||
value="${startUpdateDate!}"autocomplete="off"
|
||||
placeholder="开始日期" data-am-datepicker>
|
||||
value="${startUpdateDate!}" placeholder="开始日期" autocomplete="off" data-am-datepicker>
|
||||
</div>
|
||||
<div class="am-form-group">至</div>
|
||||
<div class="am-form-group am-form-icon">
|
||||
<i class="am-icon-calendar"></i>
|
||||
<input type="text" class="am-form-field am-input-sm" id="endUpdateDate"
|
||||
value="${endUpdateDate!}" autocomplete="off"
|
||||
placeholder="结束日期" data-am-datepicker>
|
||||
value="${endUpdateDate!}" placeholder="结束日期" autocomplete="off" data-am-datepicker>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</td>
|
||||
<th class="am-text-middle" style="width: 10%">项目周期</th>
|
||||
<td style="width: 15%">
|
||||
<div class="am-u-sm-10">
|
||||
<div class="am-form am-form-inline">
|
||||
<div class="am-form-group 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 class="am-form-group">至</div>
|
||||
<div class="am-form-group 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>
|
||||
</td>
|
||||
<th class="am-text-middle" style="width: 10%">预计合同签订时间</th>
|
||||
<td style="width: 15%">
|
||||
<div class="am-u-sm-10">
|
||||
<div class="am-form am-form-inline">
|
||||
<div class="am-form-group 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="am-form-group">至</div>
|
||||
<div class="am-form-group 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>
|
||||
</td>
|
||||
<th class="am-text-middle" style="width: 10%"></th>
|
||||
<td style="width: 15%">
|
||||
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td colspan="4">
|
||||
<td colspan="8">
|
||||
<div align='right'>
|
||||
<@shiro.hasPermission name="APPROVE_QUERY">
|
||||
<button type="button" class="am-btn am-btn-default am-btn-sm am-text-secondary"
|
||||
id="submit-btn">搜索
|
||||
id="extend" value="${extend!}">隐藏筛选项
|
||||
</button>
|
||||
<@shiro.hasPermission name="APPROVE_QUERY">
|
||||
<button type="button" class="am-btn am-btn-default am-btn-sm am-text-secondary"
|
||||
id="submit-btn">搜索
|
||||
</button>
|
||||
</@shiro.hasPermission>
|
||||
<@shiro.hasPermission name="APPROVE_EXPORT">
|
||||
<button type="button" class="am-btn am-btn-default am-btn-sm am-text-secondary"
|
||||
id="submit-btn-export">导出
|
||||
</button>
|
||||
<button type="button" class="am-btn am-btn-default am-btn-sm am-text-secondary"
|
||||
id="submit-btn-export">导出
|
||||
</button>
|
||||
</@shiro.hasPermission>
|
||||
</div>
|
||||
</td>
|
||||
|
|
@ -177,10 +291,28 @@
|
|||
<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>
|
||||
|
|
@ -191,22 +323,40 @@
|
|||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<#list pager.list as list>
|
||||
<#list pager.list as list>
|
||||
<tr>
|
||||
<td>${list.id!}</td>
|
||||
<td>${list.projectNo!}</td>
|
||||
<td>${list.tempId!}</td>
|
||||
<td class="huanhang">${list.projectNo!}</td>
|
||||
<td class="huanhang"><a style="cursor: pointer;text-decoration:none" onclick="location.href='${base}/project/approve?listFrom=list&type=1&id=${list.id}'">${list.name!}</a></td>
|
||||
<td>${list.typeDesc!}</td>
|
||||
<td>${list.underwrittenModeStr!}</td>
|
||||
<td>${Utils.format(list.advanceInterestAmount, "0.00")}</td>
|
||||
<td>${Utils.format(list.advancePeakAmount, "0.00")}</td>
|
||||
<td>${Utils.format(list.contractAmount, "0.00")}</td>
|
||||
<td>${Utils.format(list.grossProfit, "0.00")}</td>
|
||||
<td>${Utils.format(list.grossProfitMargin, "0.00")}</td>
|
||||
<td>${list.certaintyStr!}</td>
|
||||
<td>${Utils.format(list.huizhiProductAmount, "0.00")}</td>
|
||||
<td>${Utils.format(list.huazhiProductAmount, "0.00")}</td>
|
||||
<td>${Utils.format(list.huasanProductAmount, "0.00")}</td>
|
||||
<td>${Utils.format(list.ziguangOtherAmount, "0.00")}</td>
|
||||
<td>${list.statusDesc!}</td>
|
||||
<td>${list.industryScenario!}</td>
|
||||
<td>${list.resolvePlanStr!}</td>
|
||||
<td>${list.customer!}</td>
|
||||
<td>${list.terminalCustomer!}</td>
|
||||
<td>${(list.contractTime?string("yyyy-MM-dd HH:mm:ss"))!}</td>
|
||||
<td>${(list.bidsTime?string("yyyy-MM-dd HH:mm:ss"))!}</td>
|
||||
<td>${list.isSecondStr!}</td>
|
||||
<td>${list.signTypeStr!}</td>
|
||||
<td>${list.collaborator!}</td>
|
||||
<td>${list.principal!}</td>
|
||||
<td>${list.approveStatusDesc!}</td>
|
||||
<td>${list.approveName!}</td>
|
||||
<td>${list.creatorName!}</td>
|
||||
<td>${list.deptName!}</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.startDate?string("yyyy-MM"))!} ~ ${(list.endDate?string("yyyy-MM"))!}</td>
|
||||
<td>${(list.lastUpdateTime?string("yyyy-MM-dd HH:mm:ss"))!}</td>
|
||||
<td>
|
||||
<div class="am-btn-toolbar">
|
||||
<div class="am-btn-group am-btn-group-xs">
|
||||
|
|
@ -263,22 +413,39 @@
|
|||
<script type="text/javascript">
|
||||
$(function () {
|
||||
|
||||
$("#extend").on("click", function () {
|
||||
var extend = $("#extend").val();
|
||||
if (extend === '0') {
|
||||
$(".extendCondition").hide();
|
||||
$("#extend").val(1);
|
||||
$("#extend").text("扩展筛选项");
|
||||
} else {
|
||||
$(".extendCondition").show();
|
||||
$("#extend").val(0);
|
||||
$("#extend").text("隐藏筛选项");
|
||||
}
|
||||
});
|
||||
|
||||
$("#submit-btn").on("click", function () {
|
||||
$("#pageNumber").val(1);
|
||||
setKeywords();
|
||||
$("#listForm").attr("action","${base}/project/listApprove");
|
||||
$("#listForm").attr("action","${base}/project/list");
|
||||
$("#listForm").submit();
|
||||
});
|
||||
|
||||
$("#submit-btn-export").on("click", function () {
|
||||
setKeywords();
|
||||
$("#listForm").attr("action","${base}/project/exportApprove");
|
||||
$("#listForm").attr("action","${base}/project/export");
|
||||
$("#listForm").submit();
|
||||
});
|
||||
|
||||
|
||||
function setKeywords() {
|
||||
var keywordsObj = {};
|
||||
var extend = $("#extend").val();
|
||||
keywordsObj.extend = extend;
|
||||
if ($("#projectNo").val())
|
||||
keywordsObj.projectNo = $("#projectNo").val();
|
||||
if ($("#name").val())
|
||||
keywordsObj.name = $("#name").val();
|
||||
if ($("#creatorName").val())
|
||||
|
|
@ -291,14 +458,38 @@
|
|||
keywordsObj.deptId = $("#deptId").val();
|
||||
if ($("#type").val())
|
||||
keywordsObj.type = $("#type").val();
|
||||
if ($("#startDate").val())
|
||||
keywordsObj.startDate = $("#startDate").val();
|
||||
if ($("#endDate").val())
|
||||
keywordsObj.endDate = $("#endDate").val();
|
||||
if ($("#startUpdateDate").val())
|
||||
keywordsObj.startUpdateDate = $("#startUpdateDate").val();
|
||||
if ($("#endUpdateDate").val())
|
||||
keywordsObj.endUpdateDate = $("#endUpdateDate").val();
|
||||
if ($("#underwrittenMode").val())
|
||||
keywordsObj.underwrittenMode = $("#underwrittenMode").val();
|
||||
if ($("#certainty").val())
|
||||
keywordsObj.certainty = $("#certainty").val();
|
||||
if (extend === '0') {
|
||||
if ($("#isSecond").val())
|
||||
keywordsObj.isSecond = $("#isSecond").val();
|
||||
if ($("#signType").val())
|
||||
keywordsObj.signType = $("#signType").val();
|
||||
if ($("#resolvePlan").val())
|
||||
keywordsObj.resolvePlan = $("#resolvePlan").val();
|
||||
if ($("#startDate").val())
|
||||
keywordsObj.startDate = $("#startDate").val();
|
||||
if ($("#endDate").val())
|
||||
keywordsObj.endDate = $("#endDate").val();
|
||||
if ($("#startUpdateDate").val())
|
||||
keywordsObj.startUpdateDate = $("#startUpdateDate").val();
|
||||
if ($("#endUpdateDate").val())
|
||||
keywordsObj.endUpdateDate = $("#endUpdateDate").val();
|
||||
if ($("#contractStartTime").val())
|
||||
keywordsObj.contractStartTime = $("#contractStartTime").val();
|
||||
if ($("#contractEndTime").val())
|
||||
keywordsObj.contractEndTime = $("#contractEndTime").val();
|
||||
if ($("#industryScenario").val())
|
||||
keywordsObj.industryScenario = $("#industryScenario").val();
|
||||
}
|
||||
if ($("#customer").val())
|
||||
keywordsObj.customer = $("#customer").val();
|
||||
if ($("#terminalCustomer").val())
|
||||
keywordsObj.terminalCustomer = $("#terminalCustomer").val();
|
||||
if ($("#principal").val())
|
||||
keywordsObj.principal = $("#principal").val();
|
||||
var keywords = "";
|
||||
if (!$.isEmptyObject(keywordsObj)) {
|
||||
keywords = JSON.stringify(keywordsObj);
|
||||
|
|
@ -308,7 +499,6 @@
|
|||
$("#keywords").val(keywords);
|
||||
}
|
||||
|
||||
|
||||
});
|
||||
|
||||
</script>
|
||||
|
|
|
|||
Loading…
Reference in New Issue