朱兆平 / vue_cli · 提交

转到一个项目

作者 小范
提交 6859f5eb726ad634d193026bbbffb5094a1de1b1 1 个父辈 33bab60b

场站管理界面优化

内嵌 并排对比
正在显示 3 个修改的文件 包含 97 行增加 和 95 行删除
@@ -5,22 +5,22 @@ @@ -5,22 +5,22 @@
5 <div> 5 <div>
6 <el-row :gutter="10"> 6 <el-row :gutter="10">
7 <el-col :span="4"> 7 <el-col :span="4">
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"
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="4">
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"
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="4">
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"
17 placeholder="通道编号" clearable></el-input> 17 placeholder="通道编号" clearable></el-input>
18 </el-col> 18 </el-col>
19 - <el-col :span="8">  
20 - <el-button type="success" style="width:120px" size="small" @click="bayonet_getList"> 19 + <el-col :span="8" style="margin-left: 50px">
  20 + <el-button type="warning" style="width:150px" size="medium" icon="el-icon-plus" @click="bayonet_getList">
21 查询 21 查询
22 </el-button> 22 </el-button>
23 - <el-button type="primary" style="width:120px" size="small" @click="bayonet_toAddDialog"> 23 + <el-button type="primary" style="width:150px" size="medium" icon="el-icon-plus" @click="bayonet_toAddDialog">
24 卡口添加 24 卡口添加
25 </el-button> 25 </el-button>
26 </el-col> 26 </el-col>
@@ -29,24 +29,26 @@ @@ -29,24 +29,26 @@
29 29
30 <!-- 列表区域 --> 30 <!-- 列表区域 -->
31 <div style="margin-top: 20px;"> 31 <div style="margin-top: 20px;">
32 - <el-table :data="bayonet_page.bayonetList" border size="mini" 32 + <el-table :data="bayonet_page.bayonetList" border
  33 + :header-cell-style="{background:'#6F8294',color:'#FFFFFF'}"
  34 + style="border-radius: 10px 10px 0px 0px;line-height: 25px;" size="small"
33 v-loading="bayonet_loading.listLoading" element-loading-text="获取卡口列表，拼命加载中"> 35 v-loading="bayonet_loading.listLoading" element-loading-text="获取卡口列表，拼命加载中">
34 <el-table-column type="index" align="center"></el-table-column> 36 <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> 37 + <el-table-column label="场站名称" prop="yard.name" align="center" width="180"></el-table-column>
36 <el-table-column label="卡口名称" prop="name" align="center" width="200"></el-table-column> 38 <el-table-column label="卡口名称" prop="name" align="center" width="200"></el-table-column>
37 <el-table-column label="通道编号" prop="channel" align="center" width="200"></el-table-column> 39 <el-table-column label="通道编号" prop="channel" align="center" width="200"></el-table-column>
38 <el-table-column label="卡口类型" prop="type" :formatter="kakoType" align="center" width="200"> 40 <el-table-column label="卡口类型" prop="type" :formatter="kakoType" align="center" width="200">
39 </el-table-column> 41 </el-table-column>
40 - <el-table-column label="备注信息" prop="remarks" align="center" width="200"></el-table-column>  
41 - <el-table-column label="操作" width="140px" align="center"> 42 + <el-table-column label="备注信息" prop="remarks" align="center" ></el-table-column>
  43 + <el-table-column label="操作" width="200px" align="center" fixed="right">
