Fedex / imac-vue

Go to a project
Toggle navigation Toggle navigation pinning
jinhui.wang
9f1f20cd 1 parent b71027e9

弹框关闭时间逻辑修正，文本修正，bug修复

Inline Side-by-side
Showing 25 changed files with 84 additions and 87 deletions
...@@ -152,7 +152,7 @@ let tableHeaders = { ...@@ -152,7 +152,7 @@ let tableHeaders = {
152 status: 1 152 status: 1
153 }, 153 },
154 { 154 {
155 - columnChineseName: "subcategory", 155 + columnChineseName: "Subcategory",
156 columnName: "subCategory", 156 columnName: "subCategory",
157 columnWidth: "140", 157 columnWidth: "140",
158 ext1: "sorTable", 158 ext1: "sorTable",
...@@ -749,7 +749,7 @@ let tableHeaders = { ...@@ -749,7 +749,7 @@ let tableHeaders = {
749 status: 1 749 status: 1
750 }, 750 },
751 { 751 {
752 - columnChineseName: "subcategory", 752 + columnChineseName: "Subcategory",
753 columnName: "subCategory", 753 columnName: "subCategory",
754 columnWidth: "140", 754 columnWidth: "140",
755 ext1: "sorTable", 755 ext1: "sorTable",
...@@ -1814,7 +1814,7 @@ let tableHeaders = { ...@@ -1814,7 +1814,7 @@ let tableHeaders = {
1814 status: 1 1814 status: 1
1815 }, 1815 },
1816 { 1816 {
1817 - columnChineseName: "subcategory", 1817 + columnChineseName: "Subcategory",
1818 columnName: "subCategory", 1818 columnName: "subCategory",
1819 columnWidth: "120", 1819 columnWidth: "120",
1820 ext1: "", 1820 ext1: "",
...@@ -2005,7 +2005,7 @@ let tableHeaders = { ...@@ -2005,7 +2005,7 @@ let tableHeaders = {
2005 status: 1 2005 status: 1
2006 }, 2006 },
2007 { 2007 {
2008 - columnChineseName: "subcategory", 2008 + columnChineseName: "Subcategory",
2009 columnName: "subCategory", 2009 columnName: "subCategory",
2010 columnWidth: "120", 2010 columnWidth: "120",
2011 ext1: "", 2011 ext1: "",
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
4 @click="visibleOpen"> 4 @click="visibleOpen">
5 </el-button> 5 </el-button>
6 <el-dialog title="表格显示设置" :visible.sync="open" width="40%" :close-on-click-modal="false" :show-close="false" 6 <el-dialog title="表格显示设置" :visible.sync="open" width="40%" :close-on-click-modal="false" :show-close="false"
7 - append-to-body center> 7 + append-to-body center @close="close">
8 <div style="text-align: center"> 8 <div style="text-align: center">
9 <el-transfer style="text-align: left; display: inline-block" :data="transferData" 9 <el-transfer style="text-align: left; display: inline-block" :data="transferData"
10 :right-default-checked="rightDefaultChecked" v-model="transferValue" :titles="transferTitle" 10 :right-default-checked="rightDefaultChecked" v-model="transferValue" :titles="transferTitle"
......
1 <template> 1 <template>
2 <div class="component-upload-image"> 2 <div class="component-upload-image">
3 - <el-upload 3 + <el-upload :action="uploadImgUrl" list-type="picture-card" :on-success="handleUploadSuccess"
4 - :action="uploadImgUrl" 4 + :before-upload="handleBeforeUpload" :on-error="handleUploadError" name="file" :show-file-list="false"
5 - list-type="picture-card" 5 + :headers="headers" style="display: inline-block; vertical-align: top">
6 - :on-success="handleUploadSuccess"
7 - :before-upload="handleBeforeUpload"
8 - :on-error="handleUploadError"
9 - name="file"
10 - :show-file-list="false"
11 - :headers="headers"
12 - style="display: inline-block; vertical-align: top"
13 - >
14 <el-image v-if="!value" :src="value"> 6 <el-image v-if="!value" :src="value">
15 <div slot="error" class="image-slot"> 7 <div slot="error" class="image-slot">
16 <i class="el-icon-plus" /> 8 <i class="el-icon-plus" />
17 </div> 9 </div>
18 </el-image> 10 </el-image>
19 <div v-else class="image"> 11 <div v-else class="image">
20 - <el-image :src="value" :style="`width:150px;height:150px;`" fit="fill"/> 12 + <el-image :src="value" :style="`width:150px;height:150px;`" fit="fill" />
21 <div class="mask"> 13 <div class="mask">
22 <div class="actions"> 14 <div class="actions">
23 <span title="预览" @click.stop="dialogVisible = true"> 15 <span title="预览" @click.stop="dialogVisible = true">
...@@ -30,7 +22,7 @@ ...@@ -30,7 +22,7 @@
30 </div> 22 </div>
31 </div> 23 </div>
32 </el-upload> 24 </el-upload>
33 - <el-dialog :visible.sync="dialogVisible" title="预览" width="800" append-to-body> 25 + <el-dialog :visible.sync="dialogVisible" title="预览" width="800" append-to-body :close-on-press-escape="false">
34 <img :src="value" style="display: block; max-width: 100%; margin: 0 auto;"> 26 <img :src="value" style="display: block; max-width: 100%; margin: 0 auto;">
35 </el-dialog> 27 </el-dialog>
36 </div> 28 </div>
...@@ -45,7 +37,7 @@ export default { ...@@ -45,7 +37,7 @@ export default {
45 dialogVisible: false, 37 dialogVisible: false,
46 uploadImgUrl: process.env.VUE_APP_BASE_API + "/common/upload", // 上传的图片服务器地址 38 uploadImgUrl: process.env.VUE_APP_BASE_API + "/common/upload", // 上传的图片服务器地址
47 headers: { 39 headers: {
48 - Authorization: getToken(), 40 + Authorization: getToken(),
49 }, 41 },
50 }; 42 };
51 }, 43 },
...@@ -85,6 +77,7 @@ export default { ...@@ -85,6 +77,7 @@ export default {
85 <style scoped lang="scss"> 77 <style scoped lang="scss">
86 .image { 78 .image {
87 position: relative; 79 position: relative;
80 +
88 .mask { 81 .mask {
89 opacity: 0; 82 opacity: 0;
90 position: absolute; 83 position: absolute;
...@@ -93,6 +86,7 @@ export default { ...@@ -93,6 +86,7 @@ export default {
93 background-color: rgba(0, 0, 0, 0.5); 86 background-color: rgba(0, 0, 0, 0.5);
94 transition: all 0.3s; 87 transition: all 0.3s;
95 } 88 }
89 +
96 &:hover .mask { 90 &:hover .mask {
97 opacity: 1; 91 opacity: 1;
98 } 92 }
......
1 <template> 1 <template>
2 <div class="top-right-btn"> 2 <div class="top-right-btn">
3 <el-row> 3 <el-row>
4 - <el-tooltip 4 + <el-tooltip class="item" effect="dark" :content="showSearch ? '隐藏搜索' : '显示搜索'" placement="top">
5 - class="item" 5 + <el-button :size="size" circle icon="el-icon-search" @click="toggleSearch()" />
6 - effect="dark"
7 - :content="showSearch ? '隐藏搜索' : '显示搜索'"
8 - placement="top"
9 - >
10 - <el-button
11 - :size="size"
12 - circle
13 - icon="el-icon-search"
14 - @click="toggleSearch()"
15 - />
16 </el-tooltip> 6 </el-tooltip>
17 <el-tooltip class="item" effect="dark" content="刷新" placement="top"> 7 <el-tooltip class="item" effect="dark" content="刷新" placement="top">
18 - <el-button 8 + <el-button :size="size" circle icon="el-icon-refresh" @click="refresh()" />
19 - :size="size"
20 - circle
21 - icon="el-icon-refresh"
22 - @click="refresh()"
23 - />
24 </el-tooltip> 9 </el-tooltip>
25 - <el-tooltip 10 + <el-tooltip class="item" effect="dark" content="显隐列" placement="top" v-if="columns">
26 - class="item" 11 + <el-button :size="size" circle icon="el-icon-menu" @click="showColumn()" />
27 - effect="dark"
28 - content="显隐列"
29 - placement="top"
30 - v-if="columns"
31 - >
32 - <el-button
33 - :size="size"
34 - circle
35 - icon="el-icon-menu"
36 - @click="showColumn()"
37 - />
38 </el-tooltip> 12 </el-tooltip>
39 </el-row> 13 </el-row>
40 - <el-dialog :title="title" :visible.sync="open" append-to-body> 14 + <el-dialog :title="title" :visible.sync="open" append-to-body :close-on-press-escape="false">
41 - <el-transfer 15 + <el-transfer :titles="['显示', '隐藏']" v-model="value" :data="columns" @change="dataChange"></el-transfer>
42 - :titles="['显示', '隐藏']"
43 - v-model="value"
44 - :data="columns"
45 - @change="dataChange"
46 - ></el-transfer>
47 </el-dialog> 16 </el-dialog>
48 </div> 17 </div>
49 </template> 18 </template>
...@@ -111,6 +80,7 @@ export default { ...@@ -111,6 +80,7 @@ export default {
111 display: block; 80 display: block;
112 margin-left: 0px; 81 margin-left: 0px;
113 } 82 }
83 +
114 ::v-deep .el-transfer__button:first-child { 84 ::v-deep .el-transfer__button:first-child {
115 margin-bottom: 10px; 85 margin-bottom: 10px;
116 } 86 }
......
...@@ -10,10 +10,10 @@ axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8' ...@@ -10,10 +10,10 @@ axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8'
10 const service = axios.create({ 10 const service = axios.create({
11 // axios中请求配置有baseURL选项，表示请求URL公共部分 11 // axios中请求配置有baseURL选项，表示请求URL公共部分
12 baseURL: settings.baseURL, 12 baseURL: settings.baseURL,
13 -
14 // 超时 13 // 超时
15 timeout: 30000, 14 timeout: 30000,
16 }) 15 })
16 +
17 // request拦截器 17 // request拦截器
18 service.interceptors.request.use(config => { 18 service.interceptors.request.use(config => {
19 // 是否需要设置 token 19 // 是否需要设置 token
...@@ -66,7 +66,7 @@ service.interceptors.response.use(res => { ...@@ -66,7 +66,7 @@ service.interceptors.response.use(res => {
66 ).then(() => { 66 ).then(() => {
67 store.dispatch('LogOut').then(() => { 67 store.dispatch('LogOut').then(() => {
68 // location.href = '/'; 68 // location.href = '/';
69 - window.location.href = settings.logoutURL;//wsso系统跳转 69 + window.location.href = settings.loginURL;//wsso系统跳转
70 }) 70 })
71 }); 71 });
72 } else if (code === 403) { 72 } else if (code === 403) {
......
1 <template> 1 <template>
2 <div> 2 <div>
3 <el-dialog title="货物配舱" width="80%" top="5vh" :visible.sync="dialogVisible" :close-on-click-modal="false" 3 <el-dialog title="货物配舱" width="80%" top="5vh" :visible.sync="dialogVisible" :close-on-click-modal="false"
4 - :show-close="false" :append-to-body="true"> 4 + :show-close="false" :append-to-body="true" @close="dialogBeforeClose">
5 <el-divider content-position="left">已选货物信息</el-divider> 5 <el-divider content-position="left">已选货物信息</el-divider>
6 <el-table :data="tableData" size="mini" height="200" max-height="200" border stripe highlight-current-row 6 <el-table :data="tableData" size="mini" height="200" max-height="200" border stripe highlight-current-row
7 style="width: 100%"> 7 style="width: 100%">
......
1 <template> 1 <template>
2 <div> 2 <div>
3 <el-dialog title="航线优先级排序" :visible.sync="open" width="25%" :close-on-click-modal="false" :show-close="false" 3 <el-dialog title="航线优先级排序" :visible.sync="open" width="25%" :close-on-click-modal="false" :show-close="false"
4 - append-to-body center> 4 + @close="close" append-to-body center>
5 <el-form ref="routeOrder" label-width="auto" label-position="left" size="small" @submit.native.prevent> 5 <el-form ref="routeOrder" label-width="auto" label-position="left" size="small" @submit.native.prevent>
6 <el-form-item label="航班号:" prop="fltNo"> 6 <el-form-item label="航班号:" prop="fltNo">
7 <span>{{ fltNo }}</span> 7 <span>{{ fltNo }}</span>
......
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
55 </Tables> 55 </Tables>
56 <!-- 查看目的航班对话框 --> 56 <!-- 查看目的航班对话框 -->
57 <el-dialog title="实际配载航班" :visible.sync="openFlightDate" width="70%" :close-on-click-modal="false" 57 <el-dialog title="实际配载航班" :visible.sync="openFlightDate" width="70%" :close-on-click-modal="false"
58 - :show-close="false" :append-to-body="true"> 58 + :show-close="false" :append-to-body="true" @close="cancelFlightDate">
59 <el-table v-loading="loadingFlightDate" :data="sourceFlightAndFlightDate"> 59 <el-table v-loading="loadingFlightDate" :data="sourceFlightAndFlightDate">
60 <el-table-column type="index" label="序号" align="center"> 60 <el-table-column type="index" label="序号" align="center">
61 <template slot-scope="scope">{{ scope.$index + 1 }}</template> 61 <template slot-scope="scope">{{ scope.$index + 1 }}</template>
...@@ -78,7 +78,7 @@ ...@@ -78,7 +78,7 @@
78 </el-dialog> 78 </el-dialog>
79 <!-- 添加或修改对话框 --> 79 <!-- 添加或修改对话框 -->
80 <el-dialog :title="title" :visible.sync="open" width="55%" :append-to-body="true" :close-on-click-modal="false" 80 <el-dialog :title="title" :visible.sync="open" width="55%" :append-to-body="true" :close-on-click-modal="false"
81 - :show-close="false"> 81 + :show-close="false" @close="cancel">
82 <el-form ref="form" :model="form" :rules="rules" label-position="right" label-width="auto" size="small"> 82 <el-form ref="form" :model="form" :rules="rules" label-position="right" label-width="auto" size="small">
83 <el-row> 83 <el-row>
84 <el-col :span="8"> 84 <el-col :span="8">
......
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
41 layout="total,prev, pager, next, jumper, ->" @tableSelect="tableSelection" @tableSelectAll="tableSelectAll"> 41 layout="total,prev, pager, next, jumper, ->" @tableSelect="tableSelection" @tableSelectAll="tableSelectAll">
42 </Tables> 42 </Tables>
43 <el-dialog title="新增预审航班" width="20%" :visible.sync="dialogVisible" :close-on-click-modal="false" 43 <el-dialog title="新增预审航班" width="20%" :visible.sync="dialogVisible" :close-on-click-modal="false"
44 - :show-close="false" :append-to-body="true"> 44 + :show-close="false" :append-to-body="true" @close="close">
45 <el-form ref="addForm" :model="newPre" label-width="auto" label-position="left" size="small" :rules="rules" 45 <el-form ref="addForm" :model="newPre" label-width="auto" label-position="left" size="small" :rules="rules"
46 @submit.native.prevent> 46 @submit.native.prevent>
47 <el-form-item label="航班号" prop="addFlitNo"> 47 <el-form-item label="航班号" prop="addFlitNo">
...@@ -230,4 +230,5 @@ export default { ...@@ -230,4 +230,5 @@ export default {
230 }; 230 };
231 </script> 231 </script>
232 <style rel="stylesheet/scss" lang="scss"> 232 <style rel="stylesheet/scss" lang="scss">
233 +
233 </style> 234 </style>
......
...@@ -68,10 +68,10 @@ ...@@ -68,10 +68,10 @@
68 <el-button class="mt10" type="primary" icon="el-icon-circle-close" size="mini" :disabled="ids.length == 0" 68 <el-button class="mt10" type="primary" icon="el-icon-circle-close" size="mini" :disabled="ids.length == 0"
69 @click="whiteListSwitchStatus(0)" v-hasPermi="['base:flightInfo:whiteClose']">白名单自动配舱关闭 69 @click="whiteListSwitchStatus(0)" v-hasPermi="['base:flightInfo:whiteClose']">白名单自动配舱关闭
70 </el-button> 70 </el-button>
71 - <el-button class="mt10" type="primary" icon="el-icon-circle-check" size="mini" :disabled="ids.length == 0" 71 + <el-button class="mt10" type="primary" icon="el-icon-circle-check" size="mini" :disabled="ids.length == 0"
72 @click="BlackListSwitchStatus(1)">黑名单自动配舱开启 72 @click="BlackListSwitchStatus(1)">黑名单自动配舱开启
73 </el-button> 73 </el-button>
74 - <el-button class="mt10" type="primary" icon="el-icon-circle-close" size="mini" :disabled="ids.length == 0" 74 + <el-button class="mt10" type="primary" icon="el-icon-circle-close" size="mini" :disabled="ids.length == 0"
75 @click="BlackListSwitchStatus(0)">黑名单自动配舱关闭 75 @click="BlackListSwitchStatus(0)">黑名单自动配舱关闭
76 </el-button> 76 </el-button>
77 <el-button class="mt10" type="danger" icon="el-icon-delete" size="mini" :disabled="ids.length == 0" 77 <el-button class="mt10" type="danger" icon="el-icon-delete" size="mini" :disabled="ids.length == 0"
...@@ -97,7 +97,7 @@ ...@@ -97,7 +97,7 @@
97 </Tables> 97 </Tables>
98 <!-- 添加或修改对话框 --> 98 <!-- 添加或修改对话框 -->
99 <el-dialog :title="title" :visible.sync="open" width="60%" :close-on-click-modal="false" :append-to-body="true" 99 <el-dialog :title="title" :visible.sync="open" width="60%" :close-on-click-modal="false" :append-to-body="true"
100 - :show-close="false"> 100 + :show-close="false" @close="cancel">
101 <el-form ref="form" :model="form" :rules="rules" label-position="right" label-width="auto" size="small"> 101 <el-form ref="form" :model="form" :rules="rules" label-position="right" label-width="auto" size="small">
102 <el-row> 102 <el-row>
103 <el-col :span="12"> 103 <el-col :span="12">
...@@ -273,7 +273,7 @@ ...@@ -273,7 +273,7 @@
273 </div> 273 </div>
274 </el-dialog> 274 </el-dialog>
275 <el-dialog title="未删除成功航班" width="40%" center :visible.sync="dialogTableVisible" :close-on-click-modal="false" 275 <el-dialog title="未删除成功航班" width="40%" center :visible.sync="dialogTableVisible" :close-on-click-modal="false"
276 - :append-to-body="true"> 276 + :append-to-body="true" :close-on-press-escape="false">
277 <el-table :data="gridData"> 277 <el-table :data="gridData">
278 <el-table-column property="fltNo" label="航班号"></el-table-column> 278 <el-table-column property="fltNo" label="航班号"></el-table-column>
279 <el-table-column property="fltDate" label="航班日期"></el-table-column> 279 <el-table-column property="fltDate" label="航班日期"></el-table-column>
......
1 <template> 1 <template>
2 <div> 2 <div>
3 <el-dialog :title="openStatus == 'add' ? '新 增' : openStatus == 'downloadExcel' ? '导出Excel' : '导入Excel'" 3 <el-dialog :title="openStatus == 'add' ? '新 增' : openStatus == 'downloadExcel' ? '导出Excel' : '导入Excel'"
4 - :visible.sync="open" width="25%" :close-on-click-modal="false" :show-close="false" append-to-body center> 4 + :visible.sync="open" width="25%" :close-on-click-modal="false" :show-close="false" append-to-body center
5 + @close="close">
5 <el-form class="form-header" :model="formData" size="small" ref="addForm" label-width="auto" 6 <el-form class="form-header" :model="formData" size="small" ref="addForm" label-width="auto"
6 label-position="left" style="margin-bottom:10px" :rules="rules" @submit.native.prevent> 7 label-position="left" style="margin-bottom:10px" :rules="rules" @submit.native.prevent>
7 <div v-if="openStatus == 'add'"> 8 <div v-if="openStatus == 'add'">
......
1 <template> 1 <template>
2 <div> 2 <div>
3 <el-dialog :title="openStatus == 'add' ? '新 增' : openStatus == 'downloadExcel' ? '导出Excel' : '导入Excel'" 3 <el-dialog :title="openStatus == 'add' ? '新 增' : openStatus == 'downloadExcel' ? '导出Excel' : '导入Excel'"
4 - :visible.sync="open" width="25%" :close-on-click-modal="false" :show-close="false" append-to-body center> 4 + :visible.sync="open" width="25%" :close-on-click-modal="false" :show-close="false" append-to-body center
5 + @close="close">
5 <el-form class="form-header" :model="formData" size="small" ref="addForm" label-width="auto" 6 <el-form class="form-header" :model="formData" size="small" ref="addForm" label-width="auto"
6 label-position="left" style="margin-bottom:10px" :rules="rules" @submit.native.prevent> 7 label-position="left" style="margin-bottom:10px" :rules="rules" @submit.native.prevent>
7 <div v-if="openStatus == 'add'"> 8 <div v-if="openStatus == 'add'">
......
1 <template> 1 <template>
2 <div> 2 <div>
3 <el-dialog title="新 增" :visible.sync="open" width="25%" :close-on-click-modal="false" :show-close="false" 3 <el-dialog title="新 增" :visible.sync="open" width="25%" :close-on-click-modal="false" :show-close="false"
4 - append-to-body center> 4 + append-to-body center @close="close">
5 <el-form class="form-header" :model="formData" size="small" ref="addForm" label-width="auto" 5 <el-form class="form-header" :model="formData" size="small" ref="addForm" label-width="auto"
6 label-position="left" style="margin-bottom:10px" :rules="rules" @submit.native.prevent> 6 label-position="left" style="margin-bottom:10px" :rules="rules" @submit.native.prevent>
7 <el-form-item label="货站名称" prop="goodsStation"> 7 <el-form-item label="货站名称" prop="goodsStation">
......
1 <template> 1 <template>
2 <div> 2 <div>
3 <el-dialog title="查看日志" width="80%" :visible.sync="dialogVisible" :close-on-click-modal="false" 3 <el-dialog title="查看日志" width="80%" :visible.sync="dialogVisible" :close-on-click-modal="false"
4 - :show-close="false" :append-to-body="true" top="2vh"> 4 + :show-close="false" :append-to-body="true" top="2vh" @close="close">
5 <el-form class="form-header" label-position="right" label-width="auto" size="small"> 5 <el-form class="form-header" label-position="right" label-width="auto" size="small">
6 <el-row> 6 <el-row>
7 <el-col :span="4"> 7 <el-col :span="4">
8 <el-form-item label="运单号"> 8 <el-form-item label="运单号">
9 - <span>{{ data.waybillNo }}</span> 9 + <span>{{ data.waybillNo }}</span>
10 </el-form-item> 10 </el-form-item>
11 </el-col> 11 </el-col>
12 <el-col :span="4"> 12 <el-col :span="4">
13 <el-form-item label="ACCSID"> 13 <el-form-item label="ACCSID">
14 - <span>{{ data.accsId }}</span> 14 + <span>{{ data.accsId }}</span>
15 </el-form-item> 15 </el-form-item>
16 </el-col> 16 </el-col>
17 </el-row> 17 </el-row>
...@@ -93,4 +93,5 @@ export default { ...@@ -93,4 +93,5 @@ export default {
93 </script> 93 </script>
94 94
95 <style scoped> 95 <style scoped>
96 +
96 </style> 97 </style>
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -217,7 +217,7 @@ ...@@ -217,7 +217,7 @@
217 </template> 217 </template>
218 </Tables> 218 </Tables>
219 <el-dialog title="舱位释放结果" width="80%" :visible.sync="dialogVisible" :close-on-click-modal="false" 219 <el-dialog title="舱位释放结果" width="80%" :visible.sync="dialogVisible" :close-on-click-modal="false"
220 - :show-close="false" :append-to-body="true"> 220 + :show-close="false" :append-to-body="true" @close="close">
221 <el-table :data="selectTable" size="mini" border stripe highlight-current-row style="width: 100%"> 221 <el-table :data="selectTable" size="mini" border stripe highlight-current-row style="width: 100%">
222 <el-table-column type="index" label="序号" align="center"> 222 <el-table-column type="index" label="序号" align="center">
223 </el-table-column> 223 </el-table-column>
......
1 <template> 1 <template>
2 <div> 2 <div>
3 <el-dialog title="货物配舱" width="80%" :visible.sync="dialogVisible" :close-on-click-modal="false" :show-close="false" 3 <el-dialog title="货物配舱" width="80%" :visible.sync="dialogVisible" :close-on-click-modal="false" :show-close="false"
4 - :append-to-body="true"> 4 + :append-to-body="true" @close="dialogBeforeClose">
5 <el-divider content-position="left">已选货物信息</el-divider> 5 <el-divider content-position="left">已选货物信息</el-divider>
6 <el-table :data="tableData" size="mini" height="200" max-height="200" border stripe highlight-current-row 6 <el-table :data="tableData" size="mini" height="200" max-height="200" border stripe highlight-current-row
7 style="width: 100%"> 7 style="width: 100%">
......
...@@ -63,6 +63,7 @@ import { ...@@ -63,6 +63,7 @@ import {
63 importFlightDestination, 63 importFlightDestination,
64 searchFlightDestination 64 searchFlightDestination
65 } from "@/api/preMdeConfig"; 65 } from "@/api/preMdeConfig";
66 +import settings from "@/settings"
66 67
67 export default { 68 export default {
68 name: "FlightToArea", 69 name: "FlightToArea",
...@@ -164,6 +165,17 @@ export default { ...@@ -164,6 +165,17 @@ export default {
164 this.msgWarning(res.data.msg); 165 this.msgWarning(res.data.msg);
165 this.errorData = res.data.data; 166 this.errorData = res.data.data;
166 this.$router.push({ name: 'UpDateResult', params: { data: this.errorData, from: 'FlightToArea' } }) 167 this.$router.push({ name: 'UpDateResult', params: { data: this.errorData, from: 'FlightToArea' } })
168 + } else if (res.data.code === 301) {
169 + this.$confirm('登录状态已过期，需重新登录', '系统提示', {
170 + closeOnClickModal: false,
171 + showCancelButton: false,
172 + confirmButtonText: '重新登录',
173 + type: 'warning'
174 + }).then(
175 + this.$store.dispatch('LogOut').then(() => {
176 + window.location.href = settings.loginURL;//wsso系统跳转
177 + })
178 + )
167 } else { 179 } else {
168 this.msgWarning(res.data.msg); 180 this.msgWarning(res.data.msg);
169 } 181 }
......
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
39 </el-form-item> 39 </el-form-item>
40 </el-col> 40 </el-col>
41 <el-col :span="5"> 41 <el-col :span="5">
42 - <el-form-item label="service type"> 42 + <el-form-item label="Service Type">
43 <el-select v-model="formData.serviceTypeArray" class="formItem" filterable multiple clearable 43 <el-select v-model="formData.serviceTypeArray" class="formItem" filterable multiple clearable
44 placeholder="不限"> 44 placeholder="不限">
45 <el-option v-for="item in selectOptionList.serviceType" :label="item.chineseName" 45 <el-option v-for="item in selectOptionList.serviceType" :label="item.chineseName"
...@@ -61,7 +61,7 @@ ...@@ -61,7 +61,7 @@
61 <el-radio label="region">区域</el-radio> 61 <el-radio label="region">区域</el-radio>
62 <el-radio label="area">地区</el-radio> 62 <el-radio label="area">地区</el-radio>
63 <el-radio label="ursa">URSA</el-radio> 63 <el-radio label="ursa">URSA</el-radio>
64 - <el-radio label="serviceType">service type</el-radio> 64 + <el-radio label="serviceType">Service Type</el-radio>
65 </el-radio-group> 65 </el-radio-group>
66 </el-form-item> 66 </el-form-item>
67 </el-form> 67 </el-form>
......
...@@ -65,6 +65,7 @@ import { ...@@ -65,6 +65,7 @@ import {
65 importUrsaDestination, 65 importUrsaDestination,
66 searchUrsaDestination 66 searchUrsaDestination
67 } from "@/api/preMdeConfig"; 67 } from "@/api/preMdeConfig";
68 +import settings from "@/settings"
68 69
69 export default { 70 export default {
70 name: "UrsaToArea", 71 name: "UrsaToArea",
...@@ -171,6 +172,17 @@ export default { ...@@ -171,6 +172,17 @@ export default {
171 this.msgWarning(res.data.msg); 172 this.msgWarning(res.data.msg);
172 this.errorData = res.data.data; 173 this.errorData = res.data.data;
173 this.$router.push({ name: 'UpDateResult', params: { data: this.errorData, from: 'FlightInformationImport' } }) 174 this.$router.push({ name: 'UpDateResult', params: { data: this.errorData, from: 'FlightInformationImport' } })
175 + } else if (res.data.code === 301) {
176 + this.$confirm('登录状态已过期，需重新登录', '系统提示', {
177 + closeOnClickModal: false,
178 + showCancelButton: false,
179 + confirmButtonText: '重新登录',
180 + type: 'warning'
181 + }).then(
182 + this.$store.dispatch('LogOut').then(() => {
183 + window.location.href = settings.loginURL;//wsso系统跳转
184 + })
185 + )
174 } else { 186 } else {
175 this.msgWarning(res.data.msg); 187 this.msgWarning(res.data.msg);
176 } 188 }
......
1 <template> 1 <template>
2 <div> 2 <div>
3 <el-dialog :title="title" :visible.sync="open" width="25%" :close-on-click-modal="false" :show-close="false" 3 <el-dialog :title="title" :visible.sync="open" width="25%" :close-on-click-modal="false" :show-close="false"
4 - append-to-body center> 4 + @close="close" append-to-body center>
5 <el-form ref="add" :model="newDictionary" label-width="auto" label-position="left" size="small" 5 <el-form ref="add" :model="newDictionary" label-width="auto" label-position="left" size="small"
6 :rules="rules" @submit.native.prevent> 6 :rules="rules" @submit.native.prevent>
7 <!-- 新增虚拟航班 --> 7 <!-- 新增虚拟航班 -->
......
1 <template> 1 <template>
2 <div class="menuDrawer"> 2 <div class="menuDrawer">
3 - <el-dialog :title="drawerTitle" width="50%" :visible.sync="dialogVisible" :close-on-click-modal="false" :show-close="false" 3 + <el-dialog :title="drawerTitle" width="50%" :visible.sync="dialogVisible" :close-on-click-modal="false"
4 - :append-to-body="true"> 4 + :show-close="false" :append-to-body="true" @close="handleClose">
5 <el-form ref="userForm" :model="menuForm" :disabled="menuFormDisabled" :rules="rules" label-width="auto" 5 <el-form ref="userForm" :model="menuForm" :disabled="menuFormDisabled" :rules="rules" label-width="auto"
6 style="margin: 10px"> 6 style="margin: 10px">
7 <el-row> 7 <el-row>
...@@ -125,4 +125,5 @@ export default { ...@@ -125,4 +125,5 @@ export default {
125 </script> 125 </script>
126 126
127 <style> 127 <style>
128 +
128 </style> 129 </style>
...\ No newline at end of file ...\ No newline at end of file
......
1 <template> 1 <template>
2 <div class="roleDrawer"> 2 <div class="roleDrawer">
3 <el-drawer :title="drawerTitle" :visible.sync="drawer" direction="rtl" size="40%" destroy-on-close 3 <el-drawer :title="drawerTitle" :visible.sync="drawer" direction="rtl" size="40%" destroy-on-close
4 - :close-on-click-modal="false" :wrapperClosable="false" :show-close="false"> 4 + :close-on-click-modal="false" :wrapperClosable="false" :show-close="false" @close="handleClose">
5 <el-form ref="roleForm" :model="roleForm" label-width="auto" :rules="rules" size="mini" style="margin: 10px" 5 <el-form ref="roleForm" :model="roleForm" label-width="auto" :rules="rules" size="mini" style="margin: 10px"
6 @submit.native.prevent> 6 @submit.native.prevent>
7 <el-row :gutter="10"> 7 <el-row :gutter="10">
...@@ -176,4 +176,5 @@ export default { ...@@ -176,4 +176,5 @@ export default {
176 </script> 176 </script>
177 177
178 <style> 178 <style>
179 +
179 </style> 180 </style>
...\ No newline at end of file ...\ No newline at end of file
......
1 <template> 1 <template>
2 <div> 2 <div>
3 <el-dialog :title="title" :visible.sync="dialogVisible" width="60%" top="8vh" :before-close="close" 3 <el-dialog :title="title" :visible.sync="dialogVisible" width="60%" top="8vh" :before-close="close"
4 - append-to-body :close-on-click-modal="false" @submit.native.prevent> 4 + append-to-body :close-on-click-modal="false" @submit.native.prevent @close="close">
5 <el-form class="form-header" ref="superAllocationForm" :model="formData" label-width="auto" 5 <el-form class="form-header" ref="superAllocationForm" :model="formData" label-width="auto"
6 label-position="left" style="margin-bottom:10px" @submit.native.prevent size="small" :rules="rules"> 6 label-position="left" style="margin-bottom:10px" @submit.native.prevent size="small" :rules="rules">
7 <el-row> 7 <el-row>
......
1 <template> 1 <template>
2 <div class="userDrawer"> 2 <div class="userDrawer">
3 <el-drawer :title="drawerTitle" :visible.sync="drawer" direction="rtl" size="40%" :close-on-click-modal="false" 3 <el-drawer :title="drawerTitle" :visible.sync="drawer" direction="rtl" size="40%" :close-on-click-modal="false"
4 - :wrapperClosable="false" :show-close="false"> 4 + :wrapperClosable="false" :show-close="false" @close="handleClose">
5 <el-form ref="userForm" :model="userForm" label-width="auto" :rules="rules" style="margin: 10px" 5 <el-form ref="userForm" :model="userForm" label-width="auto" :rules="rules" style="margin: 10px"
6 @submit.native.prevent> 6 @submit.native.prevent>
7 <el-row :gutter="10"> 7 <el-row :gutter="10">
...@@ -244,7 +244,7 @@ export default { ...@@ -244,7 +244,7 @@ export default {
244 roleIds: [], 244 roleIds: [],
245 }; 245 };
246 this.clearValidate('userForm') 246 this.clearValidate('userForm')
247 - this.$emit("handleClose", false); 247 + this.$emit("handleClose");
248 }, 248 },
249 //提交 249 //提交
250 submit() { 250 submit() {
...@@ -276,4 +276,5 @@ export default { ...@@ -276,4 +276,5 @@ export default {
276 </script> 276 </script>
277 277
278 <style> 278 <style>
279 +
279 </style> 280 </style>
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -41,7 +41,8 @@ ...@@ -41,7 +41,8 @@
41 >修改密码</el-button 41 >修改密码</el-button
42 > --> 42 > -->
43 <el-button :type="scope.row.isValid == 1 ? 'warning' : 'primary'" size="mini" 43 <el-button :type="scope.row.isValid == 1 ? 'warning' : 'primary'" size="mini"
44 - v-hasPermi="['system:user:openClose']" @click="userStatus(scope)">{{ scope.row.isValid == 1 ? "停用" : "启用" 44 + v-hasPermi="['system:user:openClose']" @click="userStatus(scope)">{{
45 + scope.row.isValid == 1 ? "停用" : "启用"
45 }}</el-button> 46 }}</el-button>
46 <el-button type="danger" size="mini" @click="removeUser(scope)" v-hasPermi="['system:user:delete']">删除用户 47 <el-button type="danger" size="mini" @click="removeUser(scope)" v-hasPermi="['system:user:delete']">删除用户
47 </el-button> 48 </el-button>
...@@ -236,7 +237,7 @@ export default { ...@@ -236,7 +237,7 @@ export default {
236 .catch(() => { }); 237 .catch(() => { });
237 }, 238 },
238 handleClose(val) { 239 handleClose(val) {
239 - this.drawer = val; 240 + this.drawer = false;
240 this.userData = {}; 241 this.userData = {};
241 this.selectUser(); 242 this.selectUser();
242 }, 243 },
...@@ -253,4 +254,5 @@ export default { ...@@ -253,4 +254,5 @@ export default {
253 </script> 254 </script>
254 255
255 <style> 256 <style>
257 +
256 </style> 258 </style>
...\ No newline at end of file ...\ No newline at end of file
......