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

licp

2024-07-04 f5d4a9d3e7a82eca16b5285f39325d68894713a0

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

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

@@ -300,9 +300,9 @@
                  :style="`width:${handleWidth(n)}px !important;min-height:${item.style.rowlen[n.r]}px;`">
                  <template v-if="n.v.ps!=undefined && n.v.ps.value==='检验值' && state==1">
                    <el-input v-if="getInspectionValueType(n.i) == 1" class="table_input" v-model="n.v.v"
                      :disabled="getInspectionItemType(n.i) == 1 || (n.u != userId && n.u != undefined && n.u != '')"
                              @input="handleInput(n)"
                      @change="m=>changeInput(m,`${item.templateId}-${n.r}-${n.c}-${n.i}`)" @mousewheel.native.prevent :key="'abc-'+'000'+index+'000'+i+'000'+j">
                              :disabled="getInspectionItemType(n.i) == 1 || (n.u != userId && n.u != undefined && n.u != '')"
                              @input="handleInput(n)" @blur="bigNum(n)"
                              @change="m=>changeInput(m,`${item.templateId}-${n.r}-${n.c}-${n.i}`)" @mousewheel.native.prevent :key="'abc-'+'000'+index+'000'+i+'000'+j">
                      <el-button slot="append" type="primary" icon="el-icon-edit" size="mini"
                        v-if="getInspectionItemType(n.i) == 1" @click="getSystemValue(n)"></el-button>
                    </el-input>
@@ -1678,7 +1678,7 @@
                      }
                      if(this.getInspectionValueType(item.i)==1){
                        if (!isNaN(parseFloat(c.v.v))) {
                          if(c.v.v.includes('^')){
                          if(c.v.v.includes('^') || c.v.v.includes('/')){
                            comValue[(tableCode + (c.r + 1))] = c.v.v
                          }else{
                            comValue[(tableCode + (c.r + 1))] = parseFloat(c.v.v)
@@ -1926,11 +1926,13 @@
        return sum
      },
      handleInput (n) {
        if (n.v.v > 10000) {
        n.v.v = n.v.v.replace(/[^\d.^e/]/g, '');
      },
      bigNum (n) {
        if (n.v.v > 10000 && this.PROJECT === '装备电缆') {
          let num2 = new this.$Big(n.v.v)
          n.v.v = num2.toExponential()
        }
        n.v.v = n.v.v.replace(/[^\d.^e]/g, '');
      },
      getInspectionItemType(id) {
        for (var a in this.currentSample.insProduct) {

 src/util/excelFountion.js

@@ -319,7 +319,9 @@
        if(typeof(comValue[a])=='string'&&comValue[a].includes('^')){
          // 计算幂次
          arr[a] = CalculatePower(comValue[a])
        }else{
        } else if (typeof(comValue[a])=='string'&&comValue[a].includes('/')) {
          arr[a] = comValue[a]
        } else{
          arr[a] = comValue[a]
        }
      }