朱兆平 / vue_cli · 提交

转到一个项目

作者 小范
提交 ffcd4e74300b62b08862d4fe1821d5190df63989 1 个父辈 df641460

进港业务申报界面优化

内嵌 并排对比
正在显示 6 个修改的文件 包含 426 行增加 和 229 行删除
@@ -8,44 +8,36 @@ @@ -8,44 +8,36 @@
8 <el-row style="display: block;background-color: white;padding-left: 5px"> 8 <el-row style="display: block;background-color: white;padding-left: 5px">
9 <el-row> 9 <el-row>
10 <el-col :span="6"> 10 <el-col :span="6">
11 - <span>  
12 - 主单号  
13 - </span>  
14 - <el-input placeholder="" v-model="defaultQuery.awba" style="width: 150px"> 11 + <el-input placeholder="" v-model="defaultQuery.awba" style="width: 200px">
  12 + <template slot="prepend">主单号</template>
15 </el-input> 13 </el-input>
16 </el-col> 14 </el-col>
17 <el-col :span="6"> 15 <el-col :span="6">
18 - <span>  
19 - 承运人  
20 - </span>  
21 - <el-input placeholder="" v-model="defaultQuery.carrier" style="width: 150px"> 16 + <el-input placeholder="" v-model="defaultQuery.carrier" style="width: 200px">
  17 + <template slot="prepend">承运人</template>
22 </el-input> 18 </el-input>
23 </el-col> 19 </el-col>
24 <el-col :span="6"> 20 <el-col :span="6">
25 - <span>  
26 - 航班号  
27 - </span>  
28 - <el-input placeholder="" v-model="defaultQuery.flightno" style="width: 150px"> 21 + <el-input placeholder="" v-model="defaultQuery.flightno" style="width: 200px">
  22 + <template slot="prepend">航班号</template>
29 </el-input> 23 </el-input>
30 </el-col> 24 </el-col>
31 <el-col :span="6"> 25 <el-col :span="6">
32 - <span>  
33 - 航班日期  
34 - </span> 26 + <div class="ip">
  27 + 航班日期 </div>
35 <el-date-picker 28 <el-date-picker
36 v-model="defaultQuery.flightdate" 29 v-model="defaultQuery.flightdate"
37 value-format="yyyy-MM-dd" 30 value-format="yyyy-MM-dd"
38 - type="date" style="width: 150px" 31 + type="date" style="width: 130px"
39 placeholder="航班日期"> 32 placeholder="航班日期">
40 </el-date-picker> 33 </el-date-picker>
41 </el-col> 34 </el-col>
42 </el-row> 35 </el-row>
43 <el-row> 36 <el-row>
44 <el-col :span="6"> 37 <el-col :span="6">
45 - <span>  
46 - 业务状态  
47 - </span>  
48 - <el-select v-model="defaultQuery.status" placeholder="选择状态" style="width: 150px"> 38 + <div class="ip">
  39 + 业务状态 </div>
  40 + <el-select v-model="defaultQuery.status" placeholder="选择状态" style="width: 120px">
49 <el-option 41 <el-option
50 v-for="item in options" 42 v-for="item in options"
51 :key="item.value" 43 :key="item.value"
@@ -55,10 +47,9 @@ @@ -55,10 +47,9 @@
55 </el-select> 47 </el-select>
56 </el-col> 48 </el-col>
57 <el-col :span="6"> 49 <el-col :span="6">
58 - <span>  
59 - 报文类型  
60 - </span>  
61 - <el-select v-model="defaultQuery.turntype" placeholder="报文类型" style="width: 150px"> 50 + <div class="ip">
  51 + 报文类型 </div>
  52 + <el-select v-model="defaultQuery.turntype" placeholder="报文类型" style="width: 120px">
62 <el-option 53 <el-option
63 v-for="item in options2" 54 v-for="item in options2"
64 :key="item.value" 55 :key="item.value"
@@ -84,7 +75,8 @@ @@ -84,7 +75,8 @@
84 ref="multipleTable" 75 ref="multipleTable"
85 :data="tableData" 76 :data="tableData"
86 tooltip-effect="dark" 77 tooltip-effect="dark"
87 - style="width: 100%"> 78 + style="border-radius: 10px 10px 0px 0px;line-height: 25px;min-height: 500px"
  79 + :header-cell-style="{background:'#6F8294',color:'#FFFFFF'}" size="small">
88 <el-table-column 80 <el-table-column
89 fixed="left" 81 fixed="left"
90 label="修改状态" 82 label="修改状态"
@@ -158,9 +150,9 @@ @@ -158,9 +150,9 @@
158 </template> 150 </template>
159 </el-table-column> 151 </el-table-column>
160 <el-table-column 152 <el-table-column
161 - label="修改状态"  
162 - width="480"> 153 + label="修改状态" prop="operation" fixed="right" align="center" width="285">
163 <template slot-scope="scope"> 154 <template slot-scope="scope">
  155 + <el-row type="flex" justify="space-between">
164 <el-button 156 <el-button
165 v-if="scope.row.turntype=='MT6202'" 157 v-if="scope.row.turntype=='MT6202'"
166 size="mini" 158 size="mini"
@@ -177,14 +169,16 @@ @@ -177,14 +169,16 @@
177 v-if="scope.row.turntype=='MT6202'" 169 v-if="scope.row.turntype=='MT6202'"
178 size="mini" 170 size="mini"
179 type="success" 171 type="success"
180 - @click="importEdit(scope.$index, scope.row)">编辑 172 + @click="importEdit(scope.$index, scope.row)">编辑信息
181 </el-button> 173 </el-button>
182 <el-button 174 <el-button
183 v-else 175 v-else
184 size="mini" 176 size="mini"
185 type="success" 177 type="success"
186 - @click="arriveEdit(scope.$index, scope.row)">编辑 178 + @click="arriveEdit(scope.$index, scope.row)">编辑信息
187 </el-button> 179 </el-button>
  180 + </el-row>
  181 + <el-row type="flex" justify="space-between">
188 <el-button 182 <el-button
189 v-if="scope.row.turntype=='MT6202'" 183 v-if="scope.row.turntype=='MT6202'"
190 size="mini" 184 size="mini"
@@ -209,15 +203,16 @@ @@ -209,15 +203,16 @@
209 size="mini" 203 size="mini"
210 type="danger" 204 type="danger"
211 :disabled="btDeleStatusFormater(scope.row.status)" 205 :disabled="btDeleStatusFormater(scope.row.status)"
212 - @click="importDel(scope.$index, scope.row)">申请分拨删除 206 + @click="importDel(scope.$index, scope.row)">申请删除
213 </el-button> 207 </el-button>
214 <el-button 208 <el-button
215 v-else 209 v-else
216 size="mini" 210 size="mini"
217 type="danger" 211 type="danger"
218 :disabled="btDeleStatusFormater(scope.row.status)" 212 :disabled="btDeleStatusFormater(scope.row.status)"
219 - @click="arriveDel(scope.$index, scope.row)">分拨运抵删除 213 + @click="arriveDel(scope.$index, scope.row)">申请删除
220 </el-button> 214 </el-button>
  215 + </el-row>
221 </template> 216 </template>
222 </el-table-column> 217 </el-table-column>
223 </el-table> 218 </el-table>
@@ -251,9 +246,11 @@ @@ -251,9 +246,11 @@
251 </el-col> 246 </el-col>
252 </el-row> 247 </el-row>
253 <el-row> 248 <el-row>
254 - <el-col :span="5">  
255 - <el-form-item label="运单号" prop="awba">  
256 - <el-input disabled="" v-model="AruleForm.awba"></el-input> 249 + <el-col :span="6">
  250 + <el-form-item label="" prop="awba">
  251 + <el-input disabled="" v-model="AruleForm.awba" style="width: 200px">
  252 + <template slot="prepend">运单号</template>
  253 + </el-input>
257 </el-form-item> 254 </el-form-item>
258 </el-col> 255 </el-col>
259 <el-col :span="15"> 256 <el-col :span="15">
@@ -268,28 +265,33 @@ @@ -268,28 +265,33 @@
268 </el-row> 265 </el-row>
269 <el-row> 266 <el-row>
270 <el-col :span="5"> 267 <el-col :span="5">
271 - <el-form-item label="承运人" prop="carrier">  
272 - <el-input disabled="" v-model="AruleForm.carrier"></el-input> 268 + <el-form-item label="" prop="carrier">
  269 + <el-input disabled="" v-model="AruleForm.carrier" style="width: 200px">
  270 + <template slot="prepend">承运人</template>
  271 + </el-input>
273 </el-form-item> 272 </el-form-item>
274 </el-col> 273 </el-col>
275 <el-col :span="5"> 274 <el-col :span="5">
276 - <el-form-item label="航班号" prop="flightno">  
277 - <el-input disabled="" v-model="AruleForm.flightno"></el-input> 275 + <el-form-item label="" prop="flightno">
  276 + <el-input disabled="" v-model="AruleForm.flightno" style="width: 200px">
  277 + <template slot="prepend">航班号</template>
  278 + </el-input>
278 </el-form-item> 279 </el-form-item>
279 </el-col> 280 </el-col>
280 - <el-col :span="5">  
281 - <el-form-item label="航班日期" required>  
282 - <el-col :span="24"> 281 + <el-col :span="7">
  282 + <el-form-item label="" required>
283 <el-form-item prop="flightdate"> 283 <el-form-item prop="flightdate">
284 - <el-date-picker disabled="" type="date" placeholder="选择日期" v-model="AruleForm.flightdate" style="width: 100%;"></el-date-picker> 284 + <div class="ipt">
  285 + 航班日期 </div>
  286 + <el-date-picker disabled="" type="date" placeholder="选择日期" v-model="AruleForm.flightdate" style="width: 130px;"></el-date-picker>
285 </el-form-item> 287 </el-form-item>
286 - </el-col>  
287 </el-form-item> 288 </el-form-item>
288 </el-col> 289 </el-col>
289 - <el-col :span="5">  
290 - <el-form-item label="海关关区" prop="customcode">  
291 - <el-col :span="24">  
292 - <el-select v-model="AruleForm.customcode" placeholder="请选择海关关区" style="width:100%"> 290 + <el-col :span="7">
  291 + <el-form-item label="" prop="customcode">
  292 + <div class="ipt">
  293 + 海关关区 </div>
  294 + <el-select v-model="AruleForm.customcode" placeholder="请选择海关关区" style="width:120px">
293 <div v-if="dialogStatus === 'update'"> 295 <div v-if="dialogStatus === 'update'">
294 <el-option v-for="item in options3" :key="item.value" :label="item.label" 296 <el-option v-for="item in options3" :key="item.value" :label="item.label"
295 :value="item.value" ></el-option> 297 :value="item.value" ></el-option>
@@ -299,48 +301,63 @@ @@ -299,48 +301,63 @@
299 :value="item.value" ></el-option> 301 :value="item.value" ></el-option>
300 </div> 302 </div>
301 </el-select> 303 </el-select>
302 - </el-col>  
303 </el-form-item> 304 </el-form-item>
304 </el-col> 305 </el-col>
305 </el-row> 306 </el-row>
306 <el-row> 307 <el-row>
307 <el-col :span="5"> 308 <el-col :span="5">
308 - <el-form-item label="运抵件数" prop="turnpiece"> 309 + <el-form-item label="" prop="turnpiece">
309 <div v-if="dialogStatus === 'update'"> 310 <div v-if="dialogStatus === 'update'">
310 - <el-input type="number" v-model="AruleForm.turnpiece"></el-input> 311 + <el-input type="number" v-model="AruleForm.turnpiece" style="width: 200px">
  312 + <template slot="prepend">运抵件数</template>
  313 + </el-input>
311 </div> 314 </div>
312 <div v-else> 315 <div v-else>
313 - <el-input type="number" disabled="" v-model="AruleForm.turnpiece"></el-input> 316 + <el-input type="number" disabled="" v-model="AruleForm.turnpiece" style="width: 200px">
  317 + <template slot="prepend">运抵件数</template>
  318 + </el-input>
314 </div> 319 </div>
315 </el-form-item> 320 </el-form-item>
316 </el-col> 321 </el-col>
317 <el-col :span="5"> 322 <el-col :span="5">
318 - <el-form-item label="运抵重量" prop="turnweight"> 323 + <el-form-item label="" prop="turnweight">
319 <div v-if="dialogStatus === 'update'"> 324 <div v-if="dialogStatus === 'update'">
320 - <el-input type="number" v-model="AruleForm.turnweight"></el-input> 325 + <el-input type="number" v-model="AruleForm.turnweight" style="width: 200px">
  326 + <template slot="prepend">运抵重量</template>
  327 + </el-input>
321 </div> 328 </div>
322 <div v-else> 329 <div v-else>
323 - <el-input type="number" disabled="" v-model="AruleForm.turnweight"></el-input> 330 + <el-input type="number" disabled="" v-model="AruleForm.turnweight" style="width: 200px">
  331 + <template slot="prepend">运抵重量</template>
  332 + </el-input>
324 </div> 333 </div>
325 </el-form-item> 334 </el-form-item>
326 </el-col> 335 </el-col>
327 - <el-col :span="5">  
328 - <el-form-item label="卸货地" prop="turnunloading"> 336 + <el-col :span="7">
  337 + <el-form-item label="" prop="turnunloading">
329 <div v-if="dialogStatus === 'update'"> 338 <div v-if="dialogStatus === 'update'">
330 - <el-input v-model="AruleForm.turnunloading"></el-input> 339 + <el-input v-model="AruleForm.turnunloading" style="width: 215px">
  340 + <template slot="prepend">卸货地</template>
  341 + </el-input>
331 </div> 342 </div>
332 <div v-else> 343 <div v-else>
333 - <el-input disabled="" v-model="AruleForm.turnunloading"></el-input> 344 + <el-input disabled="" v-model="AruleForm.turnunloading" style="width: 215px">
  345 + <template slot="prepend">卸货地</template>
  346 + </el-input>
334 </div> 347 </div>
335 </el-form-item> 348 </el-form-item>
336 </el-col> 349 </el-col>
337 <el-col :span="5"> 350 <el-col :span="5">
338 - <el-form-item label="货物描述" prop="turnunloading"> 351 + <el-form-item label="" prop="turnunloading">
339 <div v-if="dialogStatus === 'update'"> 352 <div v-if="dialogStatus === 'update'">
340 - <el-input v-model="AruleForm.goodsname"></el-input> 353 + <el-input v-model="AruleForm.goodsname" style="width: 200px">
  354 + <template slot="prepend">货物描述</template>
  355 + </el-input>
341 </div> 356 </div>
342 <div v-else> 357 <div v-else>
343 - <el-input disabled="" v-model="AruleForm.goodsname"></el-input> 358 + <el-input disabled="" v-model="AruleForm.goodsname" style="width: 200px">
  359 + <template slot="prepend">货物描述</template>
  360 + </el-input>
344 </div> 361 </div>
345 </el-form-item> 362 </el-form-item>
346 </el-col> 363 </el-col>
@@ -360,8 +377,10 @@ @@ -360,8 +377,10 @@
360 </el-row> 377 </el-row>
361 <el-row> 378 <el-row>
362 <el-col :span="5"> 379 <el-col :span="5">
363 - <el-form-item label="运单号" prop="awba">  
364 - <el-input disabled="" v-model="IruleForm.awba"></el-input> 380 + <el-form-item label="" prop="awba">
  381 + <el-input disabled="" v-model="IruleForm.awba" style="width: 200px">
  382 + <template slot="prepend">运单号</template>
  383 + </el-input>
365 </el-form-item> 384 </el-form-item>
366 </el-col> 385 </el-col>
367 <el-col :span="15"> 386 <el-col :span="15">
@@ -376,28 +395,33 @@ @@ -376,28 +395,33 @@
376 </el-row> 395 </el-row>
377 <el-row> 396 <el-row>
378 <el-col :span="5"> 397 <el-col :span="5">
379 - <el-form-item label="承运人" prop="carrier">  
380 - <el-input disabled="" v-model="IruleForm.carrier"></el-input> 398 + <el-form-item label="" prop="carrier">
  399 + <el-input disabled="" v-model="IruleForm.carrier" style="width: 200px">
  400 + <template slot="prepend">运承运人单号</template>
  401 + </el-input>
381 </el-form-item> 402 </el-form-item>
382 </el-col> 403 </el-col>
383 <el-col :span="5"> 404 <el-col :span="5">
384 - <el-form-item label="航班号" prop="flightno">  
385 - <el-input disabled="" v-model="IruleForm.flightno"></el-input> 405 + <el-form-item label="" prop="flightno">
  406 + <el-input disabled="" v-model="IruleForm.flightno" style="width: 200px">
  407 + <template slot="prepend">航班号</template>
  408 + </el-input>
386 </el-form-item> 409 </el-form-item>
387 </el-col> 410 </el-col>
388 - <el-col :span="5">  
389 - <el-form-item label="航班日期" required>  
390 - <el-col :span="24"> 411 + <el-col :span="7">
  412 + <el-form-item label="" required>
391 <el-form-item prop="flightdate"> 413 <el-form-item prop="flightdate">
392 - <el-date-picker disabled="" type="date" placeholder="选择日期" v-model="IruleForm.flightdate" style="width: 100%;"></el-date-picker> 414 + <div class="ipt">
  415 + 航班日期 </div>
  416 + <el-date-picker disabled="" type="date" placeholder="选择日期" v-model="IruleForm.flightdate" style="width: 130px;"></el-date-picker>
393 </el-form-item> 417 </el-form-item>
394 - </el-col>  
395 </el-form-item> 418 </el-form-item>
396 </el-col> 419 </el-col>
397 - <el-col :span="5">  
398 - <el-form-item label="海关关区" prop="customcode">  
399 - <el-col :span="24">  
400 - <el-select v-model="IruleForm.customcode" placeholder="请选择海关关区" style="width:100%"> 420 + <el-col :span="7">
  421 + <el-form-item label="" prop="customcode">
  422 + <div class="ipt">
  423 + 海关关区 </div>
  424 + <el-select v-model="IruleForm.customcode" placeholder="请选择海关关区" style="width:120px">
401 <div v-if="dialogStatus === 'update'"> 425 <div v-if="dialogStatus === 'update'">
402 <el-option v-for="item in options3" :key="item.value" :label="item.label" 426 <el-option v-for="item in options3" :key="item.value" :label="item.label"
403 :value="item.value" ></el-option> 427 :value="item.value" ></el-option>
@@ -407,68 +431,94 @@ @@ -407,68 +431,94 @@
407 :value="item.value" ></el-option> 431 :value="item.value" ></el-option>
408 </div> 432 </div>
409 </el-select> 433 </el-select>
410 - </el-col>  
411 </el-form-item> 434 </el-form-item>
412 </el-col> 435 </el-col>
413 </el-row> 436 </el-row>
414 <el-row> 437 <el-row>
415 <el-col :span="5"> 438 <el-col :span="5">
416 - <el-form-item label="运抵件数" prop="turnpiece"> 439 + <el-form-item label="" prop="turnpiece">
417 <div v-if="dialogStatus === 'update'"> 440 <div v-if="dialogStatus === 'update'">
418 - <el-input v-model="IruleForm.turnpiece"></el-input> 441 + <el-input v-model="IruleForm.turnpiece" style="width: 200px">
  442 + <template slot="prepend">运抵件数</template>
  443 + </el-input>
419 </div> 444 </div>
420 <div v-else> 445 <div v-else>
421 - <el-input disabled="" v-model="IruleForm.turnpiece"></el-input> 446 + <el-input disabled="" v-model="IruleForm.turnpiece" style="width: 200px">
  447 + <template slot="prepend">运抵件数</template>
  448 + </el-input>
422 </div> 449 </div>
423 </el-form-item> 450 </el-form-item>
424 </el-col> 451 </el-col>
425 <el-col :span="5"> 452 <el-col :span="5">
426 - <el-form-item label="运抵重量" prop="turnweight"> 453 + <el-form-item label="" prop="turnweight">
427 <div v-if="dialogStatus === 'update'"> 454 <div v-if="dialogStatus === 'update'">
428 - <el-input v-model="IruleForm.turnweight"></el-input> 455 + <el-input v-model="IruleForm.turnweight" style="width: 200px">
  456 + <template slot="prepend">运抵重量</template>
  457 + </el-input>
429 </div> 458 </div>
430 <div v-else> 459 <div v-else>
431 - <el-input disabled="" v-model="IruleForm.turnweight"></el-input> 460 + <el-input disabled="" v-model="IruleForm.turnweight" style="width: 200px">
  461 + <template slot="prepend">运抵重量</template>
  462 + </el-input>
432 </div> 463 </div>
433 </el-form-item> 464 </el-form-item>
434 </el-col> 465 </el-col>
435 - <el-col :span="5">  
436 - <el-form-item label="到达地" prop="turnunloading"> 466 + <el-col :span="7">
  467 + <el-form-item label="" prop="turnunloading">
437 <div v-if="dialogStatus === 'update'"> 468 <div v-if="dialogStatus === 'update'">
438 - <el-input v-model="IruleForm.turnunloading"></el-input> 469 + <el-input v-model="IruleForm.turnunloading" style="width: 200px">
  470 + <template slot="prepend">到达地</template>
  471 + </el-input>
439 </div> 472 </div>
440 <div v-else> 473 <div v-else>
441 - <el-input disabled="" v-model="IruleForm.turnunloading"></el-input> 474 + <el-input disabled="" v-model="IruleForm.turnunloading" style="width: 200px">
  475 + <template slot="prepend">到达地</template>
  476 + </el-input>
442 </div> 477 </div>
443 </el-form-item> 478 </el-form-item>
444 </el-col> 479 </el-col>
445 <el-col :span="5"> 480 <el-col :span="5">
446 - <el-form-item label="拖车号" prop="pno"> 481 + <el-form-item label="" prop="pno">
447 <div v-if="dialogStatus === 'update'"> 482 <div v-if="dialogStatus === 'update'">
448 - <el-input v-model="IruleForm.pno"></el-input> 483 + <el-input v-model="IruleForm.pno" style="width: 200px">
  484 + <template slot="prepend">拖车号</template>
  485 + </el-input>
449 </div> 486 </div>
450 <div v-else> 487 <div v-else>
451 - <el-input disabled="" v-model="IruleForm.pno"></el-input> 488 + <el-input disabled="" v-model="IruleForm.pno" style="width: 200px">
  489 + <template slot="prepend">拖车号</template>
  490 + </el-input>
452 </div> 491 </div>
453 </el-form-item> 492 </el-form-item>
454 </el-col> 493 </el-col>
  494 +
  495 + </el-row>
  496 + <el-row>
455 <el-col :span="5"> 497 <el-col :span="5">
456 - <el-form-item label="卸货地" prop="ext2"> 498 + <el-form-item label="" prop="ext2">
457 <div v-if="dialogStatus === 'update'"> 499 <div v-if="dialogStatus === 'update'">
458 - <el-input v-model="IruleForm.ext2"></el-input> 500 + <el-input v-model="IruleForm.ext2" style="width: 200px">
  501 + <template slot="prepend">卸货地</template>
  502 + </el-input>
459 </div> 503 </div>
460 <div v-else> 504 <div v-else>
461 - <el-input disabled="" v-model="IruleForm.ext2"></el-input> 505 + <el-input disabled="" v-model="IruleForm.ext2" style="width: 200px">
  506 + <template slot="prepend">卸货地</template>
  507 + </el-input>
462 </div> 508 </div>
463 </el-form-item> 509 </el-form-item>
464 </el-col> 510 </el-col>
465 <el-col :span="5"> 511 <el-col :span="5">
466 - <el-form-item label="车辆所属" prop="ext1"> 512 + <el-form-item label="" prop="ext1">
467 <div v-if="dialogStatus === 'update'"> 513 <div v-if="dialogStatus === 'update'">
468 - <el-input v-model="IruleForm.ext1"></el-input> 514 + <el-input v-model="IruleForm.ext1" style="width: 200px">
  515 + <template slot="prepend">车辆所属</template>
  516 + </el-input>
469 </div> 517 </div>
470 <div v-else> 518 <div v-else>
471 - <el-input disabled="" v-model="IruleForm.ext1"></el-input> 519 + <el-input disabled="" v-model="IruleForm.ext1" style="width: 200px">
  520 + <template slot="prepend">车辆所属</template>
  521 + </el-input>
472 </div> 522 </div>
473 </el-form-item> 523 </el-form-item>
474 </el-col> 524 </el-col>
@@ -493,17 +543,44 @@ @@ -493,17 +543,44 @@
493 <el-row> 543 <el-row>
494 <el-dialog :title="'提交'+Reason[udStatus]+'信息'" :visible.sync="dialogFormVisible"> 544 <el-dialog :title="'提交'+Reason[udStatus]+'信息'" :visible.sync="dialogFormVisible">
495 <el-form :model="Udform" :rules="udrules" ref="Udform" class="demo-ruleForm"> 545 <el-form :model="Udform" :rules="udrules" ref="Udform" class="demo-ruleForm">
496 - <el-form-item label="操作原因" prop="operreason">  
497 - <el-input type="textarea" v-model="Udform.operreason"></el-input>  
498 - </el-form-item>  
499 - <el-form-item label="操作人" prop="operperson">  
500 - <el-input v-model="Udform.operperson"></el-input>  
501 - </el-form-item>  
502 - <el-form-item label="联系电话" prop="opertel">  
503 - <el-input v-model="Udform.opertel"></el-input>  
504 - </el-form-item> 546 +<!-- <el-form-item label="操作原因" prop="operreason">-->
  547 +<!-- <el-input type="textarea" v-model="Udform.operreason"></el-input>-->
  548 +<!-- </el-form-item>-->
  549 +<!-- <el-form-item label="操作人" prop="operperson">-->
  550 +<!-- <el-input v-model="Udform.operperson"></el-input>-->
  551 +<!-- </el-form-item>-->
  552 +<!-- <el-form-item label="联系电话" prop="opertel">-->
  553 +<!-- <el-input v-model="Udform.opertel"></el-input>-->
  554 +<!-- </el-form-item>-->
  555 + <el-row style="margin: 10px auto">
  556 + <el-col :span="22">
  557 + <el-form-item label="" prop="operreason">
  558 + <div class="ipt">
  559 + 操作原因
  560 + </div>
  561 + <el-input autosize type="textarea" v-model="Udform.operreason" style="width: 80%">
  562 + </el-input>
  563 + </el-form-item>
  564 + </el-col>
  565 + </el-row>
  566 + <el-row>
  567 + <el-col :span="11" style="margin-right: 10px">
  568 + <el-form-item label="" prop="operperson">
  569 + <el-input v-model="Udform.operperson" style="width: 200px">
  570 + <template slot="prepend">操作人</template>
  571 + </el-input>
  572 + </el-form-item>
  573 + </el-col>
  574 + <el-col :span="10">
  575 + <el-form-item label="" prop="opertel">
  576 + <el-input v-model="Udform.opertel" style="width: 250px">
  577 + <template slot="prepend">联系电话</template>
  578 + </el-input>
  579 + </el-form-item>
  580 + </el-col>
  581 + </el-row>
505 </el-form> 582 </el-form>
506 - <div slot="footer" class="dialog-footer"> 583 + <div slot="footer" class="dialog-footer" style="margin-top: 30px" align="center">
507 <el-button @click="dialogFormVisible = false">取 消</el-button> 584 <el-button @click="dialogFormVisible = false">取 消</el-button>
508 <el-button type="primary" @click="deleteIdForm('Udform')">确 定</el-button> 585 <el-button type="primary" @click="deleteIdForm('Udform')">确 定</el-button>
509 </div> 586 </div>
@@ -512,7 +589,8 @@ @@ -512,7 +589,8 @@
512 <!--明细列表弹出框--> 589 <!--明细列表弹出框-->
513 <el-row> 590 <el-row>
514 <el-dialog title="回执明细列表" :visible.sync="dialogTableVisible" width="70%"> 591 <el-dialog title="回执明细列表" :visible.sync="dialogTableVisible" width="70%">
515 - <el-table :data="gridData"> 592 + <el-table :data="gridData" style="border-radius: 10px 10px 0px 0px;line-height: 25px;min-height: 500px"
  593 + :header-cell-style="{background:'#6F8294',color:'#FFFFFF'}" size="small" >
516 <el-table-column property="busdate" label="时间" width="160"></el-table-column> 594 <el-table-column property="busdate" label="时间" width="160"></el-table-column>
517 <el-table-column property="username" label="操作人" width="130"></el-table-column> 595 <el-table-column property="username" label="操作人" width="130"></el-table-column>
518 <el-table-column property="buspiece" label="发送件数" width="130"></el-table-column> 596 <el-table-column property="buspiece" label="发送件数" width="130"></el-table-column>
@@ -525,6 +603,38 @@ @@ -525,6 +603,38 @@
525 </el-container> 603 </el-container>
526 </template> 604 </template>
527 <style scoped> 605 <style scoped>
  606 + .ip{
  607 + max-width: 100px;
  608 + margin-right: -6px;
  609 + display: inline-block;
  610 + background-color: #6F8294;
  611 + color: #ffffff;
  612 + border: 1px solid #DCDFE6;
  613 + vertical-align: middle;
  614 + padding: 5px 18px;
  615 + white-space: nowrap;
  616 + border-top-right-radius: 0px;
  617 + border-top-left-radius: 4px;
  618 + border-bottom-left-radius: 4px;
  619 + border-bottom-right-radius: 0px;
  620 + font-size: 10px;
  621 + }
  622 + .ipt{
  623 + max-width: 100px;
  624 + margin-right: -4px;
  625 + display: inline-block;
  626 + background-color: #6F8294;
  627 + color: #ffffff;
  628 + border: 1px solid #DCDFE6;
  629 + vertical-align: middle;
  630 + padding: 0 18px;
  631 + white-space: nowrap;
  632 + border-top-right-radius: 0px;
  633 + border-top-left-radius: 4px;
  634 + border-bottom-left-radius: 4px;
  635 + border-bottom-right-radius: 0px;
  636 + font-size: 10px;
  637 + }
528 .co{height: 36px;line-height: 36px;} 638 .co{height: 36px;line-height: 36px;}
529 .co{border-left: 4px #409EFF solid;padding-left: 10px;background-color: #f9fafc;margin-bottom: 2px} 639 .co{border-left: 4px #409EFF solid;padding-left: 10px;background-color: #f9fafc;margin-bottom: 2px}
530 .row-bg{background-color: white;padding:0px;} 640 .row-bg{background-color: white;padding:0px;}
@@ -543,6 +653,7 @@ @@ -543,6 +653,7 @@
543 import {mapActions, mapGetters} from 'vuex' 653 import {mapActions, mapGetters} from 'vuex'
544 import {loginedUserInfo} from "../../api/user"; 654 import {loginedUserInfo} from "../../api/user";
545 export default{ 655 export default{
  656 + name:'Allocatesearch',
546 data(){ 657 data(){
547 return{ 658 return{
548 defaultQuery:{ 659 defaultQuery:{
@@ -65,7 +65,7 @@ @@ -65,7 +65,7 @@
65 </el-form-item> 65 </el-form-item>
66 </el-col> 66 </el-col>
67 </el-row> 67 </el-row>
68 - <el-row class="row-bg"> 68 + <el-row>
69 <el-col :span="4" :offset="10"> 69 <el-col :span="4" :offset="10">
70 <div class="grid-content"> 70 <div class="grid-content">
71 <el-button type="primary" @click="submitForm('ruleForm')">下一步</el-button> 71 <el-button type="primary" @click="submitForm('ruleForm')">下一步</el-button>
@@ -72,7 +72,7 @@ @@ -72,7 +72,7 @@
72 </el-form-item> 72 </el-form-item>
73 </el-col> 73 </el-col>
74 </el-row> 74 </el-row>
75 - <el-row class="row-bg"> 75 + <el-row>
76 <el-col :span="4" :offset="10"> 76 <el-col :span="4" :offset="10">
77 <div class="grid-content"> 77 <div class="grid-content">
78 <el-button type="primary" @click="submitForm('ruleForm')">下一步</el-button> 78 <el-button type="primary" @click="submitForm('ruleForm')">下一步</el-button>
@@ -439,7 +439,7 @@ @@ -439,7 +439,7 @@
439 </el-input> 439 </el-input>
440 </el-form-item> 440 </el-form-item>
441 </el-col> 441 </el-col>
442 - <el-col :span="9" style="margin-left: 55px"> 442 + <el-col :span="9">
443 <el-form-item label="" prop="customcode"> 443 <el-form-item label="" prop="customcode">
444 <div class="ip"> 444 <div class="ip">
445 海关关区 445 海关关区
@@ -462,7 +462,7 @@ @@ -462,7 +462,7 @@
462 </el-select> 462 </el-select>
463 </el-form-item> 463 </el-form-item>
464 </el-col> 464 </el-col>
465 - <el-col :span="9" style="margin-left: -35px"> 465 + <el-col :span="9" style="margin-left: -135px">
466 <el-form-item label="" prop="paymodel"> 466 <el-form-item label="" prop="paymodel">
467 <div class="ip"> 467 <div class="ip">
468 付费方式 468 付费方式
@@ -486,7 +486,7 @@ @@ -486,7 +486,7 @@
486 </el-select> 486 </el-select>
487 </el-form-item> 487 </el-form-item>
488 </el-col> 488 </el-col>
489 - <el-col :span="8" style="margin-left: -10px"> 489 + <el-col :span="8">
490 <el-form-item label="" prop="goodsname"> 490 <el-form-item label="" prop="goodsname">
491 <el-input v-model="ruleForm.goodsname" style="width: 250px"> 491 <el-input v-model="ruleForm.goodsname" style="width: 250px">
492 <template slot="prepend">货物描述</template> 492 <template slot="prepend">货物描述</template>
@@ -24,10 +24,9 @@ @@ -24,10 +24,9 @@
24 <div class="grid-content"> 24 <div class="grid-content">
25 <el-col :span="9"> 25 <el-col :span="9">
26 <div class="grid-content"> 26 <div class="grid-content">
27 - <span>  
28 - 主单号:  
29 - </span>  
30 - <el-input v-model="defaultQuery.awba" placeholder="请输入主单号" style="width: 180px"></el-input> 27 + <el-input v-model="defaultQuery.awba" placeholder="请输入主单号" style="width: 250px">
  28 + <template slot="prepend">主单号</template>
  29 + </el-input>
31 </div> 30 </div>
32 </el-col> 31 </el-col>
33 <el-col :span="2"><div class="grid-content"><el-button type="primary" v-on:click="getMt5201List" size="mini">查询</el-button></div></el-col> 32 <el-col :span="2"><div class="grid-content"><el-button type="primary" v-on:click="getMt5201List" size="mini">查询</el-button></div></el-col>
@@ -46,7 +45,8 @@ @@ -46,7 +45,8 @@
46 :data="tableData" 45 :data="tableData"
47 tooltip-effect="dark" 46 tooltip-effect="dark"
48 v-loading="tableLoading" 47 v-loading="tableLoading"
49 - style="width: 100%" 48 + style="border-radius: 10px 10px 0px 0px;line-height: 25px;min-height: 500px"
  49 + :header-cell-style="{background:'#6F8294',color:'#FFFFFF'}" size="small"
50 @selection-change="handleSelectionChange" 50 @selection-change="handleSelectionChange"
51 row-key="uuid" 51 row-key="uuid"
52 border 52 border
@@ -125,39 +125,43 @@ @@ -125,39 +125,43 @@
125 <el-table-column 125 <el-table-column
126 prop="operation" 126 prop="operation"
127 label="操作" 127 label="操作"
128 - width="550" 128 + width="285"
129 show-overflow-tooltip> 129 show-overflow-tooltip>
130 <template slot-scope="scope"> 130 <template slot-scope="scope">
131 - <el-button  
132 - size="mini"  
133 - type="info"  
134 - @click="handleDetail(scope.$index, scope.row)">收发明细</el-button>  
135 - <el-button  
136 - v-if="scope.row.awbh==''||scope.row.awbh==null"  
137 - size="mini"  
138 - type="success"  
139 - @click="handleMain(scope.$index, scope.row)">编辑主单</el-button>  
140 - <el-button  
141 - v-else  
142 - size="mini"  
143 - type="success"  
144 - @click="handleFen(scope.$index, scope.row)">编辑分单  
145 - </el-button>  
146 - <el-button  
147 - size="mini"  
148 - type="primary"  
149 - :disabled="btSendStatusFormater(scope.row.status)"  
150 - @click="handleCreate(scope.$index, scope.row)">发送理货报</el-button>  
151 - <el-button  
152 - size="mini"  
153 - type="danger"  
154 - :disabled="btDeleStatusFormater(scope.row.status)"  
155 - @click="handleDelete(scope.$index, scope.row)">发送理货删除报</el-button>  
156 - <el-button  
157 - size="mini"  
158 - type="warning"  
159 - @click="UpdateStatus(scope.$index, scope.row)">更改状态  
160 - </el-button> 131 + <el-row type="flex" justify="space-between">
  132 + <el-button
  133 + size="mini"
  134 + type="info"
  135 + @click="handleDetail(scope.$index, scope.row)">收发明细</el-button>
  136 + <el-button
  137 + v-if="scope.row.awbh==''||scope.row.awbh==null"
  138 + size="mini"
  139 + type="success"
  140 + @click="handleMain(scope.$index, scope.row)">编辑主单</el-button>
  141 + <el-button
  142 + v-else
  143 + size="mini"
  144 + type="success"
  145 + @click="handleFen(scope.$index, scope.row)">编辑分单
  146 + </el-button>
  147 + </el-row>
  148 + <el-row type="flex" justify="space-between">
  149 + <el-button
  150 + size="mini"
  151 + type="primary"
  152 + :disabled="btSendStatusFormater(scope.row.status)"
  153 + @click="handleCreate(scope.$index, scope.row)">发理货报</el-button>
  154 + <el-button
  155 + size="mini"
  156 + type="danger"
  157 + :disabled="btDeleStatusFormater(scope.row.status)"
  158 + @click="handleDelete(scope.$index, scope.row)">发删除报</el-button>
  159 + <el-button
  160 + size="mini"
  161 + type="warning"
  162 + @click="UpdateStatus(scope.$index, scope.row)">更改状态
  163 + </el-button>
  164 + </el-row>
161 </template> 165 </template>
162 </el-table-column> 166 </el-table-column>
163 </el-table> 167 </el-table>
@@ -175,56 +179,68 @@ @@ -175,56 +179,68 @@
175 </el-col> 179 </el-col>
176 <el-row class="flightInfo"> 180 <el-row class="flightInfo">
177 <el-col :span="6"> 181 <el-col :span="6">
178 - <el-form-item label="运单号" prop="awba"> 182 + <el-form-item label="" prop="awba">
179 <div v-if="dialogStatus === 'update'"> 183 <div v-if="dialogStatus === 'update'">
180 - <el-input disabled="" v-model="ruleForm.awba"></el-input> 184 + <el-input disabled="" v-model="ruleForm.awba" style="width: 200px">
  185 + <template slot="prepend">运单号</template>
  186 + </el-input>
181 </div> 187 </div>
182 <div v-else> 188 <div v-else>
183 - <el-input v-model="ruleForm.awba"></el-input> 189 + <el-input v-model="ruleForm.awba" style="width: 200px">
  190 + <template slot="prepend">运单号</template>
  191 + </el-input>
184 </div> 192 </div>
185 </el-form-item> 193 </el-form-item>
186 </el-col> 194 </el-col>
187 - <el-col :span="6"> 195 + <el-col :span="4" style="margin-right: -15px">
188 <div v-if="FenStatus === 'addAwbh'"> 196 <div v-if="FenStatus === 'addAwbh'">
189 - <el-form-item label="分单号" prop="awbh">  
190 - <el-input v-model="ruleForm.awbh"></el-input> 197 + <el-form-item label="" prop="awbh">
  198 + <el-input v-model="ruleForm.awbh" style="width: 200px">
  199 + <template slot="prepend">分单号</template>
  200 + </el-input>
191 </el-form-item> 201 </el-form-item>
192 </div> 202 </div>
193 <div v-else> 203 <div v-else>
194 - <el-form-item style="display: none" label="分单号" prop="awbh">  
195 - <el-input v-model="ruleForm.awbh"></el-input> 204 + <el-form-item style="display: none" label="" prop="awbh">
  205 + <el-input v-model="ruleForm.awbh" style="width: 200px">
  206 + <template slot="prepend">分单号</template>
  207 + </el-input>
196 </el-form-item> 208 </el-form-item>
197 </div> 209 </div>
198 </el-col> 210 </el-col>
199 <el-col :span="6"> 211 <el-col :span="6">
200 - <el-form-item label="航班号" prop="flightno">  
201 - <el-input disabled="" v-model="ruleForm.flightno"></el-input> 212 + <el-form-item label="" prop="flightno">
  213 + <el-input disabled="" v-model="ruleForm.flightno" style="width: 200px">
  214 + <template slot="prepend">航班号</template>
  215 + </el-input>
202 </el-form-item> 216 </el-form-item>
203 </el-col> 217 </el-col>
204 - <el-col :span="6">  
205 - <el-form-item label="航班日期" required>  
206 - <el-col :span="24">  
207 - <el-form-item prop="flightdate"> 218 + <el-col :span="9">
  219 + <el-form-item label="" required prop="flightdate">
  220 + <div class="ip">
  221 + 航班日期 </div>
208 <el-date-picker disabled="" type="date" placeholder="选择日期" :clearable="false" 222 <el-date-picker disabled="" type="date" placeholder="选择日期" :clearable="false"
209 v-model="ruleForm.flightdate" 223 v-model="ruleForm.flightdate"
210 - style="width: 100%;"></el-date-picker>  
211 - </el-form-item>  
212 - </el-col> 224 + style="width: 120px;"></el-date-picker>
213 </el-form-item> 225 </el-form-item>
214 </el-col> 226 </el-col>
215 </el-row> 227 </el-row>
216 <el-row class="flightInfo"> 228 <el-row class="flightInfo">
217 <el-col :span="6"> 229 <el-col :span="6">
218 - <el-form-item label="起始站" prop="originstation">  
219 - <el-input disabled="" v-model="ruleForm.originstation" onkeyup="this.value=this.value.toUpperCase()"></el-input> 230 + <el-form-item label="" prop="originstation">
  231 + <el-input style="width: 200px" disabled="" v-model="ruleForm.originstation" onkeyup="this.value=this.value.toUpperCase()">
  232 + <template slot="prepend">起始站</template>
  233 + </el-input>
220 </el-form-item> 234 </el-form-item>
221 </el-col> 235 </el-col>
222 - <el-col :span="6">  
223 - <el-form-item label="目的站" prop="destinationstation">  
224 - <el-input disabled="" v-model="ruleForm.destinationstation" onkeyup="this.value=this.value.toUpperCase()"></el-input> 236 + <el-col :span="7">
  237 + <el-form-item label="" prop="destinationstation">
  238 + <el-input style="width: 200px" disabled="" v-model="ruleForm.destinationstation" onkeyup="this.value=this.value.toUpperCase()">
  239 + <template slot="prepend">目的站</template>
  240 + </el-input>
225 </el-form-item> 241 </el-form-item>
226 </el-col> 242 </el-col>
227 - <el-col :span="6"> 243 + <el-col :span="2">
228 <el-button size="mini" type="primary" @click="dialogStatus==='create'?createData('ruleForm'):updateData('ruleForm')" style="float: right">保存</el-button> 244 <el-button size="mini" type="primary" @click="dialogStatus==='create'?createData('ruleForm'):updateData('ruleForm')" style="float: right">保存</el-button>
229 </el-col> 245 </el-col>
230 </el-row> 246 </el-row>
@@ -238,37 +254,48 @@ @@ -238,37 +254,48 @@
238 <el-row style="margin-bottom: 0px;"> 254 <el-row style="margin-bottom: 0px;">
239 <el-row class="product"> 255 <el-row class="product">
240 <el-col :span="6"> 256 <el-col :span="6">
241 - <el-form-item label="舱单件数" prop="pcs">  
242 - <el-input type="number" v-model="ruleForm.pcs"></el-input> 257 + <el-form-item label="" prop="pcs">
  258 + <el-input type="number" v-model="ruleForm.pcs" style="width: 200px">
  259 + <template slot="prepend">舱单件数</template>
  260 + </el-input>
243 </el-form-item> 261 </el-form-item>
244 </el-col> 262 </el-col>
245 <el-col :span="6"> 263 <el-col :span="6">
246 - <el-form-item label="舱单重量" prop="wei">  
247 - <el-input type="number" v-model="ruleForm.wei"></el-input> 264 + <el-form-item label="" prop="wei">
  265 + <el-input type="number" v-model="ruleForm.wei" style="width: 200px">
  266 + <template slot="prepend">舱单重量</template>
  267 + </el-input>
248 </el-form-item> 268 </el-form-item>
249 </el-col> 269 </el-col>
250 <el-col :span="6"> 270 <el-col :span="6">
251 - <el-form-item label="理货件数" prop="piece">  
252 - <el-input type="number" v-model="ruleForm.piece"></el-input> 271 + <el-form-item label="" prop="piece">
  272 + <el-input type="number" v-model="ruleForm.piece" style="width: 200px">
  273 + <template slot="prepend">理货件数</template>
  274 + </el-input>
253 </el-form-item> 275 </el-form-item>
254 </el-col> 276 </el-col>
255 <el-col :span="6"> 277 <el-col :span="6">
256 - <el-form-item label="理货重量" prop="weight">  
257 - <el-input type="number" v-model="ruleForm.weight"></el-input> 278 + <el-form-item label="" prop="weight">
  279 + <el-input type="number" v-model="ruleForm.weight" style="width: 200px">
  280 + <template slot="prepend">理货重量</template>
  281 + </el-input>
258 </el-form-item> 282 </el-form-item>
259 </el-col> 283 </el-col>
260 </el-row> 284 </el-row>
261 </el-row> 285 </el-row>
262 <el-row class="flightInfo"> 286 <el-row class="flightInfo">
263 - <el-col :span="6">  
264 - <el-form-item label="海关关区" prop="customcode"> 287 + <el-col :span="7">
  288 + <el-form-item label="" prop="customcode">
  289 + <div class="ip">
  290 + 海关关区
  291 + </div>
265 <el-select v-model="ruleForm.customcode" 292 <el-select v-model="ruleForm.customcode"
266 filterable 293 filterable
267 allow-create 294 allow-create
268 default-first-option 295 default-first-option
269 remote 296 remote
270 :remote-method="remoteMethod2" 297 :remote-method="remoteMethod2"
271 - :loading="loading" placeholder="请选择" style="display:inline"> 298 + :loading="loading" placeholder="请选择" style="width: 115px">
272 <el-option 299 <el-option
273 v-for="item in customcodes" 300 v-for="item in customcodes"
274 :key="item.customcode" 301 :key="item.customcode"
@@ -280,15 +307,16 @@ @@ -280,15 +307,16 @@
280 </el-select> 307 </el-select>
281 </el-form-item> 308 </el-form-item>
282 </el-col> 309 </el-col>
283 - <el-col :span="6">  
284 - <el-form-item label="卸货时间" required>  
285 - <el-col :span="24"> 310 + <el-col :span="12" style="margin-left: -45px">
  311 + <el-form-item label="" required>
286 <el-form-item prop="starttime"> 312 <el-form-item prop="starttime">
  313 + <div class="ip">
  314 + 卸货时间
  315 + </div>
287 <el-date-picker type="datetime" placeholder="选择日期" :clearable="false" value-format="yyyy-MM-dd HH:mm:ss" 316 <el-date-picker type="datetime" placeholder="选择日期" :clearable="false" value-format="yyyy-MM-dd HH:mm:ss"
288 v-model="ruleForm.starttime" 317 v-model="ruleForm.starttime"
289 - style="width: 100%;"></el-date-picker> 318 + style="width: 200px;"></el-date-picker>
290 </el-form-item> 319 </el-form-item>
291 - </el-col>  
292 </el-form-item> 320 </el-form-item>
293 </el-col> 321 </el-col>
294 </el-row> 322 </el-row>
@@ -311,7 +339,8 @@ @@ -311,7 +339,8 @@
311 <template> 339 <template>
312 <el-table 340 <el-table
313 :data="tableData2" 341 :data="tableData2"
314 - style="width: 100%"> 342 + style="border-radius: 10px 10px 0px 0px;line-height: 25px;min-height: 500px"
  343 + :header-cell-style="{background:'#6F8294',color:'#FFFFFF'}" size="small">
315 <el-table-column 344 <el-table-column
316 prop="awbh" 345 prop="awbh"
317 label="分单号" 346 label="分单号"
@@ -354,10 +383,10 @@ @@ -354,10 +383,10 @@
354 <el-col :span="2.5"><div class="grid-content"><el-button type="primary" v-on:click="addTally" size="mini">新增进港理货</el-button></div></el-col> 383 <el-col :span="2.5"><div class="grid-content"><el-button type="primary" v-on:click="addTally" size="mini">新增进港理货</el-button></div></el-col>
355 <el-col :span="2.5"><div class="grid-content"><el-button type="primary" size="mini" :disabled="batich" @click="batchdel()">批量发送删除报</el-button></div></el-col> 384 <el-col :span="2.5"><div class="grid-content"><el-button type="primary" size="mini" :disabled="batich" @click="batchdel()">批量发送删除报</el-button></div></el-col>
356 <el-col :span="2.5"><div class="grid-content"><el-button type="primary" size="mini" :disabled="batich" @click="batchaplly()">批量申请</el-button></div></el-col> 385 <el-col :span="2.5"><div class="grid-content"><el-button type="primary" size="mini" :disabled="batich" @click="batchaplly()">批量申请</el-button></div></el-col>
357 - <el-col :span="2"><div class="grid-content"><el-button type="primary" @click="back" size="mini">返回</el-button></div></el-col> 386 + <el-col :span="1.5"><div class="grid-content"><el-button type="primary" @click="back" size="mini">返回</el-button></div></el-col>
358 <el-col :span="2.5"><div class="grid-content"><span>主单数：{{sumNmmsCount}}</span></div></el-col> 387 <el-col :span="2.5"><div class="grid-content"><span>主单数：{{sumNmmsCount}}</span></div></el-col>
359 <el-col :span="3.5"><div class="grid-content"><span>理货总件数：{{sumNmmsPrice}}</span></div></el-col> 388 <el-col :span="3.5"><div class="grid-content"><span>理货总件数：{{sumNmmsPrice}}</span></div></el-col>
360 - <el-col :span="7"><div class="grid-content"><span>理货总重量：{{sumNmmsWeight}}</span></div></el-col> 389 + <el-col :span="7.5"><div class="grid-content"><span>理货总重量：{{sumNmmsWeight}}</span></div></el-col>
361 </el-row> 390 </el-row>
362 <!--对话提示框--> 391 <!--对话提示框-->
363 <el-row> 392 <el-row>
@@ -377,17 +406,44 @@ @@ -377,17 +406,44 @@
377 <el-row> 406 <el-row>
378 <el-dialog :title="'提交'+Reason[udStatus]+'信息'" :visible.sync="dialogFormVisible"> 407 <el-dialog :title="'提交'+Reason[udStatus]+'信息'" :visible.sync="dialogFormVisible">
379 <el-form :model="Udform" :rules="udrules" ref="Udform" class="demo-ruleForm"> 408 <el-form :model="Udform" :rules="udrules" ref="Udform" class="demo-ruleForm">
380 - <el-form-item label="操作原因" prop="operreason">  
381 - <el-input type="textarea" v-model="Udform.operreason"></el-input>  
382 - </el-form-item>  
383 - <el-form-item label="操作人" prop="operperson">  
384 - <el-input v-model="Udform.operperson"></el-input>  
385 - </el-form-item>  
386 - <el-form-item label="联系电话" prop="opertel">  
387 - <el-input v-model="Udform.opertel"></el-input>  
388 - </el-form-item> 409 +<!-- <el-form-item label="操作原因" prop="operreason">-->
  410 +<!-- <el-input type="textarea" v-model="Udform.operreason"></el-input>-->
  411 +<!-- </el-form-item>-->
  412 +<!-- <el-form-item label="操作人" prop="operperson">-->
  413 +<!-- <el-input v-model="Udform.operperson"></el-input>-->
  414 +<!-- </el-form-item>-->
  415 +<!-- <el-form-item label="联系电话" prop="opertel">-->
  416 +<!-- <el-input v-model="Udform.opertel"></el-input>-->
  417 +<!-- </el-form-item>-->
  418 + <el-row style="margin: 10px auto">
  419 + <el-col :span="22">
  420 + <el-form-item label="" prop="operreason">
  421 + <div class="ip">
  422 + 操作原因
  423 + </div>
  424 + <el-input autosize type="textarea" v-model="Udform.operreason" style="width: 80%">
  425 + </el-input>
  426 + </el-form-item>
  427 + </el-col>
  428 + </el-row>
  429 + <el-row>
  430 + <el-col :span="11" style="margin-right: 10px">
  431 + <el-form-item label="" prop="operperson">
  432 + <el-input v-model="Udform.operperson" style="width: 200px">
  433 + <template slot="prepend">操作人</template>
  434 + </el-input>
  435 + </el-form-item>
  436 + </el-col>
  437 + <el-col :span="10">
  438 + <el-form-item label="" prop="opertel">
  439 + <el-input v-model="Udform.opertel" style="width: 250px">
  440 + <template slot="prepend">联系电话</template>
  441 + </el-input>
  442 + </el-form-item>
  443 + </el-col>
  444 + </el-row>
389 </el-form> 445 </el-form>
390 - <div slot="footer" class="dialog-footer"> 446 + <div slot="footer" class="dialog-footer" style="margin-top: 30px" align="center">
391 <el-button @click="dialogFormVisible = false">取 消</el-button> 447 <el-button @click="dialogFormVisible = false">取 消</el-button>
392 <el-button type="primary" @click="deleteUdForm('Udform')">确 定</el-button> 448 <el-button type="primary" @click="deleteUdForm('Udform')">确 定</el-button>
393 </div> 449 </div>
@@ -396,11 +452,12 @@ @@ -396,11 +452,12 @@
396 <!--明细列表弹出框--> 452 <!--明细列表弹出框-->
397 <el-row> 453 <el-row>
398 <el-dialog title="回执明细列表" :visible.sync="dialogTableVisible" width="70%"> 454 <el-dialog title="回执明细列表" :visible.sync="dialogTableVisible" width="70%">
399 - <el-table :data="gridData"> 455 + <el-table :data="gridData" style="border-radius: 10px 10px 0px 0px;line-height: 25px;min-height: 500px"
  456 + :header-cell-style="{background:'#6F8294',color:'#FFFFFF'}" size="small">
400 <el-table-column property="busdate" label="时间" width="160"></el-table-column> 457 <el-table-column property="busdate" label="时间" width="160"></el-table-column>
401 <el-table-column property="username" label="操作人" width="130"></el-table-column> 458 <el-table-column property="username" label="操作人" width="130"></el-table-column>
402 - <el-table-column property="buspiece" label="发送件数" width="130"></el-table-column>  
403 - <el-table-column property="busweight" label="发送重量" width="130"></el-table-column> 459 + <el-table-column property="buspiece" label="发送件数" width="100"></el-table-column>
  460 + <el-table-column property="busweight" label="发送重量" width="100"></el-table-column>
404 <el-table-column property="cusrestext" label="回执内容"></el-table-column> 461 <el-table-column property="cusrestext" label="回执内容"></el-table-column>
405 </el-table> 462 </el-table>
406 </el-dialog> 463 </el-dialog>
@@ -409,6 +466,22 @@ @@ -409,6 +466,22 @@
409 </el-container> 466 </el-container>
410 </template> 467 </template>
411 <style scoped> 468 <style scoped>
  469 + .ip{
  470 + max-width: 100px;
  471 + margin-right: -4px;
  472 + display: inline-block;
  473 + background-color: #6F8294;
  474 + color: #ffffff;
  475 + border: 1px solid #DCDFE6;
  476 + vertical-align: middle;
  477 + padding: 0 18px;
  478 + white-space: nowrap;
  479 + border-top-right-radius: 0px;
  480 + border-top-left-radius: 4px;
  481 + border-bottom-left-radius: 4px;
  482 + border-bottom-right-radius: 0px;
  483 + font-size: 10px;
  484 + }
412 .grid-content{height: 36px;line-height: 36px;margin-right: 5px;} 485 .grid-content{height: 36px;line-height: 36px;margin-right: 5px;}
413 .content{border-left: 4px #409EFF solid;padding-left: 10px;background-color: #f9fafc;margin-bottom: 2px} 486 .content{border-left: 4px #409EFF solid;padding-left: 10px;background-color: #f9fafc;margin-bottom: 2px}
414 .row-bg,.co{background-color: white;} 487 .row-bg,.co{background-color: white;}
@@ -450,6 +523,7 @@ @@ -450,6 +523,7 @@
450 import {mapActions, mapGetters} from 'vuex' 523 import {mapActions, mapGetters} from 'vuex'
451 import {loginedUserInfo} from "../../api/user"; 524 import {loginedUserInfo} from "../../api/user";
452 export default { 525 export default {
  526 + name:'Tallymster',
453 data() { 527 data() {
454 return { 528 return {
455 defaultQuery:{ 529 defaultQuery:{
@@ -8,57 +8,51 @@ @@ -8,57 +8,51 @@
8 <el-row style="display: block;background-color: white"> 8 <el-row style="display: block;background-color: white">
9 <el-row> 9 <el-row>
10 <el-col :span="6"> 10 <el-col :span="6">
11 - <span>  
12 - 主单号:  
13 - </span>  
14 - <el-input placeholder="" v-model="defaultQuery.awba" style="width: 150px"> 11 + <el-input placeholder="" v-model="defaultQuery.awba" style="width: 200px">
  12 + <template slot="prepend">主单号</template>
15 </el-input> 13 </el-input>
16 </el-col> 14 </el-col>
17 <el-col :span="6"> 15 <el-col :span="6">
18 - <span>  
19 - 承运人:  
20 - </span>  
21 - <el-input placeholder="" v-model="vcarrier" style="width: 150px"> 16 + <el-input placeholder="" v-model="vcarrier" style="width: 200px">
  17 + <template slot="prepend">承运人</template>
22 </el-input> 18 </el-input>
23 </el-col> 19 </el-col>
24 <el-col :span="6"> 20 <el-col :span="6">
25 - <span>  
26 - 航班号:  
27 - </span>  
28 - <el-input placeholder="" v-model="defaultQuery.flightno" style="width: 150px"> 21 + <el-input placeholder="" v-model="defaultQuery.flightno" style="width: 200px">
  22 + <template slot="prepend">航班号</template>
29 </el-input> 23 </el-input>
30 </el-col> 24 </el-col>
31 <el-col :span="6"> 25 <el-col :span="6">
32 - <span>  
33 - 航班日期:  
34 - </span> 26 + <div class="ip">
  27 + 航班日期
  28 + </div>
35 <el-date-picker 29 <el-date-picker
36 v-model="defaultQuery.flightdate" 30 v-model="defaultQuery.flightdate"
37 type="date" 31 type="date"
38 - value-format="yyyy-MM-dd" style="width: 150px" 32 + value-format="yyyy-MM-dd" style="width: 120px"
39 placeholder="航班日期"> 33 placeholder="航班日期">
40 </el-date-picker> 34 </el-date-picker>
41 </el-col> 35 </el-col>
42 </el-row> 36 </el-row>
43 <el-row > 37 <el-row >
44 <el-col :span="6"> 38 <el-col :span="6">
45 - <span>  
46 - 业务状态:  
47 - </span>  
48 - <el-select v-model="defaultQuery.status" placeholder="选择状态" style="width: 140px"> 39 + <div class="ip">
  40 + 业务状态
  41 + </div>
  42 + <el-select v-model="defaultQuery.status" placeholder="选择状态" style="width: 115px">
49 <el-option 43 <el-option
50 v-for="item in options" 44 v-for="item in options"
51 :key="item.value" 45 :key="item.value"
52 - :label="item.label" style="width: 140px" 46 + :label="item.label"
53 :value="item.value"> 47 :value="item.value">
54 </el-option> 48 </el-option>
55 </el-select> 49 </el-select>
56 </el-col> 50 </el-col>
57 <el-col :span="6"> 51 <el-col :span="6">
58 - <span>  
59 - 报文类型:  
60 - </span>  
61 - <el-select v-model="defaultQuery.messageType" placeholder="报文类型" style="width: 140px"> 52 + <div class="ip">
  53 + 报文类型
  54 + </div>
  55 + <el-select v-model="defaultQuery.messageType" placeholder="报文类型" style="width: 115px">
62 <el-option 56 <el-option
63 v-for="item in options2" 57 v-for="item in options2"
64 :key="item.value" 58 :key="item.value"
@@ -95,7 +89,8 @@ @@ -95,7 +89,8 @@
95 ref="multipleTable" 89 ref="multipleTable"
96 :data="tableData" 90 :data="tableData"
97 tooltip-effect="dark" 91 tooltip-effect="dark"
98 - style="width: 100%" 92 + style="border-radius: 10px 10px 0px 0px;line-height: 25px;min-height: 500px"
  93 + :header-cell-style="{background:'#6F8294',color:'#FFFFFF'}" size="small"
99 :default-sort = "{prop: 'date', order: 'descending'}" 94 :default-sort = "{prop: 'date', order: 'descending'}"
100 @selection-change="handleSelectionChange"> 95 @selection-change="handleSelectionChange">
101 <el-table-column 96 <el-table-column
@@ -227,6 +222,22 @@ @@ -227,6 +222,22 @@
227 </template> 222 </template>
228 223
229 <style scoped> 224 <style scoped>
  225 + .ip{
  226 + max-width: 100px;
  227 + margin-right: -4px;
  228 + display: inline-block;
  229 + background-color: #6F8294;
  230 + color: #ffffff;
  231 + border: 1px solid #DCDFE6;
  232 + vertical-align: middle;
  233 + padding: 5px 18px;
  234 + white-space: nowrap;
  235 + border-top-right-radius: 0px;
  236 + border-top-left-radius: 4px;
  237 + border-bottom-left-radius: 4px;
  238 + border-bottom-right-radius: 0px;
  239 + font-size: 10px;
  240 + }
230 .co{height: 36px;line-height: 36px;} 241 .co{height: 36px;line-height: 36px;}
231 .co{border-left: 4px #409EFF solid;padding-left: 10px;background-color: #f9fafc;margin-bottom: 2px} 242 .co{border-left: 4px #409EFF solid;padding-left: 10px;background-color: #f9fafc;margin-bottom: 2px}
232 .row-bg{background-color: white;padding:0px;} 243 .row-bg{background-color: white;padding:0px;}
@@ -249,6 +260,7 @@ @@ -249,6 +260,7 @@
249 import {mapActions, mapGetters} from 'vuex' 260 import {mapActions, mapGetters} from 'vuex'
250 import {loginedUserInfo} from "../../api/user"; 261 import {loginedUserInfo} from "../../api/user";
251 export default { 262 export default {
  263 + name:'Waybill',
252 data() { 264 data() {
253 return { 265 return {
254 defaultQuery:{ 266 defaultQuery:{