version:0.5.3

@@ -42,6 +42,8 @@ export function updateOrAddFlight(form){
   form.declarationCategory = form.declarationCategory.join(';');
   form.serviceCode = form.serviceCode.join(';');
   form.subCategory = form.subCategory.join(';');
+  form.handlingCode = form.handlingCode.join(';');
+  
 
   return request({
     url:'/destinationFlight/updateOrAddFlight',

@@ -35,7 +35,7 @@
         :base-path="route.path"
       />
     </el-menu>
-    <div class="version">version:0.5.1</div>
+    <div class="version">{{ version }}</div>
     <!-- </el-scrollbar> -->
   </div>
 </template>
@@ -45,8 +45,14 @@ import { mapGetters, mapState } from "vuex";
 import Logo from "./Logo";
 import SidebarItem from "./SidebarItem";
 import variables from "@/assets/styles/variables.scss";
+import settings from "@/settings";
 
 export default {
+  data() {
+    return {
+      version: "",
+    };
+  },
   components: { SidebarItem, Logo },
   computed: {
     ...mapState(["settings"]),
@@ -70,6 +76,9 @@ export default {
       return !this.sidebar.opened;
     },
   },
+  created() {
+    this.version = settings.version;
+  },
 };
 </script>
 

@@ -37,5 +37,10 @@ module.exports = {
    * The default is only used in the production env
    * If you want to also use it in dev, you can pass ['production', 'development']
    */
-  errorLog: 'production'
+  errorLog: 'production',
+
+    /**
+   * 版本号
+   */
+     version:'version：0.5.3'
 }

@@ -9,10 +9,9 @@ axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8'
 const service = axios.create({
   // axios中请求配置有baseURL选项，表示请求URL公共部分
   //baseURL: process.env.VUE_APP_BASE_API,
-  //baseURL: 'http://192.168.1.45:8080',
-  baseURL: `http://47.103.140.98:9002`,
-  // baseURL: 'https://imacuat.zmd.apac.fedex.com/IMAC2',
-  // baseURL: 'http://192.168.1.134:18080',
+  baseURL: `http://47.103.140.98:9002`, //阿里云服务器
+  // baseURL: 'https://imacuat.zmd.apac.fedex.com/IMAC2', //uat服务器
+  // baseURL: 'http://192.168.1.134:18080', //测试服务器
 
   // 超时
   timeout: 30000

@@ -5,9 +5,9 @@ const mimeMap = {
   xlsx: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
   zip: 'application/zip'
 }
-// const  baseUrl = 'https://imacuat.zmd.apac.fedex.com/IMAC2'
-const baseUrl = 'http://47.103.140.98:9002'
-// const baseUrl = 'http://192.168.1.134:18080'
+// const  baseUrl = 'https://imacuat.zmd.apac.fedex.com/IMAC2' // uat服务器
+const baseUrl = 'http://47.103.140.98:9002' //阿里云服务器
+// const baseUrl = 'http://192.168.1.134:18080' //测试服务器
 export function downLoadZip(str, filename) {
   var url = baseUrl + str
   axios({

@@ -65,7 +65,7 @@
 
 
     <!-- 查看目的航班对话框 -->
-    <el-dialog title="实际配载航班" :visible.sync="openFlightDate" width="70%" :close-on-click-modal="false">
+    <el-dialog title="实际配载航班" :visible.sync="openFlightDate" width="70%" :close-on-click-modal="false" :append-to-body="true">
       <el-table v-loading="loadingFlightDate" :data="sourceFlightAndFlightDate">
 
         <el-table-column label="原航班" align="center" prop="sourceFlightNo" />
@@ -84,7 +84,7 @@
 
 
     <!-- 添加或修改对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="60%" :close-on-click-modal="false">
+    <el-dialog :title="title" :visible.sync="open" width="60%" :close-on-click-modal="false" :append-to-body="true">
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-row>
           <el-col :span="10">

-//version:0.5.1
+//version:0.5.3
 'use strict'
 const path = require('path')
 const defaultSettings = require('./src/settings.js')
@@ -35,10 +35,9 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        // target: `https://imacuat.zmd.apac.fedex.com/IMAC2`,
-        // target: `http://192.168.1.45:8080`,
-        target: `http://47.103.140.98:9002`,
-        //  target: `http://192.168.1.134:18080`,
+        // target: `https://imacuat.zmd.apac.fedex.com/IMAC2`, //uat服务器
+        target: `http://47.103.140.98:9002`, //阿里云服务器
+        //  target: `http://192.168.1.134:18080`, //测试服务器
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''