Merge remote-tracking branch 'origin/master'

Crunchy

2024-07-31 3f4362c22608464d251936b9bc4feabe3286aa5e

 src/components/do/b1-inspect-order-plan/Inspection.vue

@@ -322,7 +322,7 @@
        </div>
      </div>
      <div class="center-box" id="nav" v-loading="tableLoading" v-if="!tableLists.find(m=>m.templateId==currentTable)||(tableLists.find(m=>m.templateId==currentTable).templateName!='温度循环检验原始记录'&&!tableLists.find(m=>m.templateId==currentTable).templateName.includes('热循环')&&!tableLists.find(m=>m.templateId==currentTable).templateName.includes('温升试验'))">
        <table border="1" class="tables" cellpadding="10" v-for="(item,index) in tableList" :key="index">
        <table border="1" class="tables" cellpadding="10" v-for="(item,index) in tableList" :key="index+currentTable">
          <tbody>
            <tr v-for="(m,i) in item.arr" :key="i">
              <td :id='item.templateId+"-"+n.i+"-"+n.r+"-"+n.c' v-for="(n,j) in m" :key="j"
@@ -1052,8 +1052,10 @@
        if (val0 != null && val1 != val0) {
          this.tableLists.forEach((m, i) => {
            if (m.templateId == val1) {
              this.tableList = null;
              this.tableList = [(this.tableLists[i])];
              // this.tableList = null;
              // this.tableList = [(this.tableLists[i])];
              this.$delete(this.tableList, 0)
              this.$set(this.tableList, 0, this.tableLists[i])
              this.handleTableData()
            }
          })
@@ -2363,7 +2365,8 @@
            comparisonList:this.comparisonList,
            currentSample:this.currentSample,
            PROJECT:this.PROJECT,
            param:this.param
            param:this.param,
            currentTable:this.currentTable
          }));
        } catch (error) {
          console.log(444,error);
@@ -2729,8 +2732,7 @@
                orderId: this.orderId,
                laboratory: this.sonLaboratory,
                verifyUser: this.verifyUser,
                entrustCode: this.insOrder.entrustCode,
                sampleCode: this.currentSample.sampleCode
                entrustCode: this.insOrder.entrustCode
              }).then(res => {
                if (res.code === 200) {
                  this.$message.success("操作成功")
@@ -2799,7 +2801,8 @@
            this.worker.postMessage(JSON.stringify({
              type: 'saveData',
              tableList:this.tableList,
              param:this.param
              param:this.param,
              currentTable:this.currentTable
            }));
          }
        }catch (error) {
@@ -2836,11 +2839,14 @@
      getAuthorizedPerson() {
        this.$axios.get(this.$api.user.getUserMenu).then(res => {
          let data = []
          let userName = JSON.parse(localStorage.getItem("user")).name;
          res.data.forEach(a => {
            data.push({
            if(a.name !== userName) {
              data.push({
              label: a.name,
              value: a.id
            })
            }
          })
          this.personList = data
        })