朱兆平 / vue_cli · 提交

转到一个项目

作者 小范
提交 3796459ff49a2bafc22aa6756b6173749d662fca 1 个父辈 460954fc

界面调整

内嵌 并排对比
正在显示 15 个修改的文件 包含 335 行增加 和 156 行删除
@@ -132,27 +132,27 @@ let routes = [ @@ -132,27 +132,27 @@ let routes = [
132 {path: '/main', component: Main, name: '首页'}, 132 {path: '/main', component: Main, name: '首页'},
133 ] 133 ]
134 }, 134 },
135 - {  
136 - path: '/',  
137 - component: Home,  
138 - name: 'Charts',  
139 - iconCls: 'fa fa-bar-chart',  
140 - children: [  
141 - {path: '/echarts', component: echarts, name: 'echarts'},  
142 - {path: '/earthCharts', component: earthCharts, name: '统计表'}  
143 - ]  
144 - }, 135 + // {
  136 + // path: '/',
  137 + // component: Home,
  138 + // name: 'Charts',
  139 + // iconCls: 'fa fa-bar-chart',
  140 + // children: [
  141 + // {path: '/echarts', component: echarts, name: 'echarts'},
  142 + // {path: '/earthCharts', component: earthCharts, name: '统计表'}
  143 + // ]
  144 + // },
145 // { path: '/test', component: Main }, 145 // { path: '/test', component: Main },
146 - {  
147 - path: '/bill',  
148 - component: Home,  
149 - name: '货运单',  
150 - iconCls: 'el-icon-collection',  
151 - children: [  
152 - {path: '/Way', component: Way, name: '货运单'},  
153 - {path: '/Webdialog', component: Webdialog, name: '在线客服'}  
154 - ]  
155 - }, 146 + // {
  147 + // path: '/bill',
  148 + // component: Home,
  149 + // name: '货运单',
  150 + // iconCls: 'el-icon-collection',
  151 + // children: [
  152 + // {path: '/Way', component: Way, name: '货运单'},
  153 + // {path: '/Webdialog', component: Webdialog, name: '在线客服'}
  154 + // ]
  155 + // },
