From c6d9090d32cb3d351df2d411a394a73dfe77b145 Mon Sep 17 00:00:00 2001
From: Gitea <gitea@fake.local>
Date: Thu, 14 Nov 2024 11:08:16 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=9B=E6=96=B0=E5=88=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/innovationvoucher/InnovationVoucherList1.vue  | 6 +++---
 .../src/views/innovationvoucher/InnovationVoucherList5.vue  | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/jeecgboot-vue3/src/views/innovationvoucher/InnovationVoucherList1.vue b/jeecgboot-vue3/src/views/innovationvoucher/InnovationVoucherList1.vue
index a6a186c..4634d7f 100644
--- a/jeecgboot-vue3/src/views/innovationvoucher/InnovationVoucherList1.vue
+++ b/jeecgboot-vue3/src/views/innovationvoucher/InnovationVoucherList1.vue
@@ -220,7 +220,7 @@
    */
   function getTableAction(record) {
     //console.log(userStore.loginInfo.departs[0].orgCategory, 'userStore');
-    const oct = userStore.loginInfo.departs[0].orgCategory;
+    const oct = userStore.getUserInfo.roleCode;
     const actions = [
       {
         label: '详情',
@@ -228,7 +228,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: {
@@ -237,7 +237,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: {
diff --git a/jeecgboot-vue3/src/views/innovationvoucher/InnovationVoucherList5.vue b/jeecgboot-vue3/src/views/innovationvoucher/InnovationVoucherList5.vue
index 2ae3b3f..c657652 100644
--- a/jeecgboot-vue3/src/views/innovationvoucher/InnovationVoucherList5.vue
+++ b/jeecgboot-vue3/src/views/innovationvoucher/InnovationVoucherList5.vue
@@ -235,7 +235,7 @@
    * 操作栏
    */
   function getTableAction(record) {
-    const oct = userStore.loginInfo.departs[0].orgCategory;
+    const oct = userStore.getUserInfo.roleCode;
     const actions = [
       {
         label: '详情',
@@ -243,7 +243,7 @@
       }
     ];
 
-    if((oct==="3"&&record.dxshSta==="1")||(record.dxshSta==="2"&&oct!=="3")){
+    if((oct==="quxian_admin"&&record.dxshSta==="1")||(record.dxshSta==="2"&&oct!=="quxian_admin")){
       actions.unshift({
         label: '通过',
         popConfirm: {
@@ -252,7 +252,7 @@
         }
       });
     }
-    if((oct==="3"&&record.dxshSta==="1")||(record.dxshSta==="2"&&oct!=="3")){
+    if((oct==="quxian_admin"&&record.dxshSta==="1")||(record.dxshSta==="2"&&oct!=="quxian_admin")){
       actions.unshift({
         label: '驳回',
         popConfirm: {