Merge remote-tracking branch 'origin/master'

gaoluyang

2024-07-31 38e6f27a8082e1173e3c02a33da5da39b6c6872c

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

@@ -107,8 +107,8 @@
        <el-col :span="12" v-if="packageInfo.ismiers">
          <div class="grid-content">
            <h5>光纤带
              <el-button size="mini" type="primary" class="btns" @click="addFibers"
                :disabled="miresModel===null||miresStandard===null" v-if="active==1">生成光纤带</el-button>
              <!-- <el-button size="mini" type="primary" class="btns" @click="addFibers"
                :disabled="miresModel===null||miresStandard===null" v-if="active==1">生成光纤带</el-button> -->
              <el-button size="mini" class="btns" @click="clearFibers" :disabled="selectBushing.length === 0" v-if="active==1">清除</el-button>
            </h5>
            <div
@@ -152,8 +152,10 @@
        </el-col>
        <el-col :span="!packageInfo.ismiers?24:12">
          <div class="grid-content">
            <h5>光纤<el-button size="mini" type="primary" class="btns" @click="addFiber"
                :disabled="mireModel===null||mireStandard===null" v-if="active==1">光纤配色</el-button></h5>
            <h5>光纤
              <!-- <el-button size="mini" type="primary" class="btns" @click="addFiber"
                :disabled="mireModel===null||mireStandard===null" v-if="active==1">光纤配色</el-button> -->
              </h5>
            <div
              style="display: flex;align-items: center;justify-content: space-between;margin: 4px 0 6px 0;padding: 0 12px;box-sizing: border-box;">
              <div class="search-item" style="width: 50%;margin-right: 16px;">
@@ -544,6 +546,7 @@
            this.productList.forEach(a => {
              if (a.state == 1) this.toggleSelection(a)
            })
            this.addFiber()
          }, 200)
        })
      },
@@ -566,6 +569,7 @@
            this.productList2.forEach(a => {
              if (a.state == 1) this.toggleSelection(a)
            })
            this.addFibers()
          }, 200)
        })
      },
@@ -753,7 +757,7 @@
            } else if (p.bsm === '1' && p.section !== '' && p.section !== null && p.state === 0) {
              this.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){
@@ -761,7 +765,7 @@
                this.computationalPairing(this.sampleList.length)
                this.bsm2Val2 = this.HaveJson(this.bsm2Val3)
              }
            } else if (p.bsm === '1' && p.inspectionItem === '熔接损耗' && p.state === 1) {
            } else if (p.bsm === '1' && p.inspectionItem === '光纤接头损耗' && p.state === 1) {
              this.bsm2 = false
            }
          }
@@ -828,7 +832,7 @@
          } else if (row.bsm === '1' && row.section !== '' && row.section !== null && row.state === 0) {
            this.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){
@@ -836,7 +840,7 @@
              this.computationalPairing(this.sampleList.length)
              this.bsm2Val2 = this.HaveJson(this.bsm2Val3)
            }
          } else if (row.bsm === '1' && row.inspectionItem === '熔接损耗' && row.state === 1) {
          } else if (row.bsm === '1' && row.inspectionItem === '光纤接头损耗' && row.state === 1) {
            this.bsm2 = false
          }
        }else{