From 0762e093d412ae2f2e7f02a2b9e1774c67de8564 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期二, 24 九月 2024 15:21:56 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/tx-lims-before into master
---
src/components/view/b1-inspection-order.vue | 48 +++++++++++++++++++++++++++++++++++++-----------
1 files changed, 37 insertions(+), 11 deletions(-)
diff --git a/src/components/view/b1-inspection-order.vue b/src/components/view/b1-inspection-order.vue
index 1f25b27..21b00f1 100644
--- a/src/components/view/b1-inspection-order.vue
+++ b/src/components/view/b1-inspection-order.vue
@@ -530,7 +530,21 @@
type: 'text',
method: 'handleVerify',
disabFun: (row, index) => {
- return row.state != 0
+ let state0 = false
+ if(this.currentRole=='妫�娴嬩腑蹇冧富浠�'){
+ if(row.checkState1||row.checkState1User){
+ state0 = true
+ }
+ }else if(this.currentRole=='鐮斿彂閮ㄧ粡鐞�'){
+ if(row.checkState2||row.checkState2User){
+ state0 = true
+ }
+ }else if(this.currentRole=='鎶�鏈礋璐ｄ汉'){
+ if(row.checkState3||row.checkState3User){
+ state0 = true
+ }
+ }
+ return row.state != 0 || state0 ||(this.currentRole!='妫�娴嬩腑蹇冧富浠�'&&this.currentRole!='鐮斿彂閮ㄧ粡鐞�'&&this.currentRole!='鎶�鏈礋璐ｄ汉')
}
}, {
id: 'quash',
@@ -549,15 +563,17 @@
disabFun: (row, index) => {
return (row.state != 1 && row.state != 0)||(this.tabIndex!=1)||row.isRevocation!=1
}
- }, {
- font: '鍒嗛厤',
- type: 'text',
- method: 'handleIssued',
- disabFun: (row, index) => {
- // return row.state != 1 || !!row.assign
- return row.appointed || row.state != 1
- }
- }],
+ },
+ // {
+ // font: '鍒嗛厤',
+ // type: 'text',
+ // method: 'handleIssued',
+ // disabFun: (row, index) => {
+ // // return row.state != 1 || !!row.assign
+ // return row.appointed || row.state != 1
+ // }
+ // }
+ ],
linkEvent: {
sampleName: {
method: 'selectAllByOne'
@@ -745,7 +761,8 @@
],
qrData:[],
multipleSelection:[],
- sonLaboratoryList:[]
+ sonLaboratoryList:[],
+ currentRole:''
}
},
watch:{
@@ -757,6 +774,9 @@
this.isIndeterminate = true;
}
}
+ },
+ created() {
+ this.getAuthorizedPersonRole()
},
mounted() {
this.entityCopy = this.HaveJson(this.componentData.entity)
@@ -861,6 +881,11 @@
})
})
this.personList = data
+ })
+ },
+ getAuthorizedPersonRole() {
+ this.$axios.get(this.$api.role.getRole).then(res => {
+ this.currentRole = res.message
})
},
refreshTable(e) {
@@ -1115,6 +1140,7 @@
playOrder(num) {
this.active = num
this.examine = 0
+ this.getAuthorizedPersonRole()
this.refreshTable('page')
},
handleTab(m, i) {
--
Gitblit v1.9.3