Merge remote-tracking branch 'origin/master'

zss

2024-07-01 e3f6f75938f45f2672bf0f0320cb92a4f96ff696

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

@@ -414,7 +414,17 @@
        @selection-change="selectProduct" style="margin-bottom: 10px;" @select="upProductSelect"
        :row-class-name="tableRowClassName" v-loading="getProductLoad" @select-all="handleAll">
        <el-table-column type="selection" width="65" :selectable="selectable" v-if="active==1"></el-table-column>
        <el-table-column prop="inspectionItem" label="检验项" min-width="140" show-overflow-tooltip></el-table-column>
        <el-table-column prop="inspectionItem" label="检验项" min-width="140" show-overflow-tooltip>
          <template slot="header" slot-scope="scope">
            <div style="display: flex;align-items: center;flex-direction: column;font-size: 14px">
              <span>检验项</span>
              <el-input
              v-model="inspectionItem"
              size="mini"
              placeholder="请输入"/>
            </div>
          </template>
        </el-table-column>
        <el-table-column prop="inspectionItemSubclass" label="检验项子项" min-width="140"
          show-overflow-tooltip></el-table-column>
        <el-table-column prop="sonLaboratory" label="子实验室" min-width="130" show-overflow-tooltip :filters="filters"
@@ -865,7 +875,8 @@
        model: null,
        standardMethodListId: null,
        symbolList:[
        'RTS','A','B','C','D','E','F','G','H','I','J','K','L','M','N','O','P','Q','R','S','T','U','V','W','X','Y','Z']
        'RTS','A','B','C','D','E','F','G','H','I','J','K','L','M','N','O','P','Q','R','S','T','U','V','W','X','Y','Z'],
        inspectionItem:null,
      }
    },
    watch: {
@@ -1567,7 +1578,7 @@
        } else if (row.bsm === '1' && row.section !== '' && row.section !== null && row.state === 0) {
          row.bsm1 = false
        }
        if (row.bsm === '1' && row.inspectionItem === '熔接损耗' && this.sampleList.length > 1 && row.state === 1) {
        if (row.bsm === '1' && row.inspectionItem === '光纤接头损耗' && this.sampleList.length > 1 && row.state === 1) {
          this.bsm2 = true
          this.bsm1Dia = true
          if (this.bsm2Val2.length === 0) {
@@ -1575,9 +1586,9 @@
            this.computationalPairing(this.sampleList.length)
            this.bsm2Val2 = this.HaveJson(this.bsm2Val3)
          }
        } else if (row.bsm === '1' && row.inspectionItem === '熔接损耗' && row.state === 1 && this.sampleList.length > 1) {
        } else if (row.bsm === '1' && row.inspectionItem === '光纤接头损耗' && row.state === 1 && this.sampleList.length > 1) {
          this.bsm2 = false
        } else if (row.bsm === '1' && row.inspectionItem === '熔接损耗' && this.sampleList.length < 2) {
        } else if (row.bsm === '1' && row.inspectionItem === '光纤接头损耗' && this.sampleList.length < 2) {
          this.$message.error('样品数量不足够进行配对操作')
          row.state = row.state == 1 ? 0 : 1
          this.$refs.productTable.toggleRowSelection(row, false)
@@ -1849,7 +1860,7 @@
          } else if (p.bsm === '1' && p.section !== '' && p.section !== null && p.state === 0) {
            p.bsm1 = false
          }
          if (p.bsm === '1' && p.inspectionItem === '熔接损耗' && this.sampleList.length > 1 && p.state === 1) {
          if (p.bsm === '1' && p.inspectionItem === '光纤接头损耗' && this.sampleList.length > 1 && p.state === 1) {
            this.bsm2 = true
            this.bsm1Dia = true
            if (this.bsm2Val2.length === 0) {
@@ -1857,9 +1868,9 @@
              this.computationalPairing(this.sampleList.length)
              this.bsm2Val2 = this.HaveJson(this.bsm2Val3)
            }
          } else if (p.bsm === '1' && p.inspectionItem === '熔接损耗' && p.state === 1 && this.sampleList.length > 1) {
          } else if (p.bsm === '1' && p.inspectionItem === '光纤接头损耗' && p.state === 1 && this.sampleList.length > 1) {
            this.bsm2 = false
          } else if (p.bsm === '1' && p.inspectionItem === '熔接损耗' && this.sampleList.length < 2) {
          } else if (p.bsm === '1' && p.inspectionItem === '光纤接头损耗' && this.sampleList.length < 2) {
            this.$message.error('样品数量不足够进行配对操作')
            this.$refs.productTable.clearSelection()
            return