朱兆平 / vue_cli · 提交

转到一个项目

作者 小范
提交 549a1db9fae5e98a3d375c46b52b510aece8eef1 1 个父辈 14f237e0

易通链快速通关申报平台页面优化

内嵌 并排对比
正在显示 16 个修改的文件 包含 92 行增加 和 46 行删除
@@ -8,7 +8,7 @@ @@ -8,7 +8,7 @@
8 <div class="tools" @click.prevent="collapse" style="width: 15px;margin-top: 72px;margin-left:1px;z-index:9999;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 :class="[rotate?'go':'aa']" @click="start" width="23" height="49" src="data:img/png;base64,iVBORw0KGgoAAAANSUhEUgAAAB4AAABCCAYAAABAfGYuAAAArklEQVRYhe3YIQ4CMRBG4b+IOhyS26DXEjySBE6A4QSINasRSAx3guBJECTdLMn6dtp0Be8loz/Tjhh3OLVBEzSbAhUwMDAwMDAwMDAw8B/A5+PuNzEtF/NycGwDut9u6sIj6r2vB6eiRWALmg1b0SzYOWndrExoFhyC1F3vejxfdeGh9+er9nIz4dmPy4oX+U4WvNgCScWLrswRj4k7FzAwMDAwMDAwMDBwYnLqAfLHOpMP7/PBAAAAAElFTkSuQmCC"> 11 + <img :class="[rotate?'go':'aa']" @click="start" width="20" height="44" src="data:img/png;base64,iVBORw0KGgoAAAANSUhEUgAAAB4AAABCCAYAAABAfGYuAAAArklEQVRYhe3YIQ4CMRBG4b+IOhyS26DXEjySBE6A4QSINasRSAx3guBJECTdLMn6dtp0Be8loz/Tjhh3OLVBEzSbAhUwMDAwMDAwMDAw8B/A5+PuNzEtF/NycGwDut9u6sIj6r2vB6eiRWALmg1b0SzYOWndrExoFhyC1F3vejxfdeGh9+er9nIz4dmPy4oX+U4WvNgCScWLrswRj4k7FzAwMDAwMDAwMDBwYnLqAfLHOpMP7/PBAAAAAElFTkSuQmCC">
12 </div> 12 </div>
13 <!-- 标签i的图标 fa-align-justify--> 13 <!-- 标签i的图标 fa-align-justify-->
14 </el-col> 14 </el-col>
@@ -80,7 +80,7 @@ @@ -80,7 +80,7 @@
80 </li> 80 </li>
81 </ul> 81 </ul>
82 </aside> 82 </aside>
83 -<div class="tabM" v-bind:style="{width: myWidth}"> 83 +<div class="tabM">
84 <TabMenu></TabMenu> 84 <TabMenu></TabMenu>
85 </div> 85 </div>
86 86
@@ -506,8 +506,9 @@ @@ -506,8 +506,9 @@
506 } 506 }
507 .tabM{ 507 .tabM{
508 display: inline-block; 508 display: inline-block;
509 - min-width: 870px; 509 + min-width: 758px;
510 max-width: 1190px; 510 max-width: 1190px;
  511 + padding-right: 15px;
511 } 512 }
512 .go{ 513 .go{
513 transform:rotate(-180deg); 514 transform:rotate(-180deg);
@@ -29,7 +29,10 @@ @@ -29,7 +29,10 @@
29 </el-col> 29 </el-col>
30 30
31 <!--列表--> 31 <!--列表-->
32 - <el-table :data="processList" highlight-current-row v-loading="listLoading" @selection-change="selsChange" style="width: 100%;"> 32 + <el-table :data="processList" highlight-current-row v-loading="listLoading" @selection-change="selsChange"
  33 + tooltip-effect="dark"
  34 + style="border-radius: 10px 10px 0px 0px;line-height: 25px;"
  35 + :header-cell-style="{background:'#6F8294',color:'#FFFFFF'}" size="small">
33 <el-table-column type="selection" width="55"> 36 <el-table-column type="selection" width="55">
34 </el-table-column> 37 </el-table-column>
35 <el-table-column type="index" width="60"> 38 <el-table-column type="index" width="60">
@@ -40,7 +43,7 @@ @@ -40,7 +43,7 @@
40 </el-table-column> 43 </el-table-column>
41 <el-table-column prop="auditresuld" label="执行状态" min-width="80" :formatter="formatType" sortable> 44 <el-table-column prop="auditresuld" label="执行状态" min-width="80" :formatter="formatType" sortable>
42 </el-table-column> 45 </el-table-column>
43 - <el-table-column label="操作" min-width="260"> 46 + <el-table-column label="操作" min-width="260" fixed="right">
44 <template slot-scope="scope"> 47 <template slot-scope="scope">
45 <el-button size="small" @click="startJob(scope.$index, scope.row)">开始执行</el-button> 48 <el-button size="small" @click="startJob(scope.$index, scope.row)">开始执行</el-button>
46 <el-button size="small" @click="setPerm(scope.$index, scope.row)">完成任务</el-button> 49 <el-button size="small" @click="setPerm(scope.$index, scope.row)">完成任务</el-button>
@@ -499,4 +502,4 @@ @@ -499,4 +502,4 @@
499 502
500 <style scoped> 503 <style scoped>
501 504
502 -</style>  
  505 +</style>
@@ -28,7 +28,10 @@ @@ -28,7 +28,10 @@
28 </el-col> 28 </el-col>
29 29
30 <!--列表--> 30 <!--列表-->
31 - <el-table :data="processList" highlight-current-row v-loading="listLoading" @selection-change="selsChange" style="width: 100%;"> 31 + <el-table :data="processList" highlight-current-row v-loading="listLoading" @selection-change="selsChange"
  32 + tooltip-effect="dark"
  33 + style="border-radius: 10px 10px 0px 0px;line-height: 25px;"
  34 + :header-cell-style="{background:'#6F8294',color:'#FFFFFF'}" size="small">
32 <el-table-column type="selection" width="55"> 35 <el-table-column type="selection" width="55">
33 </el-table-column> 36 </el-table-column>
34 <el-table-column type="index" width="60"> 37 <el-table-column type="index" width="60">
@@ -54,7 +57,7 @@ @@ -54,7 +57,7 @@
54 </el-table-column> 57 </el-table-column>
55 <el-table-column prop="processstatus" label="工单状态" min-width="80" :formatter="formatState" sortable> 58 <el-table-column prop="processstatus" label="工单状态" min-width="80" :formatter="formatState" sortable>
56 </el-table-column> 59 </el-table-column>
57 - <el-table-column label="操作" min-width="260"> 60 + <el-table-column label="操作" min-width="260" fixed="right">
58 <template slot-scope="scope"> 61 <template slot-scope="scope">
59 <!--<el-button size="small" @click="setPerm(scope.$index, scope.row)">分配工单</el-button>--> 62 <!--<el-button size="small" @click="setPerm(scope.$index, scope.row)">分配工单</el-button>-->
60 <el-button size="small" @click="shwoDialog(scope.$index, scope.row)">查看内容</el-button> 63 <el-button size="small" @click="shwoDialog(scope.$index, scope.row)">查看内容</el-button>
@@ -490,4 +493,4 @@ @@ -490,4 +493,4 @@
490 493
491 <style scoped> 494 <style scoped>
492 495
493 -</style>  
  496 +</style>
@@ -42,7 +42,9 @@ @@ -42,7 +42,9 @@
42 </el-row> 42 </el-row>
43 </div> 43 </div>
44 <tree-table v-loading="listLoading" :data="manifestData" :eval-func="func" :expand-all="true" 44 <tree-table v-loading="listLoading" :data="manifestData" :eval-func="func" :expand-all="true"
45 - style="font-size: 13px" border @selection-change="handleSelectionChange" 45 + style="border-radius: 10px 10px 0px 0px;line-height: 25px;"
  46 + :header-cell-style="{background:'#6F8294',color:'#FFFFFF'}" size="small"
  47 + tooltip-effect="dark" border @selection-change="handleSelectionChange"
46 :row-class-name="tableRowClassName"> 48 :row-class-name="tableRowClassName">
47 <el-table-column label="航班号" width="80px" align="center"> 49 <el-table-column label="航班号" width="80px" align="center">
48 <template slot-scope="scope"> 50 <template slot-scope="scope">
@@ -115,7 +117,7 @@ @@ -115,7 +117,7 @@
115 <!--</div>--> 117 <!--</div>-->
116 </template> 118 </template>
117 </el-table-column> 119 </el-table-column>
118 - <el-table-column label="操作" width="180px" align="center"> 120 + <el-table-column label="操作" width="180px" align="center" fixed="right">
119 <template slot-scope="scope"> 121 <template slot-scope="scope">
120 <a style="color: #1d8ce0; margin-right: 5px" v-if="scope.row.messageType==='MT2201'" @click="handleUpdate(scope.row)">预配舱单</a> 122 <a style="color: #1d8ce0; margin-right: 5px" v-if="scope.row.messageType==='MT2201'" @click="handleUpdate(scope.row)">预配舱单</a>
121 <a style="color: #1d8ce0; margin-right: 5px" v-if="scope.row.messageType==='MT3201'" @click="handleUpdate(scope.row)">出港运抵</a> 123 <a style="color: #1d8ce0; margin-right: 5px" v-if="scope.row.messageType==='MT3201'" @click="handleUpdate(scope.row)">出港运抵</a>
@@ -10,7 +10,9 @@ @@ -10,7 +10,9 @@
10 <span style="color: red">注：主分单必须同时为空或者同时不为空</span> 10 <span style="color: red">注：主分单必须同时为空或者同时不为空</span>
11 </div> 11 </div>
12 <tree-table v-loading="listLoading" :data="lostLoadData" :eval-func="func" :expand-all="true" 12 <tree-table v-loading="listLoading" :data="lostLoadData" :eval-func="func" :expand-all="true"
13 - style="font-size: 12px" border> 13 + style="border-radius: 10px 10px 0px 0px;line-height: 25px;"
  14 + :header-cell-style="{background:'#6F8294',color:'#FFFFFF'}" size="small"
  15 + tooltip-effect="dark" border>
14 <el-table-column label="航班号" width="70px" align="center"> 16 <el-table-column label="航班号" width="70px" align="center">
15 <template slot-scope="scope"> 17 <template slot-scope="scope">
16 <span>{{ scope.row.carrier }}{{ scope.row.flightno }}</span> 18 <span>{{ scope.row.carrier }}{{ scope.row.flightno }}</span>
@@ -86,7 +88,7 @@ @@ -86,7 +88,7 @@
86 <span>{{ scope.row.ext5 }}</span> 88 <span>{{ scope.row.ext5 }}</span>
87 </template> 89 </template>
88 </el-table-column> 90 </el-table-column>
89 - <el-table-column label="操作" width="220px" align="center"> 91 + <el-table-column label="操作" width="220px" align="center" fixed="right">
90 <template slot-scope="scope"> 92 <template slot-scope="scope">
91 <el-button size="mini" type="primary" @click="handleLostLoad(scope.row)" 93 <el-button size="mini" type="primary" @click="handleLostLoad(scope.row)"
92 :disabled="scope.row.offload ==='002'">落装申请 94 :disabled="scope.row.offload ==='002'">落装申请
@@ -15,7 +15,10 @@ @@ -15,7 +15,10 @@
15 </el-form> 15 </el-form>
16 </el-col> 16 </el-col>
17 <!--列表--> 17 <!--列表-->
18 - <el-table :data="logs" highlight-current-row border v-loading="listLoading" @selection-change="selsChange" style="width: 100%;"> 18 + <el-table :data="logs" highlight-current-row border v-loading="listLoading" @selection-change="selsChange"
  19 + tooltip-effect="dark"
  20 + style="border-radius: 10px 10px 0px 0px;line-height: 25px;"
  21 + :header-cell-style="{background:'#6F8294',color:'#FFFFFF'}" size="small">
19 <el-table-column type="index" width="60" align="center"> 22 <el-table-column type="index" width="60" align="center">
20 </el-table-column> 23 </el-table-column>
21 <el-table-column prop="logid" label="ID" width="80" sortable align="center"> 24 <el-table-column prop="logid" label="ID" width="80" sortable align="center">
@@ -16,7 +16,10 @@ @@ -16,7 +16,10 @@
16 </el-col> 16 </el-col>
17 17
18 <!--列表--> 18 <!--列表-->
19 - <el-table :data="tableList" highlight-current-row v-loading="listLoading" @selection-change="selsChange" style="width: 100%;height:600px;overflow: scroll" 19 + <el-table :data="tableList" highlight-current-row v-loading="listLoading" @selection-change="selsChange"
  20 + tooltip-effect="dark"
  21 + style="border-radius: 10px 10px 0px 0px;line-height: 25px;"
  22 + :header-cell-style="{background:'#6F8294',color:'#FFFFFF'}" size="small"
20 row-key="permissionId" 23 row-key="permissionId"
21 border 24 border
22 :tree-props="{children: 'children', hasChildren: 'hasChildren'}" 25 :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
@@ -35,7 +38,7 @@ @@ -35,7 +38,7 @@
35 </el-table-column> 38 </el-table-column>
36 <el-table-column prop="url" label="访问路径" width="300" sortable> 39 <el-table-column prop="url" label="访问路径" width="300" sortable>
37 </el-table-column> 40 </el-table-column>
38 - <el-table-column label="操作" min-width="100"> 41 + <el-table-column label="操作" min-width="100" fixed="right">
39 <template slot-scope="scope"> 42 <template slot-scope="scope">
40 <el-button size="small" @click="handleEdit(scope.$index, scope.row)">编辑</el-button> 43 <el-button size="small" @click="handleEdit(scope.$index, scope.row)">编辑</el-button>
41 <el-button type="danger" size="small" @click="handleDel(scope.$index, scope.row)">删除</el-button> 44 <el-button type="danger" size="small" @click="handleDel(scope.$index, scope.row)">删除</el-button>
@@ -16,10 +16,13 @@ @@ -16,10 +16,13 @@
16 </el-col> 16 </el-col>
17 17
18 <!--列表--> 18 <!--列表-->
19 - <el-table :data="roles" highlight-current-row v-loading="listLoading" @selection-change="selsChange" style="width: 100%;" 19 + <el-table :data="roles" highlight-current-row v-loading="listLoading" @selection-change="selsChange"
20 default-expand-all 20 default-expand-all
21 row-key="roleId" 21 row-key="roleId"
22 border 22 border
  23 + tooltip-effect="dark"
  24 + style="border-radius: 10px 10px 0px 0px;line-height: 25px;"
  25 + :header-cell-style="{background:'#6F8294',color:'#FFFFFF'}" size="small"
23 :tree-props="{children: 'children', hasChildren: 'hasChildren'}"> 26 :tree-props="{children: 'children', hasChildren: 'hasChildren'}">
24 <el-table-column type="selection" width="55"> 27 <el-table-column type="selection" width="55">
25 </el-table-column> 28 </el-table-column>
@@ -41,7 +44,7 @@ @@ -41,7 +44,7 @@
41 </el-table-column> 44 </el-table-column>
42 <el-table-column prop="mqcode" label="海关通道编号" min-width="150" > 45 <el-table-column prop="mqcode" label="海关通道编号" min-width="150" >
43 </el-table-column> 46 </el-table-column>
44 - <el-table-column label="操作" min-width="260"> 47 + <el-table-column label="操作" min-width="260" fixed="right">
45 <template slot-scope="scope"> 48 <template slot-scope="scope">
46 <el-button type="primary" size="small" @click="handleAdd(scope.$index, scope.row)">新增下级</el-button> 49 <el-button type="primary" size="small" @click="handleAdd(scope.$index, scope.row)">新增下级</el-button>
47 <el-button size="small" @click="setPerm(scope.$index, scope.row)">设置权限</el-button> 50 <el-button size="small" @click="setPerm(scope.$index, scope.row)">设置权限</el-button>
@@ -556,4 +559,4 @@ @@ -556,4 +559,4 @@
556 559
557 <style scoped> 560 <style scoped>
558 561
559 -</style>  
  562 +</style>
@@ -19,7 +19,11 @@ @@ -19,7 +19,11 @@
19 </el-col> 19 </el-col>
20 20
21 <!--列表--> 21 <!--列表-->
22 - <el-table :data="users" highlight-current-row border v-loading="listLoading" @selection-change="selsChange" style="width: 100%;"> 22 + <el-table :data="users" highlight-current-row border v-loading="listLoading"
  23 + @selection-change="selsChange"
  24 + tooltip-effect="dark"
  25 + style="border-radius: 10px 10px 0px 0px;line-height: 25px;"
  26 + :header-cell-style="{background:'#6F8294',color:'#FFFFFF'}" size="small">
23 <el-table-column type="selection" width="55"> 27 <el-table-column type="selection" width="55">
24 </el-table-column> 28 </el-table-column>
25 <!--<el-table-column type="index" width="60">--> 29 <!--<el-table-column type="index" width="60">-->
@@ -44,7 +48,7 @@ @@ -44,7 +48,7 @@
44 </el-table-column> 48 </el-table-column>
45 <el-table-column prop="state" label="启用" width="100" :formatter="formatState" sortable> 49 <el-table-column prop="state" label="启用" width="100" :formatter="formatState" sortable>
46 </el-table-column> 50 </el-table-column>
47 - <el-table-column label="操作" width="250"> 51 + <el-table-column label="操作" width="250" fixed="right">
48 <template slot-scope="scope"> 52 <template slot-scope="scope">
49 <el-button size="small" @click="roleEdit(scope.$index, scope.row)">角色配置</el-button> 53 <el-button size="small" @click="roleEdit(scope.$index, scope.row)">角色配置</el-button>
50 <el-button size="small" @click="handleEdit(scope.$index, scope.row)">编辑</el-button> 54 <el-button size="small" @click="handleEdit(scope.$index, scope.row)">编辑</el-button>
@@ -566,4 +570,4 @@ @@ -566,4 +570,4 @@
566 570
567 <style scoped> 571 <style scoped>
568 572
569 -</style>  
  573 +</style>
@@ -57,6 +57,8 @@ @@ -57,6 +57,8 @@
57 <el-table-column prop="receiptinformation" label="回执内容" width="280px"> 57 <el-table-column prop="receiptinformation" label="回执内容" width="280px">
58 </el-table-column> 58 </el-table-column>
59 </el-table> 59 </el-table>
  60 + <div style="margin-left: 1190px">
  61 + </div>
60 </el-row> 62 </el-row>
61 <!-- 申请表单信息--> 63 <!-- 申请表单信息-->
62 <el-row style="padding-bottom: 0px;"> 64 <el-row style="padding-bottom: 0px;">
1 <template> 1 <template>
2 - <div style="height: 850px;overflow: scroll;"> 2 + <div style="height: 850px;overflow: scroll;margin-left: 25px">
3 <table class="tl" style="margin-top: 40px;font-size:small" border="1px" cellspacing="0px"> 3 <table class="tl" style="margin-top: 40px;font-size:small" border="1px" cellspacing="0px">
4 <tbody> 4 <tbody>
5 <tr> 5 <tr>
@@ -516,6 +516,8 @@ @@ -516,6 +516,8 @@
516 </el-tab-pane> 516 </el-tab-pane>
517 </el-tabs> 517 </el-tabs>
518 </el-col> 518 </el-col>
  519 + <div style="margin-left: 1190px">
  520 + </div>
519 </el-row> 521 </el-row>
520 </el-main> 522 </el-main>
521 </el-container> 523 </el-container>
1 <template> 1 <template>
2 - <el-container> 2 + <el-container style="height: 550px;overflow:auto;">
3 <el-main style="background-color: #EAEAEA"> 3 <el-main style="background-color: #EAEAEA">
4 <!-- 航班号查询--> 4 <!-- 航班号查询-->
5 <el-row style="height: 180px"> 5 <el-row style="height: 180px">
@@ -62,7 +62,9 @@ @@ -62,7 +62,9 @@
62 <el-col :span="23"> 62 <el-col :span="23">
63 <el-table 63 <el-table
64 :data="listDate" 64 :data="listDate"
65 - style="width: 100%"> 65 + tooltip-effect="dark"
  66 + style="border-radius: 10px 10px 0px 0px;line-height: 25px;"
  67 + :header-cell-style="{background:'#6F8294',color:'#FFFFFF'}" size="small">
66 <el-table-column prop="fplt" label="计划离港"> 68 <el-table-column prop="fplt" label="计划离港">
67 </el-table-column> 69 </el-table-column>
68 <el-table-column label="航班号"> 70 <el-table-column label="航班号">
@@ -382,4 +384,4 @@ @@ -382,4 +384,4 @@
382 width: 98%; 384 width: 98%;
383 background-color: #FFFFFF; 385 background-color: #FFFFFF;
384 } 386 }
385 -</style>  
  387 +</style>
