Merge remote-tracking branch 'origin/master'

value

2024-06-01 bc0e477594c5a916c014fb20dbb3797afd037ea0

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

@@ -541,7 +541,7 @@
        </el-row>
      </span>
    </el-dialog>
    <fiberOpticConfig :currentId="currentId" v-if="configShow"/>
    <fiberOpticConfig :currentId="currentId" v-if="configShow" :active="active"/>
  </div>
</template>

@@ -1358,6 +1358,10 @@
          this.$axios.post(this.$api.insBushing.selectBushingBySampleId,{
            sampleId: this.sampleId
          }).then(res=>{
            if(res.data.length===0){
              this.$message.error('该样品没有配置光纤')
              return
            }
            for(var i in this.sampleList){
              if(this.sampleList[i].id = this.sampleId){
                this.sampleList[i].bushing = res.data