Browse Source

航站视图-预计装载数位数修改,搜索添加enter按键事件,表头添加注释

zhongxiaoyu 2 years ago
parent
commit
45abcf2066

+ 3 - 3
src/layout/components/Search/index.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-10-18 17:44:42
- * @LastEditTime: 2022-05-12 17:34:22
+ * @LastEditTime: 2022-05-13 13:35:45
  * @LastEditors: your name
  * @Description: In User Settings Edit
  * @FilePath: \Foshan4A\src\views\account\components\search.vue
@@ -12,7 +12,7 @@
       <div v-if="isTitle" :class="isChild ? 'childTitle' : ''" class="title">
         {{ title }}
       </div>
-      <div v-if="isOnly" class="content flex-wrap" @keyup.enter="checkSearch">
+      <div v-if="isOnly" class="content flex-wrap">
         <el-select v-model="value" clearable placeholder="请选择" v-if="isSou">
           <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
           </el-option>
@@ -21,7 +21,7 @@
           <el-option v-for="item in options1" :key="item.value" :label="item.label" :value="item.value">
           </el-option>
         </el-select>
-        <div v-if="isSearch" :class="isChild ? 'childSearch' : ''" class="search">
+        <div v-if="isSearch" :class="isChild ? 'childSearch' : ''" class="search" @keyup.enter="checkSearch">
           <el-input :size="isChild ? 'medium' : ''" :placeholder="placeholder" @clear="clearSearch" clearable v-model="input">
             <el-button slot="prepend" icon="el-icon-search"></el-button>
           </el-input>

+ 4 - 4
src/views/advancedQuery/views/advancedHome.vue

