jiaxing.zhou

feat(exportSummary): 新增汇总申请单查询功能

- 添加提运单号、预录入编号、电商企业代码等查询条件
- 新增汇总时间、业务状态等筛选项
- 更新表格展示字段,包括电子口岸预录入编号、提运单号等
-集成新的 API searchExportSummaryList 用于获取汇总申请单数据
...@@ -21,3 +21,14 @@ export function searchExportSummaryList(data){ ...@@ -21,3 +21,14 @@ export function searchExportSummaryList(data){
21 data: data, 21 data: data,
22 }) 22 })
23 } 23 }
24 +
25 +/**
26 + * 查询汇总回执
27 + * @param data.copNo 企业唯一编号
28 + */
29 +export function getExportSummaryReceiptData(data){
30 + return request({
31 + url: '/bus-customer/exportSummary/receipt/' + data.copNo,
32 + method: 'get',
33 + })
34 +}
......
...@@ -201,9 +201,12 @@ ...@@ -201,9 +201,12 @@
201 @sizeChange="sizeChange" 201 @sizeChange="sizeChange"
202 @currentChange="currentChange" 202 @currentChange="currentChange"
203 @cellClick="cellClick" 203 @cellClick="cellClick"
204 - :selection="false" 204 + :selection="true"
205 :selectFixed="false" 205 :selectFixed="false"
206 :rowSelectDataType="false" 206 :rowSelectDataType="false"
207 + @tableSelect="tableSelect"
208 + @tableSelectAll="tableSelectAll"
209 + :selected="selected"
207 > 210 >
208 <template v-slot:returnStatus="scope"> 211 <template v-slot:returnStatus="scope">
209 <TablePopover 212 <TablePopover
...@@ -236,11 +239,8 @@ ...@@ -236,11 +239,8 @@
236 239
237 <script> 240 <script>
238 import { 241 import {
239 - getAllExportingBills, 242 + searchExportSummaryList,
240 - getOrderReceiptData, 243 + getExportSummaryReceiptData
241 -} from "@/api/exportQuery.js";
242 -import {
243 - searchExportSummaryList
244 } from "@/api/exportSummary-api"; 244 } from "@/api/exportSummary-api";
245 export default { 245 export default {
246 name: "ExportBillQuery", 246 name: "ExportBillQuery",
...@@ -264,69 +264,88 @@ export default { ...@@ -264,69 +264,88 @@ export default {
264 total: 0, 264 total: 0,
265 }, 265 },
266 tableData: [], 266 tableData: [],
267 + selected: [],
267 headerData: [ 268 headerData: [
268 { 269 {
270 + name: "回执状态",
271 + value: "returnStatus",
272 + width: "",
273 + align: "left",
274 + slot: true,
275 + },
276 + {
269 name: "电子口岸预录入编号", 277 name: "电子口岸预录入编号",
270 value: "preNo", 278 value: "preNo",
271 width: "", 279 width: "",
272 align: "left", 280 align: "left",
273 - slot: true,
274 }, 281 },
275 { 282 {
276 name: "提运单号", 283 name: "提运单号",
277 value: "billNo", 284 value: "billNo",
278 width: "", 285 width: "",
279 align: "left", 286 align: "left",
280 - slot: true,
281 }, 287 },
282 { 288 {
283 name: "汇总申请单编号", 289 name: "汇总申请单编号",
284 value: "sumNo", 290 value: "sumNo",
285 width: "", 291 width: "",
286 align: "left", 292 align: "left",
287 - slot: true,
288 }, 293 },
289 { 294 {
290 name: "申报企业代码", 295 name: "申报企业代码",
291 value: "agentCode", 296 value: "agentCode",
292 width: "", 297 width: "",
293 align: "left", 298 align: "left",
294 - slot: true,
295 }, 299 },
296 { 300 {
297 name: "申报企业名称", 301 name: "申报企业名称",
298 value: "agentName", 302 value: "agentName",
299 width: "", 303 width: "",
300 align: "left", 304 align: "left",
301 - slot: true,
302 }, 305 },
303 { 306 {
304 name: "收发货人代码", 307 name: "收发货人代码",
305 value: "ebccode", 308 value: "ebccode",
306 width: "", 309 width: "",
307 align: "left", 310 align: "left",
308 - slot: true,
309 }, 311 },
310 { 312 {
311 name: "收发货人名称", 313 name: "收发货人名称",
312 value: "ebcname", 314 value: "ebcname",
313 width: "", 315 width: "",
314 align: "left", 316 align: "left",
315 - slot: true,
316 }, 317 },
317 { 318 {
318 name: "汇总时间", 319 name: "汇总时间",
319 value: "startTime"+"~"+"endTime", 320 value: "startTime"+"~"+"endTime",
320 width: "", 321 width: "",
321 align: "left", 322 align: "left",
322 - slot: true,
323 }, 323 },
324 { 324 {
325 name: "收发货人汇总标志", 325 name: "收发货人汇总标志",
326 value:"summaryFlag", 326 value:"summaryFlag",
327 width: "", 327 width: "",
328 align: "left", 328 align: "left",
329 - slot: true, 329 + },
330 + ],
331 + receiptDataHead: [
332 + {
333 + name: "回执状态",
334 + value: "receiptStatus",
335 + width: "",
336 + align: "left",
337 + },
338 + {
339 + name: "状态时间",
340 + value: "statusTime",
341 + width: "",
342 + align: "left",
343 + },
344 + {
345 + name: "回执描述",
346 + value: "receiptDescription",
347 + width: "",
348 + align: "left",
330 }, 349 },
331 ], 350 ],
332 dictData: { 351 dictData: {
...@@ -404,17 +423,18 @@ export default { ...@@ -404,17 +423,18 @@ export default {
404 //查询详情 423 //查询详情
405 view(val) { 424 view(val) {
406 this.$router.push({ 425 this.$router.push({
407 - name: "ExportBillDetail", 426 + name: "summaryDetail",
408 params: { data: val }, 427 params: { data: val },
409 }); 428 });
410 }, 429 },
411 popoverChange(val) { 430 popoverChange(val) {
412 console.log(val); 431 console.log(val);
413 this.tableData = val.tableData; 432 this.tableData = val.tableData;
414 - this.receiptApi(val.data.declareId, val.status) 433 + this.receiptApi(val.data.copNo, val.status)
415 .then((res) => { 434 .then((res) => {
416 val.tableData.forEach((item) => { 435 val.tableData.forEach((item) => {
417 - if (item.declareId == val.data.declareId) { 436 + console.log("item",item)
437 + if (item.id == val.data.id) {
418 item.popoverData = res; 438 item.popoverData = res;
419 } 439 }
420 }); 440 });
...@@ -427,10 +447,10 @@ export default { ...@@ -427,10 +447,10 @@ export default {
427 }); 447 });
428 }, 448 },
429 //查询回执 449 //查询回执
430 - receiptApi(id) { 450 + receiptApi(copNo) {
431 return new Promise((resolve, reject) => { 451 return new Promise((resolve, reject) => {
432 - let obj = { orderId: id }; 452 + let obj = { copNo: copNo };
433 - getOrderReceiptData(obj) 453 + getExportSummaryReceiptData(obj)
434 .then((res) => { 454 .then((res) => {
435 if (res.code === "200") { 455 if (res.code === "200") {
436 resolve(res.data); 456 resolve(res.data);
...@@ -474,6 +494,12 @@ export default { ...@@ -474,6 +494,12 @@ export default {
474 }); 494 });
475 } 495 }
476 }, 496 },
497 + tableSelect(val) {
498 + this.selected = val.selection;
499 + },
500 + tableSelectAll(val) {
501 + this.selected = val;
502 + },
477 input() { 503 input() {
478 this.$forceUpdate(); 504 this.$forceUpdate();
479 }, 505 },
......
This diff is collapsed. Click to expand it.