合并冲突

licp

2024-04-03 67d2338b3dd43c5972159822aa3dd8f53cd3c78b

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

@@ -449,26 +449,26 @@
            this.tableList.forEach(a => {
               let dels = []
               let ids = []
               a.template.forEach(b => {
                  if (b.v.ps != undefined && b.v.ps.value === '检验子项') {
                     let count = 0
                     for (let i in this.currentSample.insProduct) {
                        if (this.currentSample.insProduct[i].inspectionItemSubclass === b.v.v && this.currentSample
                           .insProduct[i].templateId === a.templateId) {
                           ids.push({
                              r: b.r,
                              id: this.currentSample.insProduct[i].id,
                              product: this.currentSample.insProduct[i]
                           })
                           break
                        }
                        count++
                     }
                     if (count === this.currentSample.insProduct.length) {
                        dels.push(b)
                     }
                  }
               })
          a.template.forEach(b => {
             if (b.v.ps != undefined && b.v.ps.value === '检验子项') {
                let count = 0
                for (let i in this.currentSample.insProduct) {
                   if (this.currentSample.insProduct[i].inspectionItemSubclass === b.v.v && this.currentSample
                      .insProduct[i].templateId === a.templateId) {
                      ids.push({
                         r: b.r,
                         id: this.currentSample.insProduct[i].id,
                         product: this.currentSample.insProduct[i]
                      })
                      break
                   }
                   count++
                }
                if (count === this.currentSample.insProduct.length) {
                   dels.push(b)
                }
             }
          })
               dels.forEach(del => {
                  for (let b = 0; b < a.template.length; b++) {
                     if (a.template[b].r === del.r) {
@@ -591,11 +591,14 @@
                           this.param[a.id].insValue[i].u = insValue[i].u
                     }
               }catch(e){}
                  try{
                     this.param[a.id].equipValue.v.v = a.insProductResult.equipValue
                  }catch(e){}
                  this.param[a.id].resValue.v.v = a.lastValue
                  this.param[a.id].insResult.v.v = a.insResult
               try{
                  this.param[a.id].equipValue.v.v = a.insProductResult.equipValue
               }catch(e){}
               try{
                 this.param[a.id].resValue.v.v = a.lastValue
                 this.param[a.id].insResult.v.v = a.insResult
               }catch(e){
               }
            })
            this.handleExcelMethod()
         },