完成检验下单、检验任务、报告生成变更

licp

2024-11-26 e6c3fccc9e412e79964a6dc2dae4c3da0c80095c

 src/components/do/b1-inspect-order-plan/circuit-parameters2.vue

@@ -86,7 +86,7 @@
              <div style="text-align: center;">{{ n.unit }}</div>
            </el-col>
            <el-col :span="2">
              <div style="text-align: center;" v-html="n.tell"></div>
              <div style="text-align: center;" v-html="n.ask"></div>
            </el-col>
            <el-col :span="16">
              <div class="content" style="text-align: center;width: 100%;overflow-x: auto;">
@@ -127,7 +127,7 @@
              <div style="text-align: center;">{{ n.unit }}</div>
            </el-col>
            <el-col :span="2">
              <div style="text-align: center;" v-html="n.tell"></div>
              <div style="text-align: center;" v-html="n.ask"></div>
            </el-col>
            <el-col :span="16">
              <div class="content" style="text-align: center;width: 100%;overflow-x: auto;">
@@ -213,7 +213,7 @@
        {
          inspectionItemSubclass:'电压驻波比',
          unit:'/',
          tell:'≤1.45',
          ask:'≤1.45',
          result:0,
          portList:[],
          angleList:[],
@@ -222,7 +222,7 @@
        {
          inspectionItemSubclass:'同极化隔离度',
          unit:'dB',
          tell:'≤1.45',
          ask:'≤1.45',
          result:0,
          portList:[],
          angleList:[],
@@ -232,7 +232,7 @@
          inspectionItemSubclass:'互调',
          often:'',//互调特有字段
          unit:'dB',
          tell:'≤1.45',
          ask:'≤1.45',
          result:0,
          portList:[],
          angleList:[],
@@ -350,18 +350,18 @@
                  this.angleList = angleList
                  this.upTemplateState = false
                }
                let tell = ''
                if(item.tell.includes(',')){
                  item.tell.split(',').forEach((m,i)=>{
                    tell = tell + m+ (i==item.tell.split(',').length-1?'':'<br/>')
                let ask = ''
                if(item.ask.includes(',')){
                  item.ask.split(',').forEach((m,i)=>{
                    ask = ask + m+ (i==item.ask.split(',').length-1?'':'<br/>')
                  })
                }else{
                  tell = item.tell
                  ask = item.ask
                }
                let obj = {
                  inspectionItemSubclass: item.inspectionItemSubclass,
                  unit:item.unit,
                  tell:tell,
                  ask:ask,
                  result:n.result,
                  id:item.id,
                  often:n.often,
@@ -649,8 +649,8 @@
      this.$set( this.loading, y, true)
      // this.loading[y] = true
      this.$axios.post(this.$api.insOrderPlan.saveInsContext2, {
        orderId:this.orderId,
        sampleId:this.sampleId,
        // orderId:this.orderId,
        sampleId:this.orderId,
        sonLaboratory:h.projectList[0].sonLaboratory,
        frequency:h.band,
        insProductResult2s:arr
@@ -679,10 +679,11 @@
      // return
      obj.allBandList.forEach((item,index)=>{
        if(!this.allBandList[index]){
          this.allBandList[index] = {
            projectList:this.HaveJson(this.allBandList[0].projectList),
            band:item.band
          }
          this.$set(this.allBandList, index, {projectList:this.HaveJson(this.allBandList[0].projectList)})
          // this.allBandList[index] = {
          //   projectList:this.HaveJson(this.allBandList[0].projectList),
          //   band:item.band
          // }
        }
        let arr = []
        item.projectList.forEach((m,i)=>{
@@ -691,13 +692,16 @@
            angleList:m.angleList,
            portList:m.portList,
            portNum:m.portNum,
              value:m.value,
              // value:m.value,
              valueType:m.valueType
            }
            this.$set(obj0,'value',m.value)
            arr.push({...this.allBandList[index].projectList.find(n=>n.inspectionItemSubclass==m.inspectionItemSubclass),...obj0})
          }
        })
        this.allBandList[index].projectList = arr
        // this.allBandList[index].projectList = arr
        this.$delete(this.allBandList[index],'projectList')
        this.$set(this.allBandList[index],'projectList',arr)
      })
      this.angleList = obj.angleList
      this.intermodulationNum = obj.intermodulationNum