From 43cc16e9dfe83c07e8c3949564e2646dc8bdfda0 Mon Sep 17 00:00:00 2001 From: pengqiang <1067496116@qq.com> Date: Tue, 16 Aug 2022 17:23:27 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BC=9A=E7=AD=BE=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E8=BF=81=E7=A7=BB=E5=88=B0=E9=A1=B9=E7=9B=AE=E9=A6=96=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/templates/admin/project_approve.ftl | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/main/resources/templates/admin/project_approve.ftl b/src/main/resources/templates/admin/project_approve.ftl index 78a41aa..f7e0301 100644 --- a/src/main/resources/templates/admin/project_approve.ftl +++ b/src/main/resources/templates/admin/project_approve.ftl @@ -2664,10 +2664,6 @@ - <#--预算状态 待审核状态 --> - <#if project.status==5 && project.approveStatusBudget==1 && currentTaskName != "执行董事" > - - From 22fb09f755bd9ab1f636150580c3879f95c04ed2 Mon Sep 17 00:00:00 2001 From: OathK1per Date: Tue, 16 Aug 2022 18:09:24 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=85=AC=E5=8F=B8=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E8=B4=B9=E7=94=A8=E9=A1=B5=E9=9D=A2=E8=AE=A1=E7=AE=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/static/assets/js/project_budget_income.js | 1 + src/main/resources/templates/admin/project_estimate_edit.ftl | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) 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 bc31616..46549b4 100644 --- a/src/main/resources/static/assets/js/project_budget_income.js +++ b/src/main/resources/static/assets/js/project_budget_income.js @@ -123,6 +123,7 @@ function updateIncomeData(data,returnData) { $("input[name='incomeTotalTaxInclude']").val(f2Fixed(deviceTaxInclude+engineerTaxInclude+serviceTaxInclude)); $("input[name='incomeTotalTaxExclude']").val(f2Fixed(deviceTaxExclude+engineerTaxExclude+serviceTaxExclude)); $("input[name='incomeTotalTax']").val(f2Fixed(deviceTax+engineerTax+serviceTax)); + $("input[name='costCompanyManageTaxExclude']").val(f2Fixed(0.028*(deviceTaxInclude+engineerTaxInclude+serviceTaxInclude))); $(".input-total-title-sale-income-budget-plan").val($("input[name='incomeTotalTaxInclude']").val()); diff --git a/src/main/resources/templates/admin/project_estimate_edit.ftl b/src/main/resources/templates/admin/project_estimate_edit.ftl index d46e287..f14f552 100644 --- a/src/main/resources/templates/admin/project_estimate_edit.ftl +++ b/src/main/resources/templates/admin/project_estimate_edit.ftl @@ -376,7 +376,7 @@
计收计划
- From 9fda644688583cecc2aecb1a9c3c2b7947a49489 Mon Sep 17 00:00:00 2001 From: pengqiang <1067496116@qq.com> Date: Tue, 16 Aug 2022 18:20:21 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BC=9A=E7=AD=BE=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/templates/admin/project_list.ftl | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/main/resources/templates/admin/project_list.ftl b/src/main/resources/templates/admin/project_list.ftl index aba8110..46c3ae8 100644 --- a/src/main/resources/templates/admin/project_list.ftl +++ b/src/main/resources/templates/admin/project_list.ftl @@ -562,26 +562,27 @@
-
+
*请输入会签意见
- +
-
+
-
*请上传会签单
+
*请上传会签单
+ style="width: 300px;" + placeholder="格式：gif、jpg、jpeg、png、pdf"/>
-