Merge remote-tracking branch 'origin/master'

gaoluyang

2024-07-11 5f3cf604c6598d34a389dcbdded8ab9c973f4085

Merge remote-tracking branch 'origin/master'

 src/components/do/b1-inspect-order-plan/Inspection.vue

@@ -1824,7 +1824,7 @@
          }
      },
      getValue(v){
        let str = v.v?v.v:(v.ct&&v.ct.s?v.ct.s.length>0&&v.ct.s[0].v.replace(new RegExp('\n', 'g'), '<br/>'):'')
        let str = v.v?v.v:(v.ct&&v.ct.s?v.ct.s.length>0&&v.ct.s[0].v.replace(new RegExp('\n', 'g'), '<br/>').replace(new RegExp('@', 'g'), '<br/>'):'')
        // str.replace(new RegExp(search, 'g'), replace)
        return str
      },

 static/js/worker.js

@@ -101,7 +101,8 @@
                    if(res.includes('/')){
                      return handleMoreParam(res,m.split('=')[1],'=')
                    }else{
                      return  res.trim() == str.trim()
                      // console.log(res.trim().replace(/[.,。、；：'";?？“，]/g, ''),' == ',str.trim().replace(/[.,。、；：'";?？“，]/g, ''))
                      return  res.trim().replace(/[.,。、；：'";?？“，]/g, '') == str.trim().replace(/[.,。、；：'";?？“，]/g, '')
                    }
                  }else{
                    return  eval(res) == eval(str)
@@ -186,7 +187,6 @@
                }
              })
            } else {
              console.log(333333)
              item.v.v = 0
              list.forEach(a => {
                if (a[0].r == item.r) {
@@ -199,6 +199,7 @@
                }
              })
            }
            console.log(tableList)
          }
          result = {
            method:'saveInsContext',