@@ -4,22 +4,24 @@ @@ -4,22 +4,24 @@
4 <!-- 搜素区域 --> 4 <!-- 搜素区域 -->
5 <div> 5 <div>
6 <el-row :gutter="10"> 6 <el-row :gutter="10">
7 - <el-col :span="4"> 7 + <el-col :span="5">
8 <el-input v-model="bayonet_queryInfo.stationName" prefix-icon="el-icon-search" size="small" 8 <el-input v-model="bayonet_queryInfo.stationName" prefix-icon="el-icon-search" size="small"
9 placeholder="场站名称" clearable></el-input> 9 placeholder="场站名称" clearable></el-input>
10 </el-col> 10 </el-col>
11 - <el-col :span="4"> 11 + <el-col :span="5">
12 <el-input v-model="bayonet_queryInfo.name" prefix-icon="el-icon-search" size="small" 12 <el-input v-model="bayonet_queryInfo.name" prefix-icon="el-icon-search" size="small"
13 placeholder="卡口名称" clearable></el-input> 13 placeholder="卡口名称" clearable></el-input>
14 </el-col> 14 </el-col>
15 - <el-col :span="4"> 15 + <el-col :span="5">
16 <el-input v-model="bayonet_queryInfo.channel" prefix-icon="el-icon-search" size="small" 16 <el-input v-model="bayonet_queryInfo.channel" prefix-icon="el-icon-search" size="small"
17 placeholder="通道编号" clearable></el-input> 17 placeholder="通道编号" clearable></el-input>
18 </el-col> 18 </el-col>
19 - <el-col :span="8"> 19 + <el-col :span="5">
20 <el-button type="success" style="width:120px" size="small" @click="bayonet_getList"> 20 <el-button type="success" style="width:120px" size="small" @click="bayonet_getList">
21 查询 21 查询
22 </el-button> 22 </el-button>
  23 + </el-col>
  24 + <el-col :span="4">
