Fedex / imac-vue

Go to a project
Toggle navigation Toggle navigation pinning
jinhui.wang
0bd7c07a 1 parent 6b952416

version:0.5.7.2,图标添加，新增航班删除，表格排序更新，表格重量计算更新，货物查询更新

Inline Side-by-side
Showing 16 changed files with 755 additions and 463 deletions
......@@ -26,6 +26,14 @@ export function findFltById(data) {
})
}
//删除航班
export function delFlight(data) {
return request({
url: '/FlightPreserveController/delFlight/'+ data,
method: 'post'
})
}
//新增修改
export function saveOrUpdate(data) {
return request({
......
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1640932660027" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="9915" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M682.496 420.864V597.333333a42.666667 42.666667 0 0 0 85.333333 0V388.565333l128-48.469333v436.736l-341.333333 124.245333V469.333333l128-48.469333zM415.957333 161.834667L511.829333 128l362.666667 128-113.450667 40.021333L416 161.834667z m-102.229333 36.096l345.088 134.186666L511.829333 384l-362.666666-128 164.565333-58.069333z m212.736 799.402666l426.624-155.136a42.666667 42.666667 0 0 0 28.074667-40.106666V243.2a42.666667 42.666667 0 0 0-28.074667-40.106667L526.506667 48.042667a42.666667 42.666667 0 0 0-29.354667 0.085333L70.570667 205.397333A42.666667 42.666667 0 0 0 42.666667 245.674667l3.285333 556.714666a42.666667 42.666667 0 0 0 27.989333 39.808l423.253334 155.093334a42.666667 42.666667 0 0 0 29.269333 0.042666zM469.162667 469.333333v429.226667l-341.333334-124.202667V337.621333l341.333334 131.712z" p-id="9916"></path></svg>
\ No newline at end of file
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1569915748289" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3062" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M768.35456 416a256 256 0 1 0-512 0 192 192 0 1 0 0 384v64a256 256 0 0 1-58.88-505.216 320.128 320.128 0 0 1 629.76 0A256.128 256.128 0 0 1 768.35456 864v-64a192 192 0 0 0 0-384z m-512 384h64v64H256.35456v-64z m448 0h64v64h-64v-64z" fill="#333333" p-id="3063"></path><path d="M539.04256 845.248V512.192a32.448 32.448 0 0 0-32-32.192c-17.664 0-32 14.912-32 32.192v333.056l-36.096-36.096a32.192 32.192 0 0 0-45.056 0.192 31.616 31.616 0 0 0-0.192 45.056l90.88 90.944a31.36 31.36 0 0 0 22.528 9.088 30.08 30.08 0 0 0 22.4-9.088l90.88-90.88a32.192 32.192 0 0 0-0.192-45.12 31.616 31.616 0 0 0-45.056-0.192l-36.096 36.096z" fill="#333333" p-id="3064"></path></svg>
\ No newline at end of file
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1569915748289" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3062" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M768.35456 416a256 256 0 1 0-512 0 192 192 0 1 0 0 384v64a256 256 0 0 1-58.88-505.216 320.128 320.128 0 0 1 629.76 0A256.128 256.128 0 0 1 768.35456 864v-64a192 192 0 0 0 0-384z m-512 384h64v64H256.35456v-64z m448 0h64v64h-64v-64z" p-id="3063"></path><path d="M539.04256 845.248V512.192a32.448 32.448 0 0 0-32-32.192c-17.664 0-32 14.912-32 32.192v333.056l-36.096-36.096a32.192 32.192 0 0 0-45.056 0.192 31.616 31.616 0 0 0-0.192 45.056l90.88 90.944a31.36 31.36 0 0 0 22.528 9.088 30.08 30.08 0 0 0 22.4-9.088l90.88-90.88a32.192 32.192 0 0 0-0.192-45.12 31.616 31.616 0 0 0-45.056-0.192l-36.096 36.096z" p-id="3064"></path></svg>
\ No newline at end of file
......
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1645581110679" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2204" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M950.555 411.291l-380.258-300.594c-32.737-25.963-84.018-25.963-116.754 0l-380.097 300.594c-13.062 10.321-15.158 29.189-4.999 42.090s28.705 15.158 41.768 4.999l11.772-9.676v363.326c0 51.443 54.346 89.985 101.918 89.985h599.899c47.089 0 78.052-36.123 78.052-89.985v-362.036l10.966 8.386c5.483 4.354 12.256 6.451 18.868 6.451 8.87 0 17.739-3.87 23.706-11.45 10.321-12.901 8.225-31.769-4.838-42.090zM481.924 842.025v-166.424c0-8.225 14.997-12.417 29.995-12.417s29.995 4.192 29.995 12.417v166.263l-59.99 0.161zM842.025 812.030c0 19.836-5.483 29.995-18.062 29.995h-221.414c0-0.484-0.645-0.806-0.645-1.29v-165.133c0-34.833-28.059-72.407-89.985-72.407s-89.985 37.574-89.985 72.407v165.133c0 0.484 0.806 0.806 0.806 1.29h-198.676c-18.868 0-41.929-16.287-41.929-29.995v-410.899l308.174-243.346c11.127-8.708 31.124-8.708 42.090 0l309.464 244.797v409.447z" p-id="2205"></path></svg>
\ No newline at end of file
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1640932917338" class="icon" viewBox="0 0 1333 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="16956" xmlns:xlink="http://www.w3.org/1999/xlink" width="260.3515625" height="200"><defs><style type="text/css"></style></defs><path d="M 1101.48 342.52 a 155.844 155.844 0 1 0 -226.753 0 a 244.675 244.675 0 0 0 -53.7662 38.1818 A 197.922 197.922 0 0 0 484.34 373.688 a 243.896 243.896 0 0 0 -63.1169 -48.3117 a 155.844 155.844 0 1 0 -226.753 0 A 245.454 245.454 0 0 0 62.003 544.337 a 38.961 38.961 0 0 0 77.9221 0 a 168.311 168.311 0 0 1 298.441 -105.974 a 38.1818 38.1818 0 0 0 17.1428 13.2468 a 190.909 190.909 0 0 0 66.2337 180.78 a 319.48 319.48 0 0 0 -189.351 290.649 a 38.961 38.961 0 0 0 77.9221 0 a 241.559 241.559 0 0 1 482.337 0 a 38.961 38.961 0 0 0 77.9221 0 a 319.48 319.48 0 0 0 -189.351 -290.649 a 197.922 197.922 0 0 0 69.3506 -149.61 a 196.363 196.363 0 0 0 0 -28.052 a 37.4026 37.4026 0 0 0 17.922 -10.1299 a 166.753 166.753 0 0 1 123.117 -52.9869 A 168.311 168.311 0 0 1 1152.9 559.143 a 38.961 38.961 0 0 0 77.9221 0 a 245.454 245.454 0 0 0 -129.351 -216.623 Z M 308.236 295.767 a 77.9221 77.9221 0 1 1 77.9221 -77.9221 a 77.9221 77.9221 0 0 1 -77.9221 77.9221 Z m 342.857 311.688 a 120.779 120.779 0 1 1 121.558 -124.675 A 121.558 121.558 0 0 1 651.093 607.454 Z m 336.623 -290.649 a 77.9221 77.9221 0 1 1 77.9221 -77.9221 a 77.9221 77.9221 0 0 1 -77.9221 74.8052 Z" p-id="16957"></path></svg>
\ No newline at end of file
var en = {
"common": {
"risk": "risk",
"exit": "exit",
"index":"index"
}
}
export default en
var zh = {
"common": {
"risk": "风险",
"exit": "退出",
"index":"首页"
}
}
export default zh
......@@ -229,6 +229,7 @@ export default {
if (this.shiftKey) {
const sum = Math.abs(this.start - end);
const min = Math.min(this.start, end);
const max = Math.max(this.start, end);
let i;
if (this.start === -1 && selection.includes(this.data[row.index])) {
for (i = 0; i < sum; i++) {
......@@ -238,15 +239,19 @@ export default {
} else if (selection.includes(this.data[row.index])) {
if (!selection.includes(this.data[this.start])) {
this.$refs.tables.toggleRowSelection(this.data[this.start], true);
this.selectTable.push(this.data[this.start]);
if(this.selectTable.includes(this.data[this.start])){
this.selectTable.push(this.data[this.start]);
}
}
for (i = this.start + 1; i <= this.start + sum; i++) {
for (i = min; i <= sum + min; i++) {
this.$refs.tables.toggleRowSelection(this.data[i], true);
this.selectTable.push(this.data[i]);
if(!this.selectTable.includes(this.data[i])){
this.selectTable.push(this.data[i]);
}
}
} else if (!selection.includes(this.data[row.index])) {
this.selectTable.splice(end - 1, sum + 1);
for (i = end; i <= this.start; i++) {
this.selectTable.splice(min > 1 ? min - 2 : min, sum + 1);
for (i = min; i <= max; i++) {
this.$refs.tables.toggleRowSelection(this.data[i], false);
}
}
......@@ -254,7 +259,7 @@ export default {
} else {
this.start = end;
if (selection.includes(this.data[end])) {
this.selectTable.push(row);
this.selectTable = selection;
} else {
for (let i = 0; i < this.selectTable.length; i++) {
if (this.selectTable[i].index == row.index) {
......@@ -263,10 +268,11 @@ export default {
}
}
}
selection = this.selectTable;
selection = this.selectTable.sort(this.compare('index','ascending'));
this.$emit("tableSelect", { selection, row });
},
tableSelectAll(selection) {
this.selectTable = selection;
this.$emit("tableSelectAll", selection);
},
SelectChange(selection) {
......@@ -289,7 +295,7 @@ export default {
// console.log(val);
// },
sortChange({ column, prop, order }) {
this.$emit("sortChange",{prop:prop, order:order})
this.$emit("sortChange", { prop: prop, order: order });
},
compare(propertyName, sort) {
return function (obj1, obj2) {
......
......@@ -66,20 +66,6 @@ export const constantRoutes = [
}
]
},
// {
// path: '/user',
// component: Layout,
// hidden: true,
// redirect: 'noredirect',
// children: [
// {
// path: 'profile',
// component: (resolve) => require(['@/views/systemConfig/userConfig/profile/index'], resolve),
// name: 'Profile',
// meta: { title: '个人中心', icon: 'user' }
// }
// ]
// },
{
path: '/',
component: Layout,
......@@ -89,13 +75,13 @@ export const constantRoutes = [
{
path: '/flightAllocConfig/:handle/:id',
component: (resolve) => require(['@/views/allocationConfig/flightAllocConfig/info'], resolve),
name: 'flightAllocConfigInfo',
name: 'FlightAllocConfigInfo',
meta: { title: '航班配舱', icon: 'user', breadcrumb: true }
},
{
path: '/flightAllocConfig/:handle',
component: (resolve) => require(['@/views/allocationConfig/flightAllocConfig/info'], resolve),
name: 'flightAllocConfigAdd',
name: 'FlightAllocConfigInfo',
meta: { title: '添加航班配舱', icon: 'user', breadcrumb: false }
}
]
......
......@@ -42,5 +42,5 @@ module.exports = {
/**
* 版本号
*/
version:'version：0.5.7'
version:'version：0.5.7.2'
}
......
......@@ -231,7 +231,9 @@
<el-form-item label="Handling Code">
<el-empty
description="暂无数据"
v-if="!selectData.HandlingCode || selectData.HandlingCode.length == 0"
v-if="
!selectData.HandlingCode || selectData.HandlingCode.length == 0
"
></el-empty>
<el-checkbox-group v-model="handingCodes" v-else>
<el-checkbox
......@@ -247,7 +249,9 @@
<el-form-item label="Sub Category">
<el-empty
description="暂无数据"
v-if="!selectData.SubCategory || selectData.SubCategory.length == 0"
v-if="
!selectData.SubCategory || selectData.SubCategory.length == 0
"
></el-empty>
<el-checkbox-group v-model="subCategorys" v-else>
<el-checkbox
......@@ -334,7 +338,7 @@ import { downLoadXlsx } from "@/utils/zipdownload";
import { upCase } from "@/utils/FedEx";
export default {
name:"CargoAllocation",
name: "CargoAllocation",
components: {
Dialog,
},
......@@ -344,7 +348,7 @@ export default {
fltDateStart: null,
fltDateEnd: null,
typeId: null,
portName:null,
portName: null,
statusId: null,
kindToAllocFlightId: null,
serviceTypeId: null,
......@@ -854,18 +858,20 @@ export default {
} else {
reject(res.msg);
}
resolve(obj)
resolve(obj);
})
.catch(() => {});
this.select();
}).then(res=>{
this.selectData = res
}).catch((err) => {
this.$message({
message: "查询条件不存在",
type: "warning",
})
.then((res) => {
this.selectData = res;
})
.catch((err) => {
this.$message({
message: "查询条件不存在",
type: "warning",
});
});
});
},
mounted() {
window.addEventListener("keydown", (code) => {
......@@ -1015,29 +1021,27 @@ export default {
this.select();
},
//排序
sortChange(val){
this.tableData.sort(this.$refs.newTables.compare(val.prop,val.order));
},
//添加到航班
addFit() {
let open = true;
this.tableSelection.forEach((item) => {
if (item.statusId != 107966) {
open = false;
sortChange(val) {
let data = [];
let nullData = [];
this.tableData.forEach((item) => {
if (item[val.prop]) {
data.push(item);
} else {
nullData.push(item);
}
});
if (open) {
this.dialogVisible = open;
data = data.sort(this.$refs.newTables.compare(val.prop, val.order));
if (val.order != "ascending") {
this.tableData = nullData.concat(data);
} else {
this.$message({
message: "包含不可手动配舱货物",
type: "warning",
});
this.tableSelection = [];
this.cargoTotal();
this.$refs.newTables.clearTable();
this.tableData = data.concat(nullData);
}
},
//添加到航班
addFit() {
this.dialogVisible = true;
},
//关闭弹框
dialogBeforeClose(val) {
this.dialogVisible = val.close;
......
......@@ -8,7 +8,7 @@
>
<el-form-item label="航班号">
<el-input
v-model.trim="queryParams.purposeOfFlightNo"
v-model.trim="purposeOfFlightNo"
placeholder="航班号"
@keyup.enter.native="getList"
></el-input>
......@@ -34,7 +34,7 @@
type="primary"
icon="el-icon-plus"
size="mini"
@click="$router.push({ name: 'flightAllocConfigAdd', params: { handle: 'add' } })"
@click="$router.push({ name: 'FlightAllocConfigInfo', params: { handle: 'add' } })"
>添加</el-button
>
<el-table :data="flyList" v-loading="loading" size="small">
......@@ -169,7 +169,7 @@ export default {
//跳转到查看，修改页面
handleClick(flightiId, handle) {
this.$router.push({
name: "flightAllocConfigInfo",
name: "FlightAllocConfigInfo",
params: { handle: handle, id: flightiId },
});
},
......@@ -218,6 +218,16 @@ export default {
},
created() {
this.getList();
},
computed:{
purposeOfFlightNo: {
get: function () {
return this.queryParams.purposeOfFlightNo;
},
set: function (val) {
this.queryParams.purposeOfFlightNo = val.toUpperCase()
},
},
}
};
</script>
......
......@@ -277,6 +277,7 @@ import {
} from "@/api/destinationFlight";
export default {
name:"",
data() {
return {
form: {
......@@ -355,6 +356,7 @@ export default {
this.formHandlingCode = this.form.handlingCode;
this.formSubCategory = this.form.subCategory;
this.form.isNeedRequired = this.isNeedRequired;
this.form.purposeOfFlightNo = this.form.purposeOfFlightNo.toUpperCase();
if (this.isLocation == 1) {
this.form.notLocation = "";
} else {
......
......@@ -237,7 +237,7 @@
//跳转到查看，修改页面
handleClick(flightiId, handle) {
this.$router.push({
name: "flightAllocConfigInfo",
name: "FlightAllocConfigInfo",
params: {
handle: handle,
id: flightiId
......
......@@ -51,8 +51,11 @@
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
<el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd">新增</el-button>
<el-button type="danger" icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete">删除
</el-button>
<el-button type="primary" icon="el-icon-circle-check" size="mini" @click="handleFlightStatus('flightStatus10')">自动配舱开启</el-button>
<el-button type="primary" icon="el-icon-circle-close" size="mini" @click="handleFlightStatus('flightStatus80')">自动配舱关闭</el-button>
</el-form>
<!-- <el-row :gutter="10" class="mb8">
<el-col :span="1.5">
......@@ -112,7 +115,7 @@
class-name="small-padding fixed-width" width="130" fixed="right">
<template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)">修改</el-button>
<!-- <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDeleteorPlayorpause(scope.row,0,'删除')">
<!-- <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row,'删除')">
删除</el-button> -->
</template>
</el-table-column>
......@@ -264,10 +267,19 @@
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
<el-dialog title="未删除成功航班" width="40%" center :visible.sync="dialogTableVisible">
<el-table :data="gridData">
<el-table-column property="fltNo" label="航班号" width="150"></el-table-column>
<el-table-column property="fltDate" label="航班日期" width="200"></el-table-column>
<el-table-column property="alloctedWeight" label="已配重量" width="200"></el-table-column>
</el-table>
</el-dialog>
</div>
</template>
<script>
import {
delFlight,
findFltConditionDataApi,
findAllFltDataApi,
findFltById,
......@@ -280,6 +292,8 @@
name: "FlightInformationMaintenance",
data() {
return {
gridData:[],
dialogTableVisible: false,
//高价百分比是否打开
ishighPriceWeightPercent:true,
//form属性禁用状态
......@@ -624,40 +638,34 @@
});
},
/** 删除 启用 停用按钮操作 */
handleDeleteorPlayorpause(row, status, statusText) {
//删除前需要停用
if (status === 0 && row.status != '3') {
this.$message({
message: '请停用后删除',
type: 'warning'
});
return;
}
this.$confirm('是否确认' + statusText + '此数据项?', "警告", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
}).then(function() {
let disable = {
id: row.id,
status: status
};
/** 删除按钮操作 */
handleDelete(row) {
const fIds =this.ids;
this.$confirm('是否确认删除所选数据?', "警告", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
}).then(function() {
return delFlight(fIds);
}).then(response => {
this.findAllFltData();
if(response.data.length>0){
this.gridData=response.data;
this.$confirm(response.msg, '提示', {
confirmButtonText: '查看删除失败航班信息',
cancelButtonText: '取消',
type: 'warning',
center: true
}).then(() => {
this.dialogTableVisible=true;
}).catch(function() { });
return delOrEnableORDisableApi(disable);
}).then(response => {
if (response.code == 200) {
this.findAllFltData();
this.msgSuccess(statusText + "成功");
} else {
this.msgError(response.msg);
}
}else{
this.msgSuccess(response.msg);
}
}).catch(function() {});
},
}).catch(function() {});
},
/** 提交按钮 */
submitForm: function() {
this.$refs["form"].validate(valid => {
......
......@@ -3,15 +3,14 @@
<el-form
ref="cargoForm"
class="form-header"
label-position="right"
label-width="auto"
size="small"
:model="formData"
label-position="top"
label-width="auto"
style="margin: 10px; width: 100%"
>
<el-row type="flex" style="flexWrap: wrap !important">
<el-row type="flex" style="flexWrap: wrap!important">
<el-col :span="6">
<el-form-item label="配舱航班日期:">
<el-form-item label="配舱航班日期">
<el-date-picker
class="formItem"
v-model="cargoPlaneTime"
......@@ -25,18 +24,12 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="配载航班号:">
<el-input
type="textarea"
v-model="cargoPlaneNo"
class="formItem"
placeholder="AC001;AC002"
rows="1"
></el-input>
<el-form-item label="配载航班号">
<el-input type="textarea" v-model="cargoPlaneNo" class="formItem" placeholder="AC001;AC002" rows="1"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="海关回执状态:">
<el-form-item label="海关回执状态">
<el-select
placeholder="不限"
v-model="formData.customsReceiptStatusId"
......@@ -55,7 +48,7 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="运单号:">
<el-form-item label="运单号">
<el-input
type="textarea"
v-model.trim="formData.waybillNo"
......@@ -66,25 +59,25 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="申报类别:">
<el-select
placeholder="不限"
v-model="formData.typeId"
class="formItem"
clearable
<el-form-item label="申报类别">
<el-select
placeholder="不限"
v-model="formData.typeId"
class="formItem"
clearable
>
<el-option
v-for="item in findConditionData.cargoType"
:label="item.chineseName"
:value="item.id"
:key="item.id"
>
<el-option
v-for="item in findConditionData.cargoType"
:label="item.chineseName"
:value="item.id"
:key="item.id"
>
</el-option>
</el-select>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="服务类型:">
<el-form-item label="服务类型">
<el-select
placeholder="不限"
v-model="formData.serviceTypeId"
......@@ -103,7 +96,7 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="URSA:">
<el-form-item label="URSA">
<el-input
type="textarea"
v-model="ursa"
......@@ -114,7 +107,7 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="站点:">
<el-form-item label="站点">
<el-input
type="textarea"
v-model="siteName"
......@@ -125,9 +118,9 @@
</el-form-item>
</el-col>
<el-col :span="24" v-show="formShow">
<el-row type="flex" style="flexWrap: wrap !important">
<el-row type="flex" style="flexWrap: wrap!important">
<el-col :span="6">
<el-form-item label="ACCS原航班日期:">
<el-form-item label="ACCS原航班日期">
<el-date-picker
class="formItem"
v-model="flightTime"
......@@ -138,21 +131,17 @@
:value-format="valueFormat"
>
</el-date-picker>
</el-form-item>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="ACCS原航班号:">
<el-input
type="text"
v-model="fltNo"
class="formItem"
placeholder="请输入ACCS航班号"
></el-input>
<el-form-item label="ACCS原航班号">
<el-input type="text" v-model="fltNo" class="formItem" placeholder="请输入ACCS航班号"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="取件日期:">
<el-form-item label="取件日期">
<el-date-picker
class="formItem"
v-model="formData.pickUpDate"
type="date"
placeholder="选择日期"
......@@ -162,7 +151,7 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="创建日期:">
<el-form-item label="创建日期">
<el-date-picker
class="formItem"
v-model="createDate"
......@@ -176,7 +165,7 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="货物状态:">
<el-form-item label="货物状态">
<el-select
placeholder="不限"
v-model="formData.statusId"
......@@ -195,22 +184,42 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="是否自动:">
<el-form-item label="是否自动">
<el-select
placeholder="不限"
v-model="formData.allocationTypeId"
class="formItem"
clearable
>
<el-option label="手动" value="1"> </el-option>
<el-option label="自动" value="2"> </el-option>
<el-option
label="手动"
value="1"
>
</el-option>
<el-option
label="自动"
value="2"
>
</el-option>
</el-select>
</el-form-item>
</el-col>
<!-- <el-col :span="6">
<el-form-item label="口岸代码">
<el-select
placeholder="不限"
v-model="formData.portName"
class="formItem"
clearable
>
</el-select>
</el-form-item>
</el-col> -->
</el-row>
</el-col>
</el-row>
<div style="paddingLeft: 10px; marginTop: 20px">
<div style="paddingLeft: 10px;marginTop:20px">
<el-button
type="primary"
icon="el-icon-search"
......@@ -222,99 +231,47 @@
<!-- <el-button type="primary" size="small" @click="checks(tableData)"
>全选/全否</el-button
> -->
<el-button
:type="downLoadingTip.downloading ? 'warning' : 'primary'"
size="small"
@click="xlse(0)"
:disabled="tableData.length == 0"
:loading="downLoadingTip.downloading"
>{{
downLoadingTip.downloading ? downLoadingTip.tip : "导出本页查询结果"
}}</el-button
<el-button :type="downLoadingTip.downloading?'warning':'primary'" size="small" @click="xlse(0)" :disabled="tableData.length==0" :loading="downLoadingTip.downloading"
>{{downLoadingTip.downloading?downLoadingTip.tip:"导出本页查询结果"}}</el-button
>
<el-button
:type="downLoadingTip.downloading ? 'warning' : 'primary'"
size="small"
@click="xlse(1)"
:disabled="tableData.length == 0"
:loading="downLoadingTip.downloading"
>{{
downLoadingTip.downloading ? downLoadingTip.tip : "导出全部查询结果"
}}</el-button
<el-button :type="downLoadingTip.downloading?'warning':'primary'" size="small" @click="xlse(1)" :disabled="tableData.length==0" :loading="downLoadingTip.downloading"
>{{downLoadingTip.downloading?downLoadingTip.tip:"导出全部查询结果"}}</el-button
>
<span style="marginLeft: 20px; color: #ffba00"
>全部导出上限80000条数据</span
>
<el-progress
v-if="progress != 0"
class="progress"
:stroke-width="12"
:show-text="true"
:percentage="progress"
:status="progress == 100 ? 'success' : 'warning'"
></el-progress>
<span style="marginLeft:20px;color:#ffba00">全部导出上限80000条数据</span>
<el-progress v-if="progress!=0" class="progress" :stroke-width="12" :show-text="true" :percentage="progress" :status="progress == 100?'success':'warning'"></el-progress>
<div class="tips">
<span style="paddingRight: 50px">总重量:{{ allWeight }}</span>
<span>总件数:{{ allQty }}</span>
</div>
<div class="formShow" @click="formShow = !formShow">
<i class="el-icon-s-tools"></i
>{{ formShow ? "收起条件" : "更多条件" }}
</div>
<!-- <RightToolbar :showSearch.sync="formShow" size="small"></RightToolbar> -->
<div class="formShow" @click="formShow = !formShow"><i class="el-icon-s-tools"></i>{{formShow?'收起条件':'更多条件'}}</div>
</div>
</el-form>
<el-table
ref="cargoTable"
<Tables
ref="newTables"
:data="tableData"
v-loading="tableLoading"
highlight-current-row
border
stripe
height="430"
size="mini"
@select="cheacked"
@select-all="selectAll"
@sort-change="sortChange"
>
<el-table-column type="selection" width="55" fixed align="center">
</el-table-column>
<el-table-column type="index" label="序号" align="center">
<template slot-scope="scope">{{ scope.$index + 1 }}</template>
</el-table-column>
<el-table-column
v-for="item in tableHeader"
:prop="item.value"
:label="item.name"
:key="item.name"
header-align="center"
align="center"
:show-overflow-tooltip="true"
:width="item.value == 'bigPretrialOpinion' ? '300' : '170'"
:formatter="formatter"
sortable
>
</el-table-column>
</el-table>
<el-pagination
:total="totalCount"
:page-size.sync="limitSize"
background
style="marginTop: 40px; textAlign: right"
@next-click="nextClick"
@prev-click="prevClick"
@current-change="currentChange"
>
</el-pagination>
:headerData="tableHeader"
:totalCount="totalCount"
:loading="tableLoading"
:limitSize="limitSize"
:limitStart="limitStart"
:shiftKey="shiftKey"
height="550"
@tableSelect="tableSelect"
@tableSelectAll="tableSelectAll"
@currentChange="currentChange"
@sortChange="sortChange"
></Tables>
</div>
</template>
<script>
import { findConditionData, findCargoData } from "@/api/cargoSelect";
import { downLoadXlsx } from "@/utils/zipdownload";
import { upCase } from "@/utils/FedEx";
import { upCase } from "@/utils/FedEx"
export default {
name: "QueryCargo",
name:"QueryCargo",
data() {
return {
formData: {
......@@ -339,81 +296,468 @@ export default {
dataSources: "",
customsReceiptStatusId: null,
big: null,
cargoPlaneNo: null,
cargoPlaneStart: null,
cargoPlaneEnd: null,
cargoPlaneNo:null,
cargoPlaneStart:null,
cargoPlaneEnd:null,
limitStart: 1,
limitSize:100,
}, //表单数据
tableHeader: [
{ name: "口岸代码", value: "portName" },
{ name: "取件日期", value: "pickUpDate" },
{ name: "取件扫描号", value: "pickUpScanNo" },
{ name: "站点", value: "siteName" },
{ name: "运单号", value: "waybillNo" },
{ name: "服务类型", value: "serviceTypeName" },
{ name: "URSA", value: "ursa" },
{ name: "申报类型", value: "typeName" },
{ name: "HandlingCode", value: "handingCode" },
{ name: "subcategory", value: "subCategory" },
{ name: "件数", value: "qty" },
{ name: "实际重量", value: "actualWeight" },
{ name: "收件人国家代码", value: "consigneeCountry" },
{ name: "品名描述", value: "nameDescription" },
{ name: "海关回执状态", value: "customsReceiptStatusName" },
{ name: "总单号", value: "totalWaybillNo" },
{ name: "预审状态", value: "preQualificationStatus" },
{ name: "航班预审意见", value: "caPretrialOpinion" },
{ name: "货物状态", value: "statusName" },
{ name: "终配航班号", value: "finalFlightNo" },
{ name: "终配航班日期", value: "finalFlightTime" },
{ name: "二配航班号", value: "twoMatchFlightNo" },
{ name: "二配航班日期", value: "twoMatchFlightTime" },
{ name: "预配航班号", value: "preplanFlightNo" },
{ name: "预配航班日期", value: "preplanFlightTime" },
{ name: "ACCS原航班号", value: "fltNoAccs" },
{ name: "ACCS原航班日期", value: "fltDateAccs" },
{ name: "ACCS原航线", value: "accsFlightRoute" },
{ name: "是否RDE手工录入", value: "manualRde" },
{ name: "是否自动", value: "cargoRulesStatus" },
{ name: "发件人账号", value: "shipperAccount" },
{ name: "发件公司中文名称", value: "shipperCompany" },
{ name: "始发地城市名称", value: "originCity" },
{ name: "收件地", value: "destinationSiteName" },
{ name: "尺寸", value: "sizeStr" },
{
type: "selection",
name: "",
value: "",
width: "50",
align: "center",
sorTable: false,
slot: null,
fixed:true,
},
{
type: "index",
name: "",
value: "",
width: "50",
align: "center",
sorTable: false,
slot: null,
fixed:false,
},
{
type: "",
name: "口岸代码",
value: "portName",
width: "150",
align: "center",
sorTable: true,
slot: null,
fixed:false,
},
{
type: "",
name: "取件日期",
value: "pickUpDate",
width: "150",
align: "center",
sorTable: true,
slot: null,
fixed:false,
},
{
type: "",
name: "取件扫描号",
value: "pickUpScanNo",
width: "150",
align: "center",
sorTable: true,
slot: null,
fixed:false,
},
{
type: "",
name: "站点",
value: "siteName",
width: "150",
align: "center",
sorTable: true,
slot: null,
fixed:false,
},
{
type: "",
name: "运单号",
value: "waybillNo",
width: "150",
align: "center",
sorTable: true,
slot: null,
fixed:false,
},
{
type: "",
name: "总单号",
value: "totalWaybillNo",
width: "150",
align: "center",
sorTable: true,
slot: null,
fixed:false,
},
{
type: "",
name: "服务类型",
value: "serviceTypeName",
width: "150",
align: "center",
sorTable: true,
slot: null,
fixed:false,
},
{
type: "",
name: "URSA",
value: "ursa",
width: "150",
align: "center",
sorTable: true,
slot: null,
fixed:false,
},
{
type: "",
name: "申报类型",
value: "typeName",
width: "150",
align: "center",
sorTable: true,
slot: null,
fixed:false,
},
{
type: "",
name: "HandlingCode",
value: "handingCode",
width: "150",
align: "center",
sorTable: true,
slot: null,
fixed:false,
},
{
type: "",
name: "subcategory",
value: "subCategory",
width: "150",
align: "center",
sorTable: true,
slot: null,
fixed:false,
},
{
type: "",
name: "件数",
value: "qty",
width: "150",
align: "center",
sorTable: true,
slot: null,
fixed:false,
},
{
type: "",
name: "实际重量",
value: "actualWeight",
width: "150",
align: "center",
sorTable: true,
slot: null,
fixed:false,
},
{
type: "",
name: "收件人国家代码",
value: "consigneeCountry",
width: "150",
align: "center",
sorTable: true,
slot: null,
fixed:false,
},
{
type: "",
name: "品名描述",
value: "nameDescription",
width: "150",
align: "center",
sorTable: false,
slot: null,
fixed:false,
},
{
type: "",
name: "海关回执状态",
value: "customsReceiptStatusName",
width: "150",
align: "center",
sorTable: true,
slot: null,
fixed:false,
},
{
type: "",
name: "预审状态",
value: "preQualificationStatus",
width: "150",
align: "center",
sorTable: true,
slot: null,
fixed:false,
},
{
type: "",
name: "航班预审意见",
value: "caPretrialOpinion",
width: "150",
align: "center",
sorTable: false,
slot: null,
fixed:false,
},
{
type: "",
name: "货物状态",
value: "statusName",
width: "150",
align: "center",
sorTable: true,
slot: null,
fixed:false,
},
{
type: "",
name: "终配航班号",
value: "finalFlightNo",
width: "150",
align: "center",
sorTable: true,
slot: null,
fixed:false,
},
{
type: "",
name: "终配航班日期",
value: "finalFlightTime",
width: "150",
align: "center",
sorTable: true,
slot: null,
fixed:false,
},
{
type: "",
name: "二配航班号",
value: "twoMatchFlightNo",
width: "150",
align: "center",
sorTable: true,
slot: null,
fixed:false,
},
{
type: "",
name: "二配航班日期",
value: "twoMatchFlightTime",
width: "150",
align: "center",
sorTable: true,
slot: null,
fixed:false,
},
{
type: "",
name: "预配航班号",
value: "preplanFlightNo",
width: "150",
align: "center",
sorTable: true,
slot: null,
fixed:false,
},
{
type: "",
name: "预配航班日期",
value: "preplanFlightTime",
width: "150",
align: "center",
sorTable: true,
slot: null,
fixed:false,
},
{
type: "",
name: "ACCS原航班号",
value: "fltNoAccs",
width: "150",
align: "center",
sorTable: true,
slot: null,
fixed:false,
},
{
type: "",
name: "ACCS原航班日期",
value: "fltDateAccs",
width: "150",
align: "center",
sorTable: true,
slot: null,
fixed:false,
},
{
type: "",
name: "ACCS原航线",
value: "accsFlightRoute",
width: "150",
align: "center",
sorTable: true,
slot: null,
fixed:false,
},
{
type: "",
name: "是否RDE手工录入",
value: "manualRde",
width: "170",
align: "center",
sorTable: true,
slot: null,
fixed:false,
},
{
type: "",
name: "是否自动",
value: "cargoRulesStatus",
width: "150",
align: "center",
sorTable: true,
slot: null,
fixed:false,
},
{
type: "",
name: "发件人账号",
value: "shipperAccount",
width: "150",
align: "center",
sorTable: false,
slot: null,
fixed:false,
},
{
type: "",
name: "发件公司中文名称",
value: "shipperCompany",
width: "150",
align: "center",
sorTable: false,
slot: null,
fixed:false,
},
{
type: "",
name: "始发地城市名称",
value: "originCity",
width: "150",
align: "center",
sorTable: false,
slot: null,
fixed:false,
},
{
type: "",
name: "收件地",
value: "destinationSiteName",
width: "150",
align: "center",
sorTable: false,
slot: null,
fixed:false,
},
{
type: "",
name: "尺寸",
value: "sizeStr",
width: "150",
align: "center",
sorTable: true,
slot: null,
fixed:false,
},
{
type: "",
name: "大货预审意见（是否可以配置航班）",
value: "bigPretrialOpinion",
width: "300",
align: "center",
sorTable: false,
slot: null,
fixed:false,
},
{
type: "",
name: "大货预审时间",
value: "bigPretrialTime",
width: "150",
align: "center",
sorTable: false,
slot: null,
fixed:false,
},
{
type: "",
name: "海关回执时间",
value: "customsReceiptTime",
width: "150",
align: "center",
sorTable: true,
slot: null,
fixed:false,
},
{
type: "",
name: "航班预审时间",
value: "caPretrialTime",
width: "150",
align: "center",
sorTable: true,
slot: null,
fixed:false,
},
{
type: "",
name: "创建人",
value: "createUserName",
width: "150",
align: "center",
sorTable: true,
slot: null,
fixed:false,
},
{
type: "",
name: "创建时间",
value: "createTime",
width: "150",
align: "center",
sorTable: true,
slot: null,
fixed:false,
},
{ name: "大货预审时间", value: "bigPretrialTime" },
{ name: "海关回执时间", value: "customsReceiptTime" },
{ name: "航班预审时间", value: "caPretrialTime" },
{ name: "创建人", value: "createUserName" },
{ name: "创建时间", value: "createTime" },
], //表头数据
findConditionData: {}, //货物查询条件
tableData: [], //表格数据
allWeight: 0,
allQty: 0,
shiftKey: false,
start: -1,
valueFormat: "yyyy-MM-dd",
tableLoading: false,
downLoadingTip: {
tip: "",
downloading: false,
downLoadingTip:{
tip:"",
downloading:false,
},
totalCount: 0,
selectTable: [],
flightTime: [],
prepalyFlightTime: [],
cargoPlaneTime: [],
cargoPlaneTime:[],
createDate: [],
limitStart: 1,
limitSize: 100, //无限制-1
progress: 0,
selecetALL: false,
page:1,
progress:0,
formShow:false,
};
},
created() {
//查询条件
findConditionData().then((res) => {
......@@ -450,46 +794,9 @@ export default {
this.tableData = [];
this.allWeight = 0;
this.allQty = 0;
this.checks();
this.tableLoading = true;
if (
this.formData.customsReceiptStatusId != null &&
this.formData.customsReceiptStatusId.length < 1
) {
this.formData.customsReceiptStatusId = null;
}
if (this.createDate != null && this.createDate.length > 0) {
this.formData.createTimeStart = this.createDate[0];
this.formData.createTimeEnd = this.createDate[1];
} else {
this.formData.createTimeStart = null;
this.formData.createTimeEnd = null;
}
if (this.prepalyFlightTime != null && this.prepalyFlightTime.length > 0) {
this.formData.prematchFltDateStart = this.prepalyFlightTime[0];
this.formData.prematchFltDateEnd = this.prepalyFlightTime[1];
} else {
this.formData.prematchFltDateStart = "";
this.formData.prematchFltDateEnd = "";
}
if (this.flightTime != null && this.flightTime.length > 0) {
this.formData.fltDateStart = this.flightTime[0];
this.formData.fltDateEnd = this.flightTime[1];
} else {
this.formData.fltDateStart = "";
this.formData.fltDateEnd = "";
}
if (this.cargoPlaneTime != null && this.cargoPlaneTime.length > 0) {
this.formData.cargoPlaneStart = this.cargoPlaneTime[0];
this.formData.cargoPlaneEnd = this.cargoPlaneTime[1];
} else {
this.formData.cargoPlaneStart = null;
this.formData.cargoPlaneEnd = null;
}
this.formData.limitStart = this.limitStart;
this.formData.limitSize = this.limitSize;
findCargoData(this.formData)
.then((res) => {
this.dataInfo();
findCargoData(this.formData).then((res) => {
if (res.code == 200) {
if (res.data.list.length > 0) {
this.tableData = res.data.list;
......@@ -510,195 +817,135 @@ export default {
});
}
this.tableLoading = false;
})
.catch(() => {
}).catch(()=>{
this.tableLoading = false;
});
this.$refs.newTables.clearTable();
this.cargoTotal();
},
//全选反选
checks(rows) {
if (rows && !this.selecetALL) {
rows.forEach((row) => {
this.$refs.cargoTable.toggleRowSelection(row);
this.allQty = row.qty + this.allQty;
this.allWeight = row.actualWeight + this.allWeight;
});
this.selecetALL = true;
this.allWeight = this.allWeight.toFixed(1);
this.allQty = this.allQty.toFixed(0);
} else {
this.$refs.cargoTable.clearSelection();
this.allWeight = 0;
this.allQty = 0;
this.selecetALL = false;
}
},
selectAll(selection) {
if (selection.length > 0) {
selection.forEach((item) => {
this.allWeight = item.actualWeight + this.allWeight;
this.allQty = item.qty + this.allQty;
});
this.allWeight = this.allWeight.toFixed(1);
this.allQty = this.allQty.toFixed(0);
} else {
this.allWeight = 0;
this.allQty = 0;
}
},
//下一页
nextClick() {
this.limitStart = this.limitStart + 100;
},
//上一页
prevClick() {
this.limitStart = this.limitStart - 100;
},
//指定页数
currentChange(page) {
this.limitStart = (page - 1) * 100;
this.select();
},
//表单项选中操作
cheacked(sl, row) {
let end = row.index;
if (this.shiftKey) {
const sum = Math.abs(this.start - end);
const min = Math.min(this.start, end);
let i;
if (this.start === -1 && sl.includes(this.tableData[row.index])) {
for (i = 0; i < sum; i++) {
this.$refs.cargoTable.toggleRowSelection(this.tableData[i], true);
this.selectTable.push(this.tableData[i]);
}
} else if (sl.includes(this.tableData[row.index])) {
for (i = this.start + 1; i <= end; i++) {
this.$refs.cargoTable.toggleRowSelection(this.tableData[i], true);
this.selectTable.push(this.tableData[i]);
}
} else if (!sl.includes(this.tableData[row.index])) {
this.selectTable.splice(end - 1, sum + 1);
for (i = end; i <= this.start; i++) {
this.$refs.cargoTable.toggleRowSelection(this.tableData[i], false);
}
}
this.start = end;
} else {
this.start = end;
if (sl.includes(this.tableData[end])) {
this.selectTable.push(row);
} else {
for (let i = 0; i < this.selectTable.length; i++) {
if (this.selectTable[i].index == row.index) {
this.selectTable.splice(i, 1);
}
}
}
}
this.allWeight = 0;
this.allQty = 0;
for (let i = 0; i < this.selectTable.length; i++) {
this.allWeight = this.allWeight + this.selectTable[i].actualWeight;
this.allQty = this.allQty + this.selectTable[i].qty;
}
this.allQty = this.allQty.toFixed();
this.allWeight = this.allWeight.toFixed(2);
},
// 导出表格
xlse(page) {
this.progress = 1;
this.downLoadingTip.downloading = true;
let cargoXlse = { title: "货物导出表", cargoConditionDto: {} };
if (
this.formData.customsReceiptStatusId != null &&
this.formData.customsReceiptStatusId.length < 1
) {
//数据初始化
dataInfo(){
if(this.formData.customsReceiptStatusId != null && this.formData.customsReceiptStatusId.length < 1){
this.formData.customsReceiptStatusId = null;
}
if (this.createDate != null && this.createDate.length > 0) {
this.formData.createTimeStart = this.createDate[0];
this.formData.createTimeEnd = this.createDate[1];
} else {
}else{
this.formData.createTimeStart = null;
this.formData.createTimeEnd = null;
}
if (this.prepalyFlightTime != null && this.prepalyFlightTime.length > 0) {
this.formData.prematchFltDateStart = this.prepalyFlightTime[0];
this.formData.prematchFltDateEnd = this.prepalyFlightTime[1];
} else {
this.formData.prematchFltDateStart = "";
}else{
this.formData.prematchFltDateStart ="";
this.formData.prematchFltDateEnd = "";
}
if (this.flightTime != null && this.flightTime.length > 0) {
this.formData.fltDateStart = this.flightTime[0];
this.formData.fltDateEnd = this.flightTime[1];
} else {
}else{
this.formData.fltDateStart = "";
this.formData.fltDateEnd = "";
}
if (this.cargoPlaneTime != null && this.cargoPlaneTime.length > 0) {
if(this.cargoPlaneTime != null && this.cargoPlaneTime.length > 0){
this.formData.cargoPlaneStart = this.cargoPlaneTime[0];
this.formData.cargoPlaneEnd = this.cargoPlaneTime[1];
} else {
}else{
this.formData.cargoPlaneStart = null;
this.formData.cargoPlaneEnd = null;
}
},
//总和
cargoTotal(){
this.allWeight = 0;
this.allQty = 0;
if(this.selectTable.length > 0){
this.selectTable.forEach(item=>{
this.allWeight = this.allWeight + item.actualWeight;
this.allQty = this.allQty + item.qty;
})
this.allWeight = this.allWeight.toFixed(2);
this.allQty = this.allQty.toFixed();
}
},
//表格多选
tableSelect(val){
this.selectTable = val.selection;
this.cargoTotal();
},
//表格全选
tableSelectAll(val){
this.selectTable = val;
this.cargoTotal();
},
//分页
currentChange(val){
this.formData.limitStart = val.start;
this.page = val.page;
this.select()
},
//排序
sortChange(val){
let data = []
let nullData = []
this.tableData.forEach(item=>{
if(item[val.prop]){
data.push(item)
}else{
nullData.push(item)
}
})
data = data.sort(this.$refs.newTables.compare(val.prop,val.order))
if(val.order != "ascending"){
this.tableData = nullData.concat(data)
}else{
this.tableData = data.concat(nullData)
}
},
// 导出表格
xlse(page) {
this.progress = 1;
this.downLoadingTip.downloading = true;
let cargoXlse = {title:"货物导出表",cargoConditionDto:{}};
this.dataInfo();
cargoXlse.cargoConditionDto = this.formData;
cargoXlse.cargoConditionDto.limitSize = this.limitSize;
if (page == 0) {
this.downLoadingTip.tip = "正在导出本页结果集";
this.downLoadingTip.tip = "正在导出本页结果集"
cargoXlse.cargoConditionDto.limitStart = this.limitStart;
downLoadXlsx("/cargo/excel", cargoXlse, "货物查询表")
.then(() => {
this.downLoadingTip.downloading = false;
this.downLoadingTip.tip = "";
this.progress = 100;
})
.catch(() => {
this.downLoadingTip.downloading = false;
this.downLoadingTip.tip = "";
});
downLoadXlsx("/cargo/excel",cargoXlse,"货物表").then(()=>{
this.downLoadingTip.downloading = false;
this.downLoadingTip.tip = ""
this.progress = 100;
}).catch(()=>{
this.downLoadingTip.downloading = false;
this.downLoadingTip.tip = "";
})
} else {
if (this.totalCount < 80000) {
this.downLoadingTip.tip = "正在导出全部结果集";
if(this.totalCount < 80000){
this.downLoadingTip.tip = "正在导出全部结果集请耐心等待"
cargoXlse.cargoConditionDto.limitStart = 0;
cargoXlse.cargoConditionDto.limitSize = -1;
downLoadXlsx("/cargo/excel", cargoXlse, "货物查询表")
.then(() => {
this.downLoadingTip.downloading = false;
this.downLoadingTip.tip = "";
this.progress = 100;
})
.catch(() => {
this.downLoadingTip.downloading = false;
this.downLoadingTip.tip = "";
});
} else {
downLoadXlsx("/cargo/excel",cargoXlse,"货物表").then(()=>{
this.downLoadingTip.downloading = false;
this.downLoadingTip.tip = ""
this.progress = 100;
}).catch(()=>{
this.downLoadingTip.downloading = false;
this.downLoadingTip.tip = ""
})
}else{
this.downLoadingTip.downloading = false;
this.$message({
message: "数据量过大无法导出",
message: "导出数据量过大，请不要超过8万条",
type: "warning",
});
}
}
},
//排序
sortChange() {
this.tableData.sort();
},
//表格格式化
formatter(row, column, cellValue, index) {
if (column.property == "cargoRulesStatus") {
if (cellValue == 1) {
return (cellValue = "手动");
} else if (cellValue == 2) {
return (cellValue = "自动");
}
}
return cellValue;
},
},
computed: {
fltNo: {
......@@ -725,14 +972,14 @@ export default {
this.formData.ursa = upCase(val);
},
},
cargoPlaneNo: {
cargoPlaneNo:{
get: function () {
return this.formData.cargoPlaneNo;
},
set: function (val) {
this.formData.cargoPlaneNo = upCase(val);
},
},
}
},
};
</script>
......@@ -745,19 +992,19 @@ export default {
margin-top: 10px;
margin-left: 50px;
}
.progress {
width: 200px;
.progress{
width:200px;
display: inline-block;
margin: 0 0 0 20px;
margin:0 0 0 20px;
}
.formShow {
.formShow{
width: max-content;
height: 48px;
height:48px;
line-height: 48px;
font-weight: 900;
color: rgb(64, 158, 255);
font-size: 14px;
float: right;
margin-right: 20px;
margin-right:20px;
}
</style>
\ No newline at end of file
......