Merge remote-tracking branch 'origin/master'

master
xxssyyyyssxx 2021-12-08 16:36:08 +08:00
commit a5f5e90e19
2 changed files with 4 additions and 4 deletions

View File

@ -1849,7 +1849,7 @@
<div class="am-g am-form-group am-margin-top" style="display: flex;"> <div class="am-g am-form-group am-margin-top" style="display: flex;">
<div class="am-u-sm-4 am-u-md-2 am-text-right"> <div class="am-u-sm-4 am-u-md-2 am-text-right">
<span style="color: red;">*</span>审核意见</div> 审核意见</div>
<div class="am-u-sm-6 am-u-md-6"> <div class="am-u-sm-6 am-u-md-6">
<textarea id="doc-vld-ta-2" minlength="10" maxlength="100"></textarea> <textarea id="doc-vld-ta-2" minlength="10" maxlength="100"></textarea>
</div> </div>

View File

@ -569,11 +569,11 @@
</select>--> </select>-->
<#if costProjectManageDetail.deletable==0> <#if costProjectManageDetail.deletable==0>
<#if costProjectManageDetail.type ==1 > <#if costProjectManageDetail.type ==1 >
人工成本 <input style="width: 80px;float: left;" readonly type="text" class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage" value="人工成本">
<#elseif costProjectManageDetail.type ==2> <#elseif costProjectManageDetail.type ==2>
业务费用 <input style="width: 80px;float: left;" readonly type="text" class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage" value="业务费用">
<#elseif costProjectManageDetail.type ==3> <#elseif costProjectManageDetail.type ==3>
其他费用 <input style="width: 80px;float: left;" readonly type="text" class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage" value="其他费用">
</#if> </#if>
<#elseif costProjectManageDetail.deletable!=0> <#elseif costProjectManageDetail.deletable!=0>
<select style="width: 80px;float: left;" class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage"> <select style="width: 80px;float: left;" class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage">