基本完成

dev_1.0.0
‘wangjiuyun 2024-10-31 15:56:26 +08:00
parent 45721a3d84
commit beeb889780
2 changed files with 15 additions and 12 deletions

View File

@ -568,23 +568,27 @@
<tr class="am-text-nowrap">
<th class="table-title" colspan="1"><span
style="font-size: 15px">项目名称:</span></th>
<td class="table-title" colspan="5">
<td class="table-title" colspan="2">
<input readonly value="${projectBudget.nameBudget!}"/>
</td>
<td class="table-title" colspan="3">
</tr>
<#if projectBudget.contractBudget??>
<tr class="am-text-nowrap">
<th class="table-title" colspan="1"><span
style="font-size: 15px">合同名称:</span></th>
<td class="table-title" colspan="5">
<td class="table-title" colspan="2">
<input readonly value="${projectBudget.contractBudget!}"/>
</td>
<td class="table-title" colspan="3">
</tr>
</#if>
<tr class="am-text-nowrap">
<th class="table-title" colspan="1"><span
style="font-size: 15px">项目类型:</span></th>
<td class="table-title" colspan="1">
<td class="table-title" colspan="2">
<#if projectBudget.typeBudget??>
<#if (projectBudget.typeBudget) =1>
<input readonly value="工程集成类"/>
@ -597,6 +601,7 @@
<input readonly value=""/>
</#if>
</td>
<td class="table-title" colspan="3">
</tr>
<tr class="am-text-nowrap">
@ -1159,9 +1164,7 @@
</#if>
</td>
<td>
<#list procurementTypes as procurementType>
<#if costDetail.category == procurementType.id>${procurementType.name}</#if>
</#list>
${costDetail.category}
</td>
<td><input type="text" min="0.00" max="99.99" step="0.01"
@ -1806,8 +1809,8 @@
<#-- </tr>-->
<tr>
<td>合计</td>
<td></td>
<td></td>
<#-- <td></td>-->
<#-- <td></td>-->
<td><input type="text" class="number" name="costTotalTaxInclude"
value="${Utils.format(budgetBean.costTotalTaxInclude, '0.00')}"
readonly required title="此列累计"></td>

View File

@ -1182,10 +1182,10 @@
</option>
<option value="自定义">自定义</option>
</select>
<input <#if costDetail.category!='华智产品'&&costDetail.category!='华三产品'&&costDetail.category!='汇智产品'&&costDetail.category>type="text"
<#else>type="hidden"</#if>
class="am-modal-prompt-input am-modal-prompt-input-cost input-changeable-tax-rate-cost-name"
value="${costDetail.category!}">
<input class="am-modal-prompt-input am-modal-prompt-input-cost input-changeable-tax-rate-cost-name"
<#if costDetail.category!='华智产品'&&costDetail.category!='华三产品'&&costDetail.category!='汇智产品'>type="text"</#if>
<#if costDetail.category=='华智产品'||costDetail.category=='华三产品'||costDetail.category=='汇智产品'>type="hidden"</#if>
value="${costDetail.category!}" />
</td>
<td width="100px"><input type="text" maxlength="5"
class="number am-modal-prompt-input am-modal-prompt-input-cost input-changeable-tax-rate input-changeable-tax-rate-cost"