Fedex / imac-vue

Go to a project
Toggle navigation Toggle navigation pinning
jinhui.wang
44230041 1 parent 394b578f

bug修复

Inline Side-by-side
Showing 11 changed files with 1023 additions and 628 deletions
let ductLabels = {
"cargoRulesStatus":{
"1":"自动",
"2":"手动"
"1":"手动",
"2":"自动"
}
}
......
......@@ -80,6 +80,7 @@
color:#6379bb;
border-bottom:1px solid #ddd;
margin:8px 10px 25px 10px;
padding-top:15px;
padding-bottom:5px;
.formItem {
width: 100%;
......
......@@ -30,8 +30,8 @@
:fixed="item.fixed"
:show-overflow-tooltip="showOverflowTooltip"
:sortable="item.sorTable"
header-align="center"
:formatter="formatter"
header-align="center"
:slotHeader="slotHeader"
:key="index"
>
......@@ -188,7 +188,6 @@ export default {
this.newHeader = this.headerData;
},
mounted() {
},
methods: {
nextClick() {
......@@ -218,7 +217,11 @@ export default {
this.selectTable.push(this.data[i]);
}
} else if (selection.includes(this.data[row.index])) {
for (i = this.start + 1; i <= end; i++) {
if(!selection.includes(this.data[this.start])){
this.$refs.tables.toggleRowSelection(this.data[this.start], true);
this.selectTable.push(this.data[this.start]);
}
for (i = this.start+1; i <= this.start+sum; i++) {
this.$refs.tables.toggleRowSelection(this.data[i], true);
this.selectTable.push(this.data[i]);
}
......@@ -254,7 +257,9 @@ export default {
this.selectTable = []
this.$refs.tables.clearSelection()
},
// itemChange(val) {},
itemChange(val) {
console.log(val)
},
// checkChange(val) {
// console.log(val);
// },
......
<template>
<div class="cargoAllocation">
<el-form ref="form" v-model="formData" class="form-header" label-position="right" label-width="auto" size="small">
<el-form
ref="form"
v-model="formData"
v-show="formShow"
class="form-header"
label-position="right"
label-width="auto"
size="small"
>
<el-row type="flex" style="flexWrap: wrap !important">
<el-col :span="6">
<el-form-item label="ACCS原航班日期">
......@@ -17,34 +25,25 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="申报类别">
<el-select
placeholder="不限"
v-model="formData.typeId"
<el-form-item label="ACCS原航班号">
<el-input
v-model="fltNo"
placeholder="请输入ACCS原航班号"
class="formItem"
clearable
>
<el-option
v-for="item in selectData.findConditionData.cargoType"
:label="item.chineseName"
:value="item.id"
:key="item.id"
>
</el-option>
</el-select>
></el-input>
</el-form-item>
</el-col>
<!-- <el-col :span="6">
<el-form-item label="海关回执状态">
<el-col :span="6">
<el-form-item label="货物状态">
<el-select
placeholder="不限"
v-model="formData.customsReceiptStatusId"
v-model="formData.statusId"
class="formItem"
multiple
clearable
>
<el-option
v-for="item in selectData.findConditionData.cargoCustomsReturnStatus"
v-for="item in selectData.findConditionData.cargoStatus"
:label="item.chineseName"
:value="item.id"
:key="item.id"
......@@ -52,17 +51,28 @@
</el-option>
</el-select>
</el-form-item>
</el-col> -->
</el-col>
<el-col :span="6">
<el-form-item label="货物状态">
<el-form-item label="运单号">
<el-input
class="formItem"
type="textarea"
placeholder="请输入运单号（回车分割）"
v-model="formData.waybillNo"
rows="1"
></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="申报类别">
<el-select
placeholder="不限"
v-model="formData.statusId"
v-model="formData.typeId"
class="formItem"
clearable
>
<el-option
v-for="item in selectData.findConditionData.cargoStatus"
v-for="item in selectData.findConditionData.cargoType"
:label="item.chineseName"
:value="item.id"
:key="item.id"
......@@ -72,18 +82,6 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="航班类型">
<el-select
placeholder="不限"
v-model="formData.kindToAllocFlightId"
class="formItem"
clearable
>
<el-option v-for="item in selectData.fltTypes" :label="item.chineseName" v-model="item.id" :key="item.id"> </el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="服务类型">
<el-select
placeholder="不限"
......@@ -102,27 +100,6 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="ACCS原航班号">
<el-input
v-model="fltNo"
placeholder="请输入ACCS原航班号"
class="formItem"
clearable
></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="运单号">
<el-input
class="formItem"
type="textarea"
placeholder="请输入运单号（回车分割）"
v-model="formData.waybillNo"
rows="1"
></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="URSA">
<el-input
class="formItem"
......@@ -146,18 +123,70 @@
</el-col>
<el-col :span="6">
<el-form-item label="重量区间">
<el-col :span="11"><el-input-number class="formItem" size="mini" v-model="formData.minWeight" :controls="false"></el-input-number></el-col>
<el-col :span="11"
><el-input-number
class="formItem"
size="mini"
v-model="formData.minWeight"
:controls="false"
:min="0"
:precision="2"
></el-input-number
></el-col>
<el-col class="line" :span="2">-</el-col>
<el-col :span="11"><el-input-number class="formItem" size="mini" v-model="formData.maxWeight" :controls="false"></el-input-number></el-col>
<el-col :span="11"
><el-input-number
class="formItem"
size="mini"
v-model="formData.maxWeight"
:controls="false"
:min="formData.minWeight"
:precision="2"
></el-input-number
></el-col>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="件数区间">
<el-col :span="11"><el-input-number class="formItem" size="mini" v-model="formData.minNumber" :controls="false"></el-input-number></el-col>
<el-col :span="11"
><el-input-number
class="formItem"
size="mini"
v-model="formData.minNumber"
:controls="false"
:min="0"
></el-input-number
></el-col>
<el-col class="line" :span="2">-</el-col>
<el-col :span="11"><el-input-number class="formItem" size="mini" v-model="formData.maxNumber" :controls="false"></el-input-number></el-col>
<el-col :span="11"
><el-input-number
class="formItem"
size="mini"
v-model="formData.maxNumber"
:controls="false"
:min="formData.minNumber"
></el-input-number
></el-col>
</el-form-item>
</el-col>
<!-- <el-col :span="6">
<el-form-item label="航班类型">
<el-select
placeholder="不限"
v-model="formData.kindToAllocFlightId"
class="formItem"
clearable
>
<el-option
v-for="item in selectData.fltTypes"
:label="item.chineseName"
v-model="item.id"
:key="item.id"
>
</el-option>
</el-select>
</el-form-item>
</el-col> -->
<el-col :span="6">
<el-form-item label="取件日期">
<el-date-picker
......@@ -169,19 +198,65 @@
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="口岸代码">
<el-input
v-model="portName"
placeholder="请输入口岸代码"
class="formItem"
clearable
></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="海关回执状态">
<el-select
placeholder="不限"
v-model="formData.customsReceiptStatusId"
class="formItem"
multiple
clearable
>
<el-option
v-for="item in selectData.findConditionData
.cargoCustomsReturnStatus"
:label="item.chineseName"
:value="item.id"
:key="item.id"
>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="Handling Code">
<el-empty description="暂无数据" v-if="selectData.HandlingCode.length == 0"></el-empty>
<el-empty
description="暂无数据"
v-if="!selectData.HandlingCode || selectData.HandlingCode.length == 0"
></el-empty>
<el-checkbox-group v-model="handingCodes" v-else>
<el-checkbox v-for="item in selectData.HandlingCode" :label="item.chineseName" v-model="item.englishName" :key="item.id"></el-checkbox>
<el-checkbox
v-for="item in selectData.HandlingCode"
:label="item.chineseName"
v-model="item.englishName"
:key="item.id"
></el-checkbox>
</el-checkbox-group>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="Sub Category">
<el-empty description="暂无数据" v-if="selectData.SubCategory.length == 0"></el-empty>
<el-empty
description="暂无数据"
v-if="!selectData.SubCategory || selectData.SubCategory.length == 0"
></el-empty>
<el-checkbox-group v-model="subCategorys" v-else>
<el-checkbox v-for="item in selectData.SubCategory" :label="item.chineseName" v-model="item.englishName" :key="item.id"></el-checkbox>
<el-checkbox
v-for="item in selectData.SubCategory"
:label="item.chineseName"
v-model="item.englishName"
:key="item.id"
></el-checkbox>
</el-checkbox-group>
</el-form-item>
</el-col>
......@@ -196,20 +271,24 @@
>查询</el-button
>
<el-button
:type="downLoadingTip.downloading?'warning':'primary'"
:type="downLoadingTip.downloading ? 'warning' : 'primary'"
size="mini"
@click="xlse(0)"
@click="xlsx(0)"
:loading="downLoadingTip.downloading"
:disabled="tableData.length <= 0"
>{{downLoadingTip.downloading?downLoadingTip.tip:"导出本页查询结果"}}</el-button
>{{
downLoadingTip.downloading ? downLoadingTip.tip : "导出本页查询结果"
}}</el-button
>
<el-button
:type="downLoadingTip.downloading?'warning':'primary'"
:type="downLoadingTip.downloading ? 'warning' : 'primary'"
size="mini"
@click="xlse(1)"
@click="xlsx(1)"
:loading="downLoadingTip.downloading"
:disabled="tableData.length <= 0"
>{{downLoadingTip.downloading?downLoadingTip.tip:"导出全部查询结果"}}</el-button
>{{
downLoadingTip.downloading ? downLoadingTip.tip : "导出全部查询结果"
}}</el-button
>
<el-button
type="primary"
......@@ -233,7 +312,7 @@
:limitSize="size"
:limitStart="formData.limitStart"
:shiftKey="shiftKey"
height="450"
height="350"
@tableSelect="tableSelect"
@tableSelectAll="tableSelectAll"
@currentChange="currentChange"
......@@ -252,7 +331,7 @@ import { findConditionData, findCargoAllocationData } from "@/api/cargoSelect";
import { allDictData } from "@/api/destinationFlight";
import { findFltConditionDataApi } from "@/api/findAllFltData";
import { downLoadXlsx } from "@/utils/zipdownload";
import { upCase } from "@/utils/FedEx"
import { upCase } from "@/utils/FedEx";
export default {
components: {
......@@ -261,23 +340,25 @@ export default {
data() {
return {
formData: {
fltDateStart:null,
fltDateEnd:null,
typeId:null,
statusId:null,
kindToAllocFlightId:null,
serviceTypeId:null,
waybillNo:null,
fltNo:null,
ursaList:null,
siteNameList:null,
minWeight:null,
maxWeight:null,
minNumber:null,
maxNumber:null,
pickUpDate:null,
handingCodes:null,
subCategorys:null,
fltDateStart: null,
fltDateEnd: null,
typeId: null,
portName:null,
statusId: null,
kindToAllocFlightId: null,
serviceTypeId: null,
waybillNo: null,
fltNo: null,
ursaList: null,
siteNameList: null,
minWeight: undefined,
maxWeight: undefined,
minNumber: undefined,
maxNumber: undefined,
pickUpDate: null,
handingCodes: null,
subCategorys: null,
customsReceiptStatusId: null,
}, //查询数据
tableHeader: [
{
......@@ -288,7 +369,7 @@ export default {
align: "center",
sorTable: false,
slot: null,
fixed:true,
fixed: true,
},
{
type: "index",
......@@ -298,7 +379,7 @@ export default {
align: "center",
sorTable: false,
slot: null,
fixed:false,
fixed: false,
},
{
type: "",
......@@ -306,9 +387,9 @@ export default {
value: "portName",
width: "150",
align: "center",
sorTable: false,
sorTable: true,
slot: null,
fixed:false,
fixed: false,
},
{
type: "",
......@@ -316,9 +397,9 @@ export default {
value: "pickUpDate",
width: "150",
align: "center",
sorTable: false,
sorTable: true,
slot: null,
fixed:false,
fixed: false,
},
{
type: "",
......@@ -326,9 +407,9 @@ export default {
value: "pickUpScanNo",
width: "150",
align: "center",
sorTable: false,
sorTable: true,
slot: null,
fixed:false,
fixed: false,
},
{
type: "",
......@@ -336,9 +417,9 @@ export default {
value: "siteName",
width: "150",
align: "center",
sorTable: false,
sorTable: true,
slot: null,
fixed:false,
fixed: false,
},
{
type: "",
......@@ -346,9 +427,9 @@ export default {
value: "waybillNo",
width: "150",
align: "center",
sorTable: false,
sorTable: true,
slot: null,
fixed:false,
fixed: false,
},
{
type: "",
......@@ -356,9 +437,9 @@ export default {
value: "totalWaybillNo",
width: "150",
align: "center",
sorTable: false,
sorTable: true,
slot: null,
fixed:false,
fixed: false,
},
{
type: "",
......@@ -366,9 +447,9 @@ export default {
value: "serviceTypeName",
width: "150",
align: "center",
sorTable: false,
sorTable: true,
slot: null,
fixed:false,
fixed: false,
},
{
type: "",
......@@ -376,9 +457,9 @@ export default {
value: "ursa",
width: "150",
align: "center",
sorTable: false,
sorTable: true,
slot: null,
fixed:false,
fixed: false,
},
{
type: "",
......@@ -386,9 +467,9 @@ export default {
value: "typeName",
width: "150",
align: "center",
sorTable: false,
sorTable: true,
slot: null,
fixed:false,
fixed: false,
},
{
type: "",
......@@ -396,9 +477,9 @@ export default {
value: "handingCode",
width: "150",
align: "center",
sorTable: false,
sorTable: true,
slot: null,
fixed:false,
fixed: false,
},
{
type: "",
......@@ -406,9 +487,9 @@ export default {
value: "subCategory",
width: "150",
align: "center",
sorTable: false,
sorTable: true,
slot: null,
fixed:false,
fixed: false,
},
{
type: "",
......@@ -416,9 +497,9 @@ export default {
value: "qty",
width: "150",
align: "center",
sorTable: false,
sorTable: true,
slot: null,
fixed:false,
fixed: false,
},
{
type: "",
......@@ -426,9 +507,9 @@ export default {
value: "actualWeight",
width: "150",
align: "center",
sorTable: false,
sorTable: true,
slot: null,
fixed:false,
fixed: false,
},
{
type: "",
......@@ -436,9 +517,9 @@ export default {
value: "consigneeCountry",
width: "150",
align: "center",
sorTable: false,
sorTable: true,
slot: null,
fixed:false,
fixed: false,
},
{
type: "",
......@@ -448,7 +529,7 @@ export default {
align: "center",
sorTable: false,
slot: null,
fixed:false,
fixed: false,
},
{
type: "",
......@@ -456,9 +537,9 @@ export default {
value: "customsReceiptStatusName",
width: "150",
align: "center",
sorTable: false,
sorTable: true,
slot: null,
fixed:false,
fixed: false,
},
{
type: "",
......@@ -466,9 +547,9 @@ export default {
value: "preQualificationStatus",
width: "150",
align: "center",
sorTable: false,
sorTable: true,
slot: null,
fixed:false,
fixed: false,
},
{
type: "",
......@@ -478,7 +559,7 @@ export default {
align: "center",
sorTable: false,
slot: null,
fixed:false,
fixed: false,
},
{
type: "",
......@@ -486,9 +567,9 @@ export default {
value: "statusName",
width: "150",
align: "center",
sorTable: false,
sorTable: true,
slot: null,
fixed:false,
fixed: false,
},
{
type: "",
......@@ -496,9 +577,9 @@ export default {
value: "finalFlightNo",
width: "150",
align: "center",
sorTable: false,
sorTable: true,
slot: null,
fixed:false,
fixed: false,
},
{
type: "",
......@@ -506,9 +587,9 @@ export default {
value: "finalFlightTime",
width: "150",
align: "center",
sorTable: false,
sorTable: true,
slot: null,
fixed:false,
fixed: false,
},
{
type: "",
......@@ -516,9 +597,9 @@ export default {
value: "twoMatchFlightNo",
width: "150",
align: "center",
sorTable: false,
sorTable: true,
slot: null,
fixed:false,
fixed: false,
},
{
type: "",
......@@ -526,9 +607,9 @@ export default {
value: "twoMatchFlightTime",
width: "150",
align: "center",
sorTable: false,
sorTable: true,
slot: null,
fixed:false,
fixed: false,
},
{
type: "",
......@@ -536,9 +617,9 @@ export default {
value: "preplanFlightNo",
width: "150",
align: "center",
sorTable: false,
sorTable: true,
slot: null,
fixed:false,
fixed: false,
},
{
type: "",
......@@ -546,9 +627,9 @@ export default {
value: "preplanFlightTime",
width: "150",
align: "center",
sorTable: false,
sorTable: true,
slot: null,
fixed:false,
fixed: false,
},
{
type: "",
......@@ -556,9 +637,9 @@ export default {
value: "fltNoAccs",
width: "150",
align: "center",
sorTable: false,
sorTable: true,
slot: null,
fixed:false,
fixed: false,
},
{
type: "",
......@@ -566,9 +647,9 @@ export default {
value: "fltDateAccs",
width: "150",
align: "center",
sorTable: false,
sorTable: true,
slot: null,
fixed:false,
fixed: false,
},
{
type: "",
......@@ -576,19 +657,19 @@ export default {
value: "accsFlightRoute",
width: "150",
align: "center",
sorTable: false,
sorTable: true,
slot: null,
fixed:false,
fixed: false,
},
{
type: "",
name: "是否RDE手工录入",
value: "manualRde",
width: "150",
width: "170",
align: "center",
sorTable: false,
sorTable: true,
slot: null,
fixed:false,
fixed: false,
},
{
type: "",
......@@ -596,9 +677,9 @@ export default {
value: "cargoRulesStatus",
width: "150",
align: "center",
sorTable: false,
sorTable: true,
slot: null,
fixed:false,
fixed: false,
},
{
type: "",
......@@ -608,7 +689,7 @@ export default {
align: "center",
sorTable: false,
slot: null,
fixed:false,
fixed: false,
},
{
type: "",
......@@ -618,7 +699,7 @@ export default {
align: "center",
sorTable: false,
slot: null,
fixed:false,
fixed: false,
},
{
type: "",
......@@ -628,7 +709,7 @@ export default {
align: "center",
sorTable: false,
slot: null,
fixed:false,
fixed: false,
},
{
type: "",
......@@ -638,7 +719,7 @@ export default {
align: "center",
sorTable: false,
slot: null,
fixed:false,
fixed: false,
},
{
type: "",
......@@ -646,9 +727,9 @@ export default {
value: "sizeStr",
width: "150",
align: "center",
sorTable: false,
sorTable: true,
slot: null,
fixed:false,
fixed: false,
},
{
type: "",
......@@ -658,7 +739,7 @@ export default {
align: "center",
sorTable: false,
slot: null,
fixed:false,
fixed: false,
},
{
type: "",
......@@ -668,7 +749,7 @@ export default {
align: "center",
sorTable: false,
slot: null,
fixed:false,
fixed: false,
},
{
type: "",
......@@ -676,9 +757,9 @@ export default {
value: "customsReceiptTime",
width: "150",
align: "center",
sorTable: false,
sorTable: true,
slot: null,
fixed:false,
fixed: false,
},
{
type: "",
......@@ -686,9 +767,9 @@ export default {
value: "caPretrialTime",
width: "150",
align: "center",
sorTable: false,
sorTable: true,
slot: null,
fixed:false,
fixed: false,
},
{
type: "",
......@@ -696,9 +777,9 @@ export default {
value: "createUserName",
width: "150",
align: "center",
sorTable: false,
sorTable: true,
slot: null,
fixed:false,
fixed: false,
},
{
type: "",
......@@ -706,78 +787,87 @@ export default {
value: "createTime",
width: "150",
align: "center",
sorTable: false,
sorTable: true,
slot: null,
fixed:false,
fixed: false,
},
], //表头数据
tableData: [], //表格数据
tableSelection: [], //选中数据
selectData:{
selectData: {
findConditionData: [],
fltTypes:[],
fltTypes: [],
HandlingCode: [],
SubCategory: [],
},//查询条件
fltDate:[],
ursaList:'',
siteNameList:'',
handingCodes:[],
subCategorys:[],
}, //查询条件
fltDate: [],
ursaList: "",
siteNameList: "",
handingCodes: [],
subCategorys: [],
valueFormat: "yyyy-MM-dd",
totalCount: 0,
page:1,
size:100,
page: 1,
size: 100,
allWeight: 0,
allQty: 0,
dialogVisible: false,
shiftKey: false,
createDate: null,
loading: false,
downLoadingTip:{
tip:"",
formShow:true,
downLoadingTip: {
tip: "",
downloading: false,
},
};
},
created() {
//查询条件
allDictData().then(res=>{
if(res.code === 200){
this.selectData.SubCategory = res.data.subCategory;
this.selectData.HandlingCode = res.data.handlingCode;
}else{
this.$message({
message: "查询条件不存在",
type: "warning",
});
new Promise((resolve, reject) => {
let obj = {};
findFltConditionDataApi()
.then((res) => {
if (res.code === 200) {
obj.flightType = res.data.flightType;
} else {
reject(res.msg);
}
})
.catch(() => {});
findFltConditionDataApi().then(res=>{
if(res.code === 200){
this.selectData.fltTypes = res.data.flightType
}else{
this.$message({
message: "查询条件不存在",
type: "warning",
});
allDictData()
.then((res) => {
if (res.code === 200) {
obj.HandlingCode = res.data.handlingCode;
obj.SubCategory = res.data.subCategory;
} else {
reject(res.msg);
}
})
.catch(() => {});
findConditionData().then((res) => {
findConditionData()
.then((res) => {
if (res.code == 200) {
this.selectData.findConditionData = res.data;
obj.findConditionData = res.data;
} else {
reject(res.msg);
}
resolve(obj)
})
.catch(() => {});
this.select();
}).then(res=>{
this.selectData = res
}).catch((err) => {
this.$message({
message: "查询条件不存在",
type: "warning",
});
}
})
this.select();
});
},
mounted(){
mounted() {
// this.selectData.HandlingCode.forEach((item,index)=>{
// if(item.id === 108093){
// this.selectData.HandlingCode.unshift(this.HandlingCode.splice(index,1)[0])
......@@ -797,7 +887,7 @@ export default {
methods: {
select() {
this.loading = true;
this.dataInfo()
this.dataInfo();
findCargoAllocationData(this.formData)
.then((res) => {
this.loading = false;
......@@ -805,9 +895,9 @@ export default {
this.tableData = res.data.list;
if (res.data.list.length > 0) {
this.totalCount = res.data.total;
this.tableData.forEach((item,index = 0)=>{
item.index = index
})
this.tableData.forEach((item, index = 0) => {
item.index = index;
});
} else {
this.$message({
message: "未查询到数据",
......@@ -825,105 +915,115 @@ export default {
this.loading = false;
});
},
cargoTotal(){
cargoTotal() {
this.allWeight = 0;
this.allQty = 0;
if(this.tableSelection.length > 0){
this.tableSelection.forEach(item=>{
if (this.tableSelection.length > 0) {
this.tableSelection.forEach((item) => {
this.allWeight = this.allWeight + item.actualWeight;
this.allQty = this.allQty + item.qty;
})
});
this.allWeight = this.allWeight.toFixed();
this.allQty = this.allQty.toFixed();
}
},
dataInfo(){
dataInfo() {
this.formData.ursaList = null;
this.formData.siteNameList = null;
this.formData.handingCodes = null;
this.formData.subCategorys = null;
if(this.handingCodes.length > 0 ){
if (this.handingCodes.length > 0) {
this.formData.handingCodes = this.handingCodes;
}
if(this.subCategorys.length > 0){
if (this.subCategorys.length > 0) {
this.formData.subCategorys = this.subCategorys;
}
if(this.formData.minWeight === 0){
this.formData.minWeight = null;
if (this.formData.minWeight === 0) {
this.formData.minWeight = undefined;
}
if(this.formData.maxWeight === 0){
this.formData.maxWeight = null;
if (this.formData.maxWeight === 0) {
this.formData.maxWeight = undefined;
}
if(this.formData.minNumber === 0){
this.formData.minNumber = null;
if (this.formData.minNumber === 0) {
this.formData.minNumber = undefined;
}
if(this.formData.maxNumber === 0){
this.formData.maxNumber = null;
if (this.formData.maxNumber === 0) {
this.formData.maxNumber = undefined;
}
if(this.ursaList && this.ursaList != ''){
this.formData.ursaList = this.ursaList.split(';' || '')
if (this.ursaList && this.ursaList != "") {
this.formData.ursaList = this.ursaList.split(";" || "");
}
if(this.siteNameList && this.siteNameList != ''){
this.formData.siteNameList = this.siteNameList.split(';' || '')
if (this.siteNameList && this.siteNameList != "") {
this.formData.siteNameList = this.siteNameList.split(";" || "");
}
if(this.fltDate && this.fltDate.length > 0){
if (this.fltDate && this.fltDate.length > 0) {
this.formData.fltDateStart = this.fltDate[0];
this.formData.fltDateEnd = this.fltDate[1];
}else{
} else {
this.formData.fltDateStart = null;
this.formData.fltDateEnd = null;
}
if (
this.formData.customsReceiptStatusId != null &&
this.formData.customsReceiptStatusId.length < 1
) {
this.formData.customsReceiptStatusId = null;
}
this.formData.page = this.page;
this.formData.size = this.size;
},
xlse(val) {
xlsx(val) {
this.downLoadingTip.downloading = true;
this.dataInfo()
if(val === 0){
this.downLoadingTip.tip = '正在导出本页结果集';
downLoadXlsx('/cargo/allocationExcel',this.formData,'手动配舱表').then(res=>{
this.downLoadingTip.downloading = false;
}).catch(err=>{
this.dataInfo();
if (val === 0) {
this.downLoadingTip.tip = "正在导出本页结果集";
downLoadXlsx("/cargo/allocationExcel", this.formData, "手动配舱表")
.then((res) => {
this.downLoadingTip.downloading = false;
console.log(err)
})
}else{
this.downLoadingTip.tip = '正在导出全部结果集请耐心等待';
.catch((err) => {
this.downLoadingTip.downloading = false;
console.log(err);
});
} else {
this.downLoadingTip.tip = "正在导出全部结果集请耐心等待";
this.formData.page = null;
this.formData.size = null;
downLoadXlsx('/cargo/allocationExcel',this.formData,'手动配舱表').then(res=>{
this.downLoadingTip.downloading = false;
}).catch(err=>{
downLoadXlsx("/cargo/allocationExcel", this.formData, "手动配舱表")
.then((res) => {
this.downLoadingTip.downloading = false;
console.log(err)
})
.catch((err) => {
this.downLoadingTip.downloading = false;
console.log(err);
});
}
},
tableSelect(val) {
this.tableSelection = val.selection
this.cargoTotal()
this.tableSelection = val.selection;
this.cargoTotal();
},
tableSelectAll(val){
this.tableSelection = val
this.cargoTotal()
tableSelectAll(val) {
this.tableSelection = val;
this.cargoTotal();
},
currentChange(val){
currentChange(val) {
this.formData.limitStart = val.start;
this.page = val.page;
this.select()
this.select();
},
addFit() {
let open = true;
this.tableSelection.forEach(item=>{
if(item.statusId != 107966){
this.tableSelection.forEach((item) => {
if (item.statusId != 107966) {
open = false;
}
})
if(open){
});
if (open) {
this.dialogVisible = open;
}else{
} else {
this.$message({
message: "此类型货物不可配舱",
message: "包含不可手动配舱货物",
type: "warning",
});
this.tableSelection = [];
......@@ -933,7 +1033,7 @@ export default {
},
dialogBeforeClose(val) {
this.dialogVisible = val.close;
if(val.reload){
if (val.reload) {
this.tableSelection = [];
this.$refs.newTables.clearTable();
this.cargoTotal();
......@@ -966,6 +1066,14 @@ export default {
this.siteNameList = upCase(val);
},
},
portName: {
get: function () {
return this.formData.portName;
},
set: function (val) {
this.formData.portName = upCase(val);
},
},
},
};
</script>
......@@ -976,22 +1084,22 @@ export default {
color: #606266;
font-size: 14px;
margin-top: 10px;
margin-left:50px;
margin-left: 50px;
}
.line{
.line {
text-align: center;
}
.el-empty{
width:30%;
height:37px;
padding:0px;
.el-empty {
width: 30%;
height: 37px;
padding: 0px;
line-height: 37px;
.el-empty__image{
.el-empty__image {
width: 0px;
height:0px;
height: 0px;
}
.el-empty__description{
margin-top:0px;
.el-empty__description {
margin-top: 0px;
}
}
</style>
\ No newline at end of file
......
......@@ -67,7 +67,7 @@
<script>
import { allocationFlight } from "@/api/cargoSelect";
import { MessageBox } from 'element-ui'
import { MessageBox } from "element-ui";
export default {
props: {
dialogVisible: {
......@@ -82,10 +82,10 @@ export default {
data() {
return {
formData: {
ids:[],
ids: [],
fltNo: undefined,
fltDate:undefined,
overweight:false
fltDate: undefined,
overweight: false,
},
cargoHeader: [
{ name: "口岸代码", value: "portName" },
......@@ -96,101 +96,101 @@ export default {
{ name: "URSA", value: "ursa" },
{ name: "实际重量", value: "actualWeight" },
{ name: "件数", value: "qty" },
{ name: "ACCS原航班号", value: "fltNoAccs" },
{ name: "ACCS原航班日期", value: "fltDateAccs" },
{ name: "品名描述", value: "nameDescription" },
{ name: "是否自动", value: "cargoRulesStatus" },
{ name: "创建人", value: "createUserName" },
{ name: "创建时间", value: "createTime" },
],
fltHeader: [
{ name: "航班日期", value: "fltDate" },
{ name: "航班号", value: "fltNo" },
{ name: "航班路线", value: "route" },
{ name: "航班类型", value: "typeName" },
{ name: "总重量", value: "totalWeight" },
{ name: "额外增重百分比", value: "extraWeightPercent" },
{ name: "已配重量", value: "alloctedWeight" },
{ name: "配舱优先级", value: "priorityRuleName" },
{ name: "是否开启高地价", value: "highLowPriceFlg" },
{ name: "航班起飞时间", value: "takeOffTime" },
{ name: "创建人", value: "createUserName" },
{ name: "创建时间", value: "createTime" },
],
rules:{
fltNo: [{
rules: {
fltNo: [
{
required: true,
message: "航班号不能为空",
trigger: "blur"
}],
fltDate: [{
trigger: "blur",
},
],
fltDate: [
{
required: true,
message: "航班日期不能为空",
trigger: "change"
}],
}
trigger: "change",
},
],
},
};
},
methods: {
cleaerForm(){
this.formData={
ids:[],
cleaerForm() {
this.formData = {
ids: [],
fltNo: undefined,
fltDate:undefined,
overweight:false
}
fltDate: undefined,
overweight: false,
};
},
//确定配舱
submit() {
let arr = [];
this.tableData.forEach(item => {
arr.push(item.id)
this.tableData.forEach((item) => {
arr.push(item.id);
});
this.formData.ids = arr;
if(this.formData.fltNo && this.formData.fltDate){
allocationFlight(this.formData).then(res=>{//code 200 配舱成功 601 重量已满需要确认 其余code直接输出msg
if(res.code === 200){
if (this.formData.fltNo && this.formData.fltDate) {
allocationFlight(this.formData).then((res) => {
//code 200 配舱成功 601 重量已满需要确认 其余code直接输出msg
if (res.code === 200) {
this.$message({
message: "货物配舱成功",
type: "success",
});
}else if(res.code === 202){
MessageBox.confirm('航班配重已满，是否继续配舱？', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}
).then(() => {
this.formData.overweight = true;//确定继续overweight变为true再次请求接口
allocationFlight(this.formData).then(res=>{
if(res.code === 200){
this.cleaerForm();
this.$emit("dialogBeforeClose", { close: false, reload: true });
} else if (res.code === 202) {
MessageBox.confirm(res.msg, "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
this.formData.overweight = true; //确定继续overweight变为true再次请求接口
allocationFlight(this.formData).then((res) => {
if (res.code === 200) {
this.$message({
message: "货物配舱成功",
type: "success",
});
}else{
} else {
this.$message({
message: res.msg,
type: "warning",
});
}
});
this.cleaerForm();
this.$emit("dialogBeforeClose", { close: false, reload: true });
})
this.cleaerForm()
this.$emit("dialogBeforeClose", {close:false,reload:true});
}).catch(() => {//取消 取消当前配舱
.catch(() => {
//取消 取消当前配舱
this.$message({
message: "配舱已取消",
type: "success",
});
this.cleaerForm()
this.$emit("dialogBeforeClose", {close:false,reload:false});
this.cleaerForm();
this.$emit("dialogBeforeClose", {
close: false,
reload: false,
});
});
}else{
} else {
this.$message({
message: res.msg,
type: "warning",
});
}
})
}else{
});
} else {
this.$message({
message: "航班号或航班日期不能为空",
type: "warning",
......@@ -198,8 +198,8 @@ export default {
}
},
dialogBeforeClose() {
this.cleaerForm()
this.$emit("dialogBeforeClose", {close:false,reload:false});
this.cleaerForm();
this.$emit("dialogBeforeClose", { close: false, reload: false });
},
},
computed: {
......
<template>
<div style="margin: 40px" class="app-container">
<div>
<el-form
:inline="true"
:model="queryParams"
class="demo-form-inline"
size="small"
class="form-header"
size="medium"
label-position="right"
label-width="auto"
>
<el-form-item label="航班号">
<el-input
......@@ -28,7 +30,7 @@
>查询</el-button
>
</el-form-item>
</el-form>
<div>
<el-button
style="margin-bottom: 20px"
type="primary"
......@@ -37,7 +39,9 @@
@click="$router.push({ name: 'flightAllocConfigAdd', params: { handle: 'add' } })"
>添加</el-button
>
<el-table :data="flyList" v-loading="loading" size="small">
</div>
</el-form>
<el-table :data="flyList" v-loading="loading" size="small" highlight-current-row border stripe>
<el-table-column
prop="purposeOfFlightNo"
label="航班号"
......@@ -208,9 +212,13 @@ export default {
.then(function () {
return enableOrDisable(id, status);
})
.then(() => {
.then((res) => {
if (res.code != 200){
this.msgError(res.msg);
}else {
this.getList();
this.msgSuccess(tip + "成功");
}
})
.catch(function () {});
},
......
......@@ -62,16 +62,16 @@
form.minNumOfPieces == 0
? (form.minNumOfPieces = undefined)
: form.minNumOfPieces
" :precision="0" :controls="false" style="width: 100%"></el-input-number>
" :precision="0" :controls="false" style="width: 100%" :min="1"></el-input-number>
</el-col>
<el-col style="text-align: center" :span="1">-</el-col>
<el-col :span="3">
<!-- <el-input v-model="form.maxNumOfPieces"></el-input> -->
<el-input-number v-model="
form.maxNumOfPieces == 0
? (form.maxNumOfPieces = undefined)
? form.maxNumOfPieces=undefined
: form.maxNumOfPieces
" :precision="0" :controls="false" style="width: 100%" :min="form.minNumOfPieces + 1"></el-input-number>
" :precision="0" :controls="false" style="width: 100%" :min="form.minNumOfPieces"></el-input-number>
</el-col>
</el-form-item>
......@@ -82,7 +82,7 @@
form.minWeight == 0
? (form.minWeight = undefined)
: form.minWeight
" :precision="2" :controls="false" style="width: 100%"></el-input-number>
" :precision="2" :controls="false" style="width: 100%" :min="0.01"></el-input-number>
</el-col>
<el-col :span="1" style="text-align: center"><span>Kg</span></el-col>
<el-col style="text-align: center" :span="1">-</el-col>
......@@ -92,7 +92,7 @@
form.maxWeight == 0
? (form.maxWeight = undefined)
: form.maxWeight
" :precision="2" :controls="false" style="width: 100%" :min="form.minWeight + 0.01"></el-input-number>
" :precision="2" :controls="false" style="width: 100%" :min="form.minWeight"></el-input-number>
</el-col>
<el-col :span="1" style="text-align: center"><span>Kg</span></el-col>
</el-form-item>
......@@ -398,10 +398,10 @@
info.subCategory.split(";") :
[];
this.form = info;
if (info.location != null || info.location == "") {
this.isLocation = "1";
} else {
if (info.notLocation != null || info.notLocation == "") {
this.isLocation = "2";
} else {
this.isLocation = "1";
}
this.isNeedRequired = info.isNeedRequired;
}
......@@ -435,10 +435,10 @@
info.subCategory.split(";") :
[];
this.form = info;
if (info.location != null || info.location == "") {
this.isLocation = "1";
} else {
if (info.notLocation != null || info.notLocation == "") {
this.isLocation = "2";
} else {
this.isLocation = "1";
}
let isNeedRequired = response.data.isNeedRequired;
this.form.isNeedRequired = isNeedRequired;
......
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" :inline="true">
<div>
<el-form class="form-header" :model="queryParams" ref="queryForm" size="medium" :inline="true" label-position="right" label-width="auto">
<el-form-item label="原航班">
<el-input type="text" v-model="upCase" placeholder="请输入原航班" clearable class="formItem"></el-input>
<el-input type="text" v-model="upCase" placeholder="请输入原航班" clearable></el-input>
<!-- <el-input v-model="upCase" placeholder="请输入原航班" clearable size="small" /> -->
</el-form-item>
<el-form-item label="状态" prop="status">
<el-select v-model="queryParams.status" placeholder="请选择" clearable size="small">
<el-select v-model="queryParams.status" placeholder="请选择" clearable>
<el-option v-for="dict in statusList" :key="dict.id" :label="dict.name" :value="dict.id" />
</el-select>
......@@ -30,15 +30,13 @@
</el-form-item>
<br />
<el-form-item>
<el-col :span="1.5">
<el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd">添加规则</el-button>
</el-col>
&#12288; <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
<el-table v-loading="loading" :data="sourceFlightRulesList">
<el-table v-loading="loading" height="550" :data="sourceFlightRulesList" highlight-current-row border stripe>
<el-table-column type="index" label="序号" align="center">
<template slot-scope="scope">{{ scope.$index + 1 }}</template>
</el-table-column>
......@@ -92,7 +90,7 @@
<!-- 添加或修改对话框 -->
<el-dialog :title="title" :visible.sync="open" width="55%" :append-to-body="true" :close-on-click-modal="false">
<el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-form ref="form" :model="form" :rules="rules" label-position="right" label-width="auto">
<el-row>
<el-col :span="10">
<el-form-item label="原航班" prop="sourceFlightNo">
......@@ -219,7 +217,7 @@
rules: {
sourceFlightNo: [{
required: true,
message: "原航班号不能为空",
message: "ACCS原航班号不能为空",
trigger: "blur"
}],
flightRank: [{
......@@ -361,7 +359,7 @@
//校验原航班号非空
if (this.queryParams.sourceFlightNo === null || this.queryParams.sourceFlightNo === undefined || this
.queryParams.sourceFlightNo.trim() === '') {
this.$message.warning("原航班号为空");
this.$message.warning("ACCS原航班号为空");
return
}
//校验原日期非空
......
<template>
<div class="app-container">
<div>
<el-form class="form-header" :model="queryParams" label-position="right" label-width="auto" size="medium">
<el-row>
<el-col :span="6">
......
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" :inline="true" label-width="90px">
<div>
<el-form class="form-header" :model="queryParams" ref="queryForm" label-position="right" label-width="auto" size="medium">
<el-row>
<el-col :span="8">
<el-col :span="6">
<el-form-item label="航班日期从" prop="fltDateStart">
<el-date-picker value-format="yyyy-MM-dd" v-model="queryParams.fltDateStart" type="date" placeholder="选择日期">
<el-date-picker class="formItem" value-format="yyyy-MM-dd" v-model="queryParams.fltDateStart" type="date" placeholder="选择日期">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="6">
<el-form-item label="到" prop="fltDateEnd">
<el-date-picker value-format="yyyy-MM-dd" v-model="queryParams.fltDateEnd" type="date" placeholder="选择日期">
<el-date-picker class="formItem" value-format="yyyy-MM-dd" v-model="queryParams.fltDateEnd" type="date" placeholder="选择日期">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="6">
<el-form-item label="航班号" prop="fltNo">
<el-input v-model="queryParams.fltNo" placeholder="请输入航班号" clearable size="small" />
<el-input class="formItem" v-model="queryParams.fltNo" placeholder="请输入航班号" clearable />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-col :span="6">
<el-form-item label="航班类型" prop="typeId">
<el-select v-model="queryParams.typeId" placeholder="请选择航班类型" clearable size="small">
<el-select class="formItem" v-model="queryParams.typeId" placeholder="请选择航班类型" clearable>
<el-option v-for="dict in flightTypelist" :key="dict.id" :label="dict.chineseName" :value="dict.id" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="6">
<el-form-item label="航班状态" prop="statusId">
<el-select v-model="queryParams.statusId" placeholder="请选择航班状态" clearable size="small">
<el-select class="formItem" v-model="queryParams.statusId" placeholder="请选择航班状态" clearable>
<el-option v-for="dict in flightStatuslist" :key="dict.id" :label="dict.chineseName" :value="dict.id" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="6">
<el-form-item label="航班种类" prop="flightKindId">
<el-select v-model="queryParams.flightKindId" placeholder="请选择航班种类" clearable size="small">
<el-select class="formItem" v-model="queryParams.flightKindId" placeholder="请选择航班种类" clearable>
<el-option v-for="dict in flightKindlist" :key="dict.id" :label="dict.chineseName" :value="dict.id" />
</el-select>
</el-form-item>
......@@ -51,14 +48,11 @@
</el-row>
<br />
<el-form-item>
<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="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-item>
<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">
......@@ -132,7 +126,7 @@
<!-- 添加或修改对话框 -->
<el-dialog :title="title" :visible.sync="open" width="60%" :close-on-click-modal="false" :append-to-body="true">
<el-form ref="form" :model="form" :rules="rules" label-width="130px">
<el-form ref="form" :model="form" :rules="rules" label-position="right" label-width="auto">
<el-row>
<el-col :span="12">
<el-form-item label="航班号" prop="fltNo">
......@@ -547,7 +541,6 @@
},
//计算高地价可配
LowHighAvailable() {
//判断是否开启高地价
if (this.form.highLowPriceFlg) {
this.ishighPriceWeightPercent=false;
......@@ -562,21 +555,33 @@
this.$set(this.form, "highAvailableWeight", (Weight - this.form.alloctedWeight) * (this.form
.highPriceWeightPercent / 100));
// this.form.HighAvailableWeight = Weightall * (this.form.highPriceWeightPercent / 100)
} else {
}else if(this.title == "修改航班信息" && this.form.highPriceWeightPercent > 0){
if(this.form.highAvailableWeight){
this.$set(this.form, 'highAvailableWeight', this.form.highAvailableWeight)
}else{
this.$set(this.form, "highAvailableWeight", (Weight - this.form.alloctedWeight) * (this.form
.highPriceWeightPercent / 100));
}
}else {
this.$set(this.form, "highAvailableWeight", 0);
// this.form.HighAvailableWeight = 0;
}
//低价可配
if (this.form.lowPriceWeightPercent > 0) {
this.$set(this.form, "lowAvailableWeight", (Weight - this.form.alloctedWeight) - this.form
.highAvailableWeight);
//this.form.lowAvailableWeight = Weightall - this.form.HighAvailableWeight;
} else {
}else if(this.title == "修改航班信息" && this.form.lowPriceWeightPercent > 0){
if(this.form.lowAvailableWeight){
this.$set(this.form, 'lowAvailableWeight', this.form.lowAvailableWeight)
}else{
this.$set(this.form, "lowAvailableWeight", (Weight - this.form.alloctedWeight) - this.form
.highAvailableWeight);
}
}else {
this.$set(this.form, "lowAvailableWeight", 0);
// this.form.lowAvailableWeight = 0;
}
}else{
this.ishighPriceWeightPercent=true;
}
......@@ -587,7 +592,7 @@
let Weight = 0;
if (this.form.extraWeightPercent > 0) {
Weight = this.form.originalWeight + this.form.originalWeight * (this.form.extraWeightPercent / 100)
} else {
}else {
Weight = this.form.originalWeight;
}
return Weight;
......
......@@ -3,15 +3,14 @@
<el-form
ref="cargoForm"
class="form-header"
size="small"
:model="formData"
label-position="top"
label-width="auto"
style="margin: 10px; width: 100%"
size="small"
:model="formData"
>
<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,12 +24,12 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="配载航班号:">
<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"
......@@ -49,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="formData.waybillNo"
......@@ -60,7 +59,7 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="申报类别:">
<el-form-item label="申报类别">
<el-select
placeholder="不限"
v-model="formData.typeId"
......@@ -78,7 +77,7 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="服务类型:">
<el-form-item label="服务类型">
<el-select
placeholder="不限"
v-model="formData.serviceTypeId"
......@@ -97,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"
......@@ -108,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"
......@@ -126,7 +125,7 @@
</template>
<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"
......@@ -140,13 +139,14 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="ACCS原航班号:">
<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="选择日期"
......@@ -156,7 +156,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"
......@@ -170,7 +170,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"
......@@ -189,7 +189,7 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="是否自动:">
<el-form-item label="是否自动">
<el-select
placeholder="不限"
v-model="formData.allocationTypeId"
......@@ -209,6 +209,18 @@
</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-collapse-item>
</el-collapse>
......@@ -240,44 +252,20 @@
</div>
</div>
</el-form>
<el-table
ref="cargoTable"
<Tables
ref="newTables"
:data="tableData"
v-loading="tableLoading"
highlight-current-row border stripe
:headerData="tableHeader"
:totalCount="totalCount"
:loading="tableLoading"
:limitSize="limitSize"
:limitStart="limitStart"
:shiftKey="shiftKey"
height="430"
size="mini"
@select="cheacked"
@select-all="selectAll"
>
<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>
@tableSelect="tableSelect"
@tableSelectAll="tableSelectAll"
@currentChange="currentChange"
></Tables>
</div>
</template>
......@@ -315,59 +303,446 @@ export default {
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:{
......@@ -380,10 +755,10 @@ export default {
prepalyFlightTime: [],
cargoPlaneTime:[],
createDate: [],
limitStart: 0,
limitStart: 1,
limitSize: 100, //无限制-1
page:1,
progress:0,
selecetALL:false,
};
},
......@@ -423,41 +798,8 @@ 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;
this.dataInfo();
findCargoData(this.formData).then((res) => {
if (res.code == 200) {
if (res.data.list.length > 0) {
......@@ -482,103 +824,10 @@ export default {
}).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(0);
this.allWeight = this.allWeight.toFixed(1);
},
// 导出表格
xlse(page) {
this.progress = 1;
this.downLoadingTip.downloading = true;
let cargoXlse = {title:"货物导出表",cargoConditionDto:{}};
dataInfo(){
if(this.formData.customsReceiptStatusId != null && this.formData.customsReceiptStatusId.length < 1){
this.formData.customsReceiptStatusId = null;
}
......@@ -610,26 +859,58 @@ export default {
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();
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()
},
// 导出表格
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 = "正在导出本页结果集"
cargoXlse.cargoConditionDto.limitStart = this.limitStart;
downLoadXlsx("/cargo/excel",cargoXlse,"货物查询表").then(()=>{
downLoadXlsx("/cargo/excel",cargoXlse,"货物表").then(()=>{
this.downLoadingTip.downloading = false;
this.downLoadingTip.tip = ""
this.progress = 100;
}).catch(()=>{
this.downLoadingTip.downloading = false;
this.downLoadingTip.tip = ""
this.downLoadingTip.tip = "";
})
} else {
if(this.totalCount < 80000){
this.downLoadingTip.tip = "正在导出全部结果集"
this.downLoadingTip.tip = "正在导出全部结果集请耐心等待"
cargoXlse.cargoConditionDto.limitStart = 0;
cargoXlse.cargoConditionDto.limitSize = -1;
downLoadXlsx("/cargo/excel",cargoXlse,"货物查询表").then(()=>{
downLoadXlsx("/cargo/excel",cargoXlse,"货物表").then(()=>{
this.downLoadingTip.downloading = false;
this.downLoadingTip.tip = ""
this.progress = 100;
......@@ -640,23 +921,12 @@ export default {
}else{
this.downLoadingTip.downloading = false;
this.$message({
message: "数据量过大无法导出",
message: "导出数据量过大，请不要超过10W条",
type: "warning",
});
}
}
},
//表格格式化
formatter(row,column,cellValue,index){
if(column.property=="cargoRulesStatus"){
if(cellValue == 1){
return cellValue = "手动"
}else if(cellValue == 2){
return cellValue = "自动"
}
}
return cellValue
}
},
computed: {
fltNo: {
......