diff --git a/ruoyi-admin/src/main/java/com/ruoyi/financial/controller/FinacialExpenseController.java b/ruoyi-admin/src/main/java/com/ruoyi/financial/controller/FinacialExpenseController.java index a38da96a..faf977b9 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/financial/controller/FinacialExpenseController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/financial/controller/FinacialExpenseController.java @@ -7,6 +7,7 @@ import com.ruoyi.common.core.redis.RedisCache; import com.ruoyi.process.general.service.IProcessService; import com.ruoyi.remind.service.RemindService; import com.ruoyi.financial.domain.VO.FinacialExpenseVo; +import com.ruoyi.system.domain.Vo.BaseExpenseAccountVo; import com.ruoyi.system.service.*; import org.activiti.engine.RuntimeService; import org.activiti.engine.TaskService; @@ -67,6 +68,9 @@ public class FinacialExpenseController extends BaseController @Autowired private IProcessService processService; + @Autowired + private IBaseExpenseAccountService baseExpenseAccountService; + @RequiresPermissions("financial:expense:view") @GetMapping() public String expense() @@ -83,7 +87,10 @@ public class FinacialExpenseController extends BaseController public TableDataInfo list(FinacialExpense finacialExpense) { startPage(); - List list = finacialExpenseService.selectFinacialExpenseList(finacialExpense); + BaseExpenseAccountVo baseExpenseAccount = new BaseExpenseAccountVo(); + baseExpenseAccount.setAuditStatus("1"); + baseExpenseAccount.setManagerAuditStatus("1"); + List list = baseExpenseAccountService.selectBaseExpenseAccountList(baseExpenseAccount); return getDataTable(list); } diff --git a/ruoyi-admin/src/main/resources/templates/financial/expense/expense.html b/ruoyi-admin/src/main/resources/templates/financial/expense/expense.html index 2ab17f76..4df296e6 100644 --- a/ruoyi-admin/src/main/resources/templates/financial/expense/expense.html +++ b/ruoyi-admin/src/main/resources/templates/financial/expense/expense.html @@ -113,18 +113,13 @@ var auditStatusData = [[${@dict.getType('auditStatus')}]]; var expenseMethodData = [[${@dict.getType('sys_base_expense_method')}]]; var finacialExpenseStatusDatas = [[${@dict.getType('financial_expense_status')}]]; - var prefix = ctx + "system/baseExpense"; + var prefix = ctx + "financial/expense"; + var prefix1 = ctx +"system/baseExpense"; $(function() { var options = { url: prefix + "/list", - createUrl: prefix + "/add", - updateUrl: prefix + "/edit/{id}", - removeUrl: prefix + "/remove", - cancelUrl: prefix + "/cancel/{id}", - restoreUrl: prefix + "/restore/{id}", - exportUrl: prefix + "/export", - detailUrl: prefix + "/detail/{id}", + detailUrl: prefix1 + "/detail/{id}", modalName: "报销单", pageSize: 10, sortable: true, // 是否启用排序 @@ -185,14 +180,14 @@ {title: '使用状态',field: 'useStatus',visible: false,align: 'center',}, {title: '操作',align: 'center', formatter: function (value, row, index) { var actions = []; - if(row.auditStatus=="1" && row.useStatus=="1") { - actions.push(' 作废'); - actions.push(' 编辑 '); - } - // 有流程实例id - if(row.useStatus=="2" ){ - actions.push(' 恢复 '); - } + // if(row.auditStatus=="1" && row.useStatus=="1") { + // actions.push(' 作废'); + // actions.push(' 编辑 '); + // } + // // 有流程实例id + // if(row.useStatus=="2" ){ + // actions.push(' 恢复 '); + // } // 有流程实例id if (row.instanceId) { // 有待办人展示审批按钮, @@ -200,7 +195,7 @@ var todoUserIdList = row.todoUserId.split(","); if(todoUserIdList.includes(loginName)){ var nodeName = row.taskName=='驳回调整'?' 调整申请':' 审批'; - actions.push(' '+nodeName+' '); + actions.push(' '+nodeName+' '); } } actions.push(' 审批历史 '); @@ -244,7 +239,7 @@ } function selectUserAll(){ $.ajax({ - url: prefix + '/getExpenseUser', + url: prefix1 + '/getExpenseUser', type: 'post', async: false, success: function (result) {