各bug修复

value

2024-05-10 245ca19f528d2da8463fa31f57bbf7b91d0a5710

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

@@ -59,7 +59,6 @@

  .content {
    display: flex;
    /* width: 100px; */
    height: 100%;
    align-items: center;
    justify-content: left;
@@ -144,6 +143,23 @@
    padding: 0 6px;
    text-align: center;
  }

  .inspection .el-textarea__inner{
    padding: 2px;
  }

  .inspection .el-textarea__inner::-webkit-scrollbar{
    width: 0;
  }

  .inspection .el-select{
    display: flex;
    align-items: center;
  }

  .inspection .el-textarea__inner{
    min-height: 100% !important;
  }
</style>
<template>
  <div v-loading="loading" class="inspection">
@@ -196,15 +212,14 @@
        </el-radio-group>
      </div>
      <div class="center-box">
        <table border="1" class="tables" cellpadding="10" v-for="(item,index) in tableList" :key="index"
          :style="`width: ${tableWidth}px;`">
        <table border="1" class="tables" cellpadding="10" v-for="(item,index) in tableList" :key="index">
          <tbody>
            <tr v-for="(m,i) in item.arr" :key="i">
              <td :id='item.templateId+"-"+n.i+"-"+n.r+"-"+n.c' v-for="(n,j) in m" :key="j"
                v-if="n.v.mc==undefined || Object.keys(n.v.mc).length === 4" :colspan="n.v.mc&&n.v.mc.cs?n.v.mc.cs:1"
                :rowspan="n.v.mc&&n.v.mc.rs?n.v.mc.rs:1"
                :style="`background:${n.v.bg};color:${n.v.fc};font-size:${n.v.fs}px;width:${item.style.columnlen[n.c]}px !important;height:${item.style.rowlen[n.r]}px;font-wight:${n.v.bl?'bold':''};`">
                <div class="content" :class="`content-h-${n.v.ht} content-v-${n.v.vt}`">
                :style="`background:${n.v.bg};color:${n.v.fc};font-size:${n.v.fs}px;width:${handleWidth(n)}px !important;height:${item.style.rowlen[n.r]}px;font-wight:${n.v.bl?'bold':''};`">
                <div class="content" :class="`content-h-${n.v.ht} content-v-${n.v.vt}`" :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 != '')"
@@ -212,8 +227,10 @@
                      <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>
                    <el-input v-else-if="getInspectionValueType(n.i) == 2" class="table_input" type="textarea"
                      :autosize="{ minRows: 1}" v-model="n.v.v" :disabled="state>1" />
                    <el-select v-else-if="getInspectionValueType(n.i) == 5" class="table_input" v-model="n.v.v"
                       v-model="n.v.v"
                      :disabled="getInspectionItemType(n.i) == 1 || (n.u != userId && n.u != undefined && n.u != '')"
                      @change="m=>changeInput(m,`${item.templateId}-${n.r}-${n.c}-${n.i}`)"/>
                    <el-select v-else-if="getInspectionValueType(n.i) == 5" class="table_input"  v-model="n.v.v"
                      :disabled="state>1">
                      <el-option label="是" value="是"></el-option>
                      <el-option label="否" value="否"></el-option>
@@ -222,9 +239,15 @@
                      v-else-if="getInspectionValueType(n.i) == 4">/</span>
                  </template>
                  <template v-else-if="n.v.ps!=undefined && n.v.ps.value==='结论'">
                    <span v-if="n.v.v===1" :style="`font-family:${n.v.ff} !important;color: green;`">合格</span>
                    <span v-else-if="n.v.v===0" :style="`font-family:${n.v.ff} !important;color: red;`">不合格</span>
                    <span v-else :style="`font-family:${n.v.ff} !important;`">待定</span>
                    <el-select v-if="getInspectionValueType(n.i) == 2 && state==1" class="table_input" v-model="n.v.v" @change="saveInsContext()">
                      <el-option label="合格" :value="1"></el-option>
                      <el-option label="不合格" :value="0"></el-option>
                    </el-select>
                    <template v-else>
                      <span v-if="n.v.v===1" :style="`font-family:${n.v.ff} !important;color: green;`">合格</span>
                      <span v-else-if="n.v.v===0" :style="`font-family:${n.v.ff} !important;color: red;`">不合格</span>
                      <span v-else :style="`font-family:${n.v.ff} !important;`">待定</span>
                    </template>
                  </template>
                  <template v-else-if="n.v.ps!=undefined && n.v.ps.value==='设备编码' && state==1">
                    <el-select v-model="n.v.v" placeholder="设备" @visible-change="e=>getEquipOptions(e,n.i)"
@@ -232,6 +255,9 @@
                      <el-option v-for="item in equipOptions" :key="item.value" :label="item.value" :value="item.value">
                      </el-option>
                    </el-select>
                  </template>
                  <template v-else-if="n.v.ps!=undefined && n.v.ps.value==='要求值' && state==1">
                    <span :style="`font-family:${n.v.ff} !important;`">{{getTell(n.i)}}</span>
                  </template>
                  <span v-else :style="`font-family:${n.v.ff} !important;`">{{n.v.v}}</span>
                </div>
