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

修改预算显示

master
OathK1per 2022-11-15 09:55:00 +08:00
parent 2eac86bee7
commit 37c46a749a
16 changed files with 174 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -196,7 +196,7 @@ public class ProjectController extends BaseController {
}
String[] headers2 = {"序号", "类别", "名称", "单位", "数量", "单价", "税率(%)", "含税总金额(元)", "不含税金额(元)", "税金(元)"};
String[] columns2 = {"tempId", "type", "name", "unit", "amount", "price", "taxRate", "totalTaxInclude", "totalTaxExclude", "totalTax"};
exportExcelUtils.exportIncomeDetailExcel(headers2, columns2, project, budgetBean, budgetIncomeDetail, incomeTotalAmount, "yyyy-MM-dd", 0, "收入明细表", outputStream);
exportExcelUtils.exportIncomeDetailExcel(headers2, columns2, project, budgetBean, budgetIncomeDetail, incomeTotalAmount, "yyyy-MM-dd", 0, "收款明细表", outputStream);
//收入计划
List<ProjectBudgetIncomePlanDetail> budgetIncomePlanDetail = projectBudgetService.getBudgetIncomePlanDetail(project);
BigDecimal incomePlanTotalReceiveAmount = projectBudgetService.getBudgetIncomePlanReceiveAmount(project);
@ -1047,7 +1047,7 @@ public class ProjectController extends BaseController {
public void incomeTemplate(HttpServletResponse response) throws Exception{
String[] headers = new String[]{"类别", "名称", "单位", "数量", "单价", "税率(%)"};
downloadHeader(response , Utils.generateExcelName("收入明细表批量导入模板"));
downloadHeader(response , Utils.generateExcelName("收款明细表批量导入模板"));
ExportUtils exportUtils = new ExportUtils(headers);
exportUtils.write(response.getOutputStream());
}
@ -1155,7 +1155,7 @@ public class ProjectController extends BaseController {
@RequestMapping("/incomeExport")
public void incomeExport(HttpServletResponse response, @RequestParam int id) throws Exception{
Project project = projectService.findById(id);
response.setHeader("Content-Disposition", "attachment;filename=".concat(new String((Utils.generateExcelName(project.getName() + "-收入明细表")).getBytes(), StandardCharsets.ISO_8859_1)));
response.setHeader("Content-Disposition", "attachment;filename=".concat(new String((Utils.generateExcelName(project.getName() + "-收款明细表")).getBytes(), StandardCharsets.ISO_8859_1)));
response.setHeader("Connection", "close");
response.setHeader("Content-Type", "application/vnd.ms-excel");
ServletOutputStream outputStream = response.getOutputStream();
@ -1166,7 +1166,7 @@ public class ProjectController extends BaseController {
BigDecimal incomeTotalAmount = projectBudgetService.getBudgetIncomeAmount(project);
String[] headers2 = {"序号", "类别", "名称", "单位", "数量", "单价", "税率(%)", "含税总金额(元)", "不含税金额(元)", "税金(元)"};
String[] columns2 = {"tempId", "type", "name", "unit", "amount", "price", "taxRate", "totalTaxInclude", "totalTaxExclude", "totalTax"};
exportExcelUtils.exportIncomeDetailExcel(headers2, columns2, project, budgetBean, budgetIncomeDetail, incomeTotalAmount, "yyyy-MM-dd", 0, "收入明细表", outputStream);
exportExcelUtils.exportIncomeDetailExcel(headers2, columns2, project, budgetBean, budgetIncomeDetail, incomeTotalAmount, "yyyy-MM-dd", 0, "收款明细表", outputStream);
exportExcelUtils.end(outputStream);
}

2
src/main/java/cn/palmte/work/model/ProjectBudgetIncomeDetail.java
View File

@ -3,7 +3,7 @@ package cn.palmte.work.model;
import javax.persistence.*;
/**
* 项目预算收入明细表
* 项目预算收款明细表
*/
@Entity
@Table(name = "project_budget_income_detail")

2
src/main/java/cn/palmte/work/model/ProjectBudgetIncomePlanDetail.java
View File

@ -4,7 +4,7 @@ import javax.persistence.Entity;
import javax.persistence.Table;
/**
* 项目预算收入明细表
* 项目预算收款明细表
*/
@Entity
@Table(name = "project_budget_income_plan_detail")

2
src/main/java/cn/palmte/work/model/ProjectBudgetIncomePlanDetailTemp.java
View File

@ -4,7 +4,7 @@ import javax.persistence.Entity;
import javax.persistence.Table;
/**
* 项目预算收入明细表
* 项目预算收款明细表
*/
@Entity
@Table(name = "project_budget_income_plan_detail_temp")

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

@ -101,7 +101,9 @@ public class ProjectService {
if(StrUtil.isNotEmpty(searchInfo.get("underwrittenMode")) && !"-1".equals(searchInfo.get("underwrittenMode"))){
queryHelper.addCondition("p.underwritten_mode=?", Integer.parseInt(searchInfo.get("underwrittenMode")));
}
if(StrUtil.isNotEmpty(searchInfo.get("certainty")) && !"-1".equals(searchInfo.get("certainty"))){
queryHelper.addCondition("p.certainty=?", Integer.parseInt(searchInfo.get("certainty")));
}
if(StrUtil.isNotEmpty(searchInfo.get("estimateStatus")) && !"-1".equals(searchInfo.get("estimateStatus"))){
queryHelper.addCondition("p.approve_status_estimate>=1 and p.approve_status_estimate<=2");
}

28
src/main/java/cn/palmte/work/service/SpaceService.java
View File

@ -15,6 +15,7 @@ import top.jfunc.common.db.QueryHelper;
import top.jfunc.common.db.bean.Page;
import top.jfunc.common.db.bean.Record;
import top.jfunc.common.db.utils.Pagination;
import top.jfunc.common.utils.CollectionUtil;
import top.jfunc.common.utils.StrUtil;
import java.util.List;
@ -34,12 +35,33 @@ public class SpaceService {
public Page<Project> list(Map<String, String> searchInfo, int pageNumber, int pageSize){
QueryHelper queryHelper = getQueryHelper(searchInfo);
return pagination.paginate(queryHelper.getSql(), Project.class,pageNumber,pageSize);
Page<Project> page = pagination.paginate(queryHelper.getSql(), Project.class, pageNumber, pageSize);
List<Project> list = page.getList();
if(CollectionUtil.isNotEmpty(list)) {
//查询项目当前审批任务节点
for (Project project : list) {
if (project.getApproveStatusBudget() > -1 && project.getIsBudget() == 1) {
project.setContractRound(project.getContractRound2());
project.setHuizhiRound(project.getHuizhiRound2());
project.setHuazhiRound(project.getHuazhiRound2());
project.setHuasanRound(project.getHuasanRound2());
project.setZiguangRound(project.getZiguangRound2());
project.setGrossProfitRound(project.getGrossProfitRound2());
project.setGrossProfitMarginRound(project.getGrossProfitMarginRound2());
project.setAdvancePeakAmountRound(project.getAdvancePeakAmountRound2());
project.setAdvanceInterestAmountRound(project.getAdvanceInterestAmountRound2());
}
}
}
return page;
}
private QueryHelper getQueryHelper(Map<String, String> searchInfo) {
QueryHelper queryHelper = new QueryHelper("SELECT p.*, FORMAT(p.contract_amount,2) as contractRound, FORMAT(p.huazhi_product_amount,2) as huazhiRound, FORMAT(p.huizhi_product_amount,2) as huizhiRound, FORMAT(p.huasan_product_amount,2) as huasanRound, FORMAT(p.ziguang_other_amount,2) as ziguangRound" +
", FORMAT(p.gross_profit,2) as grossProfitRound, '' as remark","project","p");
", FORMAT(p.gross_profit,2) as grossProfitRound, FORMAT(p.gross_profit_margin,2) as grossProfitMarginRound, FORMAT(p.advance_interest_amount,2) as advanceInterestAmountRound, FORMAT(p.advance_peak_amount,2) as advancePeakAmountRound, pe.is_budget as isBudget" +
", FORMAT(pe.contract_amount,2) as contractRound2, FORMAT(pe.huazhi_product_amount,2) as huazhiRound2, FORMAT(pe.huizhi_product_amount,2) as huizhiRound2, FORMAT(pe.huasan_product_amount,2) as huasanRound2, FORMAT(pe.ziguang_other_amount,2) as ziguangRound2" +
", FORMAT(pe.gross_profit,2) as grossProfitRound2, FORMAT(pe.gross_profit_margin,2) as grossProfitMarginRound2, FORMAT(pe.advance_interest_amount,2) as advanceInterestAmountRound2, FORMAT(pe.advance_peak_amount,2) as advancePeakAmountRound2","project","p");
queryHelper.leftJoin("project_extend pe", "p.id = pe.project_id and pe.is_budget = 1");
queryHelper.addCondition(StrUtil.isNotEmpty(searchInfo.get("name")),"p.name LIKE ?", "%"+searchInfo.get("name")+"%");
@ -123,7 +145,7 @@ public class SpaceService {
String sql = "SELECT count(id) as sum, certainty, certainty_str as name FROM project WHERE approve_status_estimate >= 1 and approve_status_estimate <= 2 and dept_name = '销售管理部' GROUP BY certainty";
List<Record> pie = pagination.find(sql);
String sql2 = "SELECT sum(IFNULL(contract_amount,0)) as sum, avg(IFNULL(gross_profit_margin, 0)) as average, certainty, certainty_str as name FROM project WHERE approve_status_estimate >= 1 and approve_status_estimate <= 2 and dept_name = '销售管理部' GROUP BY certainty";
String sql2 = "SELECT sum(IFNULL(IF(pe.is_budget = 1, pe.contract_amount, p.contract_amount),0)) AS sum, avg(IFNULL(IF(pe.is_budget = 1, pe.gross_profit_margin, p.gross_profit_margin),0)) AS average, p.certainty, p.certainty_str as name, pe.is_budget FROM project p LEFT JOIN project_extend pe ON p.id = pe.project_id WHERE p.approve_status_estimate >= 1 AND p.approve_status_estimate <= 2 AND p.dept_name = '销售管理部' GROUP BY p.certainty";
List<Record> bar = pagination.find(sql2);
return combineData(pie, bar);
}

4
src/main/resources/sql/fourcal-purge.sql
View File

@ -5753,7 +5753,7 @@ CREATE TABLE `project_budget_income_detail` (
`price` decimal(16,2) NOT NULL COMMENT '单价',
`tax_rate` decimal(16,2) NOT NULL COMMENT '税率',
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='收入明细表';
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='收款明细表';
-- ----------------------------
-- Records of project_budget_income_detail
@ -5773,7 +5773,7 @@ CREATE TABLE `project_budget_income_detail_temp` (
`price` decimal(16,2) NOT NULL COMMENT '单价',
`tax_rate` decimal(16,2) NOT NULL COMMENT '税率',
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='收入明细表';
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='收款明细表';
-- ----------------------------
-- Records of project_budget_income_detail_temp

4
src/main/resources/sql/fourcal.sql
View File

@ -8268,7 +8268,7 @@ CREATE TABLE `project_budget_income_detail` (
`price` decimal(16,2) NOT NULL COMMENT '单价',
`tax_rate` decimal(16,2) NOT NULL COMMENT '税率',
PRIMARY KEY (`id`)
) ENGINE=InnoDB AUTO_INCREMENT=711 DEFAULT CHARSET=utf8mb4 COMMENT='收入明细表';
) ENGINE=InnoDB AUTO_INCREMENT=711 DEFAULT CHARSET=utf8mb4 COMMENT='收款明细表';
-- ----------------------------
-- Records of project_budget_income_detail
@ -8393,7 +8393,7 @@ CREATE TABLE `project_budget_income_detail_temp` (
`price` decimal(16,2) NOT NULL COMMENT '单价',
`tax_rate` decimal(16,2) NOT NULL COMMENT '税率',
PRIMARY KEY (`id`)
) ENGINE=InnoDB AUTO_INCREMENT=701 DEFAULT CHARSET=utf8mb4 COMMENT='收入明细表';
) ENGINE=InnoDB AUTO_INCREMENT=701 DEFAULT CHARSET=utf8mb4 COMMENT='收款明细表';
-- ----------------------------
-- Records of project_budget_income_detail_temp

34
src/main/resources/static/assets/js/project_budget.js
View File

@ -92,12 +92,12 @@ $(function () {
var dataIncome = collectData("am-modal-prompt-input-income");
if (dataIncome.length <= 0) {
window.confirm('请填写收入明细表');
window.confirm('请填写收款明细表');
$("#saveDraft").attr('disabled', false);
return;
}
var dataIncomeCheck = convertDetailVerifyCheck(dataIncome, INCOME_DETAIL2, "收入明细表");
var dataIncomeCheck = convertDetailVerifyCheck(dataIncome, INCOME_DETAIL2, "收款明细表");
if (dataIncomeCheck == null) {
$("#saveDraft").attr('disabled', false);
return;
@ -176,13 +176,13 @@ $(function () {
}
updateBudgetPlanDetailDataUnsubmit();
var message = verifyProjectContributionProfitRate();
if (message) {
$("#saveDraft").attr('disabled', false);
layuiAlert(message);
return;
}
console.log(message);
// var message = verifyProjectContributionProfitRate();
// if (message) {
// $("#saveDraft").attr('disabled', false);
// layuiAlert(message);
// return;
// }
// console.log(message);
var startTime = $("#startDate").val();
var endTime = $("#endDate").val();
@ -205,12 +205,12 @@ $(function () {
var dataIncome = collectData("am-modal-prompt-input-income");
if (dataIncome.length <= 5) {
window.confirm('请填写收入明细表');
window.confirm('请填写收款明细表');
$("#saveApprove").attr('disabled', false);
return;
}
var dataIncomeCheck = convertDetailVerifyCheck(dataIncome, INCOME_DETAIL, "收入明细表");
var dataIncomeCheck = convertDetailVerifyCheck(dataIncome, INCOME_DETAIL, "收款明细表");
if (dataIncomeCheck == null) {
$("#saveApprove").attr('disabled', false);
return;
@ -291,12 +291,12 @@ $(function () {
}
updateBudgetPlanDetailDataUnsubmit();
var message = verifyProjectContributionProfitRate();
if (message) {
$("#saveApprove").attr('disabled', false);
layuiAlert(message);
return;
}
// var message = verifyProjectContributionProfitRate();
// if (message) {
// $("#saveApprove").attr('disabled', false);
// layuiAlert(message);
// return;
// }
var startTime = $("#startDate").val();
var endTime = $("#endDate").val();

2
src/main/resources/static/assets/js/project_budget_cost_project_manage.js
View File

@ -230,7 +230,7 @@ function bindTypeSelectChangeManager() {
categorySelect.attr("style", "display:none");
categoryInput.attr("type", "text");
} else if(SELECT_TYPE_CATEGORY_MAP_DATA_MANAGER[type]){
categorySelect.attr("style", "width: 180px;float: left;");
categorySelect.attr("style", "float: left;");
categoryInput.val("");
categoryInput.attr("type", "hidden");
categorySelect.append("<option value='xxxx' disabled selected>--请选择--</option>");

2
src/main/resources/static/assets/js/project_budget_income.js
View File

@ -71,7 +71,7 @@ $(function () {
});
});
//保存收入明细表
//保存收款明细表
$(function () {
$("#incomeTableSave").click(function () {
var data = collectData("am-modal-prompt-input-income");

12
src/main/resources/templates/admin/project_approve.ftl
View File

@ -399,7 +399,7 @@
<div class="am-tabs palm-tabs inner" data-am-tabs id="subTab">
<ul class="am-tabs-nav am-nav am-nav-tabs palm-tabs-nav">
<li class="am-active"><a href="#tab35">预算信息</a></li>
<li><a href="#tab31">收入明细表</a></li>
<li><a href="#tab31">收款明细表</a></li>
<li><a href="#tab36">收款计划表</a></li>
<li><a href="#tab32">采购成本明细表</a></li>
<li><a href="#tab33">项目管理成本表</a></li>
@ -408,7 +408,7 @@
</div>
<div class="am-tabs-bd palm-tabs-bd">
<div class="am-tab-panel am-fade am-in" id="tab31">
<#--<span class="am-text-lg">收入明细表</span>-->
<#--<span class="am-text-lg">收款明细表</span>-->
<div class="fixed-section">
<div class="am-modal-bd">
<div class="fixed-actions">
@ -517,7 +517,7 @@
</div>
</div>
<div class="am-tab-panel am-fade am-in" id="tab36">
<#--<span class="am-text-lg">收入明细表</span>-->
<#--<span class="am-text-lg">收款明细表</span>-->
<div class="fixed-section">
<div class="am-modal-bd">
<div class="fixed-actions">
@ -1024,7 +1024,7 @@
</table>
<!--endprint-->
</div>
<#--<span class="am-text-primary"><a style="cursor: pointer" id="income-detail">收入明细表</a></span>
<#--<span class="am-text-primary"><a style="cursor: pointer" id="income-detail">收款明细表</a></span>
<span class="am-text-primary"><a style="cursor: pointer" id="cost-detail">采购成本明细表</a></span>
<span class="am-text-primary"><a style="cursor: pointer" id="cost-project-manage-detail">项目管理成本表</a></span>
<span class="am-text-primary budget-plan-detail"><a style="cursor: pointer">资金计划表</a></span>-->
@ -2129,11 +2129,11 @@
</div>
<#--收入明细表弹窗-->
<#--收款明细表弹窗-->
<div class="am-modal am-modal-prompt" style="width: 1200px;max-height:600px;overflow-y:auto;"
tabindex="-1" id="my-prompt-income-detail">
<div class="am-modal-dialog">
<div class="am-modal-hd">销售收入明细表——${project.name}</div>
<div class="am-modal-hd">销售收款明细表——${project.name}</div>
<div class="am-modal-bd">
<table class="am-table am-table-bordered am-table-radius table-main" style="padding:0;"
id="incomeTable">

15
src/main/resources/templates/admin/project_budget_edit.ftl
View File

@ -71,6 +71,17 @@
display: flex;
/*position: relative;*/
}
input {
/*width: 600px;*/
width: 100%;
border:0 none;
outline:none;
}
textarea {
overflow-x: hidden;
overflow-y:hidden;
}
</style>
<div class="project_budget">
@ -84,7 +95,7 @@
<ul class="am-tabs-nav am-nav am-nav-tabs palm-tabs-nav">
<li class="am-active"><a href="#tab1">项目立项（概算）基本信息</a></li>
<#-- <li><a href="#tab2">项目立项（概算）其他信息</a></li>-->
<li><a href="#tab3">收入明细表</a></li>
<li><a href="#tab3">收款明细表</a></li>
<li><a href="#tab8">收款计划表</a></li>
<li><a href="#tab4">采购成本明细表</a></li>
<li><a href="#tab5">项目管理成本表</a></li>
@ -793,7 +804,7 @@
</div>
<div class="am-tab-panel am-fade am-in" id="tab7">
<span>收入</span>
<#-- <span class="am-text-primary"><a style="cursor: pointer" id="income-detail">收入明细表</a></span>-->
<#-- <span class="am-text-primary"><a style="cursor: pointer" id="income-detail">收款明细表</a></span>-->
<table class="am-table am-table-bordered am-table-radius table-main" style="padding:0;">
<tbody>
<tr>

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

@ -222,10 +222,10 @@
<div class="st-col-field">
<select data-am-selected="{btnSize: 'sm',btnWidth: '100%',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>
<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>>B类-垫资（账期覆盖）</option>
<option value="4" <#if underwrittenMode?? && underwrittenMode='4'>selected</#if>>C类-垫资（账期不覆盖）</option>
</select>
</div>
</div>

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

@ -220,9 +220,9 @@
<select data-am-selected="{btnSize: 'sm',btnWidth: '100%',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>
<#-- <option value="2" <#if underwrittenMode?? && underwrittenMode='2'>selected</#if>>B类-不垫资（背靠背）</option>-->
<option value="3" <#if underwrittenMode?? && underwrittenMode='3'>selected</#if>>B类-垫资（账期覆盖）</option>
<option value="4" <#if underwrittenMode?? && underwrittenMode='4'>selected</#if>>C类-垫资（账期不覆盖）</option>
</select>
</div>
</div>
@ -378,6 +378,68 @@
</div>
</div>
</div>
<!-- 扩展区域 -->
<div class="expand-section <#if extend='1'> fold</#if>">
<!-- 第五行 -->
<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">
<input type="text" class="am-form-field am-input-sm" id="huizhiStart"
value="${huizhiStart!}" placeholder="汇智产品金额" autocomplete="off">
</div>
<div class="mid-connect">至</div>
<div class="am-form-icon">
<input type="text" class="am-form-field am-input-sm" id="huizhiEnd"
value="${huizhiEnd!}" placeholder="汇智产品金额" autocomplete="off">
</div>
</div>
</div>
<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">
<input type="text" class="am-form-field am-input-sm" id="huazhiStart"
value="${huazhiStart!}" placeholder="华智产品金额" autocomplete="off">
</div>
<div class="mid-connect">至</div>
<div class="am-form-icon">
<input type="text" class="am-form-field am-input-sm" id="huazhiEnd"
value="${huazhiEnd!}" placeholder="华智产品金额" autocomplete="off">
</div>
</div>
</div>
<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">
<input type="text" class="am-form-field am-input-sm" id="huasanStart"
value="${huasanStart!}" placeholder="华三产品金额" autocomplete="off">
</div>
<div class="mid-connect">至</div>
<div class="am-form-icon">
<input type="text" class="am-form-field am-input-sm" id="huasanEnd"
value="${huasanEnd!}" placeholder="华三产品金额" autocomplete="off">
</div>
</div>
</div>
<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">
<input type="text" class="am-form-field am-input-sm" id="otherStart"
value="${otherStart!}" placeholder="其他产品金额" autocomplete="off">
</div>
<div class="mid-connect">至</div>
<div class="am-form-icon">
<input type="text" class="am-form-field am-input-sm" id="otherEnd"
value="${otherEnd!}" placeholder="其他产品金额" autocomplete="off">
</div>
</div>
</div>
</div>
</div>
<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!}">扩展筛选项
@ -607,6 +669,22 @@
keywordsObj.contractEndTime = $("#contractEndTime").val();
if ($("#industryScene").val())
keywordsObj.industryScene = $("#industryScene").val();
if ($("#huizhiStart").val())
keywordsObj.huizhiStart = $("#huizhiStart").val();
if ($("#huizhiEnd").val())
keywordsObj.huizhiEnd = $("#huizhiEnd").val();
if ($("#huazhiStart").val())
keywordsObj.huazhiStart = $("#huazhiStart").val();
if ($("#huazhiEnd").val())
keywordsObj.huazhiEnd = $("#huazhiEnd").val();
if ($("#huasanStart").val())
keywordsObj.huasanStart = $("#huasanStart").val();
if ($("#huasanEnd").val())
keywordsObj.huasanEnd = $("#huasanEnd").val();
if ($("#otherStart").val())
keywordsObj.otherStart = $("#otherStart").val();
if ($("#otherEnd").val())
keywordsObj.otherEnd = $("#otherEnd").val();
}
if ($("#customer").val())
keywordsObj.customer = $("#customer").val();

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

@ -325,16 +325,22 @@
<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.underwrittenModeStr!}</td>
<td>${Utils.format(list.huazhiProductAmount, "0.00")}</td>
<td>${Utils.format(list.huasanProductAmount, "0.00")}</td>
<td>${Utils.format(list.huizhiProductAmount, "0.00")}</td>
<td>${Utils.format(list.ziguangOtherAmount, "0.00")}</td>
<td>${list.huazhiRound!}</td>
<td>${list.huasanRound!}</td>
<td>${list.huizhiRound!}</td>
<td>${list.ziguangRound!}</td>
<#-- <td>${Utils.format(list.huazhiProductAmount, "0.00")}</td>-->
<#-- <td>${Utils.format(list.huasanProductAmount, "0.00")}</td>-->
<#-- <td>${Utils.format(list.huizhiProductAmount, "0.00")}</td>-->
<#-- <td>${Utils.format(list.ziguangOtherAmount, "0.00")}</td>-->
<td>${list.certaintyStr!}</td>
<td>${(list.bidsTime?string("yyyy-MM-dd"))!}</td>
<td>${(list.contractTime?string("yyyy-MM-dd"))!}</td>
<td>${list.calculationCollection!}</td>
<td>${Utils.format(list.grossProfit, "0.00")}</td>
<td>${Utils.format(list.contractAmount, "0.00")}</td>
<td>${list.grossProfitRound!}</td>
<td>${list.contractRound!}</td>
<#-- <td>${Utils.format(list.grossProfit, "0.00")}</td>-->
<#-- <td>${Utils.format(list.contractAmount, "0.00")}</td>-->
<td>${list.resolvePlanStr!}</td>
<td>${list.mainContractResolvePlan!}</td>
<td>${list.isSecondStr!}</td>