修改检验下单bug

licp

2024-06-06 32fb43e06c0f3be9e4a1763286217bad5d7bba4d

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

@@ -740,25 +740,30 @@
          if(ask.includes('&')){
            // 多个条件
            let arr0 = ask.split('&')
            let arr1 = []
            arr0.forEach(m=>{
                let index = code.findIndex(b=>m.includes(b))
              if(index>-1){
                let arr = m.split(code[index]).find(b=>b)
                let num = eval(arr[0].replace(/RTS/g, this.RTS))
                let arr = m.split(code[index]).filter(b=>!!b)
                let num = eval(this.replaceAll(arr[0],'RTS', this.RTS))
                m = code[index] + ''+ num
                arr1.push(m)
              }
            })
            return arr0.join('&')
            return arr1.join('&')
          }else{
            // 单个条件
            let index = code.findIndex(b=>ask.includes(b))
            if(index>-1){
              let arr = ask.split(code[index]).find(b=>b)
              let num = eval(arr[0].replace(/RTS/g, this.RTS))
              let arr = ask.split(code[index]).filter(b=>!!b)
              let num = eval(this.replaceAll(arr[0],'RTS', this.RTS))
              return code[index] + ''+ num
            }
          }
        }
      },
      replaceAll(str, find, replace) {
        return str.replace(new RegExp(find, 'g'), replace);
      },
      save() {
        if (!this.addObj.companyId) {
@@ -783,18 +788,20 @@
          this.$message.error('请输入样品型号')
        } else if (!this.sampleList.every(m => m.standardMethodListId)) {
          this.$message.error('请选择检验标准')
        }else if (this.totalArr.find(a=>a.ask.includes('RTS'))&&!this.RTS) {
        }else if (this.totalArr.find(a=>a.ask.includes('RTS')&&a.state==1)&&!this.RTS) {
          this.$message.error('请输入RTS')
        } else {
          let sampleList = this.HaveJson(this.sampleList)
          let isRTS = this.totalArr.find(a=>a.ask.includes('RTS'))
          let isRTS = this.totalArr.find(a=>a.ask.includes('RTS')&&a.state==1)
          if(isRTS){
            sampleList.forEach(item=>{
              if(item.insProduct&&item.insProduct.length>0){
                item.insProduct.forEach(a=>{
                  let ask = this.handleAsk(a.ask)
                  if(ask){
                    a.ask = ask
                  if(a.state==1){
                    let ask = this.handleAsk(a.ask)
                    if(ask&&a.state==1){
                      a.ask = ask
                    }
                  }
                })
              }
@@ -805,9 +812,11 @@
                    a.fiber.forEach(b=>{
                      if(b.productList&&b.productList.length>0){
                        b.productList.forEach(c=>{
                          let ask = this.handleAsk(c.ask)
                          if(ask){
                            c.ask = ask
                          if(c.state==1){
                            let ask = this.handleAsk(c.ask)
                            if(ask&&c.state==1){
                              c.ask = ask
                            }
                          }
                        })
                      }
@@ -817,9 +826,11 @@
                    a.fibers.forEach(b=>{
                      if(b.productList&&b.productList.length>0){
                        b.productList.forEach(c=>{
                          let ask = this.handleAsk(c.ask)
                          if(ask){
                            c.ask = ask
                          if(c.state==1){
                            let ask = this.handleAsk(c.ask)
                            if(ask&&c.state==1){
                              c.ask = ask
                            }
                          }
                        })
                      }
@@ -827,9 +838,11 @@
                        b.fiber.forEach(c=>{
                          if(c.productList&&c.productList.length>0){
                            c.productList.forEach(d=>{
                              let ask = this.handleAsk(d.ask)
                              if(ask){
                                d.ask = ask
                              if(d.state==1){
                                let ask = this.handleAsk(d.ask)
                                if(ask){
                                  d.ask = ask
                                }
                              }
                            })
                          }