42 <template slot-scope="scope"> 44 <template slot-scope="scope">
43 <el-tooltip effect="dark" content="编辑" placement="top-start" :enterable="false"> 45 <el-tooltip effect="dark" content="编辑" placement="top-start" :enterable="false">
44 - <el-button type="text" icon="el-icon-edit" size="mini" 46 + <el-button type="primary" icon="el-icon-edit" size="mini"
45 @click="bayonet_toEditDialog(scope.$index,scope.row)">编辑 47 @click="bayonet_toEditDialog(scope.$index,scope.row)">编辑
46 </el-button> 48 </el-button>
47 </el-tooltip> 49 </el-tooltip>
48 <el-tooltip effect="dark" content="删除" placement="top-start" :enterable="false"> 50 <el-tooltip effect="dark" content="删除" placement="top-start" :enterable="false">
49 - <el-button type="text" icon="el-icon-delete" size="mini" 51 + <el-button type="danger" icon="el-icon-minus" size="mini"
50 :loading="bayonet_loading.delLoading" 52 :loading="bayonet_loading.delLoading"
51 @click="bayonet_delete(scope.$index,scope.row)">删除 53 @click="bayonet_delete(scope.$index,scope.row)">删除
52 </el-button> 54 </el-button>
@@ -77,12 +79,12 @@ @@ -77,12 +79,12 @@
77 <div> 79 <div>
78 <el-dialog title="卡口添加：" 80 <el-dialog title="卡口添加："
79 :visible.sync="bayonet_dialog.addDialog" 81 :visible.sync="bayonet_dialog.addDialog"
80 - style="margin-top: -80px" text-align="center" width="60%" 82 + text-align="center" width="50%"
81 @close="bayonet_addDialogClosed"> 83 @close="bayonet_addDialogClosed">
82 <el-form :inline="true" label-width="150px" status-icon style="margin-top: -10px;" align="center" 84 <el-form :inline="true" label-width="150px" status-icon style="margin-top: -10px;" align="center"
83 :model="bayonet_addForm" :rules="bayonet_addFormRules" ref="bayonet_addFormRef"> 85 :model="bayonet_addForm" :rules="bayonet_addFormRules" ref="bayonet_addFormRef">
84 <el-form-item label="场站名称：" prop="yardId"> 86 <el-form-item label="场站名称：" prop="yardId">
85 - <el-select v-model="bayonet_addForm.yardId" style="width: 300px" clearable size="small" 87 + <el-select v-model="bayonet_addForm.yardId" clearable
86 placeholder="请选择场站名称"> 88 placeholder="请选择场站名称">
87 <el-option 89 <el-option
88 v-for="item in stationNameList" 90 v-for="item in stationNameList"
@@ -93,18 +95,18 @@ @@ -93,18 +95,18 @@
93 </el-select> 95 </el-select>
94 </el-form-item> 96 </el-form-item>
95 <el-form-item label="卡口名称：" prop="name"> 97 <el-form-item label="卡口名称：" prop="name">
96 - <el-input v-model="bayonet_addForm.name" style="width:300px" size="mini" clearable 98 + <el-input v-model="bayonet_addForm.name" clearable
97 placeholder="请输入卡口名称"> 99 placeholder="请输入卡口名称">
98 </el-input> 100 </el-input>
99 </el-form-item> 101 </el-form-item>
100 <el-form-item label="通道编号：" prop="channel"> 102 <el-form-item label="通道编号：" prop="channel">
101 - <el-input v-model="bayonet_addForm.channel" style="width:300px" size="mini" clearable 103 + <el-input v-model="bayonet_addForm.channel" clearable
102 placeholder="请输入通道编号"> 104 placeholder="请输入通道编号">
103 </el-input> 105 </el-input>
104 </el-form-item> 106 </el-form-item>
105 107
106 <el-form-item label="卡口类型：" prop="type"> 108 <el-form-item label="卡口类型：" prop="type">
107 - <el-select v-model="bayonet_addForm.type" style="width: 300px" clearable size="small" 109 + <el-select v-model="bayonet_addForm.type" clearable
108 placeholder="请选择卡口类型"> 110 placeholder="请选择卡口类型">
109 <el-option 111 <el-option
110 v-for="item in bayonetTypeList" 112 v-for="item in bayonetTypeList"
@@ -117,17 +119,17 @@ @@ -117,17 +119,17 @@
117 119
118 120
119 <el-form-item label="备注信息：" prop="remarks"> 121 <el-form-item label="备注信息：" prop="remarks">
120 - <el-input v-model="bayonet_addForm.remarks" style="width:300px" clearable size="mini"  
121 - type="textarea" :rows="5"> 122 + <el-input v-model="bayonet_addForm.remarks" clearable
  123 + type="textarea" :rows="5" style="width:300px" >
122 </el-input> 124 </el-input>
123 </el-form-item> 125 </el-form-item>
124 </el-form> 126 </el-form>
125 <div slot="footer" class="dialog-footer" style="text-align: center;margin-top: -30px"> 127 <div slot="footer" class="dialog-footer" style="text-align: center;margin-top: -30px">
126 - <el-button type="info" @click="bayonet_dialog.addDialog = false" size="medium"  
127 - style="width: 100px">取消 128 + <el-button @click="bayonet_dialog.addDialog = false"
  129 + size="medium" style="width: 100px;background-color: #6F8294;color: #ffffff">取消
128 </el-button> 130 </el-button>
129 - <el-button type="primary" @click="bayonet_add" :loading="bayonet_loading.addLoading"  
130 - size="medium" style="width: 100px">保存 131 + <el-button @click="bayonet_add" :loading="bayonet_loading.addLoading"
  132 + type="primary" size="medium" style="width: 100px">保存
