Merge remote-tracking branch 'origin/master'

zss

2024-08-09 dd6aa18a74f7c47d816ae57be4667274a48ebee3

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

@@ -134,7 +134,7 @@
              <div class="search-item" style="width: 50%;margin-right: 16px;">
                <label style="width: 80px;">纤带类型</label>
                <el-select v-model="miresModel" placeholder="请选择" size="small" style="width: 100%;"
                  

                  >
                  <el-option v-for="(item,a) in miresModels" :key="a" :label="item.label" :value="item.value">
                  </el-option>
@@ -476,7 +476,7 @@
              this.fiberList.push(b)
            })
            }
            

          }else{
            this.fiberList = []
            a.fiber.forEach(b=>{
@@ -485,7 +485,7 @@
          }
        })
      }
      

      this.getTypeDicts1()
      this.getStandTreeBySampleType()
      this.getStandTreeBySampleType2()
@@ -514,7 +514,7 @@
              }
            })
          })
          

      }
      if(this.detectionItems.type == 0) {
        // 赋值检测项信息 光纤
@@ -527,7 +527,8 @@
            })
          })

          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){
@@ -535,10 +536,6 @@
              }
            })
          })
          }else if(this.multiFiberList.length > 1) {
            this.fibersList.forEach(item => {
              item.fiber = this.fiberList
            })
          }
        }
      },
@@ -587,7 +584,7 @@
      },
      // 套管检测量赋值
      addTestNum() {
        

        if(parseInt(this.packageInfo.testNum) > parseInt(this.packageInfo.standNum)) {
          this.packageInfo.testNum = this.packageInfo.standNum
          this.$message.error('检测量不能大于标准量')
@@ -606,7 +603,7 @@
        this.fiberList = []
        this.fibersList = []
        this.detectionItems = []
        

        // 页面是否含有光纤带
        if(this.packageInfo.ismiers) {
          // 全检
@@ -649,8 +646,8 @@
          }
        }

        
        


      },
      upNum() {
        this.fiberList = []
@@ -711,7 +708,7 @@
                }
                a.fibers.push(fibers)
                this.fibersList.push(fibers)
              } 
              }
        })
      } else {
          this.bushing = []
@@ -785,7 +782,7 @@
        //     this.addFiber()
        //   }, 200)
        // })
        

          // 将下拉框值赋值给光纤  监听去除
          if(this.selectFiberList.length == 0) {
            this.$message.error('请选择数据')
@@ -822,7 +819,7 @@
          this.detectionType = 0
           this.$set(this.detectionItems,'type',0)
          }
          

        })
      },
      methodChange2(val) {
@@ -919,7 +916,7 @@
                fibersIdent: a.ident,
                productList: []
              }
              this.fiberList.push(fiber) 
              this.fiberList.push(fiber)
            }
          })
        } else {
@@ -940,7 +937,7 @@
          })
        }
      }else {
        this.fiberList = [] 
        this.fiberList = []
        let flag = true
        // 按照顺序生成光纤色标
        let colors2 = []
@@ -982,7 +979,7 @@
        //   this.$message.error('未选择套管')
        //   return
        // }
        // this.fiberList = [] 
        // this.fiberList = []
        // let flag = true
        // // 按照顺序生成光纤色标
        // let colors2 = []
@@ -1191,11 +1188,11 @@
              let product =  JSON.parse(JSON.stringify(row.productList))
              setTimeout(() => {
                product.forEach(p => {
                let rowToSelect = this.detectionItems.find(item => item.id === p.id);  
                if (rowToSelect) {  
                let rowToSelect = this.detectionItems.find(item => item.id === p.id);
                if (rowToSelect) {
                  this.toggleSelection(rowToSelect);
                }
              });  
              });
            },200)
            }
          }
@@ -1216,7 +1213,7 @@
        }
        this.$axios.post(this.$api.standardTree.selectStandardProductList, {
          model: this.mireModel.split(' - ')[1],
          standardMethodListId: this.mireStandard,  
          standardMethodListId: this.mireStandard,
          factory: ''
        }, {
          headers: {
@@ -1231,16 +1228,16 @@
          this.detectionItems = res.data
          this.detectionType = 0
          this.$set(this.detectionItems,'type',0)
         
          if (row.productList != null && row.productList.length > 0) { 
            let product =  JSON.parse(JSON.stringify(row.productList)) 

          if (row.productList != null && row.productList.length > 0) {
            let product =  JSON.parse(JSON.stringify(row.productList))
            setTimeout(() => {
              product.forEach(p => {  
                let rowToSelect = this.detectionItems.find(item => item.id === p.id);  
                if (rowToSelect) {  
              product.forEach(p => {
                let rowToSelect = this.detectionItems.find(item => item.id === p.id);
                if (rowToSelect) {
                  this.toggleSelection(rowToSelect);
                }  
              });  
                }
              });
            },200)
            }
          }