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

licp

2024-07-03 a0b1fdec2bc5ddad11e981936b80d0fdf1e4bc69

 src/components/do/b1-ins-order/add.vue

@@ -1112,17 +1112,22 @@
          }
        })
        let temperaturePoint = JSON.parse(JSON.stringify(this.temperatureData))
        temperaturePoint.unshift({temperaturePoint: 20})
        let askArr = []
        let opticalProjectArr = []
        // 拼接要求值ask
        opticalProjectList.forEach(o => {
          opticalProjectArr.push(o.value)
          temperaturePoint.forEach(t => {
            const askObj = t.temperaturePoint + '℃' + ',' + o.value + ',' + t.askSymbol + t.askNum
            askArr.push(askObj)
            if (!t.askSymbol) {
              const askObj = t.temperaturePoint + '℃' + ',' + o.value + ',' + null
              askArr.push(askObj)
            } else {
              const askObj = t.temperaturePoint + '℃' + ',' + o.value + ',' + t.askSymbol + t.askNum
              askArr.push(askObj)
            }
          })
        })
        askArr.unshift(20 + '℃')
        askArr.push(this.circulateForm.entrustNum)
        const ask = askArr.join(';')
        // 拼接要求描述tell
@@ -1388,18 +1393,36 @@
                  })
                }else if(type==1){
                  let arr = this.editTable.filter(b => b.sampleId == item.id)
                  arr.forEach(f => {
                    if(a.ask.includes(f.symbolItem)){
                      let ask = calBack(a.ask, f.symbolItem,f.value)
                      if (ask) {
                        a.ask = ask
                  for (var i=0;i<arr.length;i++){
                    if(a.ask){
                      if(a.ask.includes(arr[i].symbolItem)){
                        let ask = calBack(a.ask, arr[i].symbolItem,arr[i].value)
                        if (ask) {
                          a.ask = ask
                        }
                        let tell = this.handleTell(a.tell, arr[i].symbolItem,arr[i].value)
                        if (tell) {
                          a.tell = tell
                        }
                      }
                      let tell = this.handleTell(a.tell, f.symbolItem,f.value)
                      if (tell) {
                        a.tell = tell
                      }
                    }else{
                      this.$message.error('要求值为空，需要去标准库维护！')
                    }
                  })
                  }
                  // arr.forEach(f => {
                  //   if(a.ask){
                  //     if(a.ask.includes(f.symbolItem)){
                  //       let ask = calBack(a.ask, f.symbolItem,f.value)
                  //       if (ask) {
                  //         a.ask = ask
                  //       }
                  //       let tell = this.handleTell(a.tell, f.symbolItem,f.value)
                  //       if (tell) {
                  //         a.tell = tell
                  //       }
                  //     }
                  //   }else{}
                  // })
                }
              }
            })