131 </el-button> 133 </el-button>
132 </div> 134 </div>
133 </el-dialog> 135 </el-dialog>
@@ -136,12 +138,12 @@ @@ -136,12 +138,12 @@
136 <div> 138 <div>
137 <el-dialog title="卡口修改：" 139 <el-dialog title="卡口修改："
138 :visible.sync="bayonet_dialog.editDialog" 140 :visible.sync="bayonet_dialog.editDialog"
139 - style="margin-top: -80px" text-align="center" width="60%" 141 + text-align="center" width="50%"
140 @close="bayonet_editDialogClosed"> 142 @close="bayonet_editDialogClosed">
141 <el-form :inline="true" label-width="150px" status-icon style="margin-top: -10px;" align="center" 143 <el-form :inline="true" label-width="150px" status-icon style="margin-top: -10px;" align="center"
142 :model="bayonet_editForm" :rules="bayonet_editFormRules" ref="bayonet_editFormRef"> 144 :model="bayonet_editForm" :rules="bayonet_editFormRules" ref="bayonet_editFormRef">
143 <el-form-item label="场站名称：" prop="yardId"> 145 <el-form-item label="场站名称：" prop="yardId">
144 - <el-select v-model="bayonet_editForm.yardId" style="width: 300px" clearable size="small" 146 + <el-select v-model="bayonet_editForm.yardId" clearable
145 placeholder="请选择场站名称"> 147 placeholder="请选择场站名称">
146 <el-option 148 <el-option
147 v-for="item in stationNameList" 149 v-for="item in stationNameList"
@@ -152,17 +154,17 @@ @@ -152,17 +154,17 @@
152 </el-select> 154 </el-select>
153 </el-form-item> 155 </el-form-item>
154 <el-form-item label="卡口名称：" prop="name"> 156 <el-form-item label="卡口名称：" prop="name">
155 - <el-input v-model="bayonet_editForm.name" style="width:300px" size="mini" clearable 157 + <el-input v-model="bayonet_editForm.name" clearable
156 placeholder="请输入卡口名称"> 158 placeholder="请输入卡口名称">
157 </el-input> 159 </el-input>
158 </el-form-item> 160 </el-form-item>
159 <el-form-item label="通道编号：" prop="channel"> 161 <el-form-item label="通道编号：" prop="channel">
160 - <el-input v-model="bayonet_editForm.channel" style="width:300px" size="mini" clearable 162 + <el-input v-model="bayonet_editForm.channel" clearable
161 placeholder="请输入通道编号"> 163 placeholder="请输入通道编号">
162 </el-input> 164 </el-input>
163 </el-form-item> 165 </el-form-item>
164 <el-form-item label="卡口类型：" prop="type"> 166 <el-form-item label="卡口类型：" prop="type">
165 - <el-select v-model="bayonet_editForm.type" style="width: 300px" clearable size="small" 167 + <el-select v-model="bayonet_editForm.type" clearable
166 placeholder="请选择卡口类型"> 168 placeholder="请选择卡口类型">
167 <el-option 169 <el-option
168 v-for="item in bayonetTypeList" 170 v-for="item in bayonetTypeList"
@@ -174,17 +176,16 @@ @@ -174,17 +176,16 @@
174 </el-form-item> 176 </el-form-item>
175 177
176 <el-form-item label="备注信息：" prop="remarks"> 178 <el-form-item label="备注信息：" prop="remarks">
177 - <el-input v-model="bayonet_editForm.remarks" style="width:300px" clearable size="mini"  
178 - type="textarea" :rows="5"> 179 + <el-input v-model="bayonet_editForm.remarks" clearable
  180 + type="textarea" :rows="5" style="width:300px">
179 </el-input> 181 </el-input>
180 </el-form-item> 182 </el-form-item>
181 </el-form> 183 </el-form>
182 <div slot="footer" class="dialog-footer" style="text-align: center;margin-top: -30px"> 184 <div slot="footer" class="dialog-footer" style="text-align: center;margin-top: -30px">
183 - <el-button type="info" @click="bayonet_dialog.editDialog = false" size="medium"  
184 - style="width: 100px">取消 185 + <el-button @click="bayonet_dialog.editDialog = false" size="medium" style="width: 100px;background-color: #6F8294;color: #ffffff">取消
185 </el-button> 186 </el-button>
186 - <el-button type="primary" @click="bayonet_edit" :loading="bayonet_loading.editLoading"  
187 - size="medium" style="width: 100px">保存 187 + <el-button @click="bayonet_edit" :loading="bayonet_loading.editLoading"
  188 + type="primary" size="medium" style="width: 100px">保存
188 </el-button> 189 </el-button>
189 </div> 190 </div>
190 </el-dialog> 191 </el-dialog>
@@ -5,19 +5,19 @@ @@ -5,19 +5,19 @@
5 <div> 5 <div>
6 <el-row :gutter="10"> 6 <el-row :gutter="10">
7 <el-col :span="4"> 7 <el-col :span="4">
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"
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="4">
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"
13 placeholder="仓库名称" clearable></el-input> 13 placeholder="仓库名称" clearable></el-input>
14 </el-col> 14 </el-col>
15 15
16 - <el-col :span="8">  
17 - <el-button type="success" style="width:120px" size="small" @click="warehouse_getList"> 16 + <el-col :span="8" style="margin-left: 50px">
  17 + <el-button type="warning" style="width:150px" size="medium" icon="el-icon-plus" @click="warehouse_getList">
