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

lxp

2024-08-09 e841b95caeeb3ba3f512fab431976f64f1061a9e

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

@@ -200,7 +200,7 @@
         </span>
      </el-dialog>
      <div style="width: 100%;height: 100%;" v-if="activeFace >0">
         <Add :active="activeFace" :currentId="currentId"/>
         <Add :active="activeFace" :currentId="currentId" :examine="examine"/>
      </div>
    <Inspection v-if="state>0" @goback="goback" :orderId="orderId" :sonLaboratory="componentData.entity.sonLaboratory" :state="state"/>
      <el-dialog title="数据查看" :visible.sync="dataDialogVisible" width="80%">
@@ -228,6 +228,7 @@
      },
      data() {
         return {
            examine: null,
            alone: false,
            sampleUserForm: {
               entrustCode: null,
@@ -303,14 +304,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 +346,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
                     }
                  }
               ],
@@ -580,6 +581,7 @@
         },
         selectAllByOne(row) {
            this.activeFace = 2;
            this.examine = 1;
            this.currentId = parseInt(row.id)
         },
         playOrder(num) {