Fedex / EcomWeb

Go to a project
Toggle navigation Toggle navigation pinning
zhanbo.xu
0455de10 1 parent ca94e720

feat: 优化

Inline Side-by-side
Showing 13 changed files with 431 additions and 512 deletions
...@@ -6,7 +6,7 @@ VUE_APP_BASE_ENV = "dev" ...@@ -6,7 +6,7 @@ VUE_APP_BASE_ENV = "dev"
6 VUE_APP_Version = '1.0.0' 6 VUE_APP_Version = '1.0.0'
7 7
8 # FedEx 在线申报工具/开发环境 8 # FedEx 在线申报工具/开发环境
9 -VUE_APP_BASE_API = 'http://101.132.100.41:7001/EcomExp' 9 +VUE_APP_BASE_API = 'http://101.132.100.41:7008/EcomExp'
10 10
11 VUE_APP_BASE_ROUTE = '/EcomDev' 11 VUE_APP_BASE_ROUTE = '/EcomDev'
12 12
......
1 - /** 1 +/**
2 * 通用css样式布局处理 2 * 通用css样式布局处理
3 * Copyright (c) 2019 ruoyi 3 * Copyright (c) 2019 ruoyi
4 */ 4 */
5 5
6 - /** 基础通用 **/
7 - .pt5 {
8 - padding-top: 5px;
9 - }
10 -
11 - .pr5 {
12 - padding-right: 5px;
13 - }
14 -
15 - .pb5 {
16 - padding-bottom: 5px;
17 - }
18 -
19 - .pl10 {
20 - padding-left: 10px;
21 - }
22 -
23 - .mt5 {
24 - margin-top: 5px;
25 - }
26 -
27 - .mr5 {
28 - margin-right: 5px;
29 - }
30 -
31 - .mb5 {
32 - margin-bottom: 5px;
33 - }
34 -
35 - .mb8 {
36 - margin-bottom: 8px;
37 - }
38 -
39 - .ml5 {
40 - margin-left: 5px;
41 - }
42 -
43 - .mt10 {
44 - margin-top: 10px;
45 - }
46 -
47 - .mr10 {
48 - margin-right: 10px;
49 - }
50 -
51 - .mb10 {
52 - margin-bottom: 10px;
53 - }
54 -
55 - .ml0 {
56 - margin-left: 10px;
57 - }
58 -
59 - .mt20 {
60 - margin-top: 20px;
61 - }
62 -
63 - .mr20 {
64 - margin-right: 20px;
65 - }
66 -
67 - .mb20 {
68 - margin-bottom: 20px;
69 - }
70 -
71 - .m20 {
72 - margin-left: 20px;
73 - }
74 -
75 - .el-dialog:not(.is-fullscreen) {
76 - margin-top: 6vh !important;
77 - }
78 -
79 - .textCenter {
80 - text-align: center;
81 - }
82 -
83 - /** 表单布局 **/
84 - .form-header {
85 - font-size: 15px;
86 - color: #6379bb;
87 - border-bottom: 1px solid #ddd;
88 - margin: 8px 10px 25px 10px;
89 - padding-bottom: 5px
90 - }
91 -
92 - /** 表格布局 **/
93 - .pagination-container {
94 - position: relative;
95 - height: 25px;
96 - margin-bottom: 10px;
97 - margin-top: 15px;
98 - padding: 10px 20px !important;
99 - }
100 -
101 - /* tree border */
102 - .tree-border {
103 - margin-top: 5px;
104 - border: 1px solid #e5e6e7;
105 - background: #FFFFFF none;
106 - border-radius: 4px;
107 - }
108 -
109 - .pagination-container .el-pagination {
110 - right: 0;
111 - position: absolute;
112 - }
113 -
114 - .el-table .fixed-width .el-button--mini {
115 - padding-left: 0;
116 - padding-right: 0;
117 - width: inherit;
118 - }
119 -
120 - .el-tree-node__content>.el-checkbox {
121 - margin-right: 8px;
122 - }
123 -
124 - .list-group-striped>.list-group-item {
125 - border-left: 0;
126 - border-right: 0;
127 - border-radius: 0;
128 - padding-left: 0;
129 - padding-right: 0;
130 - }
131 -
132 - .list-group {
133 - padding-left: 0px;
134 - list-style: none;
135 - }
136 -
137 - .list-group-item {
138 - border-bottom: 1px solid #e7eaec;
139 - border-top: 1px solid #e7eaec;
140 - margin-bottom: -1px;
141 - padding: 11px 0px;
142 - font-size: 13px;
143 - }
144 -
145 - .pull-right {
146 - float: right !important;
147 - }
148 -
149 - .el-card__header {
150 - padding: 14px 15px 7px;
151 - min-height: 40px;
152 - }
153 -
154 - .el-card__body {
155 - padding: 15px 20px 20px 20px;
156 - }
157 -
158 - .card-box {
159 - padding-right: 15px;
160 - padding-left: 15px;
161 - margin-bottom: 10px;
162 - }
163 -
164 - /* button color */
165 - .el-button--cyan.is-active,
166 - .el-button--cyan:active {
167 - background: #20B2AA;
168 - border-color: #20B2AA;
169 - color: #FFFFFF;
170 - }
171 -
172 - .el-button--cyan:focus,
173 - .el-button--cyan:hover {
174 - background: #48D1CC;
175 - border-color: #48D1CC;
176 - color: #FFFFFF;
177 - }
178 -
179 - .el-button--cyan {
180 - background-color: #20B2AA;
181 - border-color: #20B2AA;
182 - color: #FFFFFF;
183 - }
184 -
185 - /* text color */
186 - .text-navy {
187 - color: #1ab394;
188 - }
189 -
190 - .text-primary {
191 - color: inherit;
192 - }
193 -
194 - .text-success {
195 - color: #1c84c6;
196 - }
197 -
198 - .text-info {
199 - color: #23c6c8;
200 - }
201 -
202 - .text-warning {
203 - color: #f8ac59;
204 - }
205 -
206 - .text-danger {
207 - color: #ed5565;
208 - }
209 -
210 - .text-muted {
211 - color: #888888;
212 - }
213 -
214 - /* image */
215 - .img-circle {
216 - border-radius: 50%;
217 - }
218 -
219 - .img-lg {
220 - width: 120px;
221 - height: 120px;
222 - }
223 -
224 - .avatar-upload-preview {
225 - position: absolute;
226 - top: 50%;
227 - transform: translate(50%, -50%);
228 - width: 200px;
229 - height: 200px;
230 - border-radius: 50%;
231 - box-shadow: 0 0 4px #ccc;
232 - overflow: hidden;
233 - }
234 -
235 - /* 拖拽列样式 */
236 - .sortable-ghost {
237 - opacity: .8;
238 - color: #fff !important;
239 - background: #42b983 !important;
240 - }
241 -
242 - .top-right-btn {
243 - position: relative;
244 - float: right;
245 - }
...\ No newline at end of file ...\ No newline at end of file
6 +/** 基础通用 **/
7 +.pt5 {
8 + padding-top: 5px;
9 +}
10 +
11 +.pr5 {
12 + padding-right: 5px;
13 +}
14 +
15 +.pb5 {
16 + padding-bottom: 5px;
17 +}
18 +
19 +.pl10 {
20 + padding-left: 10px;
21 +}
22 +
23 +.mt5 {
24 + margin-top: 5px;
25 +}
26 +
27 +.mr5 {
28 + margin-right: 5px;
29 +}
30 +
31 +.mb5 {
32 + margin-bottom: 5px;
33 +}
34 +
35 +.mb8 {
36 + margin-bottom: 8px;
37 +}
38 +
39 +.ml5 {
40 + margin-left: 5px;
41 +}
42 +
43 +.mt10 {
44 + margin-top: 10px;
45 +}
46 +
47 +.mr10 {
48 + margin-right: 10px;
49 +}
50 +
51 +.mb10 {
52 + margin-bottom: 10px;
53 +}
54 +
55 +.ml0 {
56 + margin-left: 10px;
57 +}
58 +
59 +.mt20 {
60 + margin-top: 20px;
61 +}
62 +
63 +.mr20 {
64 + margin-right: 20px;
65 +}
66 +
67 +.mb20 {
68 + margin-bottom: 20px;
69 +}
70 +
71 +.m20 {
72 + margin-left: 20px;
73 +}
74 +
75 +.el-dialog:not(.is-fullscreen) {
76 + margin-top: 1vh !important;
77 +}
78 +.el-dialog {
79 + top: 40% !important;
80 +}
81 +.textCenter {
82 + text-align: center;
83 +}
84 +
85 +/** 表单布局 **/
86 +.form-header {
87 + font-size: 15px;
88 + color: #6379bb;
89 + border-bottom: 1px solid #ddd;
90 + margin: 8px 10px 25px 10px;
91 + padding-bottom: 5px;
92 +}
93 +
94 +/** 表格布局 **/
95 +.pagination-container {
96 + position: relative;
97 + height: 25px;
98 + margin-bottom: 10px;
99 + margin-top: 15px;
100 + padding: 10px 20px !important;
101 +}
102 +
103 +/* tree border */
104 +.tree-border {
105 + margin-top: 5px;
106 + border: 1px solid #e5e6e7;
107 + background: #ffffff none;
108 + border-radius: 4px;
109 +}
110 +
111 +.pagination-container .el-pagination {
112 + right: 0;
113 + position: absolute;
114 +}
115 +
116 +.el-table .fixed-width .el-button--mini {
117 + padding-left: 0;
118 + padding-right: 0;
119 + width: inherit;
120 +}
121 +
122 +.el-tree-node__content > .el-checkbox {
123 + margin-right: 8px;
124 +}
125 +
126 +.list-group-striped > .list-group-item {
127 + border-left: 0;
128 + border-right: 0;
129 + border-radius: 0;
130 + padding-left: 0;
131 + padding-right: 0;
132 +}
133 +
134 +.list-group {
135 + padding-left: 0px;
136 + list-style: none;
137 +}
138 +
139 +.list-group-item {
140 + border-bottom: 1px solid #e7eaec;
141 + border-top: 1px solid #e7eaec;
142 + margin-bottom: -1px;
143 + padding: 11px 0px;
144 + font-size: 13px;
145 +}
146 +
147 +.pull-right {
148 + float: right !important;
149 +}
150 +
151 +.el-card__header {
152 + padding: 14px 15px 7px;
153 + min-height: 40px;
154 +}
155 +
156 +.el-card__body {
157 + padding: 15px 20px 20px 20px;
158 +}
159 +
160 +.card-box {
161 + padding-right: 15px;
162 + padding-left: 15px;
163 + margin-bottom: 10px;
164 +}
165 +
166 +/* button color */
167 +.el-button--cyan.is-active,
168 +.el-button--cyan:active {
169 + background: #20b2aa;
170 + border-color: #20b2aa;
171 + color: #ffffff;
172 +}
173 +
174 +.el-button--cyan:focus,
175 +.el-button--cyan:hover {
176 + background: #48d1cc;
177 + border-color: #48d1cc;
178 + color: #ffffff;
179 +}
180 +
181 +.el-button--cyan {
182 + background-color: #20b2aa;
183 + border-color: #20b2aa;
184 + color: #ffffff;
185 +}
186 +
187 +/* text color */
188 +.text-navy {
189 + color: #1ab394;
190 +}
191 +
192 +.text-primary {
193 + color: inherit;
194 +}
195 +
196 +.text-success {
197 + color: #1c84c6;
198 +}
199 +
200 +.text-info {
201 + color: #23c6c8;
202 +}
203 +
204 +.text-warning {
205 + color: #f8ac59;
206 +}
207 +
208 +.text-danger {
209 + color: #ed5565;
210 +}
211 +
212 +.text-muted {
213 + color: #888888;
214 +}
215 +
216 +/* image */
217 +.img-circle {
218 + border-radius: 50%;
219 +}
220 +
221 +.img-lg {
222 + width: 120px;
223 + height: 120px;
224 +}
225 +
226 +.avatar-upload-preview {
227 + position: absolute;
228 + top: 50%;
229 + transform: translate(50%, -50%);
230 + width: 200px;
231 + height: 200px;
232 + border-radius: 50%;
233 + box-shadow: 0 0 4px #ccc;
234 + overflow: hidden;
235 +}
236 +
237 +/* 拖拽列样式 */
238 +.sortable-ghost {
239 + opacity: 0.8;
240 + color: #fff !important;
241 + background: #42b983 !important;
242 +}
243 +
244 +.top-right-btn {
245 + position: relative;
246 + float: right;
247 +}
......
...@@ -12,7 +12,6 @@ ...@@ -12,7 +12,6 @@
12 :show-header="showHeader" 12 :show-header="showHeader"
13 :show-summary="showSummary" 13 :show-summary="showSummary"
14 :summary-method="getSummaries" 14 :summary-method="getSummaries"
15 - :height="height"
16 :empty-text="emptyText" 15 :empty-text="emptyText"
17 :max-height="maxHeight" 16 :max-height="maxHeight"
18 :highlight-current-row="highlightCurrentRow" 17 :highlight-current-row="highlightCurrentRow"
...@@ -427,25 +426,28 @@ export default { ...@@ -427,25 +426,28 @@ export default {
427 limitSize() { 426 limitSize() {
428 this.sizes = this.limitSize; 427 this.sizes = this.limitSize;
429 }, 428 },
430 - data(val) { 429 + // data(val) {
431 - let table = document.querySelector(".el-table__body-wrapper"); 430 + // let table = document.querySelector(".el-table__body-wrapper");
432 - let tableBody = document.querySelector(".el-table__body"); 431 + // let tableBody = document.querySelector(".el-table__body");
433 - if (this.data != null && this.data.length > 0) { 432 + // if (this.data != null && this.data.length > 0) {
434 - this.rowData = [this.data[0]]; 433 + // this.rowData = [this.data[0]];
435 - this.data.forEach((item, index) => { 434 + // this.data.forEach((item, index) => {
436 - item.index = index; 435 + // item.index = index;
437 - }); 436 + // });
438 - } 437 + // }
439 - this.$nextTick(() => { 438 + // this.$nextTick(() => {
440 - if (table) { 439 + // if (table) {
441 - table.style.maxHeight = this.maxHeight; 440 + // table.style.maxHeight = this.maxHeight + "px";
442 - tableBody.clientHeight >= parseInt(this.maxHeight) 441 + // if (val.length * 50 > this.maxHeight) {
443 - ? (table.style.height = this.maxHeight - 40 + "px") 442 + // table.style.height = this.maxHeight + "px";
444 - : (table.style.height = tableBody.clientHeight + "px"); 443 + // } else {
445 - this.$refs.tables.doLayout(); 444 + // table.style.height = val.length * 50 + "px";
446 - } 445 + // }
447 - }); 446 + // console.log(table);
448 - }, 447 + // this.$refs.tables.doLayout();
448 + // }
449 + // });
450 + // },
449 expandRowKeys(val) { 451 expandRowKeys(val) {
450 let tableBodyRow = document.getElementsByClassName("el-table__row"); 452 let tableBodyRow = document.getElementsByClassName("el-table__row");
451 if (val.length > 0) { 453 if (val.length > 0) {
...@@ -466,8 +468,13 @@ export default { ...@@ -466,8 +468,13 @@ export default {
466 }, 468 },
467 }, 469 },
468 mounted() { 470 mounted() {
469 - let table = document.querySelector(".el-table__body-wrapper"); 471 + // this.$nextTick(() => {
470 - table.style.maxHeight = this.maxHeight + "px"; 472 + // let table = document.querySelector(".el-table__body-wrapper");
473 + // console.log(this.maxHeight, this.maxHeight);
474 + // table.style.maxHeight = this.maxHeight + "px";
475 + // // table.style.height = this.maxHeight + "px";
476 + // console.log(table.style.maxHeight);
477 + // });
471 }, 478 },
472 methods: { 479 methods: {
473 sizeChange(val) { 480 sizeChange(val) {
......
...@@ -17,7 +17,32 @@ ...@@ -17,7 +17,32 @@
17 </div> 17 </div>
18 <div v-loading="tableLoading"> 18 <div v-loading="tableLoading">
19 <slot name="title"></slot> 19 <slot name="title"></slot>
20 - <Table 20 + <div style="height: 10px"></div>
21 + <el-table
22 + :pagination="false"
23 + :border="true"
24 + :empty-text="
25 + loadingDatas &&
26 + rowData &&
27 + rowData.popoverData &&
28 + !rowData.popoverData.length
29 + ? '数据加载中'
30 + : $t('portEntry.emptyText')
31 + "
32 + :data="rowData.popoverData"
33 + rowKey="id"
34 + >
35 + <el-table-column
36 + v-for="(item, index) in receiptDataHead"
37 + :key="index"
38 + :prop="item.value"
39 + :label="item.name"
40 + :align="item.align"
41 + :width="item.width"
42 + >
43 + </el-table-column>
44 + </el-table>
45 + <!-- <Table
21 class="fedexDetialTable mt20" 46 class="fedexDetialTable mt20"
22 :data="rowData.popoverData" 47 :data="rowData.popoverData"
23 :headerData="receiptDataHead" 48 :headerData="receiptDataHead"
...@@ -39,11 +64,11 @@ ...@@ -39,11 +64,11 @@
39 ? '数据加载中' 64 ? '数据加载中'
40 : $t('portEntry.emptyText') 65 : $t('portEntry.emptyText')
41 " 66 "
42 - :height="tableHeight + 'px'" 67 + :height="tableHeight"
43 - :maxHeight="tableHeight + 'px'" 68 + :maxHeight="tableHeight"
44 rowKey="id" 69 rowKey="id"
45 > 70 >
46 - </Table> 71 + </Table> -->
47 </div> 72 </div>
48 <el-button 73 <el-button
49 slot="reference" 74 slot="reference"
...@@ -90,7 +115,6 @@ export default { ...@@ -90,7 +115,6 @@ export default {
90 data() { 115 data() {
91 return { 116 return {
92 tableLoading: false, 117 tableLoading: false,
93 - tableHeight: 350,
94 }; 118 };
95 }, 119 },
96 computed: { 120 computed: {
...@@ -98,17 +122,8 @@ export default { ...@@ -98,17 +122,8 @@ export default {
98 return this.$store.state.viewOption.loadingDatas; 122 return this.$store.state.viewOption.loadingDatas;
99 }, 123 },
100 }, 124 },
101 - mounted() { 125 +
102 - this.calculateTableHeight();
103 - window.addEventListener("resize", this.calculateTableHeight);
104 - },
105 - beforeDestroy() {
106 - window.removeEventListener("resize", this.calculateTableHeight);
107 - },
108 methods: { 126 methods: {
109 - calculateTableHeight() {
110 - this.tableHeight = window.innerHeight - 300;
111 - },
112 //弹框关闭 127 //弹框关闭
113 popoverClose() { 128 popoverClose() {
114 this.$emit("popoverClose"); 129 this.$emit("popoverClose");
...@@ -176,4 +191,18 @@ export default { ...@@ -176,4 +191,18 @@ export default {
176 }; 191 };
177 </script> 192 </script>
178 193
179 -<style></style> 194 +<style lang="scss" scoped>
195 +.tableList {
196 + width: 200px;
197 + max-height: 500px;
198 + padding: 5px;
199 + margin: 0;
200 + position: absolute;
201 + bottom: 35px;
202 + right: 0px;
203 + border: 1px solid #ccc;
204 + border-radius: 3%;
205 + background: #fff;
206 + overflow-y: scroll;
207 +}
208 +</style>
......
...@@ -132,8 +132,7 @@ ...@@ -132,8 +132,7 @@
132 ref="entryTable" 132 ref="entryTable"
133 :data="tableData" 133 :data="tableData"
134 :headerData="headerData" 134 :headerData="headerData"
135 - :height="tableMaxheight + 'px'" 135 + :maxHeight="tableMaxheight"
136 - :maxHeight="tableMaxheight + 'px'"
137 :border="true" 136 :border="true"
138 :pagination="true" 137 :pagination="true"
139 :order="false" 138 :order="false"
...@@ -298,13 +297,13 @@ export default { ...@@ -298,13 +297,13 @@ export default {
298 loadings: { 297 loadings: {
299 sreachLoading: false, 298 sreachLoading: false,
300 }, 299 },
301 - tableMaxheight: 500, 300 + tableMaxheight: null,
302 outerVisible: false, 301 outerVisible: false,
303 }; 302 };
304 }, 303 },
305 created() { 304 created() {
306 this.search(0); 305 this.search(0);
307 - this.calculateTableHeight(); 306 + this.tableMaxheight = window.innerHeight - 300;
308 }, 307 },
309 watch: { 308 watch: {
310 $route(val, oldval) { 309 $route(val, oldval) {
...@@ -312,12 +311,6 @@ export default { ...@@ -312,12 +311,6 @@ export default {
312 }, 311 },
313 }, 312 },
314 313
315 - mounted() {
316 - window.addEventListener("resize", this.calculateTableHeight);
317 - },
318 - beforeDestroy() {
319 - window.removeEventListener("resize", this.calculateTableHeight);
320 - },
321 methods: { 314 methods: {
322 // 运单号跳转 315 // 运单号跳转
323 linkChange(record, type) { 316 linkChange(record, type) {
...@@ -361,9 +354,7 @@ export default { ...@@ -361,9 +354,7 @@ export default {
361 this.$refs.entryTable.$refs.tables.$refs.bodyWrapper.style.overflowY = 354 this.$refs.entryTable.$refs.tables.$refs.bodyWrapper.style.overflowY =
362 "auto"; 355 "auto";
363 }, 356 },
364 - calculateTableHeight() { 357 +
365 - this.tableMaxheight = window.innerHeight - 300;
366 - },
367 //查询回执 358 //查询回执
368 receiptApi(billNo, type) { 359 receiptApi(billNo, type) {
369 return new Promise((resolve, reject) => { 360 return new Promise((resolve, reject) => {
......
...@@ -271,7 +271,7 @@ export default { ...@@ -271,7 +271,7 @@ export default {
271 loadings: { 271 loadings: {
272 searchLoading: false, 272 searchLoading: false,
273 }, 273 },
274 - tableMaxheight: 500, 274 + tableMaxheight: null,
275 outerVisible: false, 275 outerVisible: false,
276 dialogTitle: "", 276 dialogTitle: "",
277 editType: "", 277 editType: "",
...@@ -282,18 +282,10 @@ export default { ...@@ -282,18 +282,10 @@ export default {
282 created() { 282 created() {
283 this.searchPortDictData(); 283 this.searchPortDictData();
284 this.search(0); 284 this.search(0);
285 - this.calculateTableHeight(); 285 + this.tableMaxheight = window.innerHeight - 300;
286 - },
287 - mounted() {
288 - window.addEventListener("resize", this.calculateTableHeight);
289 - },
290 - beforeDestroy() {
291 - window.removeEventListener("resize", this.calculateTableHeight);
292 }, 286 },
287 +
293 methods: { 288 methods: {
294 - calculateTableHeight() {
295 - this.tableMaxheight = window.innerHeight - 300;
296 - },
297 //查询 289 //查询
298 search(val) { 290 search(val) {
299 this.loadings.searchLoading = true; 291 this.loadings.searchLoading = true;
......
...@@ -22,14 +22,14 @@ ...@@ -22,14 +22,14 @@
22 <el-col :span="5"> 22 <el-col :span="5">
23 <Formitem label="订单编号" prop="orderNo"> 23 <Formitem label="订单编号" prop="orderNo">
24 <el-input 24 <el-input
25 - type="text" 25 + type="text"
26 - class="inputShadow" 26 + class="inputShadow"
27 - id="inputInner--orderNo" 27 + id="inputInner--orderNo"
28 - resize="none" 28 + resize="none"
29 - v-model="sreachFormData.orderNo" 29 + v-model="sreachFormData.orderNo"
30 - clearable 30 + clearable
31 - placeholder="" 31 + placeholder=""
32 - ></el-input> 32 + ></el-input>
33 </Formitem> 33 </Formitem>
34 </el-col> 34 </el-col>
35 <!-- 电商企业代码 --> 35 <!-- 电商企业代码 -->
...@@ -57,7 +57,11 @@ ...@@ -57,7 +57,11 @@
57 placeholder="" 57 placeholder=""
58 > 58 >
59 <el-option 59 <el-option
60 - v-for="(item, index) in $store.getters.dict.RECEIPT_STATUS.filter(fItem => fItem.itemChineseName !== '已提交')" 60 + v-for="(
61 + item, index
62 + ) in $store.getters.dict.RECEIPT_STATUS.filter(
63 + (fItem) => fItem.itemChineseName !== '已提交'
64 + )"
61 :key="index" 65 :key="index"
62 :label="item.itemChineseName" 66 :label="item.itemChineseName"
63 :value="item.itemValue" 67 :value="item.itemValue"
...@@ -149,7 +153,7 @@ ...@@ -149,7 +153,7 @@
149 > 153 >
150 <div slot="title"> 154 <div slot="title">
151 <span style="font-weight: 700; color: #515a6e">订单编号：</span 155 <span style="font-weight: 700; color: #515a6e">订单编号：</span
152 - >{{ scope.row.orderno }} 156 + >{{ scope.row.orderNo }}
153 </div> 157 </div>
154 <div slot="buttonLabel"> 158 <div slot="buttonLabel">
155 {{ scope.row.returnStatus }} 159 {{ scope.row.returnStatus }}
...@@ -158,8 +162,8 @@ ...@@ -158,8 +162,8 @@
158 </template> 162 </template>
159 <template v-slot:logisticsNo="scope"> 163 <template v-slot:logisticsNo="scope">
160 <el-button type="text" @click="view(scope.row)">{{ 164 <el-button type="text" @click="view(scope.row)">{{
161 - scope.row.logisticsNo 165 + scope.row.logisticsNo
162 - }}</el-button> 166 + }}</el-button>
163 </template> 167 </template>
164 </Table> 168 </Table>
165 </div> 169 </div>
...@@ -324,7 +328,6 @@ export default { ...@@ -324,7 +328,6 @@ export default {
324 } 328 }
325 getAllExportingBills(obj) 329 getAllExportingBills(obj)
326 .then((res) => { 330 .then((res) => {
327 -
328 if (res.code === "200") { 331 if (res.code === "200") {
329 this.tableData = res.data.value; 332 this.tableData = res.data.value;
330 this.page.total = res.data.totalItems; 333 this.page.total = res.data.totalItems;
...@@ -376,7 +379,7 @@ export default { ...@@ -376,7 +379,7 @@ export default {
376 }) 379 })
377 .finally(() => { 380 .finally(() => {
378 this.$nextTick(() => { 381 this.$nextTick(() => {
379 - this.$store.dispatch('setLoadingState', false) 382 + this.$store.dispatch("setLoadingState", false);
380 this.$refs.returnStatusPopover.tableLoading = false; 383 this.$refs.returnStatusPopover.tableLoading = false;
381 }); 384 });
382 }); 385 });
......
...@@ -205,7 +205,7 @@ ...@@ -205,7 +205,7 @@
205 ref="entryTable" 205 ref="entryTable"
206 :data="tableData" 206 :data="tableData"
207 :headerData="headerData" 207 :headerData="headerData"
208 - :maxHeight="tableMaxheight" 208 + :maxHeight="500"
209 :border="true" 209 :border="true"
210 :pagination="true" 210 :pagination="true"
211 :order="false" 211 :order="false"
...@@ -378,7 +378,9 @@ export default { ...@@ -378,7 +378,9 @@ export default {
378 this.search(0); 378 this.search(0);
379 }, 379 },
380 mounted() { 380 mounted() {
381 - this.tableMaxheight = window.innerHeight - 300; 381 + this.$nextTick(() => {
382 + this.tableMaxheight = window.innerHeight - 300;
383 + });
382 }, 384 },
383 watch: { 385 watch: {
384 $route() { 386 $route() {
......
...@@ -2,80 +2,40 @@ ...@@ -2,80 +2,40 @@
2 <el-dialog 2 <el-dialog
3 class="entryDialog classCUploadDialog" 3 class="entryDialog classCUploadDialog"
4 title="运抵单申报" 4 title="运抵单申报"
5 - :visible.sync="outerVisible" 5 + :visible.sync="visible"
6 - :show-close="false" 6 + top="8vh"
7 width="720px" 7 width="720px"
8 - :close-on-click-modal="false"
9 :destroy-on-close="true" 8 :destroy-on-close="true"
10 - v-loading="loadings.dialogLoading" 9 + @close="close()"
11 - @close="close(false)"
12 > 10 >
13 <div class="modelItem"> 11 <div class="modelItem">
14 - <el-form 12 + <el-descriptions class="margin-top" title="" :column="3" border>
15 - class="fedexFormStyle" 13 + <el-descriptions-item>
16 - ref="formData" 14 + <template slot="label"> 用户名 </template>
17 - :model="formData" 15 + kooriookami
18 - label-position="top" 16 + </el-descriptions-item>
19 - size="small" 17 + <el-descriptions-item>
20 - > 18 + <template slot="label"> 手机号 </template>
21 - <el-row :gutter="5"> 19 + 18100000000
22 - <el-col :span="8"> 20 + </el-descriptions-item>
23 - <Formitem label="监管场所" prop="operatorCode" type="edit"> 21 + <el-descriptions-item>
24 - <el-select 22 + <template slot="label"> 居住地 </template>
25 - type="text" 23 + 苏州市
26 - id="inputInner-edit-operatorCode" 24 + </el-descriptions-item>
27 - v-model="formData.operatorCode" 25 + <el-descriptions-item>
28 - clearable 26 + <template slot="label"> 备注 </template>
29 - filterable 27 + <el-tag size="small">学校</el-tag>
30 - placeholder="" 28 + </el-descriptions-item>
31 - > 29 + <el-descriptions-item>
32 - <el-option 30 + <template slot="label"> 联系地址 </template>
33 - v-for="item in operatorCode" 31 + 江苏省苏州市吴中区吴中大道 1188 号
34 - :key="item.operatorCode" 32 + </el-descriptions-item>
35 - :label="item.operatorName" 33 + </el-descriptions>
36 - :value="item.operatorCode"
37 - ></el-option>
38 - </el-select>
39 - </Formitem>
40 - </el-col>
41 -
42 - <el-col :span="8">
43 - <Formitem
44 - label="境内运输工具编码"
45 - prop="domesticTrafNo"
46 - type="edit"
47 - >
48 - <el-input
49 - type="text"
50 - class="inputShadow"
51 - id="inputInner-edit-domesticTrafNo"
52 - resize="none"
53 - v-model="formData.domesticTrafNo"
54 - clearable
55 - placeholder=""
56 - ></el-input>
57 - </Formitem>
58 - </el-col>
59 - </el-row>
60 - </el-form>
61 - </div>
62 - <div class="dialogOption entrySave">
63 - <el-button
64 - class="entrySaveButton"
65 - :disabled="loadings.submitLoading"
66 - @click="submit"
67 - >确 定</el-button
68 - >
69 - <el-button class="entrySaveButton" @click="close(false)">关 闭</el-button>
70 </div> 34 </div>
71 </el-dialog> 35 </el-dialog>
72 </template> 36 </template>
73 37
74 <script> 38 <script>
75 -import {
76 - getCurrUserOperatorCode,
77 - declareUpload,
78 -} from "@/api/declareData-api.js";
79 export default { 39 export default {
80 props: { 40 props: {
81 outerVisible: { 41 outerVisible: {
...@@ -89,79 +49,22 @@ export default { ...@@ -89,79 +49,22 @@ export default {
89 }, 49 },
90 }, 50 },
91 }, 51 },
52 + data() {
53 + return {
54 + visible: false,
55 + };
56 + },
92 watch: { 57 watch: {
93 outerVisible(val) { 58 outerVisible(val) {
94 if (val) { 59 if (val) {
95 - this.loadings.dialogLoading = false; 60 + this.visible = val;
96 - this.fetchOperatorCode();
97 } 61 }
98 }, 62 },
99 }, 63 },
100 - data() {
101 - return {
102 - formData: {
103 - operatorCode: "",
104 - domesticTrafNo: "",
105 - },
106 -
107 - loadings: {
108 - dialogLoading: false,
109 - submitLoading: false,
110 - },
111 - loadingText: "",
112 - operatorCode: [],
113 - };
114 - },
115 methods: { 64 methods: {
116 - fetchOperatorCode() { 65 + close() {
117 - getCurrUserOperatorCode().then((res) => { 66 + this.visible = false;
118 - if (res.code === "200") { 67 + this.$emit("close", false);
119 - this.operatorCode = res.data;
120 - }
121 - });
122 - },
123 -
124 - //数据保存
125 - submit() {
126 - this.loadings.dialogLoading = true;
127 - let obj = {
128 - ...this.formData,
129 - declareIds: this.selected.map((item) => item.declareId),
130 - type: "arrivalIn",
131 - };
132 - this.$refs.formData.validate((valid) => {
133 - if (valid) {
134 - this.addapi(obj);
135 - } else {
136 - this.loadings.dialogLoading = false;
137 - }
138 - });
139 - },
140 - //新增
141 - addapi(val) {
142 - declareUpload(val)
143 - .then((res) => {
144 - if (res.code === "200") {
145 - this.msgSuccess(res.message);
146 - this.close(true);
147 - } else {
148 - this.alertWarningMsg(res.message);
149 - this.loadings.dialogLoading = false;
150 - }
151 - })
152 - .catch((err) => {
153 - console.log(err);
154 - this.loadings.dialogLoading = false;
155 - });
156 - },
157 -
158 - close(flag) {
159 - this.formData = {
160 - operatorCode: "",
161 - domesticTrafNo: "",
162 - };
163 - this.loadings.dialogLoading = false;
164 - this.$emit("close", flag);
165 }, 68 },
166 }, 69 },
167 }; 70 };
......
...@@ -81,6 +81,7 @@ ...@@ -81,6 +81,7 @@
81 type="primary" 81 type="primary"
82 class="dropdown-style-button" 82 class="dropdown-style-button"
83 @click="addDeclare" 83 @click="addDeclare"
84 + :loading="loadings.postLoading"
84 > 85 >
85 <svg-icon 86 <svg-icon
86 class="el-icon-user-solid" 87 class="el-icon-user-solid"
...@@ -94,8 +95,7 @@ ...@@ -94,8 +95,7 @@
94 ref="entryTable" 95 ref="entryTable"
95 :data="tableData" 96 :data="tableData"
96 :headerData="headerData" 97 :headerData="headerData"
97 - :height="tableMaxheight + 'px'" 98 + :maxHeight="tableMaxheight"
98 - :maxHeight="tableMaxheight + 'px'"
99 :border="true" 99 :border="true"
100 :pagination="true" 100 :pagination="true"
101 :order="false" 101 :order="false"
...@@ -112,6 +112,13 @@ ...@@ -112,6 +112,13 @@
112 @tableSelectAll="tableSelectAll" 112 @tableSelectAll="tableSelectAll"
113 :selected="selected" 113 :selected="selected"
114 > 114 >
115 + <template slot="optionColumn">
116 + <el-table-column align="center" label="操作" width="150">
117 + <template slot-scope="scope">
118 + <el-button type="text" @click="detail(scope.row)"> 详情 </el-button>
119 + </template>
120 + </el-table-column>
121 + </template>
115 </Table> 122 </Table>
116 <DialogVue 123 <DialogVue
117 :outerVisible="outerVisible" 124 :outerVisible="outerVisible"
...@@ -122,7 +129,7 @@ ...@@ -122,7 +129,7 @@
122 </template> 129 </template>
123 130
124 <script> 131 <script>
125 -import { getHsCodeList } from "@/api/arrivalList-api.js"; 132 +import { getHsCodeList, getHsCodeIncr } from "@/api/arrivalList-api.js";
126 import DialogVue from "./dialog.vue"; 133 import DialogVue from "./dialog.vue";
127 export default { 134 export default {
128 name: "SupervisePlaceManage", 135 name: "SupervisePlaceManage",
...@@ -191,23 +198,18 @@ export default { ...@@ -191,23 +198,18 @@ export default {
191 198
192 loadings: { 199 loadings: {
193 sreachLoading: false, 200 sreachLoading: false,
201 + postLoading: false,
194 }, 202 },
195 - tableMaxheight: 500, 203 + tableMaxheight: null,
196 outerVisible: false, 204 outerVisible: false,
197 }; 205 };
198 }, 206 },
199 created() { 207 created() {
200 this.search(0); 208 this.search(0);
201 - this.calculateTableHeight(); 209 + this.tableMaxheight = window.innerHeight - 300;
202 }, 210 },
203 watch: {}, 211 watch: {},
204 212
205 - mounted() {
206 - window.addEventListener("resize", this.calculateTableHeight);
207 - },
208 - beforeDestroy() {
209 - window.removeEventListener("resize", this.calculateTableHeight);
210 - },
211 methods: { 213 methods: {
212 tableSelect(val) { 214 tableSelect(val) {
213 this.selected = val.selection; 215 this.selected = val.selection;
...@@ -224,10 +226,6 @@ export default { ...@@ -224,10 +226,6 @@ export default {
224 } 226 }
225 }, 227 },
226 228
227 - calculateTableHeight() {
228 - this.tableMaxheight = window.innerHeight - 300;
229 - },
230 -
231 clear() { 229 clear() {
232 this.$refs.sreachForm.resetFields(); 230 this.$refs.sreachForm.resetFields();
233 //重置数据 231 //重置数据
...@@ -272,21 +270,37 @@ export default { ...@@ -272,21 +270,37 @@ export default {
272 .catch((err) => { 270 .catch((err) => {
273 console.log(err); 271 console.log(err);
274 this.loadings.sreachLoading = false; 272 this.loadings.sreachLoading = false;
273 + })
274 + .finally(() => {
275 + console.log("finally");
275 }); 276 });
276 }, 277 },
277 addDeclare() { 278 addDeclare() {
278 - if (this.selected.length === 0) { 279 + this.loadings.postLoading = true;
279 - this.alertWarningMsg("请选择数据！"); 280 + getHsCodeIncr()
280 - return; 281 + .then((res) => {
281 - } 282 + if (res.code === "200") {
283 + this.loadings.postLoading = false;
284 + this.alertSuccessMsg(res.message);
285 + } else {
286 + this.alertWarningMsg(res.message);
287 + }
288 + this.loadings.postLoading = false;
289 + })
290 + .catch((err) => {
291 + console.log(err);
292 + this.loadings.postLoading = false;
293 + })
294 + .finally(() => {
295 + console.log("finally");
296 + });
297 + },
298 + detail() {
282 this.outerVisible = true; 299 this.outerVisible = true;
283 }, 300 },
284 301
285 - dialogClose(flag = false) { 302 + dialogClose() {
286 this.outerVisible = false; 303 this.outerVisible = false;
287 - if (flag) {
288 - this.search(0);
289 - }
290 }, 304 },
291 //分页 305 //分页
292 currentChange(val) { 306 currentChange(val) {
......
...@@ -109,14 +109,12 @@ ...@@ -109,14 +109,12 @@
109 </el-row> 109 </el-row>
110 </el-form> 110 </el-form>
111 <div style="height: 20px"></div> 111 <div style="height: 20px"></div>
112 - <!-- :maxHeight="tableMaxheight + 'px'" -->
113 <Table 112 <Table
114 class="fedexDetialTable fedexSreachTable" 113 class="fedexDetialTable fedexSreachTable"
115 ref="entryTable" 114 ref="entryTable"
116 :data="tableData" 115 :data="tableData"
117 :headerData="headerData" 116 :headerData="headerData"
118 - :height="tableMaxheight + 'px'" 117 + :maxHeight="tableMaxheight"
119 - :maxHeight="tableMaxheight + 'px'"
120 :border="true" 118 :border="true"
121 :pagination="true" 119 :pagination="true"
122 :order="false" 120 :order="false"
...@@ -225,26 +223,19 @@ export default { ...@@ -225,26 +223,19 @@ export default {
225 loadings: { 223 loadings: {
226 searchLoading: false, 224 searchLoading: false,
227 }, 225 },
228 - tableMaxheight: 500, 226 + tableMaxheight: null,
229 statusList: [], 227 statusList: [],
230 }; 228 };
231 }, 229 },
232 created() { 230 created() {
233 this.search(0); 231 this.search(0);
234 - this.calculateTableHeight(); 232 + this.tableMaxheight = window.innerHeight - 300;
235 }, 233 },
236 mounted() { 234 mounted() {
237 - this.tableMaxheight = window.innerHeight - 300;
238 this.fetchStatusList(); 235 this.fetchStatusList();
239 - window.addEventListener("resize", this.calculateTableHeight);
240 - },
241 - beforeDestroy() {
242 - window.removeEventListener("resize", this.calculateTableHeight);
243 }, 236 },
237 +
244 methods: { 238 methods: {
245 - calculateTableHeight() {
246 - this.tableMaxheight = window.innerHeight - 300;
247 - },
248 fetchStatusList() { 239 fetchStatusList() {
249 getDictData({ doctCode: "RESPONSE_STATE" }) 240 getDictData({ doctCode: "RESPONSE_STATE" })
250 .then((res) => { 241 .then((res) => {
......
...@@ -270,8 +270,7 @@ ...@@ -270,8 +270,7 @@
270 ref="entryTable" 270 ref="entryTable"
271 :data="tableData" 271 :data="tableData"
272 :headerData="headerData" 272 :headerData="headerData"
273 - :height="tableMaxheight + 'px'" 273 + :maxHeight="tableMaxheight"
274 - :maxHeight="tableMaxheight + 'px'"
275 :border="true" 274 :border="true"
276 :pagination="true" 275 :pagination="true"
277 :order="false" 276 :order="false"
...@@ -667,7 +666,7 @@ export default { ...@@ -667,7 +666,7 @@ export default {
667 arrivalInLoading: false, // 运抵单申报加载状态 666 arrivalInLoading: false, // 运抵单申报加载状态
668 }, 667 },
669 textareaVisible: {}, 668 textareaVisible: {},
670 - tableMaxheight: 500, 669 + tableMaxheight: null,
671 outerVisible: false, 670 outerVisible: false,
672 dropdownName: "一键申报", 671 dropdownName: "一键申报",
673 dropdownCode: "full", 672 dropdownCode: "full",
...@@ -684,8 +683,6 @@ export default { ...@@ -684,8 +683,6 @@ export default {
684 }; 683 };
685 }, 684 },
686 created() { 685 created() {
687 - this.calculateTableHeight();
688 -
689 try { 686 try {
690 if (this.$route.query.billNo && this.$route.query.search == "true") { 687 if (this.$route.query.billNo && this.$route.query.search == "true") {
691 this.sreachFormData.billNo = this.$route.query.billNo; 688 this.sreachFormData.billNo = this.$route.query.billNo;
...@@ -695,14 +692,13 @@ export default { ...@@ -695,14 +692,13 @@ export default {
695 console.log(error); 692 console.log(error);
696 } finally { 693 } finally {
697 this.search(0); 694 this.search(0);
695 + this.tableMaxheight = window.innerHeight - 300;
698 } 696 }
699 }, 697 },
700 mounted() { 698 mounted() {
701 - window.addEventListener("resize", this.calculateTableHeight); 699 + console.log(this.tableMaxheight);
702 - },
703 - beforeDestroy() {
704 - window.removeEventListener("resize", this.calculateTableHeight);
705 }, 700 },
701 +
706 watch: { 702 watch: {
707 $route(val, oldval) { 703 $route(val, oldval) {
708 this.popoverClose(); 704 this.popoverClose();
...@@ -755,9 +751,7 @@ export default { ...@@ -755,9 +751,7 @@ export default {
755 this.search(0); 751 this.search(0);
756 } 752 }
757 }, 753 },
758 - calculateTableHeight() { 754 +
759 - this.tableMaxheight = window.innerHeight - 300;
760 - },
761 //查询申报数据 755 //查询申报数据
762 search(val) { 756 search(val) {
763 this.loadings.sreachLoading = true; 757 this.loadings.sreachLoading = true;
......
...@@ -194,8 +194,7 @@ ...@@ -194,8 +194,7 @@
194 ref="entryTable" 194 ref="entryTable"
195 :data="tableData" 195 :data="tableData"
196 :headerData="headerData" 196 :headerData="headerData"
197 - :height="tableMaxheight + 'px'" 197 + :maxHeight="tableMaxheight"
198 - :maxHeight="tableMaxheight + 'px'"
199 :border="true" 198 :border="true"
200 :pagination="true" 199 :pagination="true"
201 :order="false" 200 :order="false"
...@@ -373,28 +372,20 @@ export default { ...@@ -373,28 +372,20 @@ export default {
373 formItemconsignmentCode: false, 372 formItemconsignmentCode: false,
374 formItemconsignmentHeadCode: false, 373 formItemconsignmentHeadCode: false,
375 }, 374 },
376 - tableMaxheight: 500, 375 + tableMaxheight: null,
377 }; 376 };
378 }, 377 },
379 created() { 378 created() {
380 this.search(0); 379 this.search(0);
381 - this.calculateTableHeight(); 380 + this.tableMaxheight = window.innerHeight - 300;
382 - },
383 - mounted() {
384 - window.addEventListener("resize", this.calculateTableHeight);
385 - },
386 - beforeDestroy() {
387 - window.removeEventListener("resize", this.calculateTableHeight);
388 }, 381 },
382 +
389 watch: { 383 watch: {
390 $route() { 384 $route() {
391 this.popoverClose(); 385 this.popoverClose();
392 }, 386 },
393 }, 387 },
394 methods: { 388 methods: {
395 - calculateTableHeight() {
396 - this.tableMaxheight = window.innerHeight - 300;
397 - },
398 //查询 389 //查询
399 search(val) { 390 search(val) {
400 this.loadings.searchLoading = true; 391 this.loadings.searchLoading = true;
......