bug问题
‘wangjiuyun
parent
f7b15273b2
commit
dc5d86227c
|
|
@ -867,6 +867,74 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
<div class="am-tab-panel am-fade am-in" id="tabPay">
|
||||||
|
<div class="fixed-section">
|
||||||
|
<div class="am-modal-bd">
|
||||||
|
<div class="fixed-actions">
|
||||||
|
<#-- <div class="am-btn-toolbar">-->
|
||||||
|
<#-- <div class="am-btn-group am-btn-group-xs">-->
|
||||||
|
<#-- <div class="am-btn-group am-btn-group-xs am-form-file">-->
|
||||||
|
<#-- <button type="button" id="bt_import" class="am-btn am-btn-default">-->
|
||||||
|
<#-- <span class="am-icon-archive"></span>-->
|
||||||
|
<#-- 批量导入-->
|
||||||
|
<#-- </button>-->
|
||||||
|
<#-- <input id="doc-form-file2" type="file" name="file" onChange="ajaxUploadFile2('doc-form-file2','${base}/project/batchCostImport?id=' + ${project.id})">-->
|
||||||
|
<#-- </div>-->
|
||||||
|
|
||||||
|
<#-- <button type="button" class="am-btn am-btn-default" onclick="location.href='${base}/project/costTemplate'">-->
|
||||||
|
<#-- <span class="am-icon-archive"></span> 导入模板下载-->
|
||||||
|
<#-- </button>-->
|
||||||
|
<#-- </div>-->
|
||||||
|
<#-- </div>-->
|
||||||
|
</div>
|
||||||
|
<div class="fixed-table has-actions is-vertical-scroll">
|
||||||
|
<table class="am-table am-table-bordered am-table-radius table-main" style="padding:0;" id="payTable">
|
||||||
|
<thead style="display:block;">
|
||||||
|
<tr>
|
||||||
|
<th width="60px">序号</th>
|
||||||
|
<th width="100px">付款节点</th>
|
||||||
|
<th width="100px">付款时间</th>
|
||||||
|
<th width="100px">采购成本项目</th>
|
||||||
|
<th width="100px">付款金额</th>
|
||||||
|
<th width="100px">供应商</th>
|
||||||
|
|
||||||
|
</tr>
|
||||||
|
</thead>
|
||||||
|
<tbody>
|
||||||
|
<#if budgetPayPlan??>
|
||||||
|
<#list budgetPayPlan as payDetail>
|
||||||
|
<tr>
|
||||||
|
<td width="60px"><input type="text" class="am-modal-prompt-input am-modal-prompt-input-pay input-budget-num" value="${(payDetail_index+1)!}" readonly></td>
|
||||||
|
<td width="100px"><input type="text" class="am-modal-prompt-input am-modal-prompt-input-pay input-changeable-pay-point" value="${payDetail.payPoint}" readonly></td>
|
||||||
|
<td width="100px"><input type="text" class="am-modal-prompt-input am-modal-prompt-input-pay input-changeable-pay-time" value="${(payDetail.payTime?string("yyyy-MM-dd"))!}" data-am-datepicker readonly></td>
|
||||||
|
<td width="100px">
|
||||||
|
<#if payDetail.payProject='1'>设备成本</#if>
|
||||||
|
<#if payDetail.payProject='2'>工程成本</#if>
|
||||||
|
<#if payDetail.payProject='3'>服务成本</#if>
|
||||||
|
<#if payDetail.payProject='4'>其他成本</#if>
|
||||||
|
</td>
|
||||||
|
<td width="100px"><input type="text" class="am-modal-prompt-input am-modal-prompt-input-pay input-changeable-pay-amount" value="${Utils.format(payDetail.payAmount,'0')}" readonly></td>
|
||||||
|
<td width="100px"><input type="text" class="am-modal-prompt-input am-modal-prompt-input-pay input-changeable-pay-supplier" value="${payDetail.supplier}" readonly></td>
|
||||||
|
</tr>
|
||||||
|
</#list>
|
||||||
|
</#if>
|
||||||
|
<tr class="total-new" id="payTotal">
|
||||||
|
<td width="60px"><input type="text" class="am-modal-prompt-input am-modal-prompt-input-pay" value="总计" readonly></td>
|
||||||
|
<td width="100px"></td>
|
||||||
|
<td width="100px"></td>
|
||||||
|
<td width="100px"></td>
|
||||||
|
<td width="100px"><input type="text" class="am-modal-prompt-input am-modal-prompt-input-pay input-changeable-pay-amount-total" value="${Utils.format(budgetPayPlanTotal,'0')}" readonly></td>
|
||||||
|
<td width="100px"></td>
|
||||||
|
<td width="60px"></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
</div>
|
||||||
|
|
||||||
|
|
||||||
<div class="am-tab-panel am-fade am-in" id="tab36">
|
<div class="am-tab-panel am-fade am-in" id="tab36">
|
||||||
<#--<span class="am-text-lg">收入明细表</span>-->
|
<#--<span class="am-text-lg">收入明细表</span>-->
|
||||||
|
|
|
||||||
|
|
@ -1519,11 +1519,12 @@
|
||||||
<td width="100px"><input type="text" class="am-modal-prompt-input am-modal-prompt-input-pay input-changeable-pay-point" value="${payDetail.payPoint}" ></td>
|
<td width="100px"><input type="text" class="am-modal-prompt-input am-modal-prompt-input-pay input-changeable-pay-point" value="${payDetail.payPoint}" ></td>
|
||||||
<td width="100px"><input type="text" class="am-modal-prompt-input am-modal-prompt-input-pay input-changeable-pay-time" value="${(payDetail.payTime?string("yyyy-MM-dd"))!}" data-am-datepicker ></td>
|
<td width="100px"><input type="text" class="am-modal-prompt-input am-modal-prompt-input-pay input-changeable-pay-time" value="${(payDetail.payTime?string("yyyy-MM-dd"))!}" data-am-datepicker ></td>
|
||||||
<td width="100px">
|
<td width="100px">
|
||||||
<select style="float: left;" class="am-modal-prompt-input am-modal-prompt-input-pay input-changeable-pay-project">
|
|
||||||
<option value="1" <#if payDetail.payProject == 1>selected</#if>>设备成本</option>
|
<select style="float: left;" class="am-modal-prompt-input am-modal-prompt-input-pay input-changeable-pay-project" name="payProject">
|
||||||
<option value="2" <#if payDetail.payProject == 2>selected</#if>>工程成本</option>
|
<option value="1" <#if payDetail.payProject='1'>selected</#if>>设备成本</option>
|
||||||
<option value="3" <#if payDetail.payProject == 3>selected</#if>>服务成本</option>
|
<option value="2" <#if payDetail.payProject='2'>selected</#if>>工程成本</option>
|
||||||
<option value="4" <#if payDetail.payProject == 4>selected</#if>>其他成本</option>
|
<option value="3" <#if payDetail.payProject='3'>selected</#if>>服务成本</option>
|
||||||
|
<option value="4" <#if payDetail.payProject='4'>selected</#if>>其他成本</option>
|
||||||
</select>
|
</select>
|
||||||
</td>
|
</td>
|
||||||
<td width="100px"><input type="text" class="am-modal-prompt-input am-modal-prompt-input-pay input-changeable-pay-amount" value="${Utils.format(payDetail.payAmount,'0')}"></td>
|
<td width="100px"><input type="text" class="am-modal-prompt-input am-modal-prompt-input-pay input-changeable-pay-amount" value="${Utils.format(payDetail.payAmount,'0')}"></td>
|
||||||
|
|
@ -1537,7 +1538,7 @@
|
||||||
<td width="100px"></td>
|
<td width="100px"></td>
|
||||||
<td width="100px"></td>
|
<td width="100px"></td>
|
||||||
<td width="100px"></td>
|
<td width="100px"></td>
|
||||||
<td width="100px"><input type="text" class="am-modal-prompt-input am-modal-prompt-input-pay input-changeable-pay-amount-total" value="${Utils.format(budgetBean.budgetPayPlanTotal,'0')}" readonly></td>
|
<td width="100px"><input type="text" class="am-modal-prompt-input am-modal-prompt-input-pay input-changeable-pay-amount-total" value="${Utils.format(budgetPayPlanTotal,'0')}" readonly></td>
|
||||||
<td width="100px"></td>
|
<td width="100px"></td>
|
||||||
<td width="60px"></td>
|
<td width="60px"></td>
|
||||||
</tr>
|
</tr>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue