Merge branch 'master' of http://114.132.189.42:9002/r/center-lims-before

zouyu

2024-08-08 c263fb316fc23d9db98ce711fda30d81c28d2d9c

 src/components/view/b1-inspect-order-plan.vue

@@ -303,14 +303,14 @@
                  font: '数据查看',
                  type: 'text',
                  method: 'handleDataLook',
            disabFun: (row, index) => {
              const user = JSON.parse(localStorage.getItem('user'))
              let currentUserName = ''
              if(user){
                currentUserName = user.name
              }
                     return row.userName!=currentUserName && row.checkName!=currentUserName
                  }
            //disabFun: (row, index) => {
              //const user = JSON.parse(localStorage.getItem('user'))
             // let currentUserName = ''
             // if(user){
              //  currentUserName = user.name
              //}
                     //return row.userName.indexOf(currentUserName)<0 && row.checkName.indexOf(currentUserName)<0
                  //}
               },{
                     id: '',
                     font: '检验',
@@ -345,7 +345,7 @@
                     type: 'text',
                     method: 'claimFun',
                     disabFun: (row, index) => {
                        return row.userName != null||(row.userName&&!row.userName.includes(JSON.parse(localStorage.getItem("user")).name))
                        return row.userName != null || row.checkName!=null
                     }
                  }
               ],