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

licp

2024-08-09 71a8e88eccd5626877c4ab2c93f523c4f71d79c1

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

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

@@ -620,8 +620,7 @@
        </el-row>
      </span>
    </el-dialog>
    <fiberOpticConfig :currentId="currentId" @saveFiberopticConfig="getTotal()" v-if="configShow && examine == 0" :active="active" />
    <fiberOpticConfigTwo :currentId="currentId" @saveFiberopticConfig="getTotal()" v-if="configShow && examine == 1" :active="active" />
    <fiberOpticConfig :currentId="currentId" @saveFiberopticConfig="getTotal()" v-if="configShow" :active="active" />
    <equipConfig :currentId="currentId" v-if="equipConfigShow" :active="active" />
    <cableConfig v-if="cableConfigShow" :active="active" />
<!--    单选特殊值处理框-->

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

@@ -527,17 +527,14 @@
            })
          })

          if(this.multiFiberList.length == 1) {
          // 选择的时候就将fiberList的值赋值给对应的fiberList
          if(this.multiFiberList.length > 0) {
            this.multiFiberList.forEach(item => {
            this.fibersList.forEach(a => {
              if(a.ident == item.ident){
                a.fiber = this.fiberList
              }
            })
          })
          }else if(this.multiFiberList.length > 1) {
            this.fibersList.forEach(item => {
              item.fiber = this.fiberList
            })
          }
        }