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

zouyu

2024-08-12 445c50119ba6133e5e8f929fcd71fff322a37f29

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

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

@@ -759,7 +759,7 @@
               width="800px" :show-close="false">
      <el-table
      :data="editTable"
      style="width: 100%">
      style="width: 100%" height="80vh">
      <!-- inspectionItemList -->
      <el-table-column
          prop="inspectionItemList"
@@ -1184,12 +1184,11 @@
      inputValueHandler(row,index){
        if(row){
          const nextIndex = index+1
          console.log(nextIndex, this.editTable)
          for (let i = nextIndex; i < this.editTable.length; i++) {
            const element = this.editTable[i];
            if(element.model==row.model){
            if(element.model==row.model&&row.symbolItem==element.symbolItem){
              this.editTable[i].value = row.value
            }else{
              break;
            }
          }
        }

 src/components/do/b1-ins-order/fiberoptic-config.vue

@@ -95,7 +95,7 @@
              </el-table-column> -->
              <el-table-column prop="ask" label="检测要求" show-overflow-tooltip width="200px">
                <template slot-scope="scope">
                  <el-input v-model="scope.row.ask" placeholder="请输入" size="small" :disabled="active!=1" v-if="!isAskOnlyRead" @change="changeASk(scope.row)"></el-input>
                  <el-input v-model="scope.row.ask" placeholder="请输入" size="small" :disabled="active!=1" v-if="!isAskOnlyRead" @change="changeASk(scope.row,'ask')"></el-input>
                  <span v-else>{{ scope.row.ask }}</span>
                </template>
              </el-table-column>
@@ -561,7 +561,104 @@
        }
      },

      changeASk(row) {
      changeASk(row,type) {
        if(type == 'ask') {
          // 如果检测要求含有正负号
          if(row.tell.indexOf('±') != -1) {
            let left = row.tell.substring(0,row.tell.indexOf('±'))
            let right = row.tell.substring(row.tell.indexOf('±')+1)
            // 如果可以转化为数值
           if(!isNaN(Number(left)) && !isNaN(Number(right))) {
              if(row.ask.indexOf('-') != -1) {
                  let left1 = row.ask.substring(0,row.ask.indexOf('-'))
                  let right1 = row.ask.substring(row.ask.indexOf('-')+1)
                  if(Number(left1) != (Number(left) - Number(right)) || Number(right1) != (Number(left) + Number(right))) {
                    this.$message.error('检测要求不符合要求描述')
                    row.ask = (Number(left) - Number(right)) + '-' + (Number(left) + Number(right))
                  }
              }else {
                this.$message.error('检测要求不符合规范')
                row.ask = left + '-' + right
                return
              }
           }
           // 如果要求描述左边不能转化为数值
           else if(isNaN(Number(left)) && !isNaN(Number(right))) {
            const regex = /[~-]/
            const match = left.match(regex)
            // 左边含有 - ~ 符号
            if(match) {
              let newLeft = '';
              if(left.includes('（')) {
               newLeft = left.replace('（','(')
              }
              if(left.includes('）')) {
                newLeft = newLeft.replace('）',')')
              }
              const regexTwo = /\((\d+(\.\d+)?)([~-])(\d+(\.\d+)?)\)/;
              const matchTwo = newLeft.match(regexTwo);
              let leftTwo = Number(matchTwo[1]) - Number(right)
              let rightTwo = Number(matchTwo[4]) + Number(right)
              console.log(matchTwo);
              console.log(leftTwo,rightTwo);

              console.log(row.ask.indexOf('-'));
              if(row.ask.indexOf('-') != -1) {
                  let left1 = row.ask.substring(0,row.ask.indexOf('-'))
                  let right1 = row.ask.substring(row.ask.indexOf('-')+1)
                  if(Number(left1) != leftTwo || Number(right1) != rightTwo) {
                    this.$message.error('检测要求不符合要求描述')
                    row.ask = leftTwo + '-' + rightTwo
                  }
              }else {
                this.$message.error('检测要求不符合规范')
                row.ask = leftTwo + '-' + rightTwo
                return
              }
            }
           }
          }
          // 如果检测要求含有≤ < ≥ > 符号
          const regex = /[≤<≥>]/
          const match = row.tell.match(regex)
          if(match) {
            // 符号不一致
            if( row.ask.indexOf(match[0]) != 0) {
                this.$message.error('检测要求不符合要求描述')
                row.ask = match[0]
                return
              }else {
                // 符号一致
                const regex = new RegExp(`${match[0]}(\\d+(\\.\\d+)?)`, 'g')
                const matchTow = row.tell.match(regex);
              let right =  Number(matchTow[0].split(match[0])[1])
              let left = row.ask.substring(row.ask.indexOf(match[0])+1)
              if(Number(left) != Number(right)) {
                this.$message.error('检测要求不符合要求描述')
                row.ask = match[0] + right
              }
              }
            }
            // 如果要求描述含有范围
            const regexTwo = /[~-]/
            const matchTwo = row.tell.match(regexTwo)
            const matchAsk = row.ask.match(regexTwo)
            if(matchTwo) {
              let left = row.tell.substring(0,row.tell.indexOf(matchTwo[0]))
              let right = row.tell.substring(row.tell.indexOf(matchTwo[0])+1)


              if(!isNaN(Number(left)) && !isNaN(Number(right))) {
                let leftAsk = row.ask.substring(0,row.ask.indexOf(matchAsk[0]))
                let rightAsk = row.ask.substring(row.ask.indexOf(matchAsk[0])+1)
                if(Number(leftAsk) != Number(left) || Number(rightAsk) != Number(right)) {
                  this.$message.error('检测要求不符合要求描述')
                  row.ask = left + '-' + right
                }
              }
            }
          }

        // 先勾选的情况下
          this.detectionSelect.forEach(item => {
            if(item.id == row.id) {

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

@@ -2650,6 +2650,7 @@
          } catch (e) {}
          try {
            let equipName = JSON.parse(a.insProductResult.equipName)
            // console.log(2222222,equipName)
            if(this.tableLists.find(m=>m.templateId==this.currentTable)&&(this.tableLists.find(m=>m.templateId==this.currentTable).templateName=='温度循环检验原始记录'||this.tableLists.find(m=>m.templateId==this.currentTable).templateName.includes('热循环')||this.tableLists.find(m=>m.templateId==this.currentTable).templateName.includes('温升试验'))){
              this.param[a.id].equipName = []
              for (let i = 0; i < equipName.length; i++) {
@@ -2661,7 +2662,8 @@
              }
            }
            for (let i = 0; i < equipName.length; i++) {
              if(this.tableLists.find(m=>m.templateId==this.currentTable)&&(this.tableLists.find(m=>m.templateId==this.currentTable).templateName=='温度循环检验原始记录'||this.tableLists.find(m=>m.templateId==this.currentTable).templateName=='热循环检验原始记录'||this.tableLists.find(m=>m.templateId==this.currentTable).templateName=='温升试验原始记录模板')){
              if(this.tableLists.find(m=>m.templateId==this.currentTable)&&(this.tableLists.find(m=>m.templateId==this.currentTable).templateName=='温度循环检验原始记录'||this.tableLists.find(m=>m.templateId==this.currentTable).templateName.includes('热循环')||this.tableLists.find(m=>m.templateId==this.currentTable).templateName.includes('温升试验'))){
                console.log(2222222,equipName)
                // 温度循环赋值
                this.$set(this.equipForm,`value`+i,equipName[i].v)
                this.param[a.id].equipName[i].v.v = equipName[i].v

 static/js/worker.js

@@ -325,7 +325,7 @@
            isPoint = PROJECT=='装备电缆'&&tell&&tell.length>0&&typeof tell[0] =='string'&&tell[0].includes('/') // 判断要求值是否为分数
            comResult = compute(item.v.f.replace(/=/g, ' '),comValue, isPoint)
            let list3 = list2.map(item=>item+'')
            isToExponential = list3.some(val => val.includes('e+'))
            isToExponential = list3.some(val => val.includes('e+')||val.includes('e-'))
            // 装备项目检验值转化
            if (PROJECT === '装备电缆' && isToExponential) {
              let num2 = new Big(comResult)
@@ -368,6 +368,8 @@
                      let str = a[b].v.ct.fa.split('.')[1]
                      num = str.length
                      a[b].v.v = comResult?Number(comResult).toFixed(num):comResult
                    }else if(comResult.includes('e+')|| comResult.includes('e-')){
                      a[b].v.v = comResult
                    }else{
                      let val = parseFloat(Number(comResult).toFixed(3))
                      a[b].v.v = isNaN(val) ? comResult : val