Compare commits

..

2 Commits

Author SHA1 Message Date
‘wangjiuyun 4348997e74 Merge branch 'dev_2.0.1' of http://git.unissense.tech/mula/fourcal into dev_2.0.1 2024-12-20 14:26:52 +08:00
‘wangjiuyun a7256acb39 。。 2024-12-20 14:26:38 +08:00
1 changed files with 15 additions and 15 deletions

View File

@ -264,20 +264,7 @@
<input readonly value=""/>
</#if>
</td>
<th class="table-title" colspan="1"><span style="font-size: 15px">解决方案协同:</span>
</th>
<td class="table-title" colspan="2">
<#if project.resolvePlanSynergy??>
<#if (project.resolvePlanSynergy)==true>
<input readonly value="是"/>
<#elseif (project.resolvePlanSynergy)==false>
<input readonly value="否"/>
<#else>
<input readonly value=""/>
</#if>
</#if>
</td>
<td colspan="3"></td>
</tr>
<tr class="am-text-nowrap">
@ -629,7 +616,20 @@
<input readonly value=""/>
</#if>
</td>
<td class="table-title" colspan="3">
<th class="table-title" colspan="1"><span style="font-size: 15px">解决方案协同:</span>
</th>
<td class="table-title" colspan="2">
<#if projectBudget.resolvePlanSynergy??>
<#if (projectBudget.resolvePlanSynergy)==true>
<input readonly value="是"/>
<#elseif (projectBudget.resolvePlanSynergy)==false>
<input readonly value="否"/>
<#else>
<input readonly value=""/>
</#if>
</#if>
</td>
</tr>
<tr class="am-text-nowrap">