Fedex / imac-vue

Go to a project
Toggle navigation Toggle navigation pinning
jinhui.wang
3aa303fe 1 parent 2cc22176

手动配舱页面更新，样式修改，bug修正

Expand all
Inline Side-by-side
Showing 13 changed files with 224 additions and 105 deletions
...@@ -35,6 +35,14 @@ export function findCargoAllocationData(data) { ...@@ -35,6 +35,14 @@ export function findCargoAllocationData(data) {
35 }) 35 })
36 } 36 }
37 37
38 +//手动配舱
39 +export function allocationFlight(data){
40 + return request({
41 + url:'/cargo/allocationFlight',
42 + method:'post',
43 + data:data
44 + })
45 +}
38 46
39 //导出excel 47 //导出excel
40 export function downloadExcel(data) { 48 export function downloadExcel(data) {
......
1 + let ductLabels = {
2 + "cargoRulesStatus":{
3 + "1":"自动",
4 + "2":"手动"
5 + }
6 +}
7 +
8 +export default ductLabels;
...\ No newline at end of file ...\ No newline at end of file
1 +var en = {
2 + "common": {
3 + "risk": "risk",
4 + "exit": "exit",
5 + "index":"index"
6 + }
7 +
8 +}
9 +export default en
1 +var zh = {
2 + "common": {
3 + "risk": "风险",
4 + "exit": "退出",
5 + "index":"首页"
6 + }
7 +
8 +}
9 +export default zh
...@@ -12,7 +12,6 @@ ...@@ -12,7 +12,6 @@
12 :show-header="showHeader" 12 :show-header="showHeader"
13 :height="height" 13 :height="height"
14 :highlight-current-row="highlightCurrentRow" 14 :highlight-current-row="highlightCurrentRow"
15 - :label-position="labelPosition"
16 :lazy="lazy" 15 :lazy="lazy"
17 :downShiftKey="shiftKey" 16 :downShiftKey="shiftKey"
18 :limitStart="limitStart" 17 :limitStart="limitStart"
...@@ -65,6 +64,8 @@ ...@@ -65,6 +64,8 @@
65 <script> 64 <script>
66 // import infoTable from "./info.vue"; 65 // import infoTable from "./info.vue";
67 import Item from "./item.vue"; 66 import Item from "./item.vue";
67 +import dictLabels from "../../assets/languages/dictLabels.js"
68 +import { scrollTo } from '@/utils/scroll-to'
68 export default { 69 export default {
69 name: "Table", 70 name: "Table",
70 components: { 71 components: {
...@@ -103,10 +104,6 @@ export default { ...@@ -103,10 +104,6 @@ export default {
103 type: Boolean, 104 type: Boolean,
104 default: true, 105 default: true,
105 }, 106 },
106 - labelPosition: {
107 - type: String,
108 - default: "left",
109 - },
110 indent: { 107 indent: {
111 type: Number, 108 type: Number,
112 default: 16, 109 default: 16,
...@@ -184,13 +181,11 @@ export default { ...@@ -184,13 +181,11 @@ export default {
184 // align: "center", 181 // align: "center",
185 // sorTable: false, 182 // sorTable: false,
186 // fixed:false, 183 // fixed:false,
187 - // formatter:{}
188 // }, 184 // },
189 }; 185 };
190 }, 186 },
191 created() { 187 created() {
192 this.newHeader = this.headerData; 188 this.newHeader = this.headerData;
193 - this.total = this.data.length;
194 }, 189 },
195 mounted() { 190 mounted() {
196 191
...@@ -198,12 +193,15 @@ export default { ...@@ -198,12 +193,15 @@ export default {
198 methods: { 193 methods: {
199 nextClick() { 194 nextClick() {
200 this.$emit('currentChange',{page:this.pageNum + 1,start:this.limitStart + this.limitSize}) 195 this.$emit('currentChange',{page:this.pageNum + 1,start:this.limitStart + this.limitSize})
196 + scrollTo(0,800);
201 }, 197 },
202 prevClick() { 198 prevClick() {
203 this.$emit('currentChange',{page:this.pageNum - 1,start:this.limitStart - this.limitSiz}) 199 this.$emit('currentChange',{page:this.pageNum - 1,start:this.limitStart - this.limitSiz})
200 + scrollTo(0,800);
204 }, 201 },
205 currentChange(val) { 202 currentChange(val) {
206 this.$emit('currentChange',{page:val,start: val*this.limitSize+1}); 203 this.$emit('currentChange',{page:val,start: val*this.limitSize+1});
204 + scrollTo(0,800);
207 }, 205 },
208 tableSelect(selection, row) { 206 tableSelect(selection, row) {
209 let end = row.index; 207 let end = row.index;
...@@ -253,9 +251,10 @@ export default { ...@@ -253,9 +251,10 @@ export default {
253 this.$emit("SelectChange", selection); 251 this.$emit("SelectChange", selection);
254 }, 252 },
255 clearTable(){ 253 clearTable(){
254 + this.selectTable = []
256 this.$refs.tables.clearSelection() 255 this.$refs.tables.clearSelection()
257 }, 256 },
258 - itemChange(val) {}, 257 + // itemChange(val) {},
259 // checkChange(val) { 258 // checkChange(val) {
260 // console.log(val); 259 // console.log(val);
261 // }, 260 // },
...@@ -266,6 +265,11 @@ export default { ...@@ -266,6 +265,11 @@ export default {
266 // console.log(val); 265 // console.log(val);
267 // }, 266 // },
268 formatter(row, column, cellValue, index) { 267 formatter(row, column, cellValue, index) {
268 + if(dictLabels[column.property]){
269 + if(dictLabels[column.property][cellValue]){
270 + return dictLabels[column.property][cellValue];
271 + }
272 + }
269 return cellValue; 273 return cellValue;
270 }, 274 },
271 }, 275 },
......
1 +import Vue from 'vue'
2 +import VueI18n from 'vue-i18n'
3 +
4 +import ElementLocale from 'element-ui/lib/locale'
5 +import enLocale from 'element-ui/lib/locale/lang/en'
6 +import zhLocale from 'element-ui/lib/locale/lang/zh-CN'
7 +
8 +import langZh from "@/assets/languages/zh.js"
9 +import langEN from "@/assets/languages/en.js"
10 +
11 +Vue.use(VueI18n)
12 +
13 +const i18n = new VueI18n({
14 + locale: 'zh',//默认语言
15 + messages: {
16 + 'zh': {...langZh,...zhLocale},
17 + 'en': {...langEN,...enLocale}
18 + }
19 +})
20 +ElementLocale.i18n((key, value) => i18n.t(key, value))
21 +
22 +export default i18n
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
2 <div v-if="!item.hidden"> 2 <div v-if="!item.hidden">
3 <template v-if="hasOneShowingChild(item.children,item) && (!onlyOneChild.children||onlyOneChild.noShowingChildren)&&!item.alwaysShow"> 3 <template v-if="hasOneShowingChild(item.children,item) && (!onlyOneChild.children||onlyOneChild.noShowingChildren)&&!item.alwaysShow">
4 <app-link v-if="onlyOneChild.meta" :to="resolvePath(onlyOneChild.path)"> 4 <app-link v-if="onlyOneChild.meta" :to="resolvePath(onlyOneChild.path)">
5 - <el-menu-item :index="resolvePath(onlyOneChild.path)" :class="{'submenu-title-noDropdown':!isNest}"> 5 + <el-menu-item :index="resolvePath(onlyOneChild.path)" :class="{'submenu-title-noDropdown':!isNest}" style="paddingRight:0">
6 <item :icon="onlyOneChild.meta.icon||(item.meta&&item.meta.icon)" :title="onlyOneChild.meta.title" /> 6 <item :icon="onlyOneChild.meta.icon||(item.meta&&item.meta.icon)" :title="onlyOneChild.meta.title" />
7 </el-menu-item> 7 </el-menu-item>
8 </app-link> 8 </app-link>
......
...@@ -11,6 +11,7 @@ import App from './App' ...@@ -11,6 +11,7 @@ import App from './App'
11 import store from './store' 11 import store from './store'
12 import router from './router' 12 import router from './router'
13 import permission from './directive/permission' 13 import permission from './directive/permission'
14 +import i18n from './i18n/index'
14 15
15 import './assets/icons' // icon 16 import './assets/icons' // icon
16 import './permission' // permission control 17 import './permission' // permission control
...@@ -48,10 +49,9 @@ Vue.prototype.msgInfo = function (msg) { ...@@ -48,10 +49,9 @@ Vue.prototype.msgInfo = function (msg) {
48 // 全局组件挂载 49 // 全局组件挂载
49 Vue.component('Pagination', Pagination) 50 Vue.component('Pagination', Pagination)
50 Vue.component('RightToolbar', RightToolbar) 51 Vue.component('RightToolbar', RightToolbar)
51 -Vue.component('Table', Table) 52 +Vue.component('Tables',Table)
52 53
53 Vue.use(permission) 54 Vue.use(permission)
54 -
55 /** 55 /**
56 * If you don't want to use mock-server 56 * If you don't want to use mock-server
57 * you want to use MockJs for mock api 57 * you want to use MockJs for mock api
...@@ -73,5 +73,6 @@ new Vue({ ...@@ -73,5 +73,6 @@ new Vue({
73 el: '#app', 73 el: '#app',
74 router, 74 router,
75 store, 75 store,
76 + i18n,
76 render: h => h(App) 77 render: h => h(App)
77 }) 78 })
......
...@@ -3,11 +3,11 @@ ...@@ -3,11 +3,11 @@
3 * Copyright (c) 2019 FedEx 3 * Copyright (c) 2019 FedEx
4 */ 4 */
5 5
6 -const baseURL = process.env.VUE_APP_BASE_API 6 + const baseURL = process.env.VUE_APP_BASE_API
7 7
8 -// 日期格式化 8 + // 日期格式化
9 -export function parseTime(time, pattern) { 9 + export function parseTime(time, pattern) {
10 - debugger 10 + //debugger
11 if (arguments.length === 0 || !time) { 11 if (arguments.length === 0 || !time) {
12 return null 12 return null
13 } 13 }
...@@ -45,17 +45,17 @@ export function parseTime(time, pattern) { ...@@ -45,17 +45,17 @@ export function parseTime(time, pattern) {
45 return value || 0 45 return value || 0
46 }) 46 })
47 return time_str 47 return time_str
48 -} 48 + }
49 49
50 -// 表单重置 50 + // 表单重置
51 -export function resetForm(refName) { 51 + export function resetForm(refName) {
52 if (this.$refs[refName]) { 52 if (this.$refs[refName]) {
53 this.$refs[refName].resetFields(); 53 this.$refs[refName].resetFields();
54 } 54 }
55 -} 55 + }
56 56
57 -// 添加日期范围 57 + // 添加日期范围
58 -export function addDateRange(params, dateRange, propName) { 58 + export function addDateRange(params, dateRange, propName) {
59 var search = params; 59 var search = params;
60 search.params = {}; 60 search.params = {};
61 if (null != dateRange && '' != dateRange) { 61 if (null != dateRange && '' != dateRange) {
...@@ -68,10 +68,10 @@ export function addDateRange(params, dateRange, propName) { ...@@ -68,10 +68,10 @@ export function addDateRange(params, dateRange, propName) {
68 } 68 }
69 } 69 }
70 return search; 70 return search;
71 -} 71 + }
72 72
73 -// 回显数据字典 73 + // 回显数据字典
74 -export function selectDictLabel(datas, value) { 74 + export function selectDictLabel(datas, value) {
75 var actions = []; 75 var actions = [];
76 Object.keys(datas).some((key) => { 76 Object.keys(datas).some((key) => {
77 if (datas[key].dictValue == ('' + value)) { 77 if (datas[key].dictValue == ('' + value)) {
...@@ -80,10 +80,10 @@ export function selectDictLabel(datas, value) { ...@@ -80,10 +80,10 @@ export function selectDictLabel(datas, value) {
80 } 80 }
81 }) 81 })
82 return actions.join(''); 82 return actions.join('');
83 -} 83 + }
84 84
85 -// 回显数据字典（字符串数组） 85 + // 回显数据字典（字符串数组）
86 -export function selectDictLabels(datas, value, separator) { 86 + export function selectDictLabels(datas, value, separator) {
87 var actions = []; 87 var actions = [];
88 var currentSeparator = undefined === separator ? "," : separator; 88 var currentSeparator = undefined === separator ? "," : separator;
89 var temp = value.split(currentSeparator); 89 var temp = value.split(currentSeparator);
...@@ -95,15 +95,15 @@ export function selectDictLabels(datas, value, separator) { ...@@ -95,15 +95,15 @@ export function selectDictLabels(datas, value, separator) {
95 }) 95 })
96 }) 96 })
97 return actions.join('').substring(0, actions.join('').length - 1); 97 return actions.join('').substring(0, actions.join('').length - 1);
98 -} 98 + }
99 99
100 -// 通用下载方法 100 + // 通用下载方法
101 -export function download(fileName) { 101 + export function download(fileName) {
102 window.location.href = baseURL + "/common/download?fileName=" + encodeURI(fileName) + "&delete=" + true; 102 window.location.href = baseURL + "/common/download?fileName=" + encodeURI(fileName) + "&delete=" + true;
103 -} 103 + }
104 104
105 -// 字符串格式化(%s ) 105 + // 字符串格式化(%s )
106 -export function sprintf(str) { 106 + export function sprintf(str) {
107 var args = arguments, flag = true, i = 1; 107 var args = arguments, flag = true, i = 1;
108 str = str.replace(/%s/g, function () { 108 str = str.replace(/%s/g, function () {
109 var arg = args[i++]; 109 var arg = args[i++];
...@@ -114,24 +114,24 @@ export function sprintf(str) { ...@@ -114,24 +114,24 @@ export function sprintf(str) {
114 return arg; 114 return arg;
115 }); 115 });
116 return flag ? str : ''; 116 return flag ? str : '';
117 -} 117 + }
118 118
119 -// 转换字符串，undefined,null等转化为"" 119 + // 转换字符串，undefined,null等转化为""
120 -export function praseStrEmpty(str) { 120 + export function praseStrEmpty(str) {
121 if (!str || str == "undefined" || str == "null") { 121 if (!str || str == "undefined" || str == "null") {
122 return ""; 122 return "";
123 } 123 }
124 return str; 124 return str;
125 -} 125 + }
126 126
127 -/** 127 + /**
128 * 构造树型结构数据 128 * 构造树型结构数据
129 * @param {*} data 数据源 129 * @param {*} data 数据源
130 * @param {*} id id字段 默认 'id' 130 * @param {*} id id字段 默认 'id'
131 * @param {*} parentId 父节点字段 默认 'parentId' 131 * @param {*} parentId 父节点字段 默认 'parentId'
132 * @param {*} children 孩子节点字段 默认 'children' 132 * @param {*} children 孩子节点字段 默认 'children'
133 */ 133 */
134 -export function handleTree(data, id, parentId, children) { 134 + export function handleTree(data, id, parentId, children) {
135 let config = { 135 let config = {
136 id: id || 'id', 136 id: id || 'id',
137 parentId: parentId || 'parentId', 137 parentId: parentId || 'parentId',
...@@ -173,4 +173,10 @@ export function handleTree(data, id, parentId, children) { ...@@ -173,4 +173,10 @@ export function handleTree(data, id, parentId, children) {
173 } 173 }
174 } 174 }
175 return tree; 175 return tree;
176 -} 176 + }
177 +
178 + //字符串英文转大写，；转英文;
179 + export function upCase(str){
180 + let newStr = str.replace(/；/g,";").toUpperCase();
181 + return newStr;
182 + }
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
15 max-height="200" 15 max-height="200"
16 border 16 border
17 stripe 17 stripe
18 + highlight-current-row
18 style="width: 100%" 19 style="width: 100%"
19 > 20 >
20 <el-table-column type="index" label="序号" align="center"> 21 <el-table-column type="index" label="序号" align="center">
...@@ -30,35 +31,13 @@ ...@@ -30,35 +31,13 @@
30 > 31 >
31 </el-table-column> 32 </el-table-column>
32 </el-table> 33 </el-table>
33 - <el-divider content-position="left">可配置航班信息</el-divider>
34 - <el-table
35 - :data="fltData"
36 - size="mini"
37 - height="200"
38 - max-height="200"
39 - border
40 - stripe
41 - style="width: 100%"
42 - >
43 - <el-table-column type="index" label="序号" align="center">
44 - </el-table-column>
45 - <el-table-column
46 - v-for="(item, index) in fltHeader"
47 - header-align="center"
48 - align="center"
49 - :prop="item.value"
50 - :label="item.name"
51 - :key="index"
52 - :show-overflow-tooltip="true"
53 - >
54 - </el-table-column>
55 - </el-table>
56 <el-form 34 <el-form
57 ref="form" 35 ref="form"
36 + label-position="right"
58 label-width="auto" 37 label-width="auto"
59 style="width: 400px; margin: 30px auto" 38 style="width: 400px; margin: 30px auto"
60 > 39 >
61 - <el-form-item label="航班号"> 40 + <el-form-item label="航班号" prop="fltNo">
62 <el-input 41 <el-input
63 v-model="fltNo" 42 v-model="fltNo"
64 size="medium" 43 size="medium"
...@@ -66,7 +45,7 @@ ...@@ -66,7 +45,7 @@
66 style="width: 350px" 45 style="width: 350px"
67 ></el-input> 46 ></el-input>
68 </el-form-item> 47 </el-form-item>
69 - <el-form-item label="航班日期:"> 48 + <el-form-item label="航班日期:" prop="fltDate">
70 <el-date-picker 49 <el-date-picker
71 v-model="formData.fltDate" 50 v-model="formData.fltDate"
72 type="date" 51 type="date"
...@@ -87,7 +66,7 @@ ...@@ -87,7 +66,7 @@
87 </template> 66 </template>
88 67
89 <script> 68 <script>
90 -import { findAllFltDataApi } from "@/api/findAllFltData"; 69 +import { allocationFlight } from "@/api/cargoSelect";
91 export default { 70 export default {
92 props: { 71 props: {
93 dialogVisible: { 72 dialogVisible: {
...@@ -101,17 +80,11 @@ export default { ...@@ -101,17 +80,11 @@ export default {
101 }, 80 },
102 data() { 81 data() {
103 return { 82 return {
104 - formData: { fltNo: "" }, 83 + formData: {
105 - fltSelect:{ 84 + ids:[],
106 - limitStart: 0, //当前条数【代表第几条数据 +1开始】 85 + fltNo: undefined,
107 - pageNum: 1, 86 + fltDate:undefined,
108 - limitSize: -1, //一页显示多少条数据 87 + overweight:false
109 - fltDateStart: undefined, //航班日期开始
110 - fltDateEnd: undefined, //航班日期结束
111 - typeId: undefined, //航班类型
112 - statusId: '83937', //航班状态
113 - flightKindId: undefined, //航班种类
114 - fltNo: undefined //航班号，要大写
115 }, 88 },
116 cargoHeader: [ 89 cargoHeader: [
117 { name: "口岸代码", value: "portName" }, 90 { name: "口岸代码", value: "portName" },
...@@ -141,18 +114,81 @@ export default { ...@@ -141,18 +114,81 @@ export default {
141 { name: "创建人", value: "createUserName" }, 114 { name: "创建人", value: "createUserName" },
142 { name: "创建时间", value: "createTime" }, 115 { name: "创建时间", value: "createTime" },
143 ], 116 ],
144 - fltData: [], 117 + rules:{
118 + fltNo: [{
119 + required: true,
120 + message: "航班号不能为空",
121 + trigger: "blur"
122 + }],
123 + fltDate: [{
124 + required: true,
125 + message: "航班日期不能为空",
126 + trigger: "change"
127 + }],
128 + }
145 }; 129 };
146 }, 130 },
147 methods: { 131 methods: {
132 + //确定配舱
148 submit() { 133 submit() {
149 - this.$emit("dialogBeforeClose", false); 134 + let arr = [];
135 + this.tableData.forEach(item => {
136 + arr.push(item.id)
137 + });
138 + this.formData.ids = arr;
139 + if(this.formData.fltNo && this.formData.fltDate){
140 + allocationFlight(this.formData).then(res=>{//code 200 配舱成功 601 重量已满需要确认 其余code直接输出msg
141 + if(code === 200){
142 + this.$message({
143 + message: "货物配舱成功",
144 + type: "success",
145 + });
146 + }else if(code === 601){
147 + this.$confirm('航班配重已满，是否继续配舱？', '提示', {
148 + confirmButtonText: '确定',
149 + cancelButtonText: '取消',
150 + type: 'warning'
151 + }).then(() => {
152 + this.formData.overweight = true;//确定继续overweight变为true再次请求接口
153 + allocationFlight(this.formData).then(res=>{
154 + if(code === 200){
155 + this.$message({
156 + message: "货物配舱成功",
157 + type: "success",
158 + });
159 + this.$emit("dialogBeforeClose", {close:false,reload:false});
160 + }else{
161 + this.$message({
162 + message: res.msg,
163 + type: "warning",
164 + });
165 + }
166 + })
167 + }).catch(() => {//取消 取消当前配舱
168 + this.$message({
169 + message: "配舱已取消",
170 + type: "success",
171 + });
172 + this.$emit("dialogBeforeClose", {close:false,reload:false});
173 + });
174 + }else{
175 + this.$message({
176 + message: res.msg,
177 + type: "warning",
178 + });
179 + }
180 + this.$emit("dialogBeforeClose", {close:false,reload:true});
181 + })
182 + }else{
183 + this.$message({
184 + message: "航班号或航班日期不能为空",
185 + type: "warning",
186 + });
187 + }
150 }, 188 },
151 dialogBeforeClose() { 189 dialogBeforeClose() {
152 - this.$emit("dialogBeforeClose", false); 190 + this.$emit("dialogBeforeClose", {close:false,reload:false});
153 - },
154 }, 191 },
155 - watch:{
156 }, 192 },
157 computed: { 193 computed: {
158 fltNo: { 194 fltNo: {
......
...@@ -4,9 +4,9 @@ ...@@ -4,9 +4,9 @@
4 <template v-else> 4 <template v-else>
5 <el-form ref="form" :model="form" label-width="200px" size="small" :disabled="disable" :rules="rules"> 5 <el-form ref="form" :model="form" label-width="200px" size="small" :disabled="disable" :rules="rules">
6 <el-row :gutter="20"> 6 <el-row :gutter="20">
7 - <el-col :span="8"> 7 + <el-col :span="12">
8 <el-form-item label="航班号" prop="purposeOfFlightNo"> 8 <el-form-item label="航班号" prop="purposeOfFlightNo">
9 - <el-input v-model.trim="form.purposeOfFlightNo" style="width: 30%" :disabled="nameDisabled"></el-input> 9 + <el-input v-model.trim="form.purposeOfFlightNo" style="width: 60%" :disabled="nameDisabled"></el-input>
10 </el-form-item> 10 </el-form-item>
11 </el-col> 11 </el-col>
12 <el-col :span="12"> 12 <el-col :span="12">
...@@ -100,8 +100,12 @@ ...@@ -100,8 +100,12 @@
100 <el-form-item label="申报类别"> 100 <el-form-item label="申报类别">
101 <el-card shadow="never" style="width: 70%"> 101 <el-card shadow="never" style="width: 70%">
102 <el-checkbox-group v-model="form.typeOfGoods"> 102 <el-checkbox-group v-model="form.typeOfGoods">
103 - <el-checkbox v-for="item in cargoType" :key="item.id" :label="item.chineseName" :name="item.chineseName"> 103 + <el-row>
104 + <el-col :span="2" v-for="item in cargoType" :key="item.id">
105 + <el-checkbox :label="item.chineseName" :name="item.chineseName">
104 </el-checkbox> 106 </el-checkbox>
107 + </el-col>
108 + </el-row>
105 </el-checkbox-group> 109 </el-checkbox-group>
106 </el-card> 110 </el-card>
107 </el-form-item> 111 </el-form-item>
...@@ -109,8 +113,11 @@ ...@@ -109,8 +113,11 @@
109 <el-form-item label="货物类型"> 113 <el-form-item label="货物类型">
110 <el-card shadow="never" style="width: 70%"> 114 <el-card shadow="never" style="width: 70%">
111 <el-checkbox-group v-model="form.declarationCategory"> 115 <el-checkbox-group v-model="form.declarationCategory">
112 - <el-checkbox v-for="item in cargoStatus" :key="item.id" :label="item.chineseName" :name="item.chineseName" 116 + <el-row>
113 - disabled></el-checkbox> 117 + <el-col :span="3" v-for="item in cargoStatus" :key="item.id">
118 + <el-checkbox :label="item.chineseName" :name="item.chineseName" disabled></el-checkbox>
119 + </el-col>
120 + </el-row>
114 </el-checkbox-group> 121 </el-checkbox-group>
115 </el-card> 122 </el-card>
116 </el-form-item> 123 </el-form-item>
...@@ -118,8 +125,11 @@ ...@@ -118,8 +125,11 @@
118 <el-form-item label="Service Code"> 125 <el-form-item label="Service Code">
119 <el-card shadow="never" style="width: 70%"> 126 <el-card shadow="never" style="width: 70%">
120 <el-checkbox-group v-model="form.serviceCode"> 127 <el-checkbox-group v-model="form.serviceCode">
121 - <el-checkbox v-for="item in serviceCode" :key="item.id" :label="item.englishName" 128 + <el-row>
122 - :name="item.englishName"></el-checkbox> 129 + <el-col :span="2" v-for="item in serviceCode" :key="item.id">
130 + <el-checkbox :label="item.englishName" :name="item.englishName"></el-checkbox>
131 + </el-col>
132 + </el-row>
123 </el-checkbox-group> 133 </el-checkbox-group>
124 </el-card> 134 </el-card>
125 </el-form-item> 135 </el-form-item>
...@@ -127,8 +137,11 @@ ...@@ -127,8 +137,11 @@
127 <el-form-item label="Handling Code"> 137 <el-form-item label="Handling Code">
128 <el-card shadow="never" style="width: 70%"> 138 <el-card shadow="never" style="width: 70%">
129 <el-checkbox-group v-model="form.handlingCode"> 139 <el-checkbox-group v-model="form.handlingCode">
130 - <el-checkbox v-for="item in handlingCode" :key="item.id" :label="item.englishName" 140 + <el-row>
131 - :name="item.englishName"></el-checkbox> 141 + <el-col :span="3" v-for="item in handlingCode" :key="item.id">
142 + <el-checkbox :label="item.englishName" :name="item.englishName"></el-checkbox>
143 + </el-col>
144 + </el-row>
132 </el-checkbox-group> 145 </el-checkbox-group>
133 </el-card> 146 </el-card>
134 </el-form-item> 147 </el-form-item>
...@@ -136,22 +149,27 @@ ...@@ -136,22 +149,27 @@
136 <el-form-item label="Sub Category"> 149 <el-form-item label="Sub Category">
137 <el-card shadow="never" style="width: 70%"> 150 <el-card shadow="never" style="width: 70%">
138 <el-checkbox-group v-model="form.subCategory"> 151 <el-checkbox-group v-model="form.subCategory">
139 - <el-checkbox v-for="item in subCategory" :key="item.id" :label="item.englishName" 152 + <el-row>
140 - :name="item.englishName"></el-checkbox> 153 + <el-col :span="3" v-for="item in subCategory" :key="item.id">
154 + <el-checkbox :label="item.englishName" :name="item.englishName"></el-checkbox>
155 + </el-col>
156 + </el-row>
141 </el-checkbox-group> 157 </el-checkbox-group>
142 </el-card> 158 </el-card>
143 </el-form-item> 159 </el-form-item>
144 160
161 + <el-form-item>
145 162
163 + </el-form-item>
146 </el-form> 164 </el-form>
147 - <el-row style="margin-left: 200px"> 165 + <div style="marginLeft:200px">
148 <el-button type="primary" size="small" v-if="$route.params.handle != 'detail'" @click="submit('form')" 166 <el-button type="primary" size="small" v-if="$route.params.handle != 'detail'" @click="submit('form')"
149 :loading="btnLoading"> 167 :loading="btnLoading">
150 <span v-if="$route.params.handle === 'add'">添加</span> 168 <span v-if="$route.params.handle === 'add'">添加</span>
151 <span v-else>保存</span> 169 <span v-else>保存</span>
152 </el-button> 170 </el-button>
153 <el-button size="small" @click="close">取消</el-button> 171 <el-button size="small" @click="close">取消</el-button>
154 - </el-row> 172 + </div>
155 </template> 173 </template>
156 </div> 174 </div>
157 </template> 175 </template>
......
...@@ -232,7 +232,8 @@ ...@@ -232,7 +232,8 @@
232 <el-button :type="downLoadingTip.downloading?'warning':'primary'" size="small" @click="xlse(1)" :disabled="tableData.length==0" :loading="downLoadingTip.downloading" 232 <el-button :type="downLoadingTip.downloading?'warning':'primary'" size="small" @click="xlse(1)" :disabled="tableData.length==0" :loading="downLoadingTip.downloading"
233 >{{downLoadingTip.downloading?downLoadingTip.tip:"导出全部查询结果"}}</el-button 233 >{{downLoadingTip.downloading?downLoadingTip.tip:"导出全部查询结果"}}</el-button
234 > 234 >
235 - <el-progress class="progress" :stroke-width="12" :show-text="true" :percentage="progress" :status="progress == 100?'success':'warning'"></el-progress> 235 + <span style="marginLeft:20px;color:#ffba00">全部导出上限80000条数据</span>
236 + <el-progress v-if="progress!=0" class="progress" :stroke-width="12" :show-text="true" :percentage="progress" :status="progress == 100?'success':'warning'"></el-progress>
236 <div class="tips"> 237 <div class="tips">
237 <span style="paddingRight: 50px">总重量:{{ allWeight }}</span> 238 <span style="paddingRight: 50px">总重量:{{ allWeight }}</span>
238 <span>总件数:{{ allQty }}</span> 239 <span>总件数:{{ allQty }}</span>
...@@ -283,6 +284,7 @@ ...@@ -283,6 +284,7 @@
283 <script> 284 <script>
284 import { findConditionData, findCargoData } from "@/api/cargoSelect"; 285 import { findConditionData, findCargoData } from "@/api/cargoSelect";
285 import { downLoadXlsx } from "@/utils/zipdownload"; 286 import { downLoadXlsx } from "@/utils/zipdownload";
287 +import { upCase } from "@/utils/FedEx"
286 288
287 export default { 289 export default {
288 name:"queryCargo", 290 name:"queryCargo",
...@@ -574,7 +576,7 @@ export default { ...@@ -574,7 +576,7 @@ export default {
574 }, 576 },
575 // 导出表格 577 // 导出表格
576 xlse(page) { 578 xlse(page) {
577 - this.progress = 0; 579 + this.progress = 1;
578 this.downLoadingTip.downloading = true; 580 this.downLoadingTip.downloading = true;
579 let cargoXlse = {title:"货物导出表",cargoConditionDto:{}}; 581 let cargoXlse = {title:"货物导出表",cargoConditionDto:{}};
580 if(this.formData.customsReceiptStatusId != null && this.formData.customsReceiptStatusId.length < 1){ 582 if(this.formData.customsReceiptStatusId != null && this.formData.customsReceiptStatusId.length < 1){
...@@ -662,8 +664,7 @@ export default { ...@@ -662,8 +664,7 @@ export default {
662 return this.formData.fltNo; 664 return this.formData.fltNo;
663 }, 665 },
664 set: function (val) { 666 set: function (val) {
665 - val = val.replace(/；/g,";"); 667 + this.formData.fltNo = upCase(val);
666 - this.formData.fltNo = val.toUpperCase();
667 }, 668 },
668 }, 669 },
669 siteName: { 670 siteName: {
...@@ -671,8 +672,7 @@ export default { ...@@ -671,8 +672,7 @@ export default {
671 return this.formData.siteName; 672 return this.formData.siteName;
672 }, 673 },
673 set: function (val) { 674 set: function (val) {
674 - val = val.replace(/；/g,";"); 675 + this.formData.siteName = upCase(val);
675 - this.formData.siteName = val.toUpperCase();
676 }, 676 },
677 }, 677 },
678 ursa: { 678 ursa: {
...@@ -680,8 +680,7 @@ export default { ...@@ -680,8 +680,7 @@ export default {
680 return this.formData.ursa; 680 return this.formData.ursa;
681 }, 681 },
682 set: function (val) { 682 set: function (val) {
683 - val = val.replace(/；/g,";"); 683 + this.formData.ursa = upCase(val);
684 - this.formData.ursa = val.toUpperCase();
685 }, 684 },
686 }, 685 },
687 cargoPlaneNo:{ 686 cargoPlaneNo:{
...@@ -689,8 +688,7 @@ export default { ...@@ -689,8 +688,7 @@ export default {
689 return this.formData.cargoPlaneNo; 688 return this.formData.cargoPlaneNo;
690 }, 689 },
691 set: function (val) { 690 set: function (val) {
692 - val = val.replace(/；/g,";"); 691 + this.formData.cargoPlaneNo = upCase(val);
693 - this.formData.cargoPlaneNo = val.toUpperCase();
694 }, 692 },
695 } 693 }
696 }, 694 },
......