18 查询 18 查询
19 </el-button> 19 </el-button>
20 - <el-button type="primary" style="width:120px" size="small" @click="warehouse_toAddDialog"> 20 + <el-button type="primary" style="width:150px" size="medium" icon="el-icon-plus" @click="warehouse_toAddDialog">
21 仓库添加 21 仓库添加
22 </el-button> 22 </el-button>
23 </el-col> 23 </el-col>
@@ -26,7 +26,9 @@ @@ -26,7 +26,9 @@
26 26
27 <!-- 列表区域 --> 27 <!-- 列表区域 -->
28 <div style="margin-top: 20px;"> 28 <div style="margin-top: 20px;">
29 - <el-table :data="warehouse_page.warehouseList" border size="mini" 29 + <el-table :data="warehouse_page.warehouseList" border
  30 + :header-cell-style="{background:'#6F8294',color:'#FFFFFF'}"
  31 + style="border-radius: 10px 10px 0px 0px;line-height: 25px;" size="small"
30 v-loading="warehouse_loading.listLoading" element-loading-text="获取仓库列表，拼命加载中"> 32 v-loading="warehouse_loading.listLoading" element-loading-text="获取仓库列表，拼命加载中">
31 <el-table-column type="index" align="center"></el-table-column> 33 <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> 34 <el-table-column label="场站名称" prop="yard.name" align="center" width="120"></el-table-column>
@@ -44,16 +46,16 @@ @@ -44,16 +46,16 @@
44 <el-table-column label="仓库高度（米）" prop="warehouseHeight" align="center" width="120"></el-table-column> 46 <el-table-column label="仓库高度（米）" prop="warehouseHeight" align="center" width="120"></el-table-column>
45 <el-table-column label="仓库面积（平方米）" prop="warehouseArea" align="center" width="140"></el-table-column> 47 <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> 48 <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>  
48 - <el-table-column label="操作" width="160px" align="center" fixed="right"> 49 + <el-table-column label="备注信息" prop="remarks" align="center"></el-table-column>
  50 + <el-table-column label="操作" width="200px" align="center" fixed="right">
49 <template slot-scope="scope"> 51 <template slot-scope="scope">
50 <el-tooltip effect="dark" content="编辑" placement="top-start" :enterable="false"> 52 <el-tooltip effect="dark" content="编辑" placement="top-start" :enterable="false">
51 - <el-button type="text" icon="el-icon-edit" size="mini" 53 + <el-button type="primary" icon="el-icon-edit" size="mini"
52 @click="warehouse_toEditDialog(scope.$index,scope.row)">编辑 54 @click="warehouse_toEditDialog(scope.$index,scope.row)">编辑
53 </el-button> 55 </el-button>
54 </el-tooltip> 56 </el-tooltip>
55 <el-tooltip effect="dark" content="删除" placement="top-start" :enterable="false"> 57 <el-tooltip effect="dark" content="删除" placement="top-start" :enterable="false">
56 - <el-button type="text" icon="el-icon-delete" size="mini" 58 + <el-button type="danger" icon="el-icon-minus" size="mini"
57 :loading="warehouse_loading.delLoading" 59 :loading="warehouse_loading.delLoading"
58 @click="warehouse_delete(scope.$index,scope.row)">删除 60 @click="warehouse_delete(scope.$index,scope.row)">删除
59 </el-button> 61 </el-button>
@@ -89,7 +91,7 @@ @@ -89,7 +91,7 @@
89 <el-form :inline="true" label-width="165px" status-icon style="margin-top: -20px;" align="center" 91 <el-form :inline="true" label-width="165px" status-icon style="margin-top: -20px;" align="center"
90 :model="warehouse_addForm" :rules="warehouse_addFormRules" ref="warehouse_addFormRef"> 92 :model="warehouse_addForm" :rules="warehouse_addFormRules" ref="warehouse_addFormRef">
91 <el-form-item label="场站名称：" prop="yardId"> 93 <el-form-item label="场站名称：" prop="yardId">
92 - <el-select v-model="warehouse_addForm.yardId" style="width: 300px" clearable size="mini" 94 + <el-select v-model="warehouse_addForm.yardId" style="width: 300px" clearable
93 placeholder="请选择场站名称"> 95 placeholder="请选择场站名称">
94 <el-option 96 <el-option
95 v-for="item in stationNameList" 97 v-for="item in stationNameList"
@@ -100,12 +102,12 @@ @@ -100,12 +102,12 @@
100 </el-select> 102 </el-select>
101 </el-form-item> 103 </el-form-item>
102 <el-form-item label="仓库名称：" prop="name"> 104 <el-form-item label="仓库名称：" prop="name">
103 - <el-input v-model="warehouse_addForm.name" style="width:300px" size="mini" clearable 105 + <el-input v-model="warehouse_addForm.name" style="width:300px" clearable
104 placeholder="请输入仓库名称"> 106 placeholder="请输入仓库名称">
105 </el-input> 107 </el-input>
106 </el-form-item> 108 </el-form-item>
107 <el-form-item label="仓库类型：" prop="warehouseType"> 109 <el-form-item label="仓库类型：" prop="warehouseType">
108 - <el-select v-model="warehouse_addForm.warehouseType" style="width: 300px" clearable size="mini" 110 + <el-select v-model="warehouse_addForm.warehouseType" style="width: 300px" clearable
109 placeholder="请选择仓库类型"> 111 placeholder="请选择仓库类型">
110 <el-option 112 <el-option
111 v-for="item in warehouseTypeList" 113 v-for="item in warehouseTypeList"
@@ -149,17 +151,16 @@ @@ -149,17 +151,16 @@
149 </el-form-item> 151 </el-form-item>
150 152
151 <el-form-item label="备注信息：" prop="remarks"> 153 <el-form-item label="备注信息：" prop="remarks">
152 - <el-input v-model="warehouse_addForm.remarks" style="width:300px" clearable size="mini" 154 + <el-input v-model="warehouse_addForm.remarks" style="width:300px" clearable
153 type="textarea" :rows="2"> 155 type="textarea" :rows="2">
154 </el-input> 156 </el-input>
155 </el-form-item> 157 </el-form-item>
156 </el-form> 158 </el-form>
157 <div slot="footer" class="dialog-footer" style="text-align: center;margin-top: -30px"> 159 <div slot="footer" class="dialog-footer" style="text-align: center;margin-top: -30px">
158 - <el-button type="info" @click="warehouse_dialog.addDialog = false" size="medium"  
159 - style="width: 100px">取消 160 + <el-button @click="warehouse_dialog.addDialog = false" size="medium" style="width: 100px;background-color: #6F8294;color: #ffffff">取消
160 </el-button> 161 </el-button>
161 - <el-button type="primary" @click="warehouse_add" :loading="warehouse_loading.addLoading"  
162 - size="medium" style="width: 100px">保存 162 + <el-button @click="warehouse_add" :loading="warehouse_loading.addLoading"
  163 + type="primary" size="medium" style="width: 100px">保存
