diff --git a/src/api/ecss/ecss.js b/src/api/ecss/ecss.js index 273ac71..df4f390 100644 --- a/src/api/ecss/ecss.js +++ b/src/api/ecss/ecss.js @@ -2,6 +2,7 @@ import { createAPI } from "@/utils/httpRequest.js"; +export const previewExcel = data => createAPI(`/ecss/coDel/previewExcel`,'post',data) export const saveEcssCoDelNotifyByExcel = data => createAPI(`/ecss/coDel/saveEcssCoDelNotifyByExcel`,'post',data) export const modifyNotifyDetailByExcel = data => createAPI(`/ecss/coDel/modifyNotifyDetailByExcel`,'post',data) @@ -129,5 +130,7 @@ export const getCustomers = data => createAPI(`/select/ecssMapper/getCustomerInf export const getCustomerAdd = data => createAPI(`/select/ecssMapper/getCustomerAdd/list`,'post',data) +export const getCustomerTemplateList = data => createAPI(`/ecss/coDel/getCustomerTemplateList`,'post',data) + diff --git a/src/views/modules/ecss/codelnotify.vue b/src/views/modules/ecss/codelnotify.vue index ddaba1b..26586e7 100644 --- a/src/views/modules/ecss/codelnotify.vue +++ b/src/views/modules/ecss/codelnotify.vue @@ -117,7 +117,7 @@ layout="total, sizes, prev, pager, next, jumper"> - + {{'新增'}} {{'改单导入'}} 0?this.dataList2[0].currency:'USD' - this.exportGoods.madeArea = 'Shanghai, China' + this.exportGoods.madeArea = 'Nantong, China' this.exportGoods.sendPort = 'Shanghai, China' this.exportGoods.deliveryGoodsDate = '' this.exportGoods.voyage = this.currentRow.buNo==='01-Label' || this.currentRow.buNo==='03-RFID'?this.currentRow.cmcInvoice:'' diff --git a/src/views/modules/ecss/codelnotifyConfirm.vue b/src/views/modules/ecss/codelnotifyConfirm.vue index fde3194..a2777df 100644 --- a/src/views/modules/ecss/codelnotifyConfirm.vue +++ b/src/views/modules/ecss/codelnotifyConfirm.vue @@ -109,7 +109,7 @@ layout="total, sizes, prev, pager, next, jumper"> - + - + 0?this.dataList2[0].currency:'USD' - this.exportGoods.madeArea = 'Shanghai, China' + this.exportGoods.madeArea = 'Nantong, China' this.exportGoods.sendPort = 'Shanghai, China' this.exportGoods.deliveryGoodsDate = '' this.exportGoods.voyage = this.currentRow.buNo==='01-Label' || this.currentRow.buNo==='03-RFID'?this.currentRow.cmcInvoice:'' @@ -2033,7 +2033,7 @@ let error; ExportUtil.export( "/ecss/coDel/downloadDeclarationElements", - exportParam, this.currentRow.declarationNo+"报关要素.xlsx" + exportParam, this.currentRow.cmcInvoice+"报关要素.xlsx" ); this.brandTypeFlag = false }, @@ -2055,7 +2055,7 @@ exportParam.declarationWeight = this.declarationWeight ExportUtil.export( "/ecss/coDel/downloadDeclaration", - exportParam, this.currentRow.declarationNo+"报关单.xlsx" + exportParam, this.currentRow.cmcInvoice+"报关单.xlsx" ); this.declarationFlag = false }, @@ -2071,7 +2071,7 @@ exportParam.notifyPartDetailList = this.notifyPartDetailList ExportUtil.export( "/ecss/coDel/downloadInvoice", - exportParam, this.currentRow.declarationNo+"发票.xlsx" + exportParam, this.currentRow.cmcInvoice+"发票.xlsx" ); this.exportInvoiceFlag=false this.searchTable() @@ -2106,7 +2106,7 @@ exportParam.notifyPartDetailList = this.notifyPartDetailList ExportUtil.export( "/ecss/coDel/downloadPackingList", - exportParam, this.currentRow.declarationNo+"箱单.xlsx" + exportParam, this.currentRow.cmcInvoice+"箱单.xlsx" ); this.exportPakingFlag = false; this.searchTable() @@ -2122,7 +2122,7 @@ exportParam.delNo = this.currentRow.delNo ExportUtil.export( "/ecss/coDel/downloadExportGoods", - exportParam, this.currentRow.declarationNo+"出口货物委托书.xlsx" + exportParam, this.currentRow.cmcInvoice+"出口货物委托书.xlsx" ); this.exportGoodsFlag = false; this.searchTable() @@ -2138,7 +2138,7 @@ exportParam.delNo = this.currentRow.delNo ExportUtil.export( "/ecss/coDel/downloadContract", - exportParam, this.currentRow.declarationNo+"合同.xlsx" + exportParam, this.currentRow.cmcInvoice+"合同.xlsx" ); this.searchTable() }, @@ -2181,7 +2181,7 @@ exportParam.notifyPartDetailList = this.notifyPartDetailList ExportUtil.export( "/ecss/coDel/downloadAll", - exportParam, this.currentRow.declarationNo+"单证信息.xlsx" + exportParam, this.currentRow.cmcInvoice+"单证信息.xlsx" ); this.exportAllFlag = false this.searchTable() @@ -2307,7 +2307,7 @@ }) this.exportGoods.salesMethod = 'EXW' this.exportGoods.currency = this.currentRow.currency?this.currentRow.currency:this.dataList2.length>0?this.dataList2[0].currency:'USD' - this.exportGoods.madeArea = 'Shanghai, China' + this.exportGoods.madeArea = 'Nantong, China' this.exportGoods.sendPort = 'Shanghai, China' this.exportGoods.deliveryGoodsDate = '' this.exportGoods.voyage = this.currentRow.buNo==='01-Label' || this.currentRow.buNo==='03-RFID'?this.currentRow.cmcInvoice:'' diff --git a/src/views/modules/ecss/del_upload_excel.vue b/src/views/modules/ecss/del_upload_excel.vue index f45d599..ecbd053 100644 --- a/src/views/modules/ecss/del_upload_excel.vue +++ b/src/views/modules/ecss/del_upload_excel.vue @@ -1,74 +1,19 @@