1.0高级查询修改

src/views/advancedQuery/views/advancedHome.vue

@@ -1081,9 +1081,9 @@ export default {
       function baggageFormat(baggageNO) {
         const bagNumCA = /^CA[0-9]{6}$/
         if (bagNumCA.test(baggageNO)) {
-          return baggageNO.replace('CA', '3999')
+          return Array.from({ length: 10 }, (_, i) => baggageNO.replace('CA', `${i}999`)).join()
         }
-        return baggageNO
+        return baggageNO ? [baggageNO] : null
       }
       this.resetTable()
       /* 参数顺序
@@ -1127,7 +1127,7 @@ export default {
         baggageFormat(baggageNO),
         departureStation,
         destination,
-        specialType.map(v => v.replace(',', '/')).join(),
+        specialType.map(v => v.replaceAll(',', '/')).join(),
         passengerName,
         PNR,
         digitFormat(checkInSequence),
@@ -1252,7 +1252,10 @@ export default {
 }
 </script>
 
-<style lang="scss" scoped>
+<style
+  lang="scss"
+  scoped
+>
 .advance {
   padding: 8px;
   &__head {

src/views/advancedQuery/views/advancedNew.vue

@@ -601,13 +601,6 @@ export default {
       }
     },
     advancedQueryHandler(singleJump) {
-      function baggageFormat(baggageNO) {
-        const bagNumCA = /^CA[0-9]{6}$/
-        if (bagNumCA.test(baggageNO)) {
-          return baggageNO.replace('CA', '3999')
-        }
-        return baggageNO
-      }
       try {
         if (this.dialogFlag) {
           this.$refs['paramsForm'].validate(valid => {
@@ -620,12 +613,6 @@ export default {
         const paramsRowNum = this.paramsForm.params.length
         const queryString = this.paramsForm.params.reduce(
           (preString, { leftBrackets, paramKey, comparisonOperator, paramValue, rightBrackets, connector }, index) => {
-            let formattedValue
-            if (paramKey === 'bagSN') {
-              formattedValue = baggageFormat(paramValue)
-            } else {
-              formattedValue = paramValue
-            }
             bracketsDifference += leftBrackets.length - rightBrackets.length
             if (bracketsDifference < 0) {
               throw new Error('左右括号不匹配！')
@@ -633,11 +620,11 @@ export default {
             preString += leftBrackets + paramKey + ` ${comparisonOperator} `
             if (!['is Null', 'is not Null'].includes(comparisonOperator)) {
               if (comparisonOperator === 'like') {
-                preString += `\'%${formattedValue}%\'`
+                preString += `\'%${paramValue}%\'`
               } else if (this.columnSet[paramKey].dataType === 'number') {
-                preString += formattedValue
+                preString += paramValue
               } else {
-                preString += `\'${formattedValue}\'`
+                preString += `\'${paramValue}\'`
               }
             }
             preString += rightBrackets + (index < paramsRowNum - 1 ? ` ${connector} ` : '')
@@ -862,7 +849,6 @@ export default {
       const top2 = /^([a-zA-Z][0-9])|([0-9][a-zA-Z])|([a-zA-Z]{2})/
       const num = /^[0-9]+$/
       const bagNo = /^[a-zA-Z]{2}[0-9]{6}$/
-      const bagNumCA = /^CA[0-9]{6}$/
       if (az.test(val)) {
         // 纯字母则为旅客姓名
         this.paramsForm.params.push({
@@ -883,7 +869,7 @@ export default {
           rightBrackets: '',
           connector: 'and'
         })
-      } else if ((num.test(val) && val.length === 10) || bagNo.test(val) || bagNumCA.test(val)) {
+      } else if ((num.test(val) && val.length === 10) || bagNo.test(val)) {
         // 纯数字且位数等于10则为行李牌号
         this.paramsForm.params.push({
           leftBrackets: '',
@@ -997,7 +983,10 @@ export default {
 }
 </script>
 
-<style lang="scss" scoped>
+<style
+  lang="scss"
+  scoped
+>
 .advance {
   padding: 8px;
   &__head {