diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/project/controller/ProjectController.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/project/controller/ProjectController.java index 8234ee7..6c4ee57 100644 --- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/project/controller/ProjectController.java +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/project/controller/ProjectController.java @@ -122,8 +122,7 @@ public class ProjectController extends JeecgController } /** - * @description: - * //('科技主管部门待提交', '1'); + * @description: //('科技主管部门待提交', '1'); * //('科技主管部门已提交', '2'); * //('不受理', '3'); * //('已受理', '4'); @@ -170,19 +169,19 @@ public class ProjectController extends JeecgController //申请单位数据 if ("faren_admin".equals(loginUser.getRoleCode())) { queryWrapper.eq("sys_org_code", loginUser.getOrgCode()); - queryWrapper.in("project_status", 6,1,7,8,9,10); + queryWrapper.in("project_status", 6, 1, 7, 8, 9, 10); } // 区/县管理员数据 if ("quxian_admin".equals(loginUser.getRoleCode())) { queryWrapper.likeRight("sys_org_code", loginUser.getOrgCode()); - queryWrapper.in("project_status", 1,7,8,9,10); + queryWrapper.in("project_status", 1, 7, 8, 9, 10); } if ("kejiju_admin".equals(loginUser.getRoleCode())) { - queryWrapper.in("project_status", 7,8,9,10); + queryWrapper.in("project_status", 7, 8, 9, 10); } if ("caizheng_admin".equals(loginUser.getRoleCode())) { - queryWrapper.in("budget_status", 8,9,10); + queryWrapper.in("budget_status", 8, 9, 10); } IPage pageList = projectService.page(page, queryWrapper); return Result.OK(pageList); @@ -471,7 +470,11 @@ public class ProjectController extends JeecgController log.setOperationTime(new Date()); log.setProjectStatus("5"); log.setBudgetStatus("5"); - log.setOperationMark("审核取回"); + if ("shenbaoren_role".equals(loginUser.getRoleCode())) { + log.setOperationMark("申请人取回项目书,申请人取回预算书"); + } else { + log.setOperationMark("审核驳回"); + } iProjectLogService.save(log); return Result.OK("操作成功!"); } diff --git a/jeecgboot-vue3/src/router/helper/mainOut.ts b/jeecgboot-vue3/src/router/helper/mainOut.ts index c4e8005..190f34b 100644 --- a/jeecgboot-vue3/src/router/helper/mainOut.ts +++ b/jeecgboot-vue3/src/router/helper/mainOut.ts @@ -67,7 +67,7 @@ export const mainOutRoutes: AppRouteModule[] = [ { path: '/main-home/newsList', name: 'NewsList', - component: () => import('/@/views/demo/main-home/components/newsList/index.vue'), + component: () => import('/@/views/demo/main-home/components/NewsList/index.vue'), meta: { title: '新闻列表', ignoreAuth: true, @@ -76,7 +76,7 @@ export const mainOutRoutes: AppRouteModule[] = [ { path: '/main-home/newsInfo', name: 'NewsIndo', - component: () => import('/@/views/demo/main-home/components/newsInFo/index.vue'), + component: () => import('/@/views/demo/main-home/components/newsInfo/index.vue'), meta: { title: '新闻详情', ignoreAuth: true, diff --git a/jeecgboot-vue3/src/views/projectApplication/productAudit/projectAudit4CaiZhengList.vue b/jeecgboot-vue3/src/views/projectApplication/productAudit/projectAudit4CaiZhengList.vue index f7b8e3d..329342b 100644 --- a/jeecgboot-vue3/src/views/projectApplication/productAudit/projectAudit4CaiZhengList.vue +++ b/jeecgboot-vue3/src/views/projectApplication/productAudit/projectAudit4CaiZhengList.vue @@ -211,7 +211,12 @@ function getTableAction(record) { { label: '详情', onClick: handleDetail.bind(null, record), - }]; + }, + { + label: '日志查询', + onClick: go_projectLog.bind(null, record), + } + ]; //单位法人审核 if (record.budgetStatus == 9) { actions.unshift({ @@ -236,6 +241,10 @@ function getTableAction(record) { return actions; } +function go_projectLog(record) { + // go('/comp/jeecg/basic?id=' +'666'); + go('/projectLog/projectLogList?id='+record.id); +} diff --git a/jeecgboot-vue3/src/views/projectApplication/productAudit/projectAudit4FaRenList.vue b/jeecgboot-vue3/src/views/projectApplication/productAudit/projectAudit4FaRenList.vue index df49f88..d9ac2e0 100644 --- a/jeecgboot-vue3/src/views/projectApplication/productAudit/projectAudit4FaRenList.vue +++ b/jeecgboot-vue3/src/views/projectApplication/productAudit/projectAudit4FaRenList.vue @@ -211,7 +211,12 @@ function getTableAction(record) { { label: '详情', onClick: handleDetail.bind(null, record), - }]; + }, + { + label: '日志查询', + onClick: go_projectLog.bind(null, record), + } + ]; //单位法人审核 if (record.projectStatus == 6) { actions.unshift({ @@ -235,7 +240,10 @@ function getTableAction(record) { //('市科技局已提交', '8'); return actions; } - +function go_projectLog(record) { + // go('/comp/jeecg/basic?id=' +'666'); + go('/projectLog/projectLogList?id='+record.id); +} diff --git a/jeecgboot-vue3/src/views/projectApplication/productAudit/projectAudit4KejijuList.vue b/jeecgboot-vue3/src/views/projectApplication/productAudit/projectAudit4KejijuList.vue index cfaa11a..b076208 100644 --- a/jeecgboot-vue3/src/views/projectApplication/productAudit/projectAudit4KejijuList.vue +++ b/jeecgboot-vue3/src/views/projectApplication/productAudit/projectAudit4KejijuList.vue @@ -211,7 +211,12 @@ function getTableAction(record) { { label: '详情', onClick: handleDetail.bind(null, record), - }]; + }, + { + label: '日志查询', + onClick: go_projectLog.bind(null, record), + } + ]; //单位法人审核 if (record.projectStatus == 7) { actions.unshift({ @@ -236,6 +241,10 @@ function getTableAction(record) { return actions; } +function go_projectLog(record) { + // go('/comp/jeecg/basic?id=' +'666'); + go('/projectLog/projectLogList?id='+record.id); +} diff --git a/jeecgboot-vue3/src/views/projectApplication/productAudit/projectAudit4QuXianList.vue b/jeecgboot-vue3/src/views/projectApplication/productAudit/projectAudit4QuXianList.vue index 38b9960..170d059 100644 --- a/jeecgboot-vue3/src/views/projectApplication/productAudit/projectAudit4QuXianList.vue +++ b/jeecgboot-vue3/src/views/projectApplication/productAudit/projectAudit4QuXianList.vue @@ -211,7 +211,12 @@ function getTableAction(record) { { label: '详情', onClick: handleDetail.bind(null, record), - }]; + }, + { + label: '日志查询', + onClick: go_projectLog.bind(null, record), + } + ]; if (record.projectStatus == 1) { actions.unshift({ label: '通过', @@ -235,7 +240,10 @@ function getTableAction(record) { return actions; } - +function go_projectLog(record) { + // go('/comp/jeecg/basic?id=' +'666'); + go('/projectLog/projectLogList?id='+record.id); +} + return {attrs, registerProjectLogModal, projectLog, onOk}; + }, +}); + diff --git a/jeecgboot-vue3/src/views/projectLog/ProjectLogList.vue b/jeecgboot-vue3/src/views/projectLog/ProjectLogList.vue index 71e5049..8782825 100644 --- a/jeecgboot-vue3/src/views/projectLog/ProjectLogList.vue +++ b/jeecgboot-vue3/src/views/projectLog/ProjectLogList.vue @@ -1,199 +1,221 @@