23 <el-button type="primary" style="width:120px" size="small" @click="bayonet_toAddDialog"> 25 <el-button type="primary" style="width:120px" size="small" @click="bayonet_toAddDialog">
24 卡口添加 26 卡口添加
25 </el-button> 27 </el-button>
@@ -29,7 +31,10 @@ @@ -29,7 +31,10 @@
29 31
30 <!-- 列表区域 --> 32 <!-- 列表区域 -->
31 <div style="margin-top: 20px;"> 33 <div style="margin-top: 20px;">
32 - <el-table :data="bayonet_page.bayonetList" border size="mini" 34 + <el-table :data="bayonet_page.bayonetList" border
  35 + style="border-radius: 10px 10px 0px 0px;line-height: 25px;"
  36 + :header-cell-style="{background:'#6F8294',color:'#FFFFFF'}" size="small"
  37 + tooltip-effect="dark"
33 v-loading="bayonet_loading.listLoading" element-loading-text="获取卡口列表，拼命加载中"> 38 v-loading="bayonet_loading.listLoading" element-loading-text="获取卡口列表，拼命加载中">
34 <el-table-column type="index" align="center"></el-table-column> 39 <el-table-column type="index" align="center"></el-table-column>
35 <el-table-column label="场站名称" prop="yard.name" align="center" width="120"></el-table-column> 40 <el-table-column label="场站名称" prop="yard.name" align="center" width="120"></el-table-column>
@@ -43,7 +48,7 @@ @@ -43,7 +48,7 @@
43 </template> 48 </template>
44 </el-table-column> 49 </el-table-column>
45 <el-table-column label="备注信息" prop="remarks" align="center" width="200"></el-table-column> 50 <el-table-column label="备注信息" prop="remarks" align="center" width="200"></el-table-column>
46 - <el-table-column label="操作" width="140px" align="center"> 51 + <el-table-column label="操作" align="center" fixed="right">
47 <template slot-scope="scope"> 52 <template slot-scope="scope">
48 <el-tooltip effect="dark" content="编辑" placement="top-start" :enterable="false"> 53 <el-tooltip effect="dark" content="编辑" placement="top-start" :enterable="false">
49 <el-button type="text" icon="el-icon-edit" size="mini" 54 <el-button type="text" icon="el-icon-edit" size="mini"
@@ -500,4 +505,4 @@ @@ -500,4 +505,4 @@
500 505
501 <style scoped> 506 <style scoped>
502 507
503 -</style>  
  508 +</style>
@@ -4,19 +4,20 @@ @@ -4,19 +4,20 @@
4 <!-- 搜素区域 --> 4 <!-- 搜素区域 -->
5 <div> 5 <div>
6 <el-row :gutter="10"> 6 <el-row :gutter="10">
7 - <el-col :span="4"> 7 + <el-col :span="5">
8 <el-input v-model="warehouse_queryInfo.stationName" prefix-icon="el-icon-search" size="small" 8 <el-input v-model="warehouse_queryInfo.stationName" prefix-icon="el-icon-search" size="small"
9 placeholder="场站名称" clearable></el-input> 9 placeholder="场站名称" clearable></el-input>
10 </el-col> 10 </el-col>
11 - <el-col :span="4"> 11 + <el-col :span="5">
12 <el-input v-model="warehouse_queryInfo.name" prefix-icon="el-icon-search" size="small" 12 <el-input v-model="warehouse_queryInfo.name" prefix-icon="el-icon-search" size="small"
13 placeholder="仓库名称" clearable></el-input> 13 placeholder="仓库名称" clearable></el-input>
14 </el-col> 14 </el-col>
15 -  
16 - <el-col :span="8"> 15 + <el-col :span="5">
17 <el-button type="success" style="width:120px" size="small" @click="warehouse_getList"> 16 <el-button type="success" style="width:120px" size="small" @click="warehouse_getList">
18 查询 17 查询
19 </el-button> 18 </el-button>
  19 + </el-col>
  20 + <el-col :span="5">