163 </el-button> 164 </el-button>
164 </div> 165 </div>
165 </el-dialog> 166 </el-dialog>
@@ -174,7 +175,7 @@ @@ -174,7 +175,7 @@
174 <el-form :inline="true" label-width="165px" status-icon style="margin-top: -20px;" align="center" 175 <el-form :inline="true" label-width="165px" status-icon style="margin-top: -20px;" align="center"
175 :model="warehouse_editForm" :rules="warehouse_editFormRules" ref="warehouse_editFormRef"> 176 :model="warehouse_editForm" :rules="warehouse_editFormRules" ref="warehouse_editFormRef">
176 <el-form-item label="场站名称：" prop="yardId"> 177 <el-form-item label="场站名称：" prop="yardId">
177 - <el-select v-model="warehouse_editForm.yardId" style="width: 300px" clearable size="small" 178 + <el-select v-model="warehouse_editForm.yardId" style="width: 300px" clearable
178 placeholder="请选择场站名称"> 179 placeholder="请选择场站名称">
179 <el-option 180 <el-option
180 v-for="item in stationNameList" 181 v-for="item in stationNameList"
@@ -185,12 +186,12 @@ @@ -185,12 +186,12 @@
185 </el-select> 186 </el-select>
186 </el-form-item> 187 </el-form-item>
187 <el-form-item label="仓库名称：" prop="name"> 188 <el-form-item label="仓库名称：" prop="name">
188 - <el-input v-model="warehouse_editForm.name" style="width:300px" size="mini" clearable 189 + <el-input v-model="warehouse_editForm.name" style="width:300px" clearable
189 placeholder="请输入仓库名称"> 190 placeholder="请输入仓库名称">
190 </el-input> 191 </el-input>
191 </el-form-item> 192 </el-form-item>
192 <el-form-item label="仓库类型：" prop="warehouseType"> 193 <el-form-item label="仓库类型：" prop="warehouseType">
193 - <el-select v-model="warehouse_editForm.warehouseType" style="width: 300px" clearable size="small" 194 + <el-select v-model="warehouse_editForm.warehouseType" style="width: 300px" clearable
194 placeholder="请选择仓库类型"> 195 placeholder="请选择仓库类型">
195 <el-option 196 <el-option
196 v-for="item in warehouseTypeList" 197 v-for="item in warehouseTypeList"
@@ -231,17 +232,17 @@ @@ -231,17 +232,17 @@
231 </el-form-item> 232 </el-form-item>
232 233
233 <el-form-item label="备注信息：" prop="remarks"> 234 <el-form-item label="备注信息：" prop="remarks">
234 - <el-input v-model="warehouse_editForm.remarks" style="width:300px" clearable size="mini" 235 + <el-input v-model="warehouse_editForm.remarks" style="width:300px" clearable
235 type="textarea" :rows="2"> 236 type="textarea" :rows="2">
236 </el-input> 237 </el-input>
237 </el-form-item> 238 </el-form-item>
238 </el-form> 239 </el-form>
239 <div slot="footer" class="dialog-footer" style="text-align: center;margin-top: -30px"> 240 <div slot="footer" class="dialog-footer" style="text-align: center;margin-top: -30px">
240 - <el-button type="info" @click="warehouse_dialog.editDialog = false" size="medium"  
241 - style="width: 100px">取消 241 + <el-button @click="warehouse_dialog.editDialog = false"
  242 + size="medium" style="width: 100px;background-color: #6F8294;color: #ffffff">取消
