Merge remote-tracking branch 'origin/master'

Crunchy

2024-07-31 defa824eab2350fd6abfd10abd8f4df94749e336

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

@@ -1205,7 +1205,11 @@
      },
      // 温度循环---开始
      changeItem(row){
        if(row.value0&&row.value1){
        if(row.value0&&!row.value1){
          this.$set(row,'comValue',Number(row.value0).toFixed(3))
        }else if(!row.value0&&row.value1){
          this.$set(row,'comValue',Number(row.value1).toFixed(3))
        }else if(row.value0&&row.value1){
          this.$set(row,'comValue',((Number(row.value0)+Number(row.value1))/2).toFixed(3))
        }else{
          return
@@ -2705,6 +2709,14 @@
          this.$message.error("请指定复核人员")
          return
        }
        if(!this.otherForm.humidity){
          this.$message.error("请输入湿度")
          return
        }
        if(!this.otherForm.temperature){
          this.$message.error("请输入温度")
          return
        }
        this.addVerifyDia = false
        this.submitLoading = true;
        this.$axios.post(this.$api.insOrderPlan.checkSubmitPlan, {
@@ -2717,8 +2729,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 +2810,9 @@
          if (this.equipOptions[i].value === val) {
            for (let i1 in this.param[n.i].equipName) {
              if (this.param[n.i].equipName[i1].i === n.i && this.param[n.i].equipName[i1].r === n.r) {
                this.$delete(this.param[n.i].equipValue[i1].v,'v')
                this.$set(this.param[n.i].equipValue[i1].v,'v',val)
                this.$delete(this.param[n.i].equipName[i1].v,'v')
                this.$set(this.param[n.i].equipName[i1].v,'v',this.equipOptions[i].label)
                this.param[n.i].equipValue[i1].isItADataAcquisitionDevice = this.equipOptions[i].isItADataAcquisitionDevice
              }
@@ -2822,11 +2835,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
        })