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

zouyu

2024-08-10 860c08388adb4196f30851d23ef652deaef26ffc

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

@@ -35,12 +35,12 @@
              </div>
              <div class="search-item" style="margin-right: 10px;">
                <label style="width: 100px">每根管抽检标准量</label>
                <el-input v-model="packageInfo.standNum" placeholder="请输入" size="small" @blur="addStandNum" :disabled="active!=1" style="width:100px"></el-input>
                <el-input v-model="packageInfo.standNum" placeholder="请输入" size="small" @blur="addStandNum" :disabled="active!=1" style="width:70px"></el-input>
              </div>
              <div class="search-item">
                <label style="width: 100px">每根管抽检检测量</label>
                <el-input v-model="packageInfo.testNum" placeholder="请输入" size="small" @blur="addTestNum"
                style="width:100px"
                style="width:70px"
                  :disabled="packageInfo.radio===0||active!=1"></el-input>
              </div>
            </div>
@@ -99,6 +99,8 @@
                  <el-input v-model="scope.row.ask" placeholder="请输入" size="small" :disabled="active!=1" v-if="!isAskOnlyRead"></el-input>
                  <span v-else>{{ scope.row.ask }}</span>
                </template>
              </el-table-column>
              <el-table-column prop="tell" label="要求描述" show-overflow-tooltip width="150">
              </el-table-column>
            </el-table>
          </div>
@@ -478,7 +480,7 @@
              this.fiberList.push(b)
            })
            }
            

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

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

      }
      if(this.detectionItems.type == 0) {
        // 赋值检测项信息 光纤
@@ -584,7 +586,7 @@
        this.fiberList = []
        this.fibersList = []
        this.detectionItems = []
        

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

        
        


      },
      upNum() {
        this.fiberList = []
@@ -689,7 +691,7 @@
                }
                a.fibers.push(fibers)
                this.fibersList.push(fibers)
              } 
              }
        })
      } else {
          this.bushing = []
@@ -763,7 +765,7 @@
        //     this.addFiber()
        //   }, 200)
        // })
        

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

        })
      },
      methodChange2(val) {
@@ -897,7 +899,7 @@
                fibersIdent: a.ident,
                productList: []
              }
              this.fiberList.push(fiber) 
              this.fiberList.push(fiber)
            }
          })
        } else {
@@ -918,7 +920,7 @@
          })
        }
      }else {
        this.fiberList = [] 
        this.fiberList = []
        let flag = true
        // 按照顺序生成光纤色标
        let colors2 = []
@@ -960,7 +962,7 @@
        //   this.$message.error('未选择套管')
        //   return
        // }
        // this.fiberList = [] 
        // this.fiberList = []
        // let flag = true
        // // 按照顺序生成光纤色标
        // let colors2 = []
@@ -1111,7 +1113,7 @@
        }else if (type == 0){
          this.detectionItems = []
          this.detectionItems = row.productList
        } 
        }
      //   if(type == 1) {
      //     if((row.model == null || row.model == '') && (row.standard == null || row.standard == '')){
      //       this.detectionItems = []
@@ -1144,11 +1146,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)
      //       }
      //     }
@@ -1169,7 +1171,7 @@
      //   }
      //   this.$axios.post(this.$api.standardTree.selectStandardProductList, {
      //     model: this.mireModel.split(' - ')[1],
      //     standardMethodListId: this.mireStandard,  
      //     standardMethodListId: this.mireStandard,
      //     factory: ''
      //   }, {
      //     headers: {
@@ -1184,16 +1186,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)
      //       }
      //     }