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

licp

2024-06-29 f743df9508776dd59e19c1d8bd946b49d83e07eb

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

@@ -2,7 +2,7 @@
  <div class="ins_order_config">
    <div>
      <el-row class="title">
        <el-col :span="6" style="padding-left: 20px;">光纤配置</el-col>
        <el-col :span="6" style="padding-left: 20px;text-align: left;">光纤配置</el-col>
        <el-col :span="18" style="text-align: right;">
          <el-button size="medium" type="primary" @click="save" :loading="saveLoad" v-if="active==1">保 存</el-button>
          <el-button size="medium" @click="outConfig">
@@ -53,7 +53,7 @@
              </el-table-column>
              <el-table-column label="管色标" show-overflow-tooltip>
                <template slot-scope="scope">
                  <el-select v-model="scope.row.color" size="mini" :disabled="active!=1">
                  <el-select v-model="scope.row.color" size="mini" :disabled="active!=1" allow-create filterable >
                    <el-option v-for="(color,i) in colors" :key="i" :label="color.lable"
                      :value="color.value"></el-option>
                  </el-select>
@@ -104,11 +104,11 @@
        </el-col>
      </el-row>
      <el-row :gutter="10">
        <el-col :span="12">
        <el-col :span="12" v-if="packageInfo.ismiers">
          <div class="grid-content">
            <h5>光纤带
              <el-button size="mini" type="primary" class="btns" @click="addFibers"
                :disabled="packageInfo.ismiers===false||miresModel===null||miresStandard===null" v-if="active==1">生成光纤带</el-button>
                :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
@@ -150,7 +150,7 @@
            </el-table>
          </div>
        </el-col>
        <el-col :span="12">
        <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>
@@ -187,7 +187,7 @@
              </el-table-column>
              <el-table-column prop="color" label="光纤色标" width="120">
                <template slot-scope="scope">
                  <el-select v-model="scope.row.color" size="mini" :disabled="active!=1">
                  <el-select v-model="scope.row.color" size="mini" :disabled="active!=1" allow-create filterable >
                    <el-option v-for="(color,i) in colors" :key="i" :label="color.lable"
                      :value="color.value"></el-option>
                  </el-select>
@@ -501,8 +501,8 @@
          this.miresModels = []
          res.data.forEach(a => {
            this.miresModels.push({
              label: a.sample,
              value: a.sample
              label: a.model,
              value: a.model
            })
          })
        })
@@ -588,12 +588,12 @@
            this.$message.error('未选择光纤带')
            return
          }
          this.selectFibers.forEach(a => {
          this.selectFibers.forEach((a,index) => {
            a.fiber = []
            for (var i = 0; i < parseInt(a.num); i++) {
              let fiber = {
                bushColor: a.color,
                color: colors2[i].label,
                color: colors2[(i+(parseInt(a.num)*index))>colors2.length?0:i+(parseInt(a.num)*index)*index].label,
                model: model,
                standard: standard,
                productList: this.HaveJson(this.productList)
@@ -603,12 +603,12 @@
            }
          })
        } else {
          this.selectBushing.forEach(a => {
          this.selectBushing.forEach((a,index) => {
            a.fiber = []
            for (var i = 0; i < parseInt(a.testNum); i++) {
              let fiber = {
                bushColor: a.color,
                color: colors2[i].label,
                color: colors2[(i+(parseInt(a.testNum))*index)>colors2.length?0:i+(parseInt(a.testNum))*index].label,
                model: model,
                standard: standard,
                productList: this.HaveJson(this.productList)
@@ -765,12 +765,12 @@
              this.bsm2 = false
            }
          }
          if (p.ask.includes('RTS')&&p.state === 1) {
            p.rts = ''
            this.bsm3Val = ''
            this.bsm3Dia = true
            this.bsmRow3.push(p)
          }
          // if (p.ask.includes('RTS')&&p.state === 1) {
          //   p.rts = ''
          //   this.bsm3Val = ''
          //   this.bsm3Dia = true
          //   this.bsmRow3.push(p)
          // }
        })

        if (e.length > 0) {
@@ -842,15 +842,15 @@
        }else{
          this.bsm1Dia = false
        }
        if (row.ask.includes('RTS')&&row.state === 1) {
          this.bsmRow3 = null;
          row.rts = ''
          this.bsm3Val = ''
          this.bsm3Dia = true
          this.bsmRow3 = row
        }else{
          this.bsm3Dia = false
        }
        // if (row.ask.includes('RTS')&&row.state === 1) {
        //   this.bsmRow3 = null;
        //   row.rts = ''
        //   this.bsm3Val = ''
        //   this.bsm3Dia = true
        //   this.bsmRow3 = row
        // }else{
        //   this.bsm3Dia = false
        // }
      },
      computationalPairing(n){
        const nums = [];