mula
/
fourcal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: mula:4348997e74f538e126fb20043a7cf64890aa3f0d
Branches Tags
mula:dev_2.0.3
mula:dev_2.0.1
mula:dev_2.0.2
mula:dev_2.0.0
mula:dev_1.0.0
mula:master
mula:main
..
compare: mula:203fc9b2adde52c7eac7588e0a6c6e672bcb0aed
Branches Tags
mula:dev_2.0.3
mula:dev_2.0.1
mula:dev_2.0.2
mula:dev_2.0.0
mula:dev_1.0.0
mula:master
mula:main

No commits in common. "4348997e74f538e126fb20043a7cf64890aa3f0d" and "203fc9b2adde52c7eac7588e0a6c6e672bcb0aed" have entirely different histories.
4348997e74 ... 203fc9b2ad

1 changed files with 15 additions and 15 deletions
Show Stats Expand all files Collapse all files

30
src/main/resources/templates/admin/project_approve.ftl
View File

@ -264,7 +264,20 @@
<input readonly value=""/>
</#if>
</td>
<td colspan="3"></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>
</tr>
<tr class="am-text-nowrap">
@ -616,20 +629,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 projectBudget.resolvePlanSynergy??>
<#if (projectBudget.resolvePlanSynergy)==true>
<input readonly value="是"/>
<#elseif (projectBudget.resolvePlanSynergy)==false>
<input readonly value="否"/>
<#else>
<input readonly value=""/>
</#if>
</#if>
</td>
<td class="table-title" colspan="3">
</tr>
<tr class="am-text-nowrap">