作者 xudada

Merge remote-tracking branch 'origin/master'

要显示太多修改。

为保证性能只显示 22 of 22+ 个文件。

... ... @@ -19,6 +19,31 @@ let baseUrlBillcreden = 'air-server-transport/transport/creden'
let baseUrlExact = 'air-server-transport/exactPlanConfig'
//预报
let baseUrlConfig = 'air-server-transport/prePlanConfig'
//物料申报
let baseUrlSupply = 'air-server-transport/transport/supplymatter'
let baseUrlCargo = 'air-server-transport/transport/cargodetails'
//国际转运
let baseUrlTrans = 'nmms-server-import/nmms/mt8205'
//国际转运
export const selectMt8205 = params => { return http.get(`${baseUrlTrans}/selectMt8205`, params); };
export const addMt8205 = params => { return http.post(`${baseUrlTrans}/addMt8205`, params); };
export const ediMt8205 = params => { return http.post(`${baseUrlTrans}/ediMt8205`, params); };
export const delMt8205 = params => { return http.get(`${baseUrlTrans}/delMt8205`, params); };
export const sendCreateMt8205 = params => { return http.post(`${baseUrlTrans}/sendCreateMt8205`, params); };
//物料申报管理
export const addSupplyMatter = params => { return http.post(`${baseUrlSupply}/addSupplyMatter`, params); };
export const ediSupplyMatter = params => { return http.post(`${baseUrlSupply}/ediSupplyMatter`, params); };
export const delSupplyMatter = params => { return http.post(`${baseUrlSupply}/delSupplyMatter`, params); };
export const selectSupplyMatter = params => { return http.post(`${baseUrlSupply}/selectSupplyMatter`, params); };
export const sendSupplyMatter = params => { return http.post(`${baseUrlSupply}/sendSupplyMatter`, params); };
//货物明细
export const addCargoDetails = params => { return http.post(`${baseUrlCargo}/addCargoDetails`, params); };
export const delCargoDetails = params => { return http.post(`${baseUrlCargo}/delCargoDetails`, params); };
export const selectCargoDetails = params => { return http.get(`${baseUrlCargo}/selectCargoDetails`, params); };
... ...
... ... @@ -8,7 +8,7 @@ import store from './vuex/store'
import Vuex from 'vuex'
import axios from 'axios'
import rout from './routes'
import Mock from './mock'
// import Mock from './mock'
import i18n from './lang'
import 'font-awesome/css/font-awesome.min.css'
... ... @@ -29,10 +29,10 @@ Vue.filter('datefmt',function(input,fmtstring){
});
// 注册websocket组件到VUE
Vue.prototype.socketApi = socketApi
// Vue.prototype.socketApi = socketApi
Vue.config.productionTip = false
Mock.bootstrap();
// Mock.bootstrap();
Vue.use(ElementUI,
{
// eslint-disable-next-line no-undef
... ...
... ... @@ -100,6 +100,10 @@ import Consignee from './views/consigner/consignee.vue'
import Shipper from './views/shipper/shipper.vue'
import Security from './views/security/security.vue'
import dynamics from './views/airtransport/dynamics.vue'
import matter from './views/airtransport/matter.vue'
//国际转运
import transfer from './views/airtransport/transfer.vue'
// import transpour from './views/airtransport/transpour.vue'
... ... @@ -115,7 +119,7 @@ import Way from './views/nav3/Way.vue'
//朱总让做的网页在线客服
import Webdialog from './views/bus/Webdialog.vue'
//国际转运
//转运申请
import Transport from './views/nav4/Transport.vue'
/* 车辆调度系统 */
... ... @@ -462,6 +466,18 @@ let routes = [
iconCls:'el-icon-goods',
children:[
{path:'/dynamics',component:dynamics,name:'在港动态信息'},
{path:'/matter',component:matter,name:'物料申报管理'}
]
},
{
path: '/',
component: HomeNew,
name: '国际转运',
iconCls:'el-icon-goods',
children:[
{path:'/transfer',component:transfer,name:'国际转运'},
// {path:'/transpour',component:transpour,name:'转运导入'}
]
},
{
... ...
... ... @@ -226,7 +226,7 @@
this.collapsed=!this.collapsed;
},
checkUpdate() {
axios.get('http://localhost:12021/static/nmmsVer.json').then(function(response) {
axios.get('/static/nmmsVer.json').then(function(response) {
// 判断版本号是否与本地一致
if (response.data.nmmsVer != localStorage.getItem('nmmsVer')) {
localStorage.setItem('nmmsVer', response.data.nmmsVer)
... ...
... ... @@ -49,7 +49,7 @@
height: 550px;
overflow:auto;
}
.filter-item{
margin-top: 20px;
}
/*.filter-item{*/
/* margin-top: 20px;*/
/*}*/
</style>
... ...
<template>
<section>
<!--工具条-->
<el-row class="toolbar">
<el-form :inline="true" :model="form">
<el-form-item>
<el-input v-model="form.aircraftflightno" placeholder="航班号"></el-input>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="getList">查询</el-button>
</el-form-item>
<el-form-item>
<el-button type="success" @click="add">新增</el-button>
</el-form-item>
</el-form>
</el-row>
<!-- 表单区域-->
<el-row :span="24" class="toolbar" style="margin-top: 40px">
<el-col :span="24">
<el-table
highlight-current-row
@selection-change="matterChange"
style="border-radius: 10px 10px 0px 0px"
:header-cell-style="{background:'#6F8294',color:'#FFFFFF'}" size="small"
ref="multipleTable"
:data="tableData"
tooltip-effect="dark">
<el-table-column
type="selection"
width="45">
</el-table-column>
<el-table-column
type="index"
:index="indexMethod"
width="45">
</el-table-column>
<el-table-column
prop="num"
label="编号"
width="80">
</el-table-column>
<el-table-column
prop="aircraftnum"
label="物料添加航空器编号"
width="130">
</el-table-column>
<el-table-column
prop="aircraftflightno"
label="航班号"
width="80">
</el-table-column>
<el-table-column
prop="aircraftflightdate"
label="物料添加航班日期"
width="140">
</el-table-column>
<el-table-column
prop="unaircraftnum"
label="物料起卸航空器编号"
width="130">
</el-table-column>
<el-table-column
prop="unaircraftflightno"
label="物料起卸航班号"
width="130">
</el-table-column>
<el-table-column
prop="unaircraftlightdate"
label="物料起卸航班日期"
width="140">
</el-table-column>
<el-table-column
prop="bustype"
label="业务类型"
width="80">
<template slot-scope="scope">
<span v-if="scope.row.bustype ==='1'">起卸</span>
<span v-if="scope.row.bustype ==='3'">添加</span>
<span v-if="scope.row.bustype ==='5'">调拨</span>
</template>
</el-table-column>
<el-table-column
prop="remark5"
label="填写时间"
width="140">
</el-table-column>
<el-table-column
prop="add"
width="120"
label="海关备案状态">
</el-table-column>
<el-table-column label="操作" width="300" fixed="right">
<template slot-scope="scope">
<el-button type="success" size="mini" @click="edit(scope.$index,scope.row)">编辑</el-button>
<el-button type="warning" size="mini" @click="apply(scope.row)">
申请
</el-button>
<el-button type="primary" size="mini">
完成
</el-button>
<el-button type="danger" size="mini" @click="del(scope.row)">
删除
</el-button>
</template>
</el-table-column>
</el-table>
</el-col>
<!--分页区域-->
<el-col :span="24" style="margin-bottom: 40px;margin-top: 10px">
<el-pagination
:current-page="form.pageNum"
:page-sizes="[10, 50, 100, 500]"
:page-size="form.pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="total"
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
/>
</el-col>
</el-row>
<!-- 弹框区域-->
<el-row>
<el-dialog
:title="dialogMap[dialogStatus]"
:visible.sync="supply_dialog.addDialog"
style="margin-top: -50px"
text-align="center"
width="95%">
<template>
<el-tabs v-model="activeName" @tab-click="handleClick">
<el-tab-pane label="供退物料信息" name="first">
<el-form ref="formSupply" :inline="true" :model="formSupply" label-width="145px" label-position="right" :rules="rulesSupply" >
<el-row style="margin-bottom: 10px">
<el-col :span="24">
<div class="grid-content content">申报单位</div>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="海关关区" prop="customcode">
<el-input v-model="formSupply.customcode" placeholder="" suffix-icon=“xxxx”></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="申报单流水号" prop="serialnum">
<el-input v-model="formSupply.serialnum" placeholder="" suffix-icon=“xxxx” />
</el-form-item>
</el-col>
</el-row>
<el-row style="margin-bottom: 10px">
<el-col :span="24">
<div class="grid-content content">供退物料信息</div>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="业务类型" prop="bustype">
<div v-if="dialogStatus === 'update'">
<el-select disabled="" v-model="formSupply.bustype" placeholder="请选择" size="mini">
<el-option label="1-起卸" value="1"></el-option>
<el-option label="3-添加" value="3"></el-option>
<el-option label="5-调拨" value="5"></el-option>
</el-select>
</div>
<div v-else>
<el-select v-model="formSupply.bustype" placeholder="请选择" size="mini">
<el-option label="1-起卸" value="1"></el-option>
<el-option label="3-添加" value="3"></el-option>
<el-option label="5-调拨" value="5"></el-option>
</el-select>
</div>
</el-form-item>
<!-- <el-form-item label="业务类型" prop="bustype">-->
<!-- <el-select v-model="formSupply.bustype" placeholder="请选择" size="mini" :disabled="false">-->
<!-- <el-option label="1-起卸" value="起卸"></el-option>-->
<!-- <el-option label="3-添加" value="添加"></el-option>-->
<!-- <el-option label="5-调拨" value="调拨"></el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
</el-col>
<el-col :span="8">
<el-form-item label="运输工具企业代码" prop="enterprisecode">
<el-input v-model="formSupply.enterprisecode" placeholder="" suffix-icon=“xxxx” />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="出发港" prop="destination">
<el-input v-model="formSupply.destination" placeholder="" suffix-icon=“xxxx” />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="物料添加航空器编号 " prop="aircraftnum">
<el-input v-model="formSupply.aircraftnum" placeholder="" suffix-icon=“xxxx”></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="物料添加航班号" prop="aircraftflightno">
<el-input v-model="formSupply.aircraftflightno" placeholder="" suffix-icon=“xxxx” />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="物料添加航班日期" prop="aircraftflightdate">
<el-date-picker
v-model="formSupply.aircraftflightdate"
type="date" size="mini"
value-format="yyyy-MM-dd"
format="yyyy-MM-dd"
style="width:93%"
placeholder="选择日期">
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="物料起卸航空器编号" prop="unaircraftnum">
<el-input v-model="formSupply.unaircraftnum" placeholder="" suffix-icon=“xxxx”></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="物料起卸航班号" prop="unaircraftflightno">
<el-input v-model="formSupply.unaircraftflightno" placeholder="" suffix-icon=“xxxx” />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="物料起卸航班日期" prop="unaircraftlightdate">
<el-date-picker
v-model="formSupply.unaircraftlightdate"
type="date" size="mini"
value-format="yyyy-MM-dd"
format="yyyy-MM-dd"
style="width:93%"
placeholder="选择日期">
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
<el-row style="margin-bottom: 10px">
<el-col :span="24">
<div class="grid-content content">备注信息</div>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="备注" prop="remark">
<el-input
v-model="formSupply.remark"
type="textarea"
:rows="1" style="width: 520px"
placeholder="请输入内容"
/>
</el-form-item>
</el-col>
</el-row>
<el-row style="margin-bottom: 5px;margin-top: 25px">
<el-col :span="24" :offset="9">
<el-form-item >
<el-button style="width: 100px" type="info" @click="supply_dialog.addDialog = false">取消</el-button>
<el-button type="primary" style="width: 100px" @click="dialogStatus==='create'?mat_add():mat_edit()">提交</el-button>
</el-form-item>
</el-col>
</el-row>
</el-form>
</el-tab-pane>
<el-tab-pane label="货物明细信息" name="second">
<el-form ref="formCargo" :inline="true" :model="formCargo" label-width="70px" label-position="right" :rules="rulesCargo" >
<el-row>
<el-col :span="24">
<div class="grid-content content">货物信息</div>
</el-col>
</el-row>
<el-row>
<el-col :span="6">
<el-form-item label="物料" prop="material">
<el-select v-model="formCargo.material" placeholder="请选择" size="mini">
<el-option label="1-航油" value="1"></el-option>
<el-option label="2-航材" value="2"></el-option>
<el-option label="3-免税品" value="3"></el-option>
<el-option label="4-航空食品" value="4"></el-option>
<el-option label="5-其他" value="5"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="物品名称" prop="itemname">
<el-input v-model="formCargo.itemname" placeholder="" suffix-icon=“xxxx” />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="申请数量" prop="applynum">
<el-input v-model="formCargo.applynum" placeholder="" suffix-icon=“xxxx”></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="计量单位" prop="unit">
<el-select v-model="formCargo.unit" placeholder="请选择" size="mini">
<el-option label="000-无" value="000"></el-option>
<el-option label="001-台" value="001"></el-option>
<el-option label="002-座" value="002"></el-option>
<el-option label="003-辆" value="003"></el-option>
<el-option label="004-艘" value="004"></el-option>
<el-option label="005-架" value="005"></el-option>
<el-option label="006-套" value="006"></el-option>
<el-option label="007-个" value="007"></el-option>
<el-option label="008-只" value="008"></el-option>
<el-option label="009-头" value="009"></el-option>
<el-option label="010-张" value="010"></el-option>
<el-option label="011-件" value="011"></el-option>
<el-option label="012-支" value="012"></el-option>
<el-option label="013-枝" value="013"></el-option>
<el-option label="014-根" value="014"></el-option>
<el-option label="015-条" value="015"></el-option>
<el-option label="016-把" value="016"></el-option>
<el-option label="017-块" value="017"></el-option>
<el-option label="018-卷" value="018"></el-option>
<el-option label="019-副" value="019"></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row style="margin-bottom: 10px">
<el-col :span="24">
<div class="grid-content content">备注信息</div>
</el-col>
</el-row>
<el-row style="margin-bottom: 10px">
<el-col :span="12">
<el-form-item label="备注" prop="remark">
<el-input
v-model="formCargo.remark"
type="textarea"
:rows="1" style="width: 400px"
placeholder="请输入内容"
/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item>
<el-button type="primary" @click="getListCargo">查询</el-button>
</el-form-item>
<el-form-item>
<el-button type="success" @click="addCargo">保存</el-button>
</el-form-item>
</el-col>
</el-row>
</el-form>
<el-table
@selection-change="handleSelectionChangeMat"
style="border-radius: 10px 10px 0px 0px;margin-bottom: 20px"
:header-cell-style="{background:'#6F8294',color:'#FFFFFF'}" size="small"
ref="multipleTable"
:data="tableDataCargo"
tooltip-effect="dark">
<el-table-column
type="selection"
width="55">
</el-table-column>
<el-table-column
type="index"
width="50">
</el-table-column>
<el-table-column
prop="material"
label="物料"
width="120">
</el-table-column>
<el-table-column
prop="itemname"
label="物品名称"
width="120">
</el-table-column>
<el-table-column
prop="applynum"
label="申请数量">
</el-table-column>
<el-table-column
prop="unit"
label="计量单位"
width="120">
</el-table-column>
<el-table-column
prop="remark"
label="备注"
show-overflow-tooltip>
</el-table-column>
<el-table-column label="操作" fixed="right" width="120">
<template slot-scope="scope">
<el-button type="danger" size="mini" @click="delCargo(scope.row)">
删除
</el-button>
</template>
</el-table-column>
</el-table>
<!--分页区域-->
<el-col :span="24" style="margin-top: 20px;padding-bottom: 30px">
<el-pagination
:current-page="pageNumCargo"
:page-sizes="[10, 50, 100, 500]"
:page-size="pageSizeCargo"
layout="total, sizes, prev, pager, next, jumper"
:total="totalCargo"
@size-change="handleSizeChangeCargo"
@current-change="handleCurrentChangeCargo"
/>
</el-col>
</el-tab-pane>
</el-tabs>
</template>
</el-dialog>
</el-row>
</section>
</template>
<script>
import {selectSupplyMatter, addSupplyMatter, ediSupplyMatter, delSupplyMatter,addCargoDetails,delCargoDetails,selectCargoDetails,sendSupplyMatter} from "../../api/transport";
export default {
name: "matter",
data(){
return{
// 首页>>>>>>>>>>>>>>>>>>>>>>>>>>>>
form:{
aircraftflightno:'',
pageNum: 1,
pageSize: 10,
},
formcargo:{
supplyid:''
},
total: 0,
tableData:[{
aircraftflightno:'B5157',
}],
multipleSelection:[],
// 弹框>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
dialogMap: {
update: '供退物料新增',
create: '供退物料修改'
},
dialogStatus: 'create',
supply_dialog: {
// 添加对话框
addDialog: false,
// 编辑对话框
editDialog: false
},
activeName: 'first',
// 弹框1-1>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
formSupply:{
autoid:'',
customcode:'4604',
serialnum:'',
bustype:'1',
enterprisecode:'460470678395-9',
aircraftnum:'',
destination:'CGO',
aircraftflightno:'',
aircraftflightdate:'',
unaircraftnum:'',
unaircraftflightno:'',
unaircraftlightdate:'',
remark:'',
remark1:'',
remark2:'',
remark3:'',
remark4:'',
remark5:'',
createtime:'',
updatetime:'',
declar:'',
},
rulesSupply: {
customcode: [
{ required: true, message: '', trigger: 'change' }
],
},
// 弹框1-2>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
formCargo:{
id:'',
material:'',
itemname:'',
applynum:'',
unit:'',
remark:'',
supplyid:'',
remark1:'',
remark2:'',
remark3:'',
remark4:'',
},
pageNumCargo: 1,
pageSizeCargo: 10,
totalCargo: 0,
rulesCargo: {
material: [
{ required: true, message: '请输入', trigger: 'change' }
],
itemname: [
{ required: true, message: '请输入', trigger: 'change' }
],
applynum: [
{ required: true, message: '请输入', trigger: 'change' }
],
unit: [
{ required: true, message: '请输入', trigger: 'change' }
],
},
tableDataCargo:[],
// 多选
currentRow: null
}
},
mounted() {
//获取列表
this.getList();
// var user = loginuserInfo;
// if (user) {
// this.form.username = user.username || '';
// }
},
methods:{
// 首页>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
//首页表单分页
handleSizeChange(val) {
this.form.pageSize = val
this.getList()
},
handleCurrentChange(val) {
this.form.pageNum = val
this.getList()
},
// 首页表格选中
matterChange(val) {
this.multipleSelection = val;
},
// 序列
indexMethod(index) {
return index + 1;
},
// 获取消息标签列表
getList() {
const _this = this
selectSupplyMatter(this.form).then((response) => {
const res = response.data
if (res.code !== '200') {
return _this.$message.error('获取消息收发记录,失败!')
}
// 获取列表数据
_this.tableData = res.data.list
// 获取列表的总记录数
_this.total = res.data.total
_this.$message.success('获取消息收发记录,成功!')
}).catch(error => {
// 关闭加载
_this.$message.error(error.toString())
})
},
// 打开新增
add() {
this.dialogStatus = 'create'
this.supply_dialog.addDialog = true
this.tableDataCargo = ''
this.formCargo = {
id:'',
material:'',
itemname:'',
applynum:'',
unit:'',
remark:'',
supplyid:'',
remark1:'',
remark2:'',
remark3:'',
remark4:'',
}
this.formSupply = {
autoid:'',
customcode:'4604',
serialnum:'',
bustype:'',
enterprisecode:'460470678395-9',
aircraftnum:'',
destination:'CGO',
aircraftflightno:'',
aircraftflightdate:'',
unaircraftnum:'',
unaircraftflightno:'',
unaircraftlightdate:'',
remark:'',
remark1:'',
remark2:'',
remark3:'',
remark4:'',
remark5:'',
createtime:'',
updatetime:'',
declar:'',
}
// this.form.arrivetime = new Date().format('yyyyMMddHHmmss')
},
// 新增功能
mat_add() { // 进行表单的预验证
this.$refs.formSupply.validate(valid => {
// 未通过,表单预校验
if (!valid) return
addSupplyMatter(this.formSupply).then((response) => {
const res = response.data;
// 添加失败
if (res.code !== '200') {
// 关闭加载
return this.$message.error(res.msg)
}
// 添加,成功
this.$message.success(res.msg)
this.formCargo.supplyid=res.data;
console.log("---->"+this.formCargo.supplyid)
// 隐藏对话框
/*this.supply_dialog.addDialog = false*/
// 刷新列表
this.getList()
}).catch(error => {
this.$message.error(error.toString())
})
})
},
// 打开编辑
edit(index, row) {
// $("select").each(function () {
// $("#" + this.id).attr("disabled", true);
// });
this.formSupply = Object.assign({}, row)
this.supply_dialog.addDialog = true
this.dialogStatus = 'update'
this.$nextTick(() => {
this.formSupply = Object.assign({}, row)
})
this.formCargo.supplyid=row.autoid;
this.getListCargo();
this.formCargo = {
id:'',
material:'',
itemname:'',
applynum:'',
unit:'',
remark:'',
supplyid:'',
remark1:'',
remark2:'',
remark3:'',
remark4:'',
}
},
// 编辑功能
mat_edit() {
// 进行表单的预验证
this.$refs.formSupply.validate(valid => {
// 未通过,表单预校验
if (!valid) return
ediSupplyMatter(this.formSupply).then((response) => {
const res = response.data
if (res.code !== '200') {
return this.$message.error(res.msg)
}
this.$message.success(res.msg)
// 隐藏对话框
// this.supply_dialog.addDialog = false
// 刷新列表
this.getList()
}).catch(error => {
this.$message.error(error.toString())
})
})
},
// 删除
del(row) {
// 弹框询问是否删除?
this.$confirm('此操作永久删除该消息收发记录, 是否继续?', '警告', {
confirmButtonText: '确定删除',
cancelButtonText: '取消',
type: 'warning'
}
).then(() => {
delSupplyMatter(row).then((response) => {
console.log(row)
const res = response.data
if (res.code !== '200') {
return this.$message.error(res.msg)
}
this.$message.success(res.msg)
// 刷新列表
this.getList()
}).catch(error => {
this.$message.error(res.msg)
})
}).catch(() => {
})
},
// 申请
apply(row) {
// 弹框询问是否申请?
this.$confirm('是否发送申请', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}
).then(() => {
sendSupplyMatter(row).then((response) => {
const res = response.data
if (res.code !== '200') {
return this.$message.error(res.msg)
}
this.$message.success(res.msg)
// 刷新列表
this.getList()
}).catch(error => {
this.$message.error(res.msg)
})
}).catch(() => {
})
},
// 弹框>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
// 弹框标签
handleClick(tab, event) {
console.log(tab, event);
},
// 弹框1-1>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
// 弹框1-2>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
// 弹框1-2多选
handleSelectionChangeMat(val) {
this.currentRow = val;
},
//弹框1-2表单分页
handleSizeChangeCargo(val) {
this.pageSizeCargo = val
this.getListCargo()
},
handleCurrentChangeCargo(val) {
this.pageNumCargo = val
this.getListCargo()
},
// 获取消息标签列表
getListCargo() {
const _this = this
let parms={supplyid:this.formCargo.supplyid};
selectCargoDetails(parms).then((response) => {
const res = response.data
if (res.code !== '200') {
return _this.$message.error('获取消息收发记录,失败!')
}
// 获取列表数据
_this.tableDataCargo = res.data.list
// 获取列表的总记录数
_this.totalCargo = res.data.total
_this.$message.success('获取消息收发记录,成功!')
}).catch(error => {
// 关闭加载
_this.$message.error(error.toString())
})
},
// 新增功能
addCargo() { // 进行表单的预验证
this.$refs.formCargo.validate(valid => {
// 未通过,表单预校验
if (!valid) return
if(this.formCargo.supplyid!=null && this.formCargo.supplyid!=''){
addCargoDetails(this.formCargo).then((response) => {
const res = response.data
// 添加失败
if (res.code !== '200') {
// 关闭加载
return this.$message.error(res.msg)
}
// 添加,成功
this.$message.success(res.msg)
// 刷新列表
this.getListCargo()
}).catch(error => {
this.$message.error(error.toString())
})
}else{
return this.$message.error("请先保存供料退货信息")
}
})
},
// 删除
delCargo(row) {
// 弹框询问是否删除?
this.$confirm('此操作永久删除该消息收发记录, 是否继续?', '警告', {
confirmButtonText: '确定删除',
cancelButtonText: '取消',
type: 'warning'
}
).then(() => {
delCargoDetails(row).then((response) => {
console.log(row)
const res = response.data
if (res.code !== '200') {
return this.$message.error(res.msg)
}
this.$message.success(res.msg)
// 刷新列表
this.getListCargo()
}).catch(error => {
this.$message.error(res.msg)
})
}).catch(() => {
})
},
},
}
</script>
<style scoped>
.toolbar{
background-color: white;
border-radius: 5px 5px 5px 5px;
padding: 15px 0 0 20px;
}
</style>
... ...
<template>
<el-container>
<el-main style="background-color: white">
<el-row>
<el-form :model="form" :rules="form" ref="ruleForm" label-width="2px" class="demo-ruleForm">
<el-row style="margin-top: -20px">
<el-col :span="24"><div class="grid-content content"><p>国际转运查询</p></div></el-col>
</el-row>
<el-row>
<el-col :span="6">
<el-form-item label="" >
<el-input placeholder="" v-model="form.transcarrier" style="width:220px">
<template slot="prepend">承运人</template>
</el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="">
<el-input placeholder="" v-model="form.transflightno" style="width:220px">
<template slot="prepend">航班号</template>
</el-input>
</el-form-item>
</el-col>
<el-col :span="10">
<el-form-item label="" >
<div class="ip">
航班日期
</div>
<el-date-picker type="date" placeholder="选择日期"
v-model="form.transflightdate" style="width: 140px;"
value-format="yyyy-MM-dd"></el-date-picker>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6" style="margin-top: -15px">
<el-form-item label="" prop="transawbano">
<el-input placeholder="" v-model="form.transawbano" style="width:220px">
<template slot="prepend">主单号</template>
</el-input>
</el-form-item>
</el-col>
<el-col :span="6" style="margin-top: -15px">
<el-form-item label="" prop="transawbhno">
<el-input placeholder="" v-model="form.transawbhno" style="width:220px">
<template slot="prepend">分单号</template>
</el-input>
</el-form-item>
</el-col>
<el-col :span="4" style="margin-top: -15px">
<el-button type="primary" icon="el-icon-search" @click="submitForm()">查&emsp;询</el-button>
</el-col>
</el-row>
</el-form>
</el-row>
<el-row style="margin-top: -20px">
<el-col :span="24"><div class="grid-content content"><p>国际转运明细</p></div></el-col>
</el-row>
<!--列表部分-->
<el-row>
<template>
<el-table
class="table"
v-loading="tableloading"
ref="multipleTable"
:data="tableData"
tooltip-effect="dark"
style="border-radius: 10px 10px 0px 0px;line-height: 25px;min-height: 500px"
:header-cell-style="{background:'#6F8294',color:'#FFFFFF'}" size="small"
row-key="uuid"
border
default-expand-all
:tree-props="{children: 'children', hasChildren: 'hasChildren'}">
<el-table-column
label="主单号"
width="185"
prop="transawbano"
>
</el-table-column>
<el-table-column
prop="transawbhno"
label="分单号"
width="70">
</el-table-column>
<el-table-column
prop="originflightno"
label="进港航班"
width="70">
</el-table-column>
<el-table-column
prop="transpiece"
label="运单件数"
width="70">
</el-table-column>
<el-table-column
prop="transweight"
label="运单重量"
width="80">
</el-table-column>
<el-table-column
prop="goodsname"
label="货物品名"
width="80">
</el-table-column>
<el-table-column
prop="transflightno"
label="转运航班"
width="140">
</el-table-column>
<el-table-column
prop="status"
label="状态"
width="100" :formatter="formatStatus">
</el-table-column>
<el-table-column
prop="ext5"
label="回执信息"
width="260">
<!-- <template slot-scope="scope">-->
<!-- <span v-if="scope.row.status=='01' || scope.row.status=='11'" style="color: #67C23A">-->
<!-- {{scope.row.ext5}}-->
<!-- </span>-->
<!-- <span v-else-if="scope.row.status=='02' || scope.row.status=='03'" style="color: #E6A23C">-->
<!-- {{scope.row.ext5}}-->
<!-- </span>-->
<!-- <span v-else-if="scope.row.status=='12' || scope.row.status=='13'" style="color: #F56C6C">-->
<!-- {{scope.row.ext5}}-->
<!-- </span>-->
<!-- <span v-else style="color: #909399;">-->
<!-- {{scope.row.ext5}}-->
<!-- </span>-->
<!-- </template>-->
</el-table-column>
<el-table-column
prop="operation"
label="操作"
width="285">
<template slot-scope="scope">
<el-row type="flex" justify="space-between">
<el-button
size="mini"
type="info"
@click="handleDetail(scope.$index, scope.row)">收发明细
</el-button>
<el-button
size="mini"
type="success"
@click="editForm(scope.$index, scope.row)">编辑运单
</el-button>
</el-row>
<el-row type="flex" justify="space-between">
<el-button
size="mini"
type="primary"
@click="handleSend(scope.$index, scope.row)"
:disabled="btSendStatusFormater(scope.row.status)">申请转运
</el-button>
<el-button
size="mini"
type="warning"
@click="UpdateStatus(scope.$index, scope.row)">更改状态
</el-button>
<el-button
size="mini"
type="danger"
@click="handleDelete(scope.$index, scope.row)"
:disabled="btDeleStatusFormater(scope.row.status)">删除运单
</el-button>
</el-row>
</template>
</el-table-column>
</el-table>
</template>
</el-row>
<!--分页区域-->
<el-row style="margin-bottom: 10px">
<el-pagination
:current-page="form.pageNum"
:page-sizes="[100, 505, 1000, 5000]"
:page-size="form.pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="total"
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
/>
</el-row>
<!--footer部分-->
<el-row style="margin-top: 10px">
<el-col :span="4" class="pub">
<div class="grid-content">
<el-button type="primary" size="mini" @click="addForm()">新增国际转运</el-button>
</div>
</el-col>
<el-col :span="2.5" class="pub">
<div class="grid-content"><span>主单数:{{sumNmmsCount}}</span></div>
</el-col>
<el-col :span="3.5" class="pub">
<div class="grid-content"><span>舱单总件数:{{sumNmmsPrice}}</span></div>
</el-col>
<el-col :span="7.5" class="pub">
<div class="grid-content"><span>舱单总重量:{{sumNmmsWeight}}</span></div>
</el-col>
</el-row>
<!--明细列表弹出框-->
<el-row>
<el-dialog title="回执明细列表" :visible.sync="dialogTableVisible" width="70%">
<el-table :data="gridData" style="border-radius: 10px 10px 0px 0px;line-height: 25px;min-height: 500px"
:header-cell-style="{background:'#6F8294',color:'#FFFFFF'}" size="small">
<el-table-column property="busdate" label="时间" width="160"></el-table-column>
<el-table-column property="username" label="操作人" width="130"></el-table-column>
<el-table-column property="buspiece" label="发送件数" width="130"></el-table-column>
<el-table-column property="busweight" label="发送重量" width="130"></el-table-column>
<el-table-column property="cusrestext" label="回执内容"></el-table-column>
</el-table>
</el-dialog>
</el-row>
<!--编辑主单-->
<el-dialog :title="dialogMap[dialogStatus]" :visible.sync="outerVisible.addDialog" width="80%" style="margin-top: -40px" >
<el-form :model="ruleForm" :rules="rules" ref="ruleForm" :label-position="labelPosition" size="mini" style="padding-left: 10px">
<!--原始舱单信息部分-->
<el-row class="flightInfo">
<el-col :span="24">
<div class="grid-content content">原始舱单信息</div>
</el-col>
<el-row style="margin-top: 60px">
<!-- <el-col :span="6">-->
<!-- <el-form-item prop="awba">-->
<!-- <div v-if="dialogStatus === 'update'">-->
<!-- <el-input disabled="" v-model="ruleForm.awba" style="width: 200px">-->
<!-- <template slot="prepend">运单号</template>-->
<!-- </el-input>-->
<!-- </div>-->
<!-- <div v-else>-->
<!-- <el-input v-model="ruleForm.awba" style="width: 200px">-->
<!-- <template slot="prepend">运单号</template>-->
<!-- </el-input>-->
<!-- </div>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<el-col :span="6">
<el-form-item prop="origincarrier" >
<el-input v-model="ruleForm.origincarrier" style="width: 200px" placeholder="必填项" onkeyup="this.value=this.value.toUpperCase()">
<template slot="prepend">承运人</template>
</el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item prop="originflightno" >
<el-input v-model="ruleForm.originflightno" style="width: 200px" placeholder="必填项">
<template slot="prepend">航班号</template>
</el-input>
</el-form-item>
</el-col>
<!-- <el-col :span="6">-->
<!-- <el-form-item label="" >-->
<!-- <el-form-item prop="originflightdate">-->
<!-- <div class="ip">-->
<!-- 航班日期-->
<!-- </div>-->
<!-- <el-date-picker type="date" placeholder="选择日期"-->
<!-- v-model="ruleForm.originflightdate"-->
<!-- value-formatformat="yyyy-MM-dd"-->
<!-- style="width: 125px">-->
<!-- </el-date-picker>-->
<!-- </el-form-item>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<el-col :span="6">
<el-form-item label="" >
<el-form-item prop="originflightdate">
<div class="ip">
航班日期
</div>
<el-date-picker type="date" placeholder="选择日期"
v-model="ruleForm.originflightdate"
value-format="yyyy-MM-dd"
style="width: 125px">
</el-date-picker>
</el-form-item>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6" style="margin-top: -20px" >
<el-form-item prop="originawbano" >
<el-input v-model="ruleForm.originawbano" style="width: 200px" placeholder="必填项" >
<template slot="prepend">主单号</template>
</el-input>
</el-form-item>
</el-col>
<el-col :span="12" style="margin-top: -20px">
<el-form-item prop="originstation">
<el-input v-model="ruleForm.originawbhno" style="width: 200px">
<template slot="prepend">分单号</template>
</el-input>
</el-form-item>
</el-col>
<el-col :span="6" style="margin-top: -20px">
<el-button type="primary" icon="el-icon-search">查&emsp;询</el-button>
</el-col>
</el-row>
</el-row>
<!--预配舱单信息部分-->
<el-row class="flightInfo">
<el-col :span="24">
<div class="grid-content content">预配舱单信息</div>
</el-col>
<el-row style="margin-top: 60px">
<!-- <el-col :span="6">-->
<!-- <el-form-item prop="awba">-->
<!-- <div v-if="dialogStatus === 'update'">-->
<!-- <el-input disabled="" v-model="ruleForm.awba" style="width: 200px">-->
<!-- <template slot="prepend">运单号</template>-->
<!-- </el-input>-->
<!-- </div>-->
<!-- <div v-else>-->
<!-- <el-input v-model="ruleForm.awba" style="width: 200px">-->
<!-- <template slot="prepend">运单号</template>-->
<!-- </el-input>-->
<!-- </div>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<el-col :span="6">
<el-form-item prop="transcarrier" >
<el-input v-model="ruleForm.transcarrier" style="width: 200px" placeholder="必填项" onkeyup="this.value=this.value.toUpperCase()">
<template slot="prepend">承运人</template>
</el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item prop="transflightno" >
<el-input v-model="ruleForm.transflightno" style="width: 200px" placeholder="必填项">
<template slot="prepend">航班号</template>
</el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="" >
<el-form-item prop="transflightdate">
<div class="ip">
航班日期
</div>
<el-date-picker type="date" placeholder="选择日期"
v-model="ruleForm.transflightdate"
value-format="yyyy-MM-dd"
style="width: 125px">
</el-date-picker>
</el-form-item>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6" style="margin-top: -20px" >
<el-form-item prop="transawbano" >
<el-input v-model="ruleForm.transawbano" style="width: 200px" placeholder="必填项">
<template slot="prepend">主单号</template>
</el-input>
</el-form-item>
</el-col>
<el-col :span="6" style="margin-top: -20px" >
<el-form-item prop="transawbhno">
<el-input v-model="ruleForm.transawbhno" style="width: 200px">
<template slot="prepend">分单号</template>
</el-input>
</el-form-item>
</el-col>
</el-row>
</el-row>
<!--运单信息部分-->
<el-row class="flightInfo">
<el-col :span="24">
<div class="grid-content content">提运单信息</div>
</el-col>
</el-row>
<el-row style="margin-bottom: 0px;">
<el-row class="product">
<el-col :span="6">
<el-form-item label="" prop="transpiece" >
<el-input v-model="ruleForm.transpiece" placeholder="必填项" style="width: 200px" oninput="value=value.replace(/[^\d]/g,'')">
<template slot="prepend">件&emsp;数</template>
</el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="" prop="transweight" >
<el-input v-model="ruleForm.transweight" placeholder="必填项" style="width: 200px" oninput="value=value.replace(/[^\d]/g,'')">
<template slot="prepend">重&emsp;量</template>
</el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="" prop="goodsname" >
<el-input v-model="ruleForm.goodsname" style="width: 210px" placeholder="必填项">
<template slot="prepend">货物描述</template>
</el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="" prop="customcode" >
<div class="ip">
海关关区
</div>
<el-select v-model="ruleForm.customcode"
filterable
allow-create
default-first-option
remote
:remote-method="remoteMethod2"
:loading="loading" placeholder="请选择" style="width: 115px">
<el-option
v-for="item in customcodes"
:key="item.customcode"
:label="item.customcode"
:value="item.customcode">
<span style="float: left">{{ item.customcode }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.customname }}</span>
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row class="product">
<el-col :span="6">
<el-form-item label="" prop="awboriginstation" >
<el-input v-model="ruleForm.awboriginstation" style="width: 200px" placeholder="必填项" onkeyup="this.value=this.value.toUpperCase()">
<template slot="prepend">始发站</template>
</el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="" prop="awbdesstation" >
<el-input v-model="ruleForm.awbdesstation" placeholder="必填项" style="width: 200px" onkeyup="this.value=this.value.toUpperCase()">
<template slot="prepend">目的站</template>
</el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="" prop="goodspackage">
<div class="ip">
包装类型
</div>
<el-select v-model="ruleForm.goodspackage" placeholder="请选择" size="mini" style="width: 125px">
<el-option label="木箱" value="PK"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-button type="primary" icon="el-icon-check" @click="dialogStatus==='create'?outerVisible_add():outerVisible_edit()" size="small">保&emsp;存</el-button>
<el-button icon="el-icon-close" @click="outerVisible.addDialog = false" size="small">取&emsp;消</el-button>
</el-col>
</el-row>
</el-row>
</el-form>
</el-dialog>
</el-main>
</el-container>
</template>
<script>
import {
addMt8205,
selectMt8205,
sendCreateMt8205,
delMt8205,
ediMt8205,
} from "../../api/transport";
import {loginedUserInfo} from "../../api/user";
import {selectCustomcode, sendCreateMt1201} from "../../api/mt1201";
import {selectResponseList} from "../../api/InResponse";
export default {
name: "transfer",
data() {
return{
customcodes:[],
loading:false,
// 搜索条件
form: {
transcarrier:'',
transflightno:'',
transflightdate:'',
transawbano:'',
transawbhno:'',
pageNum: 1,
pageSize: 100,
},
sumNmmsCount:0,
sumNmmsPrice:0,
sumNmmsWeight:0,
total: 0,
// 搜索列表
tableData:[],
tableloading:false,
// 明细
dialogTableVisible:false,
gridData:[],
// 新增/编辑
dialogStatus:'create',
dialogMap:{
update: '编辑',
create: '添加'
},
outerVisible: {
// 添加对话框
addDialog: false,
// 编辑对话框
editDialog: false
},
labelPosition: 'left',
ruleForm: {
uuid1201:'',
uuid2201:'',
origincarrier: undefined,
originflightno: undefined,
originflightdate: undefined,
originawbano: undefined,
originawbhno: undefined,
transcarrier: undefined,
transflightno: undefined,
transflightdate: undefined,
transawbano: undefined,
transawbhno: undefined,
transpiece: undefined,
transweight: undefined,
goodsname: undefined,
goodspackage:'PK',
awbdesstation:undefined,
awboriginstation:undefined,
customcode:'',
status:'',
actime:'',
updatetime:'',
ext3:'',
ext4:'',
ext5:'',
},
rules: {
origincarrier: [
{ required: true, message: '请输入承运人代码', trigger: 'blur' },
],
originflightno: [
{ required: true, message: '请输入航班号', trigger: 'blur' },
],
originawbano: [
{ required: true, message: '请输入主单号', trigger: 'blur' },
],
originflightdate: [
{ required: true, message: '请输入航班日期', trigger: 'blur' },
],
transawbano: [
{ required: true, message: '请输入主单号', trigger: 'blur' },
],
transcarrier: [
{ required: true, message: '请输入承运人代码', trigger: 'blur' },
],
transflightno: [
{ required: true, message: '请输入航班号', trigger: 'blur' },
],
transpiece: [
{ required: true, message: '请输入件数', trigger: 'blur' },
],
transweight: [
{ required: true, message: '请输入重量', trigger: 'blur' },
],
goodsname: [
{ required: true, message: '请输入货物描述', trigger: 'blur' },
],
customcode: [
{ required: true, message: '请输入关区', trigger: 'blur' },
],
awboriginstation: [
{ required: true, message: '请输入起始站', trigger: 'blur' },
],
transflightdate: [
{ required: true, message: '请选择日期', trigger: 'blur' },
],
awbdesstation: [
{ required: true, message: '请输入目的站', trigger: 'blur' },
],
}
}
},
methods:{
//获取关区代码
remoteMethod2:function(query){
this.customcodes=[];
let params={customcode:query};
this.loading = true;
selectCustomcode(params).then(res =>{
if (res !== '') {
setTimeout(() => {
this.loading = false;
this.customcodes=res.data.data;
}, 200);
} else {
this.customcodes = [];
}
});
},
//首页表单分页
handleSizeChange(val) {
this.form.pageSize = val
this.submitForm()
},
handleCurrentChange(val) {
this.form.pageNum = val
this.submitForm()
},
//回执收发明细
handleDetail(index,row){
// if(row.flightno.length>4){
// row.flightno=row.flightno.substring(2);
// }
let params={awbano:row.transawbano,awbhno:row.transawbhno,carrier:row.transcarrier,flightno:row.transflightno,flightdate:row.transflightdate,bustype:'MT8205'}
selectResponseList(params).then(res=>{
this.dialogTableVisible=true;
let response=res.data.data;
this.gridData=response;
});
},
// 获取消息标签列表
submitForm() {
const _this = this
selectMt8205(this.form).then((response) => {
const res = response.data
console.log(res)
// console.log(response.data)
if (res.code !== '200') {
return _this.$message.error('获取消息收发记录,失败!')
}
// 获取列表数据
_this.tableData = res.data.list
// 获取列表的总记录数
_this.total = res.data.total
_this.$message.success('获取消息收发记录,成功!')
}).catch(error => {
// 关闭加载
_this.$message.error(error.toString())
})
},
//新增编辑弹框关闭重置
// configure_addDialogClosed() {
// // 重置对话框
// this.$refs.ruleForm.resetFields()
// },
// 打开新增
addForm() {
this.dialogStatus = 'create'
this.outerVisible.addDialog = true
this.ruleForm = {
uuid1201:'',
uuid2201:'',
origincarrier: undefined,
originflightno: undefined,
originflightdate: undefined,
originawbano: undefined,
originawbhno: undefined,
transcarrier: undefined,
transflightno: undefined,
transflightdate: undefined,
transawbano: undefined,
transawbhno: '',
transpiece: undefined,
transweight: undefined,
goodsname: undefined,
goodspackage:'PK',
awbdesstation:undefined,
awboriginstation:undefined,
customcode:'',
status:'',
actime:'',
updatetime:'',
ext3:'',
ext4:'',
ext5:'',
}
},
// 新增功能
outerVisible_add() { // 进行表单的预验证
this.$refs.ruleForm.validate(valid => {
// 未通过,表单预校验
if (!valid) return
addMt8205(this.ruleForm).then((response) => {
const res = response.data
// 添加失败
if (res.code !== '200') {
// 关闭加载
return this.$message.error(res.msg)
}
// 添加,成功
this.$message.success(res.msg)
// 隐藏对话框
this.outerVisible.addDialog = false
// 刷新列表
this.submitForm()
}).catch(error => {
this.$message.error(error.toString())
})
})
},
// 打开编辑
editForm(index, row) {
this.ruleForm = Object.assign({}, row)
this.outerVisible.addDialog = true
this.dialogStatus = 'update'
this.$nextTick(() => {
this.ruleForm = Object.assign({}, row)
})
console.log(row)
},
// 编辑功能
outerVisible_edit() {
// 进行表单的预验证
this.$refs.ruleForm.validate(valid => {
// 未通过,表单预校验
if (!valid) return
ediMt8205(this.ruleForm).then((response) => {
const res = response.data
if (res.code !== '200') {
return this.$message.error(res.msg)
}
this.$message.success(res.msg)
// 隐藏对话框
this.outerVisible.addDialog = false
// 刷新列表
this.submitForm()
}).catch(error => {
this.$message.error(error.toString())
})
})
},
//删除
handleDelete(index, row) {
// 弹框询问是否删除?
this.$confirm('此操作永久删除该消息收发记录, 是否继续?', '警告', {
confirmButtonText: '确定删除',
cancelButtonText: '取消',
type: 'warning'
}
).then(() => {
delMt8205({ uuid: row.uuid }).then((response) => {
console.log(row)
const res = response.data
this.$message.success(res.msg)
this.submitForm()
}).catch(error => {
this.$message.error(res.msg)
})
}).catch(() => {
})
},
//申请转运
handleSend(index, row) {
// 弹框询问是否删除?
this.$confirm('是否发送运单申请?', '警告', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}
).then(() => {
const map = {'mt8205':row,'username':loginedUserInfo().username}
sendCreateMt8205(map).then((response) => {
const res = response.data
this.$message.success(res.msg)
this.submitForm()
}).catch(error => {
this.$message.error(res.msg)
})
}).catch(() => {
})
},
//更改状态
UpdateStatus(column,row){
this.$confirm("是否发送更改状态", "确认消息", {
distinguishCancelAndClose: true,
confirmButtonText: '确认更改',
cancelButtonText: '取消更改'
}).then(() => {
row.status = '22';
}).catch(action => {
this.$message({
type: 'info',
message: action === 'cancel'
? '取消状态更改'
: '状态更改取消'
})
})
},
//状态识别
formatStatus: function(row,column){
return row.status=='01'?'接受申报':row.status=='02'?'待人工审核':row.status=='03'?'退单'
:row.status=='11'?'放行':row.status=='12'?'拒装':row.status=='13'?'禁卸'
:row.status=='21'?'可自动发送':row.status=='22'?'未发送':row.status=='23'?'已发送新增报'
:row.status=='24'?'已发送删除报':row.status=='25'?'已发送修改报':'';
},
//发送舱单报按钮,删除,修改判定事件
btSendStatusFormater:(status) => {
if(status=='23' || status=='24'||status=='25'){
return true;
}else if(status=='22' ) {
return false;
}
},
btEditStatusFormater:(status) => {
if(status=='23' || status=='24'||status=='25'){
return true;
}else if(status=='22' ) {
return false;
}
},
btDeleStatusFormater:(status) => {
if(status=='23' || status=='24'||status=='25'){
return true;
}else if(status=='22' ) {
return false;
}
},
// 过滤中英文
inputMe(e){
return e.replace(/[^a-zA-Z0-9.-]/g,'').toUpperCase();
}
},
//渲染方法
mounted(){
this.submitForm();
// this.ruleForm.originflightdate = new Date().format('yyyy-MM-dd')
// this.ruleForm.transflightdate = new Date().format('yyyy-MM-dd')
}
}
</script>
<style scoped>
.ip{
max-width: 100px;
margin-right: -5px;
display: inline-block;
background-color: #6F8294;
color: #ffffff;
border: 1px solid #DCDFE6;
vertical-align: middle;
padding: 0 18px;
white-space: nowrap;
border-top-right-radius: 0px;
border-top-left-radius: 4px;
border-bottom-left-radius: 4px;
border-bottom-right-radius: 0px;
font-size: 10px;
}
</style>
... ...
... ... @@ -4,13 +4,15 @@
<el-col :span="24" class="toolbar" style="padding-bottom: 0px;">
<el-form :inline="true" :model="filters">
<el-form-item>
<el-input size="small" v-model="filters.companyName" placeholder="公司名称"></el-input>
<el-input size="small" v-model="filters.companyName" placeholder="公司名称">
<template slot="prepend">公司名称</template>
</el-input>
</el-form-item>
<el-form-item>
<el-button type="warning" style="width:150px" size="small" icon="el-icon-plus" v-on:click="getConsignee()">查询</el-button>
<el-button type="warning" style="width:150px" icon="el-icon-plus" v-on:click="getConsignee()">查&emsp;&emsp;询</el-button>
</el-form-item>
<el-form-item>
<el-button type="primary" style="width:150px" size="small" icon="el-icon-plus" @click="companyAdd">新增</el-button>
<el-button type="primary" style="width:150px" icon="el-icon-plus" @click="companyAdd">新&emsp;&emsp;增</el-button>
</el-form-item>
</el-form>
</el-col>
... ... @@ -35,8 +37,8 @@
<!-- </el-table-column>-->
<el-table-column label="操作" min-width="150">
<template slot-scope="scope">
<el-button type="primary" icon="el-icon-edit" size="mini" @click="handleEdit(scope.$index, scope.row)">编辑</el-button>
<el-button type="danger" icon="el-icon-delete" size="mini" @click="handleDel(scope.$index, scope.row)">删除</el-button>
<el-button type="primary" icon="el-icon-edit" size="mini" @click="handleEdit(scope.$index, scope.row)">编&emsp;&emsp;辑</el-button>
<el-button type="danger" icon="el-icon-delete" size="mini" @click="handleDel(scope.$index, scope.row)">删&emsp;&emsp;除</el-button>
</template>
</el-table-column>
</el-table>
... ... @@ -135,7 +137,8 @@
<script>
import { getList, remove, add, edit} from '../../api/consigner/consignee';
import loginUserInfo from '../../api/base';
import {loginedUserInfo} from "../../api/user";
export default {
data() {
... ... @@ -231,7 +234,7 @@
pageSize: this.pageSize,
limitSize: this.limitSize,
companyName: this.filters.companyName,
enterpriseId: loginUserInfo.companyId
enterpriseId: loginedUserInfo().companyId
};
this.listLoading = true;
getList(para).then((res) => {
... ... @@ -402,8 +405,8 @@
},
//设置 用户id 企业id
userId(){
this.coneeForm.userId = loginUserInfo.userId;
this.coneeForm.enterpriseId = loginUserInfo.companyId;
this.coneeForm.userId = loginedUserInfo().userId;
this.coneeForm.enterpriseId = loginedUserInfo().companyId;
}
},
... ...
... ... @@ -4,13 +4,15 @@
<el-col :span="24" class="toolbar" style="padding-bottom: 0px;">
<el-form :inline="true" :model="filters">
<el-form-item>
<el-input size="small" v-model="filters.companyName" placeholder="公司名称"></el-input>
<el-input size="small" v-model="filters.companyName" placeholder="公司名称">
<template slot="prepend">公司名称</template>
</el-input>
</el-form-item>
<el-form-item>
<el-button type="warning" style="width:150px" size="small" icon="el-icon-plus" v-on:click="getConsignee()">查询</el-button>
<el-button type="warning" style="width:150px" icon="el-icon-plus" v-on:click="getConsignee()">查&emsp;&emsp;询</el-button>
</el-form-item>
<el-form-item>
<el-button type="primary" style="width:150px" size="small" icon="el-icon-plus" @click="companyAdd">新增</el-button>
<el-button type="primary" style="width:150px" icon="el-icon-plus" @click="companyAdd">新&emsp;&emsp;增</el-button>
</el-form-item>
</el-form>
</el-col>
... ... @@ -35,8 +37,8 @@
<!-- </el-table-column>-->
<el-table-column label="操作" min-width="150">
<template slot-scope="scope">
<el-button type="primary" icon="el-icon-edit" size="mini" @click="handleEdit(scope.$index, scope.row)">编辑</el-button>
<el-button type="danger" icon="el-icon-delete" size="mini" @click="handleDel(scope.$index, scope.row)">删除</el-button>
<el-button type="primary" icon="el-icon-edit" size="mini" @click="handleEdit(scope.$index, scope.row)">编&emsp;&emsp;辑</el-button>
<el-button type="danger" icon="el-icon-delete" size="mini" @click="handleDel(scope.$index, scope.row)">删&emsp;&emsp;除</el-button>
</template>
</el-table-column>
</el-table>
... ... @@ -135,7 +137,7 @@
<script>
import { getList, remove, add, edit} from '../../api/consigner/consigner';
import loginUserInfo from '../../api/base';
import {loginedUserInfo} from "../../api/user";
export default {
data() {
... ... @@ -231,7 +233,7 @@
pageSize: this.pageSize,
limitSize: this.limitSize,
companyName: this.filters.companyName,
enterpriseId: loginUserInfo.companyId
enterpriseId: loginedUserInfo().companyId
};
this.listLoading = true;
getList(para).then((res) => {
... ... @@ -402,8 +404,8 @@
},
//设置 用户id 企业id
userId(){
this.conerForm.userId = loginUserInfo.userId;
this.conerForm.enterpriseId = loginUserInfo.companyId;
this.conerForm.userId = loginedUserInfo().userId;
this.conerForm.enterpriseId = loginedUserInfo().companyId;
}
},
... ...
... ... @@ -38,7 +38,7 @@
</div>
</el-col>
<div class="grid-content el-btn">
<el-button type="primary" @click="handleSerach">查询</el-button>
<el-button type="primary" @click="handleSerach" icon="el-icon-search">查&emsp;&emsp;询</el-button>
<el-button v-if="arriveQuery.flightno ===undefined && arriveData.length<1"
type="primary"
@click="handleAddArrive">新增运抵
... ... @@ -78,17 +78,17 @@
<!-- <span>{{scope.row.awbh}}</span>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column label="运抵件数" width="70" align="center">
<el-table-column label="运抵件数" width="80" align="center">
<template slot-scope="scope">
<span>{{scope.row.piece}}</span>
</template>
</el-table-column>
<el-table-column label="运抵重量" width="70" align="center">
<el-table-column label="运抵重量" width="80" align="center">
<template slot-scope="scope">
<span>{{scope.row.weight}}</span>
</template>
</el-table-column>
<el-table-column label="货物描述" width="120" style="height: 20px" align="center">
<el-table-column label="货物描述" width="120" style="height: 20px" align="center" show-overflow-tooltip>
<template slot-scope="scope">
<span>{{scope.row.goodsname}}</span>
</template>
... ... @@ -122,45 +122,57 @@
<span v-if="scope.row.status ==='25'">已发送修改报</span>
</template>
</el-table-column>
<el-table-column prop="receipt" label="回执信息" align="center">
<el-table-column prop="receipt" label="回执信息" align="center" show-overflow-tooltip width="380" >
<template slot-scope="scope">
<span>{{scope.row.ext5}}</span>
<el-tag v-if="scope.row.status=='01' || scope.row.status=='11'" type="success">
{{scope.row.ext5}}
</el-tag>
<el-tag v-else-if="scope.row.status=='02' || scope.row.status=='03'" type="warning">
{{scope.row.ext5}}
</el-tag>
<el-tag v-else-if="scope.row.status=='12' || scope.row.status=='13'" type="danger">
{{scope.row.ext5}}
</el-tag>
<el-tag v-else>
{{scope.row.ext5}}
</el-tag>
</template>
</el-table-column>
<el-table-column prop="operation" fixed="right" label="操作" align="center" width="400">
<el-table-column prop="operation" fixed="right" label="操作" align="center" width="350">
<template slot-scope="scope">
<el-button @click="handleSendDesc(scope.row)">收发明细</el-button>
<!-- <el-button type="success" @click="handleEdit(scope.row)">编辑</el-button>-->
<el-button type="primary" @click="handleSendAwb(scope.row)"
:disabled="scope.row.status ==='23'">发送出港运抵报
<el-row type="flex" justify="space-between">
<!-- <el-button type="success" @click="handleEdit(scope.row)">编辑运单</el-button>-->
<el-button icon="el-icon-view" @click="handleSendDesc(scope.row)">收发明细</el-button>
<el-button type="success" icon="el-icon-plus" v-if="scope.row.awbh ===''"
@click="handleAddAwbh(scope.row)">新增分单
</el-button>
<p></p>
<el-button type="danger" v-if="isAdmin" @click="handleAwbDelete(scope.row)">删除运单
<el-button type="danger" icon="el-icon-delete" v-if="isAdmin" @click="handleAwbDelete(scope.row)">删除运单</el-button>
</el-row>
<el-row type="flex" justify="space-between">
<el-button type="primary" icon="el-icon-plus" @click="handleSendAwb(scope.row)"
:disabled="scope.row.status ==='23'">运抵申报
</el-button>
<el-button type="warning" @click="handleAwbStatus(scope.row)"
<el-button type="warning" icon="el-icon-edit" @click="handleAwbStatus(scope.row)"
:disabled="scope.row.status ==='22'">更改状态
</el-button>
<el-button type="primary" v-if="scope.row.awbh ===''"
@click="handleAddAwbh(scope.row)">新增分单
</el-button>
<el-button type="danger" @click="handleSendDelete(scope.row)"
:disabled="scope.row.status ==='24'">发删除报
<el-button type="danger" icon="el-icon-delete" @click="handleSendDelete(scope.row)"
:disabled="scope.row.status ==='24'">删除申报
</el-button>
</el-row>
</template>
</el-table-column>
</el-table>
<div class="btnFoot">
<el-row>
<el-button type="primary" v-if="arriveQuery.flightno !==undefined || arriveData.length>0"
@click="handelAddArriveInfo">新增出港运抵
<el-button icon="el-icon-plus" type="success" v-if="arriveQuery.flightno !==undefined || arriveData.length>0"
@click="handelAddArriveInfo">新增运抵
</el-button>
<el-button type="primary" v-if="arriveQuery.flightno !== undefined || arriveData.length>0"
@click="handelBackStep">返回
<el-button icon="el-icon-back" type="primary" v-if="arriveQuery.flightno !== undefined || arriveData.length>0"
@click="handelBackStep">返&emsp;&emsp;回
</el-button>
</el-row>
</div>
<pagination background layout="total, prev, pager, next" v-show="total>0" :total="total" :page.sync="arriveQuery.pageSize"
:limit.sync="arriveQuery.limitSize"
<pagination v-show="total>0" :total="total" :page.sync="arriveQuery.pageSize" :limit.sync="arriveQuery.limitSize"
@pagination="getList"/>
<el-dialog :title="dialogMap[dialogStatus]" :visible.sync="dialogFormVisible">
<el-form ref="arriveFormData" :model="arriveModel" :rules="arriveRoles" label-position="right"
... ... @@ -184,12 +196,12 @@
<span>航班信息</span>
</div>
<el-row>
<el-col :span="7.5">
<el-form-item label="承运人" prop="carrier">
<el-input v-model="carrier"
:disabled="fenStatus === 'addAwbh'"></el-input>
</el-form-item>
</el-col>
<!-- <el-col :span="7.5">-->
<!-- <el-form-item label="承运人" prop="carrier">-->
<!-- <el-input v-model="carrier"-->
<!-- :disabled="fenStatus === 'addAwbh'"></el-input>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<el-col :span="7.5">
<el-form-item label="航班号" prop="flightno">
<el-input v-model="flightno"
... ... @@ -454,6 +466,7 @@
piece: [{required: true, trigger: 'change', validator: validatorNums}],
arrivetime: [{required: true, trigger: 'blur', message:'请选择运抵时间'}],
customcode: [{required: true, trigger: 'blur', message:'海关关区不能为空'}],
flightdate: [{required: true, trigger: 'blur', message:'请选择航班日期'}],
},
arriveData: [],
detailData: [],
... ... @@ -492,20 +505,21 @@
contactName:[{required:true,message:'操作人不能为空',trigger:'blur'}],
contactTel:[
{ required: true, message: '手机号不能为空', trigger: 'blur' },
{ type: 'number', message: '手机号格式不正确', trigger: 'blur',
transform(value){
var phone = 11 && /^((13|14|15|16|17|18|19)[0-9]{1}\d{8})$/
if (!phone.test(value)){
return false;
}else {
return Number(value);
}
}}
// { type: 'number', message: '手机号格式不正确', trigger: 'blur',
// transform(value){
// var phone = 11 && /^((13|14|15|16|17|18|19)[0-9]{1}\d{8})$/
// if (!phone.test(value)){
// return false;
// }else {
// return Number(value);
// }
// }
// }
],
},
}
},
created() {
activated() {
if (this.$route.params.flightData !== undefined) {
// 给查询条件赋值
if (this.$route.params.flightData.awba !== undefined && this.$route.params.flightData.awba !== '') {
... ... @@ -517,11 +531,19 @@
this.arriveQuery.originstation = this.$route.params.flightData.originstation
this.arriveQuery.destinationstation = this.$route.params.flightData.destinationstation
this.getList()
}else {
this.arriveQuery= {
pageSize: 1,
limitSize: 10,
awba: undefined,
messageType: 'MT3201',
}
}
let username = loginedUserInfo().username
if (username === 'admin') {
this.isAdmin = true
}
this.isAdmin = true
},
computed: {
awba: {
... ... @@ -626,9 +648,11 @@
handelAddArriveInfo() {
this.restModel()
// 给model赋值,所使用数据是以单独单号查询数据所得
this.arriveModel.carrier = this.arriveQuery.carrier
// this.arriveModel.carrier = this.arriveQuery.carrier
this.arriveModel.flightdate = this.arriveQuery.flightdate
this.arriveModel.flightno = this.arriveQuery.flightno
if (this.arriveQuery.carrier!=undefined){
this.arriveModel.flightno = this.arriveQuery.carrier+this.arriveQuery.flightno
}
this.arriveModel.originstation = this.arriveQuery.originstation
this.arriveModel.destinationstation = this.arriveQuery.destinationstation
this.arriveModel.customcode = this.arriveQuery.customcode
... ... @@ -643,10 +667,10 @@
handleAddAwbh(row){
this.restModel()
// 给model赋值,所使用数据是以单独单号查询数据所得
this.arriveModel.carrier = row.carrier
// this.arriveModel.carrier = row.carrier
this.arriveModel.awba = row.awba
this.arriveModel.flightdate = row.flightdate
this.arriveModel.flightno = row.flightno
this.arriveModel.flightno =row.carrier+ row.flightno
this.arriveModel.originstation = row.originstation
this.arriveModel.destinationstation = row.destinationstation
this.arriveModel.customcode = row.customcode
... ... @@ -663,6 +687,8 @@
createData() {
this.$refs.arriveFormData.validate(valid => {
if (valid) {
this.arriveModel.carrier = this.arriveModel.flightno.substring(0,2);
this.arriveModel.flightno = this.arriveModel.flightno.substring(2);
addMt3201(this.arriveModel).then(res => {
if (res.data.code == "200") {
this.dialogFormVisible = false
... ... @@ -704,6 +730,7 @@
// 编辑
handleEdit(row) {
this.arriveModel = Object.assign({}, row) // copy obj
this.arriveModel.flightno = row.carrier+row.flightno
if (row.awbh === ''){
this.fenStatus = undefined
}else {
... ... @@ -723,6 +750,8 @@
username : loginedUserInfo().username
}
if (valid) {
this.arriveModel.carrier = this.arriveModel.flightno.substring(0,2);
this.arriveModel.flightno = this.arriveModel.flightno.substring(2);
updateMT3201(this.arriveModel).then(res => {
if (res.data.code == "200") {
this.dialogFormVisible = false
... ...
... ... @@ -7,7 +7,7 @@
<el-date-picker v-model="listQuery.flightDate" clearable type="date" style="width: 270px;margin-right: 50px"
placeholder="航班日期"
class="filter-item" value-format="yyyy-MM-dd"></el-date-picker>
<el-button type="warning" style="width:150px" size="medium" icon="el-icon-search" @click="handleSearch">查询</el-button>
<el-button type="warning" style="width:150px" icon="el-icon-search" @click="handleSearch">查&emsp;&emsp;询</el-button>
</div>
<el-table :data="flightData" v-loading="listLoading" stripe
style="border-radius: 10px 10px 0px 0px;line-height: 25px;" stripe
... ...
... ... @@ -106,7 +106,7 @@
airportCode: [],
};
},
created() {
activated() {
if (this.$route.params.scopeRow !== undefined) {
if (this.$route.params.scopeRow.carrier === undefined) {
this.flight.flightno = this.$route.params.scopeRow.flightno
... ... @@ -185,7 +185,7 @@
} else {
this.flight.awba = undefined
}
console.log("-----------"+this.flight.messageType);
if (this.flight.messageType === "MT5202") {
this.$router.push({name: '出港理货', params: {flightData: this.flight}});
}
... ...
... ... @@ -38,9 +38,9 @@
</div>
</el-col>
<div class="el-btn">
<el-button type="primary" size="mini" @click="handleSearch">查询</el-button>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleSearch">查&emsp;&emsp;询</el-button>
<el-button v-if="loadingQuery.flightno === undefined && loadingData.length <1"
type="primary" size="mini" @click="handleAddLoading">新增装载
type="success" icon="el-icon-plus" size="mini" @click="handleAddLoading">新增装载
</el-button>
</div>
</div>
... ... @@ -59,6 +59,16 @@
<a type="text" style="color: #409eff;text-decoration: underline" class="tableInline" @click="handleEdit(scope.row)">{{scope.row.awba}}</a>
</template>
</el-table-column>
<el-table-column label="航班号" width="100" align="center">
<template slot-scope="scope">
<span>{{scope.row.carrier}}{{scope.row.flightno}}</span>
</template>
</el-table-column>
<el-table-column label="航班日期" width="130" align="center">
<template slot-scope="scope">
<span>{{scope.row.flightdate}}</span>
</template>
</el-table-column>
<el-table-column label="运载件数" width="70" align="center">
<template slot-scope="scope">
<span>{{scope.row.lodingpiece}}</span>
... ... @@ -69,7 +79,7 @@
<span>{{scope.row.lodingweight}}</span>
</template>
</el-table-column>
<el-table-column label="货物描述" width="120" align="center">
<el-table-column label="货物描述" width="120" align="center" show-overflow-tooltip>
<template slot-scope="scope">
<span>{{scope.row.goodsname}}</span>
</template>
... ... @@ -103,50 +113,56 @@
<span v-if="scope.row.status ==='25'">已发送修改报</span>
</template>
</el-table-column>
<el-table-column label="回执信息" width="270" align="center">
<el-table-column label="回执信息" width="220" align="center" show-overflow-tooltip>
<template slot-scope="scope">
<span>{{scope.row.ext5}}</span>
<el-tag v-if="scope.row.status=='01' || scope.row.status=='11'" type="success">
{{scope.row.ext5}}
</el-tag>
<el-tag v-else-if="scope.row.status=='02' || scope.row.status=='03'" type="warning">
{{scope.row.ext5}}
</el-tag>
<el-tag v-else-if="scope.row.status=='12' || scope.row.status=='13'" type="danger">
{{scope.row.ext5}}
</el-tag>
<el-tag v-else>
{{scope.row.ext5}}
</el-tag>
</template>
</el-table-column>
<el-table-column label="操作" align="center" fixed="right">
<el-table-column label="操作" align="center" width="330px" fixed="right">
<template slot-scope="scope">
<el-button size="mini" @click="handleSend(scope.row)">收发明细</el-button>
<!-- <el-button size="mini" type="success" @click="handleEdit(scope.row)" >编辑-->
<!-- </el-button>-->
<el-button size="mini" type="primary" @click="handleSendAwb(scope.row)"
:disabled="scope.row.status ==='23'">发送出港装载报
<el-row type="flex" justify="space-between">
<el-button size="mini" icon="el-icon-view" @click="handleSend(scope.row)">收发明细</el-button>
<el-button size="mini" icon="el-icon-edit" type="warning" @click="handleAwbStatus(scope.row)"
:disabled="scope.row.status ==='22'">更改状态
</el-button>
<br><br>
<el-button size="mini" type="danger" v-if="isAdmin" @click="handleAwbDelete(scope.row)">删除运单
<el-button size="mini" icon="el-icon-delete" type="danger" v-if="isAdmin" @click="handleAwbDelete(scope.row)">删除运单
</el-button>
<el-button size="mini" type="warning" @click="handleAwbStatus(scope.row)"
:disabled="scope.row.status ==='22'">更改状态
</el-row>
<el-row type="flex" justify="space-between">
<el-button size="mini" type="primary" icon="el-icon-plus" @click="handleSendAwb(scope.row)"
:disabled="scope.row.status ==='23'">装载申报
</el-button>
<el-button size="mini" type="danger" @click="handleSendDelete(scope.row)"
:disabled="scope.row.status ==='24'">发送删除报
<el-button size="mini" icon="el-icon-delete" type="danger" @click="handleSendDelete(scope.row)"
:disabled="scope.row.status ==='24'">删除申报
</el-button>
</el-row>
</template>
</el-table-column>
</el-table>
<div class="btnFoot">
<el-row>
<el-button type="primary" size="mini"
<el-button type="success" icon="el-icon-plus" size="mini"
v-if="loadingQuery.flightno !== undefined || loadingData.length >0"
@click="handelAddLoadingInfo">新增出港装载
@click="handelAddLoadingInfo">新增装载
</el-button>
<el-button type="primary" size="mini"
<el-button type="primary" icon="el-icon-back" size="mini"
v-if="loadingQuery.flightno !== undefined || loadingData.length>0"
@click="handelBackStep">返回
@click="handelBackStep">返&emsp;&emsp;
</el-button>
</el-row>
</div>
<pagination background layout="total, prev, pager, next" v-show="total>0" :total="total" :page.sync="loadingQuery.pageSize" :limit.sync="loadingQuery.limitSize"
<pagination v-show="total>0" :total="total" :page.sync="loadingQuery.pageSize" :limit.sync="loadingQuery.limitSize"
@pagination="getList"/>
<el-dialog :title="dialogMap[dialogStatus]" :visible.sync="dialogFormVisible">
... ... @@ -161,11 +177,11 @@
<el-input v-model="loadingModel.awba" :disabled="dialogStatus ==='update'"></el-input>
</el-form-item>
</el-col>
<el-col :span="7.5">
<el-form-item label="承运人" prop="carrier">
<el-input v-model="carrier" :disabled="dialogStatus ==='update'"></el-input>
</el-form-item>
</el-col>
<!-- <el-col :span="7.5">-->
<!-- <el-form-item label="承运人" prop="carrier">-->
<!-- <el-input v-model="carrier" :disabled="dialogStatus ==='update'"></el-input>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<el-col :span="7.5">
<el-form-item label="航班号" prop="flightno">
<el-input v-model="flightno" :disabled="dialogStatus ==='update'"></el-input>
... ... @@ -462,8 +478,8 @@
goodsname: [{required: true, trigger: 'blur', validator: validAlphabetsSpanceKey}],
carrier: [{required: true, trigger: 'blur', validator: validatorAwbh}],
flightno: [{required: true, trigger: 'blur', validator: validatorAwbh}],
flightdate: [{required: true, trigger: 'blur'}],
loadingtime: [{required: true, trigger: 'blur'}],
flightdate: [{required: true, trigger: 'blur', message:'请选择航班时间'}],
loadingtime: [{required: true, trigger: 'blur', message:'请选择装载时间'}],
originstation: [{required: true, trigger: 'blur', validator: validatorAlphabets}],
destinationstation: [{required: true, trigger: 'blur', validator: validatorAlphabets}],
lodingpiece: [{type: 'number',required: true, trigger: 'change', message: '只能输入数字'}],
... ... @@ -529,7 +545,7 @@
},
}
},
created() {
activated() {
if (this.$route.params.flightData !== undefined) {
// 给查询条件赋值
if (this.$route.params.flightData.awba !== undefined && this.$route.params.flightData.awba !== '') {
... ... @@ -541,6 +557,13 @@
this.loadingQuery.originstation = this.$route.params.flightData.originstation
this.loadingQuery.destinationstation = this.$route.params.flightData.destinationstation
this.getList()
}else {
this.loadingQuery= {
pageSize: 1,
limitSize: 10,
awba: undefined,
messageType: 'MT4201'
}
}
let username = loginedUserInfo().username
if (username === 'admin') {
... ... @@ -654,6 +677,7 @@
// 编辑 弹框
handleEdit(row) {
this.loadingModel = Object.assign({}, row)
this.loadingModel.flightno = row.carrier+row.flightno
this.dialogStatus = 'update'
this.dialogFormVisible = true
this.$nextTick(() => {
... ... @@ -668,6 +692,8 @@
_this.loadingModel.user= {
username : loginedUserInfo().username
}
this.loadingModel.carrier = this.loadingModel.flightno.substring(0,2);
this.loadingModel.flightno = this.loadingModel.flightno.substring(2);
updateMT4201(this.loadingModel).then(res => {
if (res.data.count > 0) {
this.dialogFormVisible = false
... ... @@ -869,9 +895,11 @@
handelAddLoadingInfo() {
this.restModel()
// 给model赋值,所使用数据是以单独单号查询数据所得
this.loadingModel.carrier = this.loadingQuery.carrier
// this.loadingModel.carrier = this.loadingQuery.carrier
this.loadingModel.flightdate = this.loadingQuery.flightdate
this.loadingModel.flightno = this.loadingQuery.flightno
if ( this.loadingQuery.carrier != undefined){
this.loadingModel.flightno = this.loadingQuery.carrier + this.loadingQuery.flightno
}
this.loadingModel.originstation = this.loadingQuery.originstation
this.loadingModel.destinationstation = this.loadingQuery.destinationstation
this.loadingModel.customcode = this.loadingQuery.customcode
... ... @@ -886,6 +914,8 @@
createData() {
this.$refs.loadingFormData.validate(valid => {
if (valid) {
this.loadingModel.carrier = this.loadingModel.flightno.substring(0,2);
this.loadingModel.flightno = this.loadingModel.flightno.substring(2);
addMt4201(this.loadingModel).then(res => {
if (res.data.count > 0) {
this.dialogFormVisible = false
... ...
... ... @@ -2,9 +2,9 @@
<!--<div class="app-container">-->
<div class="app-content">
<div class="filter-container" style="margin-top: 50px;padding-bottom: 5px">
<el-input v-model="listQuery.awba" clearable style="width: 200px;margin-right: 10px" class="filter-item" placeholder="运单号"/>
<el-input v-model="listQuery.carrier" clearable style="width: 200px;margin-right: 10px" class="filter-item" placeholder="承运人"/>
<el-input v-model="listQuery.flightno" clearable style="width: 200px;margin-right: 10px" class="filter-item" placeholder="航班号"/>
<el-input v-model="listQuery.awba" @blur="inputAwba" clearable style="width: 200px;margin-right: 10px" class="filter-item" placeholder="运单号"/>
<!-- <el-input v-model="listQuery.carrier" clearable style="width: 200px;margin-right: 10px" class="filter-item" placeholder="承运人"/>-->
<el-input v-model="flightComNo" clearable style="width: 200px;margin-right: 10px" class="filter-item" placeholder="航班号"/>
<el-date-picker v-model="listQuery.flightDate" type="date" placeholder="航班日期"
value-format="yyyy-MM-dd" class="filter-item"></el-date-picker>
</div>
... ... @@ -18,8 +18,8 @@
<el-select v-model="listQuery.customStatus" clearable class="filter-item" placeholder="请选择海关状态" style="width: 200px;margin-right: 10px">
<el-option v-for="item in customStatusList" :key="item.value" :label="item.label" :value="item.value"></el-option>
</el-select>
<el-button type="warning" style="width:150px" size="medium" icon="el-icon-search" @click="handleSearch">查询</el-button>
<el-button type="primary" style="width:150px" size="medium" icon="el-icon-search"
<el-button type="warning" style="width:150px" icon="el-icon-search" @click="handleSearch">查&emsp;&emsp;询</el-button>
<el-button type="primary" style="width:150px" icon="el-icon-search"
@click="handleUpdateStatus">批量修改状态</el-button>
</div>
<div class="midSpan">
... ... @@ -116,10 +116,18 @@
</el-table-column>
<el-table-column label="回执内容" align="center" show-overflow-tooltip>
<template slot-scope="scope">
<span>{{ scope.row.customText }}</span>
<!--<div>-->
<!--<el-progress :percentage="scope.row.customComplate" :status="scope.row.status | statusFilter"/>-->
<!--</div>-->
<el-tag v-if="scope.row.status=='01' || scope.row.status=='11'" type="success">
{{scope.row.customText}}
</el-tag>
<el-tag v-else-if="scope.row.status=='02' || scope.row.status=='03'" type="warning">
{{scope.row.customText}}
</el-tag>
<el-tag v-else-if="scope.row.status=='12' || scope.row.status=='13'" type="danger">
{{scope.row.customText}}
</el-tag>
<el-tag v-else>
{{scope.row.customText}}
</el-tag>
</template>
</el-table-column>
<el-table-column label="操作" width="180px" align="center">
... ... @@ -145,6 +153,7 @@
import {getMt520XListForParam} from "@/api/exitTidy";
import {getMt3201ListForParam} from "@/api/exitArrive";
import {getMt4201ListForParam} from "@/api/exitLoading";
import {Message} from "element-ui";
export default {
name: "ExitManifest",
... ... @@ -157,10 +166,10 @@
listLoading: false,
listQuery: {
pageSize: 1,
limitSize: 100,
limitSize: 10,
awba:undefined,
carrier: undefined,
flightno:undefined,
carrier: '',
flightno:'',
flightDate: new Date(),
messageType: undefined,
messageStatus: undefined,
... ... @@ -198,9 +207,37 @@
]
}
},
computed: {
flightComNo: {
get: function () {
return this.listQuery.carrier+this.listQuery.flightno;
},
set: function (val) {
this.listQuery.carrier='';
this.listQuery.flightno = val.toUpperCase();
}
}
},
methods: {
getList() {
// 主单为空 航班号 航班日期 不能为空
if (this.listQuery.awba == undefined
&& this.listQuery.flightno != ''){
this.listLoading = true
if (this.listQuery.flightno != '' && this.listQuery.flightno.length > 0){
this.listQuery.carrier = this.listQuery.flightno.substring(0,2);
this.listQuery.flightno = this.listQuery.flightno.substring(2);
}
getManifests(this.listQuery).then(res =>{
this.manifestData = res.data.data.list
this.total = res.data.data.total
setTimeout(() =>{
this.listLoading = false
},1500)
})
}else if (this.listQuery.awba != undefined){
this.listLoading = true
this.listQuery.flightDate = undefined;
getManifests(this.listQuery).then(res =>{
this.manifestData = res.data.data.list
this.total = res.data.data.total
... ... @@ -208,6 +245,13 @@
this.listLoading = false
},1500)
})
}else {
Message.warning("请输入运单号或者航班号为查询条件");
}
},
inputAwba(){
this.listQuery.flightDate = '';
},
handleSelectionChange() {
... ... @@ -220,7 +264,6 @@
},
handleUpdate(row){
console.log(row.messageType )
if(row.messageType === 'MT2201'){
this.$router.push({name: '出港航班信息', params: {scopeRow: row}})
}
... ...
... ... @@ -8,16 +8,30 @@
</el-col>
<el-col :span="24">
<div class="grid-content co">
<el-col :span="24">
<el-row>
<el-col :span="4">
<el-input v-model="flightComNo" placeholder="航班号" clearable >
<template slot="prepend">航班号</template>
</el-input>
</el-col>
<el-col :span="1">
<div class="grid-content"></div>
</el-col>
<el-col :span="20">
<div class="grid-content">
<span class="titleSpan">航班号:{{this.preQuery.carrier}}{{this.preQuery.flightno}}</span>
<span class="titleSpan">航班日期:{{this.preQuery.flightdate}}</span>
<!-- <span class="titleSpan">航段:{{this.preQuery.originstation}}-{{this.preQuery.destinationstation}}</span>-->
<el-col :span="4">
<div class="el-input el-input--mini el-input-group el-input-group--prepend el-input--suffix">
<div class="el-input-group__prepend"> 航班日期</div>
<el-date-picker
value-format="yyyy-MM-dd"
style="width: 200px"
v-model="preQuery.flightdate" align="left"
class="flight-date-tianbo"
type="date" placeholder="请输入航班日期" clearable>
</el-date-picker>
</div>
</el-col>
</el-row>
</el-col>
</div>
</el-col>
<el-col :span="24">
... ... @@ -30,7 +44,7 @@
</el-col>
<el-col :span="24">
<div class="grid-content">
<el-col :span="3">
<el-col :span="4">
<div class="grid-content">
<el-input v-model="preQuery.awba" placeholder="请输入主单号" clearable>
<template slot="prepend">主单号</template>
... ... @@ -38,21 +52,21 @@
</div>
</el-col>
<div class="grid-content el-btn">
<el-button type="warning" style="width:150px" icon="el-icon-search" @click="handleSerach">查询</el-button>
<el-button v-if="preQuery.flightno === undefined && preData.length<1" type="primary"
<el-button type="warning" style="width:150px" icon="el-icon-search" @click="handleSerach">查&emsp;&emsp;询</el-button>
<el-button v-if="preQuery.flightno === undefined && preData.length<1" type="success"
style="width:150px" icon="el-icon-plus"
@click="handleAddpre">新增预配舱单
</el-button>
<el-button @click="handleAwbSend('')" v-if="batchChooseFlag" style="width:150px" type="primary">
批量发送申报
<el-button icon="el-icon-plus" @click="handleAwbSend('')" v-if="batchChooseFlag" style="width:150px" type="primary">
批量申报
</el-button>
<el-button @click="handleAwbEdit('')" v-if="batchChooseFlag" style="width:150px" type="success">
批量发送修改申报
<el-button icon="el-icon-edit" @click="handleAwbEdit('')" v-if="batchChooseFlag" style="width:150px" type="success">
批量修改申报
</el-button>
<el-button @click="handleSendDelete('')" v-if="batchChooseFlag" style="width:150px" type="danger">
批量发送删除申报
<el-button icon="el-icon-delete" @click="handleSendDelete('')" v-if="batchChooseFlag" style="width:150px" type="danger">
批量删除申报
</el-button>
<el-button @click="download" style="width:150px" type="success">
<el-button icon="el-icon-download" @click="download" style="width:150px" type="success">
模板下载
</el-button>
<el-upload
... ... @@ -117,7 +131,7 @@
{{scope.row.weight}}
</template>
</el-table-column>
<el-table-column label="货物描述" width="120" align="center">
<el-table-column label="货物描述" width="120" align="center" show-overflow-tooltip>
<template slot-scope="scope">
{{scope.row.goodsname}}
</template>
... ... @@ -156,63 +170,59 @@
<span v-if="scope.row.status ==='25'">已发送修改报</span>
</template>
</el-table-column>
<el-table-column prop="receipt" label="回执信息" align="center">
<el-table-column prop="receipt" label="回执信息" align="center" show-overflow-tooltip>
<template slot-scope="scope">
<el-tag v-if="scope.row.status=='01' || scope.row.status=='11'" type="success">
{{scope.row.ext5}}
</el-tag>
<el-tag v-else-if="scope.row.status=='02' || scope.row.status=='03'" type="warning">
{{scope.row.ext5}}
</el-tag>
<el-tag v-else-if="scope.row.status=='12' || scope.row.status=='13'" type="danger">
{{scope.row.ext5}}
</el-tag>
<el-tag v-else>
{{scope.row.ext5}}
</el-tag>
</template>
</el-table-column>
<el-table-column label="操作" width="450px" fixed="right" align="center">
<template slot-scope="scope" >
<el-row>
<el-col :span="5" style="margin-right: 10px">
<el-button type="danger" v-if="isAdmin" @click="handleAwbDelete(scope.row)">删除运单</el-button>
</el-col>
<el-col :span="5" style="margin-right: 10px">
<el-button type="warning" icon="el-icon-view" @click="handleSend(scope.row)">收发明细</el-button>
</el-col>
<el-col :span="5" style="margin-right: 10px">
<el-button type="info" icon="el-icon-edit" @click="handleAwbStatus(scope.row)"
:disabled="scope.row.status === '22'">更改状态
</el-button>
</el-col>
<el-col :span="5" style="margin-right: 10px">
<el-button type="primary" icon="el-icon-plus" v-if="scope.row.awbh ===''"
<el-row type="flex" justify="space-between">
<el-button icon="el-icon-view" @click="handleSend(scope.row)">收发明细</el-button>
<el-button type="success" icon="el-icon-plus" v-if="scope.row.awbh ===''"
@click="handleAddAwbh(scope.row)">新增分单
</el-button>
</el-col>
<el-button type="warning" icon="el-icon-edit" @click="handleAwbStatus(scope.row)"
:disabled="scope.row.status === '22'">更改状态
</el-button>
<el-button type="danger" icon="el-icon-delete" v-if="isAdmin" @click="handleAwbDelete(scope.row)">删除运单</el-button>
</el-row>
<el-row>
<el-col :span="7" style="margin-right: 10px">
<el-button type="primary" icon="el-icon-plus" style="width: 130px" @click="handleAwbSend(scope.row.uuid)"
:disabled="addStatus(scope.row.status)">发送预配舱单报
<el-row type="flex" justify="space-between">
<el-button type="primary" icon="el-icon-plus" @click="handleAwbSend(scope.row.uuid)"
:disabled="addStatus(scope.row.status)">预配申报
</el-button>
</el-col>
<el-col :span="7" style="margin-right: 10px">
<el-button type="success" icon="el-icon-plus" style="width: 130px" @click="handleAwbEdit(scope.row.uuid)"
:disabled="editStatus(scope.row.status)">发送预配修改报</el-button>
</el-col>
<el-col :span="7">
<el-button type="danger" icon="el-icon-delete" style="width: 130px;margin-bottom: 10px" @click="handleSendDelete(scope.row.uuid)"
:disabled="deleteStatus(scope.row.status)">发送预配删除报</el-button>
</el-col>
<el-button type="success" icon="el-icon-edit" @click="handleAwbEdit(scope.row.uuid)"
:disabled="editStatus(scope.row.status)">修改申报</el-button>
<el-button type="danger" icon="el-icon-delete" @click="handleSendDelete(scope.row.uuid)"
:disabled="deleteStatus(scope.row.status)">删除申报</el-button>
</el-row>
</template>
</el-table-column>
</el-table>
<div class="btnFoot">
<el-row>
<el-button type="primary" v-if="preQuery.flightno !== undefined || preData.length >0"
<el-button type="success" icon="el-icon-plus" v-if="preQuery.flightno !== undefined || preData.length >0"
@click="handleAddpreInfo">新增预配舱单
</el-button>
<el-button type="primary" @click="handelBackStep"
v-if="preQuery.flightno !== undefined || preData.length >0">返回
<el-button type="primary" icon="el-icon-back" @click="handelBackStep"
v-if="preQuery.flightno !== undefined || preData.length >0">返&emsp;&emsp;回
</el-button>
</el-row>
</div>
<pagination background layout="total, prev, pager, next" v-show="total>0" :total="total" :page.sync="preQuery.pageSize" :limit.sync="preQuery.limitSize"
<pagination v-show="total>0" :total="total" :page.sync="preQuery.pageSize" :limit.sync="preQuery.limitSize"
@pagination="getList"/>
<el-dialog top="5vh" :title="dialogMap[dialogStatus]" :visible.sync="dialogFormVisible" width="90%">
<el-form ref="preFormData" :model="preModel" :rules="preRoles" label-position="right"
... ... @@ -279,7 +289,13 @@
<el-input v-model="flightno" @blur="transportQuery()" :disabled="fenStatus === 'addAwbh'" style="width: 140px" clearable>
</el-input>
</el-form-item>
<span id="message"></span>
<el-alert
title="运输工具申报信息:"
:type="alert_type"
:description = "alert_des"
:closable="false"
>
</el-alert>
</el-col>
<el-col :span="6">
<el-form-item label="航班日期" prop="flightdate">
... ... @@ -578,10 +594,20 @@
</el-col>
<el-col :span="6">
<el-form-item label="所属关区" prop="customcode">
<el-select v-model="preModel.customcode" clearable class="filter-item" style="width: 140px" placeholder="请选择所属关区">
<el-option v-for="item in custom" :key="item.value"
:label="item.label"
:value="item.value">
<!-- <el-select v-model="preModel.customcode" clearable class="filter-item" style="width: 140px" placeholder="请选择所属关区">-->
<!-- <el-option v-for="item in custom" :key="item.value"-->
<!-- :label="item.label"-->
<!-- :value="item.value">-->
<!-- </el-option>-->
<!-- </el-select>-->
<el-select v-model="preModel.customcode" class="filter-item" placeholder="请输入关区代码"
filterable clearable remote :remote-method="remoteMethodCustomCode" :loading="customLoading"
allow-create
default-first-option>
<el-option v-for="item in customCodeList" :key="item.customcode" :label="item.customcode"
:value="item.customcode">
<span style="float: left">{{ item.customcode }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.customname }}</span>
</el-option>
</el-select>
</el-form-item>
... ... @@ -728,10 +754,12 @@
<el-col :span="24" class="toolbar" style="padding-bottom: 0px;">
<el-form :inline="true" :model="consignerQuery">
<el-form-item>
<el-input v-model="consignerQuery.companyName" placeholder="关键字查询" size="small"></el-input>
<el-input v-model="consignerQuery.companyName" placeholder="公司名称" size="small">
<template slot="prepend">公司名称</template>
</el-input>
</el-form-item>
<el-form-item>
<el-button type="primary" size="small" v-on:click="consignerSelect()">查询</el-button>
<el-button type="primary" icon="el-icon-plus" size="small" v-on:click="consignerSelect()">查&emsp;&emsp;询</el-button>
</el-form-item>
</el-form>
</el-col>
... ... @@ -753,7 +781,7 @@
</el-table-column>
<el-table-column label="操作">
<template slot-scope="scope">
<el-button type="success" size="mini" @click="consignerClick(scope.row)">选择</el-button>
<el-button type="success" size="mini" icon="el-icon-thumb" @click="consignerClick(scope.row)">选&emsp;&emsp;择</el-button>
</template>
</el-table-column>
</el-table>
... ... @@ -765,10 +793,12 @@
<el-col :span="24" class="toolbar" style="padding-bottom: 0px;">
<el-form :inline="true" :model="consignerQuery">
<el-form-item>
<el-input v-model="consigneeQuery.companyName" placeholder="关键字查询" size="small"></el-input>
<el-input v-model="consigneeQuery.companyName" placeholder="公司名称" size="small">
<template slot="prepend">公司名称</template>
</el-input>
</el-form-item>
<el-form-item>
<el-button type="primary" v-on:click="consigneeSelect()" size="small">查询</el-button>
<el-button type="primary" icon="el-icon-plus" v-on:click="consigneeSelect()" size="small">查&emsp;&emsp;询</el-button>
</el-form-item>
</el-form>
</el-col>
... ... @@ -790,7 +820,7 @@
</el-table-column>
<el-table-column label="操作">
<template slot-scope="scope">
<el-button type="success" @click="consigneeClick(scope.row)" size="small">选择</el-button>
<el-button type="success" icon="el-icon-thumb" @click="consigneeClick(scope.row)" size="small">选&emsp;&emsp;择</el-button>
</template>
</el-table-column>
</el-table>
... ... @@ -830,6 +860,7 @@
validAlphabetsAndSpanceKey,
validatorNum
} from "@/utils/validate"
import flight from "../airtransport/flight";
export default {
name: "ExitPre",
... ... @@ -870,12 +901,15 @@
func: treeToArray,
total: 1,
isAdmin: false,
alert_type: 'info',
alert_des: '',
addloading: false,
consignerList: [],
dialogNeeVisible: false,
batchChooseFlag: false,
batchChooseSelection: '',
consigneeList: [],
carrierAndFlight: '',
consignerQuery: {
companyName: '',
total: 0,
... ... @@ -996,6 +1030,7 @@
awba: [{required: true, trigger: 'blur', validator: validatorAwb}],
awbh: [{required: true, trigger: 'blur', validator: validatorAwbh}],
'awbinfo.paymodel': [{required: true, message: '付款方式必选', trigger: 'change'}],
'awbinfo.awbtype': [{required: true, message: '货物类型必须', trigger: 'change'}],
goodsname: [{required: true, trigger: 'blur', validator: validAlphabetsSpanceKey}],
ex5: [{required: true, message: '货物描述不能为空', trigger: 'blur'}],
'awbinfo.sairportid': [{required: true, message: '起始航站不能为空', trigger: 'change'}],
... ... @@ -1074,7 +1109,10 @@
eairportid: undefined,
csgcustomerid: undefined,
paymodel: 'PP',
awbtype: undefined
awbtype: undefined,
dest4:undefined,
dest4city:undefined
},
user: {
username: loginedUserInfo().username
... ... @@ -1116,13 +1154,29 @@
})
}, 1000)
},
created() {
// deactivated(){
// this.preQuery= {
// pageSize: 1,
// limitSize: 30,
// awba: '',
// carrier: '',
// flightno: '',
// flightdate: '',
// originstation: '',
// destinationstation: '',
// userId:loginedUserInfo().userId,
// customCode:'',
// enterpriseId:loginedUserInfo().companyId,
// messageType: ''
// }
// console.log("distroyed")
// },
activated() {
if (this.$route.params.flightData !== undefined) {
this.preQuery.carrier = this.$route.params.flightData.flightno.substring(0, 2)
this.preQuery.flightno = this.$route.params.flightData.flightno.substring(2)
this.carrierAndFlight = this.$route.params.flightData.flightno;
this.preQuery.flightdate = this.$route.params.flightData.flightdate
this.preQuery.originstation = this.$route.params.flightData.originstation
this.preQuery.destinationstation = this.$route.params.flightData.destinationstation
if (this.$route.params.flightData.awba !== undefined && this.$route.params.flightData.awba !== '') {
this.preQuery.awba = this.$route.params.flightData.awba.substring(0, 3) + "-" + this.$route.params.flightData.awba.substring(3)
}
... ... @@ -1341,37 +1395,56 @@
this.preModel.awbinfo.dest3 = val.toUpperCase().trim()
}
},
flightComNo: {
get: function () {
return this.carrierAndFlight;
},
set: function (val) {
val = val.toUpperCase();
if (util.checkNull(val) && val.length>=2){
this.preQuery.carrier= val.substring(0,2);
this.preQuery.flightno = val.substring(2)
}else {
this.preQuery.carrier= ''
this.preQuery.flightno = ''
}
this.carrierAndFlight = val
}
}
},
methods: {
// >>>>>>>>>>>>>>>>获取list集合<<<<<<<<<<<<<<<<<<
getList() {
// console.log("11111"+JSON.stringify(this.preQuery));
this.listLoading = true
if (this.preQuery.awba !== undefined && this.preQuery.awba !== '') {
getMt2201ListForParam(this.preQuery).then(res => {
this.preData = res.data.data.list
this.total = res.data.data.total
if (res.data.data.list.length > 0) {
this.preQuery.carrier = this.preData[0].carrier
this.preQuery.flightno = this.preData[0].flightno
this.preQuery.flightdate = this.preData[0].flightdate
this.preQuery.originstation = this.preData[0].originstation
this.preQuery.destinationstation = this.preData[0].destinationstation
this.preQuery.customcode = this.preData[0].customcode
}
setTimeout(() => {
this.listLoading = false
}, 1500)
})
} else {
// if (this.preQuery.awba !== undefined && this.preQuery.awba !== '') {
// console.log("22222"+JSON.stringify(this.preQuery));
// getMt2201ListForParam(this.preQuery).then(res => {
// this.preData = res.data.data.list
// this.total = res.data.data.total
// if (res.data.data.list.length > 0) {
// this.preQuery.carrier = this.preData[0].carrier
// this.preQuery.flightno = this.preData[0].flightno
// this.preQuery.flightdate = this.preData[0].flightdate
// this.preQuery.originstation = this.preData[0].originstation
// this.preQuery.destinationstation = this.preData[0].destinationstation
// this.preQuery.customcode = this.preData[0].customcode
// }
// setTimeout(() => {
// this.listLoading = false
// }, 1500)
// })
// } else {
// console.log("33333"+JSON.stringify(this.preQuery));
getMt2201ListForParam(this.preQuery).then(res => {
this.preData = res.data.data.list
this.total = res.data.data.total
setTimeout(() => {
this.listLoading = false
}, 1500)
})
}
// }
},
// >>>>>>>>>>>>>>>>重置实体<<<<<<<<<<<<<<<<<<
restModel() {
... ... @@ -1436,6 +1509,8 @@
username : JSON.parse(sessionStorage.getItem('user')).username
}
}
this.alert_des = ''
this.alert_type = 'info'
},
// >>>>>>>>>>>>>>>>新增主单<<<<<<<<<<<<<<<<<<
handleAddpreInfo() {
... ... @@ -1456,8 +1531,6 @@
this.preModel.flightno = this.preQuery.carrier+this.preQuery.flightno
}
this.preModel.flightdate = this.preQuery.flightdate
this.preModel.originstation = this.preQuery.originstation
this.preModel.destinationstation = this.preQuery.destinationstation
this.preModel.customcode = this.preQuery.customcode
this.dialogStatus = 'create'
this.dialogFormVisible = true
... ... @@ -1551,7 +1624,6 @@
},
// 收货人信息赋值
consigneeClick(val){
console.log(val);
this.preModel.awbinfo.cnsnname=val.conName;
this.preModel.awbinfo.cnsnaddress=val.conAddress;
this.preModel.awbinfo.ecityid=val.conCity;
... ... @@ -1562,10 +1634,8 @@
},
// >>>>>>>>>>>>>>>>搜索<<<<<<<<<<<<<<<<<<
handleSerach() {
this.preQuery.flightno = undefined
this.preQuery.carrier = undefined
this.preQuery.originstation = undefined
this.preQuery.flightdate = undefined
// this.preQuery.flightdate = undefined
this.preQuery.destinationstation = undefined
this.getList()
},
... ... @@ -1658,7 +1728,7 @@
delete this.preModel.parent
delete this.preModel.children
_this.preModel.user= {
username : JSON.parse(sessionStorage.getItem('user')).username
username : loginedUserInfo().username
}
updateMT2201(_this.preModel).then(res => {
... ... @@ -1994,19 +2064,26 @@
// 远程查询运输工具申报是否成功
transportQuery(){
if (this.preModel.flightno !== undefined && this.preModel.flightno !== ''
&& this.preModel.flightdate !== undefined && this.preModel.flightdate !== ''){
let _this = this
if (this.preModel.flightno != undefined && this.preModel.flightno != ''
&& this.preModel.flightdate != undefined && this.preModel.flightdate != ''){
const params = {
flightNo: this.preModel.flightno,
flightDate: this.preModel.flightdate
}
selectPredictionInterface(params).then(res =>{
if(res.data.data != undefined && res.data.data != ""){
const span = document.getElementById("message");
span.innerHTML = res.data.data[0].statusMsg;
let ysgj_data = res.data.data[0]
let ysgj_status = ysgj_data.status
if (ysgj_status === '02'){
_this.alert_type = 'success'
}else{
_this.alert_type = 'warning'
}
_this.alert_des = ysgj_data.statusMsg
}else {
const span = document.getElementById("message");
span.innerHTML = ""
_this.alert_des = "此航班的运输工具申报未做预报动态申报."
_this.alert_type = 'error'
}
})
}
... ...
... ... @@ -38,9 +38,9 @@
</div>
</el-col>
<div class="grid-content el-btn">
<el-button type="primary" size="mini" @click="handleSerach">查询</el-button>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleSerach">查&emsp;&emsp;询</el-button>
<el-button v-if="tidyQuery.flightno === undefined && tidyData.length <1"
type="primary" size="mini"
type="success" size="mini" icon="el-icon-plus"
@click="handleAddTidy">新增理货
</el-button>
</div>
... ... @@ -68,16 +68,6 @@
<a type="text" style="color: #409eff;text-decoration: underline" class="tableInline" @click="handleEdit(scope.row)" v-else>{{scope.row.awba}}</a>
</template>
</el-table-column>
<!-- <el-table-column label="分单号" width="120" align="center">-->
<!-- <template slot-scope="scope">-->
<!-- <span>{{scope.row.awbh}}</span>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column label="运单件数/重量" width="100" align="center">-->
<!-- <template slot-scope="scope">-->
<!-- <span>{{scope.row.awbpiece}} / {{scope.row.awbweight}}</span>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column label="理货件数" width="100" align="center">
<template slot-scope="scope">
<span>{{scope.row.piece}}</span>
... ... @@ -98,7 +88,7 @@
<span>{{scope.row.endtime}}</span>
</template>
</el-table-column>
<el-table-column label="状态" width="100" align="center">
<el-table-column label="状态" width="200" align="center">
<template slot-scope="scope">
<span v-if="scope.row.status ==='01'">接受申报</span>
<span v-if="scope.row.status ==='02'">待人工审核</span>
... ... @@ -122,36 +112,49 @@
<span v-if="scope.row.status ==='25'">已发送修改报</span>
</template>
</el-table-column>
<el-table-column label="回执信息" show-overflow-tooltip width="230" align="center">
<el-table-column label="回执信息" show-overflow-tooltip width="300" align="center" show-overflow-tooltip>
<template slot-scope="scope">
<span>{{scope.row.ext5}}</span>
<el-tag v-if="scope.row.status=='01' || scope.row.status=='11'" type="success">
{{scope.row.ext5}}
</el-tag>
<el-tag v-else-if="scope.row.status=='02' || scope.row.status=='03'" type="warning">
{{scope.row.ext5}}
</el-tag>
<el-tag v-else-if="scope.row.status=='12' || scope.row.status=='13'" type="danger">
{{scope.row.ext5}}
</el-tag>
<el-tag v-else>
{{scope.row.ext5}}
</el-tag>
</template>
</el-table-column>
<el-table-column prop="operation" label="操作" width="420px" align="center">
<el-table-column prop="operation" label="操作" width="400px" align="center">
<template slot-scope="scope">
<el-button size="mini" @click="handleSend(scope.row)">收发明细</el-button>
<!-- <el-button size="mini" type="success" @click="handleEdit(scope.row)">编辑</el-button>-->
<el-button size="mini" type="primary" @click="handleAwbSend(scope.row)"
:disabled="addStatus(scope.row.status)">发送出港理货报</el-button>
<el-button size="mini" type="danger" v-if="isAdmin" @click="handleAwbDelete(scope.row)">删除运单</el-button>
<p></p>
<el-button size="mini" type="warning" @click="handleAwbStatus(scope.row)"
:disabled="scope.row.status ==='22'">更改状态</el-button>
<el-button size="mini" type="primary" v-if="scope.row.awbh ===''"
<el-row type="flex" justify="space-between">
<el-button size="mini" icon="el-icon-view" @click="handleSend(scope.row)">收发明细</el-button>
<el-button size="mini" type="success" icon="el-icon-plus" v-if="scope.row.awbh ===''"
@click="handleAddAwbh(scope.row)">新增分单</el-button>
<el-button size="mini" type="danger" @click="handleSendDelete(scope.row)"
:disabled="deleteStatus(scope.row.status)">发出港理货删除报</el-button>
<el-button size="mini" type="danger" icon="el-icon-delete" v-if="isAdmin" @click="handleAwbDelete(scope.row)">删除运单</el-button>
</el-row>
<el-row type="flex" justify="space-between">
<el-button size="mini" icon="el-icon-plus" type="primary" @click="handleAwbSend(scope.row)"
:disabled="addStatus(scope.row.status)">理货申报</el-button>
<el-button size="mini" type="warning" icon="el-icon-edit" @click="handleAwbStatus(scope.row)"
:disabled="scope.row.status ==='22'">更改状态</el-button>
<el-button size="mini" type="danger" icon="el-icon-delete" @click="handleSendDelete(scope.row)"
:disabled="deleteStatus(scope.row.status)">删除申报</el-button>
</el-row>
</template>
</el-table-column>
</el-table>
<div class="btnFoot">
<el-row>
<el-button type="primary" size="mini" v-if="tidyQuery.flightno !== undefined || tidyData.length> 0"
@click="handelAddTidyInfo">新增出港理货
<el-button type="success" icon="el-icon-plus" size="mini" v-if="tidyQuery.flightno !== undefined || tidyData.length> 0"
@click="handelAddTidyInfo">新增理货
</el-button>
<el-button type="primary" size="mini" v-if="tidyQuery.flightno !== undefined || tidyData.length> 0"
@click="handelBackStep">返回
<el-button type="primary" icon="el-icon-back" size="mini" v-if="tidyQuery.flightno !== undefined || tidyData.length> 0"
@click="handelBackStep">返&emsp;&emsp;回
</el-button>
</el-row>
</div>
... ... @@ -179,11 +182,11 @@
</el-col>
</el-row>
<el-row>
<el-col :span="7.5">
<el-form-item label="承运人" prop="carrier">
<el-input v-model="carrier" :disabled="dialogStatus === 'update'"></el-input>
</el-form-item>
</el-col>
<!-- <el-col :span="7.5">-->
<!-- <el-form-item label="承运人" prop="carrier">-->
<!-- <el-input v-model="carrier" :disabled="dialogStatus === 'update'"></el-input>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<el-col :span="7.5">
<el-form-item label="航班号" prop="flightno">
<el-input v-model="flightno" :disabled="dialogStatus === 'update'"></el-input>
... ... @@ -253,12 +256,12 @@
</el-row>
<el-row>
<el-col :span="7.5">
<el-form-item label="装载件数" prop="piece">
<el-form-item label="理货件数" prop="piece">
<el-input v-model="tidyModel.piece"></el-input>
</el-form-item>
</el-col>
<el-col :span="7.5">
<el-form-item label="装载重量" prop="weight">
<el-form-item label="理货重量" prop="weight">
<el-input v-model="tidyModel.weight"></el-input>
</el-form-item>
</el-col>
... ... @@ -447,6 +450,7 @@
goodsname: [{required: true, message: "货物描述不能为空"},{ trigger: 'blur', validator: validAlphabetsSpanceKey}],
carrier: [{required: true, message:"承运人不能为空"},{trigger: 'blur', validator: validatorAwbh}],
flightno: [{required: true, message:"航班号不能为空"}, { trigger: 'blur', validator: validatorAwbh}],
flightdate: [{required: true, trigger:'blur', message:"请选择航班日期"}],
originstation: [{required: true, message:"起始站不能为空"}, {trigger: 'blur', validator: validatorAlphabets}],
destinationstation: [{required: true, message:"目的站不能为空"}, { trigger: 'blur', validator: validatorAlphabets}],
weight: [{required: true, message:"重量不能为空"}, { trigger: 'change', validator: validatorNums}],
... ... @@ -484,7 +488,7 @@
awbweight: undefined,
rcfdep: 'MT5202',
userinfo: {
username : JSON.parse(sessionStorage.getItem('user')).username
username : loginedUserInfo().username
}
},
respModel : {
... ... @@ -520,7 +524,7 @@
rows:{},
}
},
created() {
activated() {
if (this.$route.params.flightData !== undefined) {
this.tidyQuery.carrier = this.$route.params.flightData.flightno.substring(0, 2)
this.tidyQuery.flightno = this.$route.params.flightData.flightno.substring(2)
... ... @@ -531,8 +535,15 @@
this.tidyQuery.awba = this.$route.params.flightData.awba.substring(0, 3) + "-" + this.$route.params.flightData.awba.substring(3)
}
this.getList()
}else {
this.tidyQuery = {
pageSize: 1,
limitSize: 10,
awba: undefined,
rcfdep: "MT5202"
}
}
let username = JSON.parse(sessionStorage.getItem('user')).username
let username = loginedUserInfo().username
if(username === 'admin'){
this.isAdmin = true
}
... ... @@ -677,7 +688,7 @@
cancelButtonText: '取消'
}).then(() => {
row.userinfo = {
username : JSON.parse(sessionStorage.getItem('user')).username
username : loginedUserInfo().username
}
sendCreateMt5202(row).then(res => {
if (res.data.count > 0) {
... ... @@ -708,10 +719,9 @@
// 清空from列表
this.restModel();
this.tidyModel.carrier = row.carrier
this.tidyModel.awba = row.awba
this.tidyModel.flightdate = row.flightdate
this.tidyModel.flightno = row.flightno
this.tidyModel.flightno = row.carrier + row.flightno
this.tidyModel.originstation = row.originstation
this.tidyModel.destinationstation = row.destinationstation
this.tidyModel.customcode = row.customcode
... ... @@ -739,7 +749,7 @@
flightDate: undefined,
awbh: undefined,
rcfdep: 'MT5202',
username: JSON.parse(sessionStorage.getItem('user')).username,
username: loginedUserInfo().username
}
this.dialogDeleteVisible = true
this.respModel.carrier = row.carrier
... ... @@ -861,7 +871,7 @@
awbweight: undefined,
rcfdep: 'MT5202',
userinfo: {
username: JSON.parse(sessionStorage.getItem('user')).username
username: loginedUserInfo().username
}
}
},
... ... @@ -870,9 +880,10 @@
this.fenStatus=undefined;
this.restModel()
// 给model赋值,所使用数据是以单独单号查询数据所得
this.tidyModel.carrier = this.tidyQuery.carrier
this.tidyModel.flightdate = this.tidyQuery.flightdate
this.tidyModel.flightno = this.tidyQuery.flightno
if (this.tidyQuery.carrier != undefined){
this.tidyModel.flightno = this.tidyQuery.carrier+this.tidyQuery.flightno
}
this.tidyModel.originstation = this.tidyQuery.originstation
this.tidyModel.destinationstation = this.tidyQuery.destinationstation
this.tidyModel.customcode = this.tidyQuery.customcode
... ... @@ -886,6 +897,8 @@
createData() {
this.$refs.tidyFormData.validate(valid => {
if (valid) {
this.tidyModel.carrier = this.tidyModel.flightno.substring(0,2);
this.tidyModel.flightno = this.tidyModel.flightno.substring(2);
addMt520X(this.tidyModel).then(res => {
if (res.data.code == "200") {
Message.success(res.data.msg);
... ... @@ -906,6 +919,7 @@
this.fenStatus=undefined
}
this.tidyModel = Object.assign({}, row)
this.tidyModel.flightno = row.carrier+row.flightno
this.dialogStatus = 'update'
this.dialogFormVisible = true
this.$nextTick(() => {
... ... @@ -921,12 +935,13 @@
delete this.tidyModel.children
_this.tidyModel.user= {
username : JSON.parse(sessionStorage.getItem('user')).username
username : loginedUserInfo().username
}
this.tidyModel.userinfo = {
username : loginUserInfo().username
username : loginedUserInfo().username
}
this.tidyModel.carrier = this.tidyModel.flightno.substring(0,2);
this.tidyModel.flightno = this.tidyModel.flightno.substring(2);
updateMt520X(this.tidyModel).then(res => {
console.log(res.data)
if (res.data.count > 0) {
... ...
... ... @@ -8,44 +8,36 @@
<el-row style="display: block;background-color: white;padding-left: 5px">
<el-row>
<el-col :span="6">
<span>
主单号
</span>
<el-input placeholder="" v-model="defaultQuery.awba" style="width: 150px">
<el-input placeholder="" v-model="defaultQuery.awba" style="width: 200px">
<template slot="prepend">主单号</template>
</el-input>
</el-col>
<el-col :span="6">
<span>
承运人
</span>
<el-input placeholder="" v-model="defaultQuery.carrier" style="width: 150px">
<el-input placeholder="" v-model="defaultQuery.carrier" style="width: 200px">
<template slot="prepend">承运人</template>
</el-input>
</el-col>
<el-col :span="6">
<span>
航班号
</span>
<el-input placeholder="" v-model="defaultQuery.flightno" style="width: 150px">
<el-input placeholder="" v-model="defaultQuery.flightno" style="width: 200px">
<template slot="prepend">航班号</template>
</el-input>
</el-col>
<el-col :span="6">
<span>
航班日期
</span>
<div class="ip">
航班日期 </div>
<el-date-picker
v-model="defaultQuery.flightdate"
value-format="yyyy-MM-dd"
type="date" style="width: 150px"
type="date" style="width: 130px"
placeholder="航班日期">
</el-date-picker>
</el-col>
</el-row>
<el-row>
<el-col :span="6">
<span>
业务状态
</span>
<el-select v-model="defaultQuery.status" placeholder="选择状态" style="width: 150px">
<div class="ip">
业务状态 </div>
<el-select v-model="defaultQuery.status" placeholder="选择状态" style="width: 120px">
<el-option
v-for="item in options"
:key="item.value"
... ... @@ -55,10 +47,9 @@
</el-select>
</el-col>
<el-col :span="6">
<span>
报文类型
</span>
<el-select v-model="defaultQuery.turntype" placeholder="报文类型" style="width: 150px">
<div class="ip">
报文类型 </div>
<el-select v-model="defaultQuery.turntype" placeholder="报文类型" style="width: 120px">
<el-option
v-for="item in options2"
:key="item.value"
... ... @@ -84,7 +75,8 @@
ref="multipleTable"
:data="tableData"
tooltip-effect="dark"
style="width: 100%">
style="border-radius: 10px 10px 0px 0px;line-height: 25px;min-height: 500px"
:header-cell-style="{background:'#6F8294',color:'#FFFFFF'}" size="small">
<el-table-column
fixed="left"
label="修改状态"
... ... @@ -143,7 +135,16 @@
label="回执内容"
width="250">
<template slot-scope="scope">
<span v-if="scope.row.status=='01' || scope.row.status=='11'" style="color: #67C23A">
<span v-if="scope.row.ext5 && scope.row.ext5.indexOf('异常') != -1" style="color: #F56C6C">
{{scope.row.ext5}}
</span>
<span v-else-if="scope.row.ext5 && scope.row.ext5.indexOf('不通过') != -1" style="color: #F56C6C">
{{scope.row.ext5}}
</span>
<span v-else-if="scope.row.ext5 && scope.row.ext5.indexOf('不接受') != -1" style="color: #F56C6C">
{{scope.row.ext5}}
</span>
<span v-else-if="scope.row.status=='01' || scope.row.status=='11'" style="color: #67C23A">
{{scope.row.ext5}}
</span>
<span v-else-if="scope.row.status=='02' || scope.row.status=='03'" style="color: #E6A23C">
... ... @@ -158,9 +159,9 @@
</template>
</el-table-column>
<el-table-column
label="修改状态"
width="480">
label="修改状态" prop="operation" fixed="right" align="center" width="285">
<template slot-scope="scope">
<el-row type="flex" justify="space-between">
<el-button
v-if="scope.row.turntype=='MT6202'"
size="mini"
... ... @@ -177,14 +178,16 @@
v-if="scope.row.turntype=='MT6202'"
size="mini"
type="success"
@click="importEdit(scope.$index, scope.row)">编辑
@click="importEdit(scope.$index, scope.row)">编辑信息
</el-button>
<el-button
v-else
size="mini"
type="success"
@click="arriveEdit(scope.$index, scope.row)">编辑
@click="arriveEdit(scope.$index, scope.row)">编辑信息
</el-button>
</el-row>
<el-row type="flex" justify="space-between">
<el-button
v-if="scope.row.turntype=='MT6202'"
size="mini"
... ... @@ -209,15 +212,16 @@
size="mini"
type="danger"
:disabled="btDeleStatusFormater(scope.row.status)"
@click="importDel(scope.$index, scope.row)">申请分拨删除
@click="importDel(scope.$index, scope.row)">申请删除
</el-button>
<el-button
v-else
size="mini"
type="danger"
:disabled="btDeleStatusFormater(scope.row.status)"
@click="arriveDel(scope.$index, scope.row)">分拨运抵删除
@click="arriveDel(scope.$index, scope.row)">申请删除
</el-button>
</el-row>
</template>
</el-table-column>
</el-table>
... ... @@ -251,9 +255,11 @@
</el-col>
</el-row>
<el-row>
<el-col :span="5">
<el-form-item label="运单号" prop="awba">
<el-input disabled="" v-model="AruleForm.awba"></el-input>
<el-col :span="6">
<el-form-item label="" prop="awba">
<el-input disabled="" v-model="AruleForm.awba" style="width: 200px">
<template slot="prepend">运单号</template>
</el-input>
</el-form-item>
</el-col>
<el-col :span="15">
... ... @@ -268,28 +274,33 @@
</el-row>
<el-row>
<el-col :span="5">
<el-form-item label="承运人" prop="carrier">
<el-input disabled="" v-model="AruleForm.carrier"></el-input>
<el-form-item label="" prop="carrier">
<el-input disabled="" v-model="AruleForm.carrier" style="width: 200px">
<template slot="prepend">承运人</template>
</el-input>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="航班号" prop="flightno">
<el-input disabled="" v-model="AruleForm.flightno"></el-input>
<el-form-item label="" prop="flightno">
<el-input disabled="" v-model="AruleForm.flightno" style="width: 200px">
<template slot="prepend">航班号</template>
</el-input>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="航班日期" required>
<el-col :span="24">
<el-col :span="7">
<el-form-item label="" required>
<el-form-item prop="flightdate">
<el-date-picker disabled="" type="date" placeholder="选择日期" v-model="AruleForm.flightdate" style="width: 100%;"></el-date-picker>
<div class="ipt">
航班日期 </div>
<el-date-picker disabled="" type="date" placeholder="选择日期" v-model="AruleForm.flightdate" style="width: 130px;"></el-date-picker>
</el-form-item>
</el-col>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="海关关区" prop="customcode">
<el-col :span="24">
<el-select v-model="AruleForm.customcode" placeholder="请选择海关关区" style="width:100%">
<el-col :span="7">
<el-form-item label="" prop="customcode">
<div class="ipt">
海关关区 </div>
<el-select v-model="AruleForm.customcode" placeholder="请选择海关关区" style="width:120px">
<div v-if="dialogStatus === 'update'">
<el-option v-for="item in options3" :key="item.value" :label="item.label"
:value="item.value" ></el-option>
... ... @@ -299,48 +310,63 @@
:value="item.value" ></el-option>
</div>
</el-select>
</el-col>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="5">
<el-form-item label="运抵件数" prop="turnpiece">
<el-form-item label="" prop="turnpiece">
<div v-if="dialogStatus === 'update'">
<el-input type="number" v-model="AruleForm.turnpiece"></el-input>
<el-input type="number" v-model="AruleForm.turnpiece" style="width: 200px">
<template slot="prepend">运抵件数</template>
</el-input>
</div>
<div v-else>
<el-input type="number" disabled="" v-model="AruleForm.turnpiece"></el-input>
<el-input type="number" disabled="" v-model="AruleForm.turnpiece" style="width: 200px">
<template slot="prepend">运抵件数</template>
</el-input>
</div>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="运抵重量" prop="turnweight">
<el-form-item label="" prop="turnweight">
<div v-if="dialogStatus === 'update'">
<el-input type="number" v-model="AruleForm.turnweight"></el-input>
<el-input type="number" v-model="AruleForm.turnweight" style="width: 200px">
<template slot="prepend">运抵重量</template>
</el-input>
</div>
<div v-else>
<el-input type="number" disabled="" v-model="AruleForm.turnweight"></el-input>
<el-input type="number" disabled="" v-model="AruleForm.turnweight" style="width: 200px">
<template slot="prepend">运抵重量</template>
</el-input>
</div>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="卸货地" prop="turnunloading">
<el-col :span="7">
<el-form-item label="" prop="turnunloading">
<div v-if="dialogStatus === 'update'">
<el-input v-model="AruleForm.turnunloading"></el-input>
<el-input v-model="AruleForm.turnunloading" style="width: 215px">
<template slot="prepend">卸货地</template>
</el-input>
</div>
<div v-else>
<el-input disabled="" v-model="AruleForm.turnunloading"></el-input>
<el-input disabled="" v-model="AruleForm.turnunloading" style="width: 215px">
<template slot="prepend">卸货地</template>
</el-input>
</div>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="货物描述" prop="turnunloading">
<el-form-item label="" prop="turnunloading">
<div v-if="dialogStatus === 'update'">
<el-input v-model="AruleForm.goodsname"></el-input>
<el-input v-model="AruleForm.goodsname" style="width: 200px">
<template slot="prepend">货物描述</template>
</el-input>
</div>
<div v-else>
<el-input disabled="" v-model="AruleForm.goodsname"></el-input>
<el-input disabled="" v-model="AruleForm.goodsname" style="width: 200px">
<template slot="prepend">货物描述</template>
</el-input>
</div>
</el-form-item>
</el-col>
... ... @@ -360,8 +386,10 @@
</el-row>
<el-row>
<el-col :span="5">
<el-form-item label="运单号" prop="awba">
<el-input disabled="" v-model="IruleForm.awba"></el-input>
<el-form-item label="" prop="awba">
<el-input disabled="" v-model="IruleForm.awba" style="width: 200px">
<template slot="prepend">运单号</template>
</el-input>
</el-form-item>
</el-col>
<el-col :span="15">
... ... @@ -376,28 +404,33 @@
</el-row>
<el-row>
<el-col :span="5">
<el-form-item label="承运人" prop="carrier">
<el-input disabled="" v-model="IruleForm.carrier"></el-input>
<el-form-item label="" prop="carrier">
<el-input disabled="" v-model="IruleForm.carrier" style="width: 200px">
<template slot="prepend">运承运人单号</template>
</el-input>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="航班号" prop="flightno">
<el-input disabled="" v-model="IruleForm.flightno"></el-input>
<el-form-item label="" prop="flightno">
<el-input disabled="" v-model="IruleForm.flightno" style="width: 200px">
<template slot="prepend">航班号</template>
</el-input>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="航班日期" required>
<el-col :span="24">
<el-col :span="7">
<el-form-item label="" required>
<el-form-item prop="flightdate">
<el-date-picker disabled="" type="date" placeholder="选择日期" v-model="IruleForm.flightdate" style="width: 100%;"></el-date-picker>
<div class="ipt">
航班日期 </div>
<el-date-picker disabled="" type="date" placeholder="选择日期" v-model="IruleForm.flightdate" style="width: 130px;"></el-date-picker>
</el-form-item>
</el-col>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="海关关区" prop="customcode">
<el-col :span="24">
<el-select v-model="IruleForm.customcode" placeholder="请选择海关关区" style="width:100%">
<el-col :span="7">
<el-form-item label="" prop="customcode">
<div class="ipt">
海关关区 </div>
<el-select v-model="IruleForm.customcode" placeholder="请选择海关关区" style="width:120px">
<div v-if="dialogStatus === 'update'">
<el-option v-for="item in options3" :key="item.value" :label="item.label"
:value="item.value" ></el-option>
... ... @@ -407,68 +440,94 @@
:value="item.value" ></el-option>
</div>
</el-select>
</el-col>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="5">
<el-form-item label="运抵件数" prop="turnpiece">
<el-form-item label="" prop="turnpiece">
<div v-if="dialogStatus === 'update'">
<el-input v-model="IruleForm.turnpiece"></el-input>
<el-input v-model="IruleForm.turnpiece" style="width: 200px">
<template slot="prepend">运抵件数</template>
</el-input>
</div>
<div v-else>
<el-input disabled="" v-model="IruleForm.turnpiece"></el-input>
<el-input disabled="" v-model="IruleForm.turnpiece" style="width: 200px">
<template slot="prepend">运抵件数</template>
</el-input>
</div>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="运抵重量" prop="turnweight">
<el-form-item label="" prop="turnweight">
<div v-if="dialogStatus === 'update'">
<el-input v-model="IruleForm.turnweight"></el-input>
<el-input v-model="IruleForm.turnweight" style="width: 200px">
<template slot="prepend">运抵重量</template>
</el-input>
</div>
<div v-else>
<el-input disabled="" v-model="IruleForm.turnweight"></el-input>
<el-input disabled="" v-model="IruleForm.turnweight" style="width: 200px">
<template slot="prepend">运抵重量</template>
</el-input>
</div>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="到达地" prop="turnunloading">
<el-col :span="7">
<el-form-item label="" prop="turnunloading">
<div v-if="dialogStatus === 'update'">
<el-input v-model="IruleForm.turnunloading"></el-input>
<el-input v-model="IruleForm.turnunloading" style="width: 200px">
<template slot="prepend">到达地</template>
</el-input>
</div>
<div v-else>
<el-input disabled="" v-model="IruleForm.turnunloading"></el-input>
<el-input disabled="" v-model="IruleForm.turnunloading" style="width: 200px">
<template slot="prepend">到达地</template>
</el-input>
</div>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="拖车号" prop="pno">
<el-form-item label="" prop="pno">
<div v-if="dialogStatus === 'update'">
<el-input v-model="IruleForm.pno"></el-input>
<el-input v-model="IruleForm.pno" style="width: 200px">
<template slot="prepend">拖车号</template>
</el-input>
</div>
<div v-else>
<el-input disabled="" v-model="IruleForm.pno"></el-input>
<el-input disabled="" v-model="IruleForm.pno" style="width: 200px">
<template slot="prepend">拖车号</template>
</el-input>
</div>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="5">
<el-form-item label="卸货地" prop="ext2">
<el-form-item label="" prop="ext2">
<div v-if="dialogStatus === 'update'">
<el-input v-model="IruleForm.ext2"></el-input>
<el-input v-model="IruleForm.ext2" style="width: 200px">
<template slot="prepend">卸货地</template>
</el-input>
</div>
<div v-else>
<el-input disabled="" v-model="IruleForm.ext2"></el-input>
<el-input disabled="" v-model="IruleForm.ext2" style="width: 200px">
<template slot="prepend">卸货地</template>
</el-input>
</div>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="车辆所属" prop="ext1">
<el-form-item label="" prop="ext1">
<div v-if="dialogStatus === 'update'">
<el-input v-model="IruleForm.ext1"></el-input>
<el-input v-model="IruleForm.ext1" style="width: 200px">
<template slot="prepend">车辆所属</template>
</el-input>
</div>
<div v-else>
<el-input disabled="" v-model="IruleForm.ext1"></el-input>
<el-input disabled="" v-model="IruleForm.ext1" style="width: 200px">
<template slot="prepend">车辆所属</template>
</el-input>
</div>
</el-form-item>
</el-col>
... ... @@ -493,17 +552,44 @@
<el-row>
<el-dialog :title="'提交'+Reason[udStatus]+'信息'" :visible.sync="dialogFormVisible">
<el-form :model="Udform" :rules="udrules" ref="Udform" class="demo-ruleForm">
<el-form-item label="操作原因" prop="operreason">
<el-input type="textarea" v-model="Udform.operreason"></el-input>
<!-- <el-form-item label="操作原因" prop="operreason">-->
<!-- <el-input type="textarea" v-model="Udform.operreason"></el-input>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="操作人" prop="operperson">-->
<!-- <el-input v-model="Udform.operperson"></el-input>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="联系电话" prop="opertel">-->
<!-- <el-input v-model="Udform.opertel"></el-input>-->
<!-- </el-form-item>-->
<el-row style="margin: 10px auto">
<el-col :span="22">
<el-form-item label="" prop="operreason">
<div class="ipt">
操作原因
</div>
<el-input autosize type="textarea" v-model="Udform.operreason" style="width: 80%">
</el-input>
</el-form-item>
<el-form-item label="操作人" prop="operperson">
<el-input v-model="Udform.operperson"></el-input>
</el-col>
</el-row>
<el-row>
<el-col :span="11" style="margin-right: 10px">
<el-form-item label="" prop="operperson">
<el-input v-model="Udform.operperson" style="width: 200px">
<template slot="prepend">操作人</template>
</el-input>
</el-form-item>
<el-form-item label="联系电话" prop="opertel">
<el-input v-model="Udform.opertel"></el-input>
</el-col>
<el-col :span="10">
<el-form-item label="" prop="opertel">
<el-input v-model="Udform.opertel" style="width: 250px">
<template slot="prepend">联系电话</template>
</el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<div slot="footer" class="dialog-footer" style="margin-top: 30px" align="center">
<el-button @click="dialogFormVisible = false">取 消</el-button>
<el-button type="primary" @click="deleteIdForm('Udform')">确 定</el-button>
</div>
... ... @@ -512,7 +598,8 @@
<!--明细列表弹出框-->
<el-row>
<el-dialog title="回执明细列表" :visible.sync="dialogTableVisible" width="70%">
<el-table :data="gridData">
<el-table :data="gridData" style="border-radius: 10px 10px 0px 0px;line-height: 25px;min-height: 500px"
:header-cell-style="{background:'#6F8294',color:'#FFFFFF'}" size="small" >
<el-table-column property="busdate" label="时间" width="160"></el-table-column>
<el-table-column property="username" label="操作人" width="130"></el-table-column>
<el-table-column property="buspiece" label="发送件数" width="130"></el-table-column>
... ... @@ -525,6 +612,38 @@
</el-container>
</template>
<style scoped>
.ip{
max-width: 100px;
margin-right: -6px;
display: inline-block;
background-color: #6F8294;
color: #ffffff;
border: 1px solid #DCDFE6;
vertical-align: middle;
padding: 5px 18px;
white-space: nowrap;
border-top-right-radius: 0px;
border-top-left-radius: 4px;
border-bottom-left-radius: 4px;
border-bottom-right-radius: 0px;
font-size: 10px;
}
.ipt{
max-width: 100px;
margin-right: -4px;
display: inline-block;
background-color: #6F8294;
color: #ffffff;
border: 1px solid #DCDFE6;
vertical-align: middle;
padding: 0 18px;
white-space: nowrap;
border-top-right-radius: 0px;
border-top-left-radius: 4px;
border-bottom-left-radius: 4px;
border-bottom-right-radius: 0px;
font-size: 10px;
}
.co{height: 36px;line-height: 36px;}
.co{border-left: 4px #409EFF solid;padding-left: 10px;background-color: #f9fafc;margin-bottom: 2px}
.row-bg{background-color: white;padding:0px;}
... ... @@ -543,6 +662,7 @@
import {mapActions, mapGetters} from 'vuex'
import {loginedUserInfo} from "../../api/user";
export default{
name:'Allocatesearch',
data(){
return{
defaultQuery:{
... ... @@ -802,7 +922,7 @@
const map = {'mt6202':row,'username':loginedUserInfo().username}
sendCreateMt6202(map).then(res=>{
let response=res.data;
//console.log(res);
console.log(res);
this.code=response.code;
if(this.code=='200'){
row.status='23'
... ...
... ... @@ -4,57 +4,97 @@
<el-row class="row-bg">
<el-col :span="24"><div class="grid-content content co">分拨运抵管理</div></el-col>
</el-row>
<el-row class="row-bg">
<el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="10px" class="demo-ruleForm":label-position="labelPosition">
<el-row>
<el-col :span="12">
<el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px" class="demo-ruleForm":label-position="labelPosition">
<el-form-item label="运单号" prop="awba">
<el-input v-model="ruleForm.awba"></el-input>
</el-form-item>
<el-form-item label="承运人" prop="carrier">
<el-input v-model="ruleForm.carrier"></el-input>
<el-col :span="6">
<el-form-item label="" prop="awba">
<el-input v-model="ruleForm.awba" style="width: 200px">
<template slot="prepend">运&nbsp;单&nbsp;号</template>
</el-input>
</el-form-item>
<el-form-item label="航班号" prop="flightno">
<el-input v-model="ruleForm.flightno"></el-input>
</el-form-item>
<el-form-item label="航班日期" required>
<el-col :span="24">
<el-form-item prop="flightdate">
<el-date-picker type="date" placeholder="选择日期" v-model="ruleForm.flightdate" style="width: 100%;"></el-date-picker>
</el-col>
</el-row>
<el-row>
<el-col :span="5">
<el-form-item label="" prop="carrier">
<el-input v-model="ruleForm.carrier" style="width: 160px" onkeyup="this.value=this.value.toUpperCase()">
<template slot="prepend">承&nbsp;运&nbsp;人</template>
</el-input>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="" prop="flightno">
<el-input v-model="ruleForm.flightno" style="width: 160px">
<template slot="prepend">航&nbsp;班&nbsp;号</template>
</el-input>
</el-form-item>
<el-form-item label="运抵件数" prop="turnpiece">
<el-input v-model="ruleForm.turnpiece"></el-input>
</el-col>
<el-col :span="7">
<el-form-item label="" required>
<el-form-item prop="flightdate">
<div class="ip">
航班日期
</div>
<el-date-picker type="date" placeholder="选择日期" v-model="ruleForm.flightdate" style="width: 125px;"></el-date-picker>
</el-form-item>
<el-form-item label="运抵重量" prop="turnweight">
<el-input v-model="ruleForm.turnweight"></el-input>
</el-form-item>
<el-form-item label="海关关区" prop="customcode">
<el-col :span="24">
<el-select v-model="ruleForm.customcode" placeholder="请选择海关关区" style="width:100%">
</el-col>
<el-col :span="7">
<el-form-item label="" prop="customcode">
<div class="ip">
海关关区
</div>
<el-select v-model="ruleForm.customcode" placeholder="请选择海关关区" style="width:125px">
<el-option v-for="item in options2" :key="item.value" :label="item.label"
:value="item.value" ></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="5" style="margin-top: -20px">
<el-form-item label="" prop="turnpiece">
<el-input v-model="ruleForm.turnpiece" style="width: 160px">
<template slot="prepend">运抵件数</template>
</el-input>
</el-form-item>
<el-form-item label="运抵到达" prop="turnunloading">
<el-col :span="24">
<el-select v-model="ruleForm.turnunloading" placeholder="请选择运抵到达地" style="width:100%">
</el-col>
<el-col :span="5" style="margin-top: -20px">
<el-form-item label="" prop="turnweight">
<el-input v-model="ruleForm.turnweight" style="width: 160px">
<template slot="prepend">运抵重量</template>
</el-input>
</el-form-item>
</el-col>
<el-col :span="7" style="margin-top: -20px">
<el-form-item label="" prop="turnunloading">
<div class="ip">
运抵到达
</div>
<el-select v-model="ruleForm.turnunloading" placeholder="请选择运抵到达地" style="width:125px">
<el-option v-for="item in options" :key="item.value" :label="item.label"
:value="item.value" ></el-option>
</el-select>
</el-col>
</el-form-item>
<el-form-item label="货物描述" prop="goodsname">
<el-input v-model="ruleForm.goodsname"></el-input>
</el-col>
<el-col :span="7" style="margin-top: -20px">
<el-form-item label="" prop="goodsname">
<el-input v-model="ruleForm.goodsname" style="width: 200px">
<template slot="prepend">货物描述</template>
</el-input>
</el-form-item>
</el-form>
</el-col>
<el-col :span="12">
</el-row>
<el-row>
<el-col :span="4" :offset="10" style="margin-bottom: 10px">
<el-button type="primary" @click="submitForm('ruleForm')">保存</el-button>
<el-button type="primary" @click="back">返回</el-button>
<el-button @click="back">返回</el-button>
</el-col>
</el-row>
</el-form>
</el-row>
<!--对话提示框-->
<el-row>
<el-dialog
... ... @@ -73,6 +113,22 @@
</el-container>
</template>
<style scoped>
.ip{
max-width: 100px;
margin-right: -5px;
display: inline-block;
background-color: #6F8294;
color: #ffffff;
border: 1px solid #DCDFE6;
vertical-align: middle;
padding: 0 18px;
white-space: nowrap;
border-top-right-radius: 0px;
border-top-left-radius: 4px;
border-bottom-left-radius: 4px;
border-bottom-right-radius: 0px;
font-size: 10px;
}
.co{height: 36px;line-height: 36px;}
.co{border-left: 4px #409EFF solid;padding-left: 10px;background-color: #f9fafc;margin-bottom: 2px}
.row-bg{background-color: white;padding:0px;}
... ... @@ -173,6 +229,10 @@
}
});
},
// 过滤中英文
inputMe(e){
return e.replace(/[^a-zA-Z0-9.-]/g,'').toUpperCase();
},
getDefaultData(){
this.ruleForm=this.$route.params;
},
... ...
... ... @@ -65,7 +65,7 @@
</el-form-item>
</el-col>
</el-row>
<el-row class="row-bg">
<el-row>
<el-col :span="4" :offset="10">
<div class="grid-content">
<el-button type="primary" @click="submitForm('ruleForm')">下一步</el-button>
... ... @@ -87,6 +87,7 @@
<script>
import { selectAirport } from '../../api/mt1201'
import jsutil from "@/common/js/util";
export default {
data() {
return {
... ... @@ -144,7 +145,12 @@
submitForm(formName) {
this.$refs[formName].validate((valid) => {
if (valid) {
this.$router.push({path:'/origmaster',query:{flightno:JSON.stringify(this.ruleForm.flightno),flightdate:JSON.stringify(this.dateConversion(this.ruleForm.flightdate)),originstation:JSON.stringify(this.ruleForm.originstation),destinationstation:JSON.stringify(this.ruleForm.destinationstation),awba:JSON.stringify("")}});
this.$router.push({path:'/origmaster',query:
{flightno:JSON.stringify(this.ruleForm.flightno),
flightdate:JSON.stringify(this.dateConversion(this.ruleForm.flightdate)),
originstation:JSON.stringify(this.ruleForm.originstation),
destinationstation:JSON.stringify(this.ruleForm.destinationstation),
awba:JSON.stringify("")}});
} else {
console.log('error submit!!');
return false;
... ... @@ -159,12 +165,17 @@
},
/*加载默认参数*/
getDefaultData(){
if(this.$route.query!=null){
console.log(this.$route.query)
this.ruleForm.flightno=JSON.parse(this.$route.query.flightno);
this.ruleForm.flightdate=JSON.parse(this.$route.query.flightdate);
this.ruleForm.originstation=JSON.parse(this.$route.query.originstation);
this.ruleForm.destinationstation=JSON.parse(this.$route.query.destinationstation);
if(
jsutil.checkNull(this.$route.query)
&& jsutil.checkNull(this.$route.query.flightno)
&& jsutil.checkNull(this.$route.query.flightdate)
&& jsutil.checkNull(this.$route.query.originstation)
&& jsutil.checkNull(this.$route.query.destinationstation)
){
this.ruleForm.flightno=(this.$route.query.flightno);
this.ruleForm.flightdate=(this.$route.query.flightdate);
this.ruleForm.originstation=(this.$route.query.originstation);
this.ruleForm.destinationstation=(this.$route.query.destinationstation);
}
}
},
... ...
... ... @@ -72,7 +72,7 @@
</el-form-item>
</el-col>
</el-row>
<el-row class="row-bg">
<el-row>
<el-col :span="4" :offset="10">
<div class="grid-content">
<el-button type="primary" @click="submitForm('ruleForm')">下一步</el-button>
... ... @@ -94,6 +94,8 @@
<script>
import { selectAirport } from '../../api/mt1201'
import jsutil from "@/common/js/util";
export default {
data() {
return {
... ... @@ -174,7 +176,12 @@
submitForm(formName) {
this.$refs[formName].validate((valid) => {
if (valid) {
this.$router.push({path:'/tallymaster',query:{flightno:JSON.stringify(this.ruleForm.flightno),flightdate:JSON.stringify(this.dateConversion(this.ruleForm.flightdate)),originstation:JSON.stringify(this.ruleForm.originstation),destinationstation:JSON.stringify(this.ruleForm.destinationstation),awba:JSON.stringify("")}})
this.$router.push({path:'/tallymaster',query:
{flightno:JSON.stringify(this.ruleForm.flightno),
flightdate:JSON.stringify(this.dateConversion(this.ruleForm.flightdate)),
originstation:JSON.stringify(this.ruleForm.originstation),
destinationstation:JSON.stringify(this.ruleForm.destinationstation),
awba:JSON.stringify("")}});
} else {
//console.log('error submit!!');
return false;
... ... @@ -189,11 +196,18 @@
},
/*获取默认值方法*/
getDefaultData(){
if(this.$route.query!=null){
this.ruleForm.flightno=JSON.parse(this.$route.query.flightno);
this.ruleForm.flightdate=JSON.parse(this.$route.query.flightdate);
this.ruleForm.originstation=JSON.parse(this.$route.query.originstation);
this.ruleForm.destinationstation=JSON.parse(this.$route.query.destinationstation);
if(
jsutil.checkNull(this.$route.query)
&& jsutil.checkNull(this.$route.query.flightno)
&& jsutil.checkNull(this.$route.query.flightdate)
&& jsutil.checkNull(this.$route.query.originstation)
&& jsutil.checkNull(this.$route.query.destinationstation)
)
{
this.ruleForm.flightno=(this.$route.query.flightno);
this.ruleForm.flightdate=(this.$route.query.flightdate);
this.ruleForm.originstation=(this.$route.query.originstation);
this.ruleForm.destinationstation=(this.$route.query.destinationstation);
}
}
},
... ...
<template>
<el-container>
<el-main>
<el-row class="row-bg">
<el-col :span="24"><div class="grid-content content co">分拨运单管理</div></el-col>
<el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="30px" class="demo-ruleForm":label-position="labelPosition">
<el-row class="row-bg">
<el-col :span="24"><div class="grid-content content co">分拨运抵管理</div></el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px" class="demo-ruleForm":label-position="labelPosition">
<el-form-item label="运单号" prop="awba">
<el-input v-model="ruleForm.awba"></el-input>
</el-form-item>
<el-form-item label="承运人" prop="carrier">
<el-input v-model="ruleForm.carrier"></el-input>
</el-form-item>
<el-form-item label="航班号" prop="flightno">
<el-input v-model="ruleForm.flightno"></el-input>
</el-form-item>
<el-form-item label="拖车号" prop="pno">
<el-input v-model="ruleForm.pno"></el-input>
</el-form-item>
<el-form-item label="航班日期" required>
<el-col :span="24">
<el-form-item prop="flightdate">
<el-date-picker type="date" placeholder="选择日期" v-model="ruleForm.flightdate" style="width: 100%;"></el-date-picker>
<el-col :span="18">
<el-form-item label="" prop="awba">
<el-input v-model="ruleForm.awba" style="width: 200px">
<template slot="prepend">运&nbsp;单&nbsp;号</template>
</el-input>
</el-form-item>
</el-col>
</el-row>
<!-- <el-form-item label="航班号" prop="flightno">-->
<!-- <el-input v-model="ruleForm.flightno"></el-input>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="拖车号" prop="pno">-->
<!-- <el-input v-model="ruleForm.pno"></el-input>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="航班日期" required>-->
<!-- <el-col :span="24">-->
<!-- <el-form-item prop="flightdate">-->
<!-- <el-date-picker type="date" placeholder="选择日期" v-model="ruleForm.flightdate" style="width: 100%;"></el-date-picker>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="分拨件数" prop="turnpiece">-->
<!-- <el-input v-model="ruleForm.turnpiece"></el-input>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="分拨重量" prop="turnweight">-->
<!-- <el-input v-model="ruleForm.turnweight"></el-input>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="海关关区" prop="customcode">-->
<!-- <el-col :span="24">-->
<!-- <el-select v-model="ruleForm.customcode" placeholder="请选择海关关区" style="width:100%">-->
<!-- <el-option v-for="item in options2" :key="item.value" :label="item.label"-->
<!-- :value="item.value" ></el-option>-->
<!-- </el-select>-->
<!-- </el-col>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="分拨到达" prop="turnunloading">-->
<!-- <el-col :span="24">-->
<!-- <el-select v-model="ruleForm.turnunloading" placeholder="请选择分拨到达地" style="width:100%">-->
<!-- <el-option v-for="item in options" :key="item.value" :label="item.label"-->
<!-- :value="item.value" ></el-option>-->
<!-- </el-select>-->
<!-- </el-col>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="卸货地" prop="ext2">-->
<!-- <el-input v-model="ruleForm.ext2"></el-input>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="车辆所发属" prop="ext1">-->
<!-- <el-input v-model="ruleForm.ext1"></el-input>-->
<!-- </el-form-item>-->
<el-row class="row-bg">
<el-col :span="24"><div class="grid-content content co">货物信息</div></el-col>
</el-row>
<el-row class="row-bg">
<el-row>
<el-col :span="5">
<el-form-item label="" prop="carrier">
<el-input v-model="ruleForm.carrier" style="width: 160px" onkeyup="this.value=this.value.toUpperCase()">
<template slot="prepend">承&nbsp;运&nbsp;人</template>
</el-input>
</el-form-item>
<el-form-item label="分拨件数" prop="turnpiece">
<el-input v-model="ruleForm.turnpiece"></el-input>
</el-col>
<el-col :span="5">
<el-form-item label="" prop="flightno">
<el-input v-model="ruleForm.flightno" style="width: 160px">
<template slot="prepend">航&nbsp;班&nbsp;号</template>
</el-input>
</el-form-item>
<el-form-item label="分拨重量" prop="turnweight">
<el-input v-model="ruleForm.turnweight"></el-input>
</el-col>
<el-col :span="7">
<el-form-item label="" prop="flightdate">
<div class="ip">
&nbsp;航班日期&nbsp;
</div>
<el-date-picker
v-model="ruleForm.flightdate"
value-format="yyyy-MM-dd"
type="date" style="width: 125px"
placeholder="航班日期">
</el-date-picker>
</el-form-item>
<el-form-item label="海关关区" prop="customcode">
<el-col :span="24">
<el-select v-model="ruleForm.customcode" placeholder="请选择海关关区" style="width:100%">
</el-col>
<el-col :span="7">
<el-form-item label="" prop="customcode">
<div class="ip">
海关关区
</div>
<el-select v-model="ruleForm.customcode" placeholder="请选择海关关区" style="width:115px">
<el-option v-for="item in options2" :key="item.value" :label="item.label"
:value="item.value" ></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="5">
<el-form-item label="" prop="turnpiece">
<el-input v-model="ruleForm.turnpiece" style="width: 160px">
<template slot="prepend">分拨件数</template>
</el-input>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="" prop="turnweight">
<el-input v-model="ruleForm.turnweight" style="width: 160px">
<template slot="prepend">分拨重量</template>
</el-input>
</el-form-item>
<el-form-item label="分拨到达" prop="turnunloading">
<el-col :span="24">
<el-select v-model="ruleForm.turnunloading" placeholder="请选择分拨到达地" style="width:100%">
</el-col>
<el-col :span="7">
<el-form-item label="" prop="turnunloading">
<div class="ip">
分拨到达地
</div>
<el-select v-model="ruleForm.turnunloading" placeholder="请选择分拨到达地" style="width:125px">
<el-option v-for="item in options" :key="item.value" :label="item.label"
:value="item.value" ></el-option>
</el-select>
</el-col>
</el-form-item>
<el-form-item label="卸货地" prop="ext2">
<el-input v-model="ruleForm.ext2"></el-input>
</el-form-item>
<el-form-item label="车辆所发属" prop="ext1">
<el-input v-model="ruleForm.ext1"></el-input>
</el-col>
<el-col :span="7">
<el-form-item label="" prop="pno">
<el-input v-model="ruleForm.pno" style="width: 200px">
<template slot="prepend">拖&nbsp;车&nbsp;号</template>
</el-input>
</el-form-item>
</el-form>
</el-col>
<el-col :span="12">
</el-row>
</el-row>
</el-form>
<el-col :span="8" :offset="10" style="margin-bottom: 20px;margin-top: 10px">
<el-button type="primary" @click="submitForm('ruleForm')">保存</el-button>
<el-button type="primary" @click="back">返回</el-button>
<!-- <el-button type="primary" @click="submitForm('ruleForm')">保存并发送</el-button>-->
<el-button @click="back">返回</el-button>
</el-col>
</el-row>
<!--对话提示框-->
... ... @@ -79,6 +163,22 @@
</el-container>
</template>
<style scoped>
.ip{
max-width: 100px;
margin-right: -5px;
display: inline-block;
background-color: #6F8294;
color: #ffffff;
border: 1px solid #DCDFE6;
vertical-align: middle;
padding: 0 18px;
white-space: nowrap;
border-top-right-radius: 0px;
border-top-left-radius: 4px;
border-bottom-left-radius: 4px;
border-bottom-right-radius: 0px;
font-size: 10px;
}
.co{height: 36px;line-height: 36px;}
.co{border-left: 4px #409EFF solid;padding-left: 10px;background-color: #f9fafc;margin-bottom: 2px}
.row-bg{background-color: white;padding:0px;}
... ... @@ -163,12 +263,13 @@
}
},
methods:{
//保存
submitForm(formName) {
this.$refs[formName].validate((valid) => {
if (valid) {
addAllocatImport(this.ruleForm).then(res=>{
let response=res.data;
//console.log(res);
console.log(res);
this.code=response.code;
if(this.code=='200'){
this.centerDialogVisible=true;
... ... @@ -184,6 +285,10 @@
}
});
},
// 过滤中英文
inputMe(e){
return e.replace(/[^a-zA-Z0-9.-]/g,'').toUpperCase();
},
getDefaultData(){
this.ruleForm=this.$route.params;
},
... ...
... ... @@ -115,6 +115,10 @@
departmentid:''
}
},
mounted() {
this.getdatatime();
this.getFlightList();
},
methods: {
/*设置默认航班时间*/
getdatatime(){
... ... @@ -149,11 +153,23 @@
},
/*原始舱单跳转*/
handleEdit(index, row) {
this.$router.push({path:'/enter',query:{flightno:JSON.stringify(row.flightno),flightdate:JSON.stringify(row.flightdate),originstation:JSON.stringify(row.originstation),destinationstation:JSON.stringify(row.destinationstation)}})
// row.waybillType = 'MT1201'
this.$router.push(
{
path:'/enter',
query:row
}
)
},
/*进港理货跳转*/
handleDelete(index, row) {
this.$router.push({path:'entertall',query:{flightno:JSON.stringify(row.flightno),flightdate:JSON.stringify(row.flightdate),originstation:JSON.stringify(row.originstation),destinationstation:JSON.stringify(row.destinationstation)}})
// row.waybillType = 'MT5201'
this.$router.push(
{
path:'entertall',
query:row
}
)
}
},
computed:{
... ... @@ -170,8 +186,7 @@
/*渲染方法*/
activated() {
let that=this;
that.getdatatime();
that.getFlightList();
},
}
</script>
... ...