1.表格要求值计算 2.温度循环下单逻辑修改

gaoluyang

2024-07-04 347030895032792e730394b362ce1473c0df6b03

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

@@ -1021,9 +1021,9 @@
        temperatureDataList: [
          {label: '<', value: '<'},
          {label: '≤', value: '≤'},
          {label: '＞', value: '＞'},
          {label: '=', value: '='},
          {label: '≥', value: '≥'},
          {label: '＝', value: '＝'},
          {label: '>', value: '>'},
        ]
      }
    },
@@ -1112,6 +1112,9 @@
              throw this.$message.error('请填写完整数据')
            }
          })
          if (!o.temperatureData.some(item => item.temperaturePoint == '20')) {
            throw this.$message.error(`${o.value + '波长没有配置20℃温度点'}`)
          }
        })
        let entrustTime = this.circulateForm.entrustTime
        let entrustNum = this.circulateForm.entrustNum
@@ -1123,7 +1126,7 @@
          o.temperatureData.unshift({temperaturePoint: 20})
          o.temperatureData.forEach(t => {
            if (!t.askSymbol) {
                  const askObj = t.temperaturePoint + '℃' + ',' + o.value + ',' + null
                  const askObj = t.temperaturePoint + '℃(常温)' + ',' + o.value + ',' + null
                  askArr.push(askObj)
                } else {
                  const askObj = t.temperaturePoint + '℃' + ',' + o.value + ',' + t.askSymbol + t.askNum
@@ -1149,7 +1152,7 @@
        })
        temperaturePointList = Array.from(new Set(temperaturePointList))
        temperaturePointList2 = Array.from(new Set(temperaturePointList2))
        temperaturePointList2.unshift(20 + '℃')
        temperaturePointList2.unshift(20 + '℃(常温)')
        let additionArr = []
        askNum.forEach(a => {
          additionArr.push(temperaturePointList.join(',') + a)
@@ -1391,7 +1394,7 @@
            }).catch(() => {})
          }else{
            let isRTS = this.totalArr.find(a => a.ask != null && this.symbolList.find(b=>a.ask.includes(b)) && a.state == 1)
            if (isRTS) {
            if (isRTS&&this.PROJECT=='检测中心') {
              this.editTable = this.handleData(sampleList,this.containsValue, 0)
              this.editTable.forEach(item => {
                item.value = item.modelNum