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

新增项目概算信息可不填写，默认为0

master
hanbo 2022-04-29 15:04:08 +08:00
parent edd954a631
commit a102c1c9b8
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -198,7 +198,7 @@
<tr>
<td>收入</td>
<td>设备类</td>
<td><input type="text" class="number" maxlength="16" name="incomeDeviceTaxInclude" id="incomeDeviceTaxInclude" required></td>
<td><input type="text" class="number" maxlength="16" name="incomeDeviceTaxInclude" id="incomeDeviceTaxInclude"></td>
<td><input type="text" class="number" maxlength="16" name="incomeDeviceTaxExclude" id="incomeDeviceTaxExclude" readonly></td>
<td>
<select data-am-selected name="incomeDeviceSelect" id="incomeDeviceSelect">
@ -215,7 +215,7 @@
<tr>
<td>收入</td>
<td>工程类</td>
<td><input type="text" class="number" maxlength="16" name="incomeEngineerTaxInclude" id="incomeEngineerTaxInclude" required></td>
<td><input type="text" class="number" maxlength="16" name="incomeEngineerTaxInclude" id="incomeEngineerTaxInclude"></td>
<td><input type="text" class="number" maxlength="16" name="incomeEngineerTaxExclude" id="incomeEngineerTaxExclude" readonly></td>
<td>
<select data-am-selected name="incomeEngineerSelect" id="incomeEngineerSelect">
@ -232,7 +232,7 @@
<tr>
<td>收入</td>
<td>服务类</td>
<td><input type="text" class="number" maxlength="16" name="incomeServiceTaxInclude" id="incomeServiceTaxInclude" required></td>
<td><input type="text" class="number" maxlength="16" name="incomeServiceTaxInclude" id="incomeServiceTaxInclude"></td>
<td><input type="text" class="number" maxlength="16" name="incomeServiceTaxExclude" id="incomeServiceTaxExclude" readonly></td>
<td>
<select data-am-selected name="incomeServiceSelect" id="incomeServiceSelect">
@ -270,7 +270,7 @@
<td>成本</td>
<td>采购成本</td>
<td>设备</td>
<td><input type="text" class="number" maxlength="16" name="costPurchaseDeviceTaxInclude" id="costPurchaseDeviceTaxInclude" required></td>
<td><input type="text" class="number" maxlength="16" name="costPurchaseDeviceTaxInclude" id="costPurchaseDeviceTaxInclude"></td>
<td><input type="text" class="number" maxlength="16" name="costPurchaseDeviceTaxExclude" id="costPurchaseDeviceTaxExclude" readonly></td>
<td>
<select data-am-selected name="costPurchaseDeviceSelect" id="costPurchaseDeviceSelect">
@ -288,7 +288,7 @@
<td>成本</td>
<td>采购成本</td>
<td>施工</td>
<td><input type="text" class="number" maxlength="16" name="costPurchaseBuildTaxInclude" id="costPurchaseBuildTaxInclude" required></td>
<td><input type="text" class="number" maxlength="16" name="costPurchaseBuildTaxInclude" id="costPurchaseBuildTaxInclude"></td>
<td><input type="text" class="number" maxlength="16" name="costPurchaseBuildTaxExclude" id="costPurchaseBuildTaxExclude" readonly></td>
<td>
<select data-am-selected name="costPurchaseBuildSelect" id="costPurchaseBuildSelect">
@ -306,7 +306,7 @@
<td>成本</td>
<td>采购成本</td>
<td>服务</td>
<td><input type="text" class="number" maxlength="16" name="costPurchaseServiceTaxInclude" id="costPurchaseServiceTaxInclude" required></td>
<td><input type="text" class="number" maxlength="16" name="costPurchaseServiceTaxInclude" id="costPurchaseServiceTaxInclude"></td>
<td><input type="text" class="number" maxlength="16" name="costPurchaseServiceTaxExclude" id="costPurchaseServiceTaxExclude" readonly></td>
<td>
<select data-am-selected name="costPurchaseServiceSelect" id="costPurchaseServiceSelect">
@ -324,7 +324,7 @@
<td>成本</td>
<td>采购成本</td>
<td>其他</td>
<td><input type="text" class="number" maxlength="16" name="costPurchaseOtherTaxInclude" id="costPurchaseOtherTaxInclude" required></td>
<td><input type="text" class="number" maxlength="16" name="costPurchaseOtherTaxInclude" id="costPurchaseOtherTaxInclude"></td>
<td><input type="text" class="number" maxlength="16" name="costPurchaseOtherTaxExclude" id="costPurchaseOtherTaxExclude" readonly></td>
<td>
<select data-am-selected name="costPurchaseOtherSelect" id="costPurchaseOtherSelect">
@ -343,7 +343,7 @@
<td>项目管理成本</td>
<td>项目管理成本</td>
<td><input type="text" class="number" name="costProjectManageTaxInclude" id="costProjectManageTaxInclude" readonly></td>
<td><input type="text" class="number" maxlength="16" name="costProjectManageTaxExclude" id="costProjectManageTaxExclude" required></td>
<td><input type="text" class="number" maxlength="16" name="costProjectManageTaxExclude" id="costProjectManageTaxExclude"></td>
<td>/</td>
</tr>
<tr>
@ -386,12 +386,12 @@
<tr>
<td>财务费用</td>
<td>资金占用成本</td>
<td><input type="text" class="number" maxlength="16" name="costExpropriationTaxExclude" id="costExpropriationTaxExclude" required></td>
<td><input type="text" class="number" maxlength="16" name="costExpropriationTaxExclude" id="costExpropriationTaxExclude"></td>
</tr>
<tr>
<td>公司管理费用</td>
<td></td>
<td><input type="text" class="number" maxlength="16" name="costCompanyManageTaxExclude" id="costCompanyManageTaxExclude" required></td>
<td><input type="text" class="number" maxlength="16" name="costCompanyManageTaxExclude" id="costCompanyManageTaxExclude"></td>
</tr>
</tbody>
</table>
@ -572,7 +572,7 @@
return;
}
if (incomeDeviceTaxInclude == '' || incomeDeviceTaxExclude == '' || incomeEngineerTaxInclude == '' || incomeEngineerTaxExclude == '' ||
/*if (incomeDeviceTaxInclude == '' || incomeDeviceTaxExclude == '' || incomeEngineerTaxInclude == '' || incomeEngineerTaxExclude == '' ||
incomeServiceTaxInclude == '' || incomeServiceTaxExclude == '' || costPurchaseDeviceTaxInclude == '' || costPurchaseDeviceTaxExclude == '' ||
costPurchaseBuildTaxInclude == '' || costPurchaseBuildTaxExclude == '' || costPurchaseServiceTaxInclude == '' || costPurchaseServiceTaxExclude == '' ||
costPurchaseOtherTaxInclude == '' || costPurchaseOtherTaxExclude == '' || costProjectManageTaxExclude == '' || costExpropriationTaxExclude == '' ||
@ -628,7 +628,7 @@
window.confirm('其他成本含税金额应大于不含税金额');
check = 1;
return;
}
}*/
checkRate();
if (rateResult == 1) {

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

@ -578,7 +578,7 @@
return;
}
if (incomeDeviceTaxInclude == '' || incomeDeviceTaxExclude == '' || incomeEngineerTaxInclude == '' || incomeEngineerTaxExclude == '' ||
/*if (incomeDeviceTaxInclude == '' || incomeDeviceTaxExclude == '' || incomeEngineerTaxInclude == '' || incomeEngineerTaxExclude == '' ||
incomeServiceTaxInclude == '' || incomeServiceTaxExclude == '' || costPurchaseDeviceTaxInclude == '' || costPurchaseDeviceTaxExclude == '' ||
costPurchaseBuildTaxInclude == '' || costPurchaseBuildTaxExclude == '' || costPurchaseServiceTaxInclude == '' || costPurchaseServiceTaxExclude == '' ||
costPurchaseOtherTaxInclude == '' || costPurchaseOtherTaxExclude == '' || costProjectManageTaxExclude == '' || costExpropriationTaxExclude == '' ||
@ -636,7 +636,7 @@
window.confirm('其他成本含税金额应大于不含税金额');
check = 1;
return;
}
}*/
checkRate();
if (rateResult == 1) {