242 </el-button> 243 </el-button>
243 - <el-button type="primary" @click="warehouse_edit" :loading="warehouse_loading.editLoading"  
244 - size="medium" style="width: 100px">保存 244 + <el-button @click="warehouse_edit" :loading="warehouse_loading.editLoading"
  245 + type="primary" size="medium" style="width: 100px">保存
245 </el-button> 246 </el-button>
246 </div> 247 </div>
247 </el-dialog> 248 </el-dialog>
@@ -5,18 +5,18 @@ @@ -5,18 +5,18 @@
5 <div> 5 <div>
6 <el-row :gutter="10"> 6 <el-row :gutter="10">
7 <el-col :span="4"> 7 <el-col :span="4">
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"
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="4">
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"
13 placeholder="关区代码" clearable></el-input> 13 placeholder="关区代码" clearable></el-input>
14 </el-col> 14 </el-col>
15 - <el-col :span="8">  
16 - <el-button type="success" style="width:120px" size="small" @click="yard_getList"> 15 + <el-col :span="8" style="margin-left: 50px">
  16 + <el-button type="warning" style="width:150px" size="medium" icon="el-icon-plus" @click="yard_getList">
17 查询 17 查询
18 </el-button> 18 </el-button>
19 - <el-button type="primary" style="width:120px" size="small" @click="yard_toAddDialog"> 19 + <el-button type="primary" style="width:150px" size="medium" icon="el-icon-plus" @click="yard_toAddDialog">
20 场站添加 20 场站添加
21 </el-button> 21 </el-button>
22 </el-col> 22 </el-col>
@@ -25,23 +25,25 @@ @@ -25,23 +25,25 @@
25 25
26 <!-- 列表区域 --> 26 <!-- 列表区域 -->
27 <div style="margin-top: 20px;"> 27 <div style="margin-top: 20px;">
28 - <el-table :data="yard_page.yardList" border size="mini" 28 + <el-table :data="yard_page.yardList" border
  29 + :header-cell-style="{background:'#6F8294',color:'#FFFFFF'}"
  30 + style="border-radius: 10px 10px 0px 0px;line-height: 25px;" size="small"
29 v-loading="yard_loading.listLoading" element-loading-text="获取场站列表，拼命加载中"> 31 v-loading="yard_loading.listLoading" element-loading-text="获取场站列表，拼命加载中">
30 <el-table-column type="index" align="center"></el-table-column> 32 <el-table-column type="index" align="center"></el-table-column>
31 - <el-table-column label="场站名称" prop="name" align="center" width="120"></el-table-column>  
32 - <el-table-column label="区域代码" prop="areaCode" align="center" width="120"></el-table-column>  
33 - <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>  
35 - <el-table-column label="备注信息" prop="remarks" align="center" width="200"></el-table-column>  
36 - <el-table-column label="操作" width="140px" align="center"> 33 + <el-table-column label="场站名称" prop="name" align="center" width="180"></el-table-column>
  34 + <el-table-column label="区域代码" prop="areaCode" align="center" width="180"></el-table-column>
  35 + <el-table-column label="场站编号" prop="stationId" align="center" width="180"></el-table-column>
  36 + <el-table-column label="关区代码" prop="customsCode" align="center" width="180"></el-table-column>
  37 + <el-table-column label="备注信息" prop="remarks" align="center"></el-table-column>
  38 + <el-table-column label="操作" width="200px" align="center" fixed="right">
