Fedex / EcomWeb

Go to a project
Toggle navigation Toggle navigation pinning
zhanbo.xu
1cce866c 1 parent 4918ad6e

feat: 根据需求优化和开发

Inline Side-by-side
Showing 10 changed files with 747 additions and 390 deletions
No preview for this file type
...@@ -235,7 +235,7 @@ ...@@ -235,7 +235,7 @@
235 } 235 }
236 236
237 .entrySave { 237 .entrySave {
238 - margin-top: 64px; 238 + margin-top: 50px;
239 text-align: center; 239 text-align: center;
240 240
241 .el-button { 241 .el-button {
......
1 -@import './variables.scss'; 1 +@import "./variables.scss";
2 -@import './mixin.scss'; 2 +@import "./mixin.scss";
3 -@import './transition.scss'; 3 +@import "./transition.scss";
4 -@import './element-ui.scss'; 4 +@import "./element-ui.scss";
5 -@import './sidebar.scss'; 5 +@import "./sidebar.scss";
6 -@import './btn.scss'; 6 +@import "./btn.scss";
7 7
8 @font-face { 8 @font-face {
9 font-family: FedExSans; 9 font-family: FedExSans;
10 font-style: normal; 10 font-style: normal;
11 font-weight: 300; 11 font-weight: 300;
12 - src: url('../fonts/FedExSans_W-Light.woff') format("woff") 12 + src: url("../fonts/FedExSans_W-Light.woff") format("woff");
13 } 13 }
14 14
15 @font-face { 15 @font-face {
16 font-family: FedExSans; 16 font-family: FedExSans;
17 font-style: normal; 17 font-style: normal;
18 font-weight: 400; 18 font-weight: 400;
19 - src: url('../fonts/FedExSans_W-Regular.woff') format("woff") 19 + src: url("../fonts/FedExSans_W-Regular.woff") format("woff");
20 } 20 }
21 21
22 -
23 @font-face { 22 @font-face {
24 font-family: FedExSans; 23 font-family: FedExSans;
25 font-style: normal; 24 font-style: normal;
26 font-weight: 700; 25 font-weight: 700;
27 - src: url('../fonts/FedExSans_W-Bold.woff') format("woff") 26 + src: url("../fonts/FedExSans_W-Bold.woff") format("woff");
28 } 27 }
29 28
30 @font-face { 29 @font-face {
31 font-family: FedExSansArabic; 30 font-family: FedExSansArabic;
32 font-style: normal; 31 font-style: normal;
33 font-weight: 700; 32 font-weight: 700;
34 - src: url('../fonts/FedExSans_W-Bold.woff') format("woff") 33 + src: url("../fonts/FedExSans_W-Bold.woff") format("woff");
35 } 34 }
36 35
37 @font-face { 36 @font-face {
38 font-family: FedExSansArabic; 37 font-family: FedExSansArabic;
39 font-style: normal; 38 font-style: normal;
40 font-weight: 300; 39 font-weight: 300;
41 - src: url('../fonts/FedExSans_W-Light.woff') format("woff") 40 + src: url("../fonts/FedExSans_W-Light.woff") format("woff");
42 } 41 }
43 42
44 @font-face { 43 @font-face {
45 font-family: FedExSansArabic; 44 font-family: FedExSansArabic;
46 font-style: normal; 45 font-style: normal;
47 font-weight: 400; 46 font-weight: 400;
48 - src: url('../fonts/FedExSans_W-Regular.woff') format("woff") 47 + src: url("../fonts/FedExSans_W-Regular.woff") format("woff");
48 +}
49 +
50 +@font-face {
51 + font-family: "iconfont";
52 + font-style: normal;
53 + font-weight: 200;
54 + src: url("../fonts/fedex_table_fonticon.ttf?t=1748505224980")
55 + format("truetype");
49 } 56 }
50 57
51 html, 58 html,
...@@ -160,7 +167,8 @@ aside { ...@@ -160,7 +167,8 @@ aside {
160 display: block; 167 display: block;
161 line-height: 32px; 168 line-height: 32px;
162 font-size: 16px; 169 font-size: 16px;
163 - font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif; 170 + font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen,
171 + Ubuntu, Cantarell, "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif;
164 color: #2c3e50; 172 color: #2c3e50;
165 -webkit-font-smoothing: antialiased; 173 -webkit-font-smoothing: antialiased;
166 -moz-osx-font-smoothing: grayscale; 174 -moz-osx-font-smoothing: grayscale;
...@@ -190,7 +198,7 @@ aside { ...@@ -190,7 +198,7 @@ aside {
190 } 198 }
191 199
192 .text-center { 200 .text-center {
193 - text-align: center 201 + text-align: center;
194 } 202 }
195 203
196 .sub-navbar { 204 .sub-navbar {
...@@ -201,7 +209,13 @@ aside { ...@@ -201,7 +209,13 @@ aside {
201 text-align: right; 209 text-align: right;
202 padding-right: 20px; 210 padding-right: 20px;
203 transition: 600ms ease position; 211 transition: 600ms ease position;
204 - background: linear-gradient(90deg, rgba(32, 182, 249, 1) 0%, rgba(32, 182, 249, 1) 0%, rgba(33, 120, 241, 1) 100%, rgba(33, 120, 241, 1) 100%); 212 + background: linear-gradient(
213 + 90deg,
214 + rgba(32, 182, 249, 1) 0%,
215 + rgba(32, 182, 249, 1) 0%,
216 + rgba(33, 120, 241, 1) 100%,
217 + rgba(33, 120, 241, 1) 100%
218 + );
205 219
206 .subtitle { 220 .subtitle {
207 font-size: 20px; 221 font-size: 20px;
...@@ -246,7 +260,6 @@ aside { ...@@ -246,7 +260,6 @@ aside {
246 z-index: 1000 !important; 260 z-index: 1000 !important;
247 } 261 }
248 262
249 - 263 +.el-checkbox__input.is-checked + .el-checkbox__label {
250 -.el-checkbox__input.is-checked+.el-checkbox__label {
251 color: #333333 !important; 264 color: #333333 !important;
252 } 265 }
......
...@@ -45,32 +45,6 @@ ...@@ -45,32 +45,6 @@
45 > 45 >
46 </el-table-column> 46 </el-table-column>
47 </el-table> 47 </el-table>
48 - <!-- <Table
49 - class="fedexDetialTable mt20"
50 - :data="rowData.popoverData"
51 - :headerData="receiptDataHead"
52 - :selection="false"
53 - :selectFixed="false"
54 - :order="false"
55 - :border="true"
56 - :rowSelectDataType="false"
57 - :pagination="false"
58 - :page="1"
59 - :totalCount="0"
60 - :loading="tableLoading"
61 - :emptyText="
62 - loadingDatas &&
63 - rowData &&
64 - rowData.popoverData &&
65 - !rowData.popoverData.length
66 - ? '数据加载中'
67 - : $t('portEntry.emptyText')
68 - "
69 - :height="tableHeight"
70 - :maxHeight="tableHeight"
71 - rowKey="id"
72 - >
73 - </Table> -->
74 </div> 48 </div>
75 <el-button 49 <el-button
76 slot="reference" 50 slot="reference"
......
1 export default { 1 export default {
2 returnStatus: [ 2 returnStatus: [
3 - { code: 'RECEIPT_CUSTOMS_CLEARANCE', name: '结关', value: '899' }, 3 + { code: "RECEIPT_CUSTOMS_CLEARANCE", name: "结关", value: "899" },
4 - { code: 'RECEIPT_RELEASE', name: '放行', value: '800' }, 4 + { code: "RECEIPT_RELEASE", name: "放行", value: "800" },
5 - { code: 'RECEIPT_MANUAL_REVIEW', name: '人工审核', value: '300' }, 5 + { code: "RECEIPT_MANUAL_REVIEW", name: "人工审核", value: "300" },
6 - { code: 'RECEIPT_CUSTOMS_WAREHOUSING', name: '海关入库', value: '120' }, 6 + { code: "RECEIPT_CUSTOMS_WAREHOUSING", name: "海关入库", value: "120" },
7 - { code: 'RECEIPT_AUDIT_COMPLETED', name: '海关审结', value: '399' }, 7 + { code: "RECEIPT_AUDIT_COMPLETED", name: "海关审结", value: "399" },
8 - { code: 'RECEIPT_CUSTOMS_REFUND', name: '海关退单', value: '100' }, 8 + { code: "RECEIPT_CUSTOMS_REFUND", name: "海关退单", value: "100" },
9 - { code: 'RECEIPT_FAIL_SEND', name: '发送海关失败', value: '4' }, 9 + { code: "RECEIPT_FAIL_SEND", name: "发送海关失败", value: "4" },
10 - { code: 'RECEIPT_SUCCESSFULLY_SENT', name: '发送海关成功', value: '3' }, 10 + { code: "RECEIPT_SUCCESSFULLY_SENT", name: "发送海关成功", value: "3" },
11 - { code: 'RECEIPT_DECLARE_IN_PROGRESS', name: '电子口岸申报中', value: '2' }, 11 + { code: "RECEIPT_DECLARE_IN_PROGRESS", name: "电子口岸申报中", value: "2" },
12 - { code: 'RECEIPT_TEMPORARILY_STORE', name: '电子口岸已暂存', value: '1' }, 12 + { code: "RECEIPT_TEMPORARILY_STORE", name: "电子口岸已暂存", value: "1" },
13 ], 13 ],
14 appType: [ 14 appType: [
15 - { code: 'DECLARE_APPTYPE_CHANGE', name: '变更', value: '2' }, 15 + { code: "DECLARE_APPTYPE_CHANGE", name: "变更", value: "2" },
16 - { code: 'DECLARE_APPTYPE_ADD', name: '新增', value: '1' }, 16 + { code: "DECLARE_APPTYPE_ADD", name: "新增", value: "1" },
17 ], 17 ],
18 currency: [ 18 currency: [
19 - { code: 'AED', name: '阿联酋迪拉姆', value: '138' }, 19 + { code: "AED", name: "阿联酋迪拉姆", value: "138" },
20 - { code: 'ZAR', name: '南非兰特', value: '244' }, 20 + { code: "ZAR", name: "南非兰特", value: "244" },
21 - { code: 'CAD', name: '加拿大元', value: '501' }, 21 + { code: "CAD", name: "加拿大元", value: "501" },
22 - { code: 'CHF', name: '瑞士法郎', value: '331' }, 22 + { code: "CHF", name: "瑞士法郎", value: "331" },
23 - { code: 'CNY', name: '人民币', value: '142' }, 23 + { code: "CNY", name: "人民币", value: "142" },
24 - { code: 'DKK', name: '丹麦克朗', value: '302' }, 24 + { code: "DKK", name: "丹麦克朗", value: "302" },
25 - { code: 'EUR', name: '欧元', value: '300' }, 25 + { code: "EUR", name: "欧元", value: "300" },
26 - { code: 'GBP', name: '英镑', value: '303' }, 26 + { code: "GBP", name: "英镑", value: "303" },
27 - { code: 'HKD', name: '港币', value: '110' }, 27 + { code: "HKD", name: "港币", value: "110" },
28 - { code: 'HUF', name: '匈牙利福林', value: '321' }, 28 + { code: "HUF", name: "匈牙利福林", value: "321" },
29 - { code: 'JPY', name: '日本元', value: '116' }, 29 + { code: "JPY", name: "日本元", value: "116" },
30 - { code: 'KRW', name: '韩国圆', value: '133' }, 30 + { code: "KRW", name: "韩国圆", value: "133" },
31 - { code: 'MOP', name: '澳门元', value: '121' }, 31 + { code: "MOP", name: "澳门元", value: "121" },
32 - { code: 'MXN', name: '墨西哥比索', value: '429' }, 32 + { code: "MXN", name: "墨西哥比索", value: "429" },
33 - { code: 'MYR', name: '马来西亚林吉特', value: '122' }, 33 + { code: "MYR", name: "马来西亚林吉特", value: "122" },
34 ], 34 ],
35 unit: [ 35 unit: [
36 { 36 {
37 - "code": "083", 37 + code: "083",
38 - "name": "盎司" 38 + name: "盎司",
39 }, 39 },
40 { 40 {
41 - 41 + code: "016",
42 - "code": "016", 42 + name: "把",
43 - "name": "把" 43 + },
44 + {
45 + code: "042",
46 + name: "百把",
47 + },
48 + {
49 + code: "040",
50 + name: "百副",
51 + },
52 + {
53 + code: "043",
54 + name: "百个",
55 + },
56 + {
57 + code: "044",
58 + name: "百片",
59 + },
60 + {
61 + code: "149",
62 + name: "百万贝可",
63 + },
64 + {
65 + code: "049",
66 + name: "百枝",
67 + },
68 + {
69 + code: "041",
70 + name: "百支",
71 + },
72 + {
73 + code: "076",
74 + name: "磅",
75 + },
76 + {
77 + code: "125",
78 + name: "包",
44 }, 79 },
45 { 80 {
46 - "code": "042", 81 + code: "132",
47 - "name": "百把" 82 + name: "本",
48 }, 83 },
49 { 84 {
50 - "code": "040", 85 + code: "163",
51 - "name": "百副" 86 + name: "部",
52 }, 87 },
53 { 88 {
54 - "code": "043", 89 + code: "131",
55 - "name": "百个" 90 + name: "册",
56 }, 91 },
57 { 92 {
58 - "code": "044", 93 + code: "071",
59 - "name": "百片" 94 + name: "长吨",
60 }, 95 },
61 { 96 {
62 - "code": "149", 97 + code: "089",
63 - "name": "百万贝可" 98 + name: "寸",
64 }, 99 },
65 { 100 {
66 - "code": "049", 101 + code: "127",
67 - "name": "百枝" 102 + name: "打",
68 }, 103 },
69 { 104 {
70 - "code": "041", 105 + code: "136",
71 - "name": "百支" 106 + name: "袋",
72 }, 107 },
73 { 108 {
74 - "code": "076", 109 + code: "077",
75 - "name": "磅" 110 + name: "担",
76 }, 111 },
77 { 112 {
78 - "code": "125", 113 + code: "045",
79 - "name": "包" 114 + name: "刀",
80 }, 115 },
81 { 116 {
82 - "code": "132", 117 + code: "079",
83 - "name": "本" 118 + name: "短担",
84 }, 119 },
85 { 120 {
86 - "code": "163", 121 + code: "072",
87 - "name": "部" 122 + name: "短吨",
88 }, 123 },
89 { 124 {
90 - "code": "131", 125 + code: "026",
91 - "name": "册" 126 + name: "对",
92 }, 127 },
93 { 128 {
94 - "code": "071", 129 + code: "070",
95 - "name": "长吨" 130 + name: "吨",
96 }, 131 },
97 { 132 {
98 - "code": "089", 133 + code: "133",
99 - "name": "寸" 134 + name: "发",
100 }, 135 },
101 { 136 {
102 - "code": "127", 137 + code: "022",
103 - "name": "打" 138 + name: "份",
104 }, 139 },
105 { 140 {
106 - "code": "136", 141 + code: "023",
107 - "name": "袋" 142 + name: "幅",
108 }, 143 },
109 { 144 {
110 - "code": "077", 145 + code: "019",
111 - "name": "担" 146 + name: "副",
112 }, 147 },
113 { 148 {
114 - "code": "045", 149 + code: "007",
115 - "name": "刀" 150 + name: "个",
116 }, 151 },
117 { 152 {
118 - "code": "079", 153 + code: "014",
119 - "name": "短担" 154 + name: "根",
120 }, 155 },
121 { 156 {
122 - "code": "072", 157 + code: "047",
123 - "name": "短吨" 158 + name: "公担",
124 }, 159 },
125 { 160 {
126 - "code": "026", 161 + code: "116",
127 - "name": "对" 162 + name: "公制马力",
128 }, 163 },
129 { 164 {
130 - "code": "070", 165 + code: "122",
131 - "name": "吨" 166 + name: "罐",
132 }, 167 },
133 { 168 {
134 - "code": "133", 169 + code: "096",
135 - "name": "发" 170 + name: "毫升",
136 }, 171 },
137 { 172 {
138 - "code": "022", 173 + code: "141",
139 - "name": "份" 174 + name: "合",
140 }, 175 },
141 { 176 {
142 - "code": "023", 177 + code: "140",
143 - "name": "幅" 178 + name: "盒",
144 }, 179 },
145 { 180 {
146 - "code": "019", 181 + code: "005",
147 - "name": "副" 182 + name: "架",
148 }, 183 },
149 { 184 {
150 - "code": "007", 185 + code: "011",
151 - "name": "个" 186 + name: "件",
152 }, 187 },
153 { 188 {
154 - "code": "014", 189 + code: "075",
155 - "name": "根" 190 + name: "斤",
156 }, 191 },
157 { 192 {
158 - "code": "047", 193 + code: "029",
159 - "name": "公担" 194 + name: "井",
160 }, 195 },
161 { 196 {
162 - "code": "116", 197 + code: "039",
163 - "name": "公制马力" 198 + name: "具",
164 }, 199 },
165 { 200 {
166 - "code": "122", 201 + code: "018",
167 - "name": "罐" 202 + name: "卷",
168 }, 203 },
169 { 204 {
170 - "code": "096", 205 + code: "027",
171 - "name": "毫升" 206 + name: "棵",
172 }, 207 },
173 { 208 {
174 - "code": "141", 209 + code: "036",
175 - "name": "合" 210 + name: "克",
176 }, 211 },
177 { 212 {
178 - "code": "140", 213 + code: "084",
179 - "name": "盒" 214 + name: "克拉",
180 }, 215 },
181 { 216 {
182 - "code": "005", 217 + code: "017",
183 - "name": "架" 218 + name: "块",
184 }, 219 },
185 { 220 {
186 - "code": "011", 221 + code: "128",
187 - "name": "件" 222 + name: "筐",
188 }, 223 },
189 { 224 {
190 - "code": "075", 225 + code: "135",
191 - "name": "斤" 226 + name: "捆",
192 }, 227 },
193 { 228 {
194 - "code": "029", 229 + code: "101",
195 - "name": "井" 230 + name: "立方尺",
196 }, 231 },
197 { 232 {
198 - "code": "039", 233 + code: "033",
199 - "name": "具" 234 + name: "立方米",
200 }, 235 },
201 { 236 {
202 - "code": "018", 237 + code: "099",
203 - "name": "卷" 238 + name: "立方英尺",
204 }, 239 },
205 { 240 {
206 - "code": "027", 241 + code: "139",
207 - "name": "棵" 242 + name: "粒",
208 }, 243 },
209 { 244 {
210 - "code": "036", 245 + code: "080",
211 - "name": "克" 246 + name: "两",
212 }, 247 },
213 { 248 {
214 - "code": "084", 249 + code: "003",
215 - "name": "克拉" 250 + name: "辆",
216 }, 251 },
217 { 252 {
218 - "code": "017", 253 + code: "118",
219 - "name": "块" 254 + name: "令",
220 }, 255 },
221 { 256 {
222 - "code": "128", 257 + code: "129",
223 - "name": "筐" 258 + name: "罗",
224 }, 259 },
225 { 260 {
226 - "code": "135", 261 + code: "126",
227 - "name": "捆" 262 + name: "箩",
228 }, 263 },
229 { 264 {
230 - "code": "101", 265 + code: "086",
231 - "name": "立方尺" 266 + name: "码",
232 }, 267 },
233 { 268 {
234 - "code": "033", 269 + code: "134",
235 - "name": "立方米" 270 + name: "枚",
236 }, 271 },
237 { 272 {
238 - "code": "099", 273 + code: "098",
239 - "name": "立方英尺" 274 + name: "美加仑",
240 }, 275 },
241 { 276 {
242 - "code": "139", 277 + code: "030",
243 - "name": "粒" 278 + name: "米",
244 }, 279 },
245 { 280 {
246 - "code": "080", 281 + code: "031",
247 - "name": "两" 282 + name: "盘",
248 }, 283 },
249 { 284 {
250 - "code": "003", 285 + code: "037",
251 - "name": "辆" 286 + name: "盆",
252 }, 287 },
253 { 288 {
254 - "code": "118", 289 + code: "121",
255 - "name": "令" 290 + name: "批",
256 }, 291 },
257 { 292 {
258 - "code": "129", 293 + code: "130",
259 - "name": "罗" 294 + name: "匹",
260 }, 295 },
261 { 296 {
262 - "code": "126", 297 + code: "020",
263 - "name": "箩" 298 + name: "片",
264 }, 299 },
265 { 300 {
266 - "code": "086", 301 + code: "112",
267 - "name": "码" 302 + name: "平方尺",
268 }, 303 },
269 { 304 {
270 - "code": "134", 305 + code: "110",
271 - "name": "枚" 306 + name: "平方码",
272 }, 307 },
273 { 308 {
274 - "code": "098", 309 + code: "032",
275 - "name": "美加仑" 310 + name: "平方米",
276 }, 311 },
277 { 312 {
278 - "code": "030", 313 + code: "111",
279 - "name": "米" 314 + name: "平方英尺",
280 }, 315 },
281 { 316 {
282 - "code": "031", 317 + code: "142",
283 - "name": "盘" 318 + name: "瓶",
284 }, 319 },
285 { 320 {
286 - "code": "037", 321 + code: "060",
287 - "name": "盆" 322 + name: "千伏安",
288 }, 323 },
289 { 324 {
290 - "code": "121", 325 + code: "054",
291 - "name": "批" 326 + name: "千个",
292 }, 327 },
293 { 328 {
294 - "code": "130", 329 + code: "052",
295 - "name": "匹" 330 + name: "千盒",
296 }, 331 },
297 { 332 {
298 - "code": "020", 333 + code: "035",
299 - "name": "片" 334 + name: "千克",
300 }, 335 },
301 { 336 {
302 - "code": "112", 337 + code: "051",
303 - "name": "平方尺" 338 + name: "千块",
304 }, 339 },
305 { 340 {
306 - "code": "110", 341 + code: "146",
307 - "name": "平方码" 342 + name: "千粒",
308 }, 343 },
309 { 344 {
310 - "code": "032", 345 + code: "147",
311 - "name": "平方米" 346 + name: "千米",
312 }, 347 },
313 { 348 {
314 - "code": "111", 349 + code: "063",
315 - "name": "平方英尺" 350 + name: "千升",
316 }, 351 },
317 { 352 {
318 - "code": "142", 353 + code: "061",
319 - "name": "瓶" 354 + name: "千瓦",
320 }, 355 },
321 { 356 {
322 - "code": "060", 357 + code: "062",
323 - "name": "千伏安" 358 + ext6: "KWH",
359 + name: "千瓦时",
324 }, 360 },
325 { 361 {
326 - "code": "054", 362 + code: "148",
327 - "name": "千个" 363 + name: "千英尺",
328 }, 364 },
329 { 365 {
330 - "code": "052", 366 + code: "058",
331 - "name": "千盒" 367 + name: "千张",
332 }, 368 },
333 { 369 {
334 - "code": "035", 370 + code: "053",
335 - "name": "千克" 371 + name: "千枝",
336 }, 372 },
337 { 373 {
338 - "code": "051", 374 + code: "143",
339 - "name": "千块" 375 + name: "千支",
340 }, 376 },
341 { 377 {
342 - "code": "146", 378 + code: "050",
343 - "name": "千粒" 379 + name: "千只",
344 }, 380 },
345 { 381 {
346 - "code": "147", 382 + code: "170",
347 - "name": "千米" 383 + name: "人份",
348 }, 384 },
349 { 385 {
350 - "code": "063", 386 + code: "048",
351 - "name": "千升" 387 + name: "扇",
352 }, 388 },
353 { 389 {
354 - "code": "061", 390 + code: "095",
355 - "name": "千瓦" 391 + name: "升",
356 }, 392 },
357 { 393 {
358 - "code": "062", 394 + code: "085",
359 - "ext6": "KWH", 395 + name: "市尺",
360 - "name": "千瓦时"
361 }, 396 },
362 { 397 {
363 - "code": "148", 398 + code: "081",
364 - "name": "千英尺" 399 + name: "市担",
365 }, 400 },
366 { 401 {
367 - "code": "058", 402 + code: "025",
368 - "name": "千张" 403 + name: "双",
369 }, 404 },
370 { 405 {
371 - "code": "053", 406 + code: "073",
372 - "name": "千枝" 407 + name: "司马担",
373 }, 408 },
374 { 409 {
375 - "code": "143", 410 + code: "074",
376 - "name": "千支" 411 + name: "司马斤",
377 }, 412 },
378 { 413 {
379 - "code": "050", 414 + code: "004",
380 - "name": "千只" 415 + name: "艘",
381 }, 416 },
382 { 417 {
383 - "code": "170", 418 + code: "001",
384 - "name": "人份" 419 + name: "台",
385 }, 420 },
386 { 421 {
387 - "code": "048", 422 + code: "006",
388 - "name": "扇" 423 + name: "套",
389 }, 424 },
390 { 425 {
391 - "code": "095", 426 + code: "015",
392 - "name": "升" 427 + name: "条",
393 }, 428 },
394 { 429 {
395 - "code": "085", 430 + code: "123",
396 - "name": "市尺" 431 + name: "桶",
397 }, 432 },
398 { 433 {
399 - "code": "081", 434 + code: "034",
400 - "name": "市担" 435 + name: "筒",
401 }, 436 },
402 { 437 {
403 - "code": "025", 438 + code: "009",
404 - "name": "双" 439 + name: "头",
405 }, 440 },
406 { 441 {
407 - "code": "073", 442 + code: "038",
408 - "name": "司马担" 443 + name: "万个",
409 }, 444 },
410 { 445 {
411 - "code": "074", 446 + code: "145",
412 - "name": "司马斤" 447 + name: "万粒",
413 }, 448 },
414 { 449 {
415 - "code": "004", 450 + code: "144",
416 - "name": "艘" 451 + name: "万双",
417 }, 452 },
418 { 453 {
419 - "code": "001", 454 + code: "057",
420 - "name": "台" 455 + name: "万套",
421 }, 456 },
422 { 457 {
423 - "code": "006", 458 + code: "059",
424 - "name": "套" 459 + name: "万张",
425 }, 460 },
426 { 461 {
427 - "code": "015", 462 + code: "120",
428 - "name": "条" 463 + name: "箱",
429 }, 464 },
430 { 465 {
431 - "code": "123", 466 + code: "056",
432 - "name": "桶" 467 + name: "亿个",
433 }, 468 },
434 { 469 {
435 - "code": "034", 470 + code: "055",
436 - "name": "筒" 471 + name: "亿支",
437 }, 472 },
438 { 473 {
439 - "code": "009", 474 + code: "067",
440 - "name": "头" 475 + name: "英尺",
441 }, 476 },
442 { 477 {
443 - "code": "038", 478 + code: "088",
444 - "name": "万个" 479 + name: "英寸",
445 }, 480 },
446 { 481 {
447 - "code": "145", 482 + code: "078",
448 - "name": "万粒" 483 + name: "英担",
449 }, 484 },
450 { 485 {
451 - "code": "144", 486 + code: "097",
452 - "name": "万双" 487 + name: "英加仑",
453 }, 488 },
454 { 489 {
455 - "code": "057", 490 + code: "115",
456 - "name": "万套" 491 + name: "英制马力",
457 }, 492 },
458 { 493 {
494 + code: "124",
495 + name: "扎",
496 + },
497 + {
498 + code: "010",
499 + name: "张",
500 + },
501 + {
502 + code: "013",
503 + name: "枝",
504 + },
505 + {
506 + code: "012",
507 + name: "支",
508 + },
509 + {
510 + code: "008",
511 + name: "只",
512 + },
513 + {
514 + code: "028",
515 + name: "株",
516 + },
517 + {
518 + code: "021",
519 + name: "组",
520 + },
521 + {
522 + code: "002",
523 + name: "座",
524 + },
525 + {
526 + code: "046",
527 + name: "疋",
528 + },
529 + ],
530 +};
459 531
460 - "code": "059", 532 +export const receiptStatus = () => {
461 - "name": "万张" 533 + return [
534 + {
535 + text: "未提交",
536 + value: "99999",
462 }, 537 },
463 { 538 {
464 - "code": "120", 539 + text: "已提交",
465 - "name": "箱" 540 + value: "0",
466 }, 541 },
467 { 542 {
468 - "code": "056", 543 + text: "xml报文加签失败",
469 - "name": "亿个" 544 + value: "-2",
470 }, 545 },
471 { 546 {
472 - "code": "055", 547 + text: "xml报文上传失败",
473 - "name": "亿支" 548 + value: "-3",
474 }, 549 },
475 { 550 {
476 - "code": "067", 551 + text: "电子口岸申报中",
477 - "name": "英尺" 552 + value: "2",
478 }, 553 },
479 { 554 {
480 - "code": "088", 555 + text: "发送海关成功",
481 - "name": "英寸" 556 + value: "3",
482 }, 557 },
483 { 558 {
484 - "code": "078", 559 + text: "发送海关失败",
485 - "name": "英担" 560 + value: "4",
486 }, 561 },
487 { 562 {
488 - "code": "097", 563 + text: "海关退单",
489 - "name": "英加仑" 564 + value: "100",
490 }, 565 },
491 { 566 {
492 - "code": "115", 567 + text: "海关入库",
493 - "name": "英制马力" 568 + value: "120",
494 }, 569 },
495 { 570 {
496 - "code": "124", 571 + text: "回执异常",
497 - "name": "扎" 572 + value: "-1",
573 + },
574 + ];
575 +};
576 +
577 +export const listStatus = () => {
578 + return [
579 + {
580 + text: "未提交",
581 + value: "99999",
582 + },
583 + {
584 + text: "已提交",
585 + value: "0",
498 }, 586 },
499 { 587 {
500 - "code": "010", 588 + text: "xml报文加签失败",
501 - "name": "张" 589 + value: "-2",
502 }, 590 },
503 { 591 {
504 - "code": "013", 592 + text: "xml报文上传失败",
505 - "name": "枝" 593 + value: "-3",
506 }, 594 },
507 { 595 {
508 - "code": "012", 596 + text: "电子口岸申报中",
509 - "name": "支" 597 + value: "2",
510 }, 598 },
511 { 599 {
512 - "code": "008", 600 + text: "发送海关成功",
513 - "name": "只" 601 + value: "3",
514 }, 602 },
515 { 603 {
516 - "code": "028", 604 + text: "发送海关失败",
517 - "name": "株" 605 + value: "4",
518 }, 606 },
519 { 607 {
520 - "code": "021", 608 + text: "海关退单",
521 - "name": "组" 609 + value: "100",
522 }, 610 },
523 { 611 {
524 - "code": "002", 612 + text: "海关入库",
525 - "name": "座" 613 + value: "120",
526 }, 614 },
527 { 615 {
528 - "code": "046",
529 - "name": "疋"
530 - }
531 - ]
532 -}
...\ No newline at end of file ...\ No newline at end of file
616 + text: "海关审结",
617 + value: "399",
618 + },
619 + {
620 + text: "放行",
621 + value: "800",
622 + },
623 + {
624 + text: "结关",
625 + value: "899",
626 + },
627 + {
628 + text: "回执异常",
629 + value: "-1",
630 + },
631 + ];
632 +};
633 +
634 +export const totalScoreStatus = () => {
635 + return [
636 + {
637 + text: "未提交",
638 + value: "99999",
639 + },
640 + {
641 + text: "已提交",
642 + value: "0",
643 + },
644 + {
645 + text: "xml报文加签失败",
646 + value: "-2",
647 + },
648 + {
649 + text: "xml报文上传失败",
650 + value: "-3",
651 + },
652 + {
653 + text: "电子口岸申报中",
654 + value: "2",
655 + },
656 + {
657 + text: "发送海关成功",
658 + value: "3",
659 + },
660 + {
661 + text: "发送海关失败",
662 + value: "4",
663 + },
664 + {
665 + text: "海关退单",
666 + value: "100",
667 + },
668 + // {
669 + // text: "海关入库",
670 + // value: "120",
671 + // },
672 + {
673 + text: "海关审结",
674 + value: "399",
675 + },
676 + {
677 + text: "放行",
678 + value: "800",
679 + },
680 + {
681 + text: "结关",
682 + value: "899",
683 + },
684 + {
685 + text: "回执异常",
686 + value: "-1",
687 + },
688 + ];
689 +};
......
...@@ -201,21 +201,49 @@ ...@@ -201,21 +201,49 @@
201 {{ scope.row.completedCount }} 201 {{ scope.row.completedCount }}
202 </el-button> 202 </el-button>
203 / 203 /
204 - <el-button type="text" @click.stop="linkChange(scope, 1)"> 204 + <el-button
205 + type="text"
206 + style="margin-left: 0"
207 + @click.stop="linkChange(scope, 1)"
208 + >
205 {{ scope.row.uncompletedCount }} 209 {{ scope.row.uncompletedCount }}
206 </el-button> 210 </el-button>
207 </template> 211 </template>
208 <template v-slot:listDontReleaseCount="scope"> 212 <template v-slot:listDontReleaseCount="scope">
209 - 清单放行：{{ scope.row.listReleaseCount }}/{{ 213 + 清单放行：
210 - scope.row.listDontReleaseCount 214 + <el-button
211 - }} 215 + type="text"
212 - <!-- <el-button type="text" style="margin-left: 0"> 216 + style="margin-left: 0"
217 + @click.stop="linkChange(scope, 3)"
218 + >
213 {{ scope.row.listReleaseCount }} 219 {{ scope.row.listReleaseCount }}
214 </el-button> 220 </el-button>
215 / 221 /
216 - <el-button type="text"> 222 + <el-button
223 + type="text"
224 + style="margin-left: 0"
225 + @click.stop="linkChange(scope, 4)"
226 + >
217 {{ scope.row.listDontReleaseCount }} 227 {{ scope.row.listDontReleaseCount }}
218 - </el-button> --> 228 + </el-button>
229 + </template>
230 + <template v-slot:listDontReleaseCountEnd="scope">
231 + 清单结关：
232 + <el-button
233 + type="text"
234 + style="margin-left: 0"
235 + @click.stop="linkChange(scope, 5)"
236 + >
237 + {{ scope.row.listClearanceCount }}
238 + </el-button>
239 + /
240 + <el-button
241 + type="text"
242 + style="margin-left: 0"
243 + @click.stop="linkChange(scope, 6)"
244 + >
245 + {{ scope.row.listNotClearedCount }}
246 + </el-button>
219 </template> 247 </template>
220 <template v-slot:arrivalInReceiptStatus="scope"> 248 <template v-slot:arrivalInReceiptStatus="scope">
221 <TablePopover 249 <TablePopover
...@@ -322,7 +350,7 @@ import { ...@@ -322,7 +350,7 @@ import {
322 import DialogVue from "./dialog.vue"; 350 import DialogVue from "./dialog.vue";
323 import DataPreview from "../reportingData/data-preview.vue"; 351 import DataPreview from "../reportingData/data-preview.vue";
324 import TimeDialog from "../reportingData/time-dialog.vue"; 352 import TimeDialog from "../reportingData/time-dialog.vue";
325 -import { getPortInfo } from "@/api/system/customer-ai.js"; 353 +import { getCurrUserPortInfo } from "@/api/system/user.js";
326 354
327 export default { 355 export default {
328 name: "SupervisePlaceManage", 356 name: "SupervisePlaceManage",
...@@ -388,6 +416,12 @@ export default { ...@@ -388,6 +416,12 @@ export default {
388 slot: true, 416 slot: true,
389 }, 417 },
390 { 418 {
419 + name: "航班号",
420 + value: "flightNumber",
421 + width: "",
422 + align: "left",
423 + },
424 + {
391 name: "清单审结进度", 425 name: "清单审结进度",
392 value: "listReceiptStatus", 426 value: "listReceiptStatus",
393 width: "", 427 width: "",
...@@ -402,6 +436,13 @@ export default { ...@@ -402,6 +436,13 @@ export default {
402 slot: true, 436 slot: true,
403 }, 437 },
404 { 438 {
439 + name: "清单结关进度",
440 + value: "listDontReleaseCountEnd",
441 + width: "",
442 + align: "left",
443 + slot: true,
444 + },
445 + {
405 name: "清单总分单回执", 446 name: "清单总分单回执",
406 value: "totalReceiptStatus", 447 value: "totalReceiptStatus",
407 width: "", 448 width: "",
...@@ -499,7 +540,7 @@ export default { ...@@ -499,7 +540,7 @@ export default {
499 }, 540 },
500 //获取口岸子字典 541 //获取口岸子字典
501 searchPortDictData() { 542 searchPortDictData() {
502 - getPortInfo() 543 + getCurrUserPortInfo()
503 .then((res) => { 544 .then((res) => {
504 console.log(res); 545 console.log(res);
505 if (res.code === "200") { 546 if (res.code === "200") {
...@@ -567,8 +608,15 @@ export default { ...@@ -567,8 +608,15 @@ export default {
567 }, 608 },
568 // 运单号跳转 609 // 运单号跳转
569 linkChange(record, type) { 610 linkChange(record, type) {
570 - const { billNo, completedLogisticsNo, uncompletedLogisticsNo } = 611 + const {
571 - record.row; 612 + billNo,
613 + completedLogisticsNo,
614 + uncompletedLogisticsNo,
615 + listReleaseLogisticsNo,
616 + listDontReleaseLogisticsNo,
617 + listClearanceLogisticsNo,
618 + listNotClearedLogisticsNo,
619 + } = record.row;
572 const query = { billNo, search: true }; 620 const query = { billNo, search: true };
573 if (+type === 1) { 621 if (+type === 1) {
574 query["logisticsNo"] = uncompletedLogisticsNo; 622 query["logisticsNo"] = uncompletedLogisticsNo;
...@@ -576,6 +624,18 @@ export default { ...@@ -576,6 +624,18 @@ export default {
576 if (+type === 2) { 624 if (+type === 2) {
577 query["logisticsNo"] = completedLogisticsNo; 625 query["logisticsNo"] = completedLogisticsNo;
578 } 626 }
627 + if (+type === 3) {
628 + query["logisticsNo"] = listReleaseLogisticsNo;
629 + }
630 + if (+type === 4) {
631 + query["logisticsNo"] = listDontReleaseLogisticsNo;
632 + }
633 + if (+type === 5) {
634 + query["logisticsNo"] = listClearanceLogisticsNo;
635 + }
636 + if (+type === 6) {
637 + query["logisticsNo"] = listNotClearedLogisticsNo;
638 + }
579 console.log(query, record); 639 console.log(query, record);
580 640
581 this.$router.push({ 641 this.$router.push({
......
...@@ -27,21 +27,87 @@ ...@@ -27,21 +27,87 @@
27 <el-transfer 27 <el-transfer
28 v-model="transferValue" 28 v-model="transferValue"
29 :data="logisticsWaybillDimension" 29 :data="logisticsWaybillDimension"
30 + :right-default-checked="currentItem"
30 filterable 31 filterable
31 target-order="push" 32 target-order="push"
32 :props="{ label: 'itemChineseName', key: 'itemValue' }" 33 :props="{ label: 'itemChineseName', key: 'itemValue' }"
33 :titles="['未选内容', '已选内容']" 34 :titles="['未选内容', '已选内容']"
34 - ></el-transfer> 35 + @right-check-change="choose"
36 + >
37 + <span
38 + class="el-icon-arrow-up"
39 + slot="right-footer"
40 + style="margin-left: 10px; cursor: pointer"
41 + @click="handleUp('transferValue')"
42 + title="上移"
43 + >
44 + </span>
45 + <span
46 + class="el-icon-arrow-down"
47 + slot="right-footer"
48 + style="cursor: pointer; margin-left: 8px"
49 + @click="handleDown('transferValue')"
50 + title="下移"
51 + >
52 + </span>
53 + <!-- <el-button
54 + class="transer-footer"
55 + size="mini"
56 +
57 + >上移</el-button
58 + > -->
59 + <!-- <el-button
60 + class="transer-footer"
61 + slot="right-footer"
62 + size="mini"
63 + @click="handleDown('transferValue')"
64 + >下移</el-button
65 + > -->
66 + </el-transfer>
35 </template> 67 </template>
36 <template v-if="radio === 6"> 68 <template v-if="radio === 6">
37 <el-transfer 69 <el-transfer
38 v-model="transferValue1" 70 v-model="transferValue1"
39 :data="commodityDetailDimension" 71 :data="commodityDetailDimension"
72 + :right-default-checked="currentItem"
40 filterable 73 filterable
41 target-order="push" 74 target-order="push"
42 :props="{ label: 'itemChineseName', key: 'itemValue' }" 75 :props="{ label: 'itemChineseName', key: 'itemValue' }"
43 :titles="['未选内容', '已选内容']" 76 :titles="['未选内容', '已选内容']"
44 - ></el-transfer> 77 + @right-check-change="choose"
78 + >
79 + <span
80 + class="el-icon-arrow-up"
81 + slot="right-footer"
82 + style="margin-left: 10px; cursor: pointer"
83 + @click="handleUp('transferValue1')"
84 + title="上移"
85 + >
86 + </span>
87 + <span
88 + class="el-icon-arrow-down"
89 + slot="right-footer"
90 + style="cursor: pointer; margin-left: 8px"
91 + @click="handleDown('transferValue1')"
92 + title="下移"
93 + >
94 + </span>
95 + <!-- <el-button
96 + class="transer-footer"
97 + slot="right-footer"
98 + style="margin-left: 10px"
99 + size="mini"
100 + @click="handleUp('transferValue1')"
101 + >上移</el-button
102 + >
103 + <el-button
104 + class="transer-footer"
105 + slot="right-footer"
106 + size="mini"
107 + @click="handleDown('transferValue1')"
108 + >下移</el-button
109 + > -->
110 + </el-transfer>
45 </template> 111 </template>
46 </div> 112 </div>
47 <div class="dialogOption entrySave revokeOperation"> 113 <div class="dialogOption entrySave revokeOperation">
...@@ -97,6 +163,7 @@ export default { ...@@ -97,6 +163,7 @@ export default {
97 commodityDetailDimension: [], 163 commodityDetailDimension: [],
98 logisticsWaybillDimension: [], 164 logisticsWaybillDimension: [],
99 historyInfo: {}, 165 historyInfo: {},
166 + currentItem: [],
100 }; 167 };
101 }, 168 },
102 watch: { 169 watch: {
...@@ -104,6 +171,7 @@ export default { ...@@ -104,6 +171,7 @@ export default {
104 if (val) { 171 if (val) {
105 this.customVisible = val; 172 this.customVisible = val;
106 this.getList(); 173 this.getList();
174 + this.radio = 3;
107 } 175 }
108 }, 176 },
109 }, 177 },
...@@ -171,6 +239,7 @@ export default { ...@@ -171,6 +239,7 @@ export default {
171 ? this.historyInfo.commodityDetailDimension 239 ? this.historyInfo.commodityDetailDimension
172 : this.historyInfo.defaultCommodityDetail; 240 : this.historyInfo.defaultCommodityDetail;
173 } 241 }
242 + this.currentItem = [];
174 }, 243 },
175 244
176 formSubmit() { 245 formSubmit() {
...@@ -228,8 +297,62 @@ export default { ...@@ -228,8 +297,62 @@ export default {
228 cancelModify(val) { 297 cancelModify(val) {
229 this.customVisible = false; 298 this.customVisible = false;
230 this.dialogLoading = false; 299 this.dialogLoading = false;
300 + this.currentItem = [];
231 this.$emit("cancelModify", val); 301 this.$emit("cancelModify", val);
232 }, 302 },
303 + //===============
304 + //上移事件
305 + handleUp(key) {
306 + let self = this;
307 + let item = self.currentItem;
308 + let index;
309 + if (item.length == 1) {
310 + self[key].find((val, indexs, arr) => {
311 + if (val == item[0]) {
312 + index = indexs;
313 + }
314 + });
315 + if (index == 0) {
316 + self.msgError("已经到顶了");
317 + return;
318 + }
319 + //改变的数组
320 + let changeItem = JSON.parse(JSON.stringify(self[key][index - 1]));
321 + self[key].splice(index - 1, 1);
322 + self[key].splice(index, 0, changeItem);
323 + } else {
324 + self.msgError("只能选择一条数据进行上下移动");
325 + return;
326 + }
327 + },
328 + choose(value) {
329 + this.currentItem = value;
330 + }, //下移事件
331 + handleDown(key) {
332 + let self = this;
333 + let item = self.currentItem;
334 + let index;
335 + if (item.length == 1) {
336 + //选中值的下标
337 + self[key].find((val, indexs, arr) => {
338 + if (val == item) {
339 + index = indexs;
340 + }
341 + });
342 + if (index == self[key].length - 1) {
343 + // 这里是length-1,因为下标值从0开始
344 + self.msgError("已经到底了");
345 + return;
346 + }
347 + let changeItem = JSON.parse(JSON.stringify(self[key][index]));
348 + self[key].splice(index, 1);
349 + self[key].splice(index + 1, 0, changeItem);
350 + } else {
351 + self.msgError("只能选择一条数据进行上下移动");
352 + return;
353 + }
354 + },
355 + // ===========
233 }, 356 },
234 }; 357 };
235 </script> 358 </script>
...@@ -239,13 +362,38 @@ export default { ...@@ -239,13 +362,38 @@ export default {
239 ::v-deep { 362 ::v-deep {
240 .el-transfer-panel .el-checkbox__inner { 363 .el-transfer-panel .el-checkbox__inner {
241 height: 17px; 364 height: 17px;
242 - width: 13px; 365 + width: 14px;
243 } 366 }
244 .el-button--primary, 367 .el-button--primary,
245 .el-button--primary:hover, 368 .el-button--primary:hover,
246 .el-button--primary:focus { 369 .el-button--primary:focus {
247 color: #ff6200; 370 color: #ff6200;
248 } 371 }
372 + /* .el-transfer-panel__list.is-filterable {
373 + padding-bottom: 40px;
374 + } */
375 + .el-transfer-panel__body {
376 + height: 260px;
377 + }
378 + .el-transfer-panel__list.is-filterable {
379 + height: 240px;
380 + }
381 + .is-with-footer {
382 + .el-transfer-panel__list.is-filterable {
383 + height: 205px;
384 + }
385 + }
386 + .el-transfer__buttons {
387 + display: inline-flex;
388 + flex-direction: column;
389 + .el-button + .el-button {
390 + margin-left: 0;
391 + }
392 + }
393 + .el-transfer-panel {
394 + width: 235px;
395 + height: 350px;
396 + }
249 } 397 }
250 398
251 .revokeOperation { 399 .revokeOperation {
......
...@@ -338,6 +338,7 @@ export default { ...@@ -338,6 +338,7 @@ export default {
338 getHsCodeSingleSync({ id: record.skuCode }).then((res) => { 338 getHsCodeSingleSync({ id: record.skuCode }).then((res) => {
339 if (+res.code === 200) { 339 if (+res.code === 200) {
340 this.alertSuccessMsg(res.message); 340 this.alertSuccessMsg(res.message);
341 + this.search(0);
341 } else { 342 } else {
342 this.alertWarningMsg(res.message); 343 this.alertWarningMsg(res.message);
343 } 344 }
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
21 > 21 >
22 <el-row :gutter="5"> 22 <el-row :gutter="5">
23 <el-col :span="24"> 23 <el-col :span="24">
24 - <Formitem label="同步日期" prop="beginDate" type="edit"> 24 + <Formitem label="起始日期" prop="beginDate" type="edit">
25 <el-date-picker 25 <el-date-picker
26 class="inputInner--beginDate" 26 class="inputInner--beginDate"
27 id="inputInner-edit-beginDate" 27 id="inputInner-edit-beginDate"
...@@ -76,7 +76,7 @@ export default { ...@@ -76,7 +76,7 @@ export default {
76 { 76 {
77 required: true, 77 required: true,
78 trigger: "change", 78 trigger: "change",
79 - message: "同步日期不能为空！", 79 + message: "起始日期不能为空！",
80 }, 80 },
81 ], 81 ],
82 }, 82 },
......
...@@ -535,7 +535,8 @@ import BatchModify from "./batchModify.vue"; ...@@ -535,7 +535,8 @@ import BatchModify from "./batchModify.vue";
535 import TimeDialog from "./time-dialog.vue"; 535 import TimeDialog from "./time-dialog.vue";
536 import DataPreview from "./data-preview.vue"; 536 import DataPreview from "./data-preview.vue";
537 import WeightAdjust from "./weight-adjust.vue"; 537 import WeightAdjust from "./weight-adjust.vue";
538 -import { getPortInfo } from "@/api/system/customer-ai.js"; 538 +import { getCurrUserPortInfo } from "@/api/system/user.js";
539 +import { listStatus, receiptStatus, totalScoreStatus } from "../../utils/dict";
539 export default { 540 export default {
540 name: "ReportingData", 541 name: "ReportingData",
541 components: { 542 components: {
...@@ -573,6 +574,9 @@ export default { ...@@ -573,6 +574,9 @@ export default {
573 }, 574 },
574 tableData: [], 575 tableData: [],
575 orderStatus: [], 576 orderStatus: [],
577 + waybillStatus: [],
578 + listStatus: [],
579 + totalScoreStatus: [],
576 headerData: [ 580 headerData: [
577 { 581 {
578 name: "提运单号", 582 name: "提运单号",
...@@ -617,59 +621,19 @@ export default { ...@@ -617,59 +621,19 @@ export default {
617 align: "left", 621 align: "left",
618 slot: true, 622 slot: true,
619 columnKey: "orderReceiptStatus", 623 columnKey: "orderReceiptStatus",
620 - filters: [ 624 + filterPlacement: "bottom-right",
621 - { 625 + filters: [...receiptStatus()],
622 - text: "已提交",
623 - value: "0",
624 - },
625 - {
626 - text: "xml报文加签失败",
627 - value: "-2",
628 - },
629 - {
630 - text: "xml报文上传失败",
631 - value: "-3",
632 - },
633 - {
634 - text: "电子口岸申报中",
635 - value: "2",
636 - },
637 - {
638 - text: "发送海关成功",
639 - value: "3",
640 - },
641 - {
642 - text: "发送海关失败",
643 - value: "4",
644 - },
645 - {
646 - text: "海关退单",
647 - value: "100",
648 - },
649 - {
650 - text: "海关入库",
651 - value: "120",
652 - },
653 - {
654 - text: "回执异常",
655 - value: "-1",
656 - },
657 - ],
658 - // filterMethod: this.filterMethodFn,
659 }, 626 },
660 - // { 627 +
661 - // name: "收款单回执",
662 - // value: "",
663 - // width: "",
664 - // align: "left",
665 - // slot: true,
666 - // },
667 { 628 {
668 name: "运单回执", 629 name: "运单回执",
669 value: "wayBillReceipt", 630 value: "wayBillReceipt",
670 width: "", 631 width: "",
671 align: "left", 632 align: "left",
672 slot: true, 633 slot: true,
634 + columnKey: "wayBillReceipt",
635 + filterPlacement: "bottom-right",
636 + filters: [...receiptStatus()],
673 }, 637 },
674 { 638 {
675 name: "清单回执", 639 name: "清单回执",
...@@ -677,6 +641,9 @@ export default { ...@@ -677,6 +641,9 @@ export default {
677 width: "", 641 width: "",
678 align: "left", 642 align: "left",
679 slot: true, 643 slot: true,
644 + columnKey: "listReceiptStatus",
645 + filterPlacement: "bottom-right",
646 + filters: [...listStatus()],
680 }, 647 },
681 648
682 { 649 {
...@@ -685,6 +652,9 @@ export default { ...@@ -685,6 +652,9 @@ export default {
685 width: "", 652 width: "",
686 align: "left", 653 align: "left",
687 slot: true, 654 slot: true,
655 + columnKey: "totalSplitOrderStatus",
656 + filterPlacement: "bottom-right",
657 + filters: [...totalScoreStatus()],
688 }, 658 },
689 // { 659 // {
690 // // release-v1.0.9 660 // // release-v1.0.9
...@@ -818,13 +788,16 @@ export default { ...@@ -818,13 +788,16 @@ export default {
818 }, 788 },
819 methods: { 789 methods: {
820 filterChange(value) { 790 filterChange(value) {
821 - this.orderStatus = value.orderReceiptStatus; 791 + this.orderStatus = value?.orderReceiptStatus;
792 + this.waybillStatus = value?.wayBillReceipt;
793 + this.listStatus = value?.listReceiptStatus;
794 + this.totalScoreStatus = value?.totalSplitOrderStatus;
822 console.log(value, this.orderStatus); 795 console.log(value, this.orderStatus);
823 this.search(0); 796 this.search(0);
824 }, 797 },
825 //获取口岸子字典 798 //获取口岸子字典
826 searchPortDictData() { 799 searchPortDictData() {
827 - getPortInfo() 800 + getCurrUserPortInfo()
828 .then((res) => { 801 .then((res) => {
829 console.log(res); 802 console.log(res);
830 if (res.code === "200") { 803 if (res.code === "200") {
...@@ -919,6 +892,9 @@ export default { ...@@ -919,6 +892,9 @@ export default {
919 obj.endCreateTime = obj.createTime[1]; 892 obj.endCreateTime = obj.createTime[1];
920 } 893 }
921 obj.orderStatus = this.orderStatus; 894 obj.orderStatus = this.orderStatus;
895 + obj.waybillStatus = this.waybillStatus;
896 + obj.listStatus = this.listStatus;
897 + obj.totalScoreStatus = this.totalScoreStatus;
922 searchDeclareData(obj) 898 searchDeclareData(obj)
923 .then((res) => { 899 .then((res) => {
924 if (res.code === "200") { 900 if (res.code === "200") {
...@@ -958,6 +934,10 @@ export default { ...@@ -958,6 +934,10 @@ export default {
958 dataSource: [], 934 dataSource: [],
959 ebcName: "", 935 ebcName: "",
960 }; 936 };
937 + // this.orderStatus = [];
938 + // this.waybillStatus = [];
939 + // this.listStatus = [];
940 + // this.totalScoreStatus = [];
961 this.clearPort(); 941 this.clearPort();
962 this.clearStatus(); 942 this.clearStatus();
963 }, 943 },
...@@ -1451,11 +1431,35 @@ export default { ...@@ -1451,11 +1431,35 @@ export default {
1451 .el-table th.el-table__cell > .cell { 1431 .el-table th.el-table__cell > .cell {
1452 display: flex; 1432 display: flex;
1453 align-items: center; 1433 align-items: center;
1454 - gap: 30px; 1434 + cursor: pointer;
1455 - justify-content: space-between; 1435 + /* gap: 30px;
1436 + justify-content: space-between; */
1456 &.highlight { 1437 &.highlight {
1457 color: #007ab7; 1438 color: #007ab7;
1439 + .el-icon-arrow-down {
1440 + color: #007ab7;
1441 + }
1442 + }
1443 + }
1444 + .el-table__column-filter-trigger {
1445 + display: inline-flex;
1446 + height: 34px;
1447 + cursor: pointer;
1448 + align-items: center;
1449 + }
1450 + .el-table__column-filter-trigger i {
1451 + transform: scale(1);
1452 + padding-left: 5px;
1453 + font-family: "iconfont" !important;
1454 + font-style: normal;
1455 + -webkit-font-smoothing: antialiased;
1456 + -moz-osx-font-smoothing: grayscale;
1457 + position: relative;
1458 + top: 1px;
1458 } 1459 }
1460 + .el-icon-arrow-down:before {
1461 + content: "\e7d6";
1462 + font-size: 18px;
1459 } 1463 }
1460 } 1464 }
1461 } 1465 }
......