20 <el-button type="primary" style="width:120px" size="small" @click="warehouse_toAddDialog"> 21 <el-button type="primary" style="width:120px" size="small" @click="warehouse_toAddDialog">
21 仓库添加 22 仓库添加
22 </el-button> 23 </el-button>
@@ -26,7 +27,10 @@ @@ -26,7 +27,10 @@
26 27
27 <!-- 列表区域 --> 28 <!-- 列表区域 -->
28 <div style="margin-top: 20px;"> 29 <div style="margin-top: 20px;">
29 - <el-table :data="warehouse_page.warehouseList" border size="mini" 30 + <el-table :data="warehouse_page.warehouseList" border
  31 + style="border-radius: 10px 10px 0px 0px;line-height: 25px;"
  32 + :header-cell-style="{background:'#6F8294',color:'#FFFFFF'}" size="small"
  33 + tooltip-effect="dark"
30 v-loading="warehouse_loading.listLoading" element-loading-text="获取仓库列表，拼命加载中"> 34 v-loading="warehouse_loading.listLoading" element-loading-text="获取仓库列表，拼命加载中">
31 <el-table-column type="index" align="center"></el-table-column> 35 <el-table-column type="index" align="center"></el-table-column>
32 <el-table-column label="场站名称" prop="yard.name" align="center" width="120"></el-table-column> 36 <el-table-column label="场站名称" prop="yard.name" align="center" width="120"></el-table-column>
@@ -45,7 +49,7 @@ @@ -45,7 +49,7 @@
45 <el-table-column label="仓库面积（平方米）" prop="warehouseArea" align="center" width="140"></el-table-column> 49 <el-table-column label="仓库面积（平方米）" prop="warehouseArea" align="center" width="140"></el-table-column>
46 <el-table-column label="仓库体积（立方米）" prop="warehouseVolume" align="center" width="140"></el-table-column> 50 <el-table-column label="仓库体积（立方米）" prop="warehouseVolume" align="center" width="140"></el-table-column>
47 <el-table-column label="备注信息" prop="remarks" align="center" width="200"></el-table-column> 51 <el-table-column label="备注信息" prop="remarks" align="center" width="200"></el-table-column>
48 - <el-table-column label="操作" width="160px" align="center" fixed="right"> 52 + <el-table-column label="操作" align="center" fixed="right">
49 <template slot-scope="scope"> 53 <template slot-scope="scope">
50 <el-tooltip effect="dark" content="编辑" placement="top-start" :enterable="false"> 54 <el-tooltip effect="dark" content="编辑" placement="top-start" :enterable="false">
51 <el-button type="text" icon="el-icon-edit" size="mini" 55 <el-button type="text" icon="el-icon-edit" size="mini"
@@ -61,6 +65,7 @@ @@ -61,6 +65,7 @@
61 </template> 65 </template>
62 </el-table-column> 66 </el-table-column>
63 </el-table> 67 </el-table>
  68 + <div style="margin-left: 1190px"></div>
