处理冲突

master
OathK1per 2022-01-13 18:38:46 +08:00
parent 228e60f73a
commit dead0c4d10
1 changed files with 4 additions and 3 deletions

View File

@ -920,8 +920,10 @@
<span class="am-text-primary"><a style="cursor: pointer" id="cost-detail">采购成本明细表</a></span>
<span class="am-text-primary"><a style="cursor: pointer" id="cost-project-manage-detail">项目管理成本表</a></span>
<span class="am-text-primary budget-plan-detail"><a style="cursor: pointer">资金计划表</a></span>-->
<span class="am-text-lg">收入</span>
<table class="am-table am-table-bordered am-table-radius table-main" style="padding:0;">
<div class="am-tab-panel am-fade am-in" id="tab35">
<span class="am-text-lg">收入</span>
<table class="am-table am-table-bordered am-table-radius table-main"
style="padding:0;">
<tbody>
<tr class="am-text-lg">
<td>类别</td>
@ -1174,7 +1176,6 @@
</div>
</div>
<!--验证表单元素validate end-->
</div>
<div class="am-tabs-bd">
<div <#if check==0>class="am-tab-panel am-fade am-in am-active" <#else> class="am-tab-panel am-fade am-in"</#if>