Fedex / imac-vue

Go to a project
Toggle navigation Toggle navigation pinning
jinhui.wang
711c82b9 1 parent 5e4dea0a

通用方法合并，样式修正

Inline Side-by-side
Showing 21 changed files with 203 additions and 410 deletions
...@@ -193,8 +193,8 @@ aside { ...@@ -193,8 +193,8 @@ aside {
193 193
194 .el-table__body-wrapper { 194 .el-table__body-wrapper {
195 &::-webkit-scrollbar { 195 &::-webkit-scrollbar {
196 - height: 10px; 196 + height: 7px;
197 - width: 10px; 197 + width: 7px;
198 } 198 }
199 199
200 &::-webkit-scrollbar-track { 200 &::-webkit-scrollbar-track {
...@@ -210,6 +210,13 @@ aside { ...@@ -210,6 +210,13 @@ aside {
210 } 210 }
211 } 211 }
212 212
213 +.el-scrollbar__wrap {
214 + &::-webkit-scrollbar {
215 + height: 0px;
216 + width: 0px;
217 + }
218 +}
219 +
213 // 解决表格固定列问题 220 // 解决表格固定列问题
214 .el-table__fixed, 221 .el-table__fixed,
215 .el-table__fixed-right { 222 .el-table__fixed-right {
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
9 <!-- 多选框 --> 9 <!-- 多选框 -->
10 <el-table-column v-if="selection" type="selection" width="50" align="center" :fixed="true"></el-table-column> 10 <el-table-column v-if="selection" type="selection" width="50" align="center" :fixed="true"></el-table-column>
11 <!-- 序号 --> 11 <!-- 序号 -->
12 - <el-table-column type="index" width="50" align="center" :index="indexAdd"></el-table-column> 12 + <el-table-column v-if="order" type="index" width="50" align="center" :index="indexAdd"></el-table-column>
13 <template v-for="(item, index) in headerData"> 13 <template v-for="(item, index) in headerData">
14 <!-- 自定义插槽 --> 14 <!-- 自定义插槽 -->
15 <el-table-column v-if="item.slot" :prop="item.value" :label="item.name" :width="item.width" :align="item.align" 15 <el-table-column v-if="item.slot" :prop="item.value" :label="item.name" :width="item.width" :align="item.align"
...@@ -21,6 +21,17 @@ ...@@ -21,6 +21,17 @@
21 <slot :name="item.value" :row="scope.row"></slot> 21 <slot :name="item.value" :row="scope.row"></slot>
22 </template> 22 </template>
23 </el-table-column> 23 </el-table-column>
24 + <!-- 隐藏行 -->
25 + <el-table-column v-else-if="item.expand" type="expand" :prop="item.value" :label="item.name" :index="item.index"
26 + :width="item.width" :align="item.align" :fixed="item.fixed ? item.fixed : false"
27 + :sortable="item.sorTable ? true : false" :column-key="index.toString()"
28 + :show-overflow-tooltip="showOverflowTooltip" header-align="center"
29 + :sort-orders="['descending', 'ascending', null]" :slotHeader="slotHeader" :render-header="renderHeader"
30 + :formatter="formatter" :key="index">
31 + <template slot-scope="scope">
32 + <slot :name="item.value" :row="scope.row"></slot>
33 + </template>
34 + </el-table-column>
24 <!-- 默认数据 --> 35 <!-- 默认数据 -->
25 <el-table-column v-else :prop="item.value" :label="item.name" :index="item.index" :width="item.width" 36 <el-table-column v-else :prop="item.value" :label="item.name" :index="item.index" :width="item.width"
26 :align="item.align" :fixed="item.fixed ? item.fixed : false" :sortable="item.sorTable ? true : false" 37 :align="item.align" :fixed="item.fixed ? item.fixed : false" :sortable="item.sorTable ? true : false"
...@@ -169,7 +180,19 @@ export default { ...@@ -169,7 +180,19 @@ export default {
169 }, 180 },
170 layout: { 181 layout: {
171 type: String, 182 type: String,
172 - default: 'prev, pager, next, jumper, ->, sizes, total' 183 + default: 'total,prev, pager, next, jumper, ->, sizes'
184 + },
185 + // treeProps: {
186 + // type: Object,
187 + // default: { children: 'children', hasChildren: 'hasChildren' }
188 + // },
189 + order: {
190 + type: Boolean,
191 + default: true
192 + },
193 + expand: {
194 + type: Boolean,
195 + default: false
173 } 196 }
174 }, 197 },
175 inheritAttrs: false, 198 inheritAttrs: false,
...@@ -192,7 +215,6 @@ export default { ...@@ -192,7 +215,6 @@ export default {
192 // width: "", 215 // width: "",
193 // align: "center", 216 // align: "center",
194 // sorTable: false, 217 // sorTable: false,
195 - // fixed:false,
196 // }, 218 // },
197 }; 219 };
198 }, 220 },
...@@ -353,6 +375,10 @@ export default { ...@@ -353,6 +375,10 @@ export default {
353 cellClassName({ column, columnIndex }) { 375 cellClassName({ column, columnIndex }) {
354 return columnIndex - 1 === this.dragState.start ? `darg_start` : ""; 376 return columnIndex - 1 === this.dragState.start ? `darg_start` : "";
355 }, 377 },
378 + //无限滚动
379 + infiniteScroll() {
380 +
381 + },
356 //数据格式化 382 //数据格式化
357 formatter(row, column, cellValue, index) { 383 formatter(row, column, cellValue, index) {
358 if (dictLabels[this.ductName]) { 384 if (dictLabels[this.ductName]) {
......
...@@ -15,17 +15,13 @@ import i18n from './i18n/index' ...@@ -15,17 +15,13 @@ import i18n from './i18n/index'
15 15
16 import './assets/icons' // icon 16 import './assets/icons' // icon
17 import './permission' // permission control 17 import './permission' // permission control
18 -//import { getDicts } from "@/api/system/dict/data"; 18 +import { parseTime, resetForm, addDateRange, selectDictLabel, selectDictLabels, download, handleTree, upCase, nowDate } from "@/utils/FedEx";
19 -//import { getConfigKey } from "@/api/system/config";
20 -import { parseTime, resetForm, addDateRange, selectDictLabel, selectDictLabels, download, handleTree } from "@/utils/FedEx";
21 import Pagination from "@/components/Pagination"; 19 import Pagination from "@/components/Pagination";
22 // 自定义表格工具扩展 20 // 自定义表格工具扩展
23 import RightToolbar from "@/components/RightToolbar" 21 import RightToolbar from "@/components/RightToolbar"
24 import Table from "@/components/Table" 22 import Table from "@/components/Table"
25 23
26 // 全局方法挂载 24 // 全局方法挂载
27 -//Vue.prototype.getDicts = getDicts
28 -//Vue.prototype.getConfigKey = getConfigKey
29 Vue.prototype.parseTime = parseTime 25 Vue.prototype.parseTime = parseTime
30 Vue.prototype.resetForm = resetForm 26 Vue.prototype.resetForm = resetForm
31 Vue.prototype.addDateRange = addDateRange 27 Vue.prototype.addDateRange = addDateRange
...@@ -33,11 +29,17 @@ Vue.prototype.selectDictLabel = selectDictLabel ...@@ -33,11 +29,17 @@ Vue.prototype.selectDictLabel = selectDictLabel
33 Vue.prototype.selectDictLabels = selectDictLabels 29 Vue.prototype.selectDictLabels = selectDictLabels
34 Vue.prototype.download = download 30 Vue.prototype.download = download
35 Vue.prototype.handleTree = handleTree 31 Vue.prototype.handleTree = handleTree
32 +Vue.prototype.upCase = upCase
33 +Vue.prototype.nowDate = nowDate
36 34
37 Vue.prototype.msgSuccess = function (msg) { 35 Vue.prototype.msgSuccess = function (msg) {
38 this.$message({ showClose: true, message: msg, type: "success" }); 36 this.$message({ showClose: true, message: msg, type: "success" });
39 } 37 }
40 38
39 +Vue.prototype.msgWarning = function (msg) {
40 + this.$message({ showClose: true, message: msg, type: "warning" });
41 +}
42 +
41 Vue.prototype.msgError = function (msg) { 43 Vue.prototype.msgError = function (msg) {
42 this.$message({ showClose: true, message: msg, type: "error" }); 44 this.$message({ showClose: true, message: msg, type: "error" });
43 } 45 }
...@@ -49,7 +51,7 @@ Vue.prototype.msgInfo = function (msg) { ...@@ -49,7 +51,7 @@ Vue.prototype.msgInfo = function (msg) {
49 // 全局组件挂载 51 // 全局组件挂载
50 Vue.component('Pagination', Pagination) 52 Vue.component('Pagination', Pagination)
51 Vue.component('RightToolbar', RightToolbar) 53 Vue.component('RightToolbar', RightToolbar)
52 -Vue.component('Tables',Table) 54 +Vue.component('Tables', Table)
53 55
54 Vue.use(permission) 56 Vue.use(permission)
55 /** 57 /**
...@@ -63,8 +65,7 @@ Vue.use(permission) ...@@ -63,8 +65,7 @@ Vue.use(permission)
63 65
64 Vue.use(Element, { 66 Vue.use(Element, {
65 //size: Cookies.get('size') || 'medium' // set element-ui default size 67 //size: Cookies.get('size') || 'medium' // set element-ui default size
66 - size: localStorage.getItem('size') || 'medium' // set element-ui default size 68 + // size: localStorage.getItem('size') || 'medium' // set element-ui default size
67 -
68 }) 69 })
69 70
70 Vue.config.productionTip = false 71 Vue.config.productionTip = false
......
...@@ -11,8 +11,6 @@ const service = axios.create({ ...@@ -11,8 +11,6 @@ const service = axios.create({
11 // axios中请求配置有baseURL选项，表示请求URL公共部分 11 // axios中请求配置有baseURL选项，表示请求URL公共部分
12 //baseURL: process.env.VUE_APP_BASE_API, 12 //baseURL: process.env.VUE_APP_BASE_API,
13 baseURL: settings.baseURL, //阿里云服务器 13 baseURL: settings.baseURL, //阿里云服务器
14 - // baseURL: 'https://imacuat.zmd.apac.fedex.com/iMAC', //uat服务器
15 - // baseURL: 'http://192.168.1.133:7001/iMAC', //测试服务器
16 14
17 // 超时 15 // 超时
18 timeout: 30000 16 timeout: 30000
......
...@@ -561,10 +561,7 @@ export default { ...@@ -561,10 +561,7 @@ export default {
561 this.selectData.HandlingCode = res.data.handlingCode; 561 this.selectData.HandlingCode = res.data.handlingCode;
562 this.selectData.SubCategory = res.data.subCategory; 562 this.selectData.SubCategory = res.data.subCategory;
563 } else { 563 } else {
564 - this.$message({ 564 + this.msgWarning('查询条件不存在')
565 - message: "查询条件不存在",
566 - type: "warning",
567 - });
568 } 565 }
569 }) 566 })
570 .catch(() => { }); 567 .catch(() => { });
...@@ -574,10 +571,7 @@ export default { ...@@ -574,10 +571,7 @@ export default {
574 if (res.code == 200) { 571 if (res.code == 200) {
575 this.selectData.findConditionData = res.data; 572 this.selectData.findConditionData = res.data;
576 } else { 573 } else {
577 - this.$message({ 574 + this.msgWarning('查询条件不存在')
578 - message: "查询条件不存在",
579 - type: "warning",
580 - });
581 } 575 }
582 }) 576 })
583 .catch(() => { }); 577 .catch(() => { });
...@@ -601,16 +595,10 @@ export default { ...@@ -601,16 +595,10 @@ export default {
601 // item.index = index; 595 // item.index = index;
602 // }); 596 // });
603 } else { 597 } else {
604 - this.$message({ 598 + this.msgWarning('未查询到数据')
605 - message: "未查询到数据",
606 - type: "warning",
607 - });
608 } 599 }
609 } else { 600 } else {
610 - this.$message({ 601 + this.msgWarning(res.msg)
611 - message: res.msg,
612 - type: "warning",
613 - });
614 } 602 }
615 }) 603 })
616 .catch(() => { 604 .catch(() => {
......
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
32 32
33 <script> 33 <script>
34 import { allocationFlight } from "@/api/cargoSelect"; 34 import { allocationFlight } from "@/api/cargoSelect";
35 -import { MessageBox } from "element-ui"; 35 +
36 export default { 36 export default {
37 props: { 37 props: {
38 dialogVisible: { 38 dialogVisible: {
...@@ -109,14 +109,11 @@ export default { ...@@ -109,14 +109,11 @@ export default {
109 this.loading = false; 109 this.loading = false;
110 //code 200 配舱成功 202 重量已满需要确认 其余code直接输出msg 110 //code 200 配舱成功 202 重量已满需要确认 其余code直接输出msg
111 if (res.code === 200) { 111 if (res.code === 200) {
112 - this.$message({ 112 + this.msgSuccess('货物配舱成功')
113 - message: "货物配舱成功",
114 - type: "success",
115 - });
116 this.cleaerForm(); 113 this.cleaerForm();
117 this.$emit("dialogBeforeClose", { close: false, reload: true }); 114 this.$emit("dialogBeforeClose", { close: false, reload: true });
118 } else if (res.code === 202) { 115 } else if (res.code === 202) {
119 - MessageBox.confirm(res.msg, "提示", { 116 + this.$confirm(res.msg, "提示", {
120 confirmButtonText: "确定", 117 confirmButtonText: "确定",
121 cancelButtonText: "取消", 118 cancelButtonText: "取消",
122 type: "warning", 119 type: "warning",
...@@ -125,15 +122,9 @@ export default { ...@@ -125,15 +122,9 @@ export default {
125 this.formData.overweight = true; //确定继续overweight变为true再次请求接口 122 this.formData.overweight = true; //确定继续overweight变为true再次请求接口
126 allocationFlight(this.formData).then((res) => { 123 allocationFlight(this.formData).then((res) => {
127 if (res.code === 200) { 124 if (res.code === 200) {
128 - this.$message({ 125 + this.msgSuccess('货物配舱成功')
129 - message: "货物配舱成功",
130 - type: "success",
131 - });
132 } else { 126 } else {
133 - this.$message({ 127 + this.msgWarning(res.msg)
134 - message: res.msg,
135 - type: "warning",
136 - });
137 } 128 }
138 }); 129 });
139 this.cleaerForm(); 130 this.cleaerForm();
...@@ -141,10 +132,7 @@ export default { ...@@ -141,10 +132,7 @@ export default {
141 }) 132 })
142 .catch(() => { 133 .catch(() => {
143 //取消 取消当前配舱 134 //取消 取消当前配舱
144 - this.$message({ 135 + this.msgSuccess('配舱已取消')
145 - message: "配舱已取消",
146 - type: "success",
147 - });
148 this.cleaerForm(); 136 this.cleaerForm();
149 this.$emit("dialogBeforeClose", { 137 this.$emit("dialogBeforeClose", {
150 close: false, 138 close: false,
...@@ -153,20 +141,14 @@ export default { ...@@ -153,20 +141,14 @@ export default {
153 }); 141 });
154 } else { 142 } else {
155 this.loading = false; 143 this.loading = false;
156 - this.$message({ 144 + this.msgWarning(res.msg)
157 - message: res.msg,
158 - type: "warning",
159 - });
160 } 145 }
161 }).catch(() => { 146 }).catch(() => {
162 this.loading = false; 147 this.loading = false;
163 }); 148 });
164 } else { 149 } else {
165 this.loading = false; 150 this.loading = false;
166 - this.$message({ 151 + this.msgWarning("航班号或航班日期不能为空")
167 - message: "航班号或航班日期不能为空",
168 - type: "warning",
169 - });
170 } 152 }
171 }, 153 },
172 dialogBeforeClose() { 154 dialogBeforeClose() {
...@@ -191,7 +173,7 @@ export default { ...@@ -191,7 +173,7 @@ export default {
191 return this.formData.fltNo; 173 return this.formData.fltNo;
192 }, 174 },
193 set: function (val) { 175 set: function (val) {
194 - this.formData.fltNo = val.toUpperCase(); 176 + this.formData.fltNo = this.upCase(val);
195 }, 177 },
196 }, 178 },
197 }, 179 },
......
1 <template> 1 <template>
2 <div> 2 <div>
3 - <el-form 3 + <el-form :inline="true" :model="queryParams" class="form-header" size="medium" label-position="right"
4 - :inline="true" 4 + label-width="auto">
5 - :model="queryParams"
6 - class="form-header"
7 - size="medium"
8 - label-position="right"
9 - label-width="auto"
10 - >
11 <el-form-item label="航班号"> 5 <el-form-item label="航班号">
12 - <el-input 6 + <el-input v-model.trim="purposeOfFlightNo" placeholder="航班号" @keyup.enter.native="getList"></el-input>
13 - v-model.trim="purposeOfFlightNo"
14 - placeholder="航班号"
15 - @keyup.enter.native="getList"
16 - ></el-input>
17 </el-form-item> 7 </el-form-item>
18 <el-form-item label="状态"> 8 <el-form-item label="状态">
19 <el-select v-model="queryParams.status" placeholder="状态"> 9 <el-select v-model="queryParams.status" placeholder="状态">
...@@ -22,32 +12,16 @@ ...@@ -22,32 +12,16 @@
22 </el-select> 12 </el-select>
23 </el-form-item> 13 </el-form-item>
24 <el-form-item> 14 <el-form-item>
25 - <el-button 15 + <el-button type="primary" icon="el-icon-search" @click="getList" size="mini">查询</el-button>
26 - type="primary"
27 - icon="el-icon-search"
28 - @click="getList"
29 - size="mini"
30 - >查询</el-button
31 - >
32 </el-form-item> 16 </el-form-item>
33 <div> 17 <div>
34 - <el-button 18 + <el-button style="margin-bottom: 20px" type="primary" icon="el-icon-plus" size="mini"
35 - style="margin-bottom: 20px"
36 - type="primary"
37 - icon="el-icon-plus"
38 - size="mini"
39 v-hasPermi="['allocation:alloc:add']" 19 v-hasPermi="['allocation:alloc:add']"
40 - @click="$router.push({ name: 'FlightAllocConfigAdd', params: { handle: 'add' } })" 20 + @click="$router.push({ name: 'FlightAllocConfigAdd', params: { handle: 'add' } })">添加</el-button>
41 - >添加</el-button
42 - >
43 </div> 21 </div>
44 </el-form> 22 </el-form>
45 <el-table :data="flyList" v-loading="loading" size="small" highlight-current-row border stripe> 23 <el-table :data="flyList" v-loading="loading" size="small" highlight-current-row border stripe>
46 - <el-table-column 24 + <el-table-column prop="purposeOfFlightNo" label="航班号" align="center"></el-table-column>
47 - prop="purposeOfFlightNo"
48 - label="航班号"
49 - align="center"
50 - ></el-table-column>
51 25
52 <el-table-column prop="status" label="状态" align="center"> 26 <el-table-column prop="status" label="状态" align="center">
53 <template slot-scope="scope"> 27 <template slot-scope="scope">
...@@ -66,62 +40,22 @@ ...@@ -66,62 +40,22 @@
66 40
67 <el-table-column label="操作" prop="id" align="center"> 41 <el-table-column label="操作" prop="id" align="center">
68 <template slot-scope="scope"> 42 <template slot-scope="scope">
69 - <el-button 43 + <el-button type="text" size="mini" icon="el-icon-view" @click="handleClick(scope.row.id, 'detail')">查看
70 - type="text" 44 + </el-button>
71 - size="mini" 45 + <el-button type="text" size="mini" icon="el-icon-edit" v-hasPermi="['allocation:alloc:update']"
72 - icon="el-icon-view" 46 + @click="handleClick(scope.row.id, 'update')">修改</el-button>
73 - @click="handleClick(scope.row.id, 'detail')" 47 + <el-button type="text" size="mini" icon="el-icon-delete" v-hasPermi="['allocation:alloc:delete']"
74 - >查看</el-button 48 + @click="del(scope.row.id, scope.row.status)">删除</el-button>
75 - > 49 + <el-button type="text" size="mini" icon="el-icon-video-pause" v-hasPermi="['allocation:alloc:openClose']"
76 - <el-button 50 + @click="changeStatus(scope.row.id, 3)" v-if="scope.row.status == '1'">停用</el-button>
77 - type="text" 51 + <el-button type="text" size="mini" icon="el-icon-video-play" v-hasPermi="['allocation:alloc:openClose']"
78 - size="mini" 52 + @click="changeStatus(scope.row.id, 1)" v-else>启用</el-button>
79 - icon="el-icon-edit"
80 - v-hasPermi="['allocation:alloc:update']"
81 - @click="handleClick(scope.row.id, 'update')"
82 - >修改</el-button
83 - >
84 - <el-button
85 - type="text"
86 - size="mini"
87 - icon="el-icon-delete"
88 - v-hasPermi="['allocation:alloc:delete']"
89 - @click="del(scope.row.id, scope.row.status)"
90 - >删除</el-button
91 - >
92 - <el-button
93 - type="text"
94 - size="mini"
95 - icon="el-icon-video-pause"
96 - v-hasPermi="['allocation:alloc:openClose']"
97 - @click="changeStatus(scope.row.id, 3)"
98 - v-if="scope.row.status == '1'"
99 - >停用</el-button
100 - >
101 - <el-button
102 - type="text"
103 - size="mini"
104 - icon="el-icon-video-play"
105 - v-hasPermi="['allocation:alloc:openClose']"
106 - @click="changeStatus(scope.row.id, 1)"
107 - v-else
108 - >启用</el-button
109 - >
110 </template> 53 </template>
111 </el-table-column> 54 </el-table-column>
112 </el-table> 55 </el-table>
113 - <el-pagination 56 + <el-pagination @size-change="getList" @current-change="getList" :current-page.sync="curPage"
114 - @size-change="getList" 57 + :page-sizes="[10, 20, 30, 40]" :page-size.sync="limit" layout="prev, pager, next, jumper, sizes, total"
115 - @current-change="getList" 58 + :total="total" background :hide-on-single-page="true" style="margin-top: 40px; text-align: right">
116 - :current-page.sync="curPage"
117 - :page-sizes="[10, 20, 30, 40]"
118 - :page-size.sync="limit"
119 - layout="prev, pager, next, jumper, sizes, total"
120 - :total="total"
121 - background
122 - :hide-on-single-page="true"
123 - style="margin-top: 40px; text-align: right"
124 - >
125 </el-pagination> 59 </el-pagination>
126 </div> 60 </div>
127 </template> 61 </template>
...@@ -133,12 +67,12 @@ import { ...@@ -133,12 +67,12 @@ import {
133 enableOrDisable, 67 enableOrDisable,
134 } from "@/api/destinationFlight"; 68 } from "@/api/destinationFlight";
135 export default { 69 export default {
136 - name:"FlightAllocConfig", 70 + name: "FlightAllocConfig",
137 data() { 71 data() {
138 return { 72 return {
139 queryParams: { 73 queryParams: {
140 purposeOfFlightNo: "", 74 purposeOfFlightNo: "",
141 - status:"1", 75 + status: "1",
142 start: 0, 76 start: 0,
143 limit: 10, 77 limit: 10,
144 }, 78 },
...@@ -150,14 +84,14 @@ export default { ...@@ -150,14 +84,14 @@ export default {
150 }; 84 };
151 }, 85 },
152 created() { 86 created() {
153 - if(this.$store.state.tagsView.cachedViews.length == 0){ 87 + if (this.$store.state.tagsView.cachedViews.length == 0) {
154 this.getList(); 88 this.getList();
155 } 89 }
156 }, 90 },
157 - activated(){ 91 + activated() {
158 this.getList() 92 this.getList()
159 }, 93 },
160 - deactivated(){ 94 + deactivated() {
161 this.flyList = [] 95 this.flyList = []
162 }, 96 },
163 methods: { 97 methods: {
...@@ -171,11 +105,7 @@ export default { ...@@ -171,11 +105,7 @@ export default {
171 this.loading = true; 105 this.loading = true;
172 findFlightNo(this.queryParams).then((response) => { 106 findFlightNo(this.queryParams).then((response) => {
173 if (response.code != 200) { 107 if (response.code != 200) {
174 - this.$message({ 108 + this.msgError(response.msg)
175 - showClose: true,
176 - message: response.msg,
177 - type: "error",
178 - });
179 return; 109 return;
180 } 110 }
181 this.flyList = response.data.list; 111 this.flyList = response.data.list;
...@@ -205,16 +135,13 @@ export default { ...@@ -205,16 +135,13 @@ export default {
205 showCancelButton: true, 135 showCancelButton: true,
206 type: "warning", 136 type: "warning",
207 }) 137 })
208 - .then(()=> { 138 + .then(() => {
209 delFlightId(id) 139 delFlightId(id)
210 - .then((res) => { 140 + .then((res) => {
211 - this.$message({ 141 + res.code === 200 ? this.msgSuccess(res.msg) : this.msgWarning(res.msg)
212 - message: res.msg, 142 + this.getList()
213 - type: res.code === 200 ? "success" : "warning", 143 + })
214 - }); 144 + .catch(() => { });
215 - this.getList()
216 - })
217 - .catch(() => {});
218 }) 145 })
219 } 146 }
220 }, 147 },
...@@ -226,8 +153,8 @@ export default { ...@@ -226,8 +153,8 @@ export default {
226 cancelButtonText: "取消", 153 cancelButtonText: "取消",
227 type: "warning", 154 type: "warning",
228 }) 155 })
229 - .then(()=> { 156 + .then(() => {
230 - enableOrDisable(id, status).then((res) => { 157 + enableOrDisable(id, status).then((res) => {
231 if (res.code != 200) { 158 if (res.code != 200) {
232 this.msgError(res.msg); 159 this.msgError(res.msg);
233 } else { 160 } else {
...@@ -235,17 +162,17 @@ export default { ...@@ -235,17 +162,17 @@ export default {
235 this.msgSuccess(tip + "成功"); 162 this.msgSuccess(tip + "成功");
236 } 163 }
237 }) 164 })
238 - .catch(()=> {}); 165 + .catch(() => { });
239 }) 166 })
240 }, 167 },
241 }, 168 },
242 - computed:{ 169 + computed: {
243 purposeOfFlightNo: { 170 purposeOfFlightNo: {
244 get: function () { 171 get: function () {
245 return this.queryParams.purposeOfFlightNo; 172 return this.queryParams.purposeOfFlightNo;
246 }, 173 },
247 set: function (val) { 174 set: function (val) {
248 - this.queryParams.purposeOfFlightNo = val.toUpperCase() 175 + this.queryParams.purposeOfFlightNo = this.upCase(val)
249 }, 176 },
250 }, 177 },
251 } 178 }
......
...@@ -48,12 +48,12 @@ ...@@ -48,12 +48,12 @@
48 <el-row :gutter="20"> 48 <el-row :gutter="20">
49 <el-col :span="10"> 49 <el-col :span="10">
50 <el-form-item label="URSA包含"> 50 <el-form-item label="URSA包含">
51 - <el-input type="textarea" v-model.trim="form.includeUrsa" :rows="6" resize="none"></el-input> 51 + <el-input type="textarea" v-model.trim="includeUrsa" :rows="6" resize="none"></el-input>
52 </el-form-item> 52 </el-form-item>
53 </el-col> 53 </el-col>
54 <el-col :span="10"> 54 <el-col :span="10">
55 <el-form-item label="URSA不包含"> 55 <el-form-item label="URSA不包含">
56 - <el-input type="textarea" v-model.trim="form.notIncludeUrsa" :rows="6" resize="none"></el-input> 56 + <el-input type="textarea" v-model.trim="notIncludeUrsa" :rows="6" resize="none"></el-input>
57 </el-form-item> 57 </el-form-item>
58 </el-col> 58 </el-col>
59 </el-row> 59 </el-row>
...@@ -282,7 +282,7 @@ export default { ...@@ -282,7 +282,7 @@ export default {
282 this.formSubCategory = this.form.subCategory; 282 this.formSubCategory = this.form.subCategory;
283 this.form.isNeedRequired = this.isNeedRequired; 283 this.form.isNeedRequired = this.isNeedRequired;
284 if (this.form.purposeOfFlightNo) { 284 if (this.form.purposeOfFlightNo) {
285 - this.form.purposeOfFlightNo = this.form.purposeOfFlightNo.toUpperCase(); 285 + this.form.purposeOfFlightNo = this.upCase(this.form.purposeOfFlightNo);
286 } 286 }
287 if (this.isLocation == 1) { 287 if (this.isLocation == 1) {
288 this.form.notLocation = ""; 288 this.form.notLocation = "";
...@@ -319,32 +319,17 @@ export default { ...@@ -319,32 +319,17 @@ export default {
319 } 319 }
320 }); 320 });
321 if (errorList.length != 0) { 321 if (errorList.length != 0) {
322 - this.$message({ 322 + this.msgError("URSA不包含中[" + errorList + "]错误，URSA不包含必须属于URSA包含中的类型")
323 - showClose: true,
324 - message:
325 - "URSA不包含中[" +
326 - errorList +
327 - "]错误，URSA不包含必须属于URSA包含中的类型",
328 - type: "error",
329 - });
330 this.btnLoading = false; 323 this.btnLoading = false;
331 return; 324 return;
332 } 325 }
333 } 326 }
334 updateOrAddFlight(this.form).then((response) => { 327 updateOrAddFlight(this.form).then((response) => {
335 if (response.code === 200) { 328 if (response.code === 200) {
336 - this.$message({ 329 + this.msgSuccess('成功')
337 - showClose: true,
338 - message: "成功",
339 - type: "success",
340 - });
341 this.close(); 330 this.close();
342 } else { 331 } else {
343 - this.$message({ 332 + this.msgError(response.msg)
344 - showClose: true,
345 - message: response.msg,
346 - type: "error",
347 - });
348 this.btnLoading = false; 333 this.btnLoading = false;
349 } 334 }
350 }); 335 });
...@@ -381,11 +366,7 @@ export default { ...@@ -381,11 +366,7 @@ export default {
381 async dictData() { 366 async dictData() {
382 allDictData().then((response) => { 367 allDictData().then((response) => {
383 if (response.code != 200) { 368 if (response.code != 200) {
384 - this.$message({ 369 + this.msgError(response.msg)
385 - showClose: true,
386 - message: response.msg,
387 - type: "error",
388 - });
389 return; 370 return;
390 } 371 }
391 let dict = response.data; 372 let dict = response.data;
...@@ -447,11 +428,7 @@ export default { ...@@ -447,11 +428,7 @@ export default {
447 if (isNaN(Number(id))) { 428 if (isNaN(Number(id))) {
448 findDestinationFltRuleByActualFlight(id).then((response) => { 429 findDestinationFltRuleByActualFlight(id).then((response) => {
449 if (response.code != 200) { 430 if (response.code != 200) {
450 - this.$message({ 431 + this.msgError(response.msg)
451 - showClose: true,
452 - message: response.msg,
453 - type: "error",
454 - });
455 this.isEmpty = true; 432 this.isEmpty = true;
456 } else if (response.data == null) { 433 } else if (response.data == null) {
457 this.isEmpty = true; 434 this.isEmpty = true;
...@@ -488,11 +465,7 @@ export default { ...@@ -488,11 +465,7 @@ export default {
488 //货物信息 465 //货物信息
489 findByFlightId(id).then((response) => { 466 findByFlightId(id).then((response) => {
490 if (response.code != 200) { 467 if (response.code != 200) {
491 - this.$message({ 468 + this.msgError(response.msg)
492 - showClose: true,
493 - message: response.msg,
494 - type: "error",
495 - });
496 this.isEmpty = true; 469 this.isEmpty = true;
497 } else { 470 } else {
498 let info = response.data.list; 471 let info = response.data.list;
...@@ -543,6 +516,22 @@ export default { ...@@ -543,6 +516,22 @@ export default {
543 } 516 }
544 }, 517 },
545 computed: { 518 computed: {
519 + includeUrsa: {
520 + get: function () {
521 + return this.form.includeUrsa;
522 + },
523 + set: function (val) {
524 + this.form.includeUrsa = this.upCase(val);
525 + },
526 + },
527 + notIncludeUrsa: {
528 + get: function () {
529 + return this.form.notIncludeUrsa;
530 + },
531 + set: function (val) {
532 + this.form.notIncludeUrsa = this.upCase(val);
533 + },
534 + },
546 minNumOfPieces: { 535 minNumOfPieces: {
547 get: function () { 536 get: function () {
548 return this.form.minNumOfPieces; 537 return this.form.minNumOfPieces;
......
...@@ -325,10 +325,7 @@ export default { ...@@ -325,10 +325,7 @@ export default {
325 handleDeleteorPlayorpause(row, status, statusText) { 325 handleDeleteorPlayorpause(row, status, statusText) {
326 //删除前需要停用 326 //删除前需要停用
327 if (status === 0 && row.status != "3") { 327 if (status === 0 && row.status != "3") {
328 - this.$message({ 328 + this.msgWarning('请停用后删除')
329 - message: "请停用后删除",
330 - type: "warning",
331 - });
332 return; 329 return;
333 } 330 }
334 331
...@@ -361,10 +358,9 @@ export default { ...@@ -361,10 +358,9 @@ export default {
361 if (valid) { 358 if (valid) {
362 this.form.dayOfWeek = this.dayOfWeek.sort(); 359 this.form.dayOfWeek = this.dayOfWeek.sort();
363 let formdata = JSON.parse(JSON.stringify(this.form)); 360 let formdata = JSON.parse(JSON.stringify(this.form));
364 - formdata.sourceFlightNo = formdata.sourceFlightNo 361 + formdata.sourceFlightNo = this.upCase(formdata.sourceFlightNo
365 - .trim() 362 + .trim());
366 - .toUpperCase(); 363 + formdata.flightRank = this.upCase(formdata.flightRank.trim());
367 - formdata.flightRank = formdata.flightRank.trim().toUpperCase();
368 if (formdata.startDate === undefined || formdata.startDate == null) { 364 if (formdata.startDate === undefined || formdata.startDate == null) {
369 formdata.startDate = ""; 365 formdata.startDate = "";
370 } 366 }
...@@ -463,7 +459,7 @@ export default { ...@@ -463,7 +459,7 @@ export default {
463 return this.queryParams.sourceFlightNo; 459 return this.queryParams.sourceFlightNo;
464 }, 460 },
465 set: function (val) { 461 set: function (val) {
466 - this.queryParams.sourceFlightNo = val.toUpperCase(); 462 + this.queryParams.sourceFlightNo = this.upCase(val);
467 }, 463 },
468 }, 464 },
469 }, 465 },
......
...@@ -159,10 +159,7 @@ export default { ...@@ -159,10 +159,7 @@ export default {
159 this.total = response.data.totalCount; 159 this.total = response.data.totalCount;
160 this.loading = false; 160 this.loading = false;
161 if (response.data.list.length == 0) { 161 if (response.data.list.length == 0) {
162 - this.$message({ 162 + this.msgWarning('未查询到数据')
163 - message: "未查询到数据",
164 - type: "warning",
165 - });
166 } 163 }
167 } else { 164 } else {
168 this.msgError(response.msg); 165 this.msgError(response.msg);
...@@ -176,7 +173,7 @@ export default { ...@@ -176,7 +173,7 @@ export default {
176 return this.queryParams.fltNo; 173 return this.queryParams.fltNo;
177 }, 174 },
178 set: function (val) { 175 set: function (val) {
179 - this.queryParams.fltNo = val.toUpperCase(); 176 + this.queryParams.fltNo = this.upCase(val);
180 }, 177 },
181 }, 178 },
182 siteName: { 179 siteName: {
...@@ -184,7 +181,7 @@ export default { ...@@ -184,7 +181,7 @@ export default {
184 return this.queryParams.siteName; 181 return this.queryParams.siteName;
185 }, 182 },
186 set: function (val) { 183 set: function (val) {
187 - this.queryParams.siteName = val.toUpperCase(); 184 + this.queryParams.siteName = this.upCase(val);
188 }, 185 },
189 }, 186 },
190 ursa: { 187 ursa: {
...@@ -192,7 +189,7 @@ export default { ...@@ -192,7 +189,7 @@ export default {
192 return this.queryParams.ursa; 189 return this.queryParams.ursa;
193 }, 190 },
194 set: function (val) { 191 set: function (val) {
195 - this.queryParams.ursa = val.toUpperCase(); 192 + this.queryParams.ursa = this.upCase(val);
196 }, 193 },
197 }, 194 },
198 }, 195 },
......
...@@ -135,10 +135,7 @@ export default { ...@@ -135,10 +135,7 @@ export default {
135 created() { 135 created() {
136 filghtKindData().then((response) => { 136 filghtKindData().then((response) => {
137 if (response.code != 200) { 137 if (response.code != 200) {
138 - this.$message({ 138 + this.msgError(response.msg)
139 - message: response.msg,
140 - type: "error",
141 - });
142 } 139 }
143 this.flightType = response.data; 140 this.flightType = response.data;
144 this.form.type = response.data[0].code; 141 this.form.type = response.data[0].code;
......
...@@ -249,7 +249,7 @@ import { ...@@ -249,7 +249,7 @@ import {
249 updateStatusBatch, 249 updateStatusBatch,
250 updateAutoPushBatch, 250 updateAutoPushBatch,
251 } from "@/api/findAllFltData"; 251 } from "@/api/findAllFltData";
252 -import { nowDate } from "@/utils/FedEx.js" 252 +
253 export default { 253 export default {
254 name: "FlightInformationMaintenance", 254 name: "FlightInformationMaintenance",
255 data() { 255 data() {
...@@ -565,7 +565,7 @@ export default { ...@@ -565,7 +565,7 @@ export default {
565 }, 565 },
566 created() { 566 created() {
567 //查询条件数据源 567 //查询条件数据源
568 - this.queryParams.fltDateStart = nowDate() 568 + this.queryParams.fltDateStart = this.nowDate()
569 this.findFltConditionData(); 569 this.findFltConditionData();
570 if (this.$store.state.tagsView.cachedViews.length == 0) { 570 if (this.$store.state.tagsView.cachedViews.length == 0) {
571 this.findAllFltData(); 571 this.findAllFltData();
...@@ -599,7 +599,7 @@ export default { ...@@ -599,7 +599,7 @@ export default {
599 this.form.fltNo != undefined && 599 this.form.fltNo != undefined &&
600 this.form.fltNo != "" 600 this.form.fltNo != ""
601 ) { 601 ) {
602 - this.form.fltNo = this.form.fltNo.toUpperCase(); 602 + this.form.fltNo = this.upCase(this.form.fltNo);
603 findFltCommonConf(this.form).then((response) => { 603 findFltCommonConf(this.form).then((response) => {
604 if (response.code == 200) { 604 if (response.code == 200) {
605 //额外增重百分比：根据已存在的相同航班号对应的最新值进行设置，如果无相同航班号，按照默认设置为0，不可编辑 605 //额外增重百分比：根据已存在的相同航班号对应的最新值进行设置，如果无相同航班号，按照默认设置为0，不可编辑
...@@ -697,7 +697,7 @@ export default { ...@@ -697,7 +697,7 @@ export default {
697 this.queryParams.fltNo != undefined && 697 this.queryParams.fltNo != undefined &&
698 this.queryParams.fltNo != "" 698 this.queryParams.fltNo != ""
699 ) { 699 ) {
700 - this.queryParams.fltNo = this.queryParams.fltNo.toUpperCase(); 700 + this.queryParams.fltNo = this.upCase(this.queryParams.fltNo);
701 } 701 }
702 findAllFltDataApi(this.queryParams).then((response) => { 702 findAllFltDataApi(this.queryParams).then((response) => {
703 this.loading = false; 703 this.loading = false;
......
...@@ -611,10 +611,7 @@ export default { ...@@ -611,10 +611,7 @@ export default {
611 if (res.code == 200) { 611 if (res.code == 200) {
612 this.findConditionData = res.data; 612 this.findConditionData = res.data;
613 } else { 613 } else {
614 - this.$message({ 614 + this.msgWarning('查询条件不存在')
615 - message: "查询条件不存在",
616 - type: "warning",
617 - });
618 } 615 }
619 }); 616 });
620 }, 617 },
...@@ -677,16 +674,10 @@ export default { ...@@ -677,16 +674,10 @@ export default {
677 this.tableData[i].index = i; 674 this.tableData[i].index = i;
678 } 675 }
679 } else { 676 } else {
680 - this.$message({ 677 + this.msgWarning('未查询到数据')
681 - message: "未查询到数据",
682 - type: "warning",
683 - });
684 } 678 }
685 } else { 679 } else {
686 - this.$message({ 680 + this.msgWarning(res.msg)
687 - message: res.msg,
688 - type: "warning",
689 - });
690 } 681 }
691 this.tableLoading = false; 682 this.tableLoading = false;
692 }) 683 })
...@@ -705,10 +696,7 @@ export default { ...@@ -705,10 +696,7 @@ export default {
705 }) 696 })
706 releaseCargo(idList).then(res => { 697 releaseCargo(idList).then(res => {
707 if (res.code === 200) { 698 if (res.code === 200) {
708 - this.$message({ 699 + this.msgSuccess(res.msg)
709 - message: res.msg,
710 - type: "success",
711 - });
712 } else if (res.code === 201) { 700 } else if (res.code === 201) {
713 this.selectTable.map(item => { 701 this.selectTable.map(item => {
714 res.data['success'].map(val => { 702 res.data['success'].map(val => {
...@@ -730,10 +718,7 @@ export default { ...@@ -730,10 +718,7 @@ export default {
730 }) 718 })
731 this.dialogVisible = true 719 this.dialogVisible = true
732 } else { 720 } else {
733 - this.$message({ 721 + this.msgWarning(res.msg)
734 - message: res.msg,
735 - type: "warning",
736 - });
737 } 722 }
738 }).catch(err => { 723 }).catch(err => {
739 console.log(err) 724 console.log(err)
...@@ -884,10 +869,7 @@ export default { ...@@ -884,10 +869,7 @@ export default {
884 }); 869 });
885 } else { 870 } else {
886 this.downLoadingTip.downloading = false; 871 this.downLoadingTip.downloading = false;
887 - this.$message({ 872 + this.msgWarning('导出数据量过大，请不要超过8万条')
888 - message: "导出数据量过大，请不要超过8万条",
889 - type: "warning",
890 - });
891 } 873 }
892 } 874 }
893 }, 875 },
......
...@@ -8,26 +8,16 @@ ...@@ -8,26 +8,16 @@
8 </el-input> 8 </el-input>
9 </el-form-item> 9 </el-form-item>
10 <el-form-item prop="password"> 10 <el-form-item prop="password">
11 - <el-input 11 + <el-input v-model="loginForm.password" type="password" auto-complete="off" placeholder="密码"
12 - v-model="loginForm.password" 12 + @keyup.enter.native="handleLogin">
13 - type="password"
14 - auto-complete="off"
15 - placeholder="密码"
16 - @keyup.enter.native="handleLogin"
17 - >
18 <svg-icon slot="prefix" icon-class="password" class="el-input__icon input-icon" /> 13 <svg-icon slot="prefix" icon-class="password" class="el-input__icon input-icon" />
19 </el-input> 14 </el-input>
20 </el-form-item> 15 </el-form-item>
21 16
22 <!-- <el-checkbox v-model="loginForm.rememberMe" style="margin:0px 0px 25px 0px;">记住密码</el-checkbox> --> 17 <!-- <el-checkbox v-model="loginForm.rememberMe" style="margin:0px 0px 25px 0px;">记住密码</el-checkbox> -->
23 <el-form-item style="width:100%;marginTop:44px"> 18 <el-form-item style="width:100%;marginTop:44px">
24 - <el-button 19 + <el-button :loading="loading" size="medium" type="primary" style="width:100%;"
25 - :loading="loading" 20 + @click.native.prevent="handleLogin">
26 - size="medium"
27 - type="primary"
28 - style="width:100%;"
29 - @click.native.prevent="handleLogin"
30 - >
31 <span v-if="!loading">登 录</span> 21 <span v-if="!loading">登 录</span>
32 <span v-else>登 录 中...</span> 22 <span v-else>登 录 中...</span>
33 </el-button> 23 </el-button>
...@@ -70,7 +60,7 @@ export default { ...@@ -70,7 +60,7 @@ export default {
70 }, 60 },
71 watch: { 61 watch: {
72 $route: { 62 $route: {
73 - handler: function(route) { 63 + handler: function (route) {
74 this.redirect = route.query && route.query.redirect; 64 this.redirect = route.query && route.query.redirect;
75 }, 65 },
76 immediate: true 66 immediate: true
...@@ -107,20 +97,13 @@ export default { ...@@ -107,20 +97,13 @@ export default {
107 } 97 }
108 this.$store.dispatch("Login", this.loginForm).then(res => { 98 this.$store.dispatch("Login", this.loginForm).then(res => {
109 this.loading = false; 99 this.loading = false;
110 - if(res.code != 200){ 100 + if (res.code != 200) {
111 - this.$message({ 101 + this.msgWarning(res.msg)
112 - message: res.msg, 102 + }
113 - type: "warning", 103 + this.$router.push({ path: this.redirect || "/" }).catch(() => { });
114 - });
115 - }
116 - this.$router.push({ path: this.redirect || "/" }).catch(()=>{});
117 }).catch(err => { 104 }).catch(err => {
118 this.loading = false; 105 this.loading = false;
119 - this.$message({ 106 + console.log(err)
120 - message: err,
121 - type: "warning",
122 - });
123 - //this.getCode();
124 }); 107 });
125 } 108 }
126 }); 109 });
...@@ -138,6 +121,7 @@ export default { ...@@ -138,6 +121,7 @@ export default {
138 background-image: url("../assets/images/login-background.jpg"); 121 background-image: url("../assets/images/login-background.jpg");
139 background-size: cover; 122 background-size: cover;
140 } 123 }
124 +
141 .title { 125 .title {
142 margin: 0px auto 30px auto; 126 margin: 0px auto 30px auto;
143 text-align: center; 127 text-align: center;
...@@ -149,32 +133,39 @@ export default { ...@@ -149,32 +133,39 @@ export default {
149 background: #ffffff; 133 background: #ffffff;
150 width: 400px; 134 width: 400px;
151 padding: 25px 25px 5px 25px; 135 padding: 25px 25px 5px 25px;
136 +
152 .el-input { 137 .el-input {
153 height: 38px; 138 height: 38px;
139 +
154 input { 140 input {
155 height: 38px; 141 height: 38px;
156 } 142 }
157 } 143 }
144 +
158 .input-icon { 145 .input-icon {
159 height: 39px; 146 height: 39px;
160 width: 14px; 147 width: 14px;
161 margin-left: 2px; 148 margin-left: 2px;
162 } 149 }
163 } 150 }
151 +
164 .login-tip { 152 .login-tip {
165 font-size: 13px; 153 font-size: 13px;
166 text-align: center; 154 text-align: center;
167 color: #bfbfbf; 155 color: #bfbfbf;
168 } 156 }
157 +
169 .login-code { 158 .login-code {
170 width: 33%; 159 width: 33%;
171 height: 38px; 160 height: 38px;
172 float: right; 161 float: right;
162 +
173 img { 163 img {
174 cursor: pointer; 164 cursor: pointer;
175 vertical-align: middle; 165 vertical-align: middle;
176 } 166 }
177 } 167 }
168 +
178 .el-login-footer { 169 .el-login-footer {
179 height: 40px; 170 height: 40px;
180 line-height: 40px; 171 line-height: 40px;
...@@ -187,6 +178,7 @@ export default { ...@@ -187,6 +178,7 @@ export default {
187 font-size: 12px; 178 font-size: 12px;
188 letter-spacing: 1px; 179 letter-spacing: 1px;
189 } 180 }
181 +
190 .login-code-img { 182 .login-code-img {
191 height: 38px; 183 height: 38px;
192 } 184 }
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
12 :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"> 12 :tree-props="{ children: 'children', hasChildren: 'hasChildren' }">
13 <template v-for="(item, index) in tableHeader"> 13 <template v-for="(item, index) in tableHeader">
14 <el-table-column v-if="item.value === 'menuType'" :prop="item.value" :label="item.name" :key="index" 14 <el-table-column v-if="item.value === 'menuType'" :prop="item.value" :label="item.name" :key="index"
15 - :align="item.align" header-align="center" :width="item.width" :formatter="formatter"> 15 + :align="item.align" header-align="center" :width="item.width" :formatter="formatter">
16 <template slot-scope="scope"> 16 <template slot-scope="scope">
17 <el-tag :type="scope.row.menuType === 'B' ? '' : 'success'" disable-transitions>{{ scope.row.menuType === 17 <el-tag :type="scope.row.menuType === 'B' ? '' : 'success'" disable-transitions>{{ scope.row.menuType ===
18 "B" ? "按钮" : "菜单" 18 "B" ? "按钮" : "菜单"
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
20 </template> 20 </template>
21 </el-table-column> 21 </el-table-column>
22 <el-table-column v-else :prop="item.value" :label="item.name" :key="index" :align="item.align" 22 <el-table-column v-else :prop="item.value" :label="item.name" :key="index" :align="item.align"
23 - header-align="center" :width="item.width" :formatter="formatter"> 23 + header-align="center" :width="item.width" :formatter="formatter">
24 </el-table-column> 24 </el-table-column>
25 </template> 25 </template>
26 26
...@@ -82,7 +82,7 @@ ...@@ -82,7 +82,7 @@
82 import { getAllAuth, updateStatus } from "@/api/system/user.js"; 82 import { getAllAuth, updateStatus } from "@/api/system/user.js";
83 import dictLabels from "@/assets/languages/dictLabels.js"; 83 import dictLabels from "@/assets/languages/dictLabels.js";
84 import Drawer from "./drawer.vue"; 84 import Drawer from "./drawer.vue";
85 -import { MessageBox } from "element-ui"; 85 +
86 export default { 86 export default {
87 name: "MenuConfig", 87 name: "MenuConfig",
88 components: { 88 components: {
...@@ -175,15 +175,9 @@ export default { ...@@ -175,15 +175,9 @@ export default {
175 if (res.code === 200) { 175 if (res.code === 200) {
176 res.data.length > 0 176 res.data.length > 0
177 ? (this.data = res.data) 177 ? (this.data = res.data)
178 - : this.$message({ 178 + : this.msgWarning('数据为空')
179 - message: "数据为空",
180 - type: "warning",
181 - });
182 } else { 179 } else {
183 - this.$message({ 180 + this.msgWarning(res.msg)
184 - message: res.msg,
185 - type: "warning",
186 - });
187 } 181 }
188 }) 182 })
189 .catch(() => { 183 .catch(() => {
...@@ -197,16 +191,10 @@ export default { ...@@ -197,16 +191,10 @@ export default {
197 .then((res) => { 191 .then((res) => {
198 if (res.code === 200) { 192 if (res.code === 200) {
199 this.menuAll(); 193 this.menuAll();
200 - this.$message({ 194 + this.msgSuccess('操作成功')
201 - message: "操作成功",
202 - type: "success",
203 - });
204 location.reload(); 195 location.reload();
205 } else { 196 } else {
206 - this.$message({ 197 + this.msgWarning(res.msg)
207 - message: res.msg,
208 - type: "warning",
209 - });
210 } 198 }
211 }) 199 })
212 .catch((err) => { 200 .catch((err) => {
...@@ -216,7 +204,7 @@ export default { ...@@ -216,7 +204,7 @@ export default {
216 204
217 //菜单开启关闭 205 //菜单开启关闭
218 menuStatus(row) { 206 menuStatus(row) {
219 - MessageBox.confirm( 207 + this.$confirm(
220 row.row.status == 1 ? "是否要关闭此菜单" : "是否要启用此菜单", 208 row.row.status == 1 ? "是否要关闭此菜单" : "是否要启用此菜单",
221 "提示", 209 "提示",
222 { 210 {
...@@ -236,7 +224,7 @@ export default { ...@@ -236,7 +224,7 @@ export default {
236 224
237 //菜单删除 225 //菜单删除
238 removeMenu(row) { 226 removeMenu(row) {
239 - MessageBox.confirm("是否要删除此菜单", "提示", { 227 + this.$confirm("是否要删除此菜单", "提示", {
240 confirmButtonText: "确定删除", 228 confirmButtonText: "确定删除",
241 cancelButtonText: "取消", 229 cancelButtonText: "取消",
242 type: "warning", 230 type: "warning",
......
...@@ -98,10 +98,7 @@ export default { ...@@ -98,10 +98,7 @@ export default {
98 if (res.code === 200) { 98 if (res.code === 200) {
99 this.treeData = this.treeDataInfo(res.data); 99 this.treeData = this.treeDataInfo(res.data);
100 } else { 100 } else {
101 - this.$message({ 101 + this.msgWarning(res.msg)
102 - message: res.msg,
103 - type: "warning",
104 - });
105 } 102 }
106 }) 103 })
107 .catch((err) => { 104 .catch((err) => {
...@@ -144,16 +141,10 @@ export default { ...@@ -144,16 +141,10 @@ export default {
144 .then((res) => { 141 .then((res) => {
145 this.loading = false; 142 this.loading = false;
146 if (res.code === 200) { 143 if (res.code === 200) {
147 - this.$message({ 144 + this.msgSuccess('操作成功,新增权限需重新登陆后刷新。')
148 - message: "操作成功,新增权限需重新登陆后刷新。",
149 - type: "success",
150 - });
151 this.$emit("handleClose", false); 145 this.$emit("handleClose", false);
152 } else { 146 } else {
153 - this.$message({ 147 + this.msgWarning(res.msg)
154 - message: res.msg,
155 - type: "warning",
156 - });
157 } 148 }
158 }) 149 })
159 .catch((err) => { 150 .catch((err) => {
......
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
55 55
56 <script> 56 <script>
57 import Drawer from "./drawer.vue"; 57 import Drawer from "./drawer.vue";
58 -import { MessageBox } from "element-ui"; 58 +
59 import { 59 import {
60 getRoleList, 60 getRoleList,
61 detailRole, 61 detailRole,
...@@ -153,10 +153,7 @@ export default { ...@@ -153,10 +153,7 @@ export default {
153 this.data = res.data.list; 153 this.data = res.data.list;
154 this.total = res.data.total; 154 this.total = res.data.total;
155 } else { 155 } else {
156 - this.$message({ 156 + this.msgWarning(res.msg)
157 - message: res.msg,
158 - type: "warning",
159 - });
160 } 157 }
161 }) 158 })
162 .catch((err) => { 159 .catch((err) => {
...@@ -171,10 +168,7 @@ export default { ...@@ -171,10 +168,7 @@ export default {
171 if (res.code === 200) { 168 if (res.code === 200) {
172 this.roleData = res.data; 169 this.roleData = res.data;
173 } else { 170 } else {
174 - this.$message({ 171 + this.msgWarning(res.msg)
175 - message: res.msg,
176 - type: "warning",
177 - });
178 } 172 }
179 }) 173 })
180 .catch((err) => { 174 .catch((err) => {
...@@ -206,7 +200,7 @@ export default { ...@@ -206,7 +200,7 @@ export default {
206 row.row.valid == 1 200 row.row.valid == 1
207 ? ((msg = "是否关闭此角色"), (status.valid = 2)) 201 ? ((msg = "是否关闭此角色"), (status.valid = 2))
208 : ((msg = "是否启用此角色"), (status.valid = 1)); 202 : ((msg = "是否启用此角色"), (status.valid = 1));
209 - MessageBox.confirm(msg, "注意", { 203 + this.$confirm(msg, "注意", {
210 confirmButtonText: "确定", 204 confirmButtonText: "确定",
211 cancelButtonText: "取消", 205 cancelButtonText: "取消",
212 type: "warning", 206 type: "warning",
...@@ -214,16 +208,10 @@ export default { ...@@ -214,16 +208,10 @@ export default {
214 .then(() => { 208 .then(() => {
215 updateRoleStatus(status).then((res) => { 209 updateRoleStatus(status).then((res) => {
216 if (res.code === 200) { 210 if (res.code === 200) {
217 - this.$message({ 211 + this.msgSuccess('操作成功')
218 - message: "操作成功",
219 - type: "success",
220 - });
221 this.selectRoleList(); 212 this.selectRoleList();
222 } else { 213 } else {
223 - this.$message({ 214 + this.msgWarning(res.msg)
224 - message: res.msg,
225 - type: "warning",
226 - });
227 } 215 }
228 }); 216 });
229 }) 217 })
...@@ -231,7 +219,7 @@ export default { ...@@ -231,7 +219,7 @@ export default {
231 }, 219 },
232 //删除角色 220 //删除角色
233 removeRole(row) { 221 removeRole(row) {
234 - MessageBox.confirm( 222 + this.$confirm(
235 "如删除此角色，角色下所有用户将从中被剔除，可能会对用户操作造成影响！", 223 "如删除此角色，角色下所有用户将从中被剔除，可能会对用户操作造成影响！",
236 "注意", 224 "注意",
237 { 225 {
...@@ -247,13 +235,10 @@ export default { ...@@ -247,13 +235,10 @@ export default {
247 confirmDel: false, 235 confirmDel: false,
248 }).then((res) => { 236 }).then((res) => {
249 if (res.code === 200) { 237 if (res.code === 200) {
250 - this.$message({ 238 + this.msgSuccess('删除成功')
251 - message: "删除成功",
252 - type: "success",
253 - });
254 this.selectRoleList(); 239 this.selectRoleList();
255 } else if (res.code === 202) { 240 } else if (res.code === 202) {
256 - MessageBox.confirm(res.msg, "注意", { 241 + this.$confirm(res.msg, "注意", {
257 confirmButtonText: "确定", 242 confirmButtonText: "确定",
258 cancelButtonText: "取消", 243 cancelButtonText: "取消",
259 type: "warning", 244 type: "warning",
...@@ -265,20 +250,14 @@ export default { ...@@ -265,20 +250,14 @@ export default {
265 confirmDel: true, 250 confirmDel: true,
266 }).then((res) => { 251 }).then((res) => {
267 if (res.code === 200) { 252 if (res.code === 200) {
268 - this.$message({ 253 + this.msgSuccess('操作成功')
269 - message: "操作成功",
270 - type: "success",
271 - });
272 this.selectRoleList(); 254 this.selectRoleList();
273 } 255 }
274 }); 256 });
275 }) 257 })
276 .catch(() => { }); 258 .catch(() => { });
277 } else { 259 } else {
278 - this.$message({ 260 + this.msgWarning(res.msg)
279 - message: res.msg,
280 - type: "warning",
281 - });
282 } 261 }
283 }); 262 });
284 }) 263 })
......
...@@ -209,10 +209,7 @@ export default { ...@@ -209,10 +209,7 @@ export default {
209 } 209 }
210 }); 210 });
211 } else { 211 } else {
212 - this.$message({ 212 + this.msgWarning(res.msg)
213 - message: res.msg,
214 - type: "warning",
215 - });
216 } 213 }
217 }) 214 })
218 .catch((err) => { 215 .catch((err) => {
...@@ -225,10 +222,7 @@ export default { ...@@ -225,10 +222,7 @@ export default {
225 if (res.code === 200) { 222 if (res.code === 200) {
226 this.portNameList = res.data; 223 this.portNameList = res.data;
227 } else { 224 } else {
228 - this.$message({ 225 + this.msgWarning(res.msg)
229 - message: res.msg,
230 - type: "warning",
231 - });
232 } 226 }
233 }) 227 })
234 .catch((err) => { 228 .catch((err) => {
...@@ -258,16 +252,10 @@ export default { ...@@ -258,16 +252,10 @@ export default {
258 .then((res) => { 252 .then((res) => {
259 this.loading = false; 253 this.loading = false;
260 if (res.code === 200) { 254 if (res.code === 200) {
261 - this.$message({ 255 + this.msgSuccess('操作成功')
262 - message: "操作成功",
263 - type: "success",
264 - });
265 this.$emit("handleClose", false); 256 this.$emit("handleClose", false);
266 } else { 257 } else {
267 - this.$message({ 258 + this.msgWarning(res.msg)
268 - message: res.msg,
269 - type: "warning",
270 - });
271 } 259 }
272 }) 260 })
273 .catch((err) => { 261 .catch((err) => {
...@@ -275,10 +263,7 @@ export default { ...@@ -275,10 +263,7 @@ export default {
275 console.log(err); 263 console.log(err);
276 }); 264 });
277 } else { 265 } else {
278 - this.$message({ 266 + this.msgWarning('口岸不能为空')
279 - message: "口岸不能为空",
280 - type: "warning",
281 - });
282 } 267 }
283 }, 268 },
284 }, 269 },
......
...@@ -87,8 +87,8 @@ ...@@ -87,8 +87,8 @@
87 87
88 <script> 88 <script>
89 import Drawer from "./drawer.vue"; 89 import Drawer from "./drawer.vue";
90 -import { MessageBox } from "element-ui";
91 import { listUser, detailUser, updateUserStatus } from "@/api/system/user.js"; 90 import { listUser, detailUser, updateUserStatus } from "@/api/system/user.js";
91 +
92 export default { 92 export default {
93 name: "UserConfig", 93 name: "UserConfig",
94 components: { 94 components: {
...@@ -189,10 +189,7 @@ export default { ...@@ -189,10 +189,7 @@ export default {
189 this.total = res.data.total; 189 this.total = res.data.total;
190 this.formData.page = res.data.page; 190 this.formData.page = res.data.page;
191 } else { 191 } else {
192 - this.$message({ 192 + this.msgWarning(res.msg)
193 - message: res.msg,
194 - type: "warning",
195 - });
196 } 193 }
197 }) 194 })
198 .catch((err) => { 195 .catch((err) => {
...@@ -213,10 +210,7 @@ export default { ...@@ -213,10 +210,7 @@ export default {
213 ? this.userData.portName = this.userData.portName.split(",") 210 ? this.userData.portName = this.userData.portName.split(",")
214 : ''; 211 : '';
215 } else { 212 } else {
216 - this.$message({ 213 + this.msgWarning(res.msg)
217 - message: res.msg,
218 - type: "warning",
219 - });
220 } 214 }
221 }) 215 })
222 .catch((err) => { 216 .catch((err) => {
...@@ -247,7 +241,7 @@ export default { ...@@ -247,7 +241,7 @@ export default {
247 row.row.isValid == 1 241 row.row.isValid == 1
248 ? ((msg = "是否要停用此用户"), (nowValid = 2)) 242 ? ((msg = "是否要停用此用户"), (nowValid = 2))
249 : ((msg = "是否要启用此用户"), (nowValid = 1)); 243 : ((msg = "是否要启用此用户"), (nowValid = 1));
250 - MessageBox.confirm(msg, "提示", { 244 + this.$confirm(msg, "提示", {
251 confirmButtonText: "确定", 245 confirmButtonText: "确定",
252 cancelButtonText: "取消", 246 cancelButtonText: "取消",
253 type: "warning", 247 type: "warning",
...@@ -256,16 +250,10 @@ export default { ...@@ -256,16 +250,10 @@ export default {
256 updateUserStatus({ id: row.row.id, isValid: nowValid }).then( 250 updateUserStatus({ id: row.row.id, isValid: nowValid }).then(
257 (res) => { 251 (res) => {
258 if (res.code === 200) { 252 if (res.code === 200) {
259 - this.$message({ 253 + this.msgSuccess('操作成功')
260 - message: "操作成功",
261 - type: "success",
262 - });
263 this.selectUser(); 254 this.selectUser();
264 } else { 255 } else {
265 - this.$message({ 256 + this.msgWarning(res.msg)
266 - message: res.msg,
267 - type: "warning",
268 - });
269 } 257 }
270 } 258 }
271 ); 259 );
...@@ -273,12 +261,12 @@ export default { ...@@ -273,12 +261,12 @@ export default {
273 .catch((err) => { 261 .catch((err) => {
274 console.log(err); 262 console.log(err);
275 }) 263 })
276 - .catch(() => []); 264 + .catch(() => { });
277 }, 265 },
278 266
279 //删除用户 267 //删除用户
280 removeUser(row) { 268 removeUser(row) {
281 - MessageBox.confirm("是否要删除此用户", "提示", { 269 + this.$confirm("是否要删除此用户", "提示", {
282 confirmButtonText: "确定删除", 270 confirmButtonText: "确定删除",
283 cancelButtonText: "取消", 271 cancelButtonText: "取消",
284 type: "warning", 272 type: "warning",
...@@ -286,16 +274,10 @@ export default { ...@@ -286,16 +274,10 @@ export default {
286 .then(() => { 274 .then(() => {
287 updateUserStatus({ id: row.row.id, isValid: 0 }).then((res) => { 275 updateUserStatus({ id: row.row.id, isValid: 0 }).then((res) => {
288 if (res.code === 200) { 276 if (res.code === 200) {
289 - this.$message({ 277 + this.msgSuccess('操作成功')
290 - message: "操作成功",
291 - type: "success",
292 - });
293 this.selectUser(); 278 this.selectUser();
294 } else { 279 } else {
295 - this.$message({ 280 + this.msgWarning(res.msg)
296 - message: res.msg,
297 - type: "warning",
298 - });
299 } 281 }
300 }); 282 });
301 }) 283 })
......
...@@ -506,10 +506,7 @@ export default { ...@@ -506,10 +506,7 @@ export default {
506 if (res.code === 200) { 506 if (res.code === 200) {
507 this.portList = res.data; 507 this.portList = res.data;
508 } else { 508 } else {
509 - this.$message({ 509 + this.msgWarning("查询条件" + res.msg)
510 - message: "查询条件" + res.msg,
511 - type: "warning",
512 - });
513 } 510 }
514 }); 511 });
515 if (this.$store.state.tagsView.cachedViews.length == 0) { 512 if (this.$store.state.tagsView.cachedViews.length == 0) {
...@@ -548,27 +545,18 @@ export default { ...@@ -548,27 +545,18 @@ export default {
548 this.loading = false; 545 this.loading = false;
549 if (res.code === 200) { 546 if (res.code === 200) {
550 if (res.data.total === 0) { 547 if (res.data.total === 0) {
551 - this.$message({ 548 + this.msgWarning('未查询到数据')
552 - message: "未查询到数据",
553 - type: "warning",
554 - });
555 } else { 549 } else {
556 this.data = res.data.list; 550 this.data = res.data.list;
557 this.total = res.data.total; 551 this.total = res.data.total;
558 } 552 }
559 } else { 553 } else {
560 - this.$message({ 554 + this.msgWarning(res.msg)
561 - message: res.msg,
562 - type: "warning",
563 - });
564 } 555 }
565 }); 556 });
566 } else { 557 } else {
567 this.loading = false; 558 this.loading = false;
568 - this.$message({ 559 + this.msgWarning('创建日期不能为空')
569 - message: "创建日期不能为空",
570 - type: "warning",
571 - });
572 } 560 }
573 }, 561 },
574 //分页 562 //分页
......
...@@ -35,9 +35,7 @@ module.exports = { ...@@ -35,9 +35,7 @@ module.exports = {
35 proxy: { 35 proxy: {
36 // detail: https://cli.vuejs.org/config/#devserver-proxy 36 // detail: https://cli.vuejs.org/config/#devserver-proxy
37 [process.env.VUE_APP_BASE_API]: { 37 [process.env.VUE_APP_BASE_API]: {
38 - // target: `https://imacuat.zmd.apac.fedex.com/iMAC`, //uat服务器
39 target: defaultSettings.baseURL, //阿里云服务器 38 target: defaultSettings.baseURL, //阿里云服务器
40 - // target: `http://192.168.1.133:7001/iMAC`, //测试服务器
41 changeOrigin: true, 39 changeOrigin: true,
42 pathRewrite: { 40 pathRewrite: {
43 ['^' + process.env.VUE_APP_BASE_API]: '' 41 ['^' + process.env.VUE_APP_BASE_API]: ''
......