dm页面完善

jinhui.wang
Commit 94dc4187fd130af645794cd0177cbc230ae46af2 94dc4187 1 parent 1c71aef0
Showing 4 changed files with 179 additions and 87 deletions
src/assets/languages/tableHeaders.js
src/layout/components/TagsView/index.vue
src/router/index.js
src/views/systemLog/dmLog/weatherTable.vue
--- a/src/assets/languages/tableHeaders.js
View file @94dc418
+++ b/src/assets/languages/tableHeaders.js
View file @94dc418
@@ -934,40 +934,28 @@ let tableHeaders = {
     //dm数据处理
     "DM": [
         {
-            columnChineseName: "运单号",
+            columnChineseName: "AccsId",
-            columnName: "awbNbr",
+            columnName: "dmAccsId",
-            columnWidth: "150",
-            status: 1,
-            slot: true
-        },
-        {
-            columnChineseName: "配舱备注",
-            columnName: "remarksDetail",
-            columnWidth: "450",
-            status: 1
-        },
-        {
-            columnChineseName: "回推ACCS结果",
-            columnName: "sendLogSendResult",
             columnWidth: "120",
             status: 1
         },
         {
-            columnChineseName: "处理状态",
+            columnChineseName: "口岸代码",
-            columnName: "statusDetailCode",
+            columnName: "routeDest",
-            columnWidth: "150",
+            columnWidth: "",
             status: 1
         },
         {
-            columnChineseName: "处理结果",
+            columnChineseName: "运单号",
-            columnName: "statusDetailDesc",
+            columnName: "awbNbr",
-            columnWidth: "250",
+            columnWidth: "150",
-            status: 1
+            status: 1,
+            slot: true
         },
         {
-            columnChineseName: "是否生成上架流水",
+            columnChineseName: "Accs Pool",
-            columnName: "weatherGenerateWater",
+            columnName: "accsPool",
-            columnWidth: "130",
+            columnWidth: "100",
             status: 1
         },
         {
@@ -984,8 +972,20 @@ let tableHeaders = {
             status: 1
         },
         {
-            columnChineseName: "DM推送时间",
+            columnChineseName: "ACCS原航班号",
-            columnName: "dmSendTime",
+            columnName: "dmFlightNbr",
+            columnWidth: "120",
+            status: 1
+        },
+        {
+            columnChineseName: "ACCS原航班日期",
+            columnName: "dmFlightDate",
+            columnWidth: "150",
+            status: 1
+        },
+        {
+            columnChineseName: "货物创建时间",
+            columnName: "cargoCreateTime",
             columnWidth: "150",
             status: 1
         },
@@ -996,8 +996,8 @@ let tableHeaders = {
             status: 1
         },
         {
-            columnChineseName: "货物创建时间",
+            columnChineseName: "DM推送时间",
-            columnName: "cargoCreateTime",
+            columnName: "dmSendTime",
             columnWidth: "150",
             status: 1
         },
@@ -1008,6 +1008,18 @@ let tableHeaders = {
             status: 1
         },
         {
+            columnChineseName: "回推ACCS结果",
+            columnName: "sendLogSendResult",
+            columnWidth: "120",
+            status: 1
+        },
+        {
+            columnChineseName: "推送状态",
+            columnName: "cargoPushStatus",
+            columnWidth: "",
+            status: 1
+        },
+        {
             columnChineseName: "配舱类型",
             columnName: "cargoAllocationType",
             columnWidth: "100",
@@ -1020,45 +1032,39 @@ let tableHeaders = {
             status: 1
         },
         {
-            columnChineseName: "ACCS航班号",
+            columnChineseName: "配舱备注",
-            columnName: "dmFlightNbr",
+            columnName: "remarksDetail",
-            columnWidth: "120",
+            columnWidth: "450",
             status: 1
         },
         {
-            columnChineseName: "ACCS航班日期",
+            columnChineseName: "处理状态",
-            columnName: "dmFlightDate",
+            columnName: "statusDetailCode",
             columnWidth: "150",
             status: 1
         },
         {
-            columnChineseName: "推送状态",
+            columnChineseName: "处理结果",
-            columnName: "cargoPushStatus",
+            columnName: "statusDetailDesc",
-            columnWidth: "",
+            columnWidth: "250",
             status: 1
         },
         {
-            columnChineseName: "AccsId",
+            columnChineseName: "是否生成上架流水",
-            columnName: "dmAccsId",
+            columnName: "weatherGenerateWater",
-            columnWidth: "120",
+            columnWidth: "130",
             status: 1
         },
+    ],
+    //流水表
+    "weatherTable": [
         {
-            columnChineseName: "口岸代码",
+            columnChineseName: "AccsId",
-            columnName: "routeDest",
+            columnName: "accsId",
             columnWidth: "",
             status: 1
         },
         {
-            columnChineseName: "Accs Pool",
-            columnName: "accsPool",
-            columnWidth: "100",
-            status: 1
-        },
-    ],
-    //流水表
-    "weatherTable": [
-        {
             columnChineseName: "运单号",
             columnName: "waybillNo",
             columnWidth: "",
@@ -1077,6 +1083,12 @@ let tableHeaders = {
             status: 1
         },
         {
+            columnChineseName: "申报类别",
+            columnName: "declarationCategory",
+            columnWidth: "",
+            status: 1
+        },
+        {
             columnChineseName: "是否开启高地价",
             columnName: "highLowPriceFlg",
             columnWidth: "",
@@ -1101,18 +1113,6 @@ let tableHeaders = {
             status: 1
         },
         {
-            columnChineseName: "AccsId",
-            columnName: "accsId",
-            columnWidth: "",
-            status: 1
-        },
-        {
-            columnChineseName: "申报类别",
-            columnName: "declarationCategory",
-            columnWidth: "",
-            status: 1
-        },
-        {
             columnChineseName: "操作来源",
             columnName: "operationSource",
             columnWidth: "",
--- a/src/layout/components/TagsView/index.vue
View file @94dc418
+++ b/src/layout/components/TagsView/index.vue
View file @94dc418
 <template>
   <div id="tags-view-container" class="tags-view-container">
     <scroll-pane ref="scrollPane" class="tags-view-wrapper" @scroll="handleScroll">
-      <router-link
+      <router-link v-for="tag in visitedViews" ref="tag" :key="tag.path" :class="isActive(tag) ? 'active' : ''"
-        v-for="tag in visitedViews"
+        :to="{ path: tag.path, query: tag.query, fullPath: tag.fullPath }" tag="span" class="tags-view-item"
-        ref="tag"
+        :style="activeStyle(tag)" @click.middle.native="!isAffix(tag) ? closeSelectedTag(tag) : ''"
-        :key="tag.path"
+        @contextmenu.prevent.native="openMenu(tag, $event)">
-        :class="isActive(tag)?'active':''"
-        :to="{ path: tag.path, query: tag.query, fullPath: tag.fullPath }"
-        tag="span"
-        class="tags-view-item"
-        :style="activeStyle(tag)"
-        @click.middle.native="!isAffix(tag)?closeSelectedTag(tag):''"
-        @contextmenu.prevent.native="openMenu(tag,$event)"
-      >
         {{ tag.title }}
-        <span v-if="tag.name != 'FlightAllocConfigAdd' && tag.name != 'FlightAllocConfigInfo' && !isAffix(tag)" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
+        <span
+          v-if="tag.name != 'FlightAllocConfigAdd' && tag.name != 'FlightAllocConfigInfo' && tag.name != 'weatherTable' && !isAffix(tag)"
+          class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
       </router-link>
     </scroll-pane>
-    <ul v-show="visible" :style="{left:left+'px',top:top+'px'}" class="contextmenu">
+    <ul v-show="visible" :style="{ left: left + 'px', top: top + 'px' }" class="contextmenu">
       <li @click="refreshSelectedTag(selectedTag)">刷新页面</li>
       <li v-if="!isAffix(selectedTag)" @click="closeSelectedTag(selectedTag)">关闭当前</li>
       <li @click="closeOthersTags">关闭其他</li>
@@ -168,7 +162,7 @@ export default {
       })
     },
     closeOthersTags() {
-      this.$router.push(this.selectedTag).catch(()=>{});
+      this.$router.push(this.selectedTag).catch(() => { });
       this.$store.dispatch('tagsView/delOthersViews', this.selectedTag).then(() => {
         this.moveToCurrentTag()
       })
@@ -230,6 +224,7 @@ export default {
   background: #fff;
   border-bottom: 1px solid #d8dce5;
   box-shadow: 0 1px 3px 0 rgba(0, 0, 0, .12), 0 0 3px 0 rgba(0, 0, 0, .04);
+
   .tags-view-wrapper {
     .tags-view-item {
       display: inline-block;
@@ -243,17 +238,21 @@ export default {
       padding: 0 8px;
       font-size: 12px;
       margin-left: 5px;
+
       // margin-top: 4px;
       &:first-of-type {
         margin-left: 15px;
       }
+
       &:last-of-type {
         margin-right: 15px;
       }
+
       &.active {
         background-color: #42b983;
         color: #fff;
         border-color: #42b983;
+
         &::before {
           content: '';
           background: #fff;
@@ -267,6 +266,7 @@ export default {
       }
     }
   }
+
   .contextmenu {
     // height: 0;
     margin: 0;
@@ -280,10 +280,12 @@ export default {
     font-weight: 400;
     color: #333;
     box-shadow: 2px 2px 3px 0 rgba(0, 0, 0, .3);
+
     li {
       margin: 0;
       padding: 7px 16px;
       cursor: pointer;
+
       &:hover {
         background: #eee;
       }
@@ -304,11 +306,13 @@ export default {
       text-align: center;
       transition: all .3s cubic-bezier(.645, .045, .355, 1);
       transform-origin: 100% 50%;
+
       &:before {
         transform: scale(.6);
         display: inline-block;
         vertical-align: -3px;
       }
+
       &:hover {
         background-color: #b4bccc;
         color: #fff;
--- a/src/router/index.js
View file @94dc418
+++ b/src/router/index.js
View file @94dc418
@@ -64,29 +64,34 @@ export const constantRoutes = [
         component: (resolve) => require(['@/views/index'], resolve),
         name: '首页',
         meta: { title: '首页', icon: 'home', noCache: true, affix: true }
-      }
+      },
     ]
   },
   {
-    path: '/',
+    path: '',
     component: Layout,
     hidden: true,
-    redirect: 'noredirect',
     children: [
       {
-        path: '/flightAllocConfig/:handle/:id',
+        path: '/info/:handle/:id',
         component: (resolve) => require(['@/views/allocationConfig/flightAllocConfig/info'], resolve),
         name: 'FlightAllocConfigInfo',
-        meta: { title: '航班配舱', icon: 'user', breadcrumb: true }
+        meta: { title: '航班配舱', icon: 'user' }
       },
       {
-        path: '/flightAllocConfig/:handle',
+        path: '/info/:handle',
         component: (resolve) => require(['@/views/allocationConfig/flightAllocConfig/info'], resolve),
         name: 'FlightAllocConfigAdd',
-        meta: { title: '添加航班配舱', icon: 'user', breadcrumb: false }
+        meta: { title: '新增配舱', icon: 'user' }
+      },
+      {
+        path: '/weatherTable',
+        component: (resolve) => require(['@/views/systemLog/dmLog/weatherTable'], resolve),
+        name: 'weatherTable',
+        meta: { title: '流水表', icon: 'user' }
       },
     ]
-  }
+  },
 ]
 export default new Router({
@@ -94,4 +99,4 @@ export default new Router({
   scrollBehavior: () => ({ y: 0 }),
   routes: constantRoutes,
   base: settings.routerBase,
-})
\ No newline at end of file
+})
--- a/src/views/systemLog/dmLog/weatherTable.vue 0 → 100644
View file @94dc418
+++ b/src/views/systemLog/dmLog/weatherTable.vue 0 → 100644
View file @94dc418
+<template>
+    <div style="padding:10px">
+        <el-card header="流水信息">
+            <Tables ref="weatherTable" ductName="weatherTable" :order="true" :data="data" :headerData="tableHeader"
+                :showOverflowTooltip="false" :height="tableHeight" :page="selectData.page" :limitSize="selectData.size"
+                :pageSizes="[100]" :pagination="false" :loading="loading" @currentChange="currentChange">
+            </Tables>
+            <div class="ml20 mt20">
+                <el-button size="small" @click="close">返 回</el-button>
+            </div>
+        </el-card>
+    </div>
+</template>
+
+<script>
+import { getDmFlowInformation } from "@/api/system/logConfig.js";
+
+export default {
+    name: 'weatherTable',
+    data() {
+        return {
+            data: [],
+            tableHeader: this.tableHeaders['weatherTable'],
+            selectData: {
+                page: 1,
+                size: 100,
+            },
+            loading: false,
+            tableHeight: null
+        }
+    },
+    created() {
+        if (this.$route.params.data) {
+            this.data = this.$route.params.data
+            sessionStorage.setItem('accsid', this.data[0].accsId)
+        } else {
+            this.getWeatherTable()
+        }
+    },
+    activated() {
+        if (this.$route.params.data) {
+            this.data = this.$route.params.data
+            sessionStorage.setItem('accsid', this.data[0].accsId)
+        } else {
+            this.getWeatherTable()
+        }
+    },
+    methods: {
+        //accsid获取流水
+        getWeatherTable() {
+            this.loading = true
+            let accsid = ''
+            accsid = sessionStorage.getItem('accsid')
+            getDmFlowInformation('accsId=' + accsid).then(res => {
+                this.loading = false
+                if (res.code === 200) {
+                    this.data = res.data.list
+                } else {
+                    this.msgWarning(res.msg)
+                }
+            }).catch(err => {
+                this.loading = false
+                console.log(err)
+            })
+        },
+        //返回
+        close() {
+            this.$store.state.tagsView.visitedViews.splice(
+                this.$store.state.tagsView.visitedViews.findIndex(
+                    (item) => item.path === this.$route.path
+                ),
+            );
+            sessionStorage.removeItem('accsid')
+            this.$router.push({ name: 'DmLog' })
+        },
+        //翻页
+        currentChange(val) { },
+    }
+}
+</script>
+
+<style>
+</style>
\ No newline at end of file