156 { 156 {
157 path: '/', 157 path: '/',
158 component: Home, 158 component: Home,
@@ -5,9 +5,10 @@ @@ -5,9 +5,10 @@
5 {{collapsed?'':sysName}} 5 {{collapsed?'':sysName}}
6 </el-col> 6 </el-col>
7 <el-col :span="6"> 7 <el-col :span="6">
8 - <div class="tools" @click.prevent="collapse" style="font-size:24px;width: 15px;margin-top: 80px;z-index:9999;margin-left: 10px;position:absolute;"> 8 + <div class="tools" @click.prevent="collapse" style="width: 15px;margin-top: 72px;margin-left:1px;z-index:9999;position:absolute;">
9 <!-- ;margin-top: 80px;z-index:9999;margin-left: 170px--> 9 <!-- ;margin-top: 80px;z-index:9999;margin-left: 170px-->
10 - <i class="el-icon-s-operation" style="color: rgb(38,56,76)"></i> 10 +<!-- <i class="el-icon-s-operation" style="color: rgb(38,56,76)"></i>-->
  11 + <img width="23" height="49" src="data:img/png;base64,iVBORw0KGgoAAAANSUhEUgAAAB4AAABCCAYAAABAfGYuAAAArklEQVRYhe3YIQ4CMRBG4b+IOhyS26DXEjySBE6A4QSINasRSAx3guBJECTdLMn6dtp0Be8loz/Tjhh3OLVBEzSbAhUwMDAwMDAwMDAw8B/A5+PuNzEtF/NycGwDut9u6sIj6r2vB6eiRWALmg1b0SzYOWndrExoFhyC1F3vejxfdeGh9+er9nIz4dmPy4oX+U4WvNgCScWLrswRj4k7FzAwMDAwMDAwMDBwYnLqAfLHOpMP7/PBAAAAAElFTkSuQmCC">
11 </div> 12 </div>
12 <!-- 标签i的图标 fa-align-justify--> 13 <!-- 标签i的图标 fa-align-justify-->
13 </el-col> 14 </el-col>
@@ -47,11 +48,12 @@ @@ -47,11 +48,12 @@
47 <!--导航菜单--> 48 <!--导航菜单-->
48 <el-menu :default-active="$route.path" class="el-menu-vertical-demo" @open="handleopen" 49 <el-menu :default-active="$route.path" class="el-menu-vertical-demo" @open="handleopen"
49 @close="handleclose" @select="handleselect" unique-opened router v-show="!collapsed" 50 @close="handleclose" @select="handleselect" unique-opened router v-show="!collapsed"
50 - style="width: 300px;height: 100%"> 51 + style="width: 380px;height: 100%;margin-right: -18px">
51 <!-- ;overflow: scroll--> 52 <!-- ;overflow: scroll-->
52 <div align="center" style="background-color: #2b2f3a;height: 67px"> 53 <div align="center" style="background-color: #2b2f3a;height: 67px">
53 <img src="./logo1.png"> 54 <img src="./logo1.png">
54 - <h1 style="color:white;display: inline-block;font-weight: 600;font-size: 15px;line-height: 50px">航空物流公共信息服务平台</h1> 55 + <h1 style="color:white;display: inline-block">航空物流公共信息服务平台</h1>
  56 +<!-- ;font-weight: 600;font-size: 15px;line-height: 50px-->
55 </div> 57 </div>
56 <template v-for="(item,index) in $router.options.routes" v-if="!item.hidden"> 58 <template v-for="(item,index) in $router.options.routes" v-if="!item.hidden">
57 <el-submenu :index="index+''" v-if="!item.leaf"> 59 <el-submenu :index="index+''" v-if="!item.leaf">
@@ -78,8 +80,12 @@ @@ -78,8 +80,12 @@
78 </li> 80 </li>
79 </ul> 81 </ul>
80 </aside> 82 </aside>
  83 +<div class="tabM" v-bind:style="{width: myWidth}">
  84 + <TabMenu></TabMenu>
  85 +</div>
  86 +
  87 +
81 88
82 -<TabMenu></TabMenu>  
83 89
84 </el-col> 90 </el-col>
85 </el-row> 91 </el-row>
@@ -179,6 +185,7 @@ @@ -179,6 +185,7 @@
179 } 185 }
180 }, 186 },
181 methods: { 187 methods: {
  188 +
182 reload() { 189 reload() {
183 this.$nextTick(function () { 190 this.$nextTick(function () {
184 this.$router.push({ 191 this.$router.push({
@@ -275,7 +282,8 @@ @@ -275,7 +282,8 @@
275 showMenu(i,status){ 282 showMenu(i,status){
276 this.$refs.menuColl 283 this.$refs.menuColl
277 apsed.getElementsByClassName('submenu-hook-'+i)[0].style.display=status?'block':'none'; 284 apsed.getElementsByClassName('submenu-hook-'+i)[0].style.display=status?'block':'none';
278 - } 285 + },
  286 +
279 }, 287 },
280 mounted() { 288 mounted() {
281 var _this = this; 289 var _this = this;
@@ -337,6 +345,7 @@ @@ -337,6 +345,7 @@
337 padding-right:10px; 345 padding-right:10px;
338 border-color: rgba(238,241,146,0.3); 346 border-color: rgba(238,241,146,0.3);
339 border-right-width: 0px; 347 border-right-width: 0px;
  348 + border-right-style: solid;
340 /*border-right-style: solid;*/ 349 /*border-right-style: solid;*/
341 img { 350 img {
342 width: 40px; 351 width: 40px;
@@ -348,7 +357,7 @@ @@ -348,7 +357,7 @@
348 } 357 }
349 } 358 }
350 .logo-width{ 359 .logo-width{
351 - width:300px; 360 + width:380px;
352 } 361 }
353 .logo-collapse-width{ 362 .logo-collapse-width{
354 width:60px 363 width:60px
@@ -359,11 +368,9 @@ @@ -359,11 +368,9 @@
359 height: 50px; 368 height: 50px;
360 line-height: 40px; 369 line-height: 40px;
361 cursor: pointer; 370 cursor: pointer;
362 -  
363 /*padding-left: 180px;*/ 371 /*padding-left: 180px;*/
364 /*padding-top: 60px;*/ 372 /*padding-top: 60px;*/
365 /*color: rgb(111,130,148);*/ 373 /*color: rgb(111,130,148);*/
366 -  
367 } 374 }
368 } 375 }
369 .main { 376 .main {
@@ -376,8 +383,11 @@ @@ -376,8 +383,11 @@
376 aside { 383 aside {
377 flex:0 0 300px; 384 flex:0 0 300px;
378 width: 300px; 385 width: 300px;
379 - /*overflow-y: scroll;*/ 386 + overflow-x: hidden;
  387 + overflow-y: scroll;
  388 + position: relative;
380 background: rgb(38,56,76); 389 background: rgb(38,56,76);
  390 +
381 // position: absolute; 391 // position: absolute;
382 // top: 0px; 392 // top: 0px;
383 // bottom: 0px; 393 // bottom: 0px;
@@ -397,13 +407,19 @@ @@ -397,13 +407,19 @@
397 407
398 } 408 }
399 } 409 }
  410 + aside::-webkit-scrollbar {
  411 + width: 0 !important;
  412 + }
  413 + aside::-webkit-scrollbar {
  414 + width: 0 !important;height: 0;
  415 + }
400 .menu-collapsed{ 416 .menu-collapsed{
401 flex:0 0 60px; 417 flex:0 0 60px;
402 - width: 60px; 418 + width: 230px;
403 } 419 }
404 .menu-expanded{ 420 .menu-expanded{
405 /*底层滚动框宽度*/ 421 /*底层滚动框宽度*/
406 - flex:0 0 300px; 422 + flex:0 0 380px;
407 width: 230px; 423 width: 230px;
408 } 424 }
409 .menu-expanded ul{ 425 .menu-expanded ul{
@@ -484,4 +500,9 @@ @@ -484,4 +500,9 @@
484 } 500 }
485 } 501 }
486 } 502 }
  503 + .tabM{
  504 + display: inline-block;
  505 + min-width: 870px;
  506 + max-width: 1190px;
  507 + }
487 </style> 508 </style>
1 <template> 1 <template>
2 <div class="app-container"> 2 <div class="app-container">
3 - <div class="filter-container">  
4 - <el-button class="filter-item" type="primary" icon="el-icon-search" @click="handleAdd">导入</el-button> 3 + <div class="filter-container" style="margin-top: 15px">
  4 + <el-button size="small" class="filter-item" type="primary" icon="el-icon-search" @click="handleAdd">导入</el-button>
5 <el-input 5 <el-input
6 type="textarea" 6 type="textarea"
7 :rows="40" 7 :rows="40"
@@ -9,6 +9,7 @@ @@ -9,6 +9,7 @@
9 v-model="ffmtext"> 9 v-model="ffmtext">
10 </el-input> 10 </el-input>
11 </div> 11 </div>
  12 + <div style="margin-left: 1190px"></div>
12 </div> 13 </div>
13 </template> 14 </template>
14 15
1 <template> 1 <template>
2 <div class="app-container"> 2 <div class="app-container">
3 - <div class="filter-container">  
4 - <el-button class="filter-item" type="primary" icon="el-icon-search" @click="handleAdd">导入</el-button> 3 + <div class="filter-container" style="margin-top: 15px">
  4 + <el-button size="small" class="filter-item" type="primary" icon="el-icon-search" @click="handleAdd">导入</el-button>
5 <el-input 5 <el-input
6 type="textarea" 6 type="textarea"
7 :rows="40" 7 :rows="40"
@@ -9,6 +9,7 @@ @@ -9,6 +9,7 @@
9 v-model="ffmtext"> 9 v-model="ffmtext">
10 </el-input> 10 </el-input>
11 </div> 11 </div>
  12 + <div style="margin-left: 1190px"></div>
12 </div> 13 </div>
13 </template> 14 </template>
14 15
1 <template> 1 <template>
2 <div class="app-container"> 2 <div class="app-container">
3 - <div class="filter-container">  
4 - <el-button class="filter-item" type="primary" icon="el-icon-search" @click="handleAdd">导入</el-button> 3 + <div class="filter-container" style="margin-top: 15px">
  4 + <el-button size="small" class="filter-item" type="primary" icon="el-icon-search" @click="handleAdd">导入</el-button>
5 <el-input 5 <el-input
6 type="textarea" 6 type="textarea"
7 :rows="40" 7 :rows="40"
@@ -9,6 +9,7 @@ @@ -9,6 +9,7 @@
9 v-model="ffmtext"> 9 v-model="ffmtext">
10 </el-input> 10 </el-input>
11 </div> 11 </div>
  12 + <div style="margin-left: 1190px"></div>
12 </div> 13 </div>
13 </template> 14 </template>
14 15
@@ -44,4 +45,11 @@ @@ -44,4 +45,11 @@
44 </script> 45 </script>
45 46
46 <style> 47 <style>
  48 + .app-container{
  49 + height: 550px;
  50 + overflow:auto;
  51 + }
  52 + .filter-item{
  53 + margin-top: 20px;
  54 + }
47 </style> 55 </style>
@@ -94,6 +94,132 @@ @@ -94,6 +94,132 @@
94 </div> 94 </div>
95 </a> 95 </a>
96 </li> 96 </li>
  97 + <li>
  98 + <a>
  99 + <div style="display: flex">
  100 + <div class="demo-basic--circle" >
  101 + <div class="block"><el-avatar :size="60" :src="circleUrls"></el-avatar></div>
  102 + </div>
  103 + </div>
  104 + <div style="padding-left: 10px;width: 100%">
  105 + <div class="father">
  106 + <h4 style="display: inline-block;line-height: 0px">{{name}}</h4>
  107 + <div class="sun">{{time}}</div>
  108 + <div style="background-color: rgb(245,108,108);display: inline-block;color: #FFFFFF;
  109 + width:30px;height:20px;line-height:20px;text-align:center;border-radius: 6.25rem;margin-left: 220px">
  110 + {{count}}</div>
  111 + </div>
  112 + <div style="margin: 0px;height: 30px">
  113 + <span style="margin: 0;display: inline-block;width: 85%;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">{{content}}</span>
  114 + </div>
  115 + </div>
  116 + </a>
  117 + </li>
  118 + <li>
  119 + <a>
  120 + <div style="display: flex">
  121 + <div class="demo-basic--circle" >
  122 + <div class="block"><el-avatar :size="60" :src="circleUrls"></el-avatar></div>
  123 + </div>
  124 + </div>
  125 + <div style="padding-left: 10px;width: 100%">
  126 + <div class="father">
  127 + <h4 style="display: inline-block;line-height: 0px">{{name}}</h4>
  128 + <div class="sun">{{time}}</div>
  129 + <div style="background-color: rgb(245,108,108);display: inline-block;color: #FFFFFF;
  130 + width:30px;height:20px;line-height:20px;text-align:center;border-radius: 6.25rem;margin-left: 220px">
  131 + {{count}}</div>
  132 + </div>
  133 + <div style="margin: 0px;height: 30px">
  134 + <span style="margin: 0;display: inline-block;width: 85%;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">{{content}}</span>
  135 + </div>
  136 + </div>
  137 + </a>
  138 + </li>
  139 + <li>
  140 + <a>
  141 + <div style="display: flex">
  142 + <div class="demo-basic--circle" >
  143 + <div class="block"><el-avatar :size="60" :src="circleUrls"></el-avatar></div>
  144 + </div>
  145 + </div>
  146 + <div style="padding-left: 10px;width: 100%">
  147 + <div class="father">
  148 + <h4 style="display: inline-block;line-height: 0px">{{name}}</h4>
  149 + <div class="sun">{{time}}</div>
  150 + <div style="background-color: rgb(245,108,108);display: inline-block;color: #FFFFFF;
  151 + width:30px;height:20px;line-height:20px;text-align:center;border-radius: 6.25rem;margin-left: 220px">
  152 + {{count}}</div>
  153 + </div>
  154 + <div style="margin: 0px;height: 30px">
  155 + <span style="margin: 0;display: inline-block;width: 85%;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">{{content}}</span>
  156 + </div>
  157 + </div>
  158 + </a>
  159 + </li>
  160 + <li>
  161 + <a>
  162 + <div style="display: flex">
  163 + <div class="demo-basic--circle" >
  164 + <div class="block"><el-avatar :size="60" :src="circleUrls"></el-avatar></div>
  165 + </div>
  166 + </div>
  167 + <div style="padding-left: 10px;width: 100%">
  168 + <div class="father">
  169 + <h4 style="display: inline-block;line-height: 0px">{{name}}</h4>
  170 + <div class="sun">{{time}}</div>
  171 + <div style="background-color: rgb(245,108,108);display: inline-block;color: #FFFFFF;
  172 + width:30px;height:20px;line-height:20px;text-align:center;border-radius: 6.25rem;margin-left: 220px">
  173 + {{count}}</div>
  174 + </div>
  175 + <div style="margin: 0px;height: 30px">
  176 + <span style="margin: 0;display: inline-block;width: 85%;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">{{content}}</span>
  177 + </div>
  178 + </div>
  179 + </a>
  180 + </li>
  181 + <li>
  182 + <a>
  183 + <div style="display: flex">
  184 + <div class="demo-basic--circle" >
  185 + <div class="block"><el-avatar :size="60" :src="circleUrls"></el-avatar></div>
  186 + </div>
  187 + </div>
  188 + <div style="padding-left: 10px;width: 100%">
  189 + <div class="father">
  190 + <h4 style="display: inline-block;line-height: 0px">{{name}}</h4>
  191 + <div class="sun">{{time}}</div>
  192 + <div style="background-color: rgb(245,108,108);display: inline-block;color: #FFFFFF;
  193 + width:30px;height:20px;line-height:20px;text-align:center;border-radius: 6.25rem;margin-left: 220px">
  194 + {{count}}</div>
  195 + </div>
  196 + <div style="margin: 0px;height: 30px">
  197 + <span style="margin: 0;display: inline-block;width: 85%;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">{{content}}</span>
  198 + </div>
  199 + </div>
  200 + </a>
  201 + </li>
  202 + <li>
  203 + <a>
  204 + <div style="display: flex">
  205 + <div class="demo-basic--circle" >
  206 + <div class="block"><el-avatar :size="60" :src="circleUrls"></el-avatar></div>
  207 + </div>
  208 + </div>
  209 + <div style="padding-left: 10px;width: 100%">
  210 + <div class="father">
  211 + <h4 style="display: inline-block;line-height: 0px">{{name}}</h4>
  212 + <div class="sun">{{time}}</div>
  213 + <div style="background-color: rgb(245,108,108);display: inline-block;color: #FFFFFF;
  214 + width:30px;height:20px;line-height:20px;text-align:center;border-radius: 6.25rem;margin-left: 220px">
  215 + {{count}}</div>
  216 + </div>
  217 + <div style="margin: 0px;height: 30px">
  218 + <span style="margin: 0;display: inline-block;width: 85%;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">{{content}}</span>
  219 + </div>
  220 + </div>
  221 + </a>
  222 + </li>
97 </ul> 223 </ul>
98 </el-aside> 224 </el-aside>
99 <!-- 对话框--> 225 <!-- 对话框-->
@@ -4,13 +4,13 @@ @@ -4,13 +4,13 @@
4 <el-col :span="24" class="toolbar" style="padding-bottom: 0px;"> 4 <el-col :span="24" class="toolbar" style="padding-bottom: 0px;">
5 <el-form :inline="true" :model="filters"> 5 <el-form :inline="true" :model="filters">
6 <el-form-item> 6 <el-form-item>
7 - <el-input v-model="filters.companyName" placeholder="关键字查询"></el-input> 7 + <el-input size="small" v-model="filters.companyName" placeholder="关键字查询"></el-input>
8 </el-form-item> 8 </el-form-item>
9 <el-form-item> 9 <el-form-item>
10 - <el-button type="warning" style="width:150px" size="medium" icon="el-icon-plus" v-on:click="getConsigner()">查询</el-button> 10 + <el-button type="warning" style="width:150px" size="small" icon="el-icon-plus" v-on:click="getConsigner()">查询</el-button>
11 </el-form-item> 11 </el-form-item>
12 <el-form-item> 12 <el-form-item>
13 - <el-button type="primary" style="width:150px" size="medium" icon="el-icon-plus" @click="companyAdd">新增</el-button> 13 + <el-button type="primary" style="width:150px" size="small" icon="el-icon-plus" @click="companyAdd">新增</el-button>
14 </el-form-item> 14 </el-form-item>
15 </el-form> 15 </el-form>
16 </el-col> 16 </el-col>
@@ -4,13 +4,13 @@ @@ -4,13 +4,13 @@
4 <el-col :span="24" class="toolbar" style="padding-bottom: 0px;"> 4 <el-col :span="24" class="toolbar" style="padding-bottom: 0px;">
5 <el-form :inline="true" :model="filters"> 5 <el-form :inline="true" :model="filters">
6 <el-form-item> 6 <el-form-item>
7 - <el-input v-model="filters.companyName" placeholder="关键字查询"></el-input> 7 + <el-input size="small" v-model="filters.companyName" placeholder="关键字查询"></el-input>
8 </el-form-item> 8 </el-form-item>
9 <el-form-item> 9 <el-form-item>
10 - <el-button type="warning" style="width:150px" size="medium" icon="el-icon-plus" v-on:click="getConsigner()">查询</el-button> 10 + <el-button type="warning" style="width:150px" size="small" icon="el-icon-plus" v-on:click="getConsigner()">查询</el-button>
11 </el-form-item> 11 </el-form-item>
12 <el-form-item> 12 <el-form-item>
13 - <el-button type="primary" style="width:150px" size="medium" icon="el-icon-plus" @click="companyAdd">新增</el-button> 13 + <el-button type="primary" style="width:150px" size="small" icon="el-icon-plus" @click="companyAdd">新增</el-button>
14 </el-form-item> 14 </el-form-item>
15 </el-form> 15 </el-form>
16 </el-col> 16 </el-col>
1 <template> 1 <template>
2 - <el-container> 2 + <el-container style="height: 550px;overflow:auto;">
3 <el-main> 3 <el-main>
4 <el-row> 4 <el-row>
5 <el-col :span="24"> 5 <el-col :span="24">
@@ -9,19 +9,19 @@ @@ -9,19 +9,19 @@
9 <!-- 搜索区域--> 9 <!-- 搜索区域-->
10 <el-row> 10 <el-row>
11 <el-form :inline="true" :model="formInline" class="demo-form-inline"> 11 <el-form :inline="true" :model="formInline" class="demo-form-inline">
12 - <el-col :span="5"> 12 + <el-col :span="8">
13 <el-form-item label="航班号"> 13 <el-form-item label="航班号">
14 - <el-input v-model="formInline.flightNo" placeholder="请输入航班号"></el-input> 14 + <el-input size="small" v-model="formInline.flightNo" placeholder="请输入航班号"></el-input>
15 </el-form-item> 15 </el-form-item>
16 </el-col> 16 </el-col>
17 <el-col :span="4"> 17 <el-col :span="4">
18 <el-form-item> 18 <el-form-item>
19 - <el-button type="primary" @click="onSubmit">查询</el-button> 19 + <el-button size="small" type="primary" @click="onSubmit">查询</el-button>
20 </el-form-item> 20 </el-form-item>
21 </el-col> 21 </el-col>
22 <el-col :span="4"> 22 <el-col :span="4">
23 <el-form-item> 23 <el-form-item>
24 - <el-select v-model="formInline.operation" placeholder="航班操作" style="margin-left: 50px"> 24 + <el-select v-model="formInline.operation" placeholder="航班操作" style="margin-left: 50px" size="small">
25 <el-option 25 <el-option
26 v-for="item in operation" 26 v-for="item in operation"
27 :key="item.value" 27 :key="item.value"
@@ -91,19 +91,21 @@ @@ -91,19 +91,21 @@
91 label="配载重量"> 91 label="配载重量">
92 </el-table-column> 92 </el-table-column>
93 </el-table> 93 </el-table>
94 - <div style="margin-top:5px;margin-left: 20px">  
95 - <el-button @click="dialogFormVisible = true">待运导入</el-button>  
96 - <el-button>装箱</el-button>  
97 - <el-button>部分装箱</el-button>  
98 - <el-button>放散舱</el-button>  
99 - <el-button>部分放散舱</el-button>  
100 - <el-button @click="dialogTableVisible = true">正式舱单</el-button>  
101 - <el-button>地勤交接</el-button>  
102 - <el-button @click="dialogFormVisible3 = true">转配</el-button>  
103 - <el-button>航班文件</el-button>  
104 - <el-button type="primary" >散货配上</el-button>  
105 - <el-button type="success">卸下</el-button>  
106 - <el-button type="warning">运单保存</el-button> 94 + <div style="margin-top:15px;margin-left: 20px">
  95 + <el-button size="small" @click="dialogFormVisible = true">待运导入</el-button>
  96 + <el-button size="small">装箱</el-button>
  97 + <el-button size="small">部分装箱</el-button>
  98 + <el-button size="small">放散舱</el-button>
  99 + <el-button size="small">部分放散舱</el-button>
  100 + <el-button size="small" @click="dialogTableVisible = true">正式舱单</el-button>
  101 + <el-button size="small">地勤交接</el-button>
  102 + <el-button size="small" @click="dialogFormVisible3 = true">转配</el-button>
  103 + <el-button size="small">航班文件</el-button>
  104 + </div>
  105 + <div style="margin-top:15px;margin-left: 20px">
  106 + <el-button size="small" type="primary" >散货配上</el-button>
  107 + <el-button size="small" type="success">卸下</el-button>
  108 + <el-button size="small" type="warning">运单保存</el-button>
107 </div> 109 </div>
108 </el-row> 110 </el-row>
109 <!-- 表单①待运导入按钮弹框--> 111 <!-- 表单①待运导入按钮弹框-->
@@ -499,10 +501,11 @@ @@ -499,10 +501,11 @@
499 </el-table-column> 501 </el-table-column>
500 </el-table> 502 </el-table>
501 </el-row> 503 </el-row>
502 - <div style="margin-left: 970px">  
503 - <el-button type="primary">板箱配上</el-button>  
504 - <el-button type="success">卸下</el-button> 504 + <div style="margin-top: 15px;margin-left: 20px">
  505 + <el-button size="small" type="primary">板箱配上</el-button>
  506 + <el-button size="small" type="success">卸下</el-button>
505 </div> 507 </div>
  508 + <div style="margin-left: 1190px"></div>
506 </el-main> 509 </el-main>
507 </el-container> 510 </el-container>
508 </template> 511 </template>
1 <template> 1 <template>
2 - <el-container> 2 + <el-container style="height: 550px;overflow:auto;">
3 <el-main> 3 <el-main>
4 <el-row> 4 <el-row>
5 <el-col :span="24"> 5 <el-col :span="24">
@@ -14,25 +14,25 @@ @@ -14,25 +14,25 @@
14 <el-row> 14 <el-row>
15 <el-col :span="6"> 15 <el-col :span="6">
16 <el-form-item label="运单号"> 16 <el-form-item label="运单号">
17 - <el-input v-model="form.name"></el-input> 17 + <el-input size="small" v-model="form.name"></el-input>
18 </el-form-item> 18 </el-form-item>
19 </el-col> 19 </el-col>
20 <el-col :span="6"> 20 <el-col :span="6">
21 <el-form-item label=""> 21 <el-form-item label="">
22 - <el-button @click="">挑单</el-button>  
23 - <el-button @click="">批量挑单</el-button> 22 + <el-button size="small" @click="">挑单</el-button>
  23 + <el-button size="small" @click="">批量挑单</el-button>
24 </el-form-item> 24 </el-form-item>
25 </el-col> 25 </el-col>
26 </el-row> 26 </el-row>
27 <el-row> 27 <el-row>
28 <el-col :span="6"> 28 <el-col :span="6">
29 <el-form-item label="结算客户"> 29 <el-form-item label="结算客户">
30 - <el-input v-model="form.name"></el-input> 30 + <el-input size="small" v-model="form.name"></el-input>
31 </el-form-item> 31 </el-form-item>
32 </el-col> 32 </el-col>
33 <el-col :span="6"> 33 <el-col :span="6">
34 <el-form-item label="付款方式" :label-width="formLabelWidth"> 34 <el-form-item label="付款方式" :label-width="formLabelWidth">
35 - <el-select v-model="form.waybillNo" placeholder="请选择"> 35 + <el-select size="small" v-model="form.waybillNo" placeholder="请选择">
36 <el-option label="方式一" value="yi"></el-option> 36 <el-option label="方式一" value="yi"></el-option>
37 <el-option label="方式二" value="er"></el-option> 37 <el-option label="方式二" value="er"></el-option>
38 </el-select> 38 </el-select>
@@ -42,15 +42,13 @@ @@ -42,15 +42,13 @@
42 <el-row> 42 <el-row>
43 <el-table 43 <el-table
44 :data="tableData" 44 :data="tableData"
45 - style="width: 100%"  
46 - row-key="id"  
47 - border  
48 - lazy  
49 - :load="load" 45 + style="border-radius: 10px 10px 0px 0px;line-height: 25px"
  46 + :header-cell-style="{background:'#6F8294',color:'#FFFFFF'}" size="small"
50 :tree-props="{children: 'children', hasChildren: 'hasChildren'}"> 47 :tree-props="{children: 'children', hasChildren: 'hasChildren'}">
51 <el-table-column 48 <el-table-column
52 prop="date" 49 prop="date"
53 - label="状态"> 50 + label="状态"
  51 + width="55">
54 </el-table-column> 52 </el-table-column>
55 <el-table-column 53 <el-table-column
56 prop="name" 54 prop="name"
@@ -98,19 +96,24 @@ @@ -98,19 +96,24 @@
98 </el-table-column> 96 </el-table-column>
99 <el-table-column 97 <el-table-column
100 prop="address" 98 prop="address"
101 - label="收/发货人"> 99 + label="收/发货人"
  100 + fixed="right">
102 </el-table-column> 101 </el-table-column>
103 </el-table> 102 </el-table>
104 </el-row> 103 </el-row>
105 - <div>  
106 - <el-button @click="">清除</el-button>  
107 - <el-button @click="">核对并现结结算</el-button>  
108 - <el-button @click="">导出</el-button>  
109 - <el-button @click="">打印</el-button> 104 + <div style="margin-top: 15px;margin-left: 20px">
  105 + <el-button size="small" @click="">清除</el-button>
  106 + <el-button size="small" @click="">核对并现结结算</el-button>
  107 + <el-button size="small" @click="">导出</el-button>
  108 + <el-button size="small" @click="">打印</el-button>
  109 + </div>
  110 + <div style="margin-left: 1190px">
110 </div> 111 </div>
111 </el-form> 112 </el-form>
112 </el-tab-pane> 113 </el-tab-pane>
113 <el-tab-pane label="已结算" name="second">已结算</el-tab-pane> 114 <el-tab-pane label="已结算" name="second">已结算</el-tab-pane>
  115 + <div style="margin-left: 1190px">
  116 + </div>
114 </el-tabs> 117 </el-tabs>
115 </el-row> 118 </el-row>
116 </el-main> 119 </el-main>
1 <template> 1 <template>
2 - <el-container> 2 + <el-container style="height: 550px;overflow:auto;">
3 <el-main> 3 <el-main>
4 <el-row> 4 <el-row>
5 <el-col :span="24"> 5 <el-col :span="24">
@@ -9,19 +9,19 @@ @@ -9,19 +9,19 @@
9 <!-- 搜索区域--> 9 <!-- 搜索区域-->
10 <el-row> 10 <el-row>
11 <el-form :inline="true" :model="formInline" class="demo-form-inline"> 11 <el-form :inline="true" :model="formInline" class="demo-form-inline">
12 - <el-col :span="5"> 12 + <el-col :span="8">
13 <el-form-item label="航班号"> 13 <el-form-item label="航班号">
14 - <el-input v-model="formInline.flightNo" placeholder="请输入航班号"></el-input> 14 + <el-input size="small" v-model="formInline.flightNo" placeholder="请输入航班号"></el-input>
15 </el-form-item> 15 </el-form-item>
16 </el-col> 16 </el-col>
17 <el-col :span="4"> 17 <el-col :span="4">
18 <el-form-item> 18 <el-form-item>
19 - <el-button type="primary" @click="onSubmit">查询</el-button> 19 + <el-button size="small" type="primary" @click="onSubmit">查询</el-button>
20 </el-form-item> 20 </el-form-item>
21 </el-col> 21 </el-col>
22 <el-col :span="4"> 22 <el-col :span="4">
23 <el-form-item> 23 <el-form-item>
24 - <el-select v-model="formInline.operation" placeholder="航班操作" style="margin-left: 50px"> 24 + <el-select size="small" v-model="formInline.operation" placeholder="航班操作" style="margin-left: 50px">
25 <el-option 25 <el-option
26 v-for="item in operation" 26 v-for="item in operation"
27 :key="item.value" 27 :key="item.value"
@@ -39,10 +39,9 @@ @@ -39,10 +39,9 @@
39 <el-tab-pane label="舱单" name="first"> 39 <el-tab-pane label="舱单" name="first">
40 <el-table 40 <el-table
41 :data="tableData" 41 :data="tableData"
42 - style="width: 100%"  
43 - row-key="id"  
44 - border  
45 - lazy 42 + tooltip-effect="dark"
  43 + style="border-radius: 10px 10px 0px 0px;line-height: 25px;"
  44 + :header-cell-style="{background:'#6F8294',color:'#FFFFFF'}" size="small"
46 :load="load" 45 :load="load"
47 :tree-props="{children: 'children', hasChildren: 'hasChildren'}"> 46 :tree-props="{children: 'children', hasChildren: 'hasChildren'}">
48 <el-table-column 47 <el-table-column
@@ -63,7 +62,8 @@ @@ -63,7 +62,8 @@
63 </el-table-column> 62 </el-table-column>
64 <el-table-column 63 <el-table-column
65 prop="code" 64 prop="code"
66 - label="特殊处理代码"> 65 + label="特殊处理代码"
  66 + width="95">
67 </el-table-column> 67 </el-table-column>
68 <el-table-column 68 <el-table-column
69 prop="productName" 69 prop="productName"
@@ -95,7 +95,7 @@ @@ -95,7 +95,7 @@
95 <el-row> 95 <el-row>
96 <el-col :span="6"> 96 <el-col :span="6">
97 <el-form-item label="ULD类别"> 97 <el-form-item label="ULD类别">
98 - <el-select v-model="form.type" placeholder="请选择"> 98 + <el-select size="small" v-model="form.type" placeholder="请选择">
99 <el-option label="ULD" value="ULD"></el-option> 99 <el-option label="ULD" value="ULD"></el-option>
100 <el-option label="其他" value="其他"></el-option> 100 <el-option label="其他" value="其他"></el-option>
101 </el-select> 101 </el-select>
@@ -103,76 +103,76 @@ @@ -103,76 +103,76 @@
103 </el-col> 103 </el-col>
104 <el-col :span="6"> 104 <el-col :span="6">
105 <el-form-item label="ULD号"> 105 <el-form-item label="ULD号">
106 - <el-input v-model="form.uldNo"></el-input> 106 + <el-input size="small" v-model="form.uldNo"></el-input>
107 </el-form-item> 107 </el-form-item>
108 </el-col> 108 </el-col>
109 <el-col :span="6"> 109 <el-col :span="6">
110 <el-form-item label=""> 110 <el-form-item label="">
111 - <el-button>添加ULD</el-button>  
112 - <el-button>清空ULD</el-button> 111 + <el-button size="small">添加ULD</el-button>
  112 + <el-button size="small">清空ULD</el-button>
113 </el-form-item> 113 </el-form-item>
114 </el-col> 114 </el-col>
115 </el-row> 115 </el-row>
116 <el-row> 116 <el-row>
117 <el-col :span="6"> 117 <el-col :span="6">
118 <el-form-item label="运单号"> 118 <el-form-item label="运单号">
119 - <el-input v-model="form.waybillNo"></el-input> 119 + <el-input size="small" v-model="form.waybillNo"></el-input>
120 </el-form-item> 120 </el-form-item>
121 </el-col> 121 </el-col>
122 <el-col :span="6"> 122 <el-col :span="6">
123 <el-form-item label="件数"> 123 <el-form-item label="件数">
124 - <el-input v-model="form.number"></el-input> 124 + <el-input size="small" v-model="form.number"></el-input>
125 </el-form-item> 125 </el-form-item>
126 </el-col> 126 </el-col>
127 <el-col :span="6"> 127 <el-col :span="6">
128 <el-form-item label="重量"> 128 <el-form-item label="重量">
129 - <el-input v-model="form.weight"></el-input> 129 + <el-input size="small" v-model="form.weight"></el-input>
130 </el-form-item> 130 </el-form-item>
131 </el-col> 131 </el-col>
132 </el-row> 132 </el-row>
133 <el-row> 133 <el-row>
134 <el-col :span="6"> 134 <el-col :span="6">
135 <el-form-item label="配载件数"> 135 <el-form-item label="配载件数">
136 - <el-input v-model="form.assembling"></el-input> 136 + <el-input size="small" v-model="form.assembling"></el-input>
137 </el-form-item> 137 </el-form-item>
138 </el-col> 138 </el-col>
139 <el-col :span="6"> 139 <el-col :span="6">
140 <el-form-item label="配载重量"> 140 <el-form-item label="配载重量">
141 - <el-input v-model="form.stowage"></el-input> 141 + <el-input size="small" v-model="form.stowage"></el-input>
142 </el-form-item> 142 </el-form-item>
143 </el-col> 143 </el-col>
144 <el-col :span="6"> 144 <el-col :span="6">
145 <el-form-item label="配载体积"> 145 <el-form-item label="配载体积">
146 - <el-input v-model="form.stowageVol"></el-input> 146 + <el-input size="small" v-model="form.stowageVol"></el-input>
147 </el-form-item> 147 </el-form-item>
148 </el-col> 148 </el-col>
149 </el-row> 149 </el-row>
150 <el-row> 150 <el-row>
151 <el-col :span="6"> 151 <el-col :span="6">
152 <el-form-item label="特货代码"> 152 <el-form-item label="特货代码">
153 - <el-input v-model="form.code"></el-input> 153 + <el-input size="small" v-model="form.code"></el-input>
154 </el-form-item> 154 </el-form-item>
155 </el-col> 155 </el-col>
156 <el-col :span="6"> 156 <el-col :span="6">
157 <el-form-item label="品名"> 157 <el-form-item label="品名">
158 - <el-input v-model="form.productName"></el-input> 158 + <el-input size="small" v-model="form.productName"></el-input>
159 </el-form-item> 159 </el-form-item>
160 </el-col> 160 </el-col>
161 <el-col :span="6"> 161 <el-col :span="6">
162 <el-form-item label="始发站"> 162 <el-form-item label="始发站">
163 - <el-input v-model="form.departure"></el-input> 163 + <el-input size="small" v-model="form.departure"></el-input>
164 </el-form-item> 164 </el-form-item>
165 </el-col> 165 </el-col>
166 </el-row> 166 </el-row>
167 <el-row> 167 <el-row>
168 <el-col :span="6"> 168 <el-col :span="6">
169 <el-form-item label="目的站"> 169 <el-form-item label="目的站">
170 - <el-input v-model="form.destination"></el-input> 170 + <el-input size="small" v-model="form.destination"></el-input>
171 </el-form-item> 171 </el-form-item>
172 </el-col> 172 </el-col>
173 <el-col :span="6"> 173 <el-col :span="6">
174 <el-form-item label="优先级"> 174 <el-form-item label="优先级">
175 - <el-select v-model="form.priority" placeholder="请选择"> 175 + <el-select size="small" v-model="form.priority" placeholder="请选择">
176 <el-option label="一" value="一"></el-option> 176 <el-option label="一" value="一"></el-option>
177 <el-option label="二" value="二"></el-option> 177 <el-option label="二" value="二"></el-option>
178 </el-select> 178 </el-select>
@@ -180,21 +180,23 @@ @@ -180,21 +180,23 @@
180 </el-col> 180 </el-col>
181 <el-col :span="6"> 181 <el-col :span="6">
182 <el-form-item label="备注"> 182 <el-form-item label="备注">
183 - <el-input v-model="form.remarks"></el-input> 183 + <el-input size="small" v-model="form.remarks"></el-input>
184 </el-form-item> 184 </el-form-item>
185 </el-col> 185 </el-col>
186 </el-row> 186 </el-row>
187 </el-form> 187 </el-form>
188 </el-tab-pane> 188 </el-tab-pane>
189 </el-tabs> 189 </el-tabs>
190 - <div>  
191 - <el-button>导入舱单</el-button>  
192 - <el-button>舱单保存</el-button>  
193 - <el-button>发送FFM</el-button>  
194 - <el-button>发送H2000舱单报</el-button>  
195 - <el-button>不正常检查</el-button>  
196 - <el-button @click="dialogTableVisible = true">打印</el-button>  
197 - <el-button>打印标签</el-button> 190 + <div style="margin-top: 15px;margin-left: 20px">
  191 + <el-button size="small">导入舱单</el-button>
  192 + <el-button size="small">舱单保存</el-button>
  193 + <el-button size="small">发送FFM</el-button>
  194 + <el-button size="small">发送H2000舱单报</el-button>
  195 + <el-button size="small">不正常检查</el-button>
  196 + <el-button size="small" @click="dialogTableVisible = true">打印</el-button>
  197 + <el-button size="small">打印标签</el-button>
  198 + </div>
  199 + <div style="margin-left: 1190px">
198 </div> 200 </div>
199 </el-row> 201 </el-row>
200 <!-- 航班文件 打印按钮--> 202 <!-- 航班文件 打印按钮-->
@@ -279,6 +281,13 @@ @@ -279,6 +281,13 @@
279 export default { 281 export default {
280 data() { 282 data() {
281 return { 283 return {
  284 + operation: [{
  285 + value: '操作1',
  286 + label: '操作1'
  287 + }, {
  288 + value: '操作2',
  289 + label: '操作2'
  290 + }],
282 formInline: { 291 formInline: {
283 flightNo: undefined, 292 flightNo: undefined,
284 operation: undefined 293 operation: undefined
@@ -314,4 +323,4 @@ @@ -314,4 +323,4 @@
314 323
315 <style scoped> 324 <style scoped>
316 325
317 -</style>  
  326 +</style>
1 <template> 1 <template>
2 - <el-container> 2 + <el-container style="height: 550px;overflow:auto;">
3 <el-main> 3 <el-main>
4 <el-row> 4 <el-row>
5 <el-col :span="24"> 5 <el-col :span="24">
@@ -9,19 +9,19 @@ @@ -9,19 +9,19 @@
9 <!-- 搜索区域--> 9 <!-- 搜索区域-->
10 <el-row> 10 <el-row>
11 <el-form :inline="true" :model="formInline" class="demo-form-inline"> 11 <el-form :inline="true" :model="formInline" class="demo-form-inline">
12 - <el-col :span="5"> 12 + <el-col :span="8">
13 <el-form-item label="航班号"> 13 <el-form-item label="航班号">
14 - <el-input v-model="formInline.flightNo" placeholder="请输入航班号"></el-input> 14 + <el-input size="small" v-model="formInline.flightNo" placeholder="请输入航班号"></el-input>
15 </el-form-item> 15 </el-form-item>
16 </el-col> 16 </el-col>
17 <el-col :span="4"> 17 <el-col :span="4">
18 <el-form-item> 18 <el-form-item>
19 - <el-button type="primary" @click="onSubmit">查询</el-button> 19 + <el-button size="small" type="primary" @click="onSubmit">查询</el-button>
20 </el-form-item> 20 </el-form-item>
21 </el-col> 21 </el-col>
22 <el-col :span="4"> 22 <el-col :span="4">
23 <el-form-item> 23 <el-form-item>
24 - <el-select v-model="formInline.operation" placeholder="航班操作" style="margin-left: 50px"> 24 + <el-select size="small" v-model="formInline.operation" placeholder="航班操作" style="margin-left: 50px">
25 <el-option 25 <el-option
26 v-for="item in operation" 26 v-for="item in operation"
27 :key="item.value" 27 :key="item.value"
@@ -67,11 +67,13 @@ @@ -67,11 +67,13 @@
67 label="品名"> 67 label="品名">
68 </el-table-column> 68 </el-table-column>
69 </el-table> 69 </el-table>
70 - <div style="margin-top:5px;margin-left: 1000px">  
71 - <el-button type="primary" >配上</el-button>  
72 - <el-button type="success" @click="dialogFormVisible = true">新增</el-button>  
73 - <el-button type="warning" @click="dialogForm1Visible = true">导入</el-button> 70 + <div style="margin-top:15px;margin-left: 20px">
  71 + <el-button size="small" type="primary" >配上</el-button>
  72 + <el-button size="small" type="success" @click="dialogFormVisible = true">新增</el-button>
  73 + <el-button size="small" type="warning" @click="dialogForm1Visible = true">导入</el-button>
74 </div> 74 </div>
  75 + <div style="margin-left: 1190px"></div>
  76 +
75 </el-row> 77 </el-row>
76 <!-- 表单①新增按钮弹框--> 78 <!-- 表单①新增按钮弹框-->
77 <el-row > 79 <el-row >
@@ -300,11 +302,12 @@ @@ -300,11 +302,12 @@
300 label="机仓位"> 302 label="机仓位">
301 </el-table-column> 303 </el-table-column>
302 </el-table> 304 </el-table>
303 - <div style="margin-top:5px;margin-left: 1000px">  
304 - <el-button type="primary" >拉下</el-button>  
305 - <el-button type="success" @click="dialogFormVisibles = true">新增</el-button>  
306 - <el-button type="danger" >删除</el-button> 305 + <div style="margin-top:15px;margin-left: 20px">
  306 + <el-button size="small" type="primary" >拉下</el-button>
  307 + <el-button size="small" type="success" @click="dialogFormVisibles = true">新增</el-button>
  308 + <el-button size="small" type="danger" >删除</el-button>
307 </div> 309 </div>
  310 + <div style="margin-left: 1190px"></div>
308 </el-row> 311 </el-row>
309 <!-- 表单②新增按钮弹框--> 312 <!-- 表单②新增按钮弹框-->
310 <el-row> 313 <el-row>
@@ -2,21 +2,24 @@ @@ -2,21 +2,24 @@
2 <section> 2 <section>
3 <!-- 工具条--> 3 <!-- 工具条-->
4 <el-row class="toolbar" style="padding-bottom: 0px;"> 4 <el-row class="toolbar" style="padding-bottom: 0px;">
5 - <el-form :inline="true" ref="form" :model="filters">  
6 - <el-row>  
7 - <el-col :span="5"> 5 + <el-form :inline="true" ref="form" :model="filters" style="text-align: right">
  6 + <el-row style="margin-top: -10px">
  7 + <el-col :span="8">
8 <el-form-item label="车牌号："> 8 <el-form-item label="车牌号：">
9 - <el-input v-model="filters.trailerFrameNo" placeholder="" size="small"style="width: 120px"></el-input> 9 + <el-input v-model="filters.trailerFrameNo" placeholder="" size="small" style="width: 180px"></el-input>
10 </el-form-item> 10 </el-form-item>
11 </el-col> 11 </el-col>
12 - <el-col :span="5"> 12 + <el-col :span="8">
13 <el-form-item label="挂靠名称:"> 13 <el-form-item label="挂靠名称:">
14 - <el-input v-model="filters.agentname" placeholder="" size="small" style="width: 120px"></el-input> 14 + <el-input v-model="filters.agentname" placeholder="" size="small" style="width: 180px"></el-input>
15 </el-form-item> 15 </el-form-item>
16 </el-col> 16 </el-col>
17 - <el-col :span="5"> 17 +
  18 + </el-row>
  19 + <el-row style="margin-top: 0px">
  20 + <el-col :span="8">
18 <el-form-item label="目的场站:"> 21 <el-form-item label="目的场站:">
19 - <el-select v-model="filters.endstation" @change="aisleOption(filters.endstation)" clearable placeholder="请选择"> 22 + <el-select v-model="filters.endstation" @change="aisleOption(filters.endstation)" clearable placeholder="请选择" size="small" style="width: 180px">
20 <el-option 23 <el-option
21 v-for="item in options" 24 v-for="item in options"
22 :key="item.stationId" 25 :key="item.stationId"
@@ -26,9 +29,9 @@ @@ -26,9 +29,9 @@
26 </el-select> 29 </el-select>
27 </el-form-item> 30 </el-form-item>
28 </el-col> 31 </el-col>
29 - <el-col :span="5"> 32 + <el-col :span="8">
30 <el-form-item label="卡口:" style="margin-left: 10px"> 33 <el-form-item label="卡口:" style="margin-left: 10px">
31 - <el-select v-model="filters.aisle" :disabled="disabled" placeholder="先选择目的场站" size="small" style="width: 150px"> 34 + <el-select v-model="filters.aisle" :disabled="disabled" placeholder="先选择目的场站" size="small" style="width: 180px">
32 <el-option 35 <el-option
33 v-for="item in aisleOptions" 36 v-for="item in aisleOptions"
34 :key="item.channel" 37 :key="item.channel"
@@ -38,9 +41,9 @@ @@ -38,9 +41,9 @@
38 </el-select> 41 </el-select>
39 </el-form-item> 42 </el-form-item>
40 </el-col> 43 </el-col>
41 - <el-col :span="2"> 44 + <el-col :span="4">
42 <el-form-item> 45 <el-form-item>
43 - <el-button type="primary" @click="getList()" size="small">查询</el-button> 46 + <el-button type="primary" @click="getList()" size="small" style="width: 100px">查询</el-button>
44 </el-form-item> 47 </el-form-item>
45 </el-col> 48 </el-col>
46 </el-row> 49 </el-row>
@@ -52,7 +55,8 @@ @@ -52,7 +55,8 @@
52 :data="businesstypeList" 55 :data="businesstypeList"
53 border 56 border
54 v-loading="businesstypeListLoading" 57 v-loading="businesstypeListLoading"
55 - style="width: 100%"> 58 + style="border-radius: 10px 10px 0px 0px;line-height: 25px;"
  59 + :header-cell-style="{background:'#6F8294',color:'#FFFFFF'}" size="small">
56 <el-table-column fixed prop="date" label="操作"> 60 <el-table-column fixed prop="date" label="操作">
57 <template slot-scope="scope"> 61 <template slot-scope="scope">
58 <el-button @click="selectOne(scope.$index, scope.row)" type="primary" size="small">查看</el-button> 62 <el-button @click="selectOne(scope.$index, scope.row)" type="primary" size="small">查看</el-button>
@@ -32,13 +32,13 @@ @@ -32,13 +32,13 @@
32 <div class="grid-content"> 32 <div class="grid-content">
33 <el-col :span="4"> 33 <el-col :span="4">
34 <div class="grid-content"> 34 <div class="grid-content">
35 - <el-input v-model="preQuery.awba" placeholder="请输入主单号" clearable></el-input> 35 + <el-input size="small" v-model="preQuery.awba" placeholder="请输入主单号" clearable></el-input>
36 </div> 36 </div>
37 </el-col> 37 </el-col>
38 <div class="grid-content el-btn"> 38 <div class="grid-content el-btn">
39 - <el-button type="warning" style="width:150px" size="medium" icon="el-icon-search" @click="handleSerach">查询</el-button>  
40 - <el-button v-if="preQuery.flightno === undefined && preData.length<1" type="primary"  
41 - style="width:150px" size="medium" icon="el-icon-plus" 39 + <el-button size="small" type="warning" style="width:150px" icon="el-icon-search" @click="handleSerach">查询</el-button>
  40 + <el-button size="small" v-if="preQuery.flightno === undefined && preData.length<1" type="primary"
  41 + style="width:150px" icon="el-icon-plus"
42 @click="handleAddpre">新增预配舱单 42 @click="handleAddpre">新增预配舱单
43 </el-button> 43 </el-button>
44 <el-upload 44 <el-upload
@@ -49,7 +49,7 @@ @@ -49,7 +49,7 @@
49 :on-exceed="fileExceed" 49 :on-exceed="fileExceed"
50 accept="application/vnd.ms-excel,application/vnd.ms-excels" 50 accept="application/vnd.ms-excel,application/vnd.ms-excels"
51 ref="fileupload"> 51 ref="fileupload">
52 - <el-button slot="trigger" style="width:150px" size="medium" icon="el-icon-folder-add" type="success">导入excel</el-button> 52 + <el-button slot="trigger" style="width:150px" size="small" icon="el-icon-folder-add" type="success">导入excel</el-button>
53 </el-upload> 53 </el-upload>
54 </div> 54 </div>
55 </div> 55 </div>
@@ -4,13 +4,13 @@ @@ -4,13 +4,13 @@
4 <el-col :span="24" class="toolbar" style="padding-bottom: 0px;"> 4 <el-col :span="24" class="toolbar" style="padding-bottom: 0px;">
5 <el-form :inline="true" :model="filters"> 5 <el-form :inline="true" :model="filters">
6 <el-form-item> 6 <el-form-item>
7 - <el-input v-model="filters.awba" placeholder="主单号查询"></el-input> 7 + <el-input size="small" v-model="filters.awba" placeholder="主单号查询"></el-input>
8 </el-form-item> 8 </el-form-item>
9 <el-form-item> 9 <el-form-item>
10 - <el-button type="warning" style="width:150px" size="medium" icon="el-icon-plus" v-on:click="getSecurity()">查询</el-button> 10 + <el-button type="warning" style="width:150px" size="small" icon="el-icon-plus" v-on:click="getSecurity()">查询</el-button>
11 </el-form-item> 11 </el-form-item>
12 <el-form-item> 12 <el-form-item>
13 - <el-button type="primary" style="width:150px" size="medium" icon="el-icon-plus" @click="companyAdd">新增</el-button> 13 + <el-button type="primary" style="width:150px" size="small" icon="el-icon-plus" @click="companyAdd">新增</el-button>
14 </el-form-item> 14 </el-form-item>
15 </el-form> 15 </el-form>
16 </el-col> 16 </el-col>
@@ -198,8 +198,8 @@ @@ -198,8 +198,8 @@
198 </el-row> 198 </el-row>
199 </el-form> 199 </el-form>
200 <div slot="footer" class="dialog-footer" align="center"> 200 <div slot="footer" class="dialog-footer" align="center">
201 - <el-button type="primary" size="medium" style="width: 100px" @click.native="editSubmit(0)">暂存</el-button>  
202 - <el-button type="success" size="medium" style="width: 120px" @click.native="editSubmit(1)">保存并发送</el-button> 201 + <el-button type="primary" size="small" style="width: 100px" @click.native="editSubmit(0)">暂存</el-button>
  202 + <el-button type="success" size="small" style="width: 120px" @click.native="editSubmit(1)">保存并发送</el-button>
203 </div> 203 </div>
204 </el-dialog> 204 </el-dialog>
205 <!--新增界面--> 205 <!--新增界面-->
@@ -345,8 +345,8 @@ @@ -345,8 +345,8 @@
345 </el-row> 345 </el-row>
346 </el-form> 346 </el-form>
347 <div slot="footer" class="dialog-footer" align="center"> 347 <div slot="footer" class="dialog-footer" align="center">
348 - <el-button type="primary" size="medium" style="width: 100px" @click.native="addSubmit(0)">暂存</el-button>  
349 - <el-button type="success" size="medium" style="width: 120px" @click.native="addSubmit(1)">保存并发送</el-button> 348 + <el-button type="primary" size="small" style="width: 100px" @click.native="addSubmit(0)">暂存</el-button>
  349 + <el-button type="success" size="small" style="width: 120px" @click.native="addSubmit(1)">保存并发送</el-button>
350 </div> 350 </div>
351 </el-dialog> 351 </el-dialog>
352 <!--打印界面--> 352 <!--打印界面-->