From cfc9d0dd810aaa70fe8c142ff3c9e5f8eac69eca Mon Sep 17 00:00:00 2001
From: Gitea <gitea@fake.local>
Date: Thu, 7 Nov 2024 10:26:23 +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  | 5 +++--
 jeecgboot-vue3/src/views/instrument/InstrumentList2.vue     | 5 +++--
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/jeecgboot-vue3/src/views/innovationvoucher/InnovationVoucherList1.vue b/jeecgboot-vue3/src/views/innovationvoucher/InnovationVoucherList1.vue
index 72b4833..a6a186c 100644
--- a/jeecgboot-vue3/src/views/innovationvoucher/InnovationVoucherList1.vue
+++ b/jeecgboot-vue3/src/views/innovationvoucher/InnovationVoucherList1.vue
@@ -219,6 +219,8 @@
    * 操作栏
    */
   function getTableAction(record) {
+    //console.log(userStore.loginInfo.departs[0].orgCategory, 'userStore');
+    const oct = userStore.loginInfo.departs[0].orgCategory;
     const actions = [
       {
         label: '详情',
@@ -226,7 +228,7 @@
       }
     ];
 
-    if(record.state==="1"||record.state==="2"){
+    if((oct==="3"&&record.state==="1")||(record.state==="2"&&oct!=="3")){
       actions.unshift({
         label: '通过',
         popConfirm: {
@@ -235,7 +237,7 @@
         }
       });
     }
-    if(record.state==="1"||record.state==="2"){
+    if((oct==="3"&&record.state==="1")||(record.state==="2"&&oct!=="3")){
       actions.unshift({
         label: '驳回',
         popConfirm: {
diff --git a/jeecgboot-vue3/src/views/innovationvoucher/InnovationVoucherList5.vue b/jeecgboot-vue3/src/views/innovationvoucher/InnovationVoucherList5.vue
index defb6e1..bc1f0bb 100644
--- a/jeecgboot-vue3/src/views/innovationvoucher/InnovationVoucherList5.vue
+++ b/jeecgboot-vue3/src/views/innovationvoucher/InnovationVoucherList5.vue
@@ -222,6 +222,7 @@
    * 操作栏
    */
   function getTableAction(record) {
+    const oct = userStore.loginInfo.departs[0].orgCategory;
     const actions = [
       {
         label: '详情',
@@ -229,7 +230,7 @@
       }
     ];
 
-    if(record.dxshSta==="1"||record.dxshSta==="2"){
+    if((oct==="3"&&record.dxshSta==="1")||(record.dxshSta==="2"&&oct!=="3")){
       actions.unshift({
         label: '通过',
         popConfirm: {
@@ -238,7 +239,7 @@
         }
       });
     }
-    if(record.dxshSta==="1"||record.dxshSta==="2"){
+    if((oct==="3"&&record.dxshSta==="1")||(record.dxshSta==="2"&&oct!=="3")){
       actions.unshift({
         label: '驳回',
         popConfirm: {
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: {