c-zhouhf1/zhgh_hmc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

commit

Browse Source
This commit is contained in:
@jyuhsin
2025-03-28 17:24:14 +08:00
parent 6881a944ad
commit 47f6c7033b
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/io/v/nutz/zhgh/jf/controller/reimbursement/ActivityReimbursementMineController.java
+3 -2
View File
@@ -142,9 +142,10 @@ public class ActivityReimbursementMineController {
@RequiresPermissions("sys.jf.reimbursement.mine") @RequiresPermissions("sys.jf.reimbursement.mine")
@Aop(TransAop.READ_COMMITTED) @Aop(TransAop.READ_COMMITTED)
public Object doDelete(String id) { public Object doDelete(String id) {
activityBxService.update(Chain.make("reimbursement_state_id", null) /*activityBxService.update(Chain.make("reimbursement_state_id", null)
.add("reimbursement_apply_time", null).add("reimbursement_state_id",null), .add("reimbursement_apply_time", null).add("reimbursement_state_id",null),
Cnd.where("id", "=", id)); Cnd.where("id", "=", id));*/
activityBxService.delete(id);
ReimbursementToHandler.DELETE_PROCESS_AND_TASK.exec(id,null); ReimbursementToHandler.DELETE_PROCESS_AND_TASK.exec(id,null);
return null; return null;
} }
src/main/resources/views/platform/jf/reimbursement/apply.html
+4 -4
View File
@@ -70,19 +70,19 @@ layout("/layouts/platform.html"){
</el-form-item> </el-form-item>
</el-col> </el-col>
<!--<el-col :span="12"> <el-col :span="12">
<div style="padding: 4px 0 20px 0"> <div style="padding: 4px 0 20px 0">
<el-button type="primary" size="small" @click="doExportActivityApply"> <!--<el-button type="primary" size="small" @click="doExportActivityApply">
导出活动申请方案表 导出活动申请方案表
</el-button> </el-button>
<el-button type="primary" size="small" style="margin-left: 10px" <el-button type="primary" size="small" style="margin-left: 10px"
@click="doExportReimbursementVoucher">导出报销凭证 @click="doExportReimbursementVoucher">导出报销凭证
</el-button> </el-button>-->
<el-button type="primary" size="small" style="margin-left: 10px" <el-button type="primary" size="small" style="margin-left: 10px"
@click="doExportActivitySignUpUser">导出活动参加人员 @click="doExportActivitySignUpUser">导出活动参加人员
</el-button> </el-button>
</div> </div>
</el-col>--> </el-col>
</el-row> </el-row>
<el-row :gutter="20" v-if="formData.activity_id != null && formData.activity_id !== ''"> <el-row :gutter="20" v-if="formData.activity_id != null && formData.activity_id !== ''">