Fedex / imac-vue

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

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

Inline Side-by-side
Showing 13 changed files with 479 additions and 187 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
......
1 <template> 1 <template>
2 <div class="cargoAllocation"> 2 <div class="cargoAllocation">
3 - <el-form ref="form" class="cargoForm form-header" label-width="auto" label-position="right"> 3 + <el-form ref="form" v-model="formData" class="form-header" label-position="right" label-width="auto" size="small">
4 <el-row type="flex" style="flexWrap: wrap !important"> 4 <el-row type="flex" style="flexWrap: wrap !important">
5 <el-col :span="6"> 5 <el-col :span="6">
6 <el-form-item label="ACCS原航班日期"> 6 <el-form-item label="ACCS原航班日期">
...@@ -10,13 +10,14 @@ ...@@ -10,13 +10,14 @@
10 range-separator="至" 10 range-separator="至"
11 start-placeholder="开始日期" 11 start-placeholder="开始日期"
12 end-placeholder="结束日期" 12 end-placeholder="结束日期"
13 + v-model="fltDate"
13 :value-format="valueFormat" 14 :value-format="valueFormat"
14 > 15 >
15 </el-date-picker> 16 </el-date-picker>
16 </el-form-item> 17 </el-form-item>
17 </el-col> 18 </el-col>
18 <el-col :span="6"> 19 <el-col :span="6">
19 - <el-form-item label="申报类型"> 20 + <el-form-item label="申报类别">
20 <el-select 21 <el-select
21 placeholder="不限" 22 placeholder="不限"
22 v-model="formData.typeId" 23 v-model="formData.typeId"
...@@ -24,7 +25,7 @@ ...@@ -24,7 +25,7 @@
24 clearable 25 clearable
25 > 26 >
26 <el-option 27 <el-option
27 - v-for="item in findConditionData.cargoType" 28 + v-for="item in selectData.findConditionData.cargoType"
28 :label="item.chineseName" 29 :label="item.chineseName"
29 :value="item.id" 30 :value="item.id"
30 :key="item.id" 31 :key="item.id"
...@@ -43,7 +44,7 @@ ...@@ -43,7 +44,7 @@
43 clearable 44 clearable
44 > 45 >
45 <el-option 46 <el-option
46 - v-for="item in findConditionData.cargoCustomsReturnStatus" 47 + v-for="item in selectData.findConditionData.cargoCustomsReturnStatus"
47 :label="item.chineseName" 48 :label="item.chineseName"
48 :value="item.id" 49 :value="item.id"
49 :key="item.id" 50 :key="item.id"
...@@ -61,7 +62,7 @@ ...@@ -61,7 +62,7 @@
61 clearable 62 clearable
62 > 63 >
63 <el-option 64 <el-option
64 - v-for="item in findConditionData.cargoStatus" 65 + v-for="item in selectData.findConditionData.cargoStatus"
65 :label="item.chineseName" 66 :label="item.chineseName"
66 :value="item.id" 67 :value="item.id"
67 :key="item.id" 68 :key="item.id"
...@@ -70,19 +71,6 @@ ...@@ -70,19 +71,6 @@
70 </el-select> 71 </el-select>
71 </el-form-item> 72 </el-form-item>
72 </el-col> 73 </el-col>
73 - <!-- <el-col :span="6">
74 - <el-form-item label="是否自动">
75 - <el-select
76 - placeholder="不限"
77 - v-model="formData.allocationTypeId"
78 - class="formItem"
79 - clearable
80 - >
81 - <el-option label="自动" value="2"> </el-option>
82 - <el-option label="手动" value="1"> </el-option>
83 - </el-select>
84 - </el-form-item>
85 - </el-col> -->
86 <el-col :span="6"> 74 <el-col :span="6">
87 <el-form-item label="航班类型"> 75 <el-form-item label="航班类型">
88 <el-select 76 <el-select
...@@ -91,7 +79,7 @@ ...@@ -91,7 +79,7 @@
91 class="formItem" 79 class="formItem"
92 clearable 80 clearable
93 > 81 >
94 - <el-option v-for="item in fltTypes" :label="item.chineseName" v-model="item.id" :key="item.id"> </el-option> 82 + <el-option v-for="item in selectData.fltTypes" :label="item.chineseName" v-model="item.id" :key="item.id"> </el-option>
95 </el-select> 83 </el-select>
96 </el-form-item> 84 </el-form-item>
97 </el-col> 85 </el-col>
...@@ -104,7 +92,7 @@ ...@@ -104,7 +92,7 @@
104 clearable 92 clearable
105 > 93 >
106 <el-option 94 <el-option
107 - v-for="item in findConditionData.cargoServiceType" 95 + v-for="item in selectData.findConditionData.cargoServiceType"
108 :label="item.chineseName" 96 :label="item.chineseName"
109 :value="item.id" 97 :value="item.id"
110 :key="item.id" 98 :key="item.id"
...@@ -114,57 +102,64 @@ ...@@ -114,57 +102,64 @@
114 </el-form-item> 102 </el-form-item>
115 </el-col> 103 </el-col>
116 <el-col :span="6"> 104 <el-col :span="6">
117 - <el-form-item label="运单号"> 105 + <el-form-item label="ACCS原航班号">
118 <el-input 106 <el-input
119 - type="textarea" 107 + v-model="fltNo"
120 - placeholder="xxxx;xxxx" 108 + placeholder="请输入ACCS原航班号"
121 - v-model="formData.waybillNo" 109 + class="formItem"
110 + clearable
122 ></el-input> 111 ></el-input>
123 </el-form-item> 112 </el-form-item>
124 </el-col> 113 </el-col>
125 <el-col :span="6"> 114 <el-col :span="6">
126 - <el-form-item label="ACCS原航班号"> 115 + <el-form-item label="运单号">
127 <el-input 116 <el-input
117 + class="formItem"
128 type="textarea" 118 type="textarea"
129 - v-model="formData.fltNo" 119 + placeholder="请输入运单号（回车分割）"
130 - placeholder="xxxx;xxxx" 120 + v-model="formData.waybillNo"
121 + rows="1"
131 ></el-input> 122 ></el-input>
132 </el-form-item> 123 </el-form-item>
133 </el-col> 124 </el-col>
134 <el-col :span="6"> 125 <el-col :span="6">
135 <el-form-item label="URSA"> 126 <el-form-item label="URSA">
136 <el-input 127 <el-input
128 + class="formItem"
137 type="textarea" 129 type="textarea"
138 placeholder="S_;P_;E2" 130 placeholder="S_;P_;E2"
139 v-model="ursa" 131 v-model="ursa"
132 + rows="1"
140 ></el-input> 133 ></el-input>
141 </el-form-item> 134 </el-form-item>
142 </el-col> 135 </el-col>
143 <el-col :span="6"> 136 <el-col :span="6">
144 <el-form-item label="站点"> 137 <el-form-item label="站点">
145 <el-input 138 <el-input
139 + class="formItem"
146 type="textarea" 140 type="textarea"
147 placeholder="PVG;PEK" 141 placeholder="PVG;PEK"
148 v-model="siteName" 142 v-model="siteName"
143 + rows="1"
149 ></el-input> 144 ></el-input>
150 </el-form-item> 145 </el-form-item>
151 </el-col> 146 </el-col>
152 <el-col :span="6"> 147 <el-col :span="6">
153 - <el-form-item label="重量区间:"> 148 + <el-form-item label="重量区间">
154 - <el-col :span="11"><el-input-number size="mini" v-model="formData.minWeight" :controls="false" :min="0"></el-input-number></el-col> 149 + <el-col :span="11"><el-input-number class="formItem" size="mini" v-model="formData.minWeight" :controls="false"></el-input-number></el-col>
155 <el-col class="line" :span="2">-</el-col> 150 <el-col class="line" :span="2">-</el-col>
156 - <el-col :span="11"><el-input-number size="mini" v-model="formData.maxWeight" :controls="false" :min="0"></el-input-number></el-col> 151 + <el-col :span="11"><el-input-number class="formItem" size="mini" v-model="formData.maxWeight" :controls="false"></el-input-number></el-col>
157 </el-form-item> 152 </el-form-item>
158 </el-col> 153 </el-col>
159 <el-col :span="6"> 154 <el-col :span="6">
160 - <el-form-item label="件数区间:"> 155 + <el-form-item label="件数区间">
161 - <el-col :span="11"><el-input-number size="mini" v-model="formData.minNumber" :controls="false" :min="0"></el-input-number></el-col> 156 + <el-col :span="11"><el-input-number class="formItem" size="mini" v-model="formData.minNumber" :controls="false"></el-input-number></el-col>
162 <el-col class="line" :span="2">-</el-col> 157 <el-col class="line" :span="2">-</el-col>
163 - <el-col :span="11"><el-input-number size="mini" v-model="formData.maxNumber" :controls="false" :min="0"></el-input-number></el-col> 158 + <el-col :span="11"><el-input-number class="formItem" size="mini" v-model="formData.maxNumber" :controls="false"></el-input-number></el-col>
164 </el-form-item> 159 </el-form-item>
165 </el-col> 160 </el-col>
166 <el-col :span="6"> 161 <el-col :span="6">
167 - <el-form-item label="取件日期:"> 162 + <el-form-item label="取件日期">
168 <el-date-picker 163 <el-date-picker
169 v-model="formData.pickUpDate" 164 v-model="formData.pickUpDate"
170 type="date" 165 type="date"
...@@ -175,16 +170,18 @@ ...@@ -175,16 +170,18 @@
175 </el-form-item> 170 </el-form-item>
176 </el-col> 171 </el-col>
177 <el-col :span="24"> 172 <el-col :span="24">
178 - <el-form-item label="Handling Code:"> 173 + <el-form-item label="Handling Code">
179 - <el-checkbox-group v-model="formData.handingCodes"> 174 + <el-empty description="暂无数据" v-if="selectData.HandlingCode.length == 0"></el-empty>
180 - <el-checkbox v-for="item in HandlingCode" :label="item.chineseName" v-model="item.id" :key="item.id"></el-checkbox> 175 + <el-checkbox-group v-model="handingCodes" v-else>
176 + <el-checkbox v-for="item in selectData.HandlingCode" :label="item.chineseName" v-model="item.englishName" :key="item.id"></el-checkbox>
181 </el-checkbox-group> 177 </el-checkbox-group>
182 </el-form-item> 178 </el-form-item>
183 </el-col> 179 </el-col>
184 <el-col :span="24"> 180 <el-col :span="24">
185 - <el-form-item label="Sub Category:"> 181 + <el-form-item label="Sub Category">
186 - <el-checkbox-group v-model="formData.subCategorys"> 182 + <el-empty description="暂无数据" v-if="selectData.SubCategory.length == 0"></el-empty>
187 - <el-checkbox v-for="item in SubCategory" :label="item.chineseName" v-model="item.id" :key="item.id"></el-checkbox> 183 + <el-checkbox-group v-model="subCategorys" v-else>
184 + <el-checkbox v-for="item in selectData.SubCategory" :label="item.chineseName" v-model="item.englishName" :key="item.id"></el-checkbox>
188 </el-checkbox-group> 185 </el-checkbox-group>
189 </el-form-item> 186 </el-form-item>
190 </el-col> 187 </el-col>
...@@ -227,19 +224,20 @@ ...@@ -227,19 +224,20 @@
227 </div> 224 </div>
228 </div> 225 </div>
229 </el-form> 226 </el-form>
230 - <Table 227 + <Tables
228 + ref="newTables"
231 :data="tableData" 229 :data="tableData"
232 :headerData="tableHeader" 230 :headerData="tableHeader"
233 :totalCount="totalCount" 231 :totalCount="totalCount"
234 :loading="loading" 232 :loading="loading"
235 - :limitSize="formData.limitSize" 233 + :limitSize="size"
236 :limitStart="formData.limitStart" 234 :limitStart="formData.limitStart"
237 :shiftKey="shiftKey" 235 :shiftKey="shiftKey"
238 - height="350" 236 + height="450"
239 @tableSelect="tableSelect" 237 @tableSelect="tableSelect"
240 @tableSelectAll="tableSelectAll" 238 @tableSelectAll="tableSelectAll"
241 @currentChange="currentChange" 239 @currentChange="currentChange"
242 - ></Table> 240 + ></Tables>
243 <Dialog 241 <Dialog
244 :tableData="tableSelection" 242 :tableData="tableSelection"
245 :dialogVisible="dialogVisible" 243 :dialogVisible="dialogVisible"
...@@ -250,10 +248,11 @@ ...@@ -250,10 +248,11 @@
250 248
251 <script> 249 <script>
252 import Dialog from "./info.vue"; 250 import Dialog from "./info.vue";
253 -import { findConditionData, findCargoData } from "@/api/cargoSelect"; 251 +import { findConditionData, findCargoAllocationData } from "@/api/cargoSelect";
254 import { allDictData } from "@/api/destinationFlight"; 252 import { allDictData } from "@/api/destinationFlight";
255 import { findFltConditionDataApi } from "@/api/findAllFltData"; 253 import { findFltConditionDataApi } from "@/api/findAllFltData";
256 -import { cargoXlsx } from "@/utils/zipdownload"; 254 +import { downLoadXlsx } from "@/utils/zipdownload";
255 +import { upCase } from "@/utils/FedEx"
257 256
258 export default { 257 export default {
259 components: { 258 components: {
...@@ -262,12 +261,23 @@ export default { ...@@ -262,12 +261,23 @@ export default {
262 data() { 261 data() {
263 return { 262 return {
264 formData: { 263 formData: {
265 - // allocationTypeId: "1", 264 + fltDateStart:null,
266 - handingCodes:[], 265 + fltDateEnd:null,
267 - subCategorys:[], 266 + typeId:null,
268 - page:1, 267 + statusId:null,
269 - limitStart: 0, 268 + kindToAllocFlightId:null,
270 - limitSize: 50, 269 + serviceTypeId:null,
270 + waybillNo:null,
271 + fltNo:null,
272 + ursaList:null,
273 + siteNameList:null,
274 + minWeight:null,
275 + maxWeight:null,
276 + minNumber:null,
277 + maxNumber:null,
278 + pickUpDate:null,
279 + handingCodes:null,
280 + subCategorys:null,
271 }, //查询数据 281 }, //查询数据
272 tableHeader: [ 282 tableHeader: [
273 { 283 {
...@@ -278,6 +288,7 @@ export default { ...@@ -278,6 +288,7 @@ export default {
278 align: "center", 288 align: "center",
279 sorTable: false, 289 sorTable: false,
280 slot: null, 290 slot: null,
291 + fixed:true,
281 }, 292 },
282 { 293 {
283 type: "index", 294 type: "index",
...@@ -287,6 +298,7 @@ export default { ...@@ -287,6 +298,7 @@ export default {
287 align: "center", 298 align: "center",
288 sorTable: false, 299 sorTable: false,
289 slot: null, 300 slot: null,
301 + fixed:false,
290 }, 302 },
291 { 303 {
292 type: "", 304 type: "",
...@@ -296,6 +308,7 @@ export default { ...@@ -296,6 +308,7 @@ export default {
296 align: "center", 308 align: "center",
297 sorTable: false, 309 sorTable: false,
298 slot: null, 310 slot: null,
311 + fixed:false,
299 }, 312 },
300 { 313 {
301 type: "", 314 type: "",
...@@ -305,6 +318,7 @@ export default { ...@@ -305,6 +318,7 @@ export default {
305 align: "center", 318 align: "center",
306 sorTable: false, 319 sorTable: false,
307 slot: null, 320 slot: null,
321 + fixed:false,
308 }, 322 },
309 { 323 {
310 type: "", 324 type: "",
...@@ -314,6 +328,7 @@ export default { ...@@ -314,6 +328,7 @@ export default {
314 align: "center", 328 align: "center",
315 sorTable: false, 329 sorTable: false,
316 slot: null, 330 slot: null,
331 + fixed:false,
317 }, 332 },
318 { 333 {
319 type: "", 334 type: "",
...@@ -323,6 +338,7 @@ export default { ...@@ -323,6 +338,7 @@ export default {
323 align: "center", 338 align: "center",
324 sorTable: false, 339 sorTable: false,
325 slot: null, 340 slot: null,
341 + fixed:false,
326 }, 342 },
327 { 343 {
328 type: "", 344 type: "",
...@@ -332,6 +348,7 @@ export default { ...@@ -332,6 +348,7 @@ export default {
332 align: "center", 348 align: "center",
333 sorTable: false, 349 sorTable: false,
334 slot: null, 350 slot: null,
351 + fixed:false,
335 }, 352 },
336 { 353 {
337 type: "", 354 type: "",
...@@ -341,6 +358,7 @@ export default { ...@@ -341,6 +358,7 @@ export default {
341 align: "center", 358 align: "center",
342 sorTable: false, 359 sorTable: false,
343 slot: null, 360 slot: null,
361 + fixed:false,
344 }, 362 },
345 { 363 {
346 type: "", 364 type: "",
...@@ -350,6 +368,7 @@ export default { ...@@ -350,6 +368,7 @@ export default {
350 align: "center", 368 align: "center",
351 sorTable: false, 369 sorTable: false,
352 slot: null, 370 slot: null,
371 + fixed:false,
353 }, 372 },
354 { 373 {
355 type: "", 374 type: "",
...@@ -359,6 +378,7 @@ export default { ...@@ -359,6 +378,7 @@ export default {
359 align: "center", 378 align: "center",
360 sorTable: false, 379 sorTable: false,
361 slot: null, 380 slot: null,
381 + fixed:false,
362 }, 382 },
363 { 383 {
364 type: "", 384 type: "",
...@@ -368,6 +388,7 @@ export default { ...@@ -368,6 +388,7 @@ export default {
368 align: "center", 388 align: "center",
369 sorTable: false, 389 sorTable: false,
370 slot: null, 390 slot: null,
391 + fixed:false,
371 }, 392 },
372 { 393 {
373 type: "", 394 type: "",
...@@ -377,6 +398,7 @@ export default { ...@@ -377,6 +398,7 @@ export default {
377 align: "center", 398 align: "center",
378 sorTable: false, 399 sorTable: false,
379 slot: null, 400 slot: null,
401 + fixed:false,
380 }, 402 },
381 { 403 {
382 type: "", 404 type: "",
...@@ -386,6 +408,7 @@ export default { ...@@ -386,6 +408,7 @@ export default {
386 align: "center", 408 align: "center",
387 sorTable: false, 409 sorTable: false,
388 slot: null, 410 slot: null,
411 + fixed:false,
389 }, 412 },
390 { 413 {
391 type: "", 414 type: "",
...@@ -395,6 +418,7 @@ export default { ...@@ -395,6 +418,7 @@ export default {
395 align: "center", 418 align: "center",
396 sorTable: false, 419 sorTable: false,
397 slot: null, 420 slot: null,
421 + fixed:false,
398 }, 422 },
399 { 423 {
400 type: "", 424 type: "",
...@@ -404,6 +428,7 @@ export default { ...@@ -404,6 +428,7 @@ export default {
404 align: "center", 428 align: "center",
405 sorTable: false, 429 sorTable: false,
406 slot: null, 430 slot: null,
431 + fixed:false,
407 }, 432 },
408 { 433 {
409 type: "", 434 type: "",
...@@ -413,6 +438,7 @@ export default { ...@@ -413,6 +438,7 @@ export default {
413 align: "center", 438 align: "center",
414 sorTable: false, 439 sorTable: false,
415 slot: null, 440 slot: null,
441 + fixed:false,
416 }, 442 },
417 { 443 {
418 type: "", 444 type: "",
...@@ -422,6 +448,7 @@ export default { ...@@ -422,6 +448,7 @@ export default {
422 align: "center", 448 align: "center",
423 sorTable: false, 449 sorTable: false,
424 slot: null, 450 slot: null,
451 + fixed:false,
425 }, 452 },
426 { 453 {
427 type: "", 454 type: "",
...@@ -431,6 +458,7 @@ export default { ...@@ -431,6 +458,7 @@ export default {
431 align: "center", 458 align: "center",
432 sorTable: false, 459 sorTable: false,
433 slot: null, 460 slot: null,
461 + fixed:false,
434 }, 462 },
435 { 463 {
436 type: "", 464 type: "",
...@@ -440,6 +468,7 @@ export default { ...@@ -440,6 +468,7 @@ export default {
440 align: "center", 468 align: "center",
441 sorTable: false, 469 sorTable: false,
442 slot: null, 470 slot: null,
471 + fixed:false,
443 }, 472 },
444 { 473 {
445 type: "", 474 type: "",
...@@ -449,6 +478,7 @@ export default { ...@@ -449,6 +478,7 @@ export default {
449 align: "center", 478 align: "center",
450 sorTable: false, 479 sorTable: false,
451 slot: null, 480 slot: null,
481 + fixed:false,
452 }, 482 },
453 { 483 {
454 type: "", 484 type: "",
...@@ -458,6 +488,7 @@ export default { ...@@ -458,6 +488,7 @@ export default {
458 align: "center", 488 align: "center",
459 sorTable: false, 489 sorTable: false,
460 slot: null, 490 slot: null,
491 + fixed:false,
461 }, 492 },
462 { 493 {
463 type: "", 494 type: "",
...@@ -467,6 +498,7 @@ export default { ...@@ -467,6 +498,7 @@ export default {
467 align: "center", 498 align: "center",
468 sorTable: false, 499 sorTable: false,
469 slot: null, 500 slot: null,
501 + fixed:false,
470 }, 502 },
471 { 503 {
472 type: "", 504 type: "",
...@@ -476,6 +508,7 @@ export default { ...@@ -476,6 +508,7 @@ export default {
476 align: "center", 508 align: "center",
477 sorTable: false, 509 sorTable: false,
478 slot: null, 510 slot: null,
511 + fixed:false,
479 }, 512 },
480 { 513 {
481 type: "", 514 type: "",
...@@ -485,6 +518,7 @@ export default { ...@@ -485,6 +518,7 @@ export default {
485 align: "center", 518 align: "center",
486 sorTable: false, 519 sorTable: false,
487 slot: null, 520 slot: null,
521 + fixed:false,
488 }, 522 },
489 { 523 {
490 type: "", 524 type: "",
...@@ -494,6 +528,7 @@ export default { ...@@ -494,6 +528,7 @@ export default {
494 align: "center", 528 align: "center",
495 sorTable: false, 529 sorTable: false,
496 slot: null, 530 slot: null,
531 + fixed:false,
497 }, 532 },
498 { 533 {
499 type: "", 534 type: "",
...@@ -503,6 +538,7 @@ export default { ...@@ -503,6 +538,7 @@ export default {
503 align: "center", 538 align: "center",
504 sorTable: false, 539 sorTable: false,
505 slot: null, 540 slot: null,
541 + fixed:false,
506 }, 542 },
507 { 543 {
508 type: "", 544 type: "",
...@@ -512,6 +548,7 @@ export default { ...@@ -512,6 +548,7 @@ export default {
512 align: "center", 548 align: "center",
513 sorTable: false, 549 sorTable: false,
514 slot: null, 550 slot: null,
551 + fixed:false,
515 }, 552 },
516 { 553 {
517 type: "", 554 type: "",
...@@ -521,6 +558,7 @@ export default { ...@@ -521,6 +558,7 @@ export default {
521 align: "center", 558 align: "center",
522 sorTable: false, 559 sorTable: false,
523 slot: null, 560 slot: null,
561 + fixed:false,
524 }, 562 },
525 { 563 {
526 type: "", 564 type: "",
...@@ -530,6 +568,7 @@ export default { ...@@ -530,6 +568,7 @@ export default {
530 align: "center", 568 align: "center",
531 sorTable: false, 569 sorTable: false,
532 slot: null, 570 slot: null,
571 + fixed:false,
533 }, 572 },
534 { 573 {
535 type: "", 574 type: "",
...@@ -539,6 +578,7 @@ export default { ...@@ -539,6 +578,7 @@ export default {
539 align: "center", 578 align: "center",
540 sorTable: false, 579 sorTable: false,
541 slot: null, 580 slot: null,
581 + fixed:false,
542 }, 582 },
543 { 583 {
544 type: "", 584 type: "",
...@@ -548,6 +588,7 @@ export default { ...@@ -548,6 +588,7 @@ export default {
548 align: "center", 588 align: "center",
549 sorTable: false, 589 sorTable: false,
550 slot: null, 590 slot: null,
591 + fixed:false,
551 }, 592 },
552 { 593 {
553 type: "", 594 type: "",
...@@ -557,6 +598,7 @@ export default { ...@@ -557,6 +598,7 @@ export default {
557 align: "center", 598 align: "center",
558 sorTable: false, 599 sorTable: false,
559 slot: null, 600 slot: null,
601 + fixed:false,
560 }, 602 },
561 { 603 {
562 type: "", 604 type: "",
...@@ -566,6 +608,7 @@ export default { ...@@ -566,6 +608,7 @@ export default {
566 align: "center", 608 align: "center",
567 sorTable: false, 609 sorTable: false,
568 slot: null, 610 slot: null,
611 + fixed:false,
569 }, 612 },
570 { 613 {
571 type: "", 614 type: "",
...@@ -575,6 +618,7 @@ export default { ...@@ -575,6 +618,7 @@ export default {
575 align: "center", 618 align: "center",
576 sorTable: false, 619 sorTable: false,
577 slot: null, 620 slot: null,
621 + fixed:false,
578 }, 622 },
579 { 623 {
580 type: "", 624 type: "",
...@@ -584,6 +628,7 @@ export default { ...@@ -584,6 +628,7 @@ export default {
584 align: "center", 628 align: "center",
585 sorTable: false, 629 sorTable: false,
586 slot: null, 630 slot: null,
631 + fixed:false,
587 }, 632 },
588 { 633 {
589 type: "", 634 type: "",
...@@ -593,6 +638,7 @@ export default { ...@@ -593,6 +638,7 @@ export default {
593 align: "center", 638 align: "center",
594 sorTable: false, 639 sorTable: false,
595 slot: null, 640 slot: null,
641 + fixed:false,
596 }, 642 },
597 { 643 {
598 type: "", 644 type: "",
...@@ -602,6 +648,7 @@ export default { ...@@ -602,6 +648,7 @@ export default {
602 align: "center", 648 align: "center",
603 sorTable: false, 649 sorTable: false,
604 slot: null, 650 slot: null,
651 + fixed:false,
605 }, 652 },
606 { 653 {
607 type: "", 654 type: "",
...@@ -611,6 +658,7 @@ export default { ...@@ -611,6 +658,7 @@ export default {
611 align: "center", 658 align: "center",
612 sorTable: false, 659 sorTable: false,
613 slot: null, 660 slot: null,
661 + fixed:false,
614 }, 662 },
615 { 663 {
616 type: "", 664 type: "",
...@@ -620,6 +668,7 @@ export default { ...@@ -620,6 +668,7 @@ export default {
620 align: "center", 668 align: "center",
621 sorTable: false, 669 sorTable: false,
622 slot: null, 670 slot: null,
671 + fixed:false,
623 }, 672 },
624 { 673 {
625 type: "", 674 type: "",
...@@ -629,6 +678,7 @@ export default { ...@@ -629,6 +678,7 @@ export default {
629 align: "center", 678 align: "center",
630 sorTable: false, 679 sorTable: false,
631 slot: null, 680 slot: null,
681 + fixed:false,
632 }, 682 },
633 { 683 {
634 type: "", 684 type: "",
...@@ -638,6 +688,7 @@ export default { ...@@ -638,6 +688,7 @@ export default {
638 align: "center", 688 align: "center",
639 sorTable: false, 689 sorTable: false,
640 slot: null, 690 slot: null,
691 + fixed:false,
641 }, 692 },
642 { 693 {
643 type: "", 694 type: "",
...@@ -647,6 +698,7 @@ export default { ...@@ -647,6 +698,7 @@ export default {
647 align: "center", 698 align: "center",
648 sorTable: false, 699 sorTable: false,
649 slot: null, 700 slot: null,
701 + fixed:false,
650 }, 702 },
651 { 703 {
652 type: "", 704 type: "",
...@@ -656,16 +708,26 @@ export default { ...@@ -656,16 +708,26 @@ export default {
656 align: "center", 708 align: "center",
657 sorTable: false, 709 sorTable: false,
658 slot: null, 710 slot: null,
711 + fixed:false,
659 }, 712 },
660 ], //表头数据 713 ], //表头数据
661 tableData: [], //表格数据 714 tableData: [], //表格数据
662 tableSelection: [], //选中数据 715 tableSelection: [], //选中数据
716 + selectData:{
663 findConditionData: [], 717 findConditionData: [],
664 fltTypes:[], 718 fltTypes:[],
665 HandlingCode: [], 719 HandlingCode: [],
666 SubCategory: [], 720 SubCategory: [],
721 + },//查询条件
722 + fltDate:[],
723 + ursaList:'',
724 + siteNameList:'',
725 + handingCodes:[],
726 + subCategorys:[],
667 valueFormat: "yyyy-MM-dd", 727 valueFormat: "yyyy-MM-dd",
668 totalCount: 0, 728 totalCount: 0,
729 + page:1,
730 + size:100,
669 allWeight: 0, 731 allWeight: 0,
670 allQty: 0, 732 allQty: 0,
671 dialogVisible: false, 733 dialogVisible: false,
...@@ -673,48 +735,54 @@ export default { ...@@ -673,48 +735,54 @@ export default {
673 createDate: null, 735 createDate: null,
674 loading: false, 736 loading: false,
675 downLoadingTip:{ 737 downLoadingTip:{
676 - tip:"正在导出本页结果集", 738 + tip:"",
677 downloading: false, 739 downloading: false,
678 }, 740 },
679 }; 741 };
680 }, 742 },
681 created() { 743 created() {
682 //查询条件 744 //查询条件
683 - new Promise((resolve,reject)=>{ 745 + allDictData().then(res=>{
684 - findFltConditionDataApi().then(res=>{
685 if(res.code === 200){ 746 if(res.code === 200){
686 - this.fltTypes = res.data.flightType 747 + this.selectData.SubCategory = res.data.subCategory;
748 + this.selectData.HandlingCode = res.data.handlingCode;
687 }else{ 749 }else{
688 - reject(res.msg) 750 + this.$message({
751 + message: "查询条件不存在",
752 + type: "warning",
753 + });
689 } 754 }
690 - }).catch(()=>{}) 755 + })
691 756
692 - allDictData().then(res=>{ 757 + findFltConditionDataApi().then(res=>{
693 if(res.code === 200){ 758 if(res.code === 200){
694 - this.HandlingCode = res.data.handlingCode; 759 + this.selectData.fltTypes = res.data.flightType
695 - this.SubCategory = res.data.subCategory;
696 }else{ 760 }else{
697 - reject(res.msg) 761 + this.$message({
762 + message: "查询条件不存在",
763 + type: "warning",
764 + });
698 } 765 }
699 - }).catch(()=>{}) 766 + })
700 767
701 findConditionData().then((res) => { 768 findConditionData().then((res) => {
702 if (res.code == 200) { 769 if (res.code == 200) {
703 - this.findConditionData = res.data; 770 + this.selectData.findConditionData = res.data;
704 } else { 771 } else {
705 - reject(res.msg)
706 - }
707 - }).catch(()=>{});
708 - }).catch(err=>{
709 this.$message({ 772 this.$message({
710 message: "查询条件不存在", 773 message: "查询条件不存在",
711 type: "warning", 774 type: "warning",
712 }); 775 });
776 + }
713 }) 777 })
714 - 778 + this.select();
715 - // this.select();
716 }, 779 },
717 mounted(){ 780 mounted(){
781 + // this.selectData.HandlingCode.forEach((item,index)=>{
782 + // if(item.id === 108093){
783 + // this.selectData.HandlingCode.unshift(this.HandlingCode.splice(index,1)[0])
784 + // }
785 + // })
718 window.addEventListener("keydown", (code) => { 786 window.addEventListener("keydown", (code) => {
719 if (code.keyCode === 16 && code.shiftKey) { 787 if (code.keyCode === 16 && code.shiftKey) {
720 this.shiftKey = true; 788 this.shiftKey = true;
...@@ -729,13 +797,14 @@ export default { ...@@ -729,13 +797,14 @@ export default {
729 methods: { 797 methods: {
730 select() { 798 select() {
731 this.loading = true; 799 this.loading = true;
732 - findCargoData(this.formData) 800 + this.dataInfo()
801 + findCargoAllocationData(this.formData)
733 .then((res) => { 802 .then((res) => {
734 this.loading = false; 803 this.loading = false;
735 if (res.code === 200) { 804 if (res.code === 200) {
736 - if (res.data.list.length > 0) {
737 this.tableData = res.data.list; 805 this.tableData = res.data.list;
738 - this.totalCount = res.data.totalCount; 806 + if (res.data.list.length > 0) {
807 + this.totalCount = res.data.total;
739 this.tableData.forEach((item,index = 0)=>{ 808 this.tableData.forEach((item,index = 0)=>{
740 item.index = index 809 item.index = index
741 }) 810 })
...@@ -768,7 +837,68 @@ export default { ...@@ -768,7 +837,68 @@ export default {
768 this.allQty = this.allQty.toFixed(); 837 this.allQty = this.allQty.toFixed();
769 } 838 }
770 }, 839 },
771 - xlse(val) {}, 840 + dataInfo(){
841 + this.formData.ursaList = null;
842 + this.formData.siteNameList = null;
843 + this.formData.handingCodes = null;
844 + this.formData.subCategorys = null;
845 + if(this.handingCodes.length > 0 ){
846 + this.formData.handingCodes = this.handingCodes;
847 + }
848 + if(this.subCategorys.length > 0){
849 + this.formData.subCategorys = this.subCategorys;
850 + }
851 + if(this.formData.minWeight === 0){
852 + this.formData.minWeight = null;
853 + }
854 + if(this.formData.maxWeight === 0){
855 + this.formData.maxWeight = null;
856 + }
857 + if(this.formData.minNumber === 0){
858 + this.formData.minNumber = null;
859 + }
860 + if(this.formData.maxNumber === 0){
861 + this.formData.maxNumber = null;
862 + }
863 + if(this.ursaList && this.ursaList != ''){
864 + this.formData.ursaList = this.ursaList.split(';' || '')
865 + }
866 + if(this.siteNameList && this.siteNameList != ''){
867 + this.formData.siteNameList = this.siteNameList.split(';' || '')
868 + }
869 + if(this.fltDate && this.fltDate.length > 0){
870 + this.formData.fltDateStart = this.fltDate[0];
871 + this.formData.fltDateEnd = this.fltDate[1];
872 + }else{
873 + this.formData.fltDateStart = null;
874 + this.formData.fltDateEnd = null;
875 + }
876 + this.formData.page = this.page;
877 + this.formData.size = this.size;
878 + },
879 + xlse(val) {
880 + this.downLoadingTip.downloading = true;
881 + this.dataInfo()
882 + if(val === 0){
883 + this.downLoadingTip.tip = '正在导出本页结果集';
884 + downLoadXlsx('/cargo/allocationExcel',this.formData,'手动配舱表').then(res=>{
885 + this.downLoadingTip.downloading = false;
886 + }).catch(err=>{
887 + this.downLoadingTip.downloading = false;
888 + console.log(err)
889 + })
890 + }else{
891 + this.downLoadingTip.tip = '正在导出全部结果集请耐心等待';
892 + this.formData.page = null;
893 + this.formData.size = null;
894 + downLoadXlsx('/cargo/allocationExcel',this.formData,'手动配舱表').then(res=>{
895 + this.downLoadingTip.downloading = false;
896 + }).catch(err=>{
897 + this.downLoadingTip.downloading = false;
898 + console.log(err)
899 + })
900 + }
901 + },
772 tableSelect(val) { 902 tableSelect(val) {
773 this.tableSelection = val.selection 903 this.tableSelection = val.selection
774 this.cargoTotal() 904 this.cargoTotal()
...@@ -779,38 +909,68 @@ export default { ...@@ -779,38 +909,68 @@ export default {
779 }, 909 },
780 currentChange(val){ 910 currentChange(val){
781 this.formData.limitStart = val.start; 911 this.formData.limitStart = val.start;
782 - this.formData.page = val.page; 912 + this.page = val.page;
783 this.select() 913 this.select()
784 }, 914 },
785 addFit() { 915 addFit() {
786 - this.dialogVisible = true; 916 + let open = true;
917 + this.tableSelection.forEach(item=>{
918 + if(item.statusId != 107966){
919 + open = false;
920 + }
921 + })
922 + if(open){
923 + this.dialogVisible = open;
924 + }else{
925 + this.$message({
926 + message: "此类型货物不可配舱",
927 + type: "warning",
928 + });
929 + this.tableSelection = [];
930 + this.cargoTotal();
931 + this.$refs.newTables.clearTable();
932 + }
787 }, 933 },
788 dialogBeforeClose(val) { 934 dialogBeforeClose(val) {
789 - this.dialogVisible = val; 935 + this.dialogVisible = val.close;
936 + if(val.reload){
937 + this.tableSelection = [];
938 + this.$refs.newTables.clearTable();
939 + this.cargoTotal();
940 + this.select();
941 + }
790 }, 942 },
791 }, 943 },
792 computed: { 944 computed: {
945 + fltNo: {
946 + get: function () {
947 + return this.formData.fltNo;
948 + },
949 + set: function (val) {
950 + this.formData.fltNo = upCase(val);
951 + },
952 + },
793 ursa: { 953 ursa: {
794 get: function () { 954 get: function () {
795 - return this.formData.ursaList; 955 + return this.ursaList;
796 }, 956 },
797 set: function (val) { 957 set: function (val) {
798 - this.formData.ursaList = val.toUpperCase(); 958 + this.ursaList = upCase(val);
799 }, 959 },
800 }, 960 },
801 siteName: { 961 siteName: {
802 get: function () { 962 get: function () {
803 - return this.formData.siteNameList; 963 + return this.siteNameList;
804 }, 964 },
805 set: function (val) { 965 set: function (val) {
806 - this.formData.siteNameList = val.toUpperCase(); 966 + this.siteNameList = upCase(val);
807 }, 967 },
808 }, 968 },
809 }, 969 },
810 }; 970 };
811 </script> 971 </script>
812 972
813 -<style> 973 +<style lang="scss">
814 .tips { 974 .tips {
815 display: inline-block; 975 display: inline-block;
816 color: #606266; 976 color: #606266;
...@@ -821,4 +981,17 @@ export default { ...@@ -821,4 +981,17 @@ export default {
821 .line{ 981 .line{
822 text-align: center; 982 text-align: center;
823 } 983 }
984 +.el-empty{
985 + width:30%;
986 + height:37px;
987 + padding:0px;
988 + line-height: 37px;
989 + .el-empty__image{
990 + width: 0px;
991 + height:0px;
992 + }
993 + .el-empty__description{
994 + margin-top:0px;
995 + }
996 +}
824 </style> 997 </style>
...\ 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 },
......