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 @@
+ value="${project.projectNo!}" readonly />
@@ -81,7 +81,7 @@
+ value="${project.name!}" />
@@ -168,7 +168,7 @@
+ value="${Utils.format(project.advanceInterestAmount)}" />
@@ -177,7 +177,7 @@
+ value="${Utils.format(project.advancePeakAmount)}" />
@@ -187,7 +187,7 @@
+ value="${Utils.format(project.contractAmount)}" />
@@ -197,7 +197,7 @@
+ value="${Utils.format(project.grossProfit)}" />
@@ -207,7 +207,7 @@
+ value="${Utils.format(project.grossProfitMargin)}" />
@@ -217,7 +217,7 @@
+ value="${Utils.format(project.huizhiProductAmount, "0.00")}" />
@@ -227,7 +227,7 @@
+ value="${Utils.format(project.huazhiProductAmount, "0.00")}" />
@@ -238,7 +238,7 @@
+ value="${Utils.format(project.huasanProductAmount, "0.00")}" />
@@ -248,7 +248,7 @@
+ value="${Utils.format(project.ziguangOtherAmount, "0.00")}" />
@@ -274,9 +274,39 @@
*行业场景应用
- +
@@ -304,7 +334,7 @@
+ value="${project.customer!}" />
@@ -314,7 +344,7 @@
+ value="${project.terminalCustomer!}" />
@@ -325,7 +355,7 @@
@@ -456,20 +486,20 @@ <#-- --> <#-- 收入--> <#-- 设备类--> -<#-- --> -<#-- --> +<#-- --> +<#-- --> <#-- --> <#-- --> <#-- 收入--> <#-- 工程类--> -<#-- --> -<#-- --> +<#-- --> +<#-- --> <#-- --> <#-- --> <#-- 收入--> <#-- 服务类--> -<#-- --> -<#-- --> +<#-- --> +<#-- --> <#-- --> <#-- --> <#-- 合计--> @@ -493,36 +523,36 @@ <#-- 成本--> <#-- 采购成本--> <#-- 设备--> -<#-- --> -<#-- --> +<#-- --> +<#-- --> <#-- --> <#-- --> <#-- 成本--> <#-- 采购成本--> <#-- 施工--> -<#-- --> -<#-- --> +<#-- --> +<#-- --> <#-- --> <#-- --> <#-- 成本--> <#-- 采购成本--> <#-- 服务--> -<#-- --> -<#-- --> +<#-- --> +<#-- --> <#-- --> <#-- --> <#-- 成本--> <#-- 采购成本--> <#-- 其他--> -<#-- --> -<#-- --> +<#-- --> +<#-- --> <#-- --> <#-- --> <#-- 成本--> <#-- 项目管理成本--> <#-- 项目管理成本--> -<#-- --> -<#-- --> +<#-- --> +<#-- --> <#-- --> <#-- --> <#-- 成本--> @@ -551,12 +581,12 @@ <#-- --> <#-- 财务费用--> <#-- 资金占用成本--> -<#-- --> +<#-- --> <#-- --> <#-- --> <#-- 公司管理费用--> <#-- --> -<#-- --> +<#-- --> <#-- --> <#-- --> <#-- --> @@ -1050,30 +1080,30 @@ 收入 设备类 - - - + + + 收入 工程类 - - - + + + 收入 服务类 - - - + + + 合计 - - - + + + (备注:本表所用税率为:${incomeTaxRates!}) @@ -1095,41 +1125,41 @@ 成本 采购成本 设备 - - - + + + 成本 采购成本 施工 - - - + + + 成本 采购成本 服务 - - - + + + 成本 采购成本 其他 - - - + + + 成本 项目管理成本 项目管理成本 - - - + + + 成本 @@ -1144,9 +1174,9 @@ 合计 - - - + + + (备注:本表所用税率为:${costTaxRates!}) @@ -1163,12 +1193,12 @@ 财务费用 资金占用成本 - + 公司管理费用 - + (备注:财务计取以不含税方式核算) @@ -1185,14 +1215,14 @@ 项目毛利(元) - - + + 毛利=收入总计(不含税)-成本总计(不含税)-财务费用总计(不含税) 项目贡献利润(元) - - + + 贡献利润=项目毛利(不含税)-公司管理费用总计(不含税) @@ -1209,72 +1239,72 @@ 销售商品、提供劳务收到的现金<#--a--> - + 从资金计划表查(销售收款) 收到的税费返还<#--b--> - / + / / 收到其他与经营活动有关的现金<#--c--> - + 从资金计划表查(保证金收款) 购买商品、接受劳务支付的现金<#--d--> - + 从资金计划表查(设备支出+工程支出) 支付的各项税费<#--e--> - / + / / 支付其他与经营活动有关的现金<#--f--> - + 从资金计划表查(经营性开支+保证金支出+资金利息) 经营活动产生的现金流量净额<#--g--> - + 销售商品、提供劳务收到的现金+收到的税费返还+收到其他与经营活动有关的现金-购买商品、接受劳务支付的现金-支付的各项税费-支付其他与经营活动有关的现金 投资活动现金流入<#--h--> - / + / / 投资活动现金流出<#--i--> - / + / / 投资活动产生的现金流量净额<#--j--> - / + / / 融资资金流入<#--k--> - + 从资金计划表查(垫资计划) 还款资金流出<#--l--> - + 从资金计划表查(还款计划) 筹资活动产生的现金流量净额<#--m--> - + 融资资金流入-还款资金流出 货币资金净增加额<#--n--> - + 经营活动产生的现金流量净额+投资活动产生的现金流量净额+筹资活动产生的现金流量净额 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 @@
*行业场景应用
- +
@@ -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 @@
*行业场景应用
- +
@@ -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 @@ 行业场景
- +
项目解决方案 @@ -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 @@ 行业场景
- +
项目解决方案 @@ -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();