64 </div> 69 </div>
65 70
66 <!-- 分页区域 --> 71 <!-- 分页区域 -->
@@ -589,4 +594,4 @@ @@ -589,4 +594,4 @@
589 594
590 <style scoped> 595 <style scoped>
591 596
592 -</style>  
  597 +</style>
@@ -4,18 +4,20 @@ @@ -4,18 +4,20 @@
4 <!-- 搜素区域 --> 4 <!-- 搜素区域 -->
5 <div> 5 <div>
6 <el-row :gutter="10"> 6 <el-row :gutter="10">
7 - <el-col :span="4"> 7 + <el-col :span="5">
8 <el-input v-model="yard_queryInfo.name" prefix-icon="el-icon-search" size="small" 8 <el-input v-model="yard_queryInfo.name" prefix-icon="el-icon-search" size="small"
9 placeholder="场站名称" clearable></el-input> 9 placeholder="场站名称" clearable></el-input>
10 </el-col> 10 </el-col>
11 - <el-col :span="4"> 11 + <el-col :span="5">
12 <el-input v-model="yard_queryInfo.customsCode" prefix-icon="el-icon-search" size="small" 12 <el-input v-model="yard_queryInfo.customsCode" prefix-icon="el-icon-search" size="small"
13 placeholder="关区代码" clearable></el-input> 13 placeholder="关区代码" clearable></el-input>
14 </el-col> 14 </el-col>
15 - <el-col :span="8"> 15 + <el-col :span="5">
16 <el-button type="success" style="width:120px" size="small" @click="yard_getList"> 16 <el-button type="success" style="width:120px" size="small" @click="yard_getList">
17 查询 17 查询
18 </el-button> 18 </el-button>
  19 + </el-col>
  20 + <el-col :span="5">
