Fedex / imac-vue

Go to a project
Toggle navigation Toggle navigation pinning
Elements-SY
47aea80b 1 parent 628e366a

【ET86 数据字典】

Inline Side-by-side
Showing 3 changed files with 67 additions and 45 deletions
......@@ -2,14 +2,38 @@
<div class="cargoPage">
<el-form ref="cargoForm" class="form-header" label-position="right" label-width="auto" size="small" :model="formData">
<el-row type="flex" style="flexWrap: wrap !important">
<el-col :span="6">
<el-col :span="8">
<el-form-item label="配舱航班日期">
<el-date-picker class="formItem" v-model="cargoPlaneTime" type="daterange" range-separator="至"
start-placeholder="开始日期" end-placeholder="结束日期" :value-format="valueFormat" clearable>
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="6">
<el-col :span="8">
<el-form-item label="运单号">
<el-input ref='userInfo' type="textarea" v-model="formData.waybillNo" class="formItem"
placeholder="请输入运单号（回车间隔）" :rows="1" :maxlength="12000" clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="配载航班号">
<el-input type="textarea" v-model="cargoPlaneNo" class="formItem" placeholder="AC001;AC002" :rows="1"
clearable @change="planeNoChange"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="URSA">
<el-input type="textarea" v-model="ursa" class="formItem" placeholder="S_;P_;E2" :rows="1" clearable>
</el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="始发站">
<el-input type="textarea" v-model="siteName" class="formItem" placeholder="PVG;PEK" :rows="1" clearable>
</el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="海关回执状态">
<el-select v-model="formData.customsReceiptStatusId" class="formItem" filterable multiple clearable
placeholder="不限">
......@@ -20,7 +44,7 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-col :span="8">
<el-form-item label="申报类别">
<el-select placeholder="不限" v-model="formData.typeId" class="formItem" clearable>
<el-option v-for="item in findConditionData.cargoType" :label="item.chineseName" :value="item.id"
......@@ -29,7 +53,7 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-col :span="8">
<el-form-item label="服务类型">
<el-select v-model="formData.serviceTypeId" class="formItem" filterable multiple clearable placeholder="不限">
<el-option v-for="item in findConditionData.cargoServiceType" :label="item.chineseName" :value="item.id"
......@@ -39,59 +63,35 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="运单号">
<el-input ref='userInfo' type="textarea" v-model="formData.waybillNo" class="formItem"
placeholder="请输入运单号（回车间隔）" :rows="4" :maxlength="12000" clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="配载航班号">
<el-input type="textarea" v-model="cargoPlaneNo" class="formItem" placeholder="AC001;AC002" :rows="4"
clearable @change="planeNoChange"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="URSA">
<el-input type="textarea" v-model="ursa" class="formItem" placeholder="S_;P_;E2" :rows="4" clearable>
</el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="始发站">
<el-input type="textarea" v-model="siteName" class="formItem" placeholder="PVG;PEK" :rows="4" clearable>
</el-input>
</el-form-item>
</el-col>
<el-col v-show="formShow">
<el-row type="flex" style="flexWrap: wrap !important">
<el-col :span="6">
<el-col :span="8">
<el-form-item label="ACCS原航班日期">
<el-date-picker class="formItem" v-model="flightTime" type="daterange" range-separator="至"
start-placeholder="开始日期" end-placeholder="结束日期" :value-format="valueFormat" clearable>
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="6">
<el-col :span="8">
<el-form-item label="ACCS原航班号">
<el-input type="text" v-model="fltNo" class="formItem" placeholder="请输入ACCS航班号" clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-col :span="8">
<el-form-item label="取件日期">
<el-date-picker class="formItem" v-model="formData.pickUpDate" type="date" placeholder="选择日期"
:value-format="valueFormat" clearable>
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="6">
<el-col :span="8">
<el-form-item label="创建日期">
<el-date-picker class="formItem" v-model="createDate" type="daterange" range-separator="至"
start-placeholder="开始日期" end-placeholder="结束日期" :value-format="valueFormat" clearable>
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="6">
<el-col :span="8">
<el-form-item label="ACCSpool">
<el-select placeholder="不限" v-model="formData.accsPool" class="formItem" clearable>
<el-option value="Pre-MDE" key="Pre-MDE">
......@@ -103,7 +103,7 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-col :span="8">
<el-form-item label="货物状态">
<el-select placeholder="不限" v-model="formData.statusId" class="formItem" filterable clearable>
<el-option v-for="item in findConditionData.cargoStatus" :label="item.chineseName" :value="item.id"
......@@ -112,7 +112,7 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-col :span="8">
<el-form-item label="是否自动">
<el-select placeholder="不限" v-model="formData.allocationTypeId" class="formItem" clearable>
<el-option label="手动" value="1"> </el-option>
......@@ -120,7 +120,7 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-col :span="8">
<el-form-item label="配舱状态">
<el-select placeholder="不限" v-model="formData.hasFlight" class="formItem" clearable>
<el-option label="已配" value="1"> </el-option>
......@@ -128,7 +128,7 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-col :span="8">
<el-form-item>
<template slot="label">
<div style="display:inline-block">配载航线
......@@ -145,7 +145,7 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-col :span="8">
<el-form-item label="预审状态">
<el-select v-model="formData.preStatus" placeholder="不限" class="formItem" clearable multiple>
<el-option v-for="item in findConditionData.preQualificationStatus" :label="item == '' ? '非预审' : item"
......@@ -153,7 +153,7 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-col :span="8">
<el-form-item label="发件人账号">
<el-input ref='userInfo' type="textarea" v-model="formData.shipperAccount" class="formItem"
placeholder="请输入发件人账号（;间隔）" :rows="4" :maxlength="12000" clearable></el-input>
......
......@@ -33,6 +33,9 @@
<el-input type="text" v-model="newDictionary.route" placeholder="请输入航线" maxlength="40">
</el-input>
</el-form-item>
<el-form-item label="是否为ET86航线">
<el-checkbox v-model="newDictionary.isEtesRoute"></el-checkbox>
</el-form-item>
<el-form-item>
<div style="color:#ff4949;line-height: 30px;">注意：此处不能添加虚拟航班！</div>
</el-form-item>
......@@ -108,7 +111,7 @@ export default {
},
data() {
return {
newDictionary: { flightNo: undefined, chineseName: undefined, route: undefined },
newDictionary: { flightNo: undefined, chineseName: undefined, route: undefined, isEtesRoute: false },
rules: {
chineseName: [
{
......@@ -198,9 +201,11 @@ export default {
if (this.dictName === '虚拟航班') {
this.flightAdd()
} else if (this.dictName === '航线') {
let obj = {
fltNo: this.upCase(this.newDictionary.fltNo),
route: this.upCase(this.newDictionary.route)
route: this.upCase(this.newDictionary.route),
isEtesRoute: this.newDictionary.isEtesRoute == true ? "Y" : "N"
}
addRoute(obj).then(res => {
this.loading = false
......@@ -229,7 +234,7 @@ export default {
})
}
}
//批量新增
//批量新增
else if (this.status == 'allAdd') {
if (this.dictName === '虚拟航班') {
this.flightAdd()
......@@ -382,4 +387,4 @@ export default {
<style>
</style>
\ No newline at end of file
</style>
......
......@@ -361,12 +361,12 @@ export default {
// },
//删除按钮
delDict(val) {
console.log(val)
if (this.tableName == 'serviceCode') {
this.serviceCodeCihildDel([val.id])
} else if (this.tableName === '虚拟航班') {
this.flightDel([val.id])
} else if (this.tableName === '航线') {
this.routeDel({ data: [val], id: [val.id] })
/*
如果该航线是普通航线直接删，如果是ET86航线，那么要查询该航线有没有设置维度，
如果没有直接删，如果已经设置了维度是否考虑将该航线下的维度删掉再进行操作;
......@@ -374,7 +374,24 @@ export default {
if(!val.isEtesRoute){ // 普通航线
this.routeDel({ data: [val], id: [val.id] })
}else{ // ET86航线
this.$confirm("该航线是ET86航线。是否要删除", "注意!", {
closeOnClickModal: false,
confirmButtonText: "确定删除",
cancelButtonText: "取消",
type: "warning",
}).then(() => {
this.msgWarning('待联调！')
// delDict(val).then(res => {
// if (res.code === 200) {
// this.msgSuccess(res.msg)
// } else {
// this.msgWarning(res.msg)
// }
// this.tableSelect() // 回调查询
// }).catch(err => {
// console.log(err)
// })
}).catch(() => { })
}
} else {
this.dicDel([val.id])
......