mula
/
fourcal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

成本中其他小类可编辑

master
OathK1per 2021-12-29 17:35:23 +08:00
parent 50df4ecfb8
commit 9330c2c84c
10 changed files with 45 additions and 28 deletions

13
src/main/java/cn/palmte/work/model/Project.java
View File

@ -139,6 +139,11 @@ public class Project {
*/
@Column(name = "value_risk")
private String valueRisk;
/**
* 其他中的小类名称
*/
@Column(name = "other_name")
private String otherName;
/**
* 项目创建时的配置的阀值
*/
@ -379,6 +384,14 @@ public class Project {
this.valueRisk = valueRisk;
}
public String getOtherName() {
return otherName;
}
public void setOtherName(String otherName) {
this.otherName = otherName;
}
public BigDecimal getProjectContributionProfitRateThreshold() {
return projectContributionProfitRateThreshold;
}

1
src/main/java/cn/palmte/work/service/ProjectService.java
View File

@ -190,6 +190,7 @@ public class ProjectService {
projectInDb.setZiguangOtherAmount(project.getZiguangOtherAmount());
projectInDb.setMainContractCollectionTerms(project.getMainContractCollectionTerms());
projectInDb.setValueRisk(project.getValueRisk());
projectInDb.setOtherName(project.getOtherName());
/// projectInDb.setApproveStatusEstimate(approveStatusEnum.getApproveStatus());

10
src/main/resources/templates/admin/project_approve.ftl
View File

@ -244,7 +244,7 @@
<div class="am-g am-form-group am-margin-top">
<div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>主合同收款条款</div>
<div class="am-u-sm-6 am-u-md-6">
<span>${project.mainContractCollectionTerms}</span>
<div style="width:600px; height:auto; word-wrap:break-word;">${project.mainContractCollectionTerms!}</div>
</div>
<div class="am-u-sm-2 am-u-md-4 input-msg"></div>
</div>
@ -354,7 +354,7 @@
<tr>
<td>成本</td>
<td>其他</td>
<td>其他</td>
<td>${project.otherName!}</td>
<td><input type="number" min="0.00" max="99999999.99" step="0.01" name="costOtherOtherTaxInclude" value="${Utils.format(estimateBean.costOtherOtherTaxInclude)}" required readonly></td>
<td><input type="number" min="0.00" max="99999999.99" step="0.01" name="costOtherOtherTaxExclude" value="${Utils.format(estimateBean.costOtherOtherTaxExclude)}" required readonly></td>
</tr>
@ -514,7 +514,7 @@
<tr>
<td>成本</td>
<td>其他</td>
<td>其他</td>
<td>${project.otherName!}</td>
<td><input type="number" min="0.00" max="99999999.99" step="0.01" name="costOtherOtherTaxInclude" value="${Utils.format(budgetBean.costOtherOtherTaxInclude,'0')}" required readonly title="其他含税总额（填入）"></td>
<td><input type="number" min="0.00" max="99999999.99" step="0.01" name="costOtherOtherTaxExclude" value="${Utils.format(budgetBean.costOtherOtherTaxExclude,'0')}" required readonly title="其他不含税总额（填入）"></td>
</tr>
@ -782,7 +782,7 @@
<tr>
<td>成本</td>
<td>其他</td>
<td>其他</td>
<td>${project.otherName!}</td>
<td><input name="costOtherEstimateTotal" type="number" value="${Utils.format(monthBean.estimateCostOther,'0')}" readonly required title="其他成本概算总额"></td>
<td><input name="costOtherBudgetTotal" type="number" value="${Utils.format(monthBean.budgetCostOther,'0')}" readonly required title="其他成本预算总额"></td>
<td><input name="costOtherFormerSettleTotal" type="number" value="${Utils.format(formerBean.costOtherOtherTaxExclude,'0')}" required readonly title="其他成本上月结算总额"></td>
@ -1134,7 +1134,7 @@
<tr>
<td>成本</td>
<td>其他</td>
<td>其他</td>
<td>${project.otherName!}</td>
<td><input name="costOtherOtherTaxExclude" type="number" value="${Utils.format(estimateBean.costOtherOtherTaxExclude,'0')}" readonly required title="其他成本概算总额"></td>
<td><input name="costOtherOtherTaxExclude" type="number" value="${Utils.format(budgetBean.costOtherOtherTaxExclude,'0')}" readonly required title="其他成本预算总额"></td>
<td><input name="costOtherSettleTotal" value="${Utils.format(currentBean.costOtherOtherTaxExclude,'0')}" type="number" type="number"readonly required title="其他成本结算总额"></td>

29
src/main/resources/templates/admin/project_budget_edit.ftl
View File

@ -95,23 +95,19 @@
<div class="am-g am-form-group am-margin-top">
<div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>项目类型</div>
<div class="am-u-sm-6 am-u-md-6">
<select data-am-selected id="type" name="type" readonly disabled>
<option value="1" <#if project.type=1>selected</#if>>工程集成类</option>
<option value="2" <#if project.type=2>selected</#if>>设备集成类</option>
<option value="3" <#if project.type=3>selected</#if>>战略合作类</option>
</select>
<input type="text" class="am-input" data-validate-async data-validation-message="请输入项目项目类型"
name="type" <#if project.type=1>value="工程集成类"<#elseif project.type=2>value="设备集成类"<#else>value="战略合作类"</#if>
required readonly/>
</div>
<div class="am-u-sm-2 am-u-md-4 input-msg"></div>
</div>
<div class="am-g am-form-group am-margin-top">
<div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>垫资模式</div>
<div class="am-u-sm-6 am-u-md-6">
<select data-am-selected id="underwrittenMode" name="underwrittenMode" readonly disabled>
<option value="1" <#if project.underwrittenMode=1>selected</#if>>A类-不垫资（战略合作）</option>
<option value="2" <#if project.underwrittenMode=2>selected</#if>>B类-不垫资（背靠背）</option>
<option value="3" <#if project.underwrittenMode=3>selected</#if>>C类-垫资（账期覆盖）</option>
<option value="4" <#if project.underwrittenMode=4>selected</#if>>D类-垫资（账期不覆盖）</option>
</select>
<input type="text" class="am-input" data-validate-async data-validation-message="请输入垫资模式"
name="underwrittenMode" required readonly
<#if project.underwrittenMode=1>value="A类-不垫资（战略合作）"<#elseif project.underwrittenMode=2>value="B类-不垫资（背靠背）"
<#elseif project.underwrittenMode=3>value="C类-垫资（账期覆盖）"<#else>value="D类-垫资（账期不覆盖）"</#if> />
</div>
<div class="am-u-sm-2 am-u-md-4 input-msg"></div>
</div>
@ -191,10 +187,10 @@
<div class="am-g am-form-group am-margin-top">
<div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>主合同收款条款</div>
<div class="am-u-sm-6 am-u-md-6">
<textarea rows="3" cols="20" id="mainContractCollectionTerms" name="mainContractCollectionTerms" maxlength="100"
class="am-input" data-validate-async data-validation-message="请输入收款条款"
placeholder="请输入收款条款" required
></textarea>
<textarea rows="3" cols="20" id="mainContractCollectionTerms" name="mainContractCollectionTerms" maxlength="100"
class="am-input" data-validate-async data-validation-message="请输入收款条款"
placeholder="请输入收款条款" required
>${project.mainContractCollectionTerms!}</textarea>
</div>
<div class="am-u-sm-2 am-u-md-4 input-msg"></div>
</div>
@ -300,7 +296,8 @@
<tr>
<td>成本</td>
<td>其他</td>
<td>其他</td>
<td><input type="text" id="otherName" maxlength="6" data-validate-async data-validation-message="请输入其他中的小类名称（10字符以内）"
value="${project.otherName!}" name="otherName" placeholder="请输入其他中的小类名称（10字符以内）" readonly required/> </td>
<td><input type="number" min="0.00" max="9999999999.99" step="0.01" maxlength="13" name="costOtherOtherTaxInclude" value="${Utils.format(budgetBean.costOtherOtherTaxInclude,'0')}" required title="其他含税总额（填入）"></td>
<td><input type="number" min="0.00" max="9999999999.99" step="0.01" maxlength="13" name="costOtherOtherTaxExclude" value="${Utils.format(budgetBean.costOtherOtherTaxExclude,'0')}" required title="其他不含税总额（填入）"></td>
</tr>

3
src/main/resources/templates/admin/project_estimate_add.ftl
View File

@ -269,7 +269,8 @@
<tr>
<td>成本</td>
<td>其他</td>
<td>其他</td>
<td><input type="text" id="otherName" maxlength="6" data-validate-async data-validation-message="请输入其他类的名称（10字符以内）"
value="" name="otherName" placeholder="请输入其他类的名称（10字符以内）" required/> </td>
<td><input type="number" min="0.00" max="9999999999.99" step="0.01" maxlength="13" name="costOtherOtherTaxInclude" required></td>
<td><input type="number" min="0.00" max="9999999999.99" step="0.01" maxlength="13" name="costOtherOtherTaxExclude" required></td>
</tr>

5
src/main/resources/templates/admin/project_estimate_edit.ftl
View File

@ -174,7 +174,7 @@
<textarea rows="3" cols="20" id="mainContractCollectionTerms" name="mainContractCollectionTerms" maxlength="100"
class="am-input" data-validate-async data-validation-message="请输入收款条款"
placeholder="请输入收款条款" required
></textarea>
>${project.mainContractCollectionTerms!}</textarea>
</div>
<div class="am-u-sm-2 am-u-md-4 input-msg"></div>
</div>
@ -276,7 +276,8 @@
<tr>
<td>成本</td>
<td>其他</td>
<td>其他</td>
<td><input type="text" id="otherName" maxlength="6" data-validate-async data-validation-message="请输入其他类的名称（10字符以内）"
value="${project.otherName!}" name="otherName" placeholder="请输入其他类的名称（10字符以内）" required/> </td>
<td><input type="number" min="0.00" max="9999999999.99" step="0.01" maxlength="13" name="costOtherOtherTaxInclude" value="${Utils.format(estimateBean.costOtherOtherTaxInclude)}" required></td>
<td><input type="number" min="0.00" max="9999999999.99" step="0.01" maxlength="13" name="costOtherOtherTaxExclude" value="${Utils.format(estimateBean.costOtherOtherTaxExclude)}" required></td>
</tr>

3
src/main/resources/templates/admin/project_final_add.ftl
View File

@ -139,7 +139,8 @@
<tr>
<td>成本</td>
<td>其他</td>
<td>其他</td>
<td><input type="text" id="otherName" maxlength="6" data-validate-async data-validation-message="请输入其他中的小类名称（10字符以内）"
value="${project.otherName!}" name="otherName" placeholder="请输入其他中的小类名称（10字符以内）" readonly required/> </td>
<td><input name="costOtherOtherTaxExclude" type="number" value="${Utils.format(estimateBean.costOtherOtherTaxExclude,'0')}" readonly required title="其他成本概算总额"></td>
<td><input name="costOtherOtherTaxExclude" type="number" value="${Utils.format(budgetBean.costOtherOtherTaxExclude,'0')}" readonly required title="其他成本预算总额"></td>
<td><input name="costOtherSettleTotal" value="${Utils.format(settleBean.costOtherOtherTaxExclude,'0')}" type="number" type="number"readonly required title="其他成本结算总额"></td>

3
src/main/resources/templates/admin/project_final_edit.ftl
View File

@ -139,7 +139,8 @@
<tr>
<td>成本</td>
<td>其他</td>
<td>其他</td>
<td><input type="text" id="otherName" maxlength="6" data-validate-async data-validation-message="请输入其他中的小类名称（10字符以内）"
value="${project.otherName!}" name="otherName" placeholder="请输入其他中的小类名称（10字符以内）" readonly required/> </td>
<td><input name="costOtherOtherTaxExclude" type="number" value="${Utils.format(estimateBean.costOtherOtherTaxExclude,'0')}" readonly required title="其他成本概算总额"></td>
<td><input name="costOtherOtherTaxExclude" type="number" value="${Utils.format(budgetBean.costOtherOtherTaxExclude,'0')}" readonly required title="其他成本预算总额"></td>
<td><input name="costOtherSettleTotal" value="${Utils.format(settleBean.costOtherOtherTaxExclude,'0')}" type="number" type="number"readonly required title="其他成本结算总额"></td>

3
src/main/resources/templates/admin/project_settle_add.ftl
View File

@ -163,7 +163,8 @@
<tr>
<td>成本</td>
<td>其他</td>
<td>其他</td>
<td><input type="text" id="otherName" maxlength="6" data-validate-async data-validation-message="请输入其他中的小类名称（10字符以内）"
value="${project.otherName!}" name="otherName" placeholder="请输入其他中的小类名称（10字符以内）" readonly required/> </td>
<td><input name="costOtherEstimateTotal" type="number" value="${Utils.format(estimateBean.costOtherOtherTaxExclude,'0')}" readonly required title="其他成本概算总额"></td>
<td><input name="costOtherBudgetTotal" type="number" value="${Utils.format(budgetBean.costOtherOtherTaxExclude,'0')}" readonly required title="其他成本预算总额"></td>
<td><input name="costOtherFormerSettleTotal" type="number" value="${Utils.format(formerBean.costOtherOtherTaxExclude,'0')}" required readonly title="其他成本上月结算总额"></td>

3
src/main/resources/templates/admin/project_settle_edit.ftl
View File

@ -161,7 +161,8 @@
<tr>
<td>成本</td>
<td>其他</td>
<td>其他</td>
<td><input type="text" id="otherName" maxlength="6" data-validate-async data-validation-message="请输入其他中的小类名称（10字符以内）"
value="${project.otherName!}" name="otherName" placeholder="请输入其他中的小类名称（10字符以内）" readonly required/> </td>
<td><input name="costOtherEstimateTotal" type="number" value="${Utils.format(estimateBean.costOtherOtherTaxExclude,'0')}" readonly required title="其他成本概算总额"></td>
<td><input name="costOtherBudgetTotal" type="number" value="${Utils.format(budgetBean.costOtherOtherTaxExclude,'0')}" readonly required title="其他成本预算总额"></td>
<td><input name="costOtherFormerSettleTotal" type="number" value="${Utils.format(formerBean.costOtherOtherTaxExclude,'0')}" required readonly title="其他成本上月结算总额"></td>