Fedex / imac-vue

Go to a project
Toggle navigation Toggle navigation pinning
jinhui.wang
9294476f 1 parent 5f0626b3

文本框修正

Inline Side-by-side
Showing 2 changed files with 40 additions and 132 deletions
......@@ -77,8 +77,8 @@
class="formItem"
type="textarea"
placeholder="请输入运单号（回车分割）"
v-model.trim="formData.waybillNo"
rows="1"
:autosize="true"
v-model="formData.waybillNo"
></el-input>
</el-form-item>
</el-col>
......@@ -125,7 +125,7 @@
type="textarea"
placeholder="S_;P_;E2"
v-model="ursa"
rows="1"
:autosize="true"
></el-input>
</el-form-item>
</el-col>
......@@ -136,7 +136,7 @@
type="textarea"
placeholder="PVG;PEK"
v-model="siteName"
rows="1"
:autosize="true"
></el-input>
</el-form-item>
</el-col>
......@@ -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
......@@ -329,12 +333,12 @@
import Dialog from "./info.vue";
import { findConditionData, findCargoAllocationData } from "@/api/cargoSelect";
import { allDictData } from "@/api/destinationFlight";
import { findFltConditionDataApi } from "@/api/findAllFltData";
// import { findFltConditionDataApi } from "@/api/findAllFltData";
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,
......@@ -369,7 +373,6 @@ export default {
width: "50",
align: "center",
sorTable: false,
slot: null,
fixed: true,
},
{
......@@ -379,7 +382,6 @@ export default {
width: "50",
align: "center",
sorTable: false,
slot: null,
fixed: false,
},
{
......@@ -389,7 +391,6 @@ export default {
width: "150",
align: "center",
sorTable: true,
slot: null,
fixed: false,
},
{
......@@ -399,7 +400,6 @@ export default {
width: "150",
align: "center",
sorTable: true,
slot: null,
fixed: false,
},
{
......@@ -409,7 +409,6 @@ export default {
width: "150",
align: "center",
sorTable: true,
slot: null,
fixed: false,
},
{
......@@ -419,7 +418,6 @@ export default {
width: "150",
align: "center",
sorTable: true,
slot: null,
fixed: false,
},
{
......@@ -429,7 +427,6 @@ export default {
width: "150",
align: "center",
sorTable: true,
slot: null,
fixed: false,
},
{
......@@ -439,7 +436,6 @@ export default {
width: "150",
align: "center",
sorTable: true,
slot: null,
fixed: false,
},
{
......@@ -449,7 +445,6 @@ export default {
width: "150",
align: "center",
sorTable: true,
slot: null,
fixed: false,
},
{
......@@ -468,7 +463,6 @@ export default {
width: "150",
align: "center",
sorTable: true,
slot: null,
fixed: false,
},
{
......@@ -478,7 +472,6 @@ export default {
width: "150",
align: "center",
sorTable: true,
slot: null,
fixed: false,
},
{
......@@ -488,7 +481,6 @@ export default {
width: "150",
align: "center",
sorTable: true,
slot: null,
fixed: false,
},
{
......@@ -498,7 +490,6 @@ export default {
width: "150",
align: "center",
sorTable: true,
slot: null,
fixed: false,
},
{
......@@ -508,7 +499,6 @@ export default {
width: "150",
align: "center",
sorTable: true,
slot: null,
fixed: false,
},
{
......@@ -518,7 +508,6 @@ export default {
width: "150",
align: "center",
sorTable: true,
slot: null,
fixed: false,
},
{
......@@ -528,7 +517,6 @@ export default {
width: "150",
align: "center",
sorTable: true,
slot: null,
fixed: false,
},
{
......@@ -538,7 +526,6 @@ export default {
width: "150",
align: "center",
sorTable: false,
slot: null,
fixed: false,
},
{
......@@ -548,7 +535,6 @@ export default {
width: "150",
align: "center",
sorTable: true,
slot: null,
fixed: false,
},
{
......@@ -558,7 +544,6 @@ export default {
width: "150",
align: "center",
sorTable: true,
slot: null,
fixed: false,
},
{
......@@ -568,7 +553,6 @@ export default {
width: "150",
align: "center",
sorTable: false,
slot: null,
fixed: false,
},
{
......@@ -578,7 +562,6 @@ export default {
width: "150",
align: "center",
sorTable: true,
slot: null,
fixed: false,
},
{
......@@ -588,7 +571,6 @@ export default {
width: "150",
align: "center",
sorTable: true,
slot: null,
fixed: false,
},
{
......@@ -598,7 +580,6 @@ export default {
width: "150",
align: "center",
sorTable: true,
slot: null,
fixed: false,
},
{
......@@ -608,7 +589,6 @@ export default {
width: "150",
align: "center",
sorTable: true,
slot: null,
fixed: false,
},
{
......@@ -618,7 +598,6 @@ export default {
width: "150",
align: "center",
sorTable: true,
slot: null,
fixed: false,
},
{
......@@ -628,7 +607,6 @@ export default {
width: "150",
align: "center",
sorTable: true,
slot: null,
fixed: false,
},
{
......@@ -638,7 +616,6 @@ export default {
width: "150",
align: "center",
sorTable: true,
slot: null,
fixed: false,
},
{
......@@ -648,7 +625,6 @@ export default {
width: "150",
align: "center",
sorTable: true,
slot: null,
fixed: false,
},
{
......@@ -658,7 +634,6 @@ export default {
width: "150",
align: "center",
sorTable: true,
slot: null,
fixed: false,
},
{
......@@ -668,7 +643,6 @@ export default {
width: "150",
align: "center",
sorTable: true,
slot: null,
fixed: false,
},
{
......@@ -678,7 +652,6 @@ export default {
width: "170",
align: "center",
sorTable: true,
slot: null,
fixed: false,
},
{
......@@ -688,7 +661,6 @@ export default {
width: "150",
align: "center",
sorTable: true,
slot: null,
fixed: false,
},
{
......@@ -698,7 +670,6 @@ export default {
width: "150",
align: "center",
sorTable: false,
slot: null,
fixed: false,
},
{
......@@ -708,7 +679,6 @@ export default {
width: "150",
align: "center",
sorTable: false,
slot: null,
fixed: false,
},
{
......@@ -718,7 +688,6 @@ export default {
width: "150",
align: "center",
sorTable: false,
slot: null,
fixed: false,
},
{
......@@ -728,7 +697,6 @@ export default {
width: "150",
align: "center",
sorTable: false,
slot: null,
fixed: false,
},
{
......@@ -738,7 +706,6 @@ export default {
width: "150",
align: "center",
sorTable: true,
slot: null,
fixed: false,
},
{
......@@ -748,7 +715,6 @@ export default {
width: "300",
align: "center",
sorTable: false,
slot: null,
fixed: false,
},
{
......@@ -758,7 +724,6 @@ export default {
width: "150",
align: "center",
sorTable: false,
slot: null,
fixed: false,
},
{
......@@ -768,7 +733,6 @@ export default {
width: "150",
align: "center",
sorTable: true,
slot: null,
fixed: false,
},
{
......@@ -778,7 +742,6 @@ export default {
width: "150",
align: "center",
sorTable: true,
slot: null,
fixed: false,
},
{
......@@ -788,7 +751,6 @@ export default {
width: "150",
align: "center",
sorTable: true,
slot: null,
fixed: false,
},
{
......@@ -798,7 +760,6 @@ export default {
width: "150",
align: "center",
sorTable: true,
slot: null,
fixed: false,
},
], //表头数据
......@@ -833,7 +794,7 @@ export default {
},
created() {
this.seleData()
this.select()
this.select();
},
mounted() {
window.addEventListener("keydown", (code) => {
......@@ -979,6 +940,9 @@ export default {
}
this.formData.page = this.page;
this.formData.size = this.size;
if(this.formData.waybillNo){
this.formData.waybillNo = this.formData.waybillNo.trim();
}
},
//导出表格
xlsx(val) {
......@@ -1025,21 +989,21 @@ export default {
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)
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);
}
},
//添加到航班
......
......@@ -25,7 +25,7 @@
</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-input type="textarea" v-model="cargoPlaneNo" class="formItem" placeholder="AC001;AC002" :autosize="true"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
......@@ -51,10 +51,10 @@
<el-form-item label="运单号">
<el-input
type="textarea"
v-model.trim="formData.waybillNo"
v-model="formData.waybillNo"
class="formItem"
placeholder="请输入运单号（回车间隔）"
rows="1"
:autosize="true"
></el-input>
</el-form-item>
</el-col>
......@@ -102,7 +102,7 @@
v-model="ursa"
class="formItem"
placeholder="S_;P_;E2"
rows="1"
:autosize="true"
></el-input>
</el-form-item>
</el-col>
......@@ -113,7 +113,7 @@
v-model="siteName"
class="formItem"
placeholder="PVG;PEK"
rows="1"
:autosize="true"
></el-input>
</el-form-item>
</el-col>
......@@ -204,18 +204,6 @@
</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>
......@@ -228,9 +216,6 @@
@click="select"
>查询</el-button
>
<!-- <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
>
......@@ -243,7 +228,6 @@
<span style="paddingRight: 50px">总重量:{{ allWeight }}</span>
<span>总件数:{{ allQty }}</span>
</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>
......@@ -310,7 +294,6 @@ export default {
width: "50",
align: "center",
sorTable: false,
slot: null,
fixed:true,
},
{
......@@ -320,7 +303,6 @@ export default {
width: "50",
align: "center",
sorTable: false,
slot: null,
fixed:false,
},
{
......@@ -330,7 +312,6 @@ export default {
width: "150",
align: "center",
sorTable: true,
slot: null,
fixed:false,
},
{
......@@ -340,7 +321,6 @@ export default {
width: "150",
align: "center",
sorTable: true,
slot: null,
fixed:false,
},
{
......@@ -350,7 +330,6 @@ export default {
width: "150",
align: "center",
sorTable: true,
slot: null,
fixed:false,
},
{
......@@ -360,7 +339,6 @@ export default {
width: "150",
align: "center",
sorTable: true,
slot: null,
fixed:false,
},
{
......@@ -370,7 +348,6 @@ export default {
width: "150",
align: "center",
sorTable: true,
slot: null,
fixed:false,
},
{
......@@ -380,7 +357,6 @@ export default {
width: "150",
align: "center",
sorTable: true,
slot: null,
fixed:false,
},
{
......@@ -390,7 +366,6 @@ export default {
width: "150",
align: "center",
sorTable: true,
slot: null,
fixed:false,
},
{
......@@ -409,7 +384,6 @@ export default {
width: "150",
align: "center",
sorTable: true,
slot: null,
fixed:false,
},
{
......@@ -419,7 +393,6 @@ export default {
width: "150",
align: "center",
sorTable: true,
slot: null,
fixed:false,
},
{
......@@ -429,7 +402,6 @@ export default {
width: "150",
align: "center",
sorTable: true,
slot: null,
fixed:false,
},
{
......@@ -439,7 +411,6 @@ export default {
width: "150",
align: "center",
sorTable: true,
slot: null,
fixed:false,
},
{
......@@ -449,7 +420,6 @@ export default {
width: "150",
align: "center",
sorTable: true,
slot: null,
fixed:false,
},
{
......@@ -459,7 +429,6 @@ export default {
width: "150",
align: "center",
sorTable: true,
slot: null,
fixed:false,
},
{
......@@ -469,7 +438,6 @@ export default {
width: "150",
align: "center",
sorTable: true,
slot: null,
fixed:false,
},
{
......@@ -479,7 +447,6 @@ export default {
width: "150",
align: "center",
sorTable: false,
slot: null,
fixed:false,
},
{
......@@ -489,7 +456,6 @@ export default {
width: "150",
align: "center",
sorTable: true,
slot: null,
fixed:false,
},
{
......@@ -499,7 +465,6 @@ export default {
width: "150",
align: "center",
sorTable: true,
slot: null,
fixed:false,
},
{
......@@ -509,7 +474,6 @@ export default {
width: "150",
align: "center",
sorTable: false,
slot: null,
fixed:false,
},
{
......@@ -519,7 +483,6 @@ export default {
width: "150",
align: "center",
sorTable: true,
slot: null,
fixed:false,
},
{
......@@ -529,7 +492,6 @@ export default {
width: "150",
align: "center",
sorTable: true,
slot: null,
fixed:false,
},
{
......@@ -539,7 +501,6 @@ export default {
width: "150",
align: "center",
sorTable: true,
slot: null,
fixed:false,
},
{
......@@ -549,7 +510,6 @@ export default {
width: "150",
align: "center",
sorTable: true,
slot: null,
fixed:false,
},
{
......@@ -559,7 +519,6 @@ export default {
width: "150",
align: "center",
sorTable: true,
slot: null,
fixed:false,
},
{
......@@ -569,7 +528,6 @@ export default {
width: "150",
align: "center",
sorTable: true,
slot: null,
fixed:false,
},
{
......@@ -579,7 +537,6 @@ export default {
width: "150",
align: "center",
sorTable: true,
slot: null,
fixed:false,
},
{
......@@ -589,7 +546,6 @@ export default {
width: "150",
align: "center",
sorTable: true,
slot: null,
fixed:false,
},
{
......@@ -599,7 +555,6 @@ export default {
width: "150",
align: "center",
sorTable: true,
slot: null,
fixed:false,
},
{
......@@ -609,7 +564,6 @@ export default {
width: "150",
align: "center",
sorTable: true,
slot: null,
fixed:false,
},
{
......@@ -619,7 +573,6 @@ export default {
width: "170",
align: "center",
sorTable: true,
slot: null,
fixed:false,
},
{
......@@ -629,7 +582,6 @@ export default {
width: "150",
align: "center",
sorTable: true,
slot: null,
fixed:false,
},
{
......@@ -639,7 +591,6 @@ export default {
width: "150",
align: "center",
sorTable: false,
slot: null,
fixed:false,
},
{
......@@ -649,7 +600,6 @@ export default {
width: "150",
align: "center",
sorTable: false,
slot: null,
fixed:false,
},
{
......@@ -659,7 +609,6 @@ export default {
width: "150",
align: "center",
sorTable: false,
slot: null,
fixed:false,
},
{
......@@ -669,7 +618,6 @@ export default {
width: "150",
align: "center",
sorTable: false,
slot: null,
fixed:false,
},
{
......@@ -679,7 +627,6 @@ export default {
width: "150",
align: "center",
sorTable: true,
slot: null,
fixed:false,
},
{
......@@ -689,7 +636,6 @@ export default {
width: "300",
align: "center",
sorTable: false,
slot: null,
fixed:false,
},
{
......@@ -699,7 +645,6 @@ export default {
width: "150",
align: "center",
sorTable: false,
slot: null,
fixed:false,
},
{
......@@ -709,7 +654,6 @@ export default {
width: "150",
align: "center",
sorTable: true,
slot: null,
fixed:false,
},
{
......@@ -719,7 +663,6 @@ export default {
width: "150",
align: "center",
sorTable: true,
slot: null,
fixed:false,
},
{
......@@ -729,7 +672,6 @@ export default {
width: "150",
align: "center",
sorTable: true,
slot: null,
fixed:false,
},
{
......@@ -739,7 +681,6 @@ export default {
width: "150",
align: "center",
sorTable: true,
slot: null,
fixed:false,
},
], //表头数据
......@@ -865,6 +806,9 @@ export default {
this.formData.cargoPlaneStart = null;
this.formData.cargoPlaneEnd = null;
}
if(this.formData.waybillNo){
this.formData.waybillNo = this.formData.waybillNo.trim();
}
},
//总和
cargoTotal(){
......