@@ -355,7 +381,8 @@
        noReason: '',
        tableWidth: 1000,
        currentTable:null,
        tableLists:[]
        tableLists:[],
        widthList:[]
      }
    },
    created() {
@@ -511,6 +538,7 @@
      },
      handleTableData() {
        this.excelMethodList = []
        this.widthList = this.tableList[0].style.columnlen;
        this.tableList.forEach(a => {
          let mcList = []
          a.template.forEach(b => {
@@ -565,19 +593,23 @@
                }
              })
              if (str != '') {
                let count2 = 0
                for (let i in this.currentSample.insProduct) {
                  if (this.currentSample.insProduct[i].templateId === a.templateId && this.currentSample
                    .insProduct[i].inspectionItem + this.currentSample.insProduct[i].inspectionItemSubclass === str) {
                    .insProduct[i].inspectionItem +
                     (this.currentSample.insProduct[i].inspectionItemSubclass==null?'':this.currentSample.insProduct[i].inspectionItemSubclass)
                     === str) {
                      ids.push({
                        r: b.r,
                        id: this.currentSample.insProduct[i].id,
                        product: this.currentSample.insProduct[i]
                      })
                    break
                      break
                  }
                  if(i == this.currentSample.insProduct.length-1){
                    dels.add(b.r)
                  }
                  count2++
                }
                if(count2 == this.currentSample.insProduct.length){
                  dels.add(b.r)
                }
              }
            }
@@ -597,7 +629,7 @@
                if (a.template[b].v.ps != undefined && a.template[b].v.ps.value === '单位') {
                  a.template[b].v.v = id.product.unit
                }
                if (a.template[b].v.ps != undefined && a.template[b].v.ps.value === '试验方法') {
                if (a.template[b].v.ps != undefined && (a.template[b].v.ps.value === '试验方法' || a.template[b].v.ps.value === '检测方法')) {
                  a.template[b].v.v = id.product.methodS
                }
              }
@@ -647,34 +679,39 @@
            }
            if (b.v.ps != undefined && b.v.ps.value === '计算值') {
              b.v.v = ''
              this.param[b.i].comValue.push(b)
              b.i&&this.param[b.i].comValue.push(b)
            }
            if (b.v.ps != undefined && b.v.ps.value === '设备编码') {
              b.v.v = ''
              this.param[b.i].equipValue.push(b)
              b.i&&this.param[b.i].equipValue.push(b)
            }
            if (b.v.ps != undefined && b.v.ps.value === '设备名称') {
              b.v.v = ''
              this.param[b.i].equipName.push(b)
              b.i&&this.param[b.i].equipName.push(b)
            }
            if (b.v.ps != undefined && b.v.ps.value === '最终值') {
              b.v.v = ''
              if (b.i === undefined) {
              /* if (b.i === undefined) {
                for (var c in this.param) {
                  this.param[c].resValue = b
                }
              } else {
                this.param[b.i].resValue = b
              } */
              if(b.i !== undefined){
                this.param[b.i].resValue = b
              }
            }
            if (b.v.ps != undefined && b.v.ps.value === '结论') {
              this.param[b.i].insResult = b
              conclusionList.forEach((n, i) => {
                if (n.r == b.r && n.c == b.c) {
                  b.v.f =
                    `(${this.comparisonList.find(j=>j.value==(finalList[i].c)).label}${finalList[i].r+1})`
                }
              })
              if(b.i!==undefined){
                this.param[b.i].insResult = b
                conclusionList.forEach((n, i) => {
                  if (n.r == b.r && n.c == b.c) {
                    b.v.f =
                      `(${this.comparisonList.find(j=>j.value==(finalList[i].c)).label}${finalList[i].r+1})`
                  }
                })
              }
            }
            set.add(b.r)
            if (b.v.f) {
@@ -729,7 +766,6 @@
          } catch (e) {}
        })
        this.handleExcelMethod()
        console.log(55555555555,this.currentSample.insProduct,this.tableList,this.param)
      },
      changeInput(m, code) {
        let str = code.split('-')
@@ -846,7 +882,8 @@
                if (a[0].r == item.r && comResult != '') {
                  for (var b in a) {
                    if (a[b].c == item.c) {
                      a[b].v.v = parseFloat(comResult.toFixed(3))
                      let val = parseFloat(comResult.toFixed(3))
                      a[b].v.v = isNaN(val)?'':val
                      break
                    }
                  }
@@ -915,7 +952,6 @@
              this.tableList[0].insProductResult[m] = JSON.stringify(this.tableList[0].insProductResult[m])
              break;
            case 'resValue':
              console.log(this.param)
              this.tableList[0].lastValue = value.v.v
              break;
            case 'insResult':
@@ -976,6 +1012,25 @@
          }
        }
      },
      getTell(id) {
        for (var a in this.currentSample.insProduct) {
          if (this.currentSample.insProduct[a].id == id) {
            return this.currentSample.insProduct[a].tell
          }
        }
      },
      handleWidth(n){
        let sum = 0;
        if(n.v.mc&&n.v.mc.cs&&n.v.mc.c!=undefined){
          for(let i=0;i<n.v.mc.cs;i++){
            let num = this.widthList[i+n.v.mc.c]?this.widthList[i+n.v.mc.c]:100
            sum+=num;
          }
        }else{
          sum = this.widthList[n.c]?this.widthList[n.c]:100
        }
        return sum
      },
      getInspectionItemType(id) {
        for (var a in this.currentSample.insProduct) {
          if (this.currentSample.insProduct[a].id == id) {
@@ -1016,7 +1071,7 @@
          }).then(res => {
            if (res.code === 200 && res.data) {
              this.equipOptions = res.data.map(m => {
                m.value = m.factoryNo
                m.value = m.managementNumber
                m.label = m.deviceName
                return m
              })
@@ -1095,10 +1150,8 @@
        })
      },
      saveInsContext(){
        this.$axios.post(this.$api.insOrderPlan.saveInsContext, this.param, {
          headers: {
            'Content-Type': 'application/json'
          }
        this.$axios.post(this.$api.insOrderPlan.saveInsContext, {
          param: JSON.stringify(this.param)
        }).then(res => {
          if (res.code == 201) {
            this.$message.error('保存失败')
@@ -1117,6 +1170,7 @@
            }
          }
        }
        this.saveInsContext()
      }
    }
  }