Merge remote-tracking branch 'origin/master'

jeecgboot-vue3/src/views/instrument/InstrumentList2.vue

@@ -250,7 +250,7 @@
    * 操作栏
    */
   function getTableAction(record) {
-    const oct = userStore.loginInfo.departs[0].orgCategory;
+    const oct = userStore.getUserInfo.roleCode;
     const actions = [
       {
         label: '详情',
@@ -258,7 +258,7 @@
       }
     ];
 
-    if((oct==="3"&&record.state==="1")||(record.state==="2"&&oct!=="3")){
+    if((oct==="quxian_admin"&&record.state==="1")||(record.state==="2"&&oct!=="quxian_admin")){
       actions.unshift({
         label: '通过',
         popConfirm: {
@@ -267,7 +267,7 @@
         }
       });
     }
-    if((oct==="3"&&record.state==="1")||(record.state==="2"&&oct!=="3")){
+    if((oct==="quxian_admin"&&record.state==="1")||(record.state==="2"&&oct!=="quxian_admin")){
       actions.unshift({
         label: '驳回',
         popConfirm: {