Fedex / imac-vue

Go to a project
Toggle navigation Toggle navigation pinning
jinhui.wang
c1ea2864 2 parents e8069fa0 5264c9ba

Merge remote-tracking branch 'origin/uat'

Inline Side-by-side
Showing 6 changed files with 256 additions and 165 deletions
......@@ -80,10 +80,11 @@
color:#6379bb;
border-bottom:1px solid #ddd;
margin:8px 10px 25px 10px;
padding-top:15px;
padding-bottom:5px;
.formItem {
width: 100%;
max-width: 310px;
// max-width: 310px;
}
}
......
......@@ -42,5 +42,5 @@ module.exports = {
/**
* 版本号
*/
version:'version：1.0.0'
version:'version：1.0.5'
}
......
......@@ -19,6 +19,7 @@
end-placeholder="结束日期"
v-model="fltDate"
:value-format="valueFormat"
clearable
>
</el-date-picker>
</el-form-item>
......@@ -79,6 +80,7 @@
placeholder="请输入运单号（回车分割）"
:autosize="true"
v-model="formData.waybillNo"
clearable
></el-input>
</el-form-item>
</el-col>
......@@ -126,6 +128,7 @@
placeholder="S_;P_;E2"
v-model="ursa"
:autosize="true"
clearable
></el-input>
</el-form-item>
</el-col>
......@@ -137,6 +140,7 @@
placeholder="PVG;PEK"
v-model="siteName"
:autosize="true"
clearable
></el-input>
</el-form-item>
</el-col>
......@@ -192,24 +196,6 @@
</el-row>
</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
......@@ -217,6 +203,7 @@
type="date"
placeholder="选择日期"
:value-format="valueFormat"
clearable
>
</el-date-picker>
</el-form-item>
......@@ -338,7 +325,6 @@
import Dialog from "./info.vue";
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";
......@@ -379,6 +365,7 @@ export default {
align: "center",
sorTable: false,
fixed: true,
disabled:true
},
{
type: "index",
......@@ -388,96 +375,107 @@ export default {
align: "center",
sorTable: false,
fixed: false,
disabled:true
},
{
type: "",
name: "口岸代码",
value: "portName",
width: "150",
width: "100",
align: "center",
sorTable: true,
fixed: false,
disabled:true
},
{
type: "",
name: "取件日期",
value: "pickUpDate",
width: "150",
width: "120",
align: "center",
sorTable: true,
fixed: false,
disabled:true
},
{
type: "",
name: "取件扫描号",
value: "pickUpScanNo",
width: "150",
width: "120",
align: "center",
sorTable: true,
fixed: false,
disabled:true
},
{
type: "",
name: "站点",
value: "siteName",
width: "150",
width: "80",
align: "center",
sorTable: true,
fixed: false,
disabled:true
},
{
type: "",
name: "运单号",
value: "waybillNo",
width: "150",
width: "120",
align: "center",
sorTable: true,
fixed: false,
disabled:true
},
{
type: "",
name: "总单号",
value: "totalWaybillNo",
width: "150",
width: "120",
align: "center",
sorTable: true,
fixed: false,
disabled:true
},
{
type: "",
name: "服务类型",
value: "serviceTypeName",
width: "150",
width: "100",
align: "center",
sorTable: true,
fixed: false,
disabled:true
},
{
type: "",
name: "服务代码",
value: "serviceCode",
width: "150",
width: "100",
align: "center",
sorTable: false,
fixed:false,
fixed: false,
disabled:true
},
{
type: "",
name: "URSA",
value: "ursa",
width: "150",
width: "100",
align: "center",
sorTable: true,
fixed: false,
disabled:true
},
{
type: "",
name: "申报类型",
value: "typeName",
width: "150",
width: "100",
align: "center",
sorTable: true,
fixed: false,
disabled:true
},
{
type: "",
......@@ -487,33 +485,37 @@ export default {
align: "center",
sorTable: true,
fixed: false,
disabled:true
},
{
type: "",
name: "subcategory",
value: "subCategory",
width: "150",
width: "140",
align: "center",
sorTable: true,
fixed: false,
disabled:true
},
{
type: "",
name: "件数",
value: "qty",
width: "150",
width: "80",
align: "center",
sorTable: true,
fixed: false,
disabled:true
},
{
type: "",
name: "实际重量",
value: "actualWeight",
width: "150",
width: "100",
align: "center",
sorTable: true,
fixed: false,
disabled:true
},
{
type: "",
......@@ -523,78 +525,87 @@ export default {
align: "center",
sorTable: true,
fixed: false,
disabled:true
},
{
type: "",
name: "品名描述",
value: "nameDescription",
width: "150",
width: "100",
align: "center",
sorTable: false,
fixed: false,
disabled:true
},
{
type: "",
name: "海关回执状态",
value: "customsReceiptStatusName",
width: "150",
width: "140",
align: "center",
sorTable: true,
fixed: false,
disabled:true
},
{
type: "",
name: "预审状态",
value: "preQualificationStatus",
width: "150",
width: "100",
align: "center",
sorTable: true,
fixed: false,
disabled:true
},
{
type: "",
name: "航班预审意见",
value: "caPretrialOpinion",
width: "150",
width: "120",
align: "center",
sorTable: false,
fixed: false,
disabled:true
},
{
type: "",
name: "货物状态",
value: "statusName",
width: "150",
width: "100",
align: "center",
sorTable: true,
fixed: false,
disabled:true
},
{
type: "",
name: "终配航班号",
value: "finalFlightNo",
width: "150",
width: "120",
align: "center",
sorTable: true,
fixed: false,
disabled:true
},
{
type: "",
name: "终配航班日期",
value: "finalFlightTime",
width: "150",
width: "140",
align: "center",
sorTable: true,
fixed: false,
disabled:true
},
{
type: "",
name: "二配航班号",
value: "twoMatchFlightNo",
width: "150",
width: "120",
align: "center",
sorTable: true,
fixed: false,
disabled:true
},
{
type: "",
......@@ -604,15 +615,17 @@ export default {
align: "center",
sorTable: true,
fixed: false,
disabled:true
},
{
type: "",
name: "预配航班号",
value: "preplanFlightNo",
width: "150",
width: "120",
align: "center",
sorTable: true,
fixed: false,
disabled:true
},
{
type: "",
......@@ -622,6 +635,7 @@ export default {
align: "center",
sorTable: true,
fixed: false,
disabled:true
},
{
type: "",
......@@ -631,6 +645,7 @@ export default {
align: "center",
sorTable: true,
fixed: false,
disabled:true
},
{
type: "",
......@@ -640,15 +655,17 @@ export default {
align: "center",
sorTable: true,
fixed: false,
disabled:true
},
{
type: "",
name: "ACCS原航线",
value: "accsFlightRoute",
width: "150",
width: "140",
align: "center",
sorTable: true,
fixed: false,
disabled:true
},
{
type: "",
......@@ -658,24 +675,27 @@ export default {
align: "center",
sorTable: true,
fixed: false,
disabled:true
},
{
type: "",
name: "是否自动",
value: "cargoRulesStatus",
width: "150",
width: "100",
align: "center",
sorTable: true,
fixed: false,
disabled:true
},
{
type: "",
name: "发件人账号",
value: "shipperAccount",
width: "150",
width: "120",
align: "center",
sorTable: false,
fixed: false,
disabled:true
},
{
type: "",
......@@ -685,51 +705,57 @@ export default {
align: "center",
sorTable: false,
fixed: false,
disabled:true
},
{
type: "",
name: "始发地城市名称",
value: "originCity",
width: "150",
width: "130",
align: "center",
sorTable: false,
fixed: false,
disabled:true
},
{
type: "",
name: "收件地",
value: "destinationSiteName",
width: "150",
width: "90",
align: "center",
sorTable: false,
fixed: false,
disabled:true
},
{
type: "",
name: "尺寸",
value: "sizeStr",
width: "150",
width: "80",
align: "center",
sorTable: true,
fixed: false,
disabled:true
},
{
type: "",
name: "大货预审意见（是否可以配置航班）",
value: "bigPretrialOpinion",
width: "300",
width: "250",
align: "center",
sorTable: false,
fixed: false,
disabled:true
},
{
type: "",
name: "大货预审时间",
value: "bigPretrialTime",
width: "150",
width: "120",
align: "center",
sorTable: false,
fixed: false,
disabled:true
},
{
type: "",
......@@ -739,6 +765,7 @@ export default {
align: "center",
sorTable: true,
fixed: false,
disabled:true
},
{
type: "",
......@@ -748,24 +775,27 @@ export default {
align: "center",
sorTable: true,
fixed: false,
disabled:true
},
{
type: "",
name: "创建人",
value: "createUserName",
width: "150",
width: "90",
align: "center",
sorTable: true,
fixed: false,
disabled:true
},
{
type: "",
name: "创建时间",
value: "createTime",
width: "150",
width: "100",
align: "center",
sorTable: true,
fixed: false,
disabled:true
},
], //表头数据
tableData: [], //表格数据
......@@ -817,19 +847,6 @@ export default {
methods: {
//查询条件
async seleData() {
// findFltConditionDataApi()
// .then((res) => {
// if (res.code === 200) {
// this.selectData.fltTypes = res.data.flightType;
// }else{
// this.$message({
// message: "查询条件不存在",
// type: "warning",
// });
// }
// })
// .catch(() => {});
allDictData()
.then((res) => {
if (res.code === 200) {
......
<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
v-model.trim="purposeOfFlightNo"
placeholder="航班号"
@keyup.enter.native="getList"
clearable
></el-input>
</el-form-item>
<el-form-item label="状态">
<el-select v-model="queryParams.status" placeholder="状态">
<el-select v-model="queryParams.status" placeholder="状态" clearable>
<el-option label="有效" value="1"></el-option>
<el-option label="停用" value="3"></el-option>
</el-select>
......@@ -28,21 +31,31 @@
>查询</el-button
>
</el-form-item>
<div>
<el-button
style="margin-bottom: 20px"
type="primary"
icon="el-icon-plus"
size="mini"
@click="
$router.push({
name: 'FlightAllocConfigAdd',
params: { handle: 'add' },
})
"
>添加</el-button
>
</div>
</el-form>
<el-button
style="margin-bottom: 20px"
type="primary"
icon="el-icon-plus"
size="mini"
@click="
$router.push({
name: 'FlightAllocConfigAdd',
params: { handle: 'add' },
})
"
>添加</el-button
<el-table
:data="flyList"
v-loading="loading"
size="small"
highlight-current-row
border
stripe
>
<el-table :data="flyList" v-loading="loading" size="small">
<el-table-column
prop="purposeOfFlightNo"
label="航班号"
......
<template>
<div class="app-container">
<div>
<el-form :model="queryParams" ref="queryForm" :inline="true">
<el-form-item label="ACCS原航班">
<el-input
......@@ -43,6 +43,7 @@
v-model="queryParams.flightDate"
type="date"
placeholder="选择日期"
clearable
>
</el-date-picker>
</el-form-item>
......@@ -77,7 +78,15 @@
</el-form-item>
</el-form>
<el-table v-loading="loading" :data="sourceFlightRulesList">
<el-table
v-loading="loading"
height="550"
size="small"
: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>
......
......@@ -19,13 +19,14 @@
start-placeholder="开始日期"
end-placeholder="结束日期"
:value-format="valueFormat"
clearable
>
</el-date-picker>
</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" :autosize="true"></el-input>
<el-input type="textarea" v-model="cargoPlaneNo" class="formItem" placeholder="AC001;AC002" :autosize="true" clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
......@@ -55,6 +56,7 @@
class="formItem"
placeholder="请输入运单号（回车间隔）"
:autosize="true"
clearable
></el-input>
</el-form-item>
</el-col>
......@@ -103,6 +105,7 @@
class="formItem"
placeholder="S_;P_;E2"
:autosize="true"
clearable
></el-input>
</el-form-item>
</el-col>
......@@ -114,6 +117,7 @@
class="formItem"
placeholder="PVG;PEK"
:autosize="true"
clearable
></el-input>
</el-form-item>
</el-col>
......@@ -129,13 +133,14 @@
start-placeholder="开始日期"
end-placeholder="结束日期"
:value-format="valueFormat"
clearable
>
</el-date-picker>
</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-input type="text" v-model="fltNo" class="formItem" placeholder="请输入ACCS航班号" clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
......@@ -146,6 +151,7 @@
type="date"
placeholder="选择日期"
:value-format="valueFormat"
clearable
>
</el-date-picker>
</el-form-item>
......@@ -160,6 +166,7 @@
start-placeholder="开始日期"
end-placeholder="结束日期"
:value-format="valueFormat"
clearable
>
</el-date-picker>
</el-form-item>
......@@ -295,7 +302,8 @@ export default {
width: "50",
align: "center",
sorTable: false,
fixed:true,
fixed: true,
disabled:true
},
{
type: "index",
......@@ -304,97 +312,108 @@ export default {
width: "50",
align: "center",
sorTable: false,
fixed:false,
fixed: false,
disabled:true
},
{
type: "",
name: "口岸代码",
value: "portName",
width: "150",
width: "100",
align: "center",
sorTable: true,
fixed:false,
fixed: false,
disabled:true
},
{
type: "",
name: "取件日期",
value: "pickUpDate",
width: "150",
width: "120",
align: "center",
sorTable: true,
fixed:false,
fixed: false,
disabled:true
},
{
type: "",
name: "取件扫描号",
value: "pickUpScanNo",
width: "150",
width: "120",
align: "center",
sorTable: true,
fixed:false,
fixed: false,
disabled:true
},
{
type: "",
name: "站点",
value: "siteName",
width: "150",
width: "80",
align: "center",
sorTable: true,
fixed:false,
fixed: false,
disabled:true
},
{
type: "",
name: "运单号",
value: "waybillNo",
width: "150",
width: "120",
align: "center",
sorTable: true,
fixed:false,
fixed: false,
disabled:true
},
{
type: "",
name: "总单号",
value: "totalWaybillNo",
width: "150",
width: "120",
align: "center",
sorTable: true,
fixed:false,
fixed: false,
disabled:true
},
{
type: "",
name: "服务类型",
value: "serviceTypeName",
width: "150",
width: "100",
align: "center",
sorTable: true,
fixed:false,
fixed: false,
disabled:true
},
{
type: "",
name: "服务代码",
value: "serviceCode",
width: "150",
width: "100",
align: "center",
sorTable: false,
fixed:false,
fixed: false,
disabled:true
},
{
type: "",
name: "URSA",
value: "ursa",
width: "150",
width: "100",
align: "center",
sorTable: true,
fixed:false,
fixed: false,
disabled:true
},
{
type: "",
name: "申报类型",
value: "typeName",
width: "150",
width: "100",
align: "center",
sorTable: true,
fixed:false,
fixed: false,
disabled:true
},
{
type: "",
......@@ -403,34 +422,38 @@ export default {
width: "150",
align: "center",
sorTable: true,
fixed:false,
fixed: false,
disabled:true
},
{
type: "",
name: "subcategory",
value: "subCategory",
width: "150",
width: "140",
align: "center",
sorTable: true,
fixed:false,
fixed: false,
disabled:true
},
{
type: "",
name: "件数",
value: "qty",
width: "150",
width: "80",
align: "center",
sorTable: true,
fixed:false,
fixed: false,
disabled:true
},
{
type: "",
name: "实际重量",
value: "actualWeight",
width: "150",
width: "100",
align: "center",
sorTable: true,
fixed:false,
fixed: false,
disabled:true
},
{
type: "",
......@@ -439,79 +462,88 @@ export default {
width: "150",
align: "center",
sorTable: true,
fixed:false,
fixed: false,
disabled:true
},
{
type: "",
name: "品名描述",
value: "nameDescription",
width: "150",
width: "100",
align: "center",
sorTable: false,
fixed:false,
fixed: false,
disabled:true
},
{
type: "",
name: "海关回执状态",
value: "customsReceiptStatusName",
width: "150",
width: "140",
align: "center",
sorTable: true,
fixed:false,
fixed: false,
disabled:true
},
{
type: "",
name: "预审状态",
value: "preQualificationStatus",
width: "150",
width: "100",
align: "center",
sorTable: true,
fixed:false,
fixed: false,
disabled:true
},
{
type: "",
name: "航班预审意见",
value: "caPretrialOpinion",
width: "150",
width: "120",
align: "center",
sorTable: false,
fixed:false,
fixed: false,
disabled:true
},
{
type: "",
name: "货物状态",
value: "statusName",
width: "150",
width: "100",
align: "center",
sorTable: true,
fixed:false,
fixed: false,
disabled:true
},
{
type: "",
name: "终配航班号",
value: "finalFlightNo",
width: "150",
width: "120",
align: "center",
sorTable: true,
fixed:false,
fixed: false,
disabled:true
},
{
type: "",
name: "终配航班日期",
value: "finalFlightTime",
width: "150",
width: "140",
align: "center",
sorTable: true,
fixed:false,
fixed: false,
disabled:true
},
{
type: "",
name: "二配航班号",
value: "twoMatchFlightNo",
width: "150",
width: "120",
align: "center",
sorTable: true,
fixed:false,
fixed: false,
disabled:true
},
{
type: "",
......@@ -520,16 +552,18 @@ export default {
width: "150",
align: "center",
sorTable: true,
fixed:false,
fixed: false,
disabled:true
},
{
type: "",
name: "预配航班号",
value: "preplanFlightNo",
width: "150",
width: "120",
align: "center",
sorTable: true,
fixed:false,
fixed: false,
disabled:true
},
{
type: "",
......@@ -538,7 +572,8 @@ export default {
width: "150",
align: "center",
sorTable: true,
fixed:false,
fixed: false,
disabled:true
},
{
type: "",
......@@ -547,7 +582,8 @@ export default {
width: "150",
align: "center",
sorTable: true,
fixed:false,
fixed: false,
disabled:true
},
{
type: "",
......@@ -556,16 +592,18 @@ export default {
width: "150",
align: "center",
sorTable: true,
fixed:false,
fixed: false,
disabled:true
},
{
type: "",
name: "ACCS原航线",
value: "accsFlightRoute",
width: "150",
width: "140",
align: "center",
sorTable: true,
fixed:false,
fixed: false,
disabled:true
},
{
type: "",
......@@ -574,25 +612,28 @@ export default {
width: "170",
align: "center",
sorTable: true,
fixed:false,
fixed: false,
disabled:true
},
{
type: "",
name: "是否自动",
value: "cargoRulesStatus",
width: "150",
width: "100",
align: "center",
sorTable: true,
fixed:false,
fixed: false,
disabled:true
},
{
type: "",
name: "发件人账号",
value: "shipperAccount",
width: "150",
width: "120",
align: "center",
sorTable: false,
fixed:false,
fixed: false,
disabled:true
},
{
type: "",
......@@ -601,52 +642,58 @@ export default {
width: "150",
align: "center",
sorTable: false,
fixed:false,
fixed: false,
disabled:true
},
{
type: "",
name: "始发地城市名称",
value: "originCity",
width: "150",
width: "130",
align: "center",
sorTable: false,
fixed:false,
fixed: false,
disabled:true
},
{
type: "",
name: "收件地",
value: "destinationSiteName",
width: "150",
width: "90",
align: "center",
sorTable: false,
fixed:false,
fixed: false,
disabled:true
},
{
type: "",
name: "尺寸",
value: "sizeStr",
width: "150",
width: "80",
align: "center",
sorTable: true,
fixed:false,
fixed: false,
disabled:true
},
{
type: "",
name: "大货预审意见（是否可以配置航班）",
value: "bigPretrialOpinion",
width: "300",
width: "250",
align: "center",
sorTable: false,
fixed:false,
fixed: false,
disabled:true
},
{
type: "",
name: "大货预审时间",
value: "bigPretrialTime",
width: "150",
width: "120",
align: "center",
sorTable: false,
fixed:false,
fixed: false,
disabled:true
},
{
type: "",
......@@ -655,7 +702,8 @@ export default {
width: "150",
align: "center",
sorTable: true,
fixed:false,
fixed: false,
disabled:true
},
{
type: "",
......@@ -664,25 +712,28 @@ export default {
width: "150",
align: "center",
sorTable: true,
fixed:false,
fixed: false,
disabled:true
},
{
type: "",
name: "创建人",
value: "createUserName",
width: "150",
width: "90",
align: "center",
sorTable: true,
fixed:false,
fixed: false,
disabled:true
},
{
type: "",
name: "创建时间",
value: "createTime",
width: "150",
width: "100",
align: "center",
sorTable: true,
fixed:false,
fixed: false,
disabled:true
},
], //表头数据
findConditionData: {}, //货物查询条件
......@@ -706,7 +757,7 @@ export default {
limitSize: 100, //无限制-1
page:1,
progress:0,
formShow:false,
formShow:true,
};
},
created() {
......