diff --git a/src/utils/export-options.js b/src/utils/export-options.js index 7e28d58..f2931cf 100644 --- a/src/utils/export-options.js +++ b/src/utils/export-options.js @@ -29,7 +29,7 @@ const PalletSku = { columnLabel: "箱数", }, { - columnProp: "Rolls", + columnProp: "rolls", columnLabel: "Rolls", }, { diff --git a/src/views/modules/ecss/codelnotify.vue b/src/views/modules/ecss/codelnotify.vue index f434bc5..8cc577c 100644 --- a/src/views/modules/ecss/codelnotify.vue +++ b/src/views/modules/ecss/codelnotify.vue @@ -207,6 +207,12 @@ + + + + @@ -531,6 +537,11 @@ + + + + + + style="width: 100%;margin-top: 60px"> { diff --git a/src/views/modules/ecss/codelnotifyConfirm.vue b/src/views/modules/ecss/codelnotifyConfirm.vue index f197be1..d94f902 100644 --- a/src/views/modules/ecss/codelnotifyConfirm.vue +++ b/src/views/modules/ecss/codelnotifyConfirm.vue @@ -2235,7 +2235,7 @@ createBy: this.$store.state.user.name, } excel.exportTable({ - url: "/select/ecssMapper/searchEcssCoDelNotifyDetail/list", + url: "/ecss/coDel/searchCoDelPalletList", columnMapping: excelOpts.PalletSku.columnMapping,//可以直接用table，不需要的列就剔除 mergeSetting: [],//需要合并的列 params: searchData, diff --git a/src/views/modules/ecss/createDeclaration.vue b/src/views/modules/ecss/createDeclaration.vue index 0df745d..3b735f2 100644 --- a/src/views/modules/ecss/createDeclaration.vue +++ b/src/views/modules/ecss/createDeclaration.vue @@ -308,6 +308,11 @@ + + + + + @@ -392,6 +397,13 @@ label="数量" min-width="60"> + + 英文 + + + 托 + 箱 + +
发票
@@ -161,9 +167,14 @@ 合同 + + + + + - +
箱单
@@ -221,8 +232,13 @@ + + + + + - +
出口货物委托书
@@ -402,6 +418,12 @@ 英文 + + + 托 + 箱 + + @@ -469,6 +491,11 @@ + + + + + + style="width: 100%;margin-top: 60px"> + + + + + + style="width: 100%;margin-top: 60px"> 0) { this.currentRow.brand='品牌' exportParam.brand = '品牌' @@ -2099,6 +2145,7 @@ } exportParam.hsCodeDesc = this.exportInvoice.hsCodeDesc exportParam.contractFlag = this.exportInvoice.contractFlag + exportParam.fpremark = this.exportInvoice.fpremark exportParam.declarationNo = this.currentRow.declarationNo exportParam.site = this.currentRow.site @@ -2287,6 +2334,7 @@ this.exportInvoice.material=this.currentRow.material?this.currentRow.material:row.material this.exportInvoice.hsCodeDescType=this.currentRow.hsCodeDescType?this.currentRow.hsCodeDescType:row.hsCodeDescType this.exportInvoice.goodsLabel=this.currentRow.goodsLabel?this.currentRow.goodsLabel:row.goodsLabel + this.exportInvoice.fpremark = row.remark } else if (this.templateData.type=='箱单'){ this.exportPaking.templateName=row.name this.exportPaking.upc=row.upc @@ -2303,6 +2351,7 @@ this.exportPaking.material=this.currentRow.material?this.currentRow.material:row.material this.exportPaking.hsCodeDescType=this.currentRow.hsCodeDescType?this.currentRow.hsCodeDescType:row.hsCodeDescType this.exportPaking.goodsLabel=this.currentRow.goodsLabel?this.currentRow.goodsLabel:row.goodsLabel + this.exportPaking.xdremark = row.remark } else if (this.templateData.type=='出口货物委托书'){ this.exportGoods.salesMethod = row.salesMethod this.exportGoods.currency = row.currency diff --git a/src/views/modules/ecss/del_upload_excel.vue b/src/views/modules/ecss/del_upload_excel.vue index dcee899..7a4fe6e 100644 --- a/src/views/modules/ecss/del_upload_excel.vue +++ b/src/views/modules/ecss/del_upload_excel.vue @@ -4,15 +4,24 @@ width="600px" class="customer-dialog" @close="deleteFile"> - + + + 下载文件模板 + + - - + + + + + + + @@ -64,7 +73,7 @@ - 下载文件模板 + + + + label="运抵国"> @@ -202,7 +217,8 @@ localShipAddress:'', overseasShipper:'', overseasAddress:'', - cnative:'' + cnative:'', + salesArea:'', }, customSearchData: {}, customerList : [],//所有客户 @@ -300,7 +316,8 @@ }, rowDblclick4 (row) { this.pageData.overseasShipper=row.cDeliverUnit - this.pageData.cnative=row.country + this.pageData.cnative=row.deliverycountry + this.pageData.salesArea = row.country this.overseasShipperFlag = false }, @@ -356,7 +373,7 @@ return false } if (null == this.pageData.cnative || this.pageData.cnative=='') { - this.$message.error("请先填写收货单位国家!") + this.$message.error("请先填写收货单位运抵国!") return false } // 判断文件是否上传 @@ -373,6 +390,7 @@ formData.append("overseasShipper", this.pageData.overseasShipper) formData.append("overseasAddress", this.pageData.overseasAddress) formData.append("cnative", this.pageData.cnative) + formData.append("salesArea", this.pageData.salesArea) saveEcssCoDelNotifyByExcel(formData).then(({data}) => { if (data.code === 0) { this.$message.success(data.msg) @@ -431,3 +449,8 @@ } } + diff --git a/src/views/modules/ecss/ecssTemplate.vue b/src/views/modules/ecss/ecssTemplate.vue index 0eea1d3..b3c9187 100644 --- a/src/views/modules/ecss/ecssTemplate.vue +++ b/src/views/modules/ecss/ecssTemplate.vue @@ -239,9 +239,14 @@ + + + + + - + 保存 关闭 @@ -350,7 +355,7 @@ shipper:'Checkpoint Commercial (Shanghai) Co., Ltd. 保点贸易（上海）有限公司\t\t\t\t\t\t\n' + 'Room 1411, No. 31, Lane 2419, Hunan Road, Pudong New Area, Shanghai\t\t\t\t\t\t\n' + '电话/Tel: (86-21)38112888 传真/Fax: (86-21)38112990\t\t\t\t\t\t\n' + - '上海市浦东新区沪南路2419弄31号1411室\t\t\t\t\t\t\n' + '上海市浦东新区沪南路2419弄31号1411室\t\t\t\t\t\t\n', }, addDisabledFlag:true, activeName:'attribute', diff --git a/src/views/modules/oss/ossComponents.vue b/src/views/modules/oss/ossComponents.vue index 6009918..a1d4751 100644 --- a/src/views/modules/oss/ossComponents.vue +++ b/src/views/modules/oss/ossComponents.vue @@ -19,6 +19,10 @@ export default { type:String, default:'' }, + codelnotifyFlag:{ + type:String, + default:'' + }, columns:{ type:Array, required:true @@ -210,15 +214,17 @@ export default { this.$message.warning('请选择要下载的附件'); return; } - for (let i = 0; i < this.selectionDataList.length; i++) { + // 之前代码多选时只能下载一个，因为下载第一个后this.$refs.table.clearSelection()会清空选中项 + let selectList = this.selectionDataList.map(item => ({ ...item })); + for (let i = 0; i < selectList.length; i++) { let params = { - id:this.selectionDataList[i].id, + id:selectList[i].id, } previewOssFileById(params).then((response) => { const blob = new Blob([response.data], { type: response.headers['content-type'] }); const link = document.createElement('a'); link.href = URL.createObjectURL(blob); - link.setAttribute('download', this.selectionDataList[i].fileName); + link.setAttribute('download', selectList[i].fileName); link.target = '_blank'; // 打开新窗口预览 link.click(); URL.revokeObjectURL(link.href); @@ -295,7 +301,7 @@ export default { - +