diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/instrument/controller/InstrumentController.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/instrument/controller/InstrumentController.java index 51eafb8..b17c65c 100644 --- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/instrument/controller/InstrumentController.java +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/instrument/controller/InstrumentController.java @@ -390,8 +390,7 @@ public class InstrumentController extends JeecgController 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/instrument/InstrumentList2.vue b/jeecgboot-vue3/src/views/instrument/InstrumentList2.vue index 5dfa4c7..b2078a7 100644 --- a/jeecgboot-vue3/src/views/instrument/InstrumentList2.vue +++ b/jeecgboot-vue3/src/views/instrument/InstrumentList2.vue @@ -250,6 +250,7 @@ * 操作栏 */ function getTableAction(record) { + const oct = userStore.loginInfo.departs[0].orgCategory; const actions = [ { label: '详情', @@ -257,7 +258,7 @@ } ]; - if(record.state==="1"||record.state==="2"){ + if((oct==="3"&&record.state==="1")||(record.state==="2"&&oct!=="3")){ actions.unshift({ label: '通过', popConfirm: { @@ -266,7 +267,7 @@ } }); } - if(record.state==="1"||record.state==="2"){ + if((oct==="3"&&record.state==="1")||(record.state==="2"&&oct!=="3")){ actions.unshift({ label: '驳回', popConfirm: {