37 <template slot-scope="scope"> 39 <template slot-scope="scope">
38 <el-tooltip effect="dark" content="编辑" placement="top-start" :enterable="false"> 40 <el-tooltip effect="dark" content="编辑" placement="top-start" :enterable="false">
39 - <el-button type="text" icon="el-icon-edit" size="mini" 41 + <el-button type="primary" icon="el-icon-edit" size="mini"
40 @click="yard_toEditDialog(scope.$index,scope.row)">编辑 42 @click="yard_toEditDialog(scope.$index,scope.row)">编辑
41 </el-button> 43 </el-button>
42 </el-tooltip> 44 </el-tooltip>
43 <el-tooltip effect="dark" content="删除" placement="top-start" :enterable="false"> 45 <el-tooltip effect="dark" content="删除" placement="top-start" :enterable="false">
44 - <el-button type="text" icon="el-icon-delete" size="mini" 46 + <el-button type="danger" icon="el-icon-minus" size="mini"
45 :loading="yard_loading.delLoading" 47 :loading="yard_loading.delLoading"
46 @click="yard_delete(scope.$index,scope.row)">删除 48 @click="yard_delete(scope.$index,scope.row)">删除
47 </el-button> 49 </el-button>
@@ -72,27 +74,27 @@ @@ -72,27 +74,27 @@
72 <div> 74 <div>
73 <el-dialog title="场站添加：" 75 <el-dialog title="场站添加："
74 :visible.sync="yard_dialog.addDialog" 76 :visible.sync="yard_dialog.addDialog"
75 - style="margin-top: -80px" text-align="center" width="60%" 77 + text-align="center" width="50%"
76 @close="yard_addDialogClosed"> 78 @close="yard_addDialogClosed">
77 <el-form :inline="true" label-width="150px" status-icon style="margin-top: -10px;" align="center" 79 <el-form :inline="true" label-width="150px" status-icon style="margin-top: -10px;" align="center"
78 :model="yard_addForm" :rules="yard_addFormRules" ref="yard_addFormRef"> 80 :model="yard_addForm" :rules="yard_addFormRules" ref="yard_addFormRef">
79 <el-form-item label="场站名称：" prop="name"> 81 <el-form-item label="场站名称：" prop="name">
80 - <el-input v-model="yard_addForm.name" style="width:300px" size="mini" clearable 82 + <el-input v-model="yard_addForm.name" clearable
81 placeholder="请输入场站名称"> 83 placeholder="请输入场站名称">
82 </el-input> 84 </el-input>
83 </el-form-item> 85 </el-form-item>
84 <el-form-item label="区域代码：" prop="areaCode"> 86 <el-form-item label="区域代码：" prop="areaCode">
85 - <el-input v-model="yard_addForm.areaCode" style="width:300px" size="mini" clearable 87 + <el-input v-model="yard_addForm.areaCode" clearable
86 placeholder="请输入区域代码"> 88 placeholder="请输入区域代码">
87 </el-input> 89 </el-input>
88 </el-form-item> 90 </el-form-item>
89 <el-form-item label="场站编号：" prop="stationId"> 91 <el-form-item label="场站编号：" prop="stationId">
90 - <el-input v-model="yard_addForm.stationId" style="width:300px" size="mini" clearable 92 + <el-input v-model="yard_addForm.stationId" clearable
91 placeholder="请输入场站ID"> 93 placeholder="请输入场站ID">
92 </el-input> 94 </el-input>
93 </el-form-item> 95 </el-form-item>
94 <el-form-item label="关区代码：" prop="customsCode"> 96 <el-form-item label="关区代码：" prop="customsCode">
95 - <el-select v-model="yard_addForm.customsCode" style="width: 300px" clearable size="small" 97 + <el-select v-model="yard_addForm.customsCode" clearable
96 placeholder="请选择关区代码"> 98 placeholder="请选择关区代码">
97 <el-option 99 <el-option
98 v-for="item in customsCodeList" 100 v-for="item in customsCodeList"
@@ -104,17 +106,16 @@ @@ -104,17 +106,16 @@
104 </el-form-item> 106 </el-form-item>
105 107
106 <el-form-item label="备注信息：" prop="remarks"> 108 <el-form-item label="备注信息：" prop="remarks">
107 - <el-input v-model="yard_addForm.remarks" style="width:300px" clearable size="mini"  
108 - type="textarea" :rows="5"> 109 + <el-input v-model="yard_addForm.remarks" clearable
  110 + type="textarea" :rows="5" style="width:300px" >
109 </el-input> 111 </el-input>
110 </el-form-item> 112 </el-form-item>
111 </el-form> 113 </el-form>
112 <div slot="footer" class="dialog-footer" style="text-align: center;margin-top: -30px"> 114 <div slot="footer" class="dialog-footer" style="text-align: center;margin-top: -30px">
113 - <el-button type="info" @click="yard_dialog.addDialog = false" size="medium"  
114 - style="width: 100px">取消 115 + <el-button @click="yard_dialog.addDialog = false" size="medium" style="width: 100px;background-color: #6F8294;color: #ffffff">取消
115 </el-button> 116 </el-button>
116 - <el-button type="primary" @click="yard_add" :loading="yard_loading.addLoading"  
117 - size="medium" style="width: 100px">保存 117 + <el-button @click="yard_add" :loading="yard_loading.addLoading"
  118 + type="primary" size="medium" style="width: 100px">保存
