diff --git a/config/index.js b/config/index.js index 58d4a69..a2f0bc0 100644 --- a/config/index.js +++ b/config/index.js @@ -13,7 +13,7 @@ module.exports = { // 代理列表, 是否开启代理通过[./dev.env.js]配置 proxyTable: devEnv.OPEN_PROXY === false ? {} : { '/proxyApi': { - target: 'http://127.0.0.1:9000', + target: 'http://127.0.0.1:9001', changeOrigin: true, pathRewrite: { // 把 /proxyApi 替换成 / diff --git a/src/api/ecss/ecss.js b/src/api/ecss/ecss.js index 01c5054..f540493 100644 --- a/src/api/ecss/ecss.js +++ b/src/api/ecss/ecss.js @@ -3,7 +3,9 @@ import { createAPI } from "@/utils/httpRequest.js"; export const previewExcel = data => createAPI(`/ecss/coDel/previewExcel`,'post',data) +export const previewExcelTX = data => createAPI(`/ecss/coDel/previewExcelTX`,'post',data) export const saveEcssCoDelNotifyByExcel = data => createAPI(`/ecss/coDel/saveEcssCoDelNotifyByExcel`,'post',data) +export const saveEcssCoDelNotifyByExcelTX = data => createAPI(`/ecss/coDel/saveEcssCoDelNotifyByExcelTX`,'post',data) export const modifyNotifyDetailByExcel = data => createAPI(`/ecss/coDel/modifyNotifyDetailByExcel`,'post',data) export const searchEcssCoDelNotifyHeader = data => createAPI(`/ecss/coDel/searchEcssCoDelNotifyHeader`,'post',data) diff --git a/src/views/modules/ecss/codelnotifyTX.vue b/src/views/modules/ecss/codelnotifyTX.vue new file mode 100644 index 0000000..ea91af3 --- /dev/null +++ b/src/views/modules/ecss/codelnotifyTX.vue @@ -0,0 +1,3261 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {{'查询'}} + + + {{'导入'}} + {{'导出'}} + + + + + + + 删除 + + + + + {{scope.row[item.columnProp]}} + + + + + + + + + {{'新增'}} + {{'改单导入'}} + {{'UPC导入'}} + {{'TTL Amount修正'}} + + + + + {{!!scope.row[item.columnProp]?scope.row[item.columnProp].toFixed(2):''}} + + + + + + {{ scope.row[item.columnProp] }} + + + {{ scope.row[item.columnProp] }} + + + {{ scope.row[item.columnProp] }} + + + + + + + 修改 + 取消 + + + + + + + + + + + + + 一键删除 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 保存 + 关闭 + + + + + + + + + + + + + PN + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {{ updateDetailLoading ? '保存中...' : '保存' }} + + 关闭 + + + + + + + + 是 + 否 + + + + + 是 + 否 + + + + + 是 + 否 + + + + + + + {{ xiadaLoading ? '下达中...' : '确定' }} + + 关闭 + + + + + + + + + + + + + + + + + + + + + + + + + 查询 + + + + + + {{scope.row[item.columnProp]}} + + + + + + + + + 关闭 + + + + + + + + + + + 发票模版 + + + + + + + + 品名 + + + + + Hs Code + + + + + 合同 + + + + + 货物明细 + + + + + 中文 + 英文 + + + + + 显示毛净重 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 确定 + 关闭 + + + + + + + + 中文 + 英文 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 确定 + 关闭 + + + + + + + + + 查询 + + + + + + + + + + + + 关闭 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 另存为 + + + + + + + + + 仅保存客户信息 + 保存并修改模版 + 关闭 + + + + + + + + diff --git a/src/views/modules/ecss/components/PackingDetailTabPallet.vue b/src/views/modules/ecss/components/PackingDetailTabPallet.vue new file mode 100644 index 0000000..961926d --- /dev/null +++ b/src/views/modules/ecss/components/PackingDetailTabPallet.vue @@ -0,0 +1,639 @@ + + + + + + 调整总毛重 + + + + + + + + + + + {{ scope.row.pallet_no || '-' }} + + + + + {{ scope.row.pallet_qty || '-' }} + + + + + {{ scope.row.volume !== null && scope.row.volume !== undefined ? Number(scope.row.volume).toFixed(2) : '-' }} + + + + + + + {{ scope.row.gross_weight || '-' }} + + + + + {{ scope.row.net_weight || '-' }} + + + + + + + {{ scope.row.pn || '-' }} + + + + + {{ formatDetailValue(scope.row.qty, 'qty') }} + + + + + {{ scope.row.qty_per_box || '-' }} + + + + + {{ scope.row.box_qty || '-' }} + + + + + + + + + + diff --git a/src/views/modules/ecss/createDeclaration.vue b/src/views/modules/ecss/createDeclaration.vue index 112de58..458aee3 100644 --- a/src/views/modules/ecss/createDeclaration.vue +++ b/src/views/modules/ecss/createDeclaration.vue @@ -136,11 +136,19 @@ + + @@ -485,6 +493,7 @@ import {} from "@/api/sysLanguage.js" import PackingDetailTab from "./components/PackingDetailTab.vue"; + import PackingDetailTabPallet from "./components/PackingDetailTabPallet.vue"; import { searchEcssCoDelNotifyHeaderForDanZheng, searchEcssCoDelNotifyDetail, @@ -497,6 +506,7 @@ name: "null", components:{ PackingDetailTab, + PackingDetailTabPallet, }, data() { return { diff --git a/src/views/modules/ecss/del_upload_excel_tx.vue b/src/views/modules/ecss/del_upload_excel_tx.vue new file mode 100644 index 0000000..208fa09 --- /dev/null +++ b/src/views/modules/ecss/del_upload_excel_tx.vue @@ -0,0 +1,1924 @@ + + + + + + + + + + + + + + + 下载文件模板 + + + + + + + 导入规则 + + + 以下3种情况不读取Excel内容: + 1、发票在系统已存在 + 2、内销 + 3、CargoReady Date为空 + + + 保存模板规则 + + + 客户模板名称无修改,点"保存模板"会修改原模板 + 客户模板名称有修改,点"保存模板"会另存为新模板 + + + + + + + + 将文件拖到此处,或点击上传 + + + + + + + + + + 正在解析文件,请稍候... + + + + + + + + + 可导入的发票 (共{{ validInvoices.length }}个发票) + + + + 批量删除 ({{ selectedRows.length }}) + + + + + + + + + + {{ scope.row.cmcInvoice }} + + + 已存在 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 保存模板 + + 未选择 + + + + + + + + + + 物料不存在的发票 (共{{ invalidInvoices.length }}个发票,将不会导入) + + + + + + + {{ scope.row.cmcInvoice }} + + + + 物料不存在 + + + + + + + + + 物料不存在 + 将不会导入 + + + + + + + {{ scope.row.invalidMaterials ? scope.row.invalidMaterials.length : 0 }}个物料 + + 点击发票号查看详情 + + + + + + + + 无需填写 + + + + + + + {{ scope.row.totalQty || 0 }} + + + + + {{ scope.row.totalItems || 0 }} + + + + + + + + + + + Sheet处理警告 (共{{ sheetErrors.length }}个Sheet存在问题) + + + + + {{ scope.row.sheetName }} + + + + + + + + 详细错误信息 (共{{ scope.row.errorDetails.length }}条): + + {{ index + 1 }}. {{ detail }} + + + + + ; + {{ index + 1 }}. {{ detail }} + + + + + + + + + + + + 保存 + 确认保存 + 取消预览 + 关闭 + + + + + + + + + + + + + + + + 查询 + + + 重置 + + + + + + + + + + + + + + + + + + + + + 关闭 + + + + + + + + + + 查询 + + + + + + + + + + 关闭 + + + + + + + + + + 关闭 + + + + + + + + + + 关闭 + + + + + + + + + + + + 关闭 + + + + + + + 提示:您可以在此编辑较长的文本内容,支持多行输入 + + + + + + + + + 取消 + 保存 + + + + + + + + + + + + {{ scope.row }} + + + + + + + 共发现 {{ invalidMaterialsDialog.materials.length }} 个不存在的物料 + + + + + 确定 + + + + + + +
正在解析文件,请稍候...