From d3d89c227474e6b523adb9e57933cbcbe5d46e80 Mon Sep 17 00:00:00 2001
From: OathK1per <zhangypg@gmail.com>
Date: Wed, 7 Dec 2022 10:24:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8D=E7=A7=B0=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../controller/backend/ProjectController.java | 14 +++++++-------
.../work/model/ProjectBudgetIncomeDetail.java | 2 +-
.../model/ProjectBudgetIncomePlanDetail.java | 2 +-
.../ProjectBudgetIncomePlanDetailTemp.java | 2 +-
src/main/resources/sql/fourcal-purge.sql | 4 ++--
src/main/resources/sql/fourcal.sql | 4 ++--
.../static/assets/js/project_budget.js | 8 ++++----
.../static/assets/js/project_budget_income.js | 2 +-
.../templates/admin/project_approve.ftl | 18 +++++++++---------
.../templates/admin/project_budget_edit.ftl | 8 ++++----
.../templates/admin/project_estimate_add.ftl | 4 ++--
.../templates/admin/project_estimate_edit.ftl | 4 ++--
12 files changed, 36 insertions(+), 36 deletions(-)
diff --git a/src/main/java/cn/palmte/work/controller/backend/ProjectController.java b/src/main/java/cn/palmte/work/controller/backend/ProjectController.java
index 323ada4..71bea20 100644
--- a/src/main/java/cn/palmte/work/controller/backend/ProjectController.java
+++ b/src/main/java/cn/palmte/work/controller/backend/ProjectController.java
@@ -168,7 +168,7 @@ public class ProjectController extends BaseController {
String[] columns0 = {"deptName", "projectNo", "name", "typeDesc", "startDate", "endDate", "underwrittenModeStr", "collaborator", "advanceInterestAmountRound", "advancePeakAmountRound", "contractRound",
"grossProfitRound", "grossProfitMarginRound", "huazhiRound", "huizhiRound", "huasanRound", "ziguangRound", "certaintyStr", "industryScenario", "resolvePlanStr", "customer", "terminalCustomer",
"valueRisk", "principal", "contractTime", "bidsTime", "isSecondStr", "signTypeStr", "mainContractCollectionTerms", "mainContractResolvePlan", "calculationCollection"};
- exportExcelUtils.exportProjectExcel(headers0, columns0, project, "yyyy-MM-dd", 0, "项目立项（概算）基本信息", outputStream);
+ exportExcelUtils.exportProjectExcel(headers0, columns0, project, "yyyy-MM-dd", 0, "项目立项（概算）信息", outputStream);
// String[] headers1 = {"项目负责人", "预计合同签订时间", "项目计划招标时间", "是否二次合作", "直签", "主合同收款条款", "主合同具体解决方案", "计收计划"};
// String[] columns1 = {"principal", "contractTime", "bidsTime", "isSecondStr", "signTypeStr", "mainContractCollectionTerms", "mainContractResolvePlan", "calculationCollection"};
// exportExcelUtils.exportProjectExcel(headers1, columns1, project, "yyyy-MM-dd", 0, "项目立项（概算）其他信息", outputStream);
@@ -196,7 +196,7 @@ public class ProjectController extends BaseController {
}
String[] headers2 = {"序号", "类别", "名称", "单位", "数量", "单价", "税率(%)", "含税总金额(元)", "不含税金额(元)", "税金(元)"};
String[] columns2 = {"tempId", "type", "name", "unit", "amount", "price", "taxRate", "totalTaxInclude", "totalTaxExclude", "totalTax"};
- exportExcelUtils.exportIncomeDetailExcel(headers2, columns2, project, budgetBean, budgetIncomeDetail, incomeTotalAmount, "yyyy-MM-dd", 0, "收款明细表", outputStream);
+ exportExcelUtils.exportIncomeDetailExcel(headers2, columns2, project, budgetBean, budgetIncomeDetail, incomeTotalAmount, "yyyy-MM-dd", 0, "收入明细表", outputStream);
//收入计划
List<ProjectBudgetIncomePlanDetail> budgetIncomePlanDetail = projectBudgetService.getBudgetIncomePlanDetail(project);
BigDecimal incomePlanTotalReceiveAmount = projectBudgetService.getBudgetIncomePlanReceiveAmount(project);
@@ -1047,7 +1047,7 @@ public class ProjectController extends BaseController {
public void incomeTemplate(HttpServletResponse response) throws Exception{
String[] headers = new String[]{"类别", "名称", "单位", "数量", "单价", "税率(%)"};
- downloadHeader(response , Utils.generateExcelName("收款明细表批量导入模板"));
+ downloadHeader(response , Utils.generateExcelName("收入明细表批量导入模板"));
ExportUtils exportUtils = new ExportUtils(headers);
exportUtils.write(response.getOutputStream());
}
@@ -1114,7 +1114,7 @@ public class ProjectController extends BaseController {
@RequestMapping("/estimateMainExport")
public void estimateMainExport(HttpServletResponse response, @RequestParam int id) throws Exception{
Project project = projectService.findById(id);
- response.setHeader("Content-Disposition", "attachment;filename=".concat(new String((Utils.generateExcelName(project.getName() + "-项目立项（概算）基本信息")).getBytes(), StandardCharsets.ISO_8859_1)));
+ response.setHeader("Content-Disposition", "attachment;filename=".concat(new String((Utils.generateExcelName(project.getName() + "-项目立项（概算）信息")).getBytes(), StandardCharsets.ISO_8859_1)));
response.setHeader("Connection", "close");
response.setHeader("Content-Type", "application/vnd.ms-excel");
ServletOutputStream outputStream = response.getOutputStream();
@@ -1125,7 +1125,7 @@ public class ProjectController extends BaseController {
String[] columns0 = {"deptName", "projectNo", "name", "typeDesc", "startDate", "endDate", "underwrittenModeStr", "collaborator", "advanceInterestAmountRound", "advancePeakAmountRound",
"contractRound", "grossProfitRound", "grossProfitMarginRound", "huazhiRound", "huizhiRound", "huasanRound", "ziguangRound", "certaintyStr", "industryScenario", "resolvePlanStr",
"customer", "terminalCustomer", "valueRisk", "principal", "contractTime", "bidsTime", "isSecondStr", "signTypeStr", "mainContractCollectionTerms", "mainContractResolvePlan", "calculationCollection"};
- exportExcelUtils.exportProjectExcel(headers0, columns0, project, "yyyy-MM-dd", 0, "项目立项（概算）基本信息", outputStream);
+ exportExcelUtils.exportProjectExcel(headers0, columns0, project, "yyyy-MM-dd", 0, "项目立项（概算）信息", outputStream);
exportExcelUtils.end(outputStream);
}
@@ -1155,7 +1155,7 @@ public class ProjectController extends BaseController {
@RequestMapping("/incomeExport")
public void incomeExport(HttpServletResponse response, @RequestParam int id) throws Exception{
Project project = projectService.findById(id);
- response.setHeader("Content-Disposition", "attachment;filename=".concat(new String((Utils.generateExcelName(project.getName() + "-收款明细表")).getBytes(), StandardCharsets.ISO_8859_1)));
+ response.setHeader("Content-Disposition", "attachment;filename=".concat(new String((Utils.generateExcelName(project.getName() + "-收入明细表")).getBytes(), StandardCharsets.ISO_8859_1)));
response.setHeader("Connection", "close");
response.setHeader("Content-Type", "application/vnd.ms-excel");
ServletOutputStream outputStream = response.getOutputStream();
@@ -1166,7 +1166,7 @@ public class ProjectController extends BaseController {
BigDecimal incomeTotalAmount = projectBudgetService.getBudgetIncomeAmount(project);
String[] headers2 = {"序号", "类别", "名称", "单位", "数量", "单价", "税率(%)", "含税总金额(元)", "不含税金额(元)", "税金(元)"};
String[] columns2 = {"tempId", "type", "name", "unit", "amount", "price", "taxRate", "totalTaxInclude", "totalTaxExclude", "totalTax"};
- exportExcelUtils.exportIncomeDetailExcel(headers2, columns2, project, budgetBean, budgetIncomeDetail, incomeTotalAmount, "yyyy-MM-dd", 0, "收款明细表", outputStream);
+ exportExcelUtils.exportIncomeDetailExcel(headers2, columns2, project, budgetBean, budgetIncomeDetail, incomeTotalAmount, "yyyy-MM-dd", 0, "收入明细表", outputStream);
exportExcelUtils.end(outputStream);
}
diff --git a/src/main/java/cn/palmte/work/model/ProjectBudgetIncomeDetail.java b/src/main/java/cn/palmte/work/model/ProjectBudgetIncomeDetail.java
index 131e1b1..6882f88 100644
--- a/src/main/java/cn/palmte/work/model/ProjectBudgetIncomeDetail.java
+++ b/src/main/java/cn/palmte/work/model/ProjectBudgetIncomeDetail.java
@@ -3,7 +3,7 @@ package cn.palmte.work.model;
import javax.persistence.*;
/**
- * 项目预算收款明细表
+ * 项目预算收入明细表
*/
@Entity
@Table(name = "project_budget_income_detail")
diff --git a/src/main/java/cn/palmte/work/model/ProjectBudgetIncomePlanDetail.java b/src/main/java/cn/palmte/work/model/ProjectBudgetIncomePlanDetail.java
index a373f45..8a23619 100644
--- a/src/main/java/cn/palmte/work/model/ProjectBudgetIncomePlanDetail.java
+++ b/src/main/java/cn/palmte/work/model/ProjectBudgetIncomePlanDetail.java
@@ -4,7 +4,7 @@ import javax.persistence.Entity;
import javax.persistence.Table;
/**
- * 项目预算收款明细表
+ * 项目预算收入明细表
*/
@Entity
@Table(name = "project_budget_income_plan_detail")
diff --git a/src/main/java/cn/palmte/work/model/ProjectBudgetIncomePlanDetailTemp.java b/src/main/java/cn/palmte/work/model/ProjectBudgetIncomePlanDetailTemp.java
index cbbfbac..4b47ae9 100644
--- a/src/main/java/cn/palmte/work/model/ProjectBudgetIncomePlanDetailTemp.java
+++ b/src/main/java/cn/palmte/work/model/ProjectBudgetIncomePlanDetailTemp.java
@@ -4,7 +4,7 @@ import javax.persistence.Entity;
import javax.persistence.Table;
/**
- * 项目预算收款明细表
+ * 项目预算收入明细表
*/
@Entity
@Table(name = "project_budget_income_plan_detail_temp")
diff --git a/src/main/resources/sql/fourcal-purge.sql b/src/main/resources/sql/fourcal-purge.sql
index a45cdf3..f9fe31e 100644
--- a/src/main/resources/sql/fourcal-purge.sql
+++ b/src/main/resources/sql/fourcal-purge.sql
@@ -5753,7 +5753,7 @@ CREATE TABLE `project_budget_income_detail` (
`price` decimal(16,2) NOT NULL COMMENT '单价',
`tax_rate` decimal(16,2) NOT NULL COMMENT '税率',
PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='收款明细表';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='收入明细表';
-- ----------------------------
-- Records of project_budget_income_detail
@@ -5773,7 +5773,7 @@ CREATE TABLE `project_budget_income_detail_temp` (
`price` decimal(16,2) NOT NULL COMMENT '单价',
`tax_rate` decimal(16,2) NOT NULL COMMENT '税率',
PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='收款明细表';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='收入明细表';
-- ----------------------------
-- Records of project_budget_income_detail_temp
diff --git a/src/main/resources/sql/fourcal.sql b/src/main/resources/sql/fourcal.sql
index a47de97..bb9e5bc 100644
--- a/src/main/resources/sql/fourcal.sql
+++ b/src/main/resources/sql/fourcal.sql
@@ -8268,7 +8268,7 @@ CREATE TABLE `project_budget_income_detail` (
`price` decimal(16,2) NOT NULL COMMENT '单价',
`tax_rate` decimal(16,2) NOT NULL COMMENT '税率',
PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=711 DEFAULT CHARSET=utf8mb4 COMMENT='收款明细表';
+) ENGINE=InnoDB AUTO_INCREMENT=711 DEFAULT CHARSET=utf8mb4 COMMENT='收入明细表';
-- ----------------------------
-- Records of project_budget_income_detail
@@ -8393,7 +8393,7 @@ CREATE TABLE `project_budget_income_detail_temp` (
`price` decimal(16,2) NOT NULL COMMENT '单价',
`tax_rate` decimal(16,2) NOT NULL COMMENT '税率',
PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=701 DEFAULT CHARSET=utf8mb4 COMMENT='收款明细表';
+) ENGINE=InnoDB AUTO_INCREMENT=701 DEFAULT CHARSET=utf8mb4 COMMENT='收入明细表';
-- ----------------------------
-- Records of project_budget_income_detail_temp
diff --git a/src/main/resources/static/assets/js/project_budget.js b/src/main/resources/static/assets/js/project_budget.js
index 152e3ec..38d7778 100644
--- a/src/main/resources/static/assets/js/project_budget.js
+++ b/src/main/resources/static/assets/js/project_budget.js
@@ -92,12 +92,12 @@ $(function () {
var dataIncome = collectData("am-modal-prompt-input-income");
if (dataIncome.length <= 0) {
- window.confirm('请填写收款明细表');
+ window.confirm('请填写收入明细表');
$("#saveDraft").attr('disabled', false);
return;
}
- var dataIncomeCheck = convertDetailVerifyCheck(dataIncome, INCOME_DETAIL2, "收款明细表");
+ var dataIncomeCheck = convertDetailVerifyCheck(dataIncome, INCOME_DETAIL2, "收入明细表");
if (dataIncomeCheck == null) {
$("#saveDraft").attr('disabled', false);
return;
@@ -205,12 +205,12 @@ $(function () {
var dataIncome = collectData("am-modal-prompt-input-income");
if (dataIncome.length <= 5) {
- window.confirm('请填写收款明细表');
+ window.confirm('请填写收入明细表');
$("#saveApprove").attr('disabled', false);
return;
}
- var dataIncomeCheck = convertDetailVerifyCheck(dataIncome, INCOME_DETAIL, "收款明细表");
+ var dataIncomeCheck = convertDetailVerifyCheck(dataIncome, INCOME_DETAIL, "收入明细表");
if (dataIncomeCheck == null) {
$("#saveApprove").attr('disabled', false);
return;
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 0cf7863..b535633 100644
--- a/src/main/resources/static/assets/js/project_budget_income.js
+++ b/src/main/resources/static/assets/js/project_budget_income.js
@@ -71,7 +71,7 @@ $(function () {
});
});
-//保存收款明细表
+//保存收入明细表
$(function () {
$("#incomeTableSave").click(function () {
var data = collectData("am-modal-prompt-input-income");
diff --git a/src/main/resources/templates/admin/project_approve.ftl b/src/main/resources/templates/admin/project_approve.ftl
index ad2ba20..e244453 100644
--- a/src/main/resources/templates/admin/project_approve.ftl
+++ b/src/main/resources/templates/admin/project_approve.ftl
@@ -154,7 +154,7 @@
<!--选项卡（tabs）begin-->
<div class="am-tabs palm-tabs outer" data-am-tabs>
<ul class="am-tabs-nav am-nav am-nav-tabs palm-tabs-nav">
- <li id="jiben" <#if check==1>class="am-active"</#if>><a href="#tab1">项目立项（概算）基本信息</a></li>
+ <li id="jiben" <#if check==1>class="am-active"</#if>><a href="#tab1">项目立项（概算）信息</a></li>
<#-- <#if project.status==1 || project.status==5 || project.status==10 || project.status==15>-->
<#-- <li><a href="#tab2">项目立项（概算）其他信息</a></li>-->
<#-- </#if>-->
@@ -171,7 +171,7 @@
</ul>
<div class="am-tabs-bd palm-tabs-bd">
- <#-- 项目立项（概算）基本信息 展示内容 -->
+ <#-- 项目立项（概算）信息 展示内容 -->
<div <#if check==1>class="am-tab-panel am-fade am-in am-active" <#else> class="am-tab-panel am-fade am-in"</#if> id="tab1">
<input name="id" id="id" type="hidden" value="${project.id}" />
<input name="type" id="type" type="hidden" value="${type}"/>
@@ -192,7 +192,7 @@
<!--startprint-->
<table id="myTable" class="am-table am-table-bordered">
<tr class="am-text-nowrap">
- <th class="table-title" colspan="6" style="text-align: center">项目立项（概算）基本信息</th>
+ <th class="table-title" colspan="6" style="text-align: center">项目立项（概算）信息</th>
<input type="hidden" style="border-style:none;" name="id" id="id" value="${id!}"/>
</tr>
<tr class="am-text-nowrap">
@@ -405,7 +405,7 @@
<div class="am-tabs palm-tabs inner" data-am-tabs id="subTab">
<ul class="am-tabs-nav am-nav am-nav-tabs palm-tabs-nav">
<li class="am-active"><a href="#tab35">预算信息</a></li>
- <li><a href="#tab31">收款明细表</a></li>
+ <li><a href="#tab31">收入明细表</a></li>
<li><a href="#tab36">收款计划表</a></li>
<li><a href="#tab32">采购成本明细表</a></li>
<li><a href="#tab33">项目管理成本表</a></li>
@@ -414,7 +414,7 @@
</div>
<div class="am-tabs-bd palm-tabs-bd">
<div class="am-tab-panel am-fade am-in" id="tab31">
- <#--<span class="am-text-lg">收款明细表</span>-->
+ <#--<span class="am-text-lg">收入明细表</span>-->
<div class="fixed-section">
<div class="am-modal-bd">
<div class="fixed-actions">
@@ -523,7 +523,7 @@
</div>
</div>
<div class="am-tab-panel am-fade am-in" id="tab36">
- <#--<span class="am-text-lg">收款明细表</span>-->
+ <#--<span class="am-text-lg">收入明细表</span>-->
<div class="fixed-section">
<div class="am-modal-bd">
<div class="fixed-actions">
@@ -1032,7 +1032,7 @@
</table>
<!--endprint-->
</div>
- <#--<span class="am-text-primary"><a style="cursor: pointer" id="income-detail">收款明细表</a></span>
+ <#--<span class="am-text-primary"><a style="cursor: pointer" id="income-detail">收入明细表</a></span>
<span class="am-text-primary"><a style="cursor: pointer" id="cost-detail">采购成本明细表</a></span>
<span class="am-text-primary"><a style="cursor: pointer" id="cost-project-manage-detail">项目管理成本表</a></span>
<span class="am-text-primary budget-plan-detail"><a style="cursor: pointer">资金计划表</a></span>-->
@@ -2137,11 +2137,11 @@
</div>
- <#--收款明细表弹窗-->
+ <#--收入明细表弹窗-->
<div class="am-modal am-modal-prompt" style="width: 1200px;max-height:600px;overflow-y:auto;"
tabindex="-1" id="my-prompt-income-detail">
<div class="am-modal-dialog">
- <div class="am-modal-hd">销售收款明细表——${project.name}</div>
+ <div class="am-modal-hd">销售收入明细表——${project.name}</div>
<div class="am-modal-bd">
<table class="am-table am-table-bordered am-table-radius table-main" style="padding:0;"
id="incomeTable">
diff --git a/src/main/resources/templates/admin/project_budget_edit.ftl b/src/main/resources/templates/admin/project_budget_edit.ftl
index ec6c609..ce597bc 100644
--- a/src/main/resources/templates/admin/project_budget_edit.ftl
+++ b/src/main/resources/templates/admin/project_budget_edit.ftl
@@ -93,9 +93,9 @@
<!--选项卡（tabs）begin-->
<div class="am-tabs palm-tabs" data-am-tabs>
<ul class="am-tabs-nav am-nav am-nav-tabs palm-tabs-nav">
- <li class="am-active"><a href="#tab1">项目立项（概算）基本信息</a></li>
+ <li class="am-active"><a href="#tab1">项目立项（概算）信息</a></li>
<#-- <li><a href="#tab2">项目立项（概算）其他信息</a></li>-->
- <li><a href="#tab3">收款明细表</a></li>
+ <li><a href="#tab3">收入明细表</a></li>
<li><a href="#tab8">收款计划表</a></li>
<li><a href="#tab4">采购成本明细表</a></li>
<li><a href="#tab5">项目管理成本表</a></li>
@@ -109,7 +109,7 @@
<!--验证表单元素（validate) begin-->
<table id="myTable" class="am-table am-table-bordered">
<tr class="am-text-nowrap">
- <th class="table-title" colspan="6" style="text-align: center">项目立项（概算）基本信息</th>
+ <th class="table-title" colspan="6" style="text-align: center">项目立项（概算）信息</th>
<input type="hidden" style="border-style:none;" name="id" id="id" value="${id!}"/>
</tr>
<tr class="am-text-nowrap">
@@ -804,7 +804,7 @@
</div>
<div class="am-tab-panel am-fade am-in" id="tab7">
<span>收入</span>
- <#-- <span class="am-text-primary"><a style="cursor: pointer" id="income-detail">收款明细表</a></span>-->
+ <#-- <span class="am-text-primary"><a style="cursor: pointer" id="income-detail">收入明细表</a></span>-->
<table class="am-table am-table-bordered am-table-radius table-main" style="padding:0;">
<tbody>
<tr>
diff --git a/src/main/resources/templates/admin/project_estimate_add.ftl b/src/main/resources/templates/admin/project_estimate_add.ftl
index 3f5db75..dc87a67 100644
--- a/src/main/resources/templates/admin/project_estimate_add.ftl
+++ b/src/main/resources/templates/admin/project_estimate_add.ftl
@@ -39,7 +39,7 @@
<!--选项卡（tabs）begin-->
<div class="am-tabs am-margin" data-am-tabs>
<ul class="am-tabs-nav am-nav am-nav-tabs">
- <li class="am-active"><a href="#tab1">项目立项（概算）基本信息</a></li>
+ <li class="am-active"><a href="#tab1">项目立项（概算）信息</a></li>
<#-- <li><a href="#tab2">项目立项（概算）其他信息</a></li>-->
</ul>
<div class="am-tabs-bd">
@@ -49,7 +49,7 @@
<input name="id" id="id" type="hidden" value="${projectId}" />
<table id="myTable" class="am-table am-table-bordered">
<tr class="am-text-nowrap">
- <th class="table-title" colspan="6" style="text-align: center">项目立项（概算）基本信息</th>
+ <th class="table-title" colspan="6" style="text-align: center">项目立项（概算）信息</th>
<input type="hidden" style="border-style:none;" name="id" id="id" value="${id!}"/>
</tr>
<tr class="am-text-nowrap">
diff --git a/src/main/resources/templates/admin/project_estimate_edit.ftl b/src/main/resources/templates/admin/project_estimate_edit.ftl
index 630bfde..573ce9b 100644
--- a/src/main/resources/templates/admin/project_estimate_edit.ftl
+++ b/src/main/resources/templates/admin/project_estimate_edit.ftl
@@ -44,7 +44,7 @@
<!--选项卡（tabs）begin-->
<div class="am-tabs am-margin" data-am-tabs>
<ul class="am-tabs-nav am-nav am-nav-tabs">
- <li class="am-active"><a href="#tab1">项目立项（概算）基本信息</a></li>
+ <li class="am-active"><a href="#tab1">项目立项（概算）信息</a></li>
<#-- <li><a href="#tab2">项目立项（概算）其他信息</a></li>-->
</ul>
<div class="am-tabs-bd">
@@ -53,7 +53,7 @@
<!--验证表单元素（validate) begin-->
<table id="myTable" class="am-table am-table-bordered">
<tr class="am-text-nowrap">
- <th class="table-title" colspan="6" style="text-align: center">项目立项（概算）基本信息</th>
+ <th class="table-title" colspan="6" style="text-align: center">项目立项（概算）信息</th>
<input type="hidden" style="border-style:none;" name="id" id="id" value="${id!}"/>
</tr>
<tr class="am-text-nowrap">