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

修改其他在各个表中可编辑可不填

master
OathK1per 2022-01-13 11:54:56 +08:00
parent 1119d20fab
commit c435f0778c
11 changed files with 37 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/resources/static/assets/js/project_final.js
View File

@ -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 {

4
src/main/resources/static/assets/js/project_settle.js
View File

@ -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("");

12
src/main/resources/static/assets/js/project_settle_valid.js
View File

@ -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();

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

@ -674,7 +674,7 @@
<tr>
<td>月份</td>
<td>设备支出</td>
<td>工程支出</td>
<td>工程支出（含服务+施工+其他）</td>
<td>经营性开支</td>
<td>保证金支出</td>
<td>支出合计</td>
@ -2046,7 +2046,7 @@
<tr>
<td>月份</td>
<td>设备支出</td>
<td>工程支出</td>
<td>工程支出（含服务+施工+其他）</td>
<td>经营性开支</td>
<td>保证金支出</td>
<td>支出合计</td>

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

@ -300,8 +300,8 @@
<td>成本</td>
<td>其他</td>
<td>${project.otherName!}</td>
<td><input type="text" class="number" name="costOtherOtherTaxInclude1" value="${Utils.format(estimateBean.costOtherOtherTaxInclude)}" required readonly></td>
<td><input type="text" class="number" name="costOtherOtherTaxExclude1" value="${Utils.format(estimateBean.costOtherOtherTaxExclude)}" required readonly></td>
<td><input type="text" class="number" name="costOtherOtherTaxInclude1" value="${Utils.format(estimateBean.costOtherOtherTaxInclude)}" readonly></td>
<td><input type="text" class="number" name="costOtherOtherTaxExclude1" value="${Utils.format(estimateBean.costOtherOtherTaxExclude)}" readonly></td>
</tr>
<tr>
<td>合计</td>
@ -558,7 +558,7 @@
<tr>
<td>月份</td>
<td>设备支出</td>
<td>工程支出</td>
<td>工程支出（含服务+施工+其他）</td>
<td>经营性开支</td>
<td>保证金支出</td>
<td>支出合计</td>
@ -743,9 +743,9 @@
<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="text" class="number" maxlength="16" name="costOtherOtherTaxInclude" value="${Utils.format(budgetBean.costOtherOtherTaxInclude,'0')}" required title="其他含税总额（填入）"></td>
<td><input type="text" class="number" maxlength="16" name="costOtherOtherTaxExclude" value="${Utils.format(budgetBean.costOtherOtherTaxExclude,'0')}" required title="其他不含税总额（填入）"></td>
value="${project.otherName!}" name="otherName" placeholder="请输入其他中的小类名称（10字符以内）"/> </td>
<td><input type="text" class="number" maxlength="16" name="costOtherOtherTaxInclude" value="${Utils.format(budgetBean.costOtherOtherTaxInclude,'0')}" title="其他含税总额（填入）"></td>
<td><input type="text" class="number" maxlength="16" name="costOtherOtherTaxExclude" value="${Utils.format(budgetBean.costOtherOtherTaxExclude,'0')}" title="其他不含税总额（填入）"></td>
</tr>
<tr>
<td>合计</td>

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

@ -358,9 +358,9 @@
<td>成本</td>
<td>其他</td>
<td><input type="text" id="otherName" maxlength="10" data-validate-async data-validation-message="请输入其他类的名称（10字符以内）"
value="" name="otherName" placeholder="请输入其他类的名称（10字符以内）" required/> </td>
<td><input type="text" class="number" maxlength="16" name="costOtherOtherTaxInclude" required></td>
<td><input type="text" class="number" maxlength="16" name="costOtherOtherTaxExclude" readonly required></td>
value="" name="otherName" placeholder="请输入其他类的名称（10字符以内）"/> </td>
<td><input type="text" class="number" maxlength="16" name="costOtherOtherTaxInclude"></td>
<td><input type="text" class="number" maxlength="16" name="costOtherOtherTaxExclude" readonly></td>
<td>
<select data-am-selected name="costOtherOtherSelect" id="costOtherOtherSelect">
<option value="请选择税率">请选择税率</option>

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

@ -364,9 +364,9 @@
<td>成本</td>
<td>其他</td>
<td><input type="text" id="otherName" maxlength="10" data-validate-async data-validation-message="请输入其他类的名称（10字符以内）"
value="${project.otherName!}" name="otherName" placeholder="请输入其他类的名称（10字符以内）" required/> </td>
<td><input type="text" class="number" maxlength="16" name="costOtherOtherTaxInclude" value="${Utils.format(estimateBean.costOtherOtherTaxInclude)}" required></td>
<td><input type="text" class="number" maxlength="16" name="costOtherOtherTaxExclude" value="${Utils.format(estimateBean.costOtherOtherTaxExclude)}" <#if estimateBean.costOtherOtherSelect! !="自定义">readonly</#if> required></td>
value="${project.otherName!}" name="otherName" placeholder="请输入其他类的名称（10字符以内）"/> </td>
<td><input type="text" class="number" maxlength="16" name="costOtherOtherTaxInclude" value="${Utils.format(estimateBean.costOtherOtherTaxInclude)}"></td>
<td><input type="text" class="number" maxlength="16" name="costOtherOtherTaxExclude" value="${Utils.format(estimateBean.costOtherOtherTaxExclude)}" <#if estimateBean.costOtherOtherSelect! !="自定义">readonly</#if>></td>
<td>
<select data-am-selected name="costOtherOtherSelect" id="costOtherOtherSelect">
<option value="请选择税率">请选择税率</option>

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

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

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

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

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

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

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

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