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