Commit 10cf3ed24f449f85af704eb2f36f6edffe9b51cb
1 parent
67ea443e
库位监控样式修正
Signed-off-by: TanYibin <5491541@qq.com>
Showing
2 changed files
with
106 additions
and
104 deletions
ant-design-vue-jeecg/src/assets/css/huahengUI.css
... | ... | @@ -145,7 +145,7 @@ label.error { |
145 | 145 | padding-right:20px |
146 | 146 | } |
147 | 147 | |
148 | -/** é®ç½©å±‚ */ | |
148 | +/** é®ç½©å±? */ | |
149 | 149 | .loaderbox { |
150 | 150 | display: inline-block; |
151 | 151 | min-width: 125px; |
... | ... | @@ -496,7 +496,7 @@ label{ |
496 | 496 | color: #33cabb |
497 | 497 | } |
498 | 498 | |
499 | -/** é®ç½©å±‚ **/ | |
499 | +/** é®ç½©å±? **/ | |
500 | 500 | .loaderbox { |
501 | 501 | display: inline-block; |
502 | 502 | min-width: 125px; |
... | ... | @@ -856,7 +856,7 @@ label { |
856 | 856 | height: 32px!important; |
857 | 857 | } |
858 | 858 | |
859 | -/** è¡¨æ ¼å†»ç»“åˆ—æ ·å¼ **/ | |
859 | +/** è¡¨æ ¼å†»ç»“åˆ—æ ·å¼? **/ | |
860 | 860 | .left-fixed-table-columns, .left-fixed-body-columns { |
861 | 861 | position: absolute; |
862 | 862 | background-color: #fff; |
... | ... | @@ -900,7 +900,7 @@ label { |
900 | 900 | background: #FFF; |
901 | 901 | } |
902 | 902 | |
903 | -/** è¡¨æ ¼æ ‘æ ·å¼ **/ | |
903 | +/** è¡¨æ ¼æ ‘æ ·å¼? **/ | |
904 | 904 | .bootstrap-tree-table .treetable-indent {width:16px; height: 16px; display: inline-block; position: relative;} |
905 | 905 | .bootstrap-tree-table .treetable-expander {width:16px; height: 16px; display: inline-block; position: relative; cursor: pointer;} |
906 | 906 | .bootstrap-tree-table .treetable-selected{background: #f5f5f5 !important;} |
... | ... | @@ -1009,12 +1009,12 @@ label { |
1009 | 1009 | color: #1890ff; |
1010 | 1010 | } |
1011 | 1011 | |
1012 | -/** 滚动æ¡æ ·å¼ **/ | |
1012 | +/** 滚动æ¡æ ·å¼? **/ | |
1013 | 1013 | ::-webkit-scrollbar-track { |
1014 | 1014 | background-color: #F5F5F5; |
1015 | 1015 | } |
1016 | 1016 | |
1017 | -/** æ°”æ³¡å¼¹å‡ºæ¡†æ ·å¼ **/ | |
1017 | +/** æ°”æ³¡å¼¹å‡ºæ¡†æ ·å¼? **/ | |
1018 | 1018 | .popover { |
1019 | 1019 | font-size: 13px; |
1020 | 1020 | max-width: unset; |
... | ... | @@ -1261,8 +1261,8 @@ label { |
1261 | 1261 | display: inline-block; |
1262 | 1262 | width: 50px; |
1263 | 1263 | height: 50px; |
1264 | - /*margin: 12px 6px;*/ | |
1265 | - margin-bottom: 6px; | |
1264 | + margin: 0px 1px 6px 0px; | |
1265 | + /* margin-bottom: 6px; */ | |
1266 | 1266 | background-size:cover; |
1267 | 1267 | background-image: url("~@/assets/icon/grid_empty.png"); |
1268 | 1268 | } |
... | ... | @@ -1307,7 +1307,7 @@ label { |
1307 | 1307 | visibility: visible; |
1308 | 1308 | } |
1309 | 1309 | |
1310 | -/* 设置滚动æ¡æ ·å¼ */ | |
1310 | +/* 设置滚动æ¡æ ·å¼? */ | |
1311 | 1311 | ::-webkit-scrollbar { |
1312 | 1312 | width: 6px; |
1313 | 1313 | height: 10px; |
... | ... |
ant-design-vue-jeecg/src/views/system/monitor/locationStatus.vue
1 | 1 | <template> |
2 | 2 | <a-card :bordered="false"> |
3 | - <div class="container-div"> | |
4 | - <div class="row"> | |
5 | - <div class="col-sm-12 select-info"> | |
6 | - <form id="container-form"> | |
7 | - <div class="select-list"> | |
8 | - <ul id="select_info"> | |
9 | - <li> | |
10 | - <a-select | |
11 | - show-search | |
12 | - placeholder="请选择库区" | |
13 | - option-filter-prop="children" | |
14 | - v-model="zoneCode" | |
15 | - @change="refresh" | |
16 | - style="width: 200px"> | |
17 | - <a-select-option selected="0" id="zoneCode" v-for="item in zoneList" :key="item.name" :value="item.code">{{ item.name }} | |
18 | - </a-select-option> | |
19 | - </a-select> | |
20 | - </li> | |
21 | - <li>第 | |
22 | - <a-select | |
23 | - show-search | |
24 | - option-filter-prop="children" | |
25 | - v-model="num" | |
26 | - style="width: 70px"> | |
27 | - <a-select-option id="num" v-for="num in nums" :key="num" :value="num">{{ num }} | |
28 | - </a-select-option> | |
29 | - </a-select> | |
30 | - </li> | |
31 | - <li> | |
32 | - <a-select | |
33 | - show-search | |
34 | - option-filter-prop="children" | |
35 | - v-model="col" | |
36 | - @change="refresh" | |
37 | - style="width: 70px"> | |
38 | - <a-select-option id="col" v-for="item in colList" :key="item.name" :value="item.code">{{ item.name }} | |
39 | - </a-select-option> | |
40 | - </a-select> | |
41 | - </li> | |
42 | - <li> | |
43 | - <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons"> | |
44 | - <a-button type="primary" @click="search()" icon="search" style="margin-left: 8px;">查询</a-button> | |
45 | - <a-button @click='expressDelivery()' v-if="expressDeliveryVisible" type='primary' style="margin-left: 8px;">快速出库</a-button> | |
46 | - <a-button @click="expressStorage()" type="primary" v-if="expressStorageVisible" style="margin-left: 8px;">快速入库</a-button> | |
47 | - </span> | |
48 | - </li> | |
49 | - </ul> | |
50 | - </div> | |
51 | - </form> | |
3 | + <form id="container-form"> | |
4 | + <div class="select-list"> | |
5 | + <ul id="select_info"> | |
6 | + <li> | |
7 | + <a-select | |
8 | + show-search | |
9 | + placeholder="请选择库区" | |
10 | + option-filter-prop="children" | |
11 | + v-model="zoneCode" | |
12 | + @change="refresh" | |
13 | + style="width: 200px"> | |
14 | + <a-select-option selected="0" id="zoneCode" v-for="item in zoneList" :key="item.name" :value="item.code">{{ item.name }} | |
15 | + </a-select-option> | |
16 | + </a-select> | |
17 | + </li> | |
18 | + <li>第 | |
19 | + <a-select | |
20 | + show-search | |
21 | + option-filter-prop="children" | |
22 | + v-model="num" | |
23 | + style="width: 70px"> | |
24 | + <a-select-option id="num" v-for="num in nums" :key="num" :value="num">{{ num }} | |
25 | + </a-select-option> | |
26 | + </a-select> | |
27 | + </li> | |
28 | + <li> | |
29 | + <a-select | |
30 | + show-search | |
31 | + option-filter-prop="children" | |
32 | + v-model="col" | |
33 | + @change="refresh" | |
34 | + style="width: 70px"> | |
35 | + <a-select-option id="col" v-for="item in colList" :key="item.name" :value="item.code">{{ item.name }} | |
36 | + </a-select-option> | |
37 | + </a-select> | |
38 | + </li> | |
39 | + <li> | |
40 | + <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons"> | |
41 | + <a-button type="primary" @click="search()" icon="search" style="margin-left: 8px;">查询</a-button> | |
42 | + <a-button @click='expressDelivery()' v-if="expressDeliveryVisible" type='primary' style="margin-left: 8px;">快速出库</a-button> | |
43 | + <a-button @click="expressStorage()" type="primary" v-if="expressStorageVisible" style="margin-left: 8px;">快速入库</a-button> | |
44 | + </span> | |
45 | + </li> | |
46 | + </ul> | |
52 | 47 | </div> |
53 | - <div class="col-sm-12 select-info"> | |
54 | - <form id="receiptHeader-form"> | |
55 | - <div class="select-list"> | |
56 | - <ul id="img_list"> | |
57 | - <li style="font-size: 12px">空柜空闲:<img src="~@/assets/icon/grid_rest.png"></li> | |
58 | - <li style="font-size: 12px">空盘空闲:<img src="~@/assets/icon/grid_empty.png" alt=""></li> | |
59 | - <li style="font-size: 12px">整盘空闲:<img src="~@/assets/icon/grid_all.png"></li> | |
60 | - <li style="font-size: 12px">空柜锁定:<img src="~@/assets/icon/grid_emp_lock.png"></li> | |
61 | - <li style="font-size: 12px">空盘锁定:<img src="~@/assets/icon/grid_empty_lock.png"></li> | |
62 | - <li style="font-size: 12px">整盘锁定:<img src="~@/assets/icon/grid_all_lock.png"></li> | |
63 | - </ul> | |
64 | - <ul id="info_list"> | |
65 | - <li> | |
66 | - <span style="font-size: 12px">库位统计情况:</span> | |
67 | - <input style="width: 600px; font-size: 12px; border: none;" type="text" id="zone" disabled/> | |
68 | - </li><br><br> | |
69 | - <li><span>库位:</span><input type="text" style="width: 100px; font-size: 12px; border: none;" id="code" disabled/></li> | |
70 | - <li><span>容器编码:</span><input type="text" style="width: 200px; font-size: 12px; border: none;" id="containerCode" disabled/></li><br><br> | |
71 | - <li> | |
72 | - <span>物料信息: | |
73 | - <select id="material" style="width: 600px; padding: 0px 8px;border: none;"> | |
74 | - <option>无</option> | |
75 | - </select> | |
76 | - </span> | |
77 | - </li> | |
78 | - </ul> | |
79 | - </div> | |
80 | - </form> | |
81 | - </div> | |
82 | - <div class="col-sm-12 select-info"> | |
83 | - <div id="borderCol" style="overflow-y: auto;white-space:nowrap" v-show="showPrise"> | |
84 | - <div class="location" id="location"></div> | |
85 | - </div> | |
86 | - <a-spin tip="库位视图生成中..." :spinning="spinning"> | |
87 | - <a-skeleton active :loading="loading" :paragraph="{ rows: 5 }"/> | |
88 | - </a-spin> | |
48 | + </form> | |
49 | + <div class="col-sm-12 select-info"> | |
50 | + <form id="receiptHeader-form"> | |
51 | + <div class="select-list"> | |
52 | + <ul id="img_list"> | |
53 | + <li style="font-size: 12px">空柜空闲:<img src="~@/assets/icon/grid_rest.png"></li> | |
54 | + <li style="font-size: 12px">空盘空闲:<img src="~@/assets/icon/grid_empty.png" alt=""></li> | |
55 | + <li style="font-size: 12px">整盘空闲:<img src="~@/assets/icon/grid_all.png"></li> | |
56 | + <li style="font-size: 12px">空柜锁定:<img src="~@/assets/icon/grid_emp_lock.png"></li> | |
57 | + <li style="font-size: 12px">空盘锁定:<img src="~@/assets/icon/grid_empty_lock.png"></li> | |
58 | + <li style="font-size: 12px">整盘锁定:<img src="~@/assets/icon/grid_all_lock.png"></li> | |
59 | + </ul> | |
60 | + <ul id="info_list"> | |
61 | + <li> | |
62 | + <span style="font-size: 12px">库位统计情况:</span> | |
63 | + <input style="width: 600px; font-size: 12px; border: none;" type="text" id="zone" disabled/> | |
64 | + </li><br><br> | |
65 | + <li><span>库位:</span><input type="text" style="width: 100px; font-size: 12px; border: none;" id="code" disabled/></li><br><br> | |
66 | + <li><span>容器:</span><input type="text" style="width: 200px; font-size: 12px; border: none;" id="containerCode" disabled/></li><br><br> | |
67 | + <li style="width: 100%;"> | |
68 | + <span style="height: 32px; line-height:26px;">物料信息:</span> | |
69 | + <a-textarea v-model="materialInfo" auto-size style="width: 80%; font-size: 12px; resize: none; vertical-align:top; border: none; box-shadow: none; outline:none;" readonly /> | |
70 | + </li> | |
71 | + </ul> | |
89 | 72 | </div> |
73 | + </form> | |
74 | + </div> | |
75 | + <div class="col-sm-12 select-info"> | |
76 | + <div id="borderCol" style="overflow-y: auto;white-space:nowrap" v-show="showPrise"> | |
77 | + <div class="location" id="location"></div> | |
90 | 78 | </div> |
79 | + <a-spin tip="库位视图生成中..." :spinning="spinning"> | |
80 | + <a-skeleton active :loading="loading" :paragraph="{ rows: 5 }"/> | |
81 | + </a-spin> | |
91 | 82 | </div> |
92 | 83 | <ExpressStorageModal ref="ExpressStorageModal" @ok="search"></ExpressStorageModal> |
93 | 84 | <ExpressDeliveryModal ref="ExpressDeliveryModal" @ok="search"></ExpressDeliveryModal> |
... | ... | @@ -133,6 +124,7 @@ export default { |
133 | 124 | expressDeliveryVisible: false, |
134 | 125 | expressStorageVisible: false, |
135 | 126 | col: "row", |
127 | + materialInfo: "", | |
136 | 128 | colList: [ |
137 | 129 | {code: "row", name: "行"}, |
138 | 130 | {code: "line", name: "列"}, |
... | ... | @@ -446,25 +438,26 @@ export default { |
446 | 438 | row = parseInt(row); |
447 | 439 | line = parseInt(line); |
448 | 440 | layers = parseInt(layers); |
449 | - //缓存查询 | |
450 | 441 | if (this.list_info) { |
451 | 442 | for (const element of this.list_info) { |
452 | 443 | if (element.row === row && element.icolumn === line && element.layer === layers) { |
453 | 444 | let materialCode = ''; |
454 | - let $material = $("#material"); | |
445 | + //let $material = $("#material"); | |
455 | 446 | if (element.materialName) { |
456 | - $material.children().remove(); | |
447 | + //$material.children().remove(); | |
457 | 448 | let str_info = ''; |
458 | 449 | for (let j = 0; j < element.materialName.length; j++) { |
459 | 450 | let list_batch = element.batch[j].length === 0 ? "无" : element.batch[j]; |
460 | 451 | let list_qty = element.qty[j]; |
461 | - str_info = "批次->" + list_batch + ",物料名称->" + element.materialName[j] + ",物料编码->" + element.materialCode[j] + ",数量->" + list_qty + "\r\n"; | |
452 | + str_info += "批次->" + list_batch + ",物料名称->" + element.materialName[j] + ",物料编码->" + element.materialCode[j] + ",数量->" + list_qty; | |
462 | 453 | materialCode = element.materialCode[j]; |
463 | - $material.append("<option>" + str_info + "</option>"); | |
454 | + if (j !== element.materialName.length -1) { | |
455 | + str_info += "\r\n" | |
456 | + } | |
464 | 457 | } |
458 | + this.materialInfo = str_info | |
465 | 459 | } else { |
466 | - $material.children().remove(); | |
467 | - $material.append("<option>无</option>"); | |
460 | + this.materialInfo = "无" | |
468 | 461 | } |
469 | 462 | let $code = $("#code"); |
470 | 463 | $code.val(element.code); |
... | ... | @@ -494,7 +487,10 @@ export default { |
494 | 487 | if (col === "row") { |
495 | 488 | data = {zoneCode: this.zoneCode, row: num}; |
496 | 489 | for (let i = this.grid_layer; i > 0; i--) { |
497 | - $location.append("<br><span style='display: inline-block;text-align: right;width: 50px; margin-right: 10px;'>第" + i + "层</span>"); | |
490 | + if (i != this.grid_layer) { | |
491 | + $location.append("<br>") | |
492 | + } | |
493 | + $location.append("<span style='display: inline-block;text-align: right;width: 50px; margin-right: 10px;'>第" + i + "层</span>"); | |
498 | 494 | for (let j = 1; j <= this.grid_line; j++) { |
499 | 495 | $location.append("<img data-i=" + num + " data-j=" + j + " data-k=" + i + " class='grid' onmouseover='lays(this)' onmouseout='mClose(this)' onclick='gridMsg(this)'>"); |
500 | 496 | } |
... | ... | @@ -502,7 +498,10 @@ export default { |
502 | 498 | } else if (col === "line") { |
503 | 499 | data = {zoneCode: this.zoneCode, line: num}; |
504 | 500 | for (let k = this.grid_layer; k > 0; k--) { |
505 | - $location.append("<br><span style='display: inline-block;text-align: right;width: 50px; margin-right: 10px;'>第" + k + "层</span>"); | |
501 | + if (k != this.grid_layer) { | |
502 | + $location.append("<br>") | |
503 | + } | |
504 | + $location.append("<span style='display: inline-block;text-align: right;width: 50px; margin-right: 10px;'>第" + k + "层</span>"); | |
506 | 505 | for (let l = 1; l <= this.grid_row; l++) { |
507 | 506 | $location.append("<img data-i=" + l + " data-j=" + num + " data-k=" + k + " class='grid' onmouseover='lays(this)' onmouseout='mClose(this)' onclick='gridMsg(this)'>"); |
508 | 507 | } |
... | ... | @@ -510,7 +509,10 @@ export default { |
510 | 509 | } else if (col === "layer") { |
511 | 510 | data = {zoneCode: this.zoneCode, layer: num}; |
512 | 511 | for (let m = 1; m <= this.grid_row; m++) { |
513 | - $location.append("<br><span style='display: inline-block;text-align: right;width: 50px; margin-right: 10px;'>第" + m + "行</span>"); | |
512 | + if (m != 1) { | |
513 | + $location.append("<br>") | |
514 | + } | |
515 | + $location.append("<span style='display: inline-block;text-align: right;width: 50px; margin-right: 10px;'>第" + m + "行</span>"); | |
514 | 516 | for (let n = 1; n <= this.grid_line; n++) { |
515 | 517 | $location.append("<img data-i=" + m + " data-j=" + n + " data-k=" + num + " class='grid' onmouseover='lays(this)' onmouseout='mClose(this)' onclick='gridMsg(this)'>"); |
516 | 518 | } |
... | ... |