Merge remote-tracking branch 'origin/master'

zss

2024-08-08 07ea6a242b16b7ad61602915698a9852cc894246

 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: '检验',
@@ -452,7 +452,6 @@
            }
         },
         changeCheckBox(val) {
            console.log(111,val)
            this.componentData.entity.userId = val?0:null
            this.refreshTable()
         },
@@ -469,7 +468,7 @@
               this.sampleUserForm = {
                  entrustCode: row.entrustCode,
                  insSampleId: row.id,
                     sonLaboratory: this.componentData.entity.sonLaboratory,
            sonLaboratory: row.sonLaboratory,
               }
               this.claimVisible = true
            }