19 <el-button type="primary" style="width:120px" size="small" @click="yard_toAddDialog"> 21 <el-button type="primary" style="width:120px" size="small" @click="yard_toAddDialog">
20 场站添加 22 场站添加
21 </el-button> 23 </el-button>
@@ -25,7 +27,10 @@ @@ -25,7 +27,10 @@
25 27
26 <!-- 列表区域 --> 28 <!-- 列表区域 -->
27 <div style="margin-top: 20px;"> 29 <div style="margin-top: 20px;">
28 - <el-table :data="yard_page.yardList" border size="mini" 30 + <el-table :data="yard_page.yardList" border
  31 + style="border-radius: 10px 10px 0px 0px;line-height: 25px;"
  32 + :header-cell-style="{background:'#6F8294',color:'#FFFFFF'}" size="small"
  33 + tooltip-effect="dark"
29 v-loading="yard_loading.listLoading" element-loading-text="获取场站列表，拼命加载中"> 34 v-loading="yard_loading.listLoading" element-loading-text="获取场站列表，拼命加载中">
30 <el-table-column type="index" align="center"></el-table-column> 35 <el-table-column type="index" align="center"></el-table-column>
31 <el-table-column label="场站名称" prop="name" align="center" width="120"></el-table-column> 36 <el-table-column label="场站名称" prop="name" align="center" width="120"></el-table-column>
@@ -33,7 +38,7 @@ @@ -33,7 +38,7 @@
33 <el-table-column label="场站编号" prop="stationId" align="center" width="120"></el-table-column> 38 <el-table-column label="场站编号" prop="stationId" align="center" width="120"></el-table-column>
34 <el-table-column label="关区代码" prop="customsCode" align="center" width="120"></el-table-column> 39 <el-table-column label="关区代码" prop="customsCode" align="center" width="120"></el-table-column>
35 <el-table-column label="备注信息" prop="remarks" align="center" width="200"></el-table-column> 40 <el-table-column label="备注信息" prop="remarks" align="center" width="200"></el-table-column>
36 - <el-table-column label="操作" width="140px" align="center"> 41 + <el-table-column label="操作" align="center" fixed="right">
37 <template slot-scope="scope"> 42 <template slot-scope="scope">
38 <el-tooltip effect="dark" content="编辑" placement="top-start" :enterable="false"> 43 <el-tooltip effect="dark" content="编辑" placement="top-start" :enterable="false">
39 <el-button type="text" icon="el-icon-edit" size="mini" 44 <el-button type="text" icon="el-icon-edit" size="mini"
@@ -49,6 +54,7 @@ @@ -49,6 +54,7 @@
49 </template> 54 </template>
50 </el-table-column> 55 </el-table-column>
51 </el-table> 56 </el-table>
  57 + <div style="margin-left: 1190px"></div>
52 </div> 58 </div>
53 59
54 <!-- 分页区域 --> 60 <!-- 分页区域 -->
@@ -423,4 +429,4 @@ @@ -423,4 +429,4 @@
423 429
424 <style scoped> 430 <style scoped>
425 431
426 -</style>  
  432 +</style>