commit
This commit is contained in:
+3
-2
@@ -47,8 +47,9 @@ public class ActivityBudgetApplyController {
|
|||||||
|
|
||||||
@At
|
@At
|
||||||
@Aop(TransAop.READ_COMMITTED)
|
@Aop(TransAop.READ_COMMITTED)
|
||||||
|
@ViReturn
|
||||||
@RequiresPermissions("activity.budget.apply")
|
@RequiresPermissions("activity.budget.apply")
|
||||||
public Result doSubmit(@Param("activityBudget") ActivityBudget activityBudget, Boolean flag) {
|
public Object doSubmit(@Param("activityBudget") ActivityBudget activityBudget, Boolean flag) {
|
||||||
Dao dao = baseService.dao();
|
Dao dao = baseService.dao();
|
||||||
if (flag) {
|
if (flag) {
|
||||||
activityBudget.setAuditState(1);
|
activityBudget.setAuditState(1);
|
||||||
@@ -139,7 +140,7 @@ public class ActivityBudgetApplyController {
|
|||||||
ActivityBudgetUserApplyToDoHandler.COMPLETE_APPLY_TASK.exec(activityBudget,null);
|
ActivityBudgetUserApplyToDoHandler.COMPLETE_APPLY_TASK.exec(activityBudget,null);
|
||||||
}
|
}
|
||||||
|
|
||||||
return Result.success();
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
@At
|
@At
|
||||||
|
|||||||
@@ -6,12 +6,12 @@ const BUDGET_APPLY = {
|
|||||||
<div class="card-title">
|
<div class="card-title">
|
||||||
<span class="title-left">填写申报信息</span>
|
<span class="title-left">填写申报信息</span>
|
||||||
</span>
|
</span>
|
||||||
<span class="title-right" @click="openDialogVisible">
|
<!-- <span class="title-right" @click="openDialogVisible">
|
||||||
批量导入
|
批量导入
|
||||||
<span slot="suffix">
|
<span slot="suffix">
|
||||||
<i class="el-icon-upload"></i>
|
<i class="el-icon-upload"></i>
|
||||||
</span>
|
</span>
|
||||||
</span>
|
</span>-->
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<el-form :model="formData" :rules="formRules" label-suffix=":" label-width="160px"
|
<el-form :model="formData" :rules="formRules" label-suffix=":" label-width="160px"
|
||||||
|
|||||||
Reference in New Issue
Block a user