diff --git a/src/main/resources/static/assets/js/project_budget.js b/src/main/resources/static/assets/js/project_budget.js
index 2068b26..b5bdf15 100644
--- a/src/main/resources/static/assets/js/project_budget.js
+++ b/src/main/resources/static/assets/js/project_budget.js
@@ -309,7 +309,12 @@ function arr2ObjectVerify(line, arr, detailPropertyArr, detailProperty) {
layuiAlert("第 " + (line + 1) + " 行的 " + o[1] + " 不允许为空");
return null;
}
- obj[detailPropertyArr[i]] = arr[i];
+ //如果要求是数字类型的,进行转换
+ var v = arr[i];
+ if(o[2] === 'number' ){
+ v = f2(v);
+ }
+ obj[detailPropertyArr[i]]=v;
}
return obj;
}
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 27fb2f7..c35890e 100644
--- a/src/main/resources/static/assets/js/project_budget_cost.js
+++ b/src/main/resources/static/assets/js/project_budget_cost.js
@@ -3,15 +3,15 @@
*/
//COST_DETAIL_ARR=["type","category","name","unit","amount","price","taxRate","totalTaxInclude","totalTaxExclude"];
COST_DETAIL={
- "type":[true,"大类"],
- "category":[true,"类别"],
- "name":[true,"名称"],
- "unit":[true,"单位"],
- "amount":[true,"数量"],
- "price":[true,"单价"],
- "taxRate":[true,"税率"],
- "totalTaxInclude":[true,"含税总金额"],
- "totalTaxExclude":[true,"不含税金额"]
+ "type":[true,"大类","string"],
+ "category":[true,"类别","string"],
+ "name":[true,"名称","string"],
+ "unit":[true,"单位","string"],
+ "amount":[true,"数量","string"],
+ "price":[true,"单价","number"],
+ "taxRate":[true,"税率","number"],
+ "totalTaxInclude":[true,"含税总金额","number"],
+ "totalTaxExclude":[true,"不含税金额","number"]
};
/*
[
@@ -187,9 +187,9 @@ function appendTrCost() {
''+
'
| '+
' | '+
- ' | '+
- ' | '+
- ' | '+
+ ' | '+
+ ' | '+
+ ' | '+
' | '+
' | '+
' | '+
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 89cd281..cd10199 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
@@ -3,18 +3,18 @@
*/
//COST_PROJECT_MANAGE_DETAIL_ARR=["type","name","detail","unit","amount","price","total","predictMethod","predictWhy","remark","deletable"];
COST_PROJECT_MANAGE_DETAIL={
- "type":[true,"财务费用类别"],
- "name1":[false,"业务项目"],
- "name2":[false,"业务项目"],
- "detail":[true,"项目明细"],
- "unit":[true,"单位"],
- "amount":[true,"数量"],
- "price":[true,"单价"],
- "total":[true,"总金额"],
- "predictMethod":[false,"预估计算方法"],
- "predictWhy":[false,"预估依据"],
- "remark":[false,"备注"],
- "deletable":[true,"是否可删除"]
+ "type":[true,"财务费用类别","string"],
+ "name1":[false,"业务项目","string"],
+ "name2":[false,"业务项目","string"],
+ "detail":[true,"项目明细","string"],
+ "unit":[true,"单位","string"],
+ "amount":[true,"数量","string"],
+ "price":[true,"单价","number"],
+ "total":[true,"总金额","number"],
+ "predictMethod":[false,"预估计算方法","string"],
+ "predictWhy":[false,"预估依据","string"],
+ "remark":[false,"备注","string"],
+ "deletable":[true,"是否可删除","string"]
};
SELECT_TYPE_CATEGORY_MAP_DATA_MANAGER={};
@@ -118,8 +118,8 @@ function appendTrCostProjectManage() {
' \n' +
' | \n' +
' | \n' +
- ' | \n' +
- ' | \n' +
+ ' | \n' +
+ ' | \n' +
' | \n' +
' | \n' +
' | \n' +
@@ -226,7 +226,7 @@ function bindChangeableInputProjectManage() {
//找到对应的单价
var price = f2($(this).parent().parent().find(".input-changeable-price-project-manage").val());
- $(this).parent().parent().find(".input-changeable-total-project-manage").val(f2(amount*price));
+ $(this).parent().parent().find(".input-changeable-total-project-manage").val(f2Fixed(amount*price));
});
//单价改变
$(".input-changeable-price-project-manage").change(function () {
@@ -234,7 +234,7 @@ function bindChangeableInputProjectManage() {
//找到对应的数量
var amount = parseInt($(this).parent().parent().find(".input-changeable-amount-project-manage").val());
- $(this).parent().parent().find(".input-changeable-total-project-manage").val(f2(amount*price));
+ $(this).parent().parent().find(".input-changeable-total-project-manage").val(f2Fixed(amount*price));
});
}
/**
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 c7cda2f..fb01c41 100644
--- a/src/main/resources/static/assets/js/project_budget_income.js
+++ b/src/main/resources/static/assets/js/project_budget_income.js
@@ -3,14 +3,14 @@
*/
//INCOME_DETAIL_ARR=["type","name","unit","amount","price","taxRate","totalTaxInclude","totalTaxExclude"];
INCOME_DETAIL={
- "type":[true,"类别"],
- "name":[true,"名称"],
- "unit":[true,"单位"],
- "amount":[true,"数量"],
- "price":[true,"单价"],
- "taxRate":[true,"税率"],
- "totalTaxInclude":[true,"含税总金额"],
- "totalTaxExclude":[true,"不含税金额"]
+ "type":[true,"类别","string"],
+ "name":[true,"名称","string"],
+ "unit":[true,"单位","string"],
+ "amount":[true,"数量","string"],
+ "price":[true,"单价","number"],
+ "taxRate":[true,"税率","number"],
+ "totalTaxInclude":[true,"含税总金额","number"],
+ "totalTaxExclude":[true,"不含税金额","number"]
};
/*$(function () {
@@ -136,9 +136,9 @@ function appendTrIncome() {
' \n' +
' | \n' +
' | \n' +
- ' | \n' +
- ' | \n' +
- ' | \n' +
+ ' | \n' +
+ ' | \n' +
+ ' | \n' +
' | \n' +
' | \n' +
' | \n' +
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 0270cbe..206edd7 100644
--- a/src/main/resources/static/assets/js/project_budget_plan.js
+++ b/src/main/resources/static/assets/js/project_budget_plan.js
@@ -4,18 +4,18 @@
BUDGET_PLAN_DETAIL_ARR=["month","deviceCost","engineerCost","projectManageCost","earnestMoneyCost","totalCost","saleIncome","earnestMoneyIncome","totalIncome","fundBalance","capitalInterest","underwrittenPlan","repaymentPlan"];
BUDGET_PLAN_DETAIL={
"month":[true,"月份"],
- "deviceCost":[true,"设备支出"],
- "engineerCost":[true,"工程支出"],
- "projectManageCost":[true,"经营性开支"],
- "earnestMoneyCost":[true,"保证金支出"],
- "totalCost":[true,"支出合计"],
- "saleIncome":[true,"销售收款"],
- "earnestMoneyIncome":[true,"保证金收款"],
- "totalIncome":[true,"收款合计"],
- "fundBalance":[true,"资金余额"],
- "capitalInterest":[true,"资金利息"],
- "underwrittenPlan":[true,"垫资计划"],
- "repaymentPlan":[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"]
};
@@ -189,18 +189,18 @@ function verifyBudgetPlan(){
function appendTrBudgetPlan() {
var template = '\n' +
' | \n' +
- ' | \n' +
- ' | \n' +
- ' | \n' +
- ' | \n' +
- ' | \n' +
- ' | \n' +
- ' | \n' +
- ' | \n' +
- ' | \n' +
- ' | \n' +
- ' | \n' +
- ' | \n' +
+ ' | \n' +
+ ' | \n' +
+ ' | \n' +
+ ' | \n' +
+ ' | \n' +
+ ' | \n' +
+ ' | \n' +
+ ' | \n' +
+ ' | \n' +
+ ' | \n' +
+ ' | \n' +
+ ' | \n' +
' | \n' +
'
';
$("#budgetPlanDetailTable").append(template);
diff --git a/src/main/resources/templates/admin/project_budget_edit.ftl b/src/main/resources/templates/admin/project_budget_edit.ftl
index 8ca94ed..c2e7729 100644
--- a/src/main/resources/templates/admin/project_budget_edit.ftl
+++ b/src/main/resources/templates/admin/project_budget_edit.ftl
@@ -228,26 +228,26 @@
收入 |
设备类 |
- |
- |
+ |
+ |
收入 |
工程类 |
- |
- |
+ |
+ |
收入 |
服务类 |
- |
- |
+ |
+ |
合计 |
|
- |
- |
+ |
+ |
@@ -265,50 +265,50 @@
成本 |
采购成本 |
设备 |
- |
- |
+ |
+ |
成本 |
采购成本 |
施工 |
- |
- |
+ |
+ |
成本 |
采购成本 |
服务 |
- |
- |
+ |
+ |
成本 |
采购成本 |
其他 |
- |
- |
+ |
+ |
成本 |
项目管理成本 |
项目管理成本 |
- |
- |
+ |
+ |
成本 |
其他 |
${project.otherName!} |
- |
- |
+ |
+ |
合计 |
|
|
- |
- |
+ |
+ |
@@ -323,12 +323,12 @@
财务费用 |
资金占用成本 |
- |
+ |
公司管理费用 |
|
- |
+ |
@@ -342,19 +342,19 @@
项目毛利(元) |
- |
+ |
项目毛利率(%) |
- |
+ |
项目贡献利润(元) |
- |
+ |
项目贡献利润率(%) |
- |
+ |
@@ -391,9 +391,9 @@
|
|
- > |
- |
- |
+ > |
+ |
+ |
|
|
|
@@ -458,9 +458,9 @@
|
|
- > |
- |
- |
+ > |
+ |
+ |
|
|
|
@@ -526,8 +526,8 @@
|
|
- oninput="if(value.length>8)value=value.slice(0,8)"> |
- |
+ oninput="if(value.length>8)value=value.slice(0,8)"> |
+ |
|
|
|
@@ -573,34 +573,34 @@
|
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
|
|
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
|
@@ -608,18 +608,18 @@
<#list projectBudgetPlanDetails as projectBudgetPlanDetail>
|
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
|
#list>
@@ -669,26 +669,26 @@
收入 |
设备类 |
- |
- |
+ |
+ |
收入 |
工程类 |
- |
- |
+ |
+ |
收入 |
服务类 |
- |
- |
+ |
+ |
合计 |
|
- |
- |
+ |
+ |
@@ -708,51 +708,51 @@
成本 |
采购成本 |
设备 |
- |
- |
+ |
+ |
成本 |
采购成本 |
施工 |
- |
- |
+ |
+ |
成本 |
采购成本 |
服务 |
- |
- |
+ |
+ |
成本 |
采购成本 |
其他 |
- |
- |
+ |
+ |
成本 |
项目管理成本 |
项目管理成本 |
- |
- |
+ |
+ |
成本 |
其他 |
|
- |
- |
+ |
+ |
合计 |
|
|
- |
- |
+ |
+ |
@@ -768,12 +768,12 @@
财务费用 |
资金占用成本 |
- |
+ |
公司管理费用 |
|
- |
+ |
@@ -787,19 +787,19 @@
项目毛利(元) |
- |
+ |
项目毛利率(%) |
- |
+ |
项目贡献利润(元) |
- |
+ |
项目贡献利润率(%) |
- |
+ |
@@ -814,7 +814,7 @@
销售商品、提供劳务收到的现金<#--a--> |
- |
+ |
收到的税费返还<#--b--> |
@@ -822,11 +822,11 @@
收到其他与经营活动有关的现金<#--c--> |
- |
+ |
购买商品、接受劳务支付的现金<#--d--> |
- |
+ |
支付的各项税费<#--e--> |
@@ -834,11 +834,11 @@
支付其他与经营活动有关的现金<#--f--> |
- |
+ |
经营活动产生的现金流量净额<#--g--> |
- |
+ |
投资活动现金流入<#--h--> |
@@ -854,19 +854,19 @@
融资资金流入<#--k--> |
- |
+ |
还款资金流出<#--l--> |
- |
+ |
筹资活动产生的现金流量净额<#--m--> |
- |
+ |
货币资金净增加额<#--n--> |
- |
+ |