Merge remote-tracking branch 'origin/master'

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<Instrument, IInstrumen
 		 if(instrument.getFlag().equals("1")){
 			 instrument.setState("2");
 			 instrument.setFlag("2");
-		 }
+		 }else if(instrument.getFlag().equals("2")&&instrument.getState().equals("2")){
-		 if(instrument.getFlag().equals("2")&&instrument.getState().equals("2")){
 			 instrument.setState("3");
 		 }
 		 //instrument.setFlag("2");

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,

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: {