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

@@ -436,6 +436,7 @@
            <div style="display: flex;align-items: center;flex-direction: column;font-size: 14px">
              <span>检验项</span>
              <el-input
                v-if="active==1"
              v-model="inspectionItem"
              @input="searchFilterList"
              size="mini"
@@ -449,6 +450,7 @@
            <div style="display: flex;align-items: center;flex-direction: column;font-size: 14px">
              <span>检验项子项</span>
              <el-input
                v-if="active==1"
                v-model="inspectionItemSubclass"
                @input="searchFilterList"
                size="mini"
@@ -463,6 +465,7 @@
            <div style="display: flex;align-items: center;flex-direction: column;font-size: 14px">
              <span>试验方法</span>
              <el-input
                v-if="active==1"
                v-model="methodS"
                @input="searchFilterList"
                size="mini"
@@ -1098,22 +1101,31 @@
          this.$message.error('请填写完整数据')
          return
        }

        const opticalProjectList = JSON.parse(JSON.stringify(this.opticalProjectList))
        let entrustTime = this.circulateForm.entrustTime
        let entrustNum = this.circulateForm.entrustNum
        let temperaturePoint1 = JSON.parse(JSON.stringify(this.temperatureData))

        temperaturePoint1.forEach(t => {
          if (!t.temperaturePoint || !t.askSymbol || !t.askNum) {
            throw this.$message.error('请填写完整数据')
          }
        })
        let temperaturePoint = JSON.parse(JSON.stringify(this.temperatureData))
        temperaturePoint.unshift({temperaturePoint: 20, askSymbol: null, askNum: null})
        temperaturePoint.unshift({temperaturePoint: 20})
        let askArr = []
        let opticalProjectArr = []
        // 拼接要求值ask
        opticalProjectList.forEach(o => {
          opticalProjectArr.push(o.value)
          temperaturePoint.forEach(t => {
            t.temperaturePoint = t.temperaturePoint + '℃'
            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.push(this.circulateForm.entrustNum)
@@ -1129,9 +1141,6 @@
          temperaturePointList.push(t.temperaturePoint)
        })
        temperaturePoint1.forEach(t => {
          if (!t.temperaturePoint || !t.askSymbol || !t.askNum) {
            throw this.$message.error('请填写完整数据')
          }
          t.temperaturePoint = t.temperaturePoint + '℃'
          askNum.push(t.askSymbol + t.askNum + 'dB/Km')
          temperaturePointList2.push(t.temperaturePoint)
@@ -1140,6 +1149,7 @@
        askNum.forEach(a => {
          additionArr.push(temperaturePointList2.join(',') + a)
        })
        temperaturePointList2.unshift(20 + '℃')
        const tell = '温度范围:' + temperaturePointList2.join(',') + ';' + '保温时间:' + entrustTime + ';' + '循环次数:'
          + entrustNum + ';' + '光纤(' + opticalProjectArr.join(',') + ')' + '附加衰减绝对值:' + additionArr.join(';')
        this.productList.forEach(item => {
@@ -1148,6 +1158,8 @@
            item.tell = tell
          }
        })
        console.log('ask---', ask)
        console.log('tell---', tell)
        this.circulateShow = false
      },
      beforeCirculateShowClose () {
@@ -1324,7 +1336,7 @@
            }
          })
          console.log('isHaveBushing===', isHaveBushing)
          if (productListSelected && select[2] === '光缆' && !isHaveBushing) {
          if (productListSelected && select[2] === '光缆' && isHaveBushing === false) {
            this.$message.error('光缆温度循环项目必须进行光纤配置')
            return
          }
@@ -1381,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{}
                  // })
                }
              }
            })