朱兆平 / vue_cli · 提交

转到一个项目

作者 小范
提交 3796459ff49a2bafc22aa6756b6173749d662fca 1 个父辈 460954fc master ... ExportOrder flightplan2.0 master_dev master_dev_markdown master_dev_permission master_ffmTemp zhidan

界面调整

内嵌 并排对比
正在显示 15 个修改的文件 包含 335 行增加 和 156 行删除
... ... @@ -132,27 +132,27 @@ let routes = [
{path: '/main', component: Main, name: '首页'},
]
},
{
path: '/',
component: Home,
name: 'Charts',
iconCls: 'fa fa-bar-chart',
children: [
{path: '/echarts', component: echarts, name: 'echarts'},
{path: '/earthCharts', component: earthCharts, name: '统计表'}
]
},
// {
// path: '/',
// component: Home,
// name: 'Charts',
// iconCls: 'fa fa-bar-chart',
// children: [
// {path: '/echarts', component: echarts, name: 'echarts'},
// {path: '/earthCharts', component: earthCharts, name: '统计表'}
// ]
// },
// { path: '/test', component: Main },
{
path: '/bill',
component: Home,
name: '货运单',
iconCls: 'el-icon-collection',
children: [
{path: '/Way', component: Way, name: '货运单'},
{path: '/Webdialog', component: Webdialog, name: '在线客服'}
]
},
// {
// path: '/bill',
// component: Home,
// name: '货运单',
// iconCls: 'el-icon-collection',
// children: [
// {path: '/Way', component: Way, name: '货运单'},
// {path: '/Webdialog', component: Webdialog, name: '在线客服'}
// ]
// },
{
path: '/',
component: Home,
... ...
... ... @@ -5,9 +5,10 @@
{{collapsed?'':sysName}}
</el-col>
<el-col :span="6">
<div class="tools" @click.prevent="collapse" style="font-size:24px;width: 15px;margin-top: 80px;z-index:9999;margin-left: 10px;position:absolute;">
<div class="tools" @click.prevent="collapse" style="width: 15px;margin-top: 72px;margin-left:1px;z-index:9999;position:absolute;">
<!-- ;margin-top: 80px;z-index:9999;margin-left: 170px-->
<i class="el-icon-s-operation" style="color: rgb(38,56,76)"></i>
<!-- <i class="el-icon-s-operation" style="color: rgb(38,56,76)"></i>-->
<img width="23" height="49" src="data:img/png;base64,iVBORw0KGgoAAAANSUhEUgAAAB4AAABCCAYAAABAfGYuAAAArklEQVRYhe3YIQ4CMRBG4b+IOhyS26DXEjySBE6A4QSINasRSAx3guBJECTdLMn6dtp0Be8loz/Tjhh3OLVBEzSbAhUwMDAwMDAwMDAw8B/A5+PuNzEtF/NycGwDut9u6sIj6r2vB6eiRWALmg1b0SzYOWndrExoFhyC1F3vejxfdeGh9+er9nIz4dmPy4oX+U4WvNgCScWLrswRj4k7FzAwMDAwMDAwMDBwYnLqAfLHOpMP7/PBAAAAAElFTkSuQmCC">
</div>
<!-- 标签i的图标 fa-align-justify-->
</el-col>
... ... @@ -47,11 +48,12 @@
<!--导航菜单-->
<el-menu :default-active="$route.path" class="el-menu-vertical-demo" @open="handleopen"
@close="handleclose" @select="handleselect" unique-opened router v-show="!collapsed"
style="width: 300px;height: 100%">
style="width: 380px;height: 100%;margin-right: -18px">
<!-- ;overflow: scroll-->
<div align="center" style="background-color: #2b2f3a;height: 67px">
<img src="./logo1.png">
<h1 style="color:white;display: inline-block;font-weight: 600;font-size: 15px;line-height: 50px">航空物流公共信息服务平台</h1>
<h1 style="color:white;display: inline-block">航空物流公共信息服务平台</h1>
<!-- ;font-weight: 600;font-size: 15px;line-height: 50px-->
</div>
<template v-for="(item,index) in $router.options.routes" v-if="!item.hidden">
<el-submenu :index="index+''" v-if="!item.leaf">
... ... @@ -78,8 +80,12 @@
</li>
</ul>
</aside>
<div class="tabM" v-bind:style="{width: myWidth}">
<TabMenu></TabMenu>
</div>
<TabMenu></TabMenu>
</el-col>
</el-row>
... ... @@ -179,6 +185,7 @@
}
},
methods: {
reload() {
this.$nextTick(function () {
this.$router.push({
... ... @@ -275,7 +282,8 @@
showMenu(i,status){
this.$refs.menuColl
apsed.getElementsByClassName('submenu-hook-'+i)[0].style.display=status?'block':'none';
}
},
},
mounted() {
var _this = this;
... ... @@ -337,6 +345,7 @@
padding-right:10px;
border-color: rgba(238,241,146,0.3);
border-right-width: 0px;
border-right-style: solid;
/*border-right-style: solid;*/
img {
width: 40px;
... ... @@ -348,7 +357,7 @@
}
}
.logo-width{
width:300px;
width:380px;
}
.logo-collapse-width{
width:60px
... ... @@ -359,11 +368,9 @@
height: 50px;
line-height: 40px;
cursor: pointer;
/*padding-left: 180px;*/
/*padding-top: 60px;*/
/*color: rgb(111,130,148);*/
}
}
.main {
... ... @@ -376,8 +383,11 @@
aside {
flex:0 0 300px;
width: 300px;
/*overflow-y: scroll;*/
overflow-x: hidden;
overflow-y: scroll;
position: relative;
background: rgb(38,56,76);
// position: absolute;
// top: 0px;
// bottom: 0px;
... ... @@ -397,13 +407,19 @@
}
}
aside::-webkit-scrollbar {
width: 0 !important;
}
aside::-webkit-scrollbar {
width: 0 !important;height: 0;
}
.menu-collapsed{
flex:0 0 60px;
width: 60px;
width: 230px;
}
.menu-expanded{
/*底层滚动框宽度*/
flex:0 0 300px;
flex:0 0 380px;
width: 230px;
}
.menu-expanded ul{
... ... @@ -484,4 +500,9 @@
}
}
}
.tabM{
display: inline-block;
min-width: 870px;
max-width: 1190px;
}
</style>
... ...
<template>
<div class="app-container">
<div class="filter-container">
<el-button class="filter-item" type="primary" icon="el-icon-search" @click="handleAdd">导入</el-button>
<div class="filter-container" style="margin-top: 15px">
<el-button size="small" class="filter-item" type="primary" icon="el-icon-search" @click="handleAdd">导入</el-button>
<el-input
type="textarea"
:rows="40"
... ... @@ -9,6 +9,7 @@
v-model="ffmtext">
</el-input>
</div>
<div style="margin-left: 1190px"></div>
</div>
</template>
... ...
<template>
<div class="app-container">
<div class="filter-container">
<el-button class="filter-item" type="primary" icon="el-icon-search" @click="handleAdd">导入</el-button>
<div class="filter-container" style="margin-top: 15px">
<el-button size="small" class="filter-item" type="primary" icon="el-icon-search" @click="handleAdd">导入</el-button>
<el-input
type="textarea"
:rows="40"
... ... @@ -9,6 +9,7 @@
v-model="ffmtext">
</el-input>
</div>
<div style="margin-left: 1190px"></div>
</div>
</template>
... ...
<template>
<div class="app-container">
<div class="filter-container">
<el-button class="filter-item" type="primary" icon="el-icon-search" @click="handleAdd">导入</el-button>
<div class="filter-container" style="margin-top: 15px">
<el-button size="small" class="filter-item" type="primary" icon="el-icon-search" @click="handleAdd">导入</el-button>
<el-input
type="textarea"
:rows="40"
... ... @@ -9,6 +9,7 @@
v-model="ffmtext">
</el-input>
</div>
<div style="margin-left: 1190px"></div>
</div>
</template>
... ... @@ -44,4 +45,11 @@
</script>
<style>
.app-container{
height: 550px;
overflow:auto;
}
.filter-item{
margin-top: 20px;
}
</style>
... ...
... ... @@ -94,6 +94,132 @@
</div>
</a>
</li>
<li>
<a>
<div style="display: flex">
<div class="demo-basic--circle" >
<div class="block"><el-avatar :size="60" :src="circleUrls"></el-avatar></div>
</div>
</div>
<div style="padding-left: 10px;width: 100%">
<div class="father">
<h4 style="display: inline-block;line-height: 0px">{{name}}</h4>
<div class="sun">{{time}}</div>
<div style="background-color: rgb(245,108,108);display: inline-block;color: #FFFFFF;
width:30px;height:20px;line-height:20px;text-align:center;border-radius: 6.25rem;margin-left: 220px">
{{count}}</div>
</div>
<div style="margin: 0px;height: 30px">
<span style="margin: 0;display: inline-block;width: 85%;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">{{content}}</span>
</div>
</div>
</a>
</li>
<li>
<a>
<div style="display: flex">
<div class="demo-basic--circle" >
<div class="block"><el-avatar :size="60" :src="circleUrls"></el-avatar></div>
</div>
</div>
<div style="padding-left: 10px;width: 100%">
<div class="father">
<h4 style="display: inline-block;line-height: 0px">{{name}}</h4>
<div class="sun">{{time}}</div>
<div style="background-color: rgb(245,108,108);display: inline-block;color: #FFFFFF;
width:30px;height:20px;line-height:20px;text-align:center;border-radius: 6.25rem;margin-left: 220px">
{{count}}</div>
</div>
<div style="margin: 0px;height: 30px">
<span style="margin: 0;display: inline-block;width: 85%;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">{{content}}</span>
</div>
</div>
</a>
</li>
<li>
<a>
<div style="display: flex">
<div class="demo-basic--circle" >
<div class="block"><el-avatar :size="60" :src="circleUrls"></el-avatar></div>
</div>
</div>
<div style="padding-left: 10px;width: 100%">
<div class="father">
<h4 style="display: inline-block;line-height: 0px">{{name}}</h4>
<div class="sun">{{time}}</div>
<div style="background-color: rgb(245,108,108);display: inline-block;color: #FFFFFF;
width:30px;height:20px;line-height:20px;text-align:center;border-radius: 6.25rem;margin-left: 220px">
{{count}}</div>
</div>
<div style="margin: 0px;height: 30px">
<span style="margin: 0;display: inline-block;width: 85%;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">{{content}}</span>
</div>
</div>
</a>
</li>
<li>
<a>
<div style="display: flex">
<div class="demo-basic--circle" >
<div class="block"><el-avatar :size="60" :src="circleUrls"></el-avatar></div>
</div>
</div>
<div style="padding-left: 10px;width: 100%">
<div class="father">
<h4 style="display: inline-block;line-height: 0px">{{name}}</h4>
<div class="sun">{{time}}</div>
<div style="background-color: rgb(245,108,108);display: inline-block;color: #FFFFFF;
width:30px;height:20px;line-height:20px;text-align:center;border-radius: 6.25rem;margin-left: 220px">
{{count}}</div>
</div>
<div style="margin: 0px;height: 30px">
<span style="margin: 0;display: inline-block;width: 85%;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">{{content}}</span>
</div>
</div>
</a>
</li>
<li>
<a>
<div style="display: flex">
<div class="demo-basic--circle" >
<div class="block"><el-avatar :size="60" :src="circleUrls"></el-avatar></div>
</div>
</div>
<div style="padding-left: 10px;width: 100%">
<div class="father">
<h4 style="display: inline-block;line-height: 0px">{{name}}</h4>
<div class="sun">{{time}}</div>
<div style="background-color: rgb(245,108,108);display: inline-block;color: #FFFFFF;
width:30px;height:20px;line-height:20px;text-align:center;border-radius: 6.25rem;margin-left: 220px">
{{count}}</div>
</div>
<div style="margin: 0px;height: 30px">
<span style="margin: 0;display: inline-block;width: 85%;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">{{content}}</span>
</div>
</div>
</a>
</li>
<li>
<a>
<div style="display: flex">
<div class="demo-basic--circle" >
<div class="block"><el-avatar :size="60" :src="circleUrls"></el-avatar></div>
</div>
</div>
<div style="padding-left: 10px;width: 100%">
<div class="father">
<h4 style="display: inline-block;line-height: 0px">{{name}}</h4>
<div class="sun">{{time}}</div>
<div style="background-color: rgb(245,108,108);display: inline-block;color: #FFFFFF;
width:30px;height:20px;line-height:20px;text-align:center;border-radius: 6.25rem;margin-left: 220px">
{{count}}</div>
</div>
<div style="margin: 0px;height: 30px">
<span style="margin: 0;display: inline-block;width: 85%;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">{{content}}</span>
</div>
</div>
</a>
</li>
</ul>
</el-aside>
<!-- 对话框-->
... ...
... ... @@ -4,13 +4,13 @@
<el-col :span="24" class="toolbar" style="padding-bottom: 0px;">
<el-form :inline="true" :model="filters">
<el-form-item>
<el-input v-model="filters.companyName" placeholder="关键字查询"></el-input>
<el-input size="small" v-model="filters.companyName" placeholder="关键字查询"></el-input>
</el-form-item>
<el-form-item>
<el-button type="warning" style="width:150px" size="medium" icon="el-icon-plus" v-on:click="getConsigner()">查询</el-button>
<el-button type="warning" style="width:150px" size="small" icon="el-icon-plus" v-on:click="getConsigner()">查询</el-button>
</el-form-item>
<el-form-item>
<el-button type="primary" style="width:150px" size="medium" icon="el-icon-plus" @click="companyAdd">新增</el-button>
<el-button type="primary" style="width:150px" size="small" icon="el-icon-plus" @click="companyAdd">新增</el-button>
</el-form-item>
</el-form>
</el-col>
... ...
... ... @@ -4,13 +4,13 @@
<el-col :span="24" class="toolbar" style="padding-bottom: 0px;">
<el-form :inline="true" :model="filters">
<el-form-item>
<el-input v-model="filters.companyName" placeholder="关键字查询"></el-input>
<el-input size="small" v-model="filters.companyName" placeholder="关键字查询"></el-input>
</el-form-item>
<el-form-item>
<el-button type="warning" style="width:150px" size="medium" icon="el-icon-plus" v-on:click="getConsigner()">查询</el-button>
<el-button type="warning" style="width:150px" size="small" icon="el-icon-plus" v-on:click="getConsigner()">查询</el-button>
</el-form-item>
<el-form-item>
<el-button type="primary" style="width:150px" size="medium" icon="el-icon-plus" @click="companyAdd">新增</el-button>
<el-button type="primary" style="width:150px" size="small" icon="el-icon-plus" @click="companyAdd">新增</el-button>
</el-form-item>
</el-form>
</el-col>
... ...
<template>
<el-container>
<el-container style="height: 550px;overflow:auto;">
<el-main>
<el-row>
<el-col :span="24">
... ... @@ -9,19 +9,19 @@
<!-- 搜索区域-->
<el-row>
<el-form :inline="true" :model="formInline" class="demo-form-inline">
<el-col :span="5">
<el-col :span="8">
<el-form-item label="航班号">
<el-input v-model="formInline.flightNo" placeholder="请输入航班号"></el-input>
<el-input size="small" v-model="formInline.flightNo" placeholder="请输入航班号"></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item>
<el-button type="primary" @click="onSubmit">查询</el-button>
<el-button size="small" type="primary" @click="onSubmit">查询</el-button>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item>
<el-select v-model="formInline.operation" placeholder="航班操作" style="margin-left: 50px">
<el-select v-model="formInline.operation" placeholder="航班操作" style="margin-left: 50px" size="small">
<el-option
v-for="item in operation"
:key="item.value"
... ... @@ -91,19 +91,21 @@
label="配载重量">
</el-table-column>
</el-table>
<div style="margin-top:5px;margin-left: 20px">
<el-button @click="dialogFormVisible = true">待运导入</el-button>
<el-button>装箱</el-button>
<el-button>部分装箱</el-button>
<el-button>放散舱</el-button>
<el-button>部分放散舱</el-button>
<el-button @click="dialogTableVisible = true">正式舱单</el-button>
<el-button>地勤交接</el-button>
<el-button @click="dialogFormVisible3 = true">转配</el-button>
<el-button>航班文件</el-button>
<el-button type="primary" >散货配上</el-button>
<el-button type="success">卸下</el-button>
<el-button type="warning">运单保存</el-button>
<div style="margin-top:15px;margin-left: 20px">
<el-button size="small" @click="dialogFormVisible = true">待运导入</el-button>
<el-button size="small">装箱</el-button>
<el-button size="small">部分装箱</el-button>
<el-button size="small">放散舱</el-button>
<el-button size="small">部分放散舱</el-button>
<el-button size="small" @click="dialogTableVisible = true">正式舱单</el-button>
<el-button size="small">地勤交接</el-button>
<el-button size="small" @click="dialogFormVisible3 = true">转配</el-button>
<el-button size="small">航班文件</el-button>
</div>
<div style="margin-top:15px;margin-left: 20px">
<el-button size="small" type="primary" >散货配上</el-button>
<el-button size="small" type="success">卸下</el-button>
<el-button size="small" type="warning">运单保存</el-button>
</div>
</el-row>
<!-- 表单①待运导入按钮弹框-->
... ... @@ -499,10 +501,11 @@
</el-table-column>
</el-table>
</el-row>
<div style="margin-left: 970px">
<el-button type="primary">板箱配上</el-button>
<el-button type="success">卸下</el-button>
<div style="margin-top: 15px;margin-left: 20px">
<el-button size="small" type="primary">板箱配上</el-button>
<el-button size="small" type="success">卸下</el-button>
</div>
<div style="margin-left: 1190px"></div>
</el-main>
</el-container>
</template>
... ...
<template>
<el-container>
<el-container style="height: 550px;overflow:auto;">
<el-main>
<el-row>
<el-col :span="24">
... ... @@ -14,25 +14,25 @@
<el-row>
<el-col :span="6">
<el-form-item label="运单号">
<el-input v-model="form.name"></el-input>
<el-input size="small" v-model="form.name"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="">
<el-button @click="">挑单</el-button>
<el-button @click="">批量挑单</el-button>
<el-button size="small" @click="">挑单</el-button>
<el-button size="small" @click="">批量挑单</el-button>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6">
<el-form-item label="结算客户">
<el-input v-model="form.name"></el-input>
<el-input size="small" v-model="form.name"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="付款方式" :label-width="formLabelWidth">
<el-select v-model="form.waybillNo" placeholder="请选择">
<el-select size="small" v-model="form.waybillNo" placeholder="请选择">
<el-option label="方式一" value="yi"></el-option>
<el-option label="方式二" value="er"></el-option>
</el-select>
... ... @@ -42,15 +42,13 @@
<el-row>
<el-table
:data="tableData"
style="width: 100%"
row-key="id"
border
lazy
:load="load"
style="border-radius: 10px 10px 0px 0px;line-height: 25px"
:header-cell-style="{background:'#6F8294',color:'#FFFFFF'}" size="small"
:tree-props="{children: 'children', hasChildren: 'hasChildren'}">
<el-table-column
prop="date"
label="状态">
label="状态"
width="55">
</el-table-column>
<el-table-column
prop="name"
... ... @@ -98,19 +96,24 @@
</el-table-column>
<el-table-column
prop="address"
label="收/发货人">
label="收/发货人"
fixed="right">
</el-table-column>
</el-table>
</el-row>
<div>
<el-button @click="">清除</el-button>
<el-button @click="">核对并现结结算</el-button>
<el-button @click="">导出</el-button>
<el-button @click="">打印</el-button>
<div style="margin-top: 15px;margin-left: 20px">
<el-button size="small" @click="">清除</el-button>
<el-button size="small" @click="">核对并现结结算</el-button>
<el-button size="small" @click="">导出</el-button>
<el-button size="small" @click="">打印</el-button>
</div>
<div style="margin-left: 1190px">
</div>
</el-form>
</el-tab-pane>
<el-tab-pane label="已结算" name="second">已结算</el-tab-pane>
<div style="margin-left: 1190px">
</div>
</el-tabs>
</el-row>
</el-main>
... ...
<template>
<el-container>
<el-container style="height: 550px;overflow:auto;">
<el-main>
<el-row>
<el-col :span="24">
... ... @@ -9,19 +9,19 @@
<!-- 搜索区域-->
<el-row>
<el-form :inline="true" :model="formInline" class="demo-form-inline">
<el-col :span="5">
<el-col :span="8">
<el-form-item label="航班号">
<el-input v-model="formInline.flightNo" placeholder="请输入航班号"></el-input>
<el-input size="small" v-model="formInline.flightNo" placeholder="请输入航班号"></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item>
<el-button type="primary" @click="onSubmit">查询</el-button>
<el-button size="small" type="primary" @click="onSubmit">查询</el-button>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item>
<el-select v-model="formInline.operation" placeholder="航班操作" style="margin-left: 50px">
<el-select size="small" v-model="formInline.operation" placeholder="航班操作" style="margin-left: 50px">
<el-option
v-for="item in operation"
:key="item.value"
... ... @@ -39,10 +39,9 @@
<el-tab-pane label="舱单" name="first">
<el-table
:data="tableData"
style="width: 100%"
row-key="id"
border
lazy
tooltip-effect="dark"
style="border-radius: 10px 10px 0px 0px;line-height: 25px;"
:header-cell-style="{background:'#6F8294',color:'#FFFFFF'}" size="small"
:load="load"
:tree-props="{children: 'children', hasChildren: 'hasChildren'}">
<el-table-column
... ... @@ -63,7 +62,8 @@
</el-table-column>
<el-table-column
prop="code"
label="特殊处理代码">
label="特殊处理代码"
width="95">
</el-table-column>
<el-table-column
prop="productName"
... ... @@ -95,7 +95,7 @@
<el-row>
<el-col :span="6">
<el-form-item label="ULD类别">
<el-select v-model="form.type" placeholder="请选择">
<el-select size="small" v-model="form.type" placeholder="请选择">
<el-option label="ULD" value="ULD"></el-option>
<el-option label="其他" value="其他"></el-option>
</el-select>
... ... @@ -103,76 +103,76 @@
</el-col>
<el-col :span="6">
<el-form-item label="ULD号">
<el-input v-model="form.uldNo"></el-input>
<el-input size="small" v-model="form.uldNo"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="">
<el-button>添加ULD</el-button>
<el-button>清空ULD</el-button>
<el-button size="small">添加ULD</el-button>
<el-button size="small">清空ULD</el-button>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6">
<el-form-item label="运单号">
<el-input v-model="form.waybillNo"></el-input>
<el-input size="small" v-model="form.waybillNo"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="件数">
<el-input v-model="form.number"></el-input>
<el-input size="small" v-model="form.number"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="重量">
<el-input v-model="form.weight"></el-input>
<el-input size="small" v-model="form.weight"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6">
<el-form-item label="配载件数">
<el-input v-model="form.assembling"></el-input>
<el-input size="small" v-model="form.assembling"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="配载重量">
<el-input v-model="form.stowage"></el-input>
<el-input size="small" v-model="form.stowage"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="配载体积">
<el-input v-model="form.stowageVol"></el-input>
<el-input size="small" v-model="form.stowageVol"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6">
<el-form-item label="特货代码">
<el-input v-model="form.code"></el-input>
<el-input size="small" v-model="form.code"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="品名">
<el-input v-model="form.productName"></el-input>
<el-input size="small" v-model="form.productName"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="始发站">
<el-input v-model="form.departure"></el-input>
<el-input size="small" v-model="form.departure"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6">
<el-form-item label="目的站">
<el-input v-model="form.destination"></el-input>
<el-input size="small" v-model="form.destination"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="优先级">
<el-select v-model="form.priority" placeholder="请选择">
<el-select size="small" v-model="form.priority" placeholder="请选择">
<el-option label="一" value="一"></el-option>
<el-option label="二" value="二"></el-option>
</el-select>
... ... @@ -180,21 +180,23 @@
</el-col>
<el-col :span="6">
<el-form-item label="备注">
<el-input v-model="form.remarks"></el-input>
<el-input size="small" v-model="form.remarks"></el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
</el-tab-pane>
</el-tabs>
<div>
<el-button>导入舱单</el-button>
<el-button>舱单保存</el-button>
<el-button>发送FFM</el-button>
<el-button>发送H2000舱单报</el-button>
<el-button>不正常检查</el-button>
<el-button @click="dialogTableVisible = true">打印</el-button>
<el-button>打印标签</el-button>
<div style="margin-top: 15px;margin-left: 20px">
<el-button size="small">导入舱单</el-button>
<el-button size="small">舱单保存</el-button>
<el-button size="small">发送FFM</el-button>
<el-button size="small">发送H2000舱单报</el-button>
<el-button size="small">不正常检查</el-button>
<el-button size="small" @click="dialogTableVisible = true">打印</el-button>
<el-button size="small">打印标签</el-button>
</div>
<div style="margin-left: 1190px">
</div>
</el-row>
<!-- 航班文件 打印按钮-->
... ... @@ -279,6 +281,13 @@
export default {
data() {
return {
operation: [{
value: '操作1',
label: '操作1'
}, {
value: '操作2',
label: '操作2'
}],
formInline: {
flightNo: undefined,
operation: undefined
... ... @@ -314,4 +323,4 @@
<style scoped>
</style>
\ No newline at end of file
</style>
... ...
<template>
<el-container>
<el-container style="height: 550px;overflow:auto;">
<el-main>
<el-row>
<el-col :span="24">
... ... @@ -9,19 +9,19 @@
<!-- 搜索区域-->
<el-row>
<el-form :inline="true" :model="formInline" class="demo-form-inline">
<el-col :span="5">
<el-col :span="8">
<el-form-item label="航班号">
<el-input v-model="formInline.flightNo" placeholder="请输入航班号"></el-input>
<el-input size="small" v-model="formInline.flightNo" placeholder="请输入航班号"></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item>
<el-button type="primary" @click="onSubmit">查询</el-button>
<el-button size="small" type="primary" @click="onSubmit">查询</el-button>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item>
<el-select v-model="formInline.operation" placeholder="航班操作" style="margin-left: 50px">
<el-select size="small" v-model="formInline.operation" placeholder="航班操作" style="margin-left: 50px">
<el-option
v-for="item in operation"
:key="item.value"
... ... @@ -67,11 +67,13 @@
label="品名">
</el-table-column>
</el-table>
<div style="margin-top:5px;margin-left: 1000px">
<el-button type="primary" >配上</el-button>
<el-button type="success" @click="dialogFormVisible = true">新增</el-button>
<el-button type="warning" @click="dialogForm1Visible = true">导入</el-button>
<div style="margin-top:15px;margin-left: 20px">
<el-button size="small" type="primary" >配上</el-button>
<el-button size="small" type="success" @click="dialogFormVisible = true">新增</el-button>
<el-button size="small" type="warning" @click="dialogForm1Visible = true">导入</el-button>
</div>
<div style="margin-left: 1190px"></div>
</el-row>
<!-- 表单①新增按钮弹框-->
<el-row >
... ... @@ -300,11 +302,12 @@
label="机仓位">
</el-table-column>
</el-table>
<div style="margin-top:5px;margin-left: 1000px">
<el-button type="primary" >拉下</el-button>
<el-button type="success" @click="dialogFormVisibles = true">新增</el-button>
<el-button type="danger" >删除</el-button>
<div style="margin-top:15px;margin-left: 20px">
<el-button size="small" type="primary" >拉下</el-button>
<el-button size="small" type="success" @click="dialogFormVisibles = true">新增</el-button>
<el-button size="small" type="danger" >删除</el-button>
</div>
<div style="margin-left: 1190px"></div>
</el-row>
<!-- 表单②新增按钮弹框-->
<el-row>
... ...
... ... @@ -2,21 +2,24 @@
<section>
<!-- 工具条-->
<el-row class="toolbar" style="padding-bottom: 0px;">
<el-form :inline="true" ref="form" :model="filters">
<el-row>
<el-col :span="5">
<el-form :inline="true" ref="form" :model="filters" style="text-align: right">
<el-row style="margin-top: -10px">
<el-col :span="8">
<el-form-item label="车牌号：">
<el-input v-model="filters.trailerFrameNo" placeholder="" size="small"style="width: 120px"></el-input>
<el-input v-model="filters.trailerFrameNo" placeholder="" size="small" style="width: 180px"></el-input>
</el-form-item>
</el-col>
<el-col :span="5">
<el-col :span="8">
<el-form-item label="挂靠名称:">
<el-input v-model="filters.agentname" placeholder="" size="small" style="width: 120px"></el-input>
<el-input v-model="filters.agentname" placeholder="" size="small" style="width: 180px"></el-input>
</el-form-item>
</el-col>
<el-col :span="5">
</el-row>
<el-row style="margin-top: 0px">
<el-col :span="8">
<el-form-item label="目的场站:">
<el-select v-model="filters.endstation" @change="aisleOption(filters.endstation)" clearable placeholder="请选择">
<el-select v-model="filters.endstation" @change="aisleOption(filters.endstation)" clearable placeholder="请选择" size="small" style="width: 180px">
<el-option
v-for="item in options"
:key="item.stationId"
... ... @@ -26,9 +29,9 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="5">
<el-col :span="8">
<el-form-item label="卡口:" style="margin-left: 10px">
<el-select v-model="filters.aisle" :disabled="disabled" placeholder="先选择目的场站" size="small" style="width: 150px">
<el-select v-model="filters.aisle" :disabled="disabled" placeholder="先选择目的场站" size="small" style="width: 180px">
<el-option
v-for="item in aisleOptions"
:key="item.channel"
... ... @@ -38,9 +41,9 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="2">
<el-col :span="4">
<el-form-item>
<el-button type="primary" @click="getList()" size="small">查询</el-button>
<el-button type="primary" @click="getList()" size="small" style="width: 100px">查询</el-button>
</el-form-item>
</el-col>
</el-row>
... ... @@ -52,7 +55,8 @@
:data="businesstypeList"
border
v-loading="businesstypeListLoading"
style="width: 100%">
style="border-radius: 10px 10px 0px 0px;line-height: 25px;"
:header-cell-style="{background:'#6F8294',color:'#FFFFFF'}" size="small">
<el-table-column fixed prop="date" label="操作">
<template slot-scope="scope">
<el-button @click="selectOne(scope.$index, scope.row)" type="primary" size="small">查看</el-button>
... ...
... ... @@ -32,13 +32,13 @@
<div class="grid-content">
<el-col :span="4">
<div class="grid-content">
<el-input v-model="preQuery.awba" placeholder="请输入主单号" clearable></el-input>
<el-input size="small" v-model="preQuery.awba" placeholder="请输入主单号" clearable></el-input>
</div>
</el-col>
<div class="grid-content el-btn">
<el-button type="warning" style="width:150px" size="medium" icon="el-icon-search" @click="handleSerach">查询</el-button>
<el-button v-if="preQuery.flightno === undefined && preData.length<1" type="primary"
style="width:150px" size="medium" icon="el-icon-plus"
<el-button size="small" type="warning" style="width:150px" icon="el-icon-search" @click="handleSerach">查询</el-button>
<el-button size="small" v-if="preQuery.flightno === undefined && preData.length<1" type="primary"
style="width:150px" icon="el-icon-plus"
@click="handleAddpre">新增预配舱单
</el-button>
<el-upload
... ... @@ -49,7 +49,7 @@
:on-exceed="fileExceed"
accept="application/vnd.ms-excel,application/vnd.ms-excels"
ref="fileupload">
<el-button slot="trigger" style="width:150px" size="medium" icon="el-icon-folder-add" type="success">导入excel</el-button>
<el-button slot="trigger" style="width:150px" size="small" icon="el-icon-folder-add" type="success">导入excel</el-button>
</el-upload>
</div>
</div>
... ...
... ... @@ -4,13 +4,13 @@
<el-col :span="24" class="toolbar" style="padding-bottom: 0px;">
<el-form :inline="true" :model="filters">
<el-form-item>
<el-input v-model="filters.awba" placeholder="主单号查询"></el-input>
<el-input size="small" v-model="filters.awba" placeholder="主单号查询"></el-input>
</el-form-item>
<el-form-item>
<el-button type="warning" style="width:150px" size="medium" icon="el-icon-plus" v-on:click="getSecurity()">查询</el-button>
<el-button type="warning" style="width:150px" size="small" icon="el-icon-plus" v-on:click="getSecurity()">查询</el-button>
</el-form-item>
<el-form-item>
<el-button type="primary" style="width:150px" size="medium" icon="el-icon-plus" @click="companyAdd">新增</el-button>
<el-button type="primary" style="width:150px" size="small" icon="el-icon-plus" @click="companyAdd">新增</el-button>
</el-form-item>
</el-form>
</el-col>
... ... @@ -198,8 +198,8 @@
</el-row>
</el-form>
<div slot="footer" class="dialog-footer" align="center">
<el-button type="primary" size="medium" style="width: 100px" @click.native="editSubmit(0)">暂存</el-button>
<el-button type="success" size="medium" style="width: 120px" @click.native="editSubmit(1)">保存并发送</el-button>
<el-button type="primary" size="small" style="width: 100px" @click.native="editSubmit(0)">暂存</el-button>
<el-button type="success" size="small" style="width: 120px" @click.native="editSubmit(1)">保存并发送</el-button>
</div>
</el-dialog>
<!--新增界面-->
... ... @@ -345,8 +345,8 @@
</el-row>
</el-form>
<div slot="footer" class="dialog-footer" align="center">
<el-button type="primary" size="medium" style="width: 100px" @click.native="addSubmit(0)">暂存</el-button>
<el-button type="success" size="medium" style="width: 120px" @click.native="addSubmit(1)">保存并发送</el-button>
<el-button type="primary" size="small" style="width: 100px" @click.native="addSubmit(0)">暂存</el-button>
<el-button type="success" size="small" style="width: 120px" @click.native="addSubmit(1)">保存并发送</el-button>
</div>
</el-dialog>
<!--打印界面-->
... ...