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

Merge remote-tracking branch 'origin/master'

master
xxssyyyyssxx 2021-12-09 13:11:39 +08:00
parent 28d02ec5a8 101163731e
commit fcb5c9ca0b
3 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/cn/palmte/work/service/HumanCostService.java
View File

@ -260,7 +260,7 @@ public class HumanCostService {
int roleId = admin.getRoleId();
Integer adminId = admin.getId();
//自己创建的肯定能看见
projectList = pagination.find(sql, Project.class, Project.STATUS_SETTLE, Project.STATUS_BUDGET, 2, adminId, roleId, adminId);
projectList = pagination.find(sql, Project.class, Project.STATUS_SETTLE, Project.STATUS_BUDGET, 2, Project.STATUS_FINAL, 2, adminId, roleId, adminId);
}
for (Project project : projectList) {
data.add(project.getName());

14
src/main/resources/static/assets/js/project_budget.js
View File

@ -14,6 +14,13 @@ $(function () {
}
console.log(message);
var startTime = $("#startDate").val();
var endTime = $("#endDate").val();
if (startTime > endTime) {
window.confirm('开始日期应早于结束日期');
return;
}
$("#pmsForm").attr("action",base+"/project/budgetEditSave");
$("#pmsForm").submit();
});
@ -25,6 +32,13 @@ $(function () {
return;
}
var startTime = $("#startDate").val();
var endTime = $("#endDate").val();
if (startTime > endTime) {
window.confirm('开始日期应早于结束日期');
return;
}
$("#pmsForm").attr("action",base+"/project/budgetEditSaveAndApprove");
$("#pmsForm").submit();
});

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

@ -569,11 +569,11 @@
</select>-->
<#if costProjectManageDetail.deletable==0>
<#if costProjectManageDetail.type ==1 >
<input style="width: 80px;float: left;" readonly type="text" class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage" value="人工成本">
<input readonly type="hidden" class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage" value="1">人工成本
<#elseif costProjectManageDetail.type ==2>
<input style="width: 80px;float: left;" readonly type="text" class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage" value="业务费用">
<input readonly type="hidden" class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage" value="2">业务费用
<#elseif costProjectManageDetail.type ==3>
<input style="width: 80px;float: left;" readonly type="text" class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage" value="其他费用">
<input readonly type="hidden" class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage" value="3">其他费用
</#if>
<#elseif costProjectManageDetail.deletable!=0>
<select style="width: 80px;float: left;" class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage">