王勇 / dispatch_sys_vue · 提交

转到一个项目

作者 王勇
提交 99a67d234eb827252630e54d2a709cf1cfb42d7e 1 个父辈 db81f631

修改界面

内嵌 并排对比
正在显示 4 个修改的文件 包含 58 行增加 和 43 行删除
@@ -208,25 +208,23 @@ @@ -208,25 +208,23 @@
208 style="margin-top: -50px" 208 style="margin-top: -50px"
209 title="查看调度记录明细" 209 title="查看调度记录明细"
210 :visible.sync="viewDialogVisible" 210 :visible.sync="viewDialogVisible"
211 - width="50%" @close="showDialogClosed"> 211 + text-align="center"
  212 + width="60%" @close="showDialogClosed">
212 <!-- 表单显示区域 :rules="dispatchFormRules" --> 213 <!-- 表单显示区域 :rules="dispatchFormRules" -->
213 <el-form :model="showForm" ref="showFormRef" 214 <el-form :model="showForm" ref="showFormRef"
214 - style="margin-left:10%;margin-right:10%;background-color: #F5F7FA"> 215 + :inline="true" align="center"
  216 + style="background-color: #F5F7FA;margin-left: 5%;margin-right: 5%">
215 217
216 - <div style="margin-left: 30px"> 218 + <div style="margin-top: -15px">
217 <br> 219 <br>
218 <el-form-item label="用户名称：" prop="userName"> 220 <el-form-item label="用户名称：" prop="userName">
219 - <el-input v-model="showForm.userName" style="width: 300px;" readonly></el-input> 221 + <el-input v-model="showForm.userName" style="width: 200px;" size="small" readonly></el-input>
220 </el-form-item> 222 </el-form-item>
221 <el-form-item label="联系方式：" prop="userMobile"> 223 <el-form-item label="联系方式：" prop="userMobile">
222 - <el-input v-model="showForm.userMobile" style="width: 300px;" readonly></el-input> 224 + <el-input v-model="showForm.userMobile" style="width: 200px;" size="small" readonly></el-input>
223 </el-form-item> 225 </el-form-item>
224 - <!-- <el-form-item label="车辆类型：" prop="vehicleType">-->  
225 - <!-- <el-input v-model="showForm.vehicleType" style="width: 300px;" readonly>-->  
226 - <!-- </el-input>-->  
227 - <!-- </el-form-item>-->  
228 <el-form-item label="车辆类型：" prop="vehicleType"> 226 <el-form-item label="车辆类型：" prop="vehicleType">
229 - <el-select v-model="showForm.vehicleType" style="width:300px" readonly 227 + <el-select v-model="showForm.vehicleType" style="width:200px" size="small" readonly
230 placeholder="请选择车辆类型"> 228 placeholder="请选择车辆类型">
231 <el-option 229 <el-option
232 v-for="item in vehicleTypeList" 230 v-for="item in vehicleTypeList"
@@ -237,12 +235,11 @@ @@ -237,12 +235,11 @@
237 </el-select> 235 </el-select>
238 </el-form-item> 236 </el-form-item>
239 <el-form-item label="车牌号码：" prop="licensePlateNumber"> 237 <el-form-item label="车牌号码：" prop="licensePlateNumber">
240 - <el-input v-model="showForm.licensePlateNumber" style="width: 300px;" 238 + <el-input v-model="showForm.licensePlateNumber" style="width: 200px;" size="small"
241 readonly></el-input> 239 readonly></el-input>
242 </el-form-item> 240 </el-form-item>
243 <el-form-item label="场站位置：" prop="station"> 241 <el-form-item label="场站位置：" prop="station">
244 -  
245 - <el-select v-model="showForm.station" style="width:300px" readonly 242 + <el-select v-model="showForm.station" style="width:200px" readonly size="small"
246 placeholder="请选择场站位置"> 243 placeholder="请选择场站位置">
247 <el-option 244 <el-option
248 v-for="item in stationList" 245 v-for="item in stationList"
@@ -251,10 +248,9 @@ @@ -251,10 +248,9 @@
251 :value="item.value"> 248 :value="item.value">
252 </el-option> 249 </el-option>
253 </el-select> 250 </el-select>
254 -  
255 </el-form-item> 251 </el-form-item>
256 <el-form-item label="业务类型：" prop="dispatchType"> 252 <el-form-item label="业务类型：" prop="dispatchType">
257 - <el-select v-model="showForm.dispatchType" style="width:300px" readonly 253 + <el-select v-model="showForm.dispatchType" style="width:200px" readonly size="small"
258 placeholder="请选择业务类型"> 254 placeholder="请选择业务类型">
259 <el-option 255 <el-option
260 v-for="item in dispatchTypeList" 256 v-for="item in dispatchTypeList"
@@ -265,16 +261,16 @@ @@ -265,16 +261,16 @@
265 </el-select> 261 </el-select>
266 </el-form-item> 262 </el-form-item>
267 <el-form-item label="创建时间：" prop="gmtCreate"> 263 <el-form-item label="创建时间：" prop="gmtCreate">
268 - <el-input v-model="showForm.gmtCreate" style="width: 300px;" readonly></el-input> 264 + <el-input v-model="showForm.gmtCreate" style="width: 200px;" size="small" readonly></el-input>
269 </el-form-item> 265 </el-form-item>
270 <el-form-item label="开始时间：" prop="beginTime"> 266 <el-form-item label="开始时间：" prop="beginTime">
271 - <el-input v-model="showForm.beginTime" style="width: 300px;" readonly></el-input> 267 + <el-input v-model="showForm.beginTime" style="width: 200px;" size="small" readonly></el-input>
272 </el-form-item> 268 </el-form-item>
273 <el-form-item label="结束时间：" prop="endTime"> 269 <el-form-item label="结束时间：" prop="endTime">
274 - <el-input v-model="showForm.endTime" style="width: 300px;" readonly></el-input> 270 + <el-input v-model="showForm.endTime" style="width: 200px;" size="small" readonly></el-input>
275 </el-form-item> 271 </el-form-item>
276 <el-form-item label="记录状态：" prop="status"> 272 <el-form-item label="记录状态：" prop="status">
277 - <el-select v-model="showForm.status" placeholder="记录状态" style="width:300px" 273 + <el-select v-model="showForm.status" placeholder="记录状态" style="width:200px" size="small"
278 readonly> 274 readonly>
279 <el-option 275 <el-option
280 v-for="item in statusList" 276 v-for="item in statusList"
@@ -62,6 +62,7 @@ @@ -62,6 +62,7 @@
62 <!--调度记录列表区域--> 62 <!--调度记录列表区域-->
63 <div style="margin-top: 20px;"> 63 <div style="margin-top: 20px;">
64 <el-table :data="DispatchNoteList" border stripe v-loading="listLoading" 64 <el-table :data="DispatchNoteList" border stripe v-loading="listLoading"
  65 + :row-class-name="rowStatus"
65 element-loading-text="拼命加载中"> 66 element-loading-text="拼命加载中">
66 <el-table-column type="index" align="center"></el-table-column> 67 <el-table-column type="index" align="center"></el-table-column>
67 <el-table-column label="用户名称" prop="userName" align="center" width="100"></el-table-column> 68 <el-table-column label="用户名称" prop="userName" align="center" width="100"></el-table-column>
@@ -164,13 +165,13 @@ @@ -164,13 +165,13 @@
164 <el-dialog title="添加车辆调度记录" 165 <el-dialog title="添加车辆调度记录"
165 :visible.sync="addDispatchNodeFormVisible" 166 :visible.sync="addDispatchNodeFormVisible"
166 style="margin-top: -50px" 167 style="margin-top: -50px"
167 - width="50%" text-align="center" @close="dispatchDialogClosed"> 168 + width="60%" text-align="center" @close="dispatchDialogClosed">
168 <el-form :inline="true" :model="addDispatchNodeForm" label-width="120px" status-icon 169 <el-form :inline="true" :model="addDispatchNodeForm" label-width="120px" status-icon
169 :rules="addDispatchNodeFormRules" ref="addDispatchNodeFormRef" 170 :rules="addDispatchNodeFormRules" ref="addDispatchNodeFormRef"
170 style="background-color: #F5F7FA" align="center"> 171 style="background-color: #F5F7FA" align="center">
171 <br> 172 <br>
172 <el-form-item label="用户名称：" prop="userName"> 173 <el-form-item label="用户名称：" prop="userName">
173 - <el-input v-model="addDispatchNodeForm.userName" style="width:200px" clearable size="small" 174 + <el-input v-model="addDispatchNodeForm.userName" style="width:200px" size="small" clearable
174 placeholder="请输入您的用户名称"></el-input> 175 placeholder="请输入您的用户名称"></el-input>
175 </el-form-item> 176 </el-form-item>
176 <el-form-item label="联系方式：" prop="userMobile"> 177 <el-form-item label="联系方式：" prop="userMobile">
@@ -273,14 +274,15 @@ @@ -273,14 +274,15 @@
273 style="margin-top: -50px" 274 style="margin-top: -50px"
274 title="编辑调度记录明细" 275 title="编辑调度记录明细"
275 :visible.sync="viewDialogVisible" 276 :visible.sync="viewDialogVisible"
276 -  
277 - width="50%" 277 + text-align="center"
  278 + width="60%"
278 @close="editDialogClosed"> 279 @close="editDialogClosed">
279 280
280 <el-form :model="editForm" label-width="120px" status-icon 281 <el-form :model="editForm" label-width="120px" status-icon
  282 + :inline="true"
281 style="background-color: #F5F7FA;" 283 style="background-color: #F5F7FA;"
282 :rules="editFormRules" ref="editFormRef"> 284 :rules="editFormRules" ref="editFormRef">
283 - <div style="margin-left: 30px"> 285 + <div style="margin-left: 40px">
284 <br> 286 <br>
285 <el-form-item label="用户名称：" prop="userName"> 287 <el-form-item label="用户名称：" prop="userName">
286 <el-input v-model="editForm.userName" style="width:200px" clearable size="small" 288 <el-input v-model="editForm.userName" style="width:200px" clearable size="small"
@@ -807,6 +809,15 @@ @@ -807,6 +809,15 @@
807 this.editForm = Object.assign({}, row); 809 this.editForm = Object.assign({}, row);
808 this.viewDialogVisible = true; 810 this.viewDialogVisible = true;
809 }, 811 },
  812 + /**
  813 + * 根据状态的不同区分颜色
  814 + *
  815 + * @param row
  816 + * @param rowIndex
  817 + */
  818 + rowStatus({row, rowIndex}){
  819 +
  820 + }
810 } 821 }
811 } 822 }
812 </script> 823 </script>
@@ -105,12 +105,14 @@ @@ -105,12 +105,14 @@
105 <el-dialog 105 <el-dialog
106 style="margin-top: -50px" 106 style="margin-top: -50px"
107 title="增加驾驶员信息" 107 title="增加驾驶员信息"
  108 + text-align="center"
108 :visible.sync="addDriverInfoFormVisible" 109 :visible.sync="addDriverInfoFormVisible"
109 width="50%" @close="addDriverInfoDialogClosed"> 110 width="50%" @close="addDriverInfoDialogClosed">
110 <el-form :model="addDriverInfoForm" label-width="100px" status-icon 111 <el-form :model="addDriverInfoForm" label-width="100px" status-icon
111 :rules="addDriverInfoFormRules" ref="addDriverInfoFormRef" 112 :rules="addDriverInfoFormRules" ref="addDriverInfoFormRef"
112 - style="margin-left:10%;margin-right:10%;background-color: #F5F7FA">  
113 - <div style="margin-left: 30px"> 113 + size="medium" align="center" :inline="true"
  114 + style="background-color: #F5F7FA">
  115 + <div style="margin-top: -15px">
114 <br> 116 <br>
115 <el-form-item label="司机姓名：" prop="driverName"> 117 <el-form-item label="司机姓名：" prop="driverName">
116 <el-input v-model="addDriverInfoForm.driverName" style="width: 300px;" clearable 118 <el-input v-model="addDriverInfoForm.driverName" style="width: 300px;" clearable
@@ -171,14 +173,16 @@ @@ -171,14 +173,16 @@
171 <!-- 编辑驾驶员信息，对话框 --> 173 <!-- 编辑驾驶员信息，对话框 -->
172 <div> 174 <div>
173 <el-dialog 175 <el-dialog
174 - style="margin-top: -50px" 176 + style="margin-top: -70px"
175 title="编辑驾驶员信息" 177 title="编辑驾驶员信息"
176 :visible.sync="editDialogVisible" 178 :visible.sync="editDialogVisible"
  179 + text-align="center"
177 width="50%" @close="editDriverInfoDialogClosed"> 180 width="50%" @close="editDriverInfoDialogClosed">
178 <el-form :model="editDriverInfoForm" label-width="100px" status-icon 181 <el-form :model="editDriverInfoForm" label-width="100px" status-icon
179 :rules="editDriverInfoFormRules" ref="editDriverInfoFormRef" 182 :rules="editDriverInfoFormRules" ref="editDriverInfoFormRef"
180 - style="margin-left:10%;margin-right:10%;background-color: #F5F7FA">  
181 - <div style="margin-left: 30px"> 183 + :inline="true" size="medium" align="center"
  184 + style="background-color: #F5F7FA">
  185 + <div style="margin-top: -15px">
182 <br> 186 <br>
183 <el-form-item label="司机姓名：" prop="driverName"> 187 <el-form-item label="司机姓名：" prop="driverName">
184 <el-input v-model="editDriverInfoForm.driverName" style="width: 300px;" clearable 188 <el-input v-model="editDriverInfoForm.driverName" style="width: 300px;" clearable
@@ -186,27 +186,29 @@ @@ -186,27 +186,29 @@
186 <!-- 编辑车辆信息，对话框 --> 186 <!-- 编辑车辆信息，对话框 -->
187 <div> 187 <div>
188 <el-dialog 188 <el-dialog
189 - style="margin-top: -50px"  
190 title="编辑车辆信息" 189 title="编辑车辆信息"
  190 + text-align="center"
191 :visible.sync="editDialogVisible" 191 :visible.sync="editDialogVisible"
192 - width="50%" @close="editVehicleInfoDialogClosed"> 192 + width="60%" @close="editVehicleInfoDialogClosed">
193 <el-form :model="editVehicleInfoForm" label-width="100px" status-icon 193 <el-form :model="editVehicleInfoForm" label-width="100px" status-icon
194 :rules="editVehicleInfoFormRules" ref="editVehicleInfoFormRef" 194 :rules="editVehicleInfoFormRules" ref="editVehicleInfoFormRef"
195 - style="margin-left:10%;margin-right:10%;background-color: #F5F7FA">  
196 - <div style="margin-left: 30px"> 195 + :inline="true" align="center"
  196 + style="background-color: #F5F7FA">
  197 + <div >
197 <br> 198 <br>
198 <el-form-item label="车牌号码：" prop="licensePlateNumber"> 199 <el-form-item label="车牌号码：" prop="licensePlateNumber">
199 <el-input v-model="editVehicleInfoForm.licensePlateNumber" clearable 200 <el-input v-model="editVehicleInfoForm.licensePlateNumber" clearable
200 - style="width: 300px;" 201 + style="width:250px"
201 placeholder="请输入车牌号码"></el-input> 202 placeholder="请输入车牌号码"></el-input>
202 </el-form-item> 203 </el-form-item>
203 <el-form-item label="行驶证号：" prop="drivingLicenseNumber"> 204 <el-form-item label="行驶证号：" prop="drivingLicenseNumber">
204 <el-input v-model="editVehicleInfoForm.drivingLicenseNumber" clearable 205 <el-input v-model="editVehicleInfoForm.drivingLicenseNumber" clearable
205 - style="width: 300px;" 206 + style="width:250px"
206 placeholder="请输入车辆行驶证号"></el-input> 207 placeholder="请输入车辆行驶证号"></el-input>
207 </el-form-item> 208 </el-form-item>
208 <el-form-item label="车辆类型：" prop="vehicleType"> 209 <el-form-item label="车辆类型：" prop="vehicleType">
209 - <el-select v-model="editVehicleInfoForm.vehicleType" style="width: 300px" clearable 210 + <el-select v-model="editVehicleInfoForm.vehicleType" clearable
  211 + style="width:250px"
210 placeholder="请选择车辆类型"> 212 placeholder="请选择车辆类型">
211 <el-option 213 <el-option
212 v-for="item in vehicleTypeList" 214 v-for="item in vehicleTypeList"
@@ -217,14 +219,15 @@ @@ -217,14 +219,15 @@
217 </el-select> 219 </el-select>
218 </el-form-item> 220 </el-form-item>
219 <el-form-item label="车辆载重：" prop="vehicleLoad"> 221 <el-form-item label="车辆载重：" prop="vehicleLoad">
220 - <el-input-number style="width: 200px" v-model="editVehicleInfoForm.vehicleLoad"  
221 - clearable 222 + <el-input-number v-model="editVehicleInfoForm.vehicleLoad"
  223 + clearable style="width:220px"
222 :min="10" :max="10000" controls-position="right"> 224 :min="10" :max="10000" controls-position="right">
223 </el-input-number> 225 </el-input-number>
224 <span style="margin-left:5px;font-size: 18px">Kg</span> 226 <span style="margin-left:5px;font-size: 18px">Kg</span>
225 </el-form-item> 227 </el-form-item>
226 <el-form-item label="车辆状态：" prop="vehicleStatus"> 228 <el-form-item label="车辆状态：" prop="vehicleStatus">
227 - <el-select v-model="editVehicleInfoForm.vehicleStatus" clearable style="width: 300px" 229 + <el-select v-model="editVehicleInfoForm.vehicleStatus" clearable
  230 + style="width:250px"
228 clearable placeholder="请选择车辆状态"> 231 clearable placeholder="请选择车辆状态">
229 <el-option 232 <el-option
230 v-for="item in vehicleStatusList" 233 v-for="item in vehicleStatusList"
@@ -235,8 +238,8 @@ @@ -235,8 +238,8 @@
235 </el-select> 238 </el-select>
236 </el-form-item> 239 </el-form-item>
237 <el-form-item label="有无挂车：" prop="vehicleType"> 240 <el-form-item label="有无挂车：" prop="vehicleType">
238 - <el-select v-model="editVehicleInfoForm.isTrailer" clearable style="width: 300px"  
239 - clearable 241 + <el-select v-model="editVehicleInfoForm.isTrailer" clearable
  242 + style="width:250px" clearable
240 placeholder="请选择有无挂车"> 243 placeholder="请选择有无挂车">
241 <el-option 244 <el-option
242 v-for="item in isTrailerList" 245 v-for="item in isTrailerList"
@@ -247,12 +250,13 @@ @@ -247,12 +250,13 @@
247 </el-select> 250 </el-select>
248 </el-form-item> 251 </el-form-item>
249 <el-form-item label="车辆公司：" prop="vehicleCompany"> 252 <el-form-item label="车辆公司：" prop="vehicleCompany">
250 - <el-input v-model="editVehicleInfoForm.vehicleCompany" clearable style="width: 300px;" 253 + <el-input v-model="editVehicleInfoForm.vehicleCompany" clearable
  254 + style="width:250px"
251 placeholder="请输入车辆公司"></el-input> 255 placeholder="请输入车辆公司"></el-input>
252 </el-form-item> 256 </el-form-item>
253 <el-form-item label="空闲时间：" prop="freetime"> 257 <el-form-item label="空闲时间：" prop="freetime">
254 <el-date-picker v-model="editVehicleInfoForm.freetime" type="datetime" 258 <el-date-picker v-model="editVehicleInfoForm.freetime" type="datetime"
255 - style="width: 300px;" 259 + style="width:250px"
256 placeholder="选择调度时间"></el-date-picker> 260 placeholder="选择调度时间"></el-date-picker>
257 </el-form-item> 261 </el-form-item>
258 <br> 262 <br>