zhaoke 1 жил өмнө
parent
commit
8294f381dd

+ 1 - 1
src/layout/components/Sidebar/index.vue

@@ -2,7 +2,7 @@
   <div :class="{ 'has-logo': showLogo }">
     <logo v-if="showLogo" :collapse="isCollapse" />
     <el-scrollbar wrap-class="scrollbar-wrapper">
-      <el-menu class="navMenu" :default-active="activeMenu" :collapse="isCollapse" :background-color="variables.menusBg" :text-color="variables.menuText" :unique-opened="false" :active-text-color="variables.menuActiveText" :collapse-transition="false" mode="vertical">
+      <el-menu class="navMenu" :default-active="activeMenu" :background-color="variables.menusBg" :text-color="variables.menuText" :unique-opened="false" :active-text-color="variables.menuActiveText" :collapse-transition="false" mode="vertical">
         <sidebar-item v-for="(route, index) in permission_routes" :key="index" :item="route" :base-path="route.path" :leup="leup" />
       </el-menu>
     </el-scrollbar>

+ 20 - 1
src/views/advancedQuery/views/advancedHome.vue

@@ -893,7 +893,9 @@ export default {
       } else if (azNum.test(val) && top2.test(val) && val.length < 8) {
         // 字母加数字且前两位为字母则为航班号
         if (val.length <= 5) {
-          val = val.substring(0, 2) + '0' + val.substring(2, val.length)
+          const len = val.length
+          const lenCx = 6 - len
+          val = val.substring(0, 2) + '0'.repeat(lenCx) + val.substring(2, len)
           this.$refs['search'].input = val
         }
         this.form['flightNO'] = val
@@ -1009,6 +1011,23 @@ export default {
         'noBSM',
         'loadType'
       )
+      const azNum = /^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]*$/
+      // const top2 = /^[a-zA-Z]{2}\w*$/
+      const top2 = /^([a-zA-Z][0-9])|([0-9][a-zA-Z])|([a-zA-Z]{2})/
+      // const bagNumCA = /^CA[0-9]{6}$/
+      const { flightNO } = this.dataContent[0]
+      // 纯字母则为旅客姓名
+      if (azNum.test(flightNO) && top2.test(flightNO) && flightNO.length < 8) {
+        // 字母加数字且前两位为字母则为航班号
+        if (flightNO.length <= 5) {
+          const len = flightNO.length
+          const lenCx = 6 - len
+          const val = flightNO.substring(0, 2) + '0'.repeat(lenCx) + flightNO.substring(2, len)
+          this.$refs['search'].input = val
+          this.form['flightNO'] = val
+          this.dataContent[0]['flightNO'] = val
+        }
+      }
       this.advancedQuery(this.dataContent, singleJump)
       this.gjFlag = false
     },