From faaaf75726e30fc438a2b3e2ee51f610cef4eb90 Mon Sep 17 00:00:00 2001
From: OathK1per <zhangypg@gmail.com>
Date: Thu, 1 Sep 2022 15:05:17 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E7=AE=97=E8=8D=89=E7=A8=BF=EF=BC=8C?=
=?UTF-8?q?=E8=A1=8C=E4=B8=9A=E5=9C=BA=E6=99=AF=E6=94=B9=E4=B8=BA=E7=AD=9B?=
=?UTF-8?q?=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../palmte/work/bean/IndustrySceneEnum.java | 89 ++++++++
.../java/cn/palmte/work/model/Project.java | 13 ++
.../palmte/work/service/ProjectService.java | 12 +-
.../static/assets/js/project_budget.js | 148 ++++++-------
.../static/assets/js/project_budget_cost.js | 25 ++-
.../js/project_budget_cost_project_manage.js | 22 +-
.../static/assets/js/project_budget_income.js | 17 +-
.../static/assets/js/project_budget_plan.js | 20 +-
.../templates/admin/project_budget_edit.ftl | 200 ++++++++++--------
.../templates/admin/project_estimate_add.ftl | 31 ++-
.../templates/admin/project_estimate_edit.ftl | 48 ++++-
.../templates/admin/project_list.ftl | 23 +-
.../templates/admin/project_list_approve.ftl | 23 +-
13 files changed, 475 insertions(+), 196 deletions(-)
create mode 100644 src/main/java/cn/palmte/work/bean/IndustrySceneEnum.java
diff --git a/src/main/java/cn/palmte/work/bean/IndustrySceneEnum.java b/src/main/java/cn/palmte/work/bean/IndustrySceneEnum.java
new file mode 100644
index 0000000..540a816
--- /dev/null
+++ b/src/main/java/cn/palmte/work/bean/IndustrySceneEnum.java
@@ -0,0 +1,89 @@
+package cn.palmte.work.bean;
+
+public enum IndustrySceneEnum {
+ PLAN_O(-1,""),
+ PLAN_A(1,"信息安全"),
+ PLAN_B(2,"政府"),
+ PLAN_C(3,"公安"),
+ PLAN_D(4,"企业"),
+ PLAN_E(5,"教育"),
+ PLAN_F(6,"交通"),
+ PLAN_G(7,"医疗"),
+ PLAN_H(8,"电力能源"),
+ PLAN_I(9,"运营商"),
+ PLAN_J(10,"金融"),
+ PLAN_K(11,"专网"),
+ PLAN_L(12,"其他"),
+ PLAN_M(13,"互联网"),
+ PLAN_N(14,"银行");
+
+ private int scene;
+ private String scenario;
+
+ IndustrySceneEnum(int scene, String scenario) {
+ this.scene = scene;
+ this.scenario = scenario;
+ }
+
+ public int getScene() {
+ return scene;
+ }
+
+ public void setScene(int scene) {
+ this.scene = scene;
+ }
+
+ public String getScenario() {
+ return scenario;
+ }
+
+ public void setScenario(String scenario) {
+ this.scenario = scenario;
+ }
+
+ public static IndustrySceneEnum parseScene(int scene){
+ if(scene == 1){
+ return PLAN_A;
+ }
+ if(scene == 2){
+ return PLAN_B;
+ }
+ if(scene == 3){
+ return PLAN_C;
+ }
+ if(scene == 4){
+ return PLAN_D;
+ }
+ if(scene == 5){
+ return PLAN_E;
+ }
+ if(scene == 6){
+ return PLAN_F;
+ }
+ if(scene == 7){
+ return PLAN_G;
+ }
+ if(scene == 8){
+ return PLAN_H;
+ }
+ if(scene == 9){
+ return PLAN_I;
+ }
+ if(scene == 10){
+ return PLAN_J;
+ }
+ if(scene == 11){
+ return PLAN_K;
+ }
+ if(scene == 12){
+ return PLAN_L;
+ }
+ if(scene == 13){
+ return PLAN_M;
+ }
+ if(scene == 14){
+ return PLAN_N;
+ }
+ throw new IllegalArgumentException("Unkown scene:"+scene);
+ }
+}
diff --git a/src/main/java/cn/palmte/work/model/Project.java b/src/main/java/cn/palmte/work/model/Project.java
index 677834c..75bdb42 100644
--- a/src/main/java/cn/palmte/work/model/Project.java
+++ b/src/main/java/cn/palmte/work/model/Project.java
@@ -133,6 +133,11 @@ public class Project {
*/
@Column(name = "contract_amount")
private BigDecimal contractAmount;
+ /**
+ * 行业场景应用
+ */
+ @Column(name = "industry_scene")
+ private Integer industryScene;
/**
* 行业场景应用
*/
@@ -528,6 +533,14 @@ public class Project {
this.contractAmount = contractAmount;
}
+ public Integer getIndustryScene() {
+ return industryScene;
+ }
+
+ public void setIndustryScene(Integer industryScene) {
+ this.industryScene = industryScene;
+ }
+
public String getIndustryScenario() {
return industryScenario;
}
diff --git a/src/main/java/cn/palmte/work/service/ProjectService.java b/src/main/java/cn/palmte/work/service/ProjectService.java
index 05bfe5e..d14ef71 100644
--- a/src/main/java/cn/palmte/work/service/ProjectService.java
+++ b/src/main/java/cn/palmte/work/service/ProjectService.java
@@ -111,7 +111,10 @@ public class ProjectService {
if (StrUtil.isNotEmpty(searchInfo.get("resolvePlan")) && !"-1".equals(searchInfo.get("resolvePlan"))) {
queryHelper.addCondition("p.resolve_plan=?", Integer.parseInt(searchInfo.get("resolvePlan")));
}
- queryHelper.addCondition(StrUtil.isNotEmpty(searchInfo.get("industryScenario")), "p.industry_scenario LIKE ?", "%" + searchInfo.get("industryScenario") + "%");
+ if (StrUtil.isNotEmpty(searchInfo.get("industryScene")) && !"-1".equals(searchInfo.get("industryScene"))) {
+ queryHelper.addCondition("p.industry_scene=?", Integer.parseInt(searchInfo.get("industryScene")));
+ }
+// queryHelper.addCondition(StrUtil.isNotEmpty(searchInfo.get("industryScenario")), "p.industry_scenario LIKE ?", "%" + searchInfo.get("industryScenario") + "%");
/**
* 只选择了一个时间的情况，就项目时间包括这个时间的
*/
@@ -212,6 +215,7 @@ public class ProjectService {
project.setStatus(StatusEnum.ESTIMATE_ACCOUNTS.getStatus());
project.setStatusDesc(StatusEnum.ESTIMATE_ACCOUNTS.getStatusDesc());
project.setApproveStatusEstimate(approveStatusEnum.getApproveStatus());
+ project.setIndustryScenario(IndustrySceneEnum.parseScene(project.getIndustryScene()).getScenario());
project.setCreatorId(admin.getId());
project.setCreatorName(admin.getRealName());
@@ -240,7 +244,8 @@ public class ProjectService {
projectInDb.setName(project.getName());
projectInDb.setCustomer(project.getCustomer());
projectInDb.setTerminalCustomer(project.getTerminalCustomer());
- projectInDb.setIndustryScenario(project.getIndustryScenario());
+ projectInDb.setIndustryScene(project.getIndustryScene());
+ projectInDb.setIndustryScenario(IndustrySceneEnum.parseScene(project.getIndustryScene()).getScenario());
projectInDb.setType(project.getType());
projectInDb.setTypeDesc(TypeEnum.parseType(project.getType()).getTypeDesc());
projectInDb.setUnderwrittenMode(project.getUnderwrittenMode());
@@ -301,7 +306,8 @@ public class ProjectService {
projectInDb.setName(project.getName());
projectInDb.setCustomer(project.getCustomer());
projectInDb.setTerminalCustomer(project.getTerminalCustomer());
- projectInDb.setIndustryScenario(project.getIndustryScenario());
+ projectInDb.setIndustryScene(project.getIndustryScene());
+ projectInDb.setIndustryScenario(IndustrySceneEnum.parseScene(project.getIndustryScene()).getScenario());
projectInDb.setType(project.getType());
projectInDb.setTypeDesc(TypeEnum.parseType(project.getType()).getTypeDesc());
projectInDb.setUnderwrittenMode(project.getUnderwrittenMode());
diff --git a/src/main/resources/static/assets/js/project_budget.js b/src/main/resources/static/assets/js/project_budget.js
index d46b741..152b165 100644
--- a/src/main/resources/static/assets/js/project_budget.js
+++ b/src/main/resources/static/assets/js/project_budget.js
@@ -1,61 +1,61 @@
-INCOME_DETAIL={
- "num":[false,"序号","string"],
- "type":[true,"类别","string"],
- "name":[true,"名称","string"],
- "unit":[true,"单位","string"],
- "amount":[true,"数量","string"],
- "price":[true,"单价","price"],
- "taxRate":[true,"税率","number"],
- "totalTaxInclude":[true,"含税总金额","number"],
- "totalTaxExclude":[true,"不含税金额","number"],
- "totalTax":[true,"税金","number"]
-};
-
-COST_DETAIL={
- "num":[false,"序号","string"],
- "type":[true,"大类","string"],
- "category":[true,"类别","string"],
- "name":[true,"名称","string"],
- "unit":[true,"单位","string"],
- "amount":[true,"数量","string"],
- "price":[true,"单价","price"],
- "taxRate":[true,"税率","number"],
- "totalTaxInclude":[true,"含税总金额","number"],
- "totalTaxExclude":[true,"不含税金额","number"],
- "totalTax":[true,"税金","number"]
-};
-
-COST_PROJECT_MANAGE_DETAIL={
- "num":[false,"序号","string"],
- "type":[true,"财务费用类别","string"],
- "name1":[false,"业务项目","string"],
- "name2":[false,"业务项目","string"],
- "detail":[true,"项目明细","string"],
- "unit":[true,"单位","string"],
- "amount":[true,"数量","string"],
- "price":[true,"单价","price"],
- "total":[true,"总金额","number"],
- "predictMethod":[false,"预估计算方法","string"],
- "predictWhy":[false,"预估依据","string"],
- "remark":[false,"备注","string"],
- "deletable":[true,"是否可删除","string"]
-};
-
-BUDGET_PLAN_DETAIL={
- "month":[true,"月份"],
- "deviceCost":[true,"设备支出","number"],
- "engineerCost":[true,"工程支出","number"],
- "projectManageCost":[true,"经营性开支","number"],
- "earnestMoneyCost":[true,"保证金支出","number"],
- "totalCost":[true,"支出合计","number"],
- "saleIncome":[true,"销售收款","number"],
- "earnestMoneyIncome":[true,"保证金收款","number"],
- "totalIncome":[true,"收款合计","number"],
- "fundBalance":[true,"资金余额","number"],
- "capitalInterest":[true,"资金利息","number"],
- "underwrittenPlan":[true,"垫资计划","number"],
- "repaymentPlan":[true,"还款计划","number"]
-};
+// INCOME_DETAIL={
+// "num":[false,"序号","string"],
+// "type":[true,"类别","string"],
+// "name":[true,"名称","string"],
+// "unit":[true,"单位","string"],
+// "amount":[true,"数量","string"],
+// "price":[true,"单价","price"],
+// "taxRate":[true,"税率","number"],
+// "totalTaxInclude":[true,"含税总金额","number"],
+// "totalTaxExclude":[true,"不含税金额","number"],
+// "totalTax":[true,"税金","number"]
+// };
+//
+// COST_DETAIL={
+// "num":[false,"序号","string"],
+// "type":[true,"大类","string"],
+// "category":[true,"类别","string"],
+// "name":[true,"名称","string"],
+// "unit":[true,"单位","string"],
+// "amount":[true,"数量","string"],
+// "price":[true,"单价","price"],
+// "taxRate":[true,"税率","number"],
+// "totalTaxInclude":[true,"含税总金额","number"],
+// "totalTaxExclude":[true,"不含税金额","number"],
+// "totalTax":[true,"税金","number"]
+// };
+//
+// COST_PROJECT_MANAGE_DETAIL={
+// "num":[false,"序号","string"],
+// "type":[true,"财务费用类别","string"],
+// "name1":[false,"业务项目","string"],
+// "name2":[false,"业务项目","string"],
+// "detail":[true,"项目明细","string"],
+// "unit":[true,"单位","string"],
+// "amount":[true,"数量","string"],
+// "price":[true,"单价","price"],
+// "total":[true,"总金额","number"],
+// "predictMethod":[false,"预估计算方法","string"],
+// "predictWhy":[false,"预估依据","string"],
+// "remark":[false,"备注","string"],
+// "deletable":[true,"是否可删除","string"]
+// };
+//
+// BUDGET_PLAN_DETAIL={
+// "month":[true,"月份"],
+// "deviceCost":[true,"设备支出","number"],
+// "engineerCost":[true,"工程支出","number"],
+// "projectManageCost":[true,"经营性开支","number"],
+// "earnestMoneyCost":[true,"保证金支出","number"],
+// "totalCost":[true,"支出合计","number"],
+// "saleIncome":[true,"销售收款","number"],
+// "earnestMoneyIncome":[true,"保证金收款","number"],
+// "totalIncome":[true,"收款合计","number"],
+// "fundBalance":[true,"资金余额","number"],
+// "capitalInterest":[true,"资金利息","number"],
+// "underwrittenPlan":[true,"垫资计划","number"],
+// "repaymentPlan":[true,"还款计划","number"]
+// };
var result = 0;
@@ -88,7 +88,7 @@ $(function () {
$("#saveDraft").attr('disabled', true);
$("#collaboratorUrl").val($("#collaboratorUrl_span").text());
- checkIfFillIn();
+ // checkIfFillIn();
var dataIncome = collectData("am-modal-prompt-input-income");
if (dataIncome.length <= 0) {
@@ -97,14 +97,14 @@ $(function () {
return;
}
- var dataIncomeCheck = convertDetailVerifyCheck(dataIncome, INCOME_DETAIL, "收入明细表");
+ var dataIncomeCheck = convertDetailVerifyCheck(dataIncome, INCOME_DETAIL2, "收入明细表");
if (dataIncomeCheck == null) {
$("#saveDraft").attr('disabled', false);
return;
}
//如果没有提交则自动计算预算信息
- dataIncome = prepareAjaxDataVerify(dataIncome, INCOME_DETAIL, $("#id").val());
+ dataIncome = prepareAjaxDataVerify(dataIncome, INCOME_DETAIL2, $("#id").val());
if(dataIncome.details){
postAjax(base+"/project/budgetEditSaveIncomeDetail", dataIncome);
}
@@ -117,14 +117,14 @@ $(function () {
return;
}
- var dataCostCheck = convertDetailVerifyCheck(dataCost, COST_DETAIL, "采购成本明细表");
+ var dataCostCheck = convertDetailVerifyCheck(dataCost, COST_DETAIL2, "采购成本明细表");
if (dataCostCheck == null) {
$("#saveDraft").attr('disabled', false);
return;
}
//如果没有提交则自动计算预算信息
- dataCost = prepareAjaxDataVerify(dataCost, COST_DETAIL, $("#id").val());
+ dataCost = prepareAjaxDataVerify(dataCost, COST_DETAIL2, $("#id").val());
if(dataCost){
postAjax(base+"/project/budgetEditSaveCostDetail", dataCost);
}
@@ -137,13 +137,13 @@ $(function () {
return;
}
- var dataManageCheck = convertDetailVerifyCheck(dataManage, COST_PROJECT_MANAGE_DETAIL, "项目管理成本表");
+ var dataManageCheck = convertDetailVerifyCheck(dataManage, COST_PROJECT_MANAGE_DETAIL2, "项目管理成本表");
if (dataManageCheck == null) {
$("#saveDraft").attr('disabled', false);
return;
}
- dataManage = prepareAjaxDataVerify(dataManage, COST_PROJECT_MANAGE_DETAIL, $("#id").val());
+ dataManage = prepareAjaxDataVerify(dataManage, COST_PROJECT_MANAGE_DETAIL2, $("#id").val());
if(dataManage){
postAjax(base+"/project/budgetEditSaveCostProjectManageDetail", dataManage);
}
@@ -156,7 +156,7 @@ $(function () {
return;
}
- var dataPlanCheck = convertDetailVerifyCheck(dataPlan, BUDGET_PLAN_DETAIL, "项目资金计划表");
+ var dataPlanCheck = convertDetailVerifyCheck(dataPlan, BUDGET_PLAN_DETAIL2, "项目资金计划表");
if (dataPlanCheck == null) {
$("#saveDraft").attr('disabled', false);
return;
@@ -170,7 +170,7 @@ $(function () {
return;
}
- dataPlan = prepareAjaxDataVerify(dataPlan, BUDGET_PLAN_DETAIL, $("#id").val());
+ dataPlan = prepareAjaxDataVerify(dataPlan, BUDGET_PLAN_DETAIL2, $("#id").val());
if(dataPlan){
postAjax(base+"/project/budgetEditSaveBudgetPlanDetail", dataPlan);
}
@@ -342,7 +342,7 @@ function checkIfFillIn() {
var huazhiProductAmount = $("#huazhiProductAmount").val();
var huasanProductAmount = $("#huasanProductAmount").val();
var ziguangOtherAmount = $("#ziguangOtherAmount").val();
- var industryScenario = $("#industryScenario").val();
+ // var industryScenario = $("#industryScenario").val();
var customer = $("#customer").val();
var terminalCustomer = $("#terminalCustomer").val();
var valueRisk = $("#valueRisk").val();
@@ -472,11 +472,11 @@ function checkIfFillIn() {
return;
}
- if (industryScenario == undefined || industryScenario.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('主合同收款条款不能为空');
@@ -651,7 +651,7 @@ function convertDetailVerify(data, detailProperty) {
var arr = arrayToMatrix(data, detailPropertyArr.length);
var details = [];
for (var i = 0; i < arr.length; i++) {
- if (i === arr.length - 1 && detailProperty !== BUDGET_PLAN_DETAIL) {
+ if (i === arr.length - 1 && detailProperty !== BUDGET_PLAN_DETAIL2) {
continue;
}
var obj = arr2ObjectVerify(i, arr[i], detailPropertyArr, detailProperty);
diff --git a/src/main/resources/static/assets/js/project_budget_cost.js b/src/main/resources/static/assets/js/project_budget_cost.js
index cf53f79..792e4f1 100644
--- a/src/main/resources/static/assets/js/project_budget_cost.js
+++ b/src/main/resources/static/assets/js/project_budget_cost.js
@@ -2,6 +2,27 @@
* 一个采购成本详情的字段
*/
//COST_DETAIL_ARR=["type","category","name","unit","amount","price","taxRate","totalTaxInclude","totalTaxExclude"];
+COST_DETAIL2={
+ "num":[false,"序号","string"],
+ "type":[false,"大类","string"],
+ "category":[false,"类别","string"],
+ "name":[false,"名称","string"],
+ "unit":[false,"单位","string"],
+ "amount":[false,"数量","string"],
+ "price":[false,"单价","price"],
+ "taxRate":[false,"税率","number"],
+ "totalTaxInclude":[false,"含税总金额","number"],
+ "totalTaxExclude":[false,"不含税金额","number"],
+ "totalTax":[false,"税金","number"],
+ "contractParty":[false,"签约方","string"],
+ "isUnderwritten":[false,"是否垫资","string"],
+ "underwrittenAmount":[false,"预估垫资金额","number"],
+ "payTime":[false,"支出时间","string"],
+ "payAmount":[false,"支出金额","number"],
+ "payWay":[false,"付款方式","string"],
+ "remark":[false,"备注","string"]
+};
+
COST_DETAIL={
"num":[false,"序号","string"],
"type":[true,"大类","string"],
@@ -124,7 +145,7 @@ $(function () {
//不能使用e.data，因为无法获取动态添加的
var data = collectData("am-modal-prompt-input-cost");
//data = prepareAjaxData(data, COST_DETAIL_ARR, $("#id").val(),false);
- data = prepareAjaxDataVerify(data, COST_DETAIL, $("#id").val());
+ data = prepareAjaxDataVerify(data, COST_DETAIL2, $("#id").val());
if(data){
postAjax(base+"/project/budgetEditSaveCostDetail", data, updateCostData);
}
@@ -141,7 +162,7 @@ $(function () {
//不能使用e.data，因为无法获取动态添加的
var data = collectData("am-modal-prompt-input-cost");
//data = prepareAjaxData(data, COST_DETAIL_ARR, $("#id").val(),false);
- data = prepareAjaxDataVerify(data, COST_DETAIL, $("#id").val());
+ data = prepareAjaxDataVerify(data, COST_DETAIL2, $("#id").val());
if(data){
postAjax(base+"/project/budgetEditSaveCostDetail", data, updateCostData);
}
diff --git a/src/main/resources/static/assets/js/project_budget_cost_project_manage.js b/src/main/resources/static/assets/js/project_budget_cost_project_manage.js
index 7d4375d..8c1ef1b 100644
--- a/src/main/resources/static/assets/js/project_budget_cost_project_manage.js
+++ b/src/main/resources/static/assets/js/project_budget_cost_project_manage.js
@@ -2,6 +2,24 @@
* 一个项目管理成本详情的字段
*/
//COST_PROJECT_MANAGE_DETAIL_ARR=["type","name","detail","unit","amount","price","total","predictMethod","predictWhy","remark","deletable"];
+COST_PROJECT_MANAGE_DETAIL2={
+ "num":[false,"序号","string"],
+ "type":[false,"财务费用类别","string"],
+ "name1":[false,"业务项目","string"],
+ "name2":[false,"业务项目","string"],
+ "detail":[false,"项目明细","string"],
+ "unit":[false,"单位","string"],
+ "amount":[false,"数量","string"],
+ "price":[false,"单价","price"],
+ "total":[false,"总金额","number"],
+ "payTime":[false,"支出时间","string"],
+ "payAmount":[false,"支出金额","number"],
+ "predictMethod":[false,"预估计算方法","string"],
+ "predictWhy":[false,"预估依据","string"],
+ "remark":[false,"备注","string"],
+ "deletable":[false,"是否可删除","string"]
+};
+
COST_PROJECT_MANAGE_DETAIL={
"num":[false,"序号","string"],
"type":[true,"财务费用类别","string"],
@@ -61,7 +79,7 @@ $(function () {
//不能使用e.data，因为无法获取动态添加的
var data = collectData("am-modal-prompt-input-cost-project-manage");
//data = prepareAjaxData(data, COST_PROJECT_MANAGE_DETAIL_ARR, $("#id").val(),true);
- data = prepareAjaxDataVerify(data, COST_PROJECT_MANAGE_DETAIL, $("#id").val());
+ data = prepareAjaxDataVerify(data, COST_PROJECT_MANAGE_DETAIL2, $("#id").val());
if(data){
postAjax(base+"/project/budgetEditSaveCostProjectManageDetail", data, updateCostProjectManageData);
}
@@ -79,7 +97,7 @@ $(function () {
//不能使用e.data，因为无法获取动态添加的
var data = collectData("am-modal-prompt-input-cost-project-manage");
//data = prepareAjaxData(data, COST_PROJECT_MANAGE_DETAIL_ARR, $("#id").val(),true);
- data = prepareAjaxDataVerify(data, COST_PROJECT_MANAGE_DETAIL, $("#id").val());
+ data = prepareAjaxDataVerify(data, COST_PROJECT_MANAGE_DETAIL2, $("#id").val());
if(data){
postAjax(base+"/project/budgetEditSaveCostProjectManageDetail", data, updateCostProjectManageData);
}
diff --git a/src/main/resources/static/assets/js/project_budget_income.js b/src/main/resources/static/assets/js/project_budget_income.js
index 9269f4c..8efab17 100644
--- a/src/main/resources/static/assets/js/project_budget_income.js
+++ b/src/main/resources/static/assets/js/project_budget_income.js
@@ -2,6 +2,19 @@
* 一个收入详情的字段
*/
//INCOME_DETAIL_ARR=["type","name","unit","amount","price","taxRate","totalTaxInclude","totalTaxExclude"];
+INCOME_DETAIL2={
+ "num":[false,"序号","string"],
+ "type":[false,"类别","string"],
+ "name":[false,"名称","string"],
+ "unit":[false,"单位","string"],
+ "amount":[false,"数量","string"],
+ "price":[false,"单价","price"],
+ "taxRate":[false,"税率","number"],
+ "totalTaxInclude":[false,"含税总金额","number"],
+ "totalTaxExclude":[false,"不含税金额","number"],
+ "totalTax":[false,"税金","number"]
+};
+
INCOME_DETAIL={
"num":[false,"序号","string"],
"type":[true,"类别","string"],
@@ -47,7 +60,7 @@ $(function () {
//不能使用e.data，因为无法获取动态添加的
var data = collectData("am-modal-prompt-input-income");
//data = prepareAjaxData(data, INCOME_DETAIL_ARR, $("#id").val(),false);
- data = prepareAjaxDataVerify(data, INCOME_DETAIL, $("#id").val());
+ data = prepareAjaxDataVerify(data, INCOME_DETAIL2, $("#id").val());
if(data.details){
postAjax(base+"/project/budgetEditSaveIncomeDetail", data, updateIncomeData);
}
@@ -62,7 +75,7 @@ $(function () {
$(function () {
$("#incomeTableSave").click(function () {
var data = collectData("am-modal-prompt-input-income");
- data = prepareAjaxDataVerify(data, INCOME_DETAIL, $("#id").val());
+ data = prepareAjaxDataVerify(data, INCOME_DETAIL2, $("#id").val());
if(data.details){
postAjax(base+"/project/budgetEditSaveIncomeDetail", data, updateIncomeData);
}
diff --git a/src/main/resources/static/assets/js/project_budget_plan.js b/src/main/resources/static/assets/js/project_budget_plan.js
index 3154c2c..a90f7fa 100644
--- a/src/main/resources/static/assets/js/project_budget_plan.js
+++ b/src/main/resources/static/assets/js/project_budget_plan.js
@@ -2,6 +2,22 @@
* 一个资金计划的字段
*/
BUDGET_PLAN_DETAIL_ARR=["month","deviceCost","engineerCost","projectManageCost","earnestMoneyCost","totalCost","saleIncome","earnestMoneyIncome","totalIncome","fundBalance","capitalInterest","underwrittenPlan","repaymentPlan"];
+BUDGET_PLAN_DETAIL2={
+ "month":[true,"月份"],
+ "deviceCost":[false,"设备支出","number"],
+ "engineerCost":[false,"工程支出","number"],
+ "projectManageCost":[false,"经营性开支","number"],
+ "earnestMoneyCost":[false,"保证金支出","number"],
+ "totalCost":[false,"支出合计","number"],
+ "saleIncome":[false,"销售收款","number"],
+ "earnestMoneyIncome":[false,"保证金收款","number"],
+ "totalIncome":[false,"收款合计","number"],
+ "fundBalance":[false,"资金余额","number"],
+ "capitalInterest":[false,"资金利息","number"],
+ "underwrittenPlan":[false,"垫资计划","number"],
+ "repaymentPlan":[false,"还款计划","number"]
+};
+
BUDGET_PLAN_DETAIL={
"month":[true,"月份"],
"deviceCost":[true,"设备支出","number"],
@@ -78,7 +94,7 @@ $(function () {
//不能使用e.data，因为无法获取动态添加的
var data = collectData("am-modal-prompt-input-budget-plan-detail");
//data = prepareAjaxData(data, BUDGET_PLAN_DETAIL_ARR, $("#id").val(),false);
- data = prepareAjaxDataVerify(data, BUDGET_PLAN_DETAIL, $("#id").val());
+ data = prepareAjaxDataVerify(data, BUDGET_PLAN_DETAIL2, $("#id").val());
if(data){
postAjax(base+"/project/budgetEditSaveBudgetPlanDetail", data, updateBudgetPlanDetailData);
}
@@ -277,7 +293,7 @@ $(function () {
//不能使用e.data，因为无法获取动态添加的
var data = collectData("am-modal-prompt-input-budget-plan-detail");
//data = prepareAjaxData(data, BUDGET_PLAN_DETAIL_ARR, $("#id").val(),false);
- data = prepareAjaxDataVerify(data, BUDGET_PLAN_DETAIL, $("#id").val());
+ data = prepareAjaxDataVerify(data, BUDGET_PLAN_DETAIL2, $("#id").val());
if(data){
postAjax(base+"/project/budgetEditSaveBudgetPlanDetail", data, updateBudgetPlanDetailData);
}
diff --git a/src/main/resources/templates/admin/project_budget_edit.ftl b/src/main/resources/templates/admin/project_budget_edit.ftl
index b1faab7..51e7e9b 100644
--- a/src/main/resources/templates/admin/project_budget_edit.ftl
+++ b/src/main/resources/templates/admin/project_budget_edit.ftl
@@ -71,7 +71,7 @@
<div class="am-u-sm-6 am-u-md-6">
<input type="text" id="projectNo" class="am-input" data-validate-async data-validation-message="请输入项目编号（50字符以内）"
name="projectNo" placeholder="请输入项目编号（50字符以内）" maxlength="50"
- value="${project.projectNo!}" required readonly />
+ value="${project.projectNo!}" readonly />
</div>
<div class="am-u-sm-2 am-u-md-4 input-msg"></div>
</div>
@@ -81,7 +81,7 @@
<div class="am-u-sm-6 am-u-md-6">
<input type="text" class="am-input" data-validate-async data-validation-message="请输入项目名称（1000字符以内）"
name="name" placeholder="请输入项目名称（1000字符以内）" maxlength="1000" id="name"
- value="${project.name!}" required/>
+ value="${project.name!}" />
</div>
<div class="am-u-sm-2 am-u-md-4 input-msg"></div>
</div>
@@ -168,7 +168,7 @@
<div class="am-u-sm-6 am-u-md-6">
<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 />
+ value="${Utils.format(project.advanceInterestAmount)}" />
</div>
<div class="am-u-sm-2 am-u-md-4 input-msg"></div>
</div>
@@ -177,7 +177,7 @@
<div class="am-u-sm-6 am-u-md-6">
<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 />
+ value="${Utils.format(project.advancePeakAmount)}" />
</div>
<div class="am-u-sm-2 am-u-md-4 input-msg"></div>
</div>
@@ -187,7 +187,7 @@
<div class="am-u-sm-6 am-u-md-6">
<input type="text" class="number am-input" data-validate-async data-validation-message="请输入合同金额"
name="contractAmount" placeholder="单位（元）" maxlength="20" id="contractAmount"
- value="${Utils.format(project.contractAmount)}" required />
+ value="${Utils.format(project.contractAmount)}" />
</div>
<div class="am-u-sm-2 am-u-md-4 input-msg"></div>
</div>
@@ -197,7 +197,7 @@
<div class="am-u-sm-6 am-u-md-6">
<input type="text" class="number am-input" data-validate-async data-validation-message="请输入项目毛利"
name="grossProfit" id="grossProfit" placeholder="单位（元）" maxlength="16"
- value="${Utils.format(project.grossProfit)}" required />
+ value="${Utils.format(project.grossProfit)}" />
</div>
<div class="am-u-sm-2 am-u-md-4 input-msg"></div>
</div>
@@ -207,7 +207,7 @@
<div class="am-u-sm-6 am-u-md-6">
<input type="text" class="number am-input" data-validate-async data-validation-message="请输入项目毛利率"
name="grossProfitMargin" id="grossProfitMargin" placeholder="单位（%）" maxlength="16"
- value="${Utils.format(project.grossProfitMargin)}" required />
+ value="${Utils.format(project.grossProfitMargin)}" />
</div>
<div class="am-u-sm-2 am-u-md-4 input-msg"></div>
</div>
@@ -217,7 +217,7 @@
<div class="am-u-sm-6 am-u-md-6">
<input type="text" class="number am-input" data-validation-message="请输入汇智产品金额"
name="huizhiProductAmount" placeholder="单位（元）" maxlength="20" id="huizhiProductAmount"
- value="${Utils.format(project.huizhiProductAmount, "0.00")}" required />
+ value="${Utils.format(project.huizhiProductAmount, "0.00")}" />
</div>
<div class="am-u-sm-2 am-u-md-4 input-msg"></div>
</div>
@@ -227,7 +227,7 @@
<div class="am-u-sm-6 am-u-md-6">
<input type="text" class="number am-input" data-validation-message="华智产品金额"
name="huazhiProductAmount" placeholder="单位（元）" maxlength="20" id="huazhiProductAmount"
- value="${Utils.format(project.huazhiProductAmount, "0.00")}" required />
+ value="${Utils.format(project.huazhiProductAmount, "0.00")}" />
</div>
<div class="am-u-sm-2 am-u-md-4 input-msg"></div>
</div>
@@ -238,7 +238,7 @@
<div class="am-u-sm-6 am-u-md-6">
<input type="text" class="number am-input" data-validation-message="华三产品金额"
name="huasanProductAmount" placeholder="单位（元）" maxlength="20" id="huasanProductAmount"
- value="${Utils.format(project.huasanProductAmount, "0.00")}" required />
+ value="${Utils.format(project.huasanProductAmount, "0.00")}" />
</div>
<div class="am-u-sm-2 am-u-md-4 input-msg"></div>
</div>
@@ -248,7 +248,7 @@
<div class="am-u-sm-6 am-u-md-6">
<input type="text" class="number am-input" data-validation-message="请输入其他产品金额"
name="ziguangOtherAmount" placeholder="单位（元）" maxlength="20" id="ziguangOtherAmount"
- value="${Utils.format(project.ziguangOtherAmount, "0.00")}" required />
+ value="${Utils.format(project.ziguangOtherAmount, "0.00")}" />
</div>
<div class="am-u-sm-2 am-u-md-4 input-msg"></div>
</div>
@@ -274,9 +274,39 @@
<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="text" class="am-input" data-validate-async data-validation-message="请输入行业场景应用"
- name="industryScenario" placeholder="请输入行业场景应用" maxlength="20" id="industryScenario"
- value="${project.industryScenario!}" required/>
+ <select data-am-selected id="industryScene" name="industryScene">
+ <#if project.industryScene??>
+ <option value="1" <#if project.industryScene=1>selected</#if>>信息安全</option>
+ <option value="2" <#if project.industryScene=2>selected</#if>>政府</option>
+ <option value="3" <#if project.industryScene=3>selected</#if>>公安</option>
+ <option value="4" <#if project.industryScene=4>selected</#if>>企业</option>
+ <option value="5" <#if project.industryScene=5>selected</#if>>教育</option>
+ <option value="6" <#if project.industryScene=6>selected</#if>>交通</option>
+ <option value="7" <#if project.industryScene=7>selected</#if>>医疗</option>
+ <option value="8" <#if project.industryScene=8>selected</#if>>电力资源</option>
+ <option value="9" <#if project.industryScene=9>selected</#if>>运营商</option>
+ <option value="10" <#if project.industryScene=10>selected</#if>>金融</option>
+ <option value="11" <#if project.industryScene=11>selected</#if>>专网</option>
+ <option value="12" <#if project.industryScene=12>selected</#if>>其他</option>
+ <option value="13" <#if project.industryScene=13>selected</#if>>互联网</option>
+ <option value="14" <#if project.industryScene=14>selected</#if>>银行</option>
+ <#else>
+ <option value="1" >信息安全</option>
+ <option value="2" >政府</option>
+ <option value="3" >公安</option>
+ <option value="4" >企业</option>
+ <option value="5" >教育</option>
+ <option value="6" >交通</option>
+ <option value="7" >医疗</option>
+ <option value="8" >电力资源</option>
+ <option value="9" >运营商</option>
+ <option value="10" >金融</option>
+ <option value="11" >专网</option>
+ <option value="12" >其他</option>
+ <option value="13" >互联网</option>
+ <option value="14" >银行</option>
+ </#if>
+ </select>
</div>
<div class="am-u-sm-2 am-u-md-4 input-msg"></div>
</div>
@@ -304,7 +334,7 @@
<div class="am-u-sm-6 am-u-md-6">
<input type="text" class="am-input" data-validate-async data-validation-message="请输入客户名称（1000字符以内）"
name="customer" placeholder="请输入客户名称（1000字符以内）" maxlength="1000" id="customer"
- value="${project.customer!}" required/>
+ value="${project.customer!}" />
</div>
<div class="am-u-sm-2 am-u-md-4 input-msg"></div>
</div>
@@ -314,7 +344,7 @@
<div class="am-u-sm-6 am-u-md-6">
<input type="text" class="am-input" data-validate-async data-validation-message="请输入最终用户名称（1000字符以内）"
name="terminalCustomer" placeholder="请输入最终用户名称（1000字符以内）" maxlength="1000" id="terminalCustomer"
- value="${project.terminalCustomer!}" required/>
+ value="${project.terminalCustomer!}" />
</div>
<div class="am-u-sm-2 am-u-md-4 input-msg"></div>
</div>
@@ -325,7 +355,7 @@
<div class="am-u-sm-6 am-u-md-6">
<textarea rows="5" cols="20" id="valueRisk" name="valueRisk" maxlength="1000"
class="am-input" data-validate-async data-validation-message="请输入价值及风险"
- placeholder="请输入价值及风险" required
+ placeholder="请输入价值及风险"
>${project.valueRisk!}</textarea>
</div>
<div class="am-u-sm-2 am-u-md-4 input-msg"></div>
@@ -456,20 +486,20 @@
<#-- <tr>-->
<#-- <td>收入</td>-->
<#-- <td>设备类</td>-->
-<#-- <td><input type="text" class="number" name="incomeDeviceTaxInclude1" value="${Utils.format(estimateBean.incomeDeviceTaxInclude)}" required readonly></td>-->
-<#-- <td><input type="text" class="number" name="incomeDeviceTaxExclude1" value="${Utils.format(estimateBean.incomeDeviceTaxExclude)}" required readonly></td>-->
+<#-- <td><input type="text" class="number" name="incomeDeviceTaxInclude1" value="${Utils.format(estimateBean.incomeDeviceTaxInclude)}" readonly></td>-->
+<#-- <td><input type="text" class="number" name="incomeDeviceTaxExclude1" value="${Utils.format(estimateBean.incomeDeviceTaxExclude)}" readonly></td>-->
<#-- </tr>-->
<#-- <tr>-->
<#-- <td>收入</td>-->
<#-- <td>工程类</td>-->
-<#-- <td><input type="text" class="number" name="incomeEngineerTaxInclude1" value="${Utils.format(estimateBean.incomeEngineerTaxInclude)}" required readonly></td>-->
-<#-- <td><input type="text" class="number" name="incomeEngineerTaxExclude1" value="${Utils.format(estimateBean.incomeEngineerTaxExclude)}" required readonly></td>-->
+<#-- <td><input type="text" class="number" name="incomeEngineerTaxInclude1" value="${Utils.format(estimateBean.incomeEngineerTaxInclude)}" readonly></td>-->
+<#-- <td><input type="text" class="number" name="incomeEngineerTaxExclude1" value="${Utils.format(estimateBean.incomeEngineerTaxExclude)}" readonly></td>-->
<#-- </tr>-->
<#-- <tr>-->
<#-- <td>收入</td>-->
<#-- <td>服务类</td>-->
-<#-- <td><input type="text" class="number" name="incomeServiceTaxInclude1" value="${Utils.format(estimateBean.incomeServiceTaxInclude)}" required readonly></td>-->
-<#-- <td><input type="text" class="number" name="incomeServiceTaxExclude1" value="${Utils.format(estimateBean.incomeServiceTaxExclude)}" required readonly></td>-->
+<#-- <td><input type="text" class="number" name="incomeServiceTaxInclude1" value="${Utils.format(estimateBean.incomeServiceTaxInclude)}" readonly></td>-->
+<#-- <td><input type="text" class="number" name="incomeServiceTaxExclude1" value="${Utils.format(estimateBean.incomeServiceTaxExclude)}" readonly></td>-->
<#-- </tr>-->
<#-- <tr>-->
<#-- <td>合计</td>-->
@@ -493,36 +523,36 @@
<#-- <td>成本</td>-->
<#-- <td>采购成本</td>-->
<#-- <td>设备</td>-->
-<#-- <td><input type="text" class="number" name="costPurchaseDeviceTaxInclude1" value="${Utils.format(estimateBean.costPurchaseDeviceTaxInclude)}" required readonly></td>-->
-<#-- <td><input type="text" class="number" name="costPurchaseDeviceTaxExclude1" value="${Utils.format(estimateBean.costPurchaseDeviceTaxExclude)}" required readonly></td>-->
+<#-- <td><input type="text" class="number" name="costPurchaseDeviceTaxInclude1" value="${Utils.format(estimateBean.costPurchaseDeviceTaxInclude)}" readonly></td>-->
+<#-- <td><input type="text" class="number" name="costPurchaseDeviceTaxExclude1" value="${Utils.format(estimateBean.costPurchaseDeviceTaxExclude)}" readonly></td>-->
<#-- </tr>-->
<#-- <tr>-->
<#-- <td>成本</td>-->
<#-- <td>采购成本</td>-->
<#-- <td>施工</td>-->
-<#-- <td><input type="text" class="number" name="costPurchaseBuildTaxInclude1" value="${Utils.format(estimateBean.costPurchaseBuildTaxInclude)}" required readonly></td>-->
-<#-- <td><input type="text" class="number" name="costPurchaseBuildTaxExclude1" value="${Utils.format(estimateBean.costPurchaseBuildTaxExclude)}" required readonly></td>-->
+<#-- <td><input type="text" class="number" name="costPurchaseBuildTaxInclude1" value="${Utils.format(estimateBean.costPurchaseBuildTaxInclude)}" readonly></td>-->
+<#-- <td><input type="text" class="number" name="costPurchaseBuildTaxExclude1" value="${Utils.format(estimateBean.costPurchaseBuildTaxExclude)}" readonly></td>-->
<#-- </tr>-->
<#-- <tr>-->
<#-- <td>成本</td>-->
<#-- <td>采购成本</td>-->
<#-- <td>服务</td>-->
-<#-- <td><input type="text" class="number" name="costPurchaseServiceTaxInclude1" value="${Utils.format(estimateBean.costPurchaseServiceTaxInclude)}" required readonly></td>-->
-<#-- <td><input type="text" class="number" name="costPurchaseServiceTaxExclude1" value="${Utils.format(estimateBean.costPurchaseServiceTaxExclude)}" required readonly></td>-->
+<#-- <td><input type="text" class="number" name="costPurchaseServiceTaxInclude1" value="${Utils.format(estimateBean.costPurchaseServiceTaxInclude)}" readonly></td>-->
+<#-- <td><input type="text" class="number" name="costPurchaseServiceTaxExclude1" value="${Utils.format(estimateBean.costPurchaseServiceTaxExclude)}" readonly></td>-->
<#-- </tr>-->
<#-- <tr>-->
<#-- <td>成本</td>-->
<#-- <td>采购成本</td>-->
<#-- <td>其他</td>-->
-<#-- <td><input type="text" class="number" name="costPurchaseOtherTaxInclude1" value="${Utils.format(estimateBean.costPurchaseOtherTaxInclude)}" required readonly></td>-->
-<#-- <td><input type="text" class="number" name="costPurchaseOtherTaxExclude1" value="${Utils.format(estimateBean.costPurchaseOtherTaxExclude)}" required readonly></td>-->
+<#-- <td><input type="text" class="number" name="costPurchaseOtherTaxInclude1" value="${Utils.format(estimateBean.costPurchaseOtherTaxInclude)}" readonly></td>-->
+<#-- <td><input type="text" class="number" name="costPurchaseOtherTaxExclude1" value="${Utils.format(estimateBean.costPurchaseOtherTaxExclude)}" readonly></td>-->
<#-- </tr>-->
<#-- <tr>-->
<#-- <td>成本</td>-->
<#-- <td>项目管理成本</td>-->
<#-- <td>项目管理成本</td>-->
-<#-- <td><input type="text" class="number" name="costProjectManageTaxInclude1" value="${Utils.format(estimateBean.costProjectManageTaxExclude)}" required readonly></td>-->
-<#-- <td><input type="text" class="number" name="costProjectManageTaxExclude1" value="${Utils.format(estimateBean.costProjectManageTaxExclude)}" required readonly></td>-->
+<#-- <td><input type="text" class="number" name="costProjectManageTaxInclude1" value="${Utils.format(estimateBean.costProjectManageTaxExclude)}" readonly></td>-->
+<#-- <td><input type="text" class="number" name="costProjectManageTaxExclude1" value="${Utils.format(estimateBean.costProjectManageTaxExclude)}" readonly></td>-->
<#-- </tr>-->
<#-- <tr>-->
<#-- <td>成本</td>-->
@@ -551,12 +581,12 @@
<#-- <tr>-->
<#-- <td>财务费用</td>-->
<#-- <td>资金占用成本</td>-->
-<#-- <td><input type="text" class="number" name="costExpropriationTaxExclude1" value="${Utils.format(estimateBean.costExpropriationTaxExclude)}" required readonly></td>-->
+<#-- <td><input type="text" class="number" name="costExpropriationTaxExclude1" value="${Utils.format(estimateBean.costExpropriationTaxExclude)}" readonly></td>-->
<#-- </tr>-->
<#-- <tr>-->
<#-- <td>公司管理费用</td>-->
<#-- <td></td>-->
-<#-- <td><input type="text" class="number" name="costCompanyManageTaxExclude1" value="${Utils.format(estimateBean.costCompanyManageTaxExclude)}" required readonly></td>-->
+<#-- <td><input type="text" class="number" name="costCompanyManageTaxExclude1" value="${Utils.format(estimateBean.costCompanyManageTaxExclude)}" readonly></td>-->
<#-- </tr>-->
<#-- </tbody>-->
<#-- </table>-->
@@ -1050,30 +1080,30 @@
<tr>
<td>收入</td>
<td>设备类</td>
- <td><input type="text" class="number" name="incomeDeviceTaxInclude" value="${Utils.format(budgetBean.incomeDeviceTaxInclude,'0')}" required readonly title="设备类含税总额"></td>
- <td><input type="text" class="number" name="incomeDeviceTaxExclude" value="${Utils.format(budgetBean.incomeDeviceTaxExclude,'0')}" required readonly title="设备类不含税总额"></td>
- <td><input type="text" class="number" name="incomeDeviceTax" value="${Utils.format(budgetBean.incomeDeviceTax,'0')}" required readonly title="设备类税金"></td>
+ <td><input type="text" class="number" name="incomeDeviceTaxInclude" value="${Utils.format(budgetBean.incomeDeviceTaxInclude,'0')}" readonly title="设备类含税总额"></td>
+ <td><input type="text" class="number" name="incomeDeviceTaxExclude" value="${Utils.format(budgetBean.incomeDeviceTaxExclude,'0')}" readonly title="设备类不含税总额"></td>
+ <td><input type="text" class="number" name="incomeDeviceTax" value="${Utils.format(budgetBean.incomeDeviceTax,'0')}" readonly title="设备类税金"></td>
</tr>
<tr>
<td>收入</td>
<td>工程类</td>
- <td><input type="text" class="number" name="incomeEngineerTaxInclude" value="${Utils.format(budgetBean.incomeEngineerTaxInclude,'0')}" required readonly title="工程类含税总额"></td>
- <td><input type="text" class="number" name="incomeEngineerTaxExclude" value="${Utils.format(budgetBean.incomeEngineerTaxExclude,'0')}" required readonly title="工程类不含税总额"></td>
- <td><input type="text" class="number" name="incomeEngineerTax" value="${Utils.format(budgetBean.incomeEngineerTax,'0')}" required readonly title="工程类税金"></td>
+ <td><input type="text" class="number" name="incomeEngineerTaxInclude" value="${Utils.format(budgetBean.incomeEngineerTaxInclude,'0')}" readonly title="工程类含税总额"></td>
+ <td><input type="text" class="number" name="incomeEngineerTaxExclude" value="${Utils.format(budgetBean.incomeEngineerTaxExclude,'0')}" readonly title="工程类不含税总额"></td>
+ <td><input type="text" class="number" name="incomeEngineerTax" value="${Utils.format(budgetBean.incomeEngineerTax,'0')}" readonly title="工程类税金"></td>
</tr>
<tr>
<td>收入</td>
<td>服务类</td>
- <td><input type="text" class="number" name="incomeServiceTaxInclude" value="${Utils.format(budgetBean.incomeServiceTaxInclude,'0')}" required readonly title="服务类含税总额"></td>
- <td><input type="text" class="number" name="incomeServiceTaxExclude" value="${Utils.format(budgetBean.incomeServiceTaxExclude,'0')}" required readonly title="服务类不含税总额"></td>
- <td><input type="text" class="number" name="incomeServiceTax" value="${Utils.format(budgetBean.incomeServiceTax,'0')}" required readonly title="服务类税金"></td>
+ <td><input type="text" class="number" name="incomeServiceTaxInclude" value="${Utils.format(budgetBean.incomeServiceTaxInclude,'0')}" readonly title="服务类含税总额"></td>
+ <td><input type="text" class="number" name="incomeServiceTaxExclude" value="${Utils.format(budgetBean.incomeServiceTaxExclude,'0')}" readonly title="服务类不含税总额"></td>
+ <td><input type="text" class="number" name="incomeServiceTax" value="${Utils.format(budgetBean.incomeServiceTax,'0')}" readonly title="服务类税金"></td>
</tr>
<tr>
<td>合计</td>
<td></td>
- <td><input type="text" class="number" name="incomeTotalTaxInclude" value="${Utils.format(budgetBean.incomeTotalTaxInclude,'0')}" readonly required title="此列累计"></td>
- <td><input type="text" class="number" name="incomeTotalTaxExclude" value="${Utils.format(budgetBean.incomeTotalTaxExclude,'0')}" readonly required title="此列累计"></td>
- <td><input type="text" class="number" name="incomeTotalTax" value="${Utils.format(budgetBean.incomeTotalTax,'0')}" required readonly title="此列累计"></td>
+ <td><input type="text" class="number" name="incomeTotalTaxInclude" value="${Utils.format(budgetBean.incomeTotalTaxInclude,'0')}" readonly title="此列累计"></td>
+ <td><input type="text" class="number" name="incomeTotalTaxExclude" value="${Utils.format(budgetBean.incomeTotalTaxExclude,'0')}" readonly title="此列累计"></td>
+ <td><input type="text" class="number" name="incomeTotalTax" value="${Utils.format(budgetBean.incomeTotalTax,'0')}" readonly title="此列累计"></td>
</tr>
</tbody>
(备注：本表所用税率为：<span class="incomeTaxRates">${incomeTaxRates!}</span>)
@@ -1095,41 +1125,41 @@
<td>成本</td>
<td>采购成本</td>
<td>设备</td>
- <td><input type="text" class="number" name="costPurchaseDeviceTaxInclude" value="${Utils.format(budgetBean.costPurchaseDeviceTaxInclude,'0')}" readonly required title="购买设备含税总额"></td>
- <td><input type="text" class="number" name="costPurchaseDeviceTaxExclude" value="${Utils.format(budgetBean.costPurchaseDeviceTaxExclude,'0')}" readonly required title="购买设备不含税总额"></td>
- <td><input type="text" class="number" name="costPurchaseDeviceTax" value="${Utils.format(budgetBean.costPurchaseDeviceTax,'0')}" readonly required title="购买设备税金"></td>
+ <td><input type="text" class="number" name="costPurchaseDeviceTaxInclude" value="${Utils.format(budgetBean.costPurchaseDeviceTaxInclude,'0')}" readonly title="购买设备含税总额"></td>
+ <td><input type="text" class="number" name="costPurchaseDeviceTaxExclude" value="${Utils.format(budgetBean.costPurchaseDeviceTaxExclude,'0')}" readonly title="购买设备不含税总额"></td>
+ <td><input type="text" class="number" name="costPurchaseDeviceTax" value="${Utils.format(budgetBean.costPurchaseDeviceTax,'0')}" readonly title="购买设备税金"></td>
</tr>
<tr>
<td>成本</td>
<td>采购成本</td>
<td>施工</td>
- <td><input type="text" class="number" name="costPurchaseBuildTaxInclude" value="${Utils.format(budgetBean.costPurchaseBuildTaxInclude,'0')}" readonly required title="购买施工含税总额"></td>
- <td><input type="text" class="number" name="costPurchaseBuildTaxExclude" value="${Utils.format(budgetBean.costPurchaseBuildTaxExclude,'0')}" readonly required title="购买施工不含税总额"></td>
- <td><input type="text" class="number" name="costPurchaseBuildTax" value="${Utils.format(budgetBean.costPurchaseBuildTax,'0')}" readonly required title="购买施工税金"></td>
+ <td><input type="text" class="number" name="costPurchaseBuildTaxInclude" value="${Utils.format(budgetBean.costPurchaseBuildTaxInclude,'0')}" readonly title="购买施工含税总额"></td>
+ <td><input type="text" class="number" name="costPurchaseBuildTaxExclude" value="${Utils.format(budgetBean.costPurchaseBuildTaxExclude,'0')}" readonly title="购买施工不含税总额"></td>
+ <td><input type="text" class="number" name="costPurchaseBuildTax" value="${Utils.format(budgetBean.costPurchaseBuildTax,'0')}" readonly title="购买施工税金"></td>
</tr>
<tr>
<td>成本</td>
<td>采购成本</td>
<td>服务</td>
- <td><input type="text" class="number" name="costPurchaseServiceTaxInclude" value="${Utils.format(budgetBean.costPurchaseServiceTaxInclude,'0')}" readonly required title="购买服务含税总额"></td>
- <td><input type="text" class="number" name="costPurchaseServiceTaxExclude" value="${Utils.format(budgetBean.costPurchaseServiceTaxExclude,'0')}" readonly required title="购买服务不含税总额"></td>
- <td><input type="text" class="number" name="costPurchaseServiceTax" value="${Utils.format(budgetBean.costPurchaseServiceTax,'0')}" readonly required title="购买服务税金"></td>
+ <td><input type="text" class="number" name="costPurchaseServiceTaxInclude" value="${Utils.format(budgetBean.costPurchaseServiceTaxInclude,'0')}" readonly title="购买服务含税总额"></td>
+ <td><input type="text" class="number" name="costPurchaseServiceTaxExclude" value="${Utils.format(budgetBean.costPurchaseServiceTaxExclude,'0')}" readonly title="购买服务不含税总额"></td>
+ <td><input type="text" class="number" name="costPurchaseServiceTax" value="${Utils.format(budgetBean.costPurchaseServiceTax,'0')}" readonly title="购买服务税金"></td>
</tr>
<tr>
<td>成本</td>
<td>采购成本</td>
<td>其他</td>
- <td><input type="text" class="number" name="costPurchaseOtherTaxInclude" value="${Utils.format(budgetBean.costPurchaseOtherTaxInclude,'0')}" readonly required title="购买其他含税总额"></td>
- <td><input type="text" class="number" name="costPurchaseOtherTaxExclude" value="${Utils.format(budgetBean.costPurchaseOtherTaxExclude,'0')}" readonly required title="购买其他不含税总额"></td>
- <td><input type="text" class="number" name="costPurchaseOtherTax" value="${Utils.format(budgetBean.costPurchaseOtherTax,'0')}" readonly required title="购买其他税金"></td>
+ <td><input type="text" class="number" name="costPurchaseOtherTaxInclude" value="${Utils.format(budgetBean.costPurchaseOtherTaxInclude,'0')}" readonly title="购买其他含税总额"></td>
+ <td><input type="text" class="number" name="costPurchaseOtherTaxExclude" value="${Utils.format(budgetBean.costPurchaseOtherTaxExclude,'0')}" readonly title="购买其他不含税总额"></td>
+ <td><input type="text" class="number" name="costPurchaseOtherTax" value="${Utils.format(budgetBean.costPurchaseOtherTax,'0')}" readonly title="购买其他税金"></td>
</tr>
<tr>
<td>成本</td>
<td>项目管理成本</td>
<td>项目管理成本</td>
- <td><input type="text" class="number" name="costProjectManageTaxInclude" value="${Utils.format(budgetBean.costProjectManageTaxInclude,'0')}" readonly required title="项目管理成本总额含税"></td>
- <td><input type="text" class="number" name="costProjectManageTaxExclude" value="${Utils.format(budgetBean.costProjectManageTaxExclude,'0')}" readonly required title="项目管理成本总额不含税"></td>
- <td><input type="text" class="number" name="costProjectManageTax" value="财务计取以不含税方式核算" readonly required title="项目管理成本税金"></td>
+ <td><input type="text" class="number" name="costProjectManageTaxInclude" value="${Utils.format(budgetBean.costProjectManageTaxInclude,'0')}" readonly title="项目管理成本总额含税"></td>
+ <td><input type="text" class="number" name="costProjectManageTaxExclude" value="${Utils.format(budgetBean.costProjectManageTaxExclude,'0')}" readonly title="项目管理成本总额不含税"></td>
+ <td><input type="text" class="number" name="costProjectManageTax" value="财务计取以不含税方式核算" readonly title="项目管理成本税金"></td>
</tr>
<tr>
<td>成本</td>
@@ -1144,9 +1174,9 @@
<td>合计</td>
<td></td>
<td></td>
- <td><input type="text" class="number" name="costTotalTaxInclude" value="${Utils.format(budgetBean.costTotalTaxInclude,'0')}" readonly required title="此列累计"></td>
- <td><input type="text" class="number" name="costTotalTaxExclude" value="${Utils.format(budgetBean.costTotalTaxExclude,'0')}" readonly required title="此列累计"></td>
- <td><input type="text" class="number" name="costTotalTax" value="${Utils.format(budgetBean.costTotalTax,'0')}" readonly required title="此列累计"></td>
+ <td><input type="text" class="number" name="costTotalTaxInclude" value="${Utils.format(budgetBean.costTotalTaxInclude,'0')}" readonly title="此列累计"></td>
+ <td><input type="text" class="number" name="costTotalTaxExclude" value="${Utils.format(budgetBean.costTotalTaxExclude,'0')}" readonly title="此列累计"></td>
+ <td><input type="text" class="number" name="costTotalTax" value="${Utils.format(budgetBean.costTotalTax,'0')}" readonly title="此列累计"></td>
</tr>
</tbody>
(备注：本表所用税率为：<span class="costTaxRates">${costTaxRates!}</span>)
@@ -1163,12 +1193,12 @@
<tr>
<td>财务费用</td>
<td>资金占用成本</td>
- <td><input type="text" class="number" name="costExpropriationTaxExclude" value="${Utils.format(budgetBean.costExpropriationTaxExclude,'0')}" required readonly title="资金占用成本不含税总额"></td>
+ <td><input type="text" class="number" name="costExpropriationTaxExclude" value="${Utils.format(budgetBean.costExpropriationTaxExclude,'0')}" readonly title="资金占用成本不含税总额"></td>
</tr>
<tr>
<td>公司管理费用</td>
<td></td>
- <td><input type="text" class="number" maxlength="16" name="costCompanyManageTaxExclude" value="${Utils.format(budgetBean.costCompanyManageTaxExclude,'0')}" readonly required title="公司管理费用不含税总额"></td>
+ <td><input type="text" class="number" maxlength="16" name="costCompanyManageTaxExclude" value="${Utils.format(budgetBean.costCompanyManageTaxExclude,'0')}" readonly title="公司管理费用不含税总额"></td>
</tr>
</tbody>
(备注：财务计取以不含税方式核算)
@@ -1185,14 +1215,14 @@
</tr>
<tr>
<td>项目毛利（元）</td>
- <td><input type="text" class="number" name="projectGrossProfitRate" value="${Utils.format(budgetBean.projectGrossProfitRate,'0')}" readonly required title="毛利（不含税）/收入总计（不含税）"></td>
- <td><input type="text" class="number" name="projectGrossProfit" value="${Utils.format(budgetBean.projectGrossProfit,'0')}" readonly required title="收入总计（不含税）-成本总计（不含税）-财务费用总计（不含税）"></td>
+ <td><input type="text" class="number" name="projectGrossProfitRate" value="${Utils.format(budgetBean.projectGrossProfitRate,'0')}" readonly title="毛利（不含税）/收入总计（不含税）"></td>
+ <td><input type="text" class="number" name="projectGrossProfit" value="${Utils.format(budgetBean.projectGrossProfit,'0')}" readonly title="收入总计（不含税）-成本总计（不含税）-财务费用总计（不含税）"></td>
<td>毛利=收入总计(不含税)-成本总计(不含税)-财务费用总计(不含税)</td>
</tr>
<tr>
<td>项目贡献利润（元）</td>
- <td><input type="text" class="number" name="projectContributionProfitRate" value="${Utils.format(budgetBean.projectContributionProfitRate,'0')}" readonly required title="贡献利润（不含税）/收入总计（不含税）"></td>
- <td><input type="text" class="number" name="projectContributionProfit" value="${Utils.format(budgetBean.projectContributionProfit,'0')}" readonly required title="项目毛利（不含税）-公司管理费用总计（不含税）"></td>
+ <td><input type="text" class="number" name="projectContributionProfitRate" value="${Utils.format(budgetBean.projectContributionProfitRate,'0')}" readonly title="贡献利润（不含税）/收入总计（不含税）"></td>
+ <td><input type="text" class="number" name="projectContributionProfit" value="${Utils.format(budgetBean.projectContributionProfit,'0')}" readonly title="项目毛利（不含税）-公司管理费用总计（不含税）"></td>
<td>贡献利润=项目毛利(不含税)-公司管理费用总计(不含税)</td>
</tr>
</tbody>
@@ -1209,72 +1239,72 @@
</tr>
<tr>
<td>销售商品、提供劳务收到的现金<#--a--></td>
- <td><input type="text" class="number" name="saleIncomeCash" value="${Utils.format(cashFlowBean.saleIncomeCash,'0')}" readonly required title="取自资金计划表（销售收款）"></td>
+ <td><input type="text" class="number" name="saleIncomeCash" value="${Utils.format(cashFlowBean.saleIncomeCash,'0')}" readonly title="取自资金计划表（销售收款）"></td>
<td>从资金计划表查(销售收款)</td>
</tr>
<tr>
<td>收到的税费返还<#--b--></td>
- <td>/<input type="hidden" name="taxReturn" value="${Utils.format(cashFlowBean.taxReturn,'0')}" readonly required></td>
+ <td>/<input type="hidden" name="taxReturn" value="${Utils.format(cashFlowBean.taxReturn,'0')}" readonly ></td>
<td>/</td>
</tr>
<tr>
<td>收到其他与经营活动有关的现金<#--c--></td>
- <td><input type="text" class="number" name="earnestMoneyIncome" value="${Utils.format(cashFlowBean.earnestMoneyIncome,'0')}" readonly required title="取自资金计划表（保证金收款）"></td>
+ <td><input type="text" class="number" name="earnestMoneyIncome" value="${Utils.format(cashFlowBean.earnestMoneyIncome,'0')}" readonly title="取自资金计划表（保证金收款）"></td>
<td>从资金计划表查(保证金收款)</td>
</tr>
<tr>
<td>购买商品、接受劳务支付的现金<#--d--></td>
- <td><input type="text" class="number" name="purchaseCost" value="${Utils.format(cashFlowBean.purchaseCost,'0')}" readonly required title="取自资金计划表（设备支出+工程支出）"></td>
+ <td><input type="text" class="number" name="purchaseCost" value="${Utils.format(cashFlowBean.purchaseCost,'0')}" readonly title="取自资金计划表（设备支出+工程支出）"></td>
<td>从资金计划表查(设备支出+工程支出)</td>
</tr>
<tr>
<td>支付的各项税费<#--e--></td>
- <td>/<input type="hidden" name="taxCost" value="${Utils.format(cashFlowBean.taxCost,'0')}" readonly required></td>
+ <td>/<input type="hidden" name="taxCost" value="${Utils.format(cashFlowBean.taxCost,'0')}" readonly ></td>
<td>/</td>
</tr>
<tr>
<td>支付其他与经营活动有关的现金<#--f--></td>
- <td><input type="text" class="number" name="earnestMoneyCost" value="${Utils.format(cashFlowBean.earnestMoneyCost,'0')}" readonly required title="取自资金计划表（经营性开支+保证金支出+资金利息）"></td>
+ <td><input type="text" class="number" name="earnestMoneyCost" value="${Utils.format(cashFlowBean.earnestMoneyCost,'0')}" readonly title="取自资金计划表（经营性开支+保证金支出+资金利息）"></td>
<td>从资金计划表查(经营性开支+保证金支出+资金利息)</td>
</tr>
<tr>
<td>经营活动产生的现金流量净额<#--g--></td>
- <td><input type="text" class="number" name="netCashFlow" value="${Utils.format(cashFlowBean.netCashFlow,'0')}" readonly required title="g=a+c+b-d-f-e"></td>
+ <td><input type="text" class="number" name="netCashFlow" value="${Utils.format(cashFlowBean.netCashFlow,'0')}" readonly title="g=a+c+b-d-f-e"></td>
<td>销售商品、提供劳务收到的现金+收到的税费返还+收到其他与经营活动有关的现金-购买商品、接受劳务支付的现金-支付的各项税费-支付其他与经营活动有关的现金</td>
</tr>
<tr>
<td>投资活动现金流入<#--h--></td>
- <td>/<input type="hidden" name="cashInflowFromInvestingActivities" value="${Utils.format(cashFlowBean.cashInflowFromInvestingActivities,'0')}" readonly required></td>
+ <td>/<input type="hidden" name="cashInflowFromInvestingActivities" value="${Utils.format(cashFlowBean.cashInflowFromInvestingActivities,'0')}" readonly ></td>
<td>/</td>
</tr>
<tr>
<td>投资活动现金流出<#--i--></td>
- <td>/<input type="hidden" name="cashOutflowFromInvestingActivities" value="${Utils.format(cashFlowBean.cashOutflowFromInvestingActivities,'0')}" readonly required></td>
+ <td>/<input type="hidden" name="cashOutflowFromInvestingActivities" value="${Utils.format(cashFlowBean.cashOutflowFromInvestingActivities,'0')}" readonly ></td>
<td>/</td>
</tr>
<tr>
<td>投资活动产生的现金流量净额<#--j--></td>
- <td>/<input type="hidden" name="netCashFromInvestingActivities" value="${Utils.format(cashFlowBean.netCashFromInvestingActivities,'0')}" readonly required></td>
+ <td>/<input type="hidden" name="netCashFromInvestingActivities" value="${Utils.format(cashFlowBean.netCashFromInvestingActivities,'0')}" readonly ></td>
<td>/</td>
</tr>
<tr>
<td>融资资金流入<#--k--></td>
- <td><input type="text" class="number" name="financingCapitalInflow" value="${Utils.format(cashFlowBean.financingCapitalInflow,'0')}" readonly required title="从资金计划表查（垫资计划）"></td>
+ <td><input type="text" class="number" name="financingCapitalInflow" value="${Utils.format(cashFlowBean.financingCapitalInflow,'0')}" readonly title="从资金计划表查（垫资计划）"></td>
<td>从资金计划表查(垫资计划)</td>
</tr>
<tr>
<td>还款资金流出<#--l--></td>
- <td><input type="text" class="number" name="financingCapitalOutflow" value="${Utils.format(cashFlowBean.financingCapitalOutflow,'0')}" readonly required title="从资金计划表查（还款计划）"></td>
+ <td><input type="text" class="number" name="financingCapitalOutflow" value="${Utils.format(cashFlowBean.financingCapitalOutflow,'0')}" readonly title="从资金计划表查（还款计划）"></td>
<td>从资金计划表查(还款计划)</td>
</tr>
<tr>
<td>筹资活动产生的现金流量净额<#--m--></td>
- <td><input type="text" class="number" name="financingCapitalCashflow" value="${Utils.format(cashFlowBean.financingCapitalCashflow,'0')}" readonly required title="m=k-l"></td>
+ <td><input type="text" class="number" name="financingCapitalCashflow" value="${Utils.format(cashFlowBean.financingCapitalCashflow,'0')}" readonly title="m=k-l"></td>
<td>融资资金流入-还款资金流出</td>
</tr>
<tr>
<td>货币资金净增加额<#--n--></td>
- <td><input type="text" class="number" name="netIncreaseMonetaryFunds" value="${Utils.format(cashFlowBean.netIncreaseMonetaryFunds,'0')}" readonly required title="n=g+j+m"></td>
+ <td><input type="text" class="number" name="netIncreaseMonetaryFunds" value="${Utils.format(cashFlowBean.netIncreaseMonetaryFunds,'0')}" readonly title="n=g+j+m"></td>
<td>经营活动产生的现金流量净额+投资活动产生的现金流量净额+筹资活动产生的现金流量净额</td>
</tr>
</tbody>
diff --git a/src/main/resources/templates/admin/project_estimate_add.ftl b/src/main/resources/templates/admin/project_estimate_add.ftl
index fe45510..a631bd3 100644
--- a/src/main/resources/templates/admin/project_estimate_add.ftl
+++ b/src/main/resources/templates/admin/project_estimate_add.ftl
@@ -222,9 +222,22 @@
<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="text" class="am-input" data-validate-async data-validation-message="请输入行业场景应用"
- name="industryScenario" id="industryScenario" placeholder="请输入行业场景应用" maxlength="20"
- value="" />
+ <select data-am-selected id="industryScene" name="industryScene">
+ <option value="1" >信息安全</option>
+ <option value="2" >政府</option>
+ <option value="3" >公安</option>
+ <option value="4" >企业</option>
+ <option value="5" >教育</option>
+ <option value="6" >交通</option>
+ <option value="7" >医疗</option>
+ <option value="8" >电力资源</option>
+ <option value="9" >运营商</option>
+ <option value="10" >金融</option>
+ <option value="11" >专网</option>
+ <option value="12" >其他</option>
+ <option value="13" >互联网</option>
+ <option value="14" >银行</option>
+ </select>
</div>
<div class="am-u-sm-2 am-u-md-4 input-msg"></div>
</div>
@@ -709,7 +722,7 @@
var huazhiProductAmount = $("#huazhiProductAmount").val();
var huasanProductAmount = $("#huasanProductAmount").val();
var ziguangOtherAmount = $("#ziguangOtherAmount").val();
- var industryScenario = $("#industryScenario").val();
+ var industryScene = $("#industryScene").val();
var customer = $("#customer").val();
var terminalCustomer = $("#terminalCustomer").val();
var valueRisk = $("#valueRisk").val();
@@ -846,11 +859,11 @@
return;
}
- if (industryScenario == undefined || industryScenario.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('主合同收款条款不能为空');
diff --git a/src/main/resources/templates/admin/project_estimate_edit.ftl b/src/main/resources/templates/admin/project_estimate_edit.ftl
index 39e6648..2d1e46c 100644
--- a/src/main/resources/templates/admin/project_estimate_edit.ftl
+++ b/src/main/resources/templates/admin/project_estimate_edit.ftl
@@ -243,9 +243,39 @@
<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="text" class="am-input" data-validate-async data-validation-message="请输入行业场景应用"
- name="industryScenario" placeholder="请输入行业场景应用" maxlength="20" id="industryScenario"
- value="${project.industryScenario!}" />
+ <select data-am-selected id="industryScene" name="industryScene">
+ <#if project.industryScene??>
+ <option value="1" <#if project.industryScene=1>selected</#if>>信息安全</option>
+ <option value="2" <#if project.industryScene=2>selected</#if>>政府</option>
+ <option value="3" <#if project.industryScene=3>selected</#if>>公安</option>
+ <option value="4" <#if project.industryScene=4>selected</#if>>企业</option>
+ <option value="5" <#if project.industryScene=5>selected</#if>>教育</option>
+ <option value="6" <#if project.industryScene=6>selected</#if>>交通</option>
+ <option value="7" <#if project.industryScene=7>selected</#if>>医疗</option>
+ <option value="8" <#if project.industryScene=8>selected</#if>>电力资源</option>
+ <option value="9" <#if project.industryScene=9>selected</#if>>运营商</option>
+ <option value="10" <#if project.industryScene=10>selected</#if>>金融</option>
+ <option value="11" <#if project.industryScene=11>selected</#if>>专网</option>
+ <option value="12" <#if project.industryScene=12>selected</#if>>其他</option>
+ <option value="13" <#if project.industryScene=13>selected</#if>>互联网</option>
+ <option value="14" <#if project.industryScene=14>selected</#if>>银行</option>
+ <#else>
+ <option value="1" >信息安全</option>
+ <option value="2" >政府</option>
+ <option value="3" >公安</option>
+ <option value="4" >企业</option>
+ <option value="5" >教育</option>
+ <option value="6" >交通</option>
+ <option value="7" >医疗</option>
+ <option value="8" >电力资源</option>
+ <option value="9" >运营商</option>
+ <option value="10" >金融</option>
+ <option value="11" >专网</option>
+ <option value="12" >其他</option>
+ <option value="13" >互联网</option>
+ <option value="14" >银行</option>
+ </#if>
+ </select>
</div>
<div class="am-u-sm-2 am-u-md-4 input-msg"></div>
</div>
@@ -746,7 +776,7 @@
var huazhiProductAmount = $("#huazhiProductAmount").val();
var huasanProductAmount = $("#huasanProductAmount").val();
var ziguangOtherAmount = $("#ziguangOtherAmount").val();
- var industryScenario = $("#industryScenario").val();
+ // var industryScenario = $("#industryScenario").val();
var customer = $("#customer").val();
var terminalCustomer = $("#terminalCustomer").val();
var valueRisk = $("#valueRisk").val();
@@ -877,11 +907,11 @@
return;
}
- if (industryScenario == undefined || industryScenario.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('主合同收款条款不能为空');
diff --git a/src/main/resources/templates/admin/project_list.ftl b/src/main/resources/templates/admin/project_list.ftl
index 2bdfaad..da8b64f 100644
--- a/src/main/resources/templates/admin/project_list.ftl
+++ b/src/main/resources/templates/admin/project_list.ftl
@@ -168,8 +168,23 @@
<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!}"/>
+ <select data-am-selected="{btnSize: 'sm',btnWidth: '150px',maxHeight: 500}" id="industryScene" name="industryScene">
+ <option value="-1">全部</option>
+ <option value="1" <#if industryScene?? && industryScene='1'>selected</#if>>信息安全</option>
+ <option value="2" <#if industryScene?? && industryScene='2'>selected</#if>>政府</option>
+ <option value="3" <#if industryScene?? && industryScene='3'>selected</#if>>公安</option>
+ <option value="4" <#if industryScene?? && industryScene='4'>selected</#if>>企业</option>
+ <option value="5" <#if industryScene?? && industryScene='5'>selected</#if>>教育</option>
+ <option value="6" <#if industryScene?? && industryScene='6'>selected</#if>>交通</option>
+ <option value="7" <#if industryScene?? && industryScene='7'>selected</#if>>医疗</option>
+ <option value="8" <#if industryScene?? && industryScene='8'>selected</#if>>电力资源</option>
+ <option value="9" <#if industryScene?? && industryScene='9'>selected</#if>>运营商</option>
+ <option value="10" <#if industryScene?? && industryScene='10'>selected</#if>>金融</option>
+ <option value="11" <#if industryScene?? && industryScene='11'>selected</#if>>专网</option>
+ <option value="12" <#if industryScene?? && industryScene='12'>selected</#if>>其他</option>
+ <option value="13" <#if industryScene?? && industryScene='13'>selected</#if>>互联网</option>
+ <option value="14" <#if industryScene?? && industryScene='14'>selected</#if>>银行</option>
+ </select>
</div>
</td>
<th class="am-text-middle" style="width: 10%">项目解决方案</th>
@@ -764,8 +779,8 @@
keywordsObj.contractStartTime = $("#contractStartTime").val();
if ($("#contractEndTime").val())
keywordsObj.contractEndTime = $("#contractEndTime").val();
- if ($("#industryScenario").val())
- keywordsObj.industryScenario = $("#industryScenario").val();
+ if ($("#industryScene").val())
+ keywordsObj.industryScene = $("#industryScene").val();
}
if ($("#customer").val())
keywordsObj.customer = $("#customer").val();
diff --git a/src/main/resources/templates/admin/project_list_approve.ftl b/src/main/resources/templates/admin/project_list_approve.ftl
index e721433..3a9e02e 100644
--- a/src/main/resources/templates/admin/project_list_approve.ftl
+++ b/src/main/resources/templates/admin/project_list_approve.ftl
@@ -167,8 +167,23 @@
<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!}"/>
+ <select data-am-selected="{btnSize: 'sm',btnWidth: '150px',maxHeight: 500}" id="industryScene" name="industryScene">
+ <option value="-1">全部</option>
+ <option value="1" <#if industryScene?? && industryScene='1'>selected</#if>>信息安全</option>
+ <option value="2" <#if industryScene?? && industryScene='2'>selected</#if>>政府</option>
+ <option value="3" <#if industryScene?? && industryScene='3'>selected</#if>>公安</option>
+ <option value="4" <#if industryScene?? && industryScene='4'>selected</#if>>企业</option>
+ <option value="5" <#if industryScene?? && industryScene='5'>selected</#if>>教育</option>
+ <option value="6" <#if industryScene?? && industryScene='6'>selected</#if>>交通</option>
+ <option value="7" <#if industryScene?? && industryScene='7'>selected</#if>>医疗</option>
+ <option value="8" <#if industryScene?? && industryScene='8'>selected</#if>>电力资源</option>
+ <option value="9" <#if industryScene?? && industryScene='9'>selected</#if>>运营商</option>
+ <option value="10" <#if industryScene?? && industryScene='10'>selected</#if>>金融</option>
+ <option value="11" <#if industryScene?? && industryScene='11'>selected</#if>>专网</option>
+ <option value="12" <#if industryScene?? && industryScene='12'>selected</#if>>其他</option>
+ <option value="13" <#if industryScene?? && industryScene='13'>selected</#if>>互联网</option>
+ <option value="14" <#if industryScene?? && industryScene='14'>selected</#if>>银行</option>
+ </select>
</div>
</td>
<th class="am-text-middle" style="width: 10%">项目解决方案</th>
@@ -481,8 +496,8 @@
keywordsObj.contractStartTime = $("#contractStartTime").val();
if ($("#contractEndTime").val())
keywordsObj.contractEndTime = $("#contractEndTime").val();
- if ($("#industryScenario").val())
- keywordsObj.industryScenario = $("#industryScenario").val();
+ if ($("#industryScene").val())
+ keywordsObj.industryScene = $("#industryScene").val();
}
if ($("#customer").val())
keywordsObj.customer = $("#customer").val();