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

licp

2024-06-28 05042558a60020be98a8e86a6223bd6acbdc5237

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

@@ -914,14 +914,16 @@
        this.selectUserDia = false
      },
      containsValue(str) {
        let symbolItem = ''
        this.symbolList.some(value =>{
          if(str.includes(value)){
            symbolItem  = value
            return true
          }
        })
        return symbolItem
        if(str){
          let symbolItem = ''
          this.symbolList.some(value =>{
            if(str.includes(value)){
              symbolItem  = value
              return true
            }
          })
          return symbolItem
        }
      },
      handleAsk(ask,symbolItem, value) {
        try{
@@ -1001,6 +1003,9 @@
            let isRTS = this.totalArr.find(a => a.ask != null && this.symbolList.find(b=>a.ask.includes(b)) && a.state == 1)
            if (isRTS) {
              this.editTable = this.handleData(sampleList,this.containsValue, 0)
              this.editTable.forEach(item => {
                item.value = item.modelNum
              })
              this.bsm3Dia = true;
              return
            }
@@ -1024,6 +1029,7 @@
            model:item.model,
            symbolList:[],
            sampleId:item.id,
            modelNum:item.modelNum,
          }
          if (item.insProduct && item.insProduct.length > 0) {
            item.insProduct.forEach(a => {
@@ -1192,6 +1198,7 @@
                sampleId:a.sampleId,
                value:null,
                inspectionItemList:b.inspectionItemList,
                modelNum:a.modelNum,
              }
              editTableNew.push(obj)
            })
@@ -1349,7 +1356,7 @@
        }
      },
      selectStandardTreeList() {
        this.$axios.get(this.$api.standardTree.selectStandardTreeList).then(res => {
        this.$axios.get(this.$api.standardTree.selectStandardTreeList2).then(res => {
          this.list = res.data
          this.list.forEach(a => {
            this.expandedKeys.push(a.label)