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

修改几个显示问题

master
OathK1per 2022-08-19 08:22:55 +08:00
parent 08cd8e316b
commit 053cc77bc9
13 changed files with 403 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/cn/palmte/work/bean/CertaintyEnum.java
View File

@ -4,6 +4,7 @@ package cn.palmte.work.bean;
* @author xiongshiyan at 2021/11/1 , contact me with email yanshixiong@126.com or phone 15208384257
*/
public enum CertaintyEnum {
PLAN_O(-1,""),
PLAN_A(1,"A：基本确定中标，待签合同，合同签订中"),
PLAN_B(2,"B：客户产品参数、商务评分、商务资质引导成功"),
PLAN_C(3,"C：项目初期引导阶段");

3
src/main/java/cn/palmte/work/bean/IsSecondEnum.java
View File

@ -4,6 +4,7 @@ package cn.palmte.work.bean;
* @author xiongshiyan at 2021/11/1 , contact me with email yanshixiong@126.com or phone 15208384257
*/
public enum IsSecondEnum {
PLAN_O(-1,""),
PLAN_A(1,"是"),
PLAN_B(2,"否");
@ -38,6 +39,6 @@ public enum IsSecondEnum {
if(isSecond == 2){
return PLAN_B;
}
throw new IllegalArgumentException("Unkown isSecond:"+isSecond);
return PLAN_O;
}
}

1
src/main/java/cn/palmte/work/bean/ResolvePlanEnum.java
View File

@ -4,6 +4,7 @@ package cn.palmte.work.bean;
* @author xiongshiyan at 2021/11/1 , contact me with email yanshixiong@126.com or phone 15208384257
*/
public enum ResolvePlanEnum {
PLAN_O(-1,""),
PLAN_A(1,"公共服务(智慧交通、雪亮工程、治安防控体系等)"),
PLAN_B(2,"泛行业(智慧园区、智慧医疗、智慧工地等)"),
PLAN_C(3,"其他生态");

3
src/main/java/cn/palmte/work/bean/SignTypeEnum.java
View File

@ -4,6 +4,7 @@ package cn.palmte.work.bean;
* @author xiongshiyan at 2021/11/1 , contact me with email yanshixiong@126.com or phone 15208384257
*/
public enum SignTypeEnum {
PLAN_O(-1,""),
PLAN_A(1,"紫光汇智直接投标");
private int signType;
@ -34,6 +35,6 @@ public enum SignTypeEnum {
if(signType == 1){
return PLAN_A;
}
throw new IllegalArgumentException("Unkown signType:"+signType);
return PLAN_O;
}
}

1
src/main/java/cn/palmte/work/bean/UnderwrittenModeEnum.java
View File

@ -4,6 +4,7 @@ package cn.palmte.work.bean;
* @author xiongshiyan at 2021/11/1 , contact me with email yanshixiong@126.com or phone 15208384257
*/
public enum UnderwrittenModeEnum {
PLAN_O(-1,""),
PLAN_A(1,"A类-不垫资（战略合作）"),
PLAN_B(2,"B类-不垫资（背靠背）"),
PLAN_C(3,"C类-垫资（账期覆盖）"),

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

@ -130,7 +130,7 @@ public class ProjectController extends BaseController {
String[] headers = {"项目编号", "项目名称", "项目类型", "垫资模式", "垫资利息", "垫资峰值", "项目合同金额", "项目毛利", "项目毛利率", "项目把握度", "汇智产品金额", "华智产品金额",
"华三产品金额", "其他产品金额", "项目状态", "行业场景应用", "解决方案", "客户名称", "终端客户名称", "预计合同签订时间", "项目计划招标时间", "是否二次合作", "签单方式", "合作对象",
"项目负责人", "价值及风险", "主合同收款条款", "主合同具体解决方案", "计收计划", "审核状态", "当前审核人", "项目创建者", "部门名称", "项目开始时间", "项目结束时间", "最后更新时间"};
String[] exportColumns = {"projectNo", "name", "typeDesc", "underwrittenModeDesc", "advanceInterestAmount", "advancePeakAmount", "contractRound", "grossProfit", "grossProfitMargin", "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",
"principal", "valueRisk", "mainContractCollectionTerms", "mainContractResolvePlan", "calculationCollection", "approveStatusDesc", "approveName", "creatorName", "deptName", "startDateYM", "endDateYM", "lastUpdateTime"};
ExportUtils.exportToExcel(headers, exportColumns, 1, 10000,
@ -149,9 +149,9 @@ public class ProjectController extends BaseController {
ServletOutputStream outputStream = response.getOutputStream();
ExportExcelUtils exportExcelUtils = new ExportExcelUtils();
String[] headers0 = {"部门名称", "项目编号", "项目名称", "项目类型", "项目计划开始时间", "项目计划结束时间", "垫资模式", "合作对象", "垫资利息", "垫资峰值", "合同金额", "项目毛利", "项目毛利率", "华智产品金额", "汇智产品金额", "华三产品金额", "其他产品金额", "项目把握度", "行业场景应用", "项目解决方案", "客户名称", "终端客户名称", "价值及风险"};
String[] columns0 = {"deptName", "projectNo", "name", "typeDesc", "startDate", "endDate", "underwrittenModeStr", "collaborator", "advanceInterestAmount", "advancePeakAmount", "contractAmount", "grossProfit", "grossProfitMargin", "huazhiProductAmount", "huizhiProductAmount", "huasanProductAmount", "ziguangOtherAmount", "certaintyStr", "industryScenario", "resolvePlanStr", "customer", "terminalCustomer", "valueRisk"};
String[] columns0 = {"deptName", "projectNo", "name", "typeDesc", "startDate", "endDate", "underwrittenModeStr", "collaborator", "advanceInterestAmountRound", "advancePeakAmountRound", "contractRound", "grossProfitRound", "grossProfitMarginRound", "huazhiRound", "huizhiRound", "huasanRound", "ziguangRound", "certaintyStr", "industryScenario", "resolvePlanStr", "customer", "terminalCustomer", "valueRisk"};
exportExcelUtils.exportProjectExcel(headers0, columns0, project, "yyyy-MM-dd", 0, "项目基本信息", outputStream);
String[] headers1 = {"项目负责人", "预计合同签订时间", "项目计划招标时间", "是否二次合作", "签单方式", "主合同收款条款", "主合具体解决方案", "计收计划"};
String[] headers1 = {"项目负责人", "预计合同签订时间", "项目计划招标时间", "是否二次合作", "签单方式", "主合同收款条款", "主合同具体解决方案", "计收计划"};
String[] columns1 = {"principal", "contractTime", "bidsTime", "isSecondStr", "signTypeStr", "mainContractCollectionTerms", "mainContractResolvePlan", "calculationCollection"};
exportExcelUtils.exportProjectExcel(headers1, columns1, project, "yyyy-MM-dd", 0, "项目其他信息", outputStream);
BudgetBean budgetBean = projectBudgetService.getBudget(project);

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

@ -186,6 +186,10 @@ public class ProjectService {
public Project addProject(Project project, Admin admin, ApproveStatusEnum approveStatusEnum) {
String projectNo = numSeqService.generate();
if (project.getUnderwrittenMode() != 1) {
project.setCollaborator(null);
project.setCollaboratorUrl(null);
}
project.setProjectNo(projectNo);
project.setTypeDesc(TypeEnum.parseType(project.getType()).getTypeDesc());
project.setUnderwrittenModeStr(UnderwrittenModeEnum.parseUnderwrittenMode(project.getUnderwrittenMode()).getUnderwrittenModeStr());
@ -238,8 +242,13 @@ public class ProjectService {
projectInDb.setResolvePlan(project.getResolvePlan());
projectInDb.setResolvePlanStr(ResolvePlanEnum.parseResolvePlan(project.getResolvePlan()).getResolvePlanStr());
if (project.getUnderwrittenMode() != 1) {
projectInDb.setCollaborator(null);
projectInDb.setCollaboratorUrl(null);
} else {
projectInDb.setCollaborator(project.getCollaborator());
projectInDb.setCollaboratorUrl(project.getCollaboratorUrl());
}
projectInDb.setGrossProfit(project.getGrossProfit());
projectInDb.setGrossProfitMargin(project.getGrossProfitMargin());
projectInDb.setStartDate(project.getStartDate());

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

@ -88,13 +88,7 @@ $(function () {
$("#saveDraft").attr('disabled', true);
$("#collaboratorUrl").val($("#collaboratorUrl_span").text());
checkName();
if (result == 1) {
window.confirm('项目名称已存在');
$("#saveDraft").attr('disabled', false);
return;
}
checkIfFillIn();
var dataIncome = collectData("am-modal-prompt-input-income");
if (dataIncome.length <= 0) {
@ -207,13 +201,7 @@ $(function () {
$("#saveApprove").attr('disabled', true);
$("#collaboratorUrl").val($("#collaboratorUrl_span").text());
checkName();
if (result == 1) {
window.confirm('项目名称已存在');
$("#saveApprove").attr('disabled', false);
return;
}
checkIfFillIn();
var dataIncome = collectData("am-modal-prompt-input-income");
if (dataIncome.length <= 0) {
@ -338,6 +326,182 @@ $(function () {
};
});
//立项表填写检查
function checkIfFillIn() {
var name = $("#name").val();
var startTime = $("#startDate").val();
var endTime = $("#endDate").val();
var underwrittenMode = $("#underwrittenMode").val();
var collaborator = $("#collaborator").val();
var advanceInterestAmount = $("#advanceInterestAmount").val();
var advancePeakAmount = $("#advancePeakAmount").val();
var contractAmount = $("#contractAmount").val();
var grossProfit = $("#grossProfit").val();
var grossProfitMargin = $("#grossProfitMargin").val();
var huizhiProductAmount = $("#huizhiProductAmount").val();
var huazhiProductAmount = $("#huazhiProductAmount").val();
var huasanProductAmount = $("#huasanProductAmount").val();
var ziguangOtherAmount = $("#ziguangOtherAmount").val();
var industryScenario = $("#industryScenario").val();
var customer = $("#customer").val();
var terminalCustomer = $("#terminalCustomer").val();
var valueRisk = $("#valueRisk").val();
// var incomeDeviceTaxInclude = $("#incomeDeviceTaxInclude").val();
// var incomeDeviceTaxExclude = $("#incomeDeviceTaxExclude").val();
// var incomeEngineerTaxInclude = $("#incomeEngineerTaxInclude").val();
// var incomeEngineerTaxExclude = $("#incomeEngineerTaxExclude").val();
// var incomeServiceTaxInclude = $("#incomeServiceTaxInclude").val();
// var incomeServiceTaxExclude = $("#incomeServiceTaxExclude").val();
// var costPurchaseDeviceTaxInclude = $("#costPurchaseDeviceTaxInclude").val();
// var costPurchaseDeviceTaxExclude = $("#costPurchaseDeviceTaxExclude").val();
// var costPurchaseBuildTaxInclude = $("#costPurchaseBuildTaxInclude").val();
// var costPurchaseBuildTaxExclude = $("#costPurchaseBuildTaxExclude").val();
// var costPurchaseServiceTaxInclude = $("#costPurchaseServiceTaxInclude").val();
// var costPurchaseServiceTaxExclude = $("#costPurchaseServiceTaxExclude").val();
// var costPurchaseOtherTaxInclude = $("#costPurchaseOtherTaxInclude").val();
// var costPurchaseOtherTaxExclude = $("#costPurchaseOtherTaxExclude").val();
// var costCompanyManageTaxExclude = $("#costCompanyManageTaxExclude ").val();
// var costProjectManageTaxExclude = $("#costProjectManageTaxExclude ").val();
// var costOtherOtherTaxInclude = $("#costOtherOtherTaxInclude").val();
// var costOtherOtherTaxExclude = $("#costOtherOtherTaxExclude").val();
if (name.length <= 0) {
window.confirm('项目名称不能为空');
check = 1;
return;
}
checkName();
if (result == 1) {
window.confirm('项目名称已存在');
check = 1;
return;
}
if (startTime.length <= 0) {
window.confirm('项目计划开始时间不能为空');
check = 1;
return;
}
if (endTime.length <= 0) {
window.confirm('项目计划结束时间不能为空');
check = 1;
return;
}
if (startTime > endTime) {
window.confirm('开始日期应早于结束日期');
check = 1;
return;
}
// if (projectNo.length <= 0) {
// window.confirm('项目编号不能为空');
// check = 1;
// return;
// }
//
// checkProjectNo();
// if (projectNoResult == 1) {
// window.confirm('项目编号已存在');
// check = 1;
// return;
// }
if (underwrittenMode == 1 && (collaborator == undefined || collaborator.length <= 0)) {
window.confirm('合作对象不能为空');
check = 1;
return;
}
if (advanceInterestAmount == undefined || advanceInterestAmount.length <= 0) {
window.confirm('垫资利息不能为空');
check = 1;
return;
}
if (advancePeakAmount == undefined || advancePeakAmount.length <= 0) {
window.confirm('垫资峰值不能为空');
check = 1;
return;
}
if (contractAmount == undefined || contractAmount.length <= 0) {
window.confirm('合同金额不能为空');
check = 1;
return;
}
if (grossProfit == undefined || grossProfit.length <= 0) {
window.confirm('项目毛利不能为空');
check = 1;
return;
}
if (grossProfitMargin == undefined || grossProfitMargin.length <= 0) {
window.confirm('项目毛利率不能为空');
check = 1;
return;
}
if (huizhiProductAmount == undefined || huizhiProductAmount.length <= 0) {
window.confirm('汇智产品金额不能为空');
check = 1;
return;
}
if (huazhiProductAmount == undefined || huazhiProductAmount.length <= 0) {
window.confirm('华智产品金额不能为空');
check = 1;
return;
}
if (huasanProductAmount == undefined || huasanProductAmount.length <= 0) {
window.confirm('华三产品金额不能为空');
check = 1;
return;
}
if (ziguangOtherAmount == undefined || ziguangOtherAmount.length <= 0) {
window.confirm('其他产品金额不能为空');
check = 1;
return;
}
if (industryScenario == undefined || industryScenario.length <= 0) {
window.confirm('行业应用场景不能为空');
check = 1;
return;
}
// if (mainContractCollectionTerms == undefined || mainContractCollectionTerms.length <= 0) {
// window.confirm('主合同收款条款不能为空');
// check = 1;
// return;
// }
if (customer == undefined || customer.length <= 0) {
window.confirm('客户名称不能为空');
check = 1;
return;
}
if (terminalCustomer == undefined || terminalCustomer.length <= 0) {
window.confirm('终端客户名称不能为空');
check = 1;
return;
}
if (valueRisk == undefined || valueRisk.length <= 0) {
window.confirm('价值及风险不能为空');
check = 1;
return;
}
}
/**
* 一维数组变二维数组
* @param list

50
src/main/resources/templates/admin/monthly_settle_info.ftl
View File

@ -124,15 +124,15 @@
<!--验证表单元素（validate) begin-->
<div class="am-g am-form-group am-margin-top">
<div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 69px; margin-bottom: 13px;" value="月份(请选择)"></div>
<div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 100px; margin-bottom: 13px;" value="月份(请选择)"></div>
<div class="am-u-sm-6 am-u-md-6">
<input readonly id="time" name="time" value="${monthlySettle.month!}"></input>
<input readonly type="text" id="time" name="time" value="${monthlySettle.month!}"></input>
</div>
<div class="am-u-sm-2 am-u-md-4 input-msg"></div>
</div>
<div class="am-g am-form-group am-margin-top">
<div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 69px;margin-bottom: 6px;" value="项目编号"></div>
<div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 100px;margin-bottom: 6px;" value="项目编号"></div>
<div class="am-u-sm-6 am-u-md-6">
<input readonly id="projectNo" value="${monthlySettle.projectNo!}">
</div>
@ -140,7 +140,7 @@
</div>
<div class="am-g am-form-group am-margin-top">
<div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 69px;margin-bottom: 6px;" value="项目名称"></div>
<div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 100px;margin-bottom: 6px;" value="项目名称"></div>
<div class="am-u-sm-6 am-u-md-6">
<input readonly id="projectName" value="${monthlySettle.projectName!}">
</div>
@ -148,7 +148,7 @@
</div>
<div class="am-g am-form-group am-margin-top">
<div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 69px ;margin-bottom: 12px;" value="项目类型"></div>
<div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 100px ;margin-bottom: 12px;" value="项目类型"></div>
<div class="am-u-sm-6 am-u-md-6">
<input readonly id="projectType" value="${monthlySettle.projectType!}">
</div>
@ -156,7 +156,7 @@
</div>
<div class="am-g am-form-group am-margin-top">
<div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 69px;margin-bottom: 6px;" value="合同编号"></div>
<div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 100px;margin-bottom: 6px;" value="合同编号"></div>
<div class="am-u-sm-6 am-u-md-6">
<input readonly id="contractNo" value="${monthlySettle.contractNo!}">
</div>
@ -164,7 +164,7 @@
</div>
<div class="am-g am-form-group am-margin-top">
<div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 69px;margin-bottom: 6px;" value="合同方"></div>
<div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 100px;margin-bottom: 6px;" value="合同方"></div>
<div class="am-u-sm-6 am-u-md-6">
<input readonly id="contractParty" value="${monthlySettle.contractParty!}">
</div>
@ -172,7 +172,7 @@
</div>
<div class="am-g am-form-group am-margin-top">
<div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 69px ;margin-bottom: 12px;" value="合同金额"></div>
<div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 100px ;margin-bottom: 12px;" value="合同金额"></div>
<div class="am-u-sm-6 am-u-md-6">
<input readonly id="contractAmount" value="${Utils.format(monthlySettle.contractAmount)}元">
</div>
@ -196,7 +196,7 @@
</div>
<div class="am-g am-form-group am-margin-top">
<div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 69px ;margin-bottom: 12px;" value="累计已收款"></div>
<div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 100px ;margin-bottom: 12px;" value="累计已收款"></div>
<div class="am-u-sm-6 am-u-md-6">
<input readonly value="${Utils.format(monthlySettle.totalCollect)}元"></input>
</div>
@ -204,7 +204,7 @@
</div>
<div class="am-g am-form-group am-margin-top">
<div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 100px;margin-bottom: 12px;" value="已采购累计付款"></div>
<div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 140px;margin-bottom: 12px;" value="已采购累计付款"></div>
<div class="am-u-sm-6 am-u-md-6">
<input readonly value="${Utils.format(monthlySettle.totalPurchasedPaid)}元"></input>
</div>
@ -212,7 +212,7 @@
</div>
<div class="am-g am-form-group am-margin-top">
<div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 69px ;margin-bottom: 6px;" value="已采购累计未付款"></div>
<div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 140px ;margin-bottom: 6px;" value="已采购累计未付款"></div>
<div class="am-u-sm-6 am-u-md-6">
<input readonly value="${Utils.format(monthlySettle.totalPurchasedUnpaid)}元">
</div>
@ -220,7 +220,7 @@
</div>
<div class="am-g am-form-group am-margin-top">
<div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 100px ;margin-bottom: 6px;" value="超期垫资金额"></div>
<div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 120px ;margin-bottom: 6px;" value="超期垫资金额"></div>
<div class="am-u-sm-6 am-u-md-6">
<input readonly value="${Utils.format(monthlySettle.timeOutAmount)}元">
</div>
@ -228,7 +228,7 @@
</div>
<div class="am-g am-form-group am-margin-top">
<div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 69px;margin-bottom: 12px;" value="销售累计开票金额"></div>
<div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 140px;margin-bottom: 12px;" value="销售累计开票金额"></div>
<div class="am-u-sm-6 am-u-md-6">
<input readonly value="${Utils.format(monthlySettle.totalBillAmount)}元"></input>
</div>
@ -236,7 +236,7 @@
</div>
<div class="am-g am-form-group am-margin-top">
<div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 69px ;margin-bottom: 12px;" value="销售经理"></div>
<div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 100px ;margin-bottom: 12px;" value="销售经理"></div>
<div class="am-u-sm-6 am-u-md-6">
<input readonly value="${monthlySettle.saleManager!}" />
</div>
@ -244,7 +244,7 @@
</div>
<div class="am-g am-form-group am-margin-top">
<div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 69px ;margin-bottom: 12px;" value="项目经理"></div>
<div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 100px ;margin-bottom: 12px;" value="项目经理"></div>
<div class="am-u-sm-6 am-u-md-6">
<input readonly value="${monthlySettle.projectManager!}" />
</div>
@ -252,7 +252,7 @@
</div>
<div class="am-g am-form-group am-margin-top">
<div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;margin-left: 10px;margin-left: -15px" value="收款节点"></div>
<div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 100px;" value="收款节点"></div>
<div class="am-u-sm-6 am-u-md-6">
<input readonly value="${monthlySettle.collectPoint!}"></input>
</div>
@ -260,7 +260,7 @@
</div>
<div class="am-g am-form-group am-margin-top">
<div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;margin-left: -15px" value="收款要求时间"></div>
<div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 120px;" value="收款要求时间"></div>
<div class="am-u-sm-6 am-u-md-6">
<input readonly value="${(monthlySettle.contractSignTime?string("yyyy-MM-dd"))!}"></input>
</div>
@ -268,7 +268,7 @@
</div>
<div class="am-g am-form-group am-margin-top">
<div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;margin-left: 10px;margin-left: -15px" value="收款金额"></div>
<div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 100px;" value="收款金额"></div>
<div class="am-u-sm-6 am-u-md-6">
<input readonly value="${Utils.format(monthlySettle.collectAmount)}元"></input>
</div>
@ -276,7 +276,7 @@
</div>
<div class="am-g am-form-group am-margin-top">
<div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;margin-left: -15px" value="实际收款时间"></div>
<div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 120px;" value="实际收款时间"></div>
<div class="am-u-sm-6 am-u-md-6">
<input readonly value="${(monthlySettle.collectActualTime?string("yyyy-MM-dd"))!}"></input>
</div>
@ -284,7 +284,7 @@
</div>
<div class="am-g am-form-group am-margin-top">
<div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 100px;margin-bottom: 12px;" value="实际收款金额"></div>
<div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 120px;margin-bottom: 12px;" value="实际收款金额"></div>
<div class="am-u-sm-6 am-u-md-6">
<input readonly value="${Utils.format(monthlySettle.collectActualAmount)}元"></input>
</div>
@ -292,7 +292,7 @@
</div>
<div class="am-g am-form-group am-margin-top">
<div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 69px ;margin-bottom: 6px;" value="实际欠收金额"></div>
<div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 120px ;margin-bottom: 6px;" value="实际欠收金额"></div>
<div class="am-u-sm-6 am-u-md-6">
<input readonly value="${Utils.format(monthlySettle.uncollectActualAmount)}元">
</div>
@ -308,7 +308,7 @@
</div>
<div class="am-g am-form-group am-margin-top">
<div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 69px;margin-bottom: 12px;" value="到货证明"></div>
<div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 100px;margin-bottom: 12px;" value="到货证明"></div>
<div class="am-u-sm-6 am-u-md-6">
<input readonly value="${monthlySettle.productCertificate!}"></input>
</div>
@ -316,7 +316,7 @@
</div>
<div class="am-g am-form-group am-margin-top">
<div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 69px ;margin-bottom: 12px;" value="验收报告时间"></div>
<div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 120px ;margin-bottom: 12px;" value="验收报告时间"></div>
<div class="am-u-sm-6 am-u-md-6">
<input readonly value="${(monthlySettle.inspectionReportTime?string("yyyy-MM-dd"))!}" />
</div>
@ -324,7 +324,7 @@
</div>
<div class="am-g am-form-group am-margin-top">
<div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 69px;margin-bottom: 12px;" value="项目风险预警"></div>
<div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 120px;margin-bottom: 12px;" value="项目风险预警"></div>
<div class="am-u-sm-6 am-u-md-6">
<input readonly value="${monthlySettle.riskWarning!}"></input>
</div>
@ -332,7 +332,7 @@
</div>
<div class="am-g am-form-group am-margin-top">
<div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 69px ;margin-bottom: 12px;" value="已计收金额"></div>
<div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 120px ;margin-bottom: 12px;" value="已计收金额"></div>
<div class="am-u-sm-6 am-u-md-6">
<input readonly value="${Utils.format(monthlySettle.calColAmount)}元" />
</div>

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

@ -221,6 +221,7 @@
<input readonly value="${project.collaborator!}"/>
</div>
<#if project.collaboratorUrl?? && project.collaboratorUrl != "">
<div class="am-form-file am-text-xs">
<#-- <button type="button" class="am-btn am-btn-primary am-btn-sm">-->
<a href="${project.collaboratorUrl!}" download>
@ -228,6 +229,9 @@
</a>
<#-- </button>-->
</div>
<#else>
<div class="am-u-sm-2 am-u-md-4 input-msg"></div>
</#if>
</div>
@ -412,6 +416,8 @@
<input readonly value="是"/>
<#elseif (project.isSecond!) =2>
<input readonly value="否"/>
<#else >
<input readonly value=""/>
</#if>
</span>
</div>
@ -424,6 +430,8 @@
<span>
<#if (project.signType!) =1>
<input readonly value="紫光汇智直接投标"/>
<#else >
<input readonly value=""/>
</#if>
</span>
</div>
@ -439,7 +447,7 @@
</div>
<div class="am-g am-form-group am-margin-top">
<div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 180px;" value="主合同具体解决方案"/></div>
<div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 160px;" value="主合同具体解决方案"/></div>
<div class="am-u-sm-6 am-u-md-6">
<input readonly value="${project.mainContractResolvePlan!}"/>
</div>

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

@ -165,7 +165,7 @@
<div class="am-g am-form-group am-margin-top">
<div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>垫资利息</div>
<div class="am-u-sm-6 am-u-md-6">
<input type="number" class="am-input" data-validate-async data-validation-message="请输入垫资利息"
<input type="text" class="am-input number" data-validate-async data-validation-message="请输入垫资利息"
name="advanceInterestAmount" placeholder="单位（元）" maxlength="16" id="advanceInterestAmount"
value="${Utils.format(project.advanceInterestAmount)}" required />
</div>
@ -174,7 +174,7 @@
<div class="am-g am-form-group am-margin-top">
<div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>垫资峰值</div>
<div class="am-u-sm-6 am-u-md-6">
<input type="number" class="am-input" data-validate-async data-validation-message="请输入垫资峰值"
<input type="text" class="am-input number" data-validate-async data-validation-message="请输入垫资峰值"
name="advancePeakAmount" placeholder="单位（元）" maxlength="16" id="advancePeakAmount"
value="${Utils.format(project.advancePeakAmount)}" required />
</div>
@ -434,10 +434,10 @@
<div class="am-g am-form-group am-margin-top">
<div class="am-u-sm-4 am-u-md-2 am-text-right">计收计划</div>
<div class="am-u-sm-6 am-u-md-6">
<textarea rows="3" cols="20" id="CalculationCollection" name="CalculationCollection" maxlength="1000"
<textarea rows="3" cols="20" id="calculationCollection" name="calculationCollection" maxlength="1000"
class="am-input" data-validate-async data-validation-message="按照开票金额及时间罗列计收计划"
placeholder="按照开票金额及时间罗列计收计划"
>${project.CalculationCollection!}</textarea>
>${project.calculationCollection!}</textarea>
</div>
<div class="am-u-sm-2 am-u-md-4 input-msg"></div>
</div>

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

@ -686,17 +686,24 @@
});
function checkIfFillIn() {
var underwrittenMode = $("#underwrittenMode").val();
var name = $("#name").val();
var startTime = $("#startDate").val();
var endTime = $("#endDate").val();
var name = $("#name").val();
var underwrittenMode = $("#underwrittenMode").val();
var collaborator = $("#collaborator").val();
var advanceInterestAmount = $("#advanceInterestAmount").val();
var advancePeakAmount = $("#advancePeakAmount").val();
var contractAmount = $("#contractAmount").val();
var grossProfit = $("#grossProfit").val();
var grossProfitMargin = $("#grossProfitMargin").val();
var huizhiProductAmount = $("#huizhiProductAmount").val();
var huazhiProductAmount = $("#huazhiProductAmount").val();
var huasanProductAmount = $("#huasanProductAmount").val();
var ziguangOtherAmount = $("#ziguangOtherAmount").val();
var industryScenario = $("#industryScenario").val();
var customer = $("#customer").val();
var terminalCustomer = $("#terminalCustomer").val();
var contractAmount = $("#contractAmount").val();
var industryScenario = $("#industryScenario").val();
// var mainContractCollectionTerms = $("#mainContractCollectionTerms").val();
var valueRisk = $("#valueRisk").val();
var collaborator = $("#collaborator").val();
// var principal = $("#principal").val();
// var contractTime = $("#contractTime").val();
@ -723,6 +730,19 @@
// var costOtherOtherTaxInclude = $("#costOtherOtherTaxInclude").val();
// var costOtherOtherTaxExclude = $("#costOtherOtherTaxExclude").val();
if (name.length <= 0) {
window.confirm('项目名称不能为空');
check = 1;
return;
}
checkName();
if (result == 1) {
window.confirm('项目名称已存在');
check = 1;
return;
}
if (startTime.length <= 0) {
window.confirm('项目计划开始时间不能为空');
check = 1;
@ -754,33 +774,21 @@
// return;
// }
if (name.length <= 0) {
window.confirm('项目名称不能为空');
check = 1;
return;
}
checkName();
if (result == 1) {
window.confirm('项目名称已存在');
check = 1;
return;
}
if (underwrittenMode == 1 && (collaborator == undefined || collaborator.length <= 0 )) {
window.confirm('合作对象不能为空');
check = 1;
return;
}
if (customer == undefined || customer.length <= 0 ) {
window.confirm('客户名称不能为空');
if (advanceInterestAmount == undefined || advanceInterestAmount.length <= 0) {
window.confirm('垫资利息不能为空');
check = 1;
return;
}
if (terminalCustomer == undefined || terminalCustomer.length <= 0) {
window.confirm('终端客户名称不能为空');
if (advancePeakAmount == undefined || advancePeakAmount.length <= 0) {
window.confirm('垫资峰值不能为空');
check = 1;
return;
}
@ -791,6 +799,42 @@
return;
}
if (grossProfit == undefined || grossProfit.length <= 0) {
window.confirm('项目毛利不能为空');
check = 1;
return;
}
if (grossProfitMargin == undefined || grossProfitMargin.length <= 0) {
window.confirm('项目毛利率不能为空');
check = 1;
return;
}
if (huizhiProductAmount == undefined || huizhiProductAmount.length <= 0) {
window.confirm('汇智产品金额不能为空');
check = 1;
return;
}
if (huazhiProductAmount == undefined || huazhiProductAmount.length <= 0) {
window.confirm('华智产品金额不能为空');
check = 1;
return;
}
if (huasanProductAmount == undefined || huasanProductAmount.length <= 0) {
window.confirm('华三产品金额不能为空');
check = 1;
return;
}
if (ziguangOtherAmount == undefined || ziguangOtherAmount.length <= 0) {
window.confirm('其他产品金额不能为空');
check = 1;
return;
}
if (industryScenario == undefined || industryScenario.length <= 0) {
window.confirm('行业应用场景不能为空');
check = 1;
@ -803,6 +847,18 @@
// return;
// }
if (customer == undefined || customer.length <= 0 ) {
window.confirm('客户名称不能为空');
check = 1;
return;
}
if (terminalCustomer == undefined || terminalCustomer.length <= 0) {
window.confirm('终端客户名称不能为空');
check = 1;
return;
}
if (valueRisk == undefined || valueRisk.length <= 0) {
window.confirm('价值及风险不能为空');
check = 1;

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

@ -135,7 +135,7 @@
<div class="am-g am-form-group am-margin-top">
<div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>垫资利息</div>
<div class="am-u-sm-6 am-u-md-6">
<input type="number" class="am-input" data-validate-async data-validation-message="请输入垫资利息"
<input type="text" class="am-input number" data-validate-async data-validation-message="请输入垫资利息"
name="advanceInterestAmount" placeholder="单位（元）" maxlength="16" id="advanceInterestAmount"
value="${Utils.format(project.advanceInterestAmount)}" required />
</div>
@ -144,7 +144,7 @@
<div class="am-g am-form-group am-margin-top">
<div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>垫资峰值</div>
<div class="am-u-sm-6 am-u-md-6">
<input type="number" class="am-input" data-validate-async data-validation-message="请输入垫资峰值"
<input type="text" class="am-input number" data-validate-async data-validation-message="请输入垫资峰值"
name="advancePeakAmount" placeholder="单位（元）" maxlength="16" id="advancePeakAmount"
value="${Utils.format(project.advancePeakAmount)}" required />
</div>
@ -404,10 +404,10 @@
<div class="am-g am-form-group am-margin-top">
<div class="am-u-sm-4 am-u-md-2 am-text-right">计收计划</div>
<div class="am-u-sm-6 am-u-md-6">
<textarea rows="3" cols="20" id="CalculationCollection" name="CalculationCollection" maxlength="1000"
<textarea rows="3" cols="20" id="calculationCollection" name="calculationCollection" maxlength="1000"
class="am-input" data-validate-async data-validation-message="按照开票金额及时间罗列计收计划"
placeholder="按照开票金额及时间罗列计收计划"
>${project.CalculationCollection!}</textarea>
>${project.calculationCollection!}</textarea>
</div>
<div class="am-u-sm-2 am-u-md-4 input-msg"></div>
</div>
@ -724,17 +724,24 @@
});
function checkIfFillIn() {
var underwrittenMode = $("#underwrittenMode").val();
var name = $("#name").val();
var startTime = $("#startDate").val();
var endTime = $("#endDate").val();
var name = $("#name").val();
var underwrittenMode = $("#underwrittenMode").val();
var collaborator = $("#collaborator").val();
var advanceInterestAmount = $("#advanceInterestAmount").val();
var advancePeakAmount = $("#advancePeakAmount").val();
var contractAmount = $("#contractAmount").val();
var grossProfit = $("#grossProfit").val();
var grossProfitMargin = $("#grossProfitMargin").val();
var huizhiProductAmount = $("#huizhiProductAmount").val();
var huazhiProductAmount = $("#huazhiProductAmount").val();
var huasanProductAmount = $("#huasanProductAmount").val();
var ziguangOtherAmount = $("#ziguangOtherAmount").val();
var industryScenario = $("#industryScenario").val();
var customer = $("#customer").val();
var terminalCustomer = $("#terminalCustomer").val();
var contractAmount = $("#contractAmount").val();
var industryScenario = $("#industryScenario").val();
// var mainContractCollectionTerms = $("#mainContractCollectionTerms").val();
var valueRisk = $("#valueRisk").val();
var collaborator = $("#collaborator").val();
// var incomeDeviceTaxInclude = $("#incomeDeviceTaxInclude").val();
// var incomeDeviceTaxExclude = $("#incomeDeviceTaxExclude").val();
@ -755,6 +762,19 @@
// var costOtherOtherTaxInclude = $("#costOtherOtherTaxInclude").val();
// var costOtherOtherTaxExclude = $("#costOtherOtherTaxExclude").val();
if (name.length <= 0) {
window.confirm('项目名称不能为空');
check = 1;
return;
}
checkName();
if (result == 1) {
window.confirm('项目名称已存在');
check = 1;
return;
}
if (startTime.length <= 0) {
window.confirm('项目计划开始时间不能为空');
check = 1;
@ -786,33 +806,21 @@
// return;
// }
if (name.length <= 0) {
window.confirm('项目名称不能为空');
check = 1;
return;
}
checkName();
if (result == 1) {
window.confirm('项目名称已存在');
check = 1;
return;
}
if (underwrittenMode == 1 && (collaborator == undefined || collaborator.length <= 0 )) {
window.confirm('合作对象不能为空');
check = 1;
return;
}
if (customer == undefined || customer.length <= 0 ) {
window.confirm('客户名称不能为空');
if (advanceInterestAmount == undefined || advanceInterestAmount.length <= 0) {
window.confirm('垫资利息不能为空');
check = 1;
return;
}
if (terminalCustomer == undefined || terminalCustomer.length <= 0) {
window.confirm('终端客户名称不能为空');
if (advancePeakAmount == undefined || advancePeakAmount.length <= 0) {
window.confirm('垫资峰值不能为空');
check = 1;
return;
}
@ -823,6 +831,42 @@
return;
}
if (grossProfit == undefined || grossProfit.length <= 0) {
window.confirm('项目毛利不能为空');
check = 1;
return;
}
if (grossProfitMargin == undefined || grossProfitMargin.length <= 0) {
window.confirm('项目毛利率不能为空');
check = 1;
return;
}
if (huizhiProductAmount == undefined || huizhiProductAmount.length <= 0) {
window.confirm('汇智产品金额不能为空');
check = 1;
return;
}
if (huazhiProductAmount == undefined || huazhiProductAmount.length <= 0) {
window.confirm('华智产品金额不能为空');
check = 1;
return;
}
if (huasanProductAmount == undefined || huasanProductAmount.length <= 0) {
window.confirm('华三产品金额不能为空');
check = 1;
return;
}
if (ziguangOtherAmount == undefined || ziguangOtherAmount.length <= 0) {
window.confirm('其他产品金额不能为空');
check = 1;
return;
}
if (industryScenario == undefined || industryScenario.length <= 0) {
window.confirm('行业应用场景不能为空');
check = 1;
@ -835,6 +879,18 @@
// return;
// }
if (customer == undefined || customer.length <= 0 ) {
window.confirm('客户名称不能为空');
check = 1;
return;
}
if (terminalCustomer == undefined || terminalCustomer.length <= 0) {
window.confirm('终端客户名称不能为空');
check = 1;
return;
}
if (valueRisk == undefined || valueRisk.length <= 0) {
window.confirm('价值及风险不能为空');
check = 1;