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

项目管理成本修改

master
OathK1per 2021-12-31 17:57:37 +08:00
parent 1997cc2118
commit 3027a41a03
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -287,12 +287,8 @@ public class ProjectController extends BaseController {
for (int i = 0; i < details.size(); i++) {
ProjectBudgetCostProjectManageDetailTemp detail = details.getObject(i, ProjectBudgetCostProjectManageDetailTemp.class);
if(detail.getType() == 3 || "3".equals(detail.getName1()) || "8".equals(detail.getName1())) {
if ("".equals(detail.getName2())) {
return ResponseMsg.buildFailedMsg("业务项目不允许为空");
} else {
detail.setName(detail.getName2());
detail.setIsDiy(1);
}
detail.setName(detail.getName2());
detail.setIsDiy(1);
} else {
if ("1".equals(detail.getName1())) {
detail.setName("人工费");

2
src/main/resources/templates/admin/project_budget_edit.ftl
View File

@ -512,12 +512,14 @@
<#if costProjectManageDetail.type == 1>
<option value="1" <#if costProjectManageDetail.name == "人工费">selected</#if>>人工费</option>
<option value="2" <#if costProjectManageDetail.name == "总部支撑人力费用">selected</#if>>总部支撑人力费用</option>
<option value="3" <#if costProjectManageDetail.name == "自定义">selected</#if>>自定义</option>
</#if>
<#if costProjectManageDetail.type == 2>
<option value="4" <#if costProjectManageDetail.name == "人员差旅费">selected</#if>>人员差旅费</option>
<option value="5" <#if costProjectManageDetail.name == "业务费用">selected</#if>>业务费用</option>
<option value="6" <#if costProjectManageDetail.name == "商务及专项验收费用">selected</#if>>商务及专项验收费用</option>
<option value="7" <#if costProjectManageDetail.name == "办公费用">selected</#if>>办公费用</option>
<option value="8" <#if costProjectManageDetail.name == "自定义">selected</#if>>自定义</option>
</#if>
</select>
<input <#if costProjectManageDetail.isDiy == 1>type="text"<#else>type="hidden"</#if> class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage am-modal-prompt-input-cost-project-manage-category2" value="${costProjectManageDetail.name!}">