@@ -345,12 +345,12 @@ export default {
           label: '特殊行李类型'
         },
         {
-          prop: '删除',
-          label: 'deleted'
+          prop: 'deleted',
+          label: '删除'
         },
         {
-          prop: '激活',
-          label: 'activated'
+          prop: 'activated',
+          label: '激活'
         },
         {
           prop: 'BagWeight',

+ 16 - 12
src/views/baggageManagement/components/arrival/index.vue

@@ -1,14 +1,14 @@
 <!--
  * @Author: zk
  * @Date: 2022-01-17 10:39:22
- * @LastEditTime: 2022-05-13 09:37:33
+ * @LastEditTime: 2022-05-13 13:50:30
  * @LastEditors: your name
- * @Description: 港01
+ * @Description: 港01
 -->
 <template>
-  <div class="departure-one">
+  <div class="arrival-one">
     <!--功能区-表单-->
-    <div class="departure-form">
+    <div class="arrival-form">
       <el-form
         ref="form"
         :inline="true"
@@ -151,7 +151,7 @@
     <!--表格-->
     <div
       v-loading="loading"
-      class="departure-table"
+      class="arrival-table"
       element-loading-text="拼命加载中"
       element-loading-spinner="el-icon-loading"
       element-loading-background="rgba(0, 0, 0, 0.8)"
@@ -179,7 +179,11 @@
           :filter-method="
             tableDataFilters[item.statCode] && filterHandler
           "
-        />
+        >
+          <template slot="header">
+            <el-tooltip :content="item.statName" placement="top"><span>{{ item.statName }}</span></el-tooltip>
+          </template>
+        </el-table-column>
       </el-table>
     </div>
     <!--列设置-->
@@ -234,13 +238,13 @@ export default {
   mixins: [terminalMixin, formMixin, tableColsMixin],
   data() {
     return {
-      orderNum: ['0', '0', '0', '0'], // 默认总数
+      orderNum: ['0', '0', '0', '0', '0', '0'], // 默认总数
       // 初始表头
       tableCols: [
         {
           statCode: 'FlightNO',
           statName: '航班号',
-          width: 100
+          width: 80
         },
         {
           statCode: 'FlightDate',
@@ -483,10 +487,10 @@ export default {
 
     toOrderNum(num) {
       num = num.toString()
-      if (num.length < 4) {
+      if (num.length < 6) {
         num = '0' + num // 如未满八位数,添加"0"补位
         this.toOrderNum(num) // 递归添加"0"补位
-      } else if (num.length === 4) {
+      } else if (num.length >= 6) {
         this.orderNum = num.split('') // 将其便变成数据,渲染至滚动数组
       } else {
         // 订单总量数字超过八位显示异常
@@ -499,7 +503,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.departure-form {
+.arrival-form {
   padding-top: 11px;
   padding-left: 5px;
   ::v-deep .form {
@@ -623,7 +627,7 @@ export default {
     margin-right: 0;
   }
 }
-.departure-table {
+.arrival-table {
   width: 100%;
   ::v-deep .table {
     width: 100%;

+ 9 - 6
src/views/baggageManagement/components/departure/index.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zk
  * @Date: 2022-01-17 10:39:22
- * @LastEditTime: 2022-05-13 09:37:48
+ * @LastEditTime: 2022-05-13 14:29:51
  * @LastEditors: your name
  * @Description: 离港01
 -->
@@ -179,8 +179,11 @@
           :width="item.width"
           :filters="tableDataFilters[item.statCode]"
           :filter-method="tableDataFilters[item.statCode] && filterHandler"
-        />
-
+        >
+          <template slot="header">
+            <el-tooltip :content="item.statName" placement="top"><span>{{ item.statName }}</span></el-tooltip>
+          </template>
+        </el-table-column>
       </el-table>
     </div>
     <!--列设置-->
@@ -235,7 +238,7 @@ export default {
   mixins: [terminalMixin, formMixin, tableColsMixin],
   data() {
     return {
-      orderNum: ['0', '0', '0', '0'], // 默认总数
+      orderNum: ['0', '0', '0', '0', '0', '0'], // 默认总数
       // 初始表头
       tableCols: [
         {
@@ -482,10 +485,10 @@ export default {
 
     toOrderNum(num) {
       num = num.toString()
-      if (num.length < 4) {
+      if (num.length < 6) {
         num = '0' + num // 如未满八位数,添加"0"补位
         this.toOrderNum(num) // 递归添加"0"补位
-      } else if (num.length === 4) {
+      } else if (num.length >= 6) {
         this.orderNum = num.split('') // 将其便变成数据,渲染至滚动数组
       } else {
         // 订单总量数字超过八位显示异常

+ 10 - 6
src/views/baggageManagement/components/transferArrival/index.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zk
  * @Date: 2022-01-17 10:39:22
- * @LastEditTime: 2022-05-13 11:47:31
+ * @LastEditTime: 2022-05-13 14:30:52
  * @LastEditors: your name
  * @Description: 离港01
 -->
@@ -214,7 +214,11 @@
             :prop="p.statCode"
             :label="p.statName"
             :formatter="tableFormat"
-          />
+          >
+            <template slot="header">
+              <el-tooltip :content="p.statName" placement="top"><span>{{ p.statName }}</span></el-tooltip>
+            </template>
+          </el-table-column>
         </el-table-column>
       </el-table>
     </div>
@@ -279,7 +283,7 @@ export default {
         label: 'outAicompanyCode2'
       },
 
-      orderNum: ['0', '0', '0', '0'], // 默认总数
+      orderNum: ['0', '0', '0', '0', '0', '0'], // 默认总数
       // 初始表头
       tableCols: [
         {
@@ -630,7 +634,7 @@ export default {
       })
       tableData.forEach(item => {
         Object.keys(tempSets).forEach(key => {
-          ;(item[key] ?? '') !== '' && tempSets[key].add(item[key])
+          (item[key] ?? '') !== '' && tempSets[key].add(item[key])
         })
       })
       Object.keys(tempSets).forEach(key => {
@@ -659,10 +663,10 @@ export default {
 
     toOrderNum(num) {
       num = num.toString()
-      if (num.length < 4) {
+      if (num.length < 6) {
         num = '0' + num // 如未满八位数,添加"0"补位
         this.toOrderNum(num) // 递归添加"0"补位
-      } else if (num.length === 4) {
+      } else if (num.length >= 6) {
         this.orderNum = num.split('') // 将其便变成数据,渲染至滚动数组
       } else {
         // 订单总量数字超过八位显示异常

+ 10 - 6
src/views/baggageManagement/components/transferDeparture/index.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zk
  * @Date: 2022-01-17 10:39:22
- * @LastEditTime: 2022-05-13 11:42:10
+ * @LastEditTime: 2022-05-13 14:31:17
  * @LastEditors: your name
  * @Description: 离港01
 -->
@@ -228,7 +228,11 @@
             :prop="p.statCode"
             :label="p.statName"
             :formatter="tableFormat"
-          />
+          >
+            <template slot="header">
+              <el-tooltip :content="p.statName" placement="top"><span>{{ p.statName }}</span></el-tooltip>
+            </template>
+          </el-table-column>
         </el-table-column>
       </el-table>
     </div>
@@ -292,7 +296,7 @@ export default {
         value: 'outAicompanyCode2',
         label: 'outAicompanyCode2'
       },
-      orderNum: ['0', '0', '0', '0'], // 默认总数
+      orderNum: ['0', '0', '0', '0', '0', '0'], // 默认总数
       // 初始表头
       tableCols: [
         {
@@ -634,7 +638,7 @@ export default {
       })
       tableData.forEach(item => {
         Object.keys(tempSets).forEach(key => {
-          ;(item[key] ?? '') !== '' && tempSets[key].add(item[key])
+          (item[key] ?? '') !== '' && tempSets[key].add(item[key])
         })
       })
       Object.keys(tempSets).forEach(key => {
@@ -663,10 +667,10 @@ export default {
 
     toOrderNum(num) {
       num = num.toString()
-      if (num.length < 4) {
+      if (num.length < 6) {
         num = '0' + num // 如未满八位数,添加"0"补位
         this.toOrderNum(num) // 递归添加"0"补位
-      } else if (num.length === 4) {
+      } else if (num.length >= 6) {
         this.orderNum = num.split('') // 将其便变成数据,渲染至滚动数组
       } else {
         // 订单总量数字超过八位显示异常