diff --git a/src/main/resources/static/assets/js/project_final.js b/src/main/resources/static/assets/js/project_final.js
index c866607..ac54375 100644
--- a/src/main/resources/static/assets/js/project_final.js
+++ b/src/main/resources/static/assets/js/project_final.js
@@ -290,7 +290,7 @@ function calCostFinalTotal() {
var costFinalTotal = $("input[name='costFinalTotal']");
if (costPurchaseDeviceFinalTotal && costPurchaseBuildFinalTotal && costPurchaseServiceFinalTotal &&
- costPurchaseOtherFinalTotal && costProjectManageFinalTotal && costOtherFinalTotal) {
+ costPurchaseOtherFinalTotal && costProjectManageFinalTotal) {
costFinalTotal.val(f2Fixed(f2(costPurchaseDeviceFinalTotal) + f2(costPurchaseBuildFinalTotal) + f2(costPurchaseServiceFinalTotal) +
f2(costPurchaseOtherFinalTotal) + f2(costProjectManageFinalTotal) + f2(costOtherFinalTotal)));
} else {
diff --git a/src/main/resources/static/assets/js/project_settle.js b/src/main/resources/static/assets/js/project_settle.js
index d73e7a4..bc7aeed 100644
--- a/src/main/resources/static/assets/js/project_settle.js
+++ b/src/main/resources/static/assets/js/project_settle.js
@@ -405,7 +405,7 @@ function calCostOtherSettleTotal() {
var costOtherSettleTotal = $("input[name='costOtherSettleTotal']");
- if(costOtherFormerSettleTotal && costOther){
+ if(costOtherFormerSettleTotal){
costOtherSettleTotal.val(f2Fixed(f2(costOtherFormerSettleTotal)+f2(costOther)));
}else {
costOtherSettleTotal.val("");
@@ -425,7 +425,7 @@ function calCostTotal() {
var costTotal = $("input[name='costTotal']");
- if(costPurchaseDevice && costPurchaseBuild && costPurchaseService && costPurchaseOther && costProjectManage && costOther){
+ if(costPurchaseDevice && costPurchaseBuild && costPurchaseService && costPurchaseOther && costProjectManage){
costTotal.val(f2Fixed(f2(costPurchaseDevice)+f2(costPurchaseBuild)+f2(costPurchaseService)+f2(costPurchaseOther)+f2(costProjectManage)+f2(costOther)));
}else {
costTotal.val("");
diff --git a/src/main/resources/static/assets/js/project_settle_valid.js b/src/main/resources/static/assets/js/project_settle_valid.js
index 096ad17..175d6a8 100644
--- a/src/main/resources/static/assets/js/project_settle_valid.js
+++ b/src/main/resources/static/assets/js/project_settle_valid.js
@@ -125,18 +125,6 @@ var costProjectManageValid = function() {
return true;
};
-var costOtherValid = function() {
- var month = $("input[name='costOther']").val();
- if (month == "") {
- layui.use('layer', function(){
- var layer = layui.layer;
- layer.alert("请填入本月其他成本数据");
- });
- return false;
- }
- return true;
-};
-
var costTotalValid = function() {
var settle = $("input[name='costSettleTotal']").val();
var budget = $("input[name='costBudgetTotal']").val();
diff --git a/src/main/resources/templates/admin/project_approve.ftl b/src/main/resources/templates/admin/project_approve.ftl
index 6f86f88..fe7089d 100644
--- a/src/main/resources/templates/admin/project_approve.ftl
+++ b/src/main/resources/templates/admin/project_approve.ftl
@@ -674,7 +674,7 @@
月份 |
设备支出 |
- 工程支出 |
+ 工程支出(含服务+施工+其他) |
经营性开支 |
保证金支出 |
支出合计 |
@@ -2046,7 +2046,7 @@
月份 |
设备支出 |
- 工程支出 |
+ 工程支出(含服务+施工+其他) |
经营性开支 |
保证金支出 |
支出合计 |
diff --git a/src/main/resources/templates/admin/project_budget_edit.ftl b/src/main/resources/templates/admin/project_budget_edit.ftl
index 6c9f2ee..911b925 100644
--- a/src/main/resources/templates/admin/project_budget_edit.ftl
+++ b/src/main/resources/templates/admin/project_budget_edit.ftl
@@ -300,8 +300,8 @@
成本 |
其他 |
${project.otherName!} |
- |
- |
+ |
+ |
合计 |
@@ -558,7 +558,7 @@
月份 |
设备支出 |
- 工程支出 |
+ 工程支出(含服务+施工+其他) |
经营性开支 |
保证金支出 |
支出合计 |
@@ -743,9 +743,9 @@
成本 |
其他 |
|
- |
- |
+ value="${project.otherName!}" name="otherName" placeholder="请输入其他中的小类名称(10字符以内)"/>
+ |
+ |
合计 |
diff --git a/src/main/resources/templates/admin/project_estimate_add.ftl b/src/main/resources/templates/admin/project_estimate_add.ftl
index d6f07d2..62e8506 100644
--- a/src/main/resources/templates/admin/project_estimate_add.ftl
+++ b/src/main/resources/templates/admin/project_estimate_add.ftl
@@ -358,9 +358,9 @@
成本 |
其他 |
|
- |
- |
+ value="" name="otherName" placeholder="请输入其他类的名称(10字符以内)"/>
+ |
+ |
|
+ |
+ readonly#if>> |
|
+ |
+ |
+ |
+ |
合计 |
diff --git a/src/main/resources/templates/admin/project_final_edit.ftl b/src/main/resources/templates/admin/project_final_edit.ftl
index 1ddf0ca..f926a6d 100644
--- a/src/main/resources/templates/admin/project_final_edit.ftl
+++ b/src/main/resources/templates/admin/project_final_edit.ftl
@@ -140,11 +140,11 @@
成本 |
其他 |
|
- |
- |
- |
- |
+ value="${project.otherName!}" name="otherName" placeholder="请输入其他中的小类名称(10字符以内)"/>
+ |
+ |
+ |
+ |
合计 |
diff --git a/src/main/resources/templates/admin/project_settle_add.ftl b/src/main/resources/templates/admin/project_settle_add.ftl
index 38c8ef0..02e1ab5 100644
--- a/src/main/resources/templates/admin/project_settle_add.ftl
+++ b/src/main/resources/templates/admin/project_settle_add.ftl
@@ -164,11 +164,11 @@
成本 |
其他 |
|
- |
- |
- |
- |
+ value="${project.otherName!}" name="otherName" placeholder="请输入其他中的小类名称(10字符以内)"/>
+ |
+ |
+ |
+ |
|
diff --git a/src/main/resources/templates/admin/project_settle_edit.ftl b/src/main/resources/templates/admin/project_settle_edit.ftl
index 7062922..c5a3434 100644
--- a/src/main/resources/templates/admin/project_settle_edit.ftl
+++ b/src/main/resources/templates/admin/project_settle_edit.ftl
@@ -162,11 +162,11 @@
成本 |
其他 |
|
- |
- |
- |
- |
+ value="${project.otherName!}" name="otherName" placeholder="请输入其他中的小类名称(10字符以内)"/>
+ |
+ |
+ |
+ |
|