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

修复查看采购成本明细表，大类和类别显示信息不对

master
hanbo 2021-12-02 17:03:36 +08:00
parent e0c3986f6d
commit 93ab205ea6
2 changed files with 6 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/cn/palmte/work/controller/backend/ProjectController.java
View File

@ -361,6 +361,7 @@ public class ProjectController extends BaseController {
//预算信息 //预算信息
BudgetBean budgetBean = projectBudgetService.getBudget(project); BudgetBean budgetBean = projectBudgetService.getBudget(project);
model.put("procurementTypes", procurementTypeService.allProcurementTypeList());
model.put("budgetBean", budgetBean); model.put("budgetBean", budgetBean);
//收入明细 //收入明细
model.put("incomeDetails", projectBudgetService.getBudgetIncomeDetail(project)); model.put("incomeDetails", projectBudgetService.getBudgetIncomeDetail(project));

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

@ -107,7 +107,7 @@
<li><a href="#tab3">项目预算信息</a></li> <li><a href="#tab3">项目预算信息</a></li>
</#if> </#if>
<#if project.status==10 || project.status==15> <#if project.status==10 || project.status==15>
<li><a href="#tab4">项目结算信息</a></li> <li id="jiesuan"><a href="#tab4">项目结算信息</a></li>
</#if> </#if>
<#if project.status==15> <#if project.status==15>
<li><a href="#tab5">项目决算信息</a></li> <li><a href="#tab5">项目决算信息</a></li>
@ -1490,49 +1490,9 @@
</#if> </#if>
</td> </td>
<td> <td>
<#--<select style="width: auto" readonly <#list procurementTypes as procurementType>
class="am-modal-prompt-input am-modal-prompt-input-cost am-modal-prompt-input-cost-category"> <#if costDetail.category == procurementType.id>${procurementType.name}</#if>
<option value="1" <#if costDetail.category == 1>selected</#if>> </#list>
华智产品
</option>
<option value="2" <#if costDetail.category == 2>selected</#if>>
紫光其他产品
</option>
<option value="3" <#if costDetail.category == 3>selected</#if>>
外购产品
</option>
<option value="4" <#if costDetail.category == 4>selected</#if>>
外购工程
</option>
<option value="5" <#if costDetail.category == 5>selected</#if>>
华智服务
</option>
<option value="6" <#if costDetail.category == 6>selected</#if>>
紫光其他服务
</option>
<option value="7" <#if costDetail.category == 7>selected</#if>>
外购服务
</option>
<option value="8" <#if costDetail.category == 8>selected</#if>>其他
</option>
</select>-->
<#if costDetail.category ==1 >
华智产品
<#elseif costDetail.category ==2>
紫光其他产品
<#elseif costDetail.category ==3>
外购产品
<#elseif costDetail.category ==4>
外购工程
<#elseif costDetail.category ==5>
华智服务
<#elseif costDetail.category ==6>
紫光其他服务
<#elseif costDetail.category ==7>
外购服务
<#elseif costDetail.category ==8>
其他
</#if>
</td> </td>
<td><input type="text" readonly <td><input type="text" readonly
class="am-modal-prompt-input am-modal-prompt-input-cost" class="am-modal-prompt-input am-modal-prompt-input-cost"
@ -1998,6 +1958,7 @@
$("#pmsForm").submit(); $("#pmsForm").submit();
} }
}); });
document.getElementById("jiesuan").setAttribute("active",true)
}); });
function setKeywords(time) { function setKeywords(time) {