118 </el-button> 119 </el-button>
119 </div> 120 </div>
120 </el-dialog> 121 </el-dialog>
@@ -124,27 +125,27 @@ @@ -124,27 +125,27 @@
124 <div> 125 <div>
125 <el-dialog title="场站修改：" 126 <el-dialog title="场站修改："
126 :visible.sync="yard_dialog.editDialog" 127 :visible.sync="yard_dialog.editDialog"
127 - style="margin-top: -80px" text-align="center" width="60%" 128 + text-align="center" width="50%"
128 @close="yard_editDialogClosed"> 129 @close="yard_editDialogClosed">
129 <el-form :inline="true" label-width="150px" status-icon style="margin-top: -10px;" align="center" 130 <el-form :inline="true" label-width="150px" status-icon style="margin-top: -10px;" align="center"
130 :model="yard_editForm" :rules="yard_editFormRules" ref="yard_editFormRef"> 131 :model="yard_editForm" :rules="yard_editFormRules" ref="yard_editFormRef">
131 <el-form-item label="场站名称：" prop="name"> 132 <el-form-item label="场站名称：" prop="name">
132 - <el-input v-model="yard_editForm.name" style="width:300px" size="mini" clearable 133 + <el-input v-model="yard_editForm.name" clearable
133 placeholder="请输入场站名称"> 134 placeholder="请输入场站名称">
134 </el-input> 135 </el-input>
135 </el-form-item> 136 </el-form-item>
136 <el-form-item label="区域代码：" prop="areaCode"> 137 <el-form-item label="区域代码：" prop="areaCode">
137 - <el-input v-model="yard_editForm.areaCode" style="width:300px" size="mini" clearable 138 + <el-input v-model="yard_editForm.areaCode" clearable
138 placeholder="请输入区域代码"> 139 placeholder="请输入区域代码">
139 </el-input> 140 </el-input>
140 </el-form-item> 141 </el-form-item>
141 <el-form-item label="场站编号：" prop="stationId"> 142 <el-form-item label="场站编号：" prop="stationId">
142 - <el-input v-model="yard_editForm.stationId" style="width:300px" size="mini" clearable 143 + <el-input v-model="yard_editForm.stationId" clearable
143 placeholder="请输入场站ID"> 144 placeholder="请输入场站ID">
144 </el-input> 145 </el-input>
145 </el-form-item> 146 </el-form-item>
146 <el-form-item label="关区代码：" prop="customsCode"> 147 <el-form-item label="关区代码：" prop="customsCode">
147 - <el-select v-model="yard_editForm.customsCode" style="width: 300px" clearable size="small" 148 + <el-select v-model="yard_editForm.customsCode" clearable
148 placeholder="请选择关区代码"> 149 placeholder="请选择关区代码">
149 <el-option 150 <el-option
150 v-for="item in customsCodeList" 151 v-for="item in customsCodeList"
@@ -156,17 +157,16 @@ @@ -156,17 +157,16 @@
156 </el-form-item> 157 </el-form-item>
157 158
158 <el-form-item label="备注信息：" prop="remarks"> 159 <el-form-item label="备注信息：" prop="remarks">
159 - <el-input v-model="yard_editForm.remarks" style="width:300px" clearable size="mini" 160 + <el-input v-model="yard_editForm.remarks" style="width:300px" clearable
160 type="textarea" :rows="5"> 161 type="textarea" :rows="5">
161 </el-input> 162 </el-input>
162 </el-form-item> 163 </el-form-item>
163 </el-form> 164 </el-form>
164 <div slot="footer" class="dialog-footer" style="text-align: center;margin-top: -30px"> 165 <div slot="footer" class="dialog-footer" style="text-align: center;margin-top: -30px">
165 - <el-button type="info" @click="yard_dialog.editDialog = false" size="medium"  
166 - style="width: 100px">取消 166 + <el-button @click="yard_dialog.editDialog = false" size="medium" style="width: 100px;background-color: #6F8294;color: #ffffff">取消
167 </el-button> 167 </el-button>
168 - <el-button type="primary" @click="yard_edit" :loading="yard_loading.editLoading"  
169 - size="medium" style="width: 100px">保存 168 + <el-button @click="yard_edit" :loading="yard_loading.editLoading"
  169 + type="primary" size="medium" style="width: 100px">保存
170 </el-button> 170 </el-button>
171 </div> 171 </div>
172 </el-dialog> 172 </el-dialog>