From f78e61b43394cd3b9c4778b4c564c9808d25733a Mon Sep 17 00:00:00 2001 From: b2894lxlx <517289602@qq.com> Date: Wed, 9 Sep 2026 14:43:38 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E8=B0=83=E6=95=B4=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E8=BF=90=E5=8D=95=202=E3=80=81=E8=B0=83=E6=95=B4=E5=AF=B9?= =?UTF-8?q?=E8=B4=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/option/business/contract-manage.js | 8 +- src/option/business/temporary-credit-limit.js | 8 +- src/option/business/transport-plan.js | 10 +- .../components/shipping-template-page.vue | 233 ++++++++++++++++-- .../components/transport-plan-page.vue | 132 +++++++--- .../components/pre-settlement-editor.vue | 109 ++++++++ .../transport-reconciliation-editor.vue | 208 +++++++++++++++- 7 files changed, 639 insertions(+), 69 deletions(-) diff --git a/src/option/business/contract-manage.js b/src/option/business/contract-manage.js index b416f07..06342c0 100644 --- a/src/option/business/contract-manage.js +++ b/src/option/business/contract-manage.js @@ -27,6 +27,12 @@ const listDicFormatter = res => { return []; }; +const projectNameDicFormatter = res => { + const list = listDicFormatter(res); + // 过滤掉 projectName 为空的记录 + return list.filter(item => item && item.projectName && String(item.projectName).trim()); +}; + export const config = { title: '合同管理', permission: 'contract_manage', @@ -266,7 +272,7 @@ export const option = createCrudOption([ order: 165, dicUrl: '/blade-transport/project-apply/list?current=1&size=9999&approvalStatuses=approved,change_approved', - dicFormatter: listDicFormatter, + dicFormatter: projectNameDicFormatter, props: { label: 'projectName', value: 'projectName', diff --git a/src/option/business/temporary-credit-limit.js b/src/option/business/temporary-credit-limit.js index 4e8befd..6981a71 100644 --- a/src/option/business/temporary-credit-limit.js +++ b/src/option/business/temporary-credit-limit.js @@ -15,6 +15,12 @@ const listDicFormatter = res => { return []; }; +const projectNameDicFormatter = res => { + const list = listDicFormatter(res); + // 过滤掉 projectName 为空的记录 + return list.filter(item => item && item.projectName && String(item.projectName).trim()); +}; + const userDicFormatter = res => listDicFormatter(res).map(user => ({ ...user, @@ -137,7 +143,7 @@ export const option = { searchType: 'select', formslot: true, dicUrl: '/blade-transport/project-apply/list?current=1&size=9999', - dicFormatter: listDicFormatter, + dicFormatter: projectNameDicFormatter, props: { label: 'projectName', value: 'projectName', diff --git a/src/option/business/transport-plan.js b/src/option/business/transport-plan.js index d15c736..45b9154 100644 --- a/src/option/business/transport-plan.js +++ b/src/option/business/transport-plan.js @@ -23,6 +23,12 @@ const listDicFormatter = res => { return []; }; +const projectNameDicFormatter = res => { + const list = listDicFormatter(res); + // 过滤掉 projectName 为空的记录 + return list.filter(item => item && item.projectName && String(item.projectName).trim()); +}; + const parseGoodsRows = value => { if (!value) return []; if (Array.isArray(value)) return value; @@ -209,7 +215,7 @@ export const config = { statusProp: 'businessStatus', statusTextProp: 'businessStatusName', deleteStatus: ['draft', 'waiting_dispatch'], - editStatus: ['draft', 'waiting_dispatch'], + editStatus: ['draft', 'waiting_dispatch', 'dispatching'], detailButton: true, detailSections: [ { @@ -364,7 +370,7 @@ export const option = { span: 6, order: 400, dicUrl: '/blade-transport/project-apply/list?current=1&size=9999', - dicFormatter: listDicFormatter, + dicFormatter: projectNameDicFormatter, props: { label: 'projectName', value: 'projectName', diff --git a/src/views/business/components/shipping-template-page.vue b/src/views/business/components/shipping-template-page.vue index 5d84d89..7fa8619 100644 --- a/src/views/business/components/shipping-template-page.vue +++ b/src/views/business/components/shipping-template-page.vue @@ -1257,6 +1257,7 @@ export default { dialogReadonly: false, crudDialogType: '', standaloneFormKey: '', + copyingRow: null, detailBox: false, detailLoading: false, detailRow: {}, @@ -1427,7 +1428,7 @@ export default { String(item.value).toUpperCase() === String(this.shippingTemplateFreight.currency || '').toUpperCase() ); - return this.currencyName(option?.label || this.shippingTemplateFreight.currency); + return this.currencyUnit(option?.label || this.shippingTemplateFreight.currency); }, roadFreightTotal() { const total = this.shippingTemplateFreight.freightItems.reduce( @@ -1498,7 +1499,8 @@ export default { if ( this.isStandaloneFormPage && (to.query.mode !== from?.query?.mode || - String(to.query.id || '') !== String(from?.query.id || '')) + String(to.query.id || '') !== String(from?.query.id || '') || + to.query.copy !== from?.query?.copy) ) this.$nextTick(() => this.initStandaloneFormPage()); }, @@ -1608,13 +1610,21 @@ export default { }, openBusinessForm(mode, row = {}) { if (this.isStandaloneBusinessPage) { + const query = { + mode, + ...(mode === 'edit' && row.id ? { id: row.id } : {}), + name: `${mode === 'edit' ? '编辑' : '新增'}${this.config.title}`, + }; + // 如果是复制模式，添加标识 + console.log('openBusinessForm, mode:', mode, 'copyingRow:', this.copyingRow); + if (mode === 'add' && this.copyingRow) { + query.copy = Date.now().toString(); + console.log('添加 copy 参数:', query.copy); + } + console.log('最终的 query:', query); this.$router.push({ path: '/business/shipping-template/form', - query: { - mode, - ...(mode === 'edit' && row.id ? { id: row.id } : {}), - name: `${mode === 'edit' ? '编辑' : '新增'}${this.config.title}`, - }, + query, }); return; } @@ -1624,10 +1634,29 @@ export default { if (!this.isStandaloneFormPage) return; const mode = this.$route.query.mode; const id = this.$route.query.id || ''; - const key = `${mode}:${id}`; + const copy = this.$route.query.copy || ''; + const key = `${mode}:${id}:${copy}`; + console.log('initStandaloneFormPage 被调用, key:', key, 'standaloneFormKey:', this.standaloneFormKey); if (this.standaloneFormKey === key) return; this.standaloneFormKey = key; + + // 检查是否是复制模式 + if (mode === 'add' && copy) { + const copyData = sessionStorage.getItem('shipping-template-copy-data'); + console.log('复制模式检测到，从 sessionStorage 读取数据:', copyData); + if (copyData) { + try { + this.copyingRow = JSON.parse(copyData); + console.log('解析后的 copyingRow:', this.copyingRow); + sessionStorage.removeItem('shipping-template-copy-data'); + } catch (e) { + console.error('解析复制数据失败', e); + } + } + } + if (mode === 'edit') this.form = { id }; + console.log('调用 beforeOpen 前，copyingRow:', this.copyingRow); this.beforeOpen(() => {}, mode); }, parseJsonArray(value) { @@ -1752,9 +1781,37 @@ export default { .catch(() => loading?.()); }, beforeOpen(done, type) { + console.log('beforeOpen 被调用，type:', type, 'copyingRow:', this.copyingRow); this.crudDialogType = type; this.dialogReadonly = type === 'view'; if (type === 'add') { + // 检查是否是复制模式 + if (this.copyingRow) { + console.log('进入复制模式分支'); + const copyData = { ...this.copyingRow }; + this.copyingRow = null; + this.form = { ...(this.config.defaultForm || {}), ...copyData }; + console.log('合并后的 form:', this.form); + // 删除模板编号，等待系统生成 + delete this.form.templateCode; + this.applyFormDetail(this.form); + console.log('applyFormDetail 调用完成'); + // 生成新的模板编号 + if (typeof this.api.nextCode === 'function') { + this.api + .nextCode() + .then(res => { + this.form.templateCode = res?.data?.data || ''; + console.log('生成的新模板编号:', this.form.templateCode); + }) + .finally(() => done?.()); + } else { + done?.(); + } + return; + } + console.log('进入正常新增模式分支'); + // 正常新增模式 this.form = { ...(this.config.defaultForm || {}) }; this.selectedProjectId = ''; this.contractOptions = []; @@ -1791,9 +1848,12 @@ export default { this.normalizeCargo(item) ); if (!this.transportCargoRows.length) this.transportCargoRows = [defaultCargo()]; - this.restoreCargoTypePaths(); - // 编辑时先加载货物类型树，保证已有货物类型可以回显为级联路径。 - this.ensureCargoTypeOptions().catch(() => {}); + // 先加载货物类型树，保证已有货物类型可以回显为级联路径，然后再恢复路径。 + this.ensureCargoTypeOptions() + .then(() => { + this.restoreCargoTypePaths(); + }) + .catch(() => {}); this.attachmentRows = this.parseJsonArray(this.form.attachmentsJson); this.shippingTemplateFreight = { ...defaultFreight(), @@ -1937,11 +1997,42 @@ export default { }); }, handleCopy(row) { - if (typeof this.api.copy !== 'function') return; - this.api.copy(row.id).then(() => { - this.$message.success('复制成功'); - this.onLoad(this.page, this.query); - }); + this.api + .getDetail(row.id) + .then(res => { + const detail = res?.data?.data || {}; + console.log('获取到的详情数据:', detail); + // 删除不需要复制的字段 + delete detail.id; + delete detail.templateCode; // 系统自动生成 + delete detail.createTime; + delete detail.createUser; + delete detail.createUserName; + delete detail.createDept; + delete detail.updateTime; + delete detail.updateUser; + delete detail.updateUserName; + delete detail.status; + + console.log('处理后的数据:', detail); + console.log('isStandaloneBusinessPage:', this.isStandaloneBusinessPage); + + // 存储到组件状态（用于判断是否是复制模式） + this.copyingRow = detail; + console.log('已存储到 copyingRow'); + + // 如果是独立表单页模式，同时存储到 sessionStorage + if (this.isStandaloneBusinessPage) { + sessionStorage.setItem('shipping-template-copy-data', JSON.stringify(detail)); + console.log('已存储到 sessionStorage'); + } + + // 打开新增表单 + this.openBusinessForm('add', {}); + }) + .catch(() => { + this.$message.error('获取数据失败'); + }); }, handleCustomOperation(operation, row) { if (operation.action === 'createFromTemplate') { @@ -2100,6 +2191,45 @@ export default { }[text.toUpperCase()] || text ); }, + currencyUnit(value) { + const text = String(value || ''); + // 如果格式是 "CNY - 人民币"，提取货币代码部分 + let code = text; + if (text.includes(' - ')) { + code = text.split(' - ')[0].trim(); + } + + const upperCode = code.toUpperCase(); + const unitMap = { + CNY: '元', + RMB: '元', + USD: '美元', + EUR: '欧元', + JPY: '日元', + GBP: '英镑', + }; + + // 如果是已知的货币代码，返回对应的单位 + if (unitMap[upperCode]) { + return unitMap[upperCode]; + } + + // 如果是中文货币名称，转换为单位 + const nameMap = { + '人民币': '元', + '美元': '美元', + '欧元': '欧元', + '日元': '日元', + '英镑': '英镑', + }; + + if (nameMap[code]) { + return nameMap[code]; + } + + // 默认返回原值 + return text; + }, loadFeeUnitOptions() { getDictionary({ code: 'unit_fee' }).then(res => { this.feeUnitOptions = this.normalizeDictOptions(res?.data?.data || []); @@ -2644,7 +2774,20 @@ export default { const pathMatch = this.cargoTypeFlatOptions.find(item => item.path?.join('/') === pathKey); if (pathMatch) return pathMatch; } - const codeCandidates = [row.secondCargoTypeCode, row.cargoTypeCode, row.firstCargoTypeCode] + + // 优先通过二级类型编码查找（最准确） + if (row.secondCargoTypeCode) { + const secondMatch = this.cargoTypeFlatOptions.find( + item => String(item.cargoCode || item.code || '').trim() === String(row.secondCargoTypeCode).trim() + ); + if (secondMatch) { + console.log('通过 secondCargoTypeCode 找到货物类型:', secondMatch); + return secondMatch; + } + } + + // 其他候选编码 + const codeCandidates = [row.cargoTypeCode, row.firstCargoTypeCode] .map(value => String(value || '').trim()) .filter(Boolean); const nameCandidates = [ @@ -2655,6 +2798,7 @@ export default { ] .map(value => String(value || '').trim()) .filter(Boolean); + return ( this.cargoTypeFlatOptions.find(item => codeCandidates.some( @@ -2671,13 +2815,19 @@ export default { return matched?.path ? this.cargoPath(matched.path) : []; }, restoreCargoTypePaths() { + console.log('restoreCargoTypePaths 被调用'); + console.log('transportCargoRows:', this.transportCargoRows); + console.log('cargoTypeFlatOptions 长度:', this.cargoTypeFlatOptions.length); if (!this.transportCargoRows.length || !this.cargoTypeFlatOptions.length) return; - this.transportCargoRows.forEach(row => { + this.transportCargoRows.forEach((row, index) => { + console.log(`处理第 ${index + 1} 行货物:`, row); const path = this.resolveCargoTypePath(row); + console.log(`解析出的 path:`, path); if (!path.length) return; const item = this.cargoTypeFlatOptions.find( option => option.path?.join('/') === path.join('/') ); + console.log(`匹配到的 item:`, item); row.cargoTypePath = path; row.cargoType = item?.cargoName || @@ -2691,12 +2841,22 @@ export default { row.secondCargoTypeCode || row.firstCargoTypeCode || ''; + console.log(`设置后的 row.cargoTypePath:`, row.cargoTypePath); }); }, normalizeCargo(row = {}) { - const cargoTypePath = this.resolveCargoTypePath(row); + console.log('normalizeCargo 输入:', row); + // 如果原始数据中有完整的 cargoTypePath 数组，直接使用 + let cargoTypePath = []; + if (Array.isArray(row.cargoTypePath) && row.cargoTypePath.length > 0) { + cargoTypePath = this.cargoPath(row.cargoTypePath); + console.log('使用原始的 cargoTypePath:', cargoTypePath); + } else { + cargoTypePath = this.resolveCargoTypePath(row); + console.log('解析的 cargoTypePath:', cargoTypePath); + } const cargoType = this.findCargoTypeOption({ ...row, cargoTypePath }); - return { + const result = { ...defaultCargo(), ...row, cargoTypePath, @@ -2714,6 +2874,8 @@ export default { '', cargoName: row.cargoName || row.goodsName || '', }; + console.log('normalizeCargo 输出:', result); + return result; }, handleCargoTypeChange(row, value) { const path = this.cargoPath(value); @@ -2740,26 +2902,47 @@ export default { .catch(() => callback([])); }, async selectCargoSuggestion(row, item = {}) { - const cargoTypeOption = this.findCargoTypeOption(item); + console.log('selectCargoSuggestion 被调用，item:', item); + const selectedCargo = { ...row, ...item, cargoName: item.cargoName || item.name || item.label || item.value || row.cargoName || '', }; + + // 确保货物类型树已加载 try { await this.ensureCargoTypeOptions(); + console.log('货物类型树已加载，共', this.cargoTypeFlatOptions.length, '个选项'); } catch (error) { + console.warn('货物类型树加载失败', error); // 货物类型树加载失败时仍保留货物名称，提交时会给出货物类型必填提示。 } - // 货物名称返回了类型信息时，以货物自身的类型覆盖当前行原有类型。 - // 这样从一个类型切换到另一个类型时，级联选择器不会继续显示旧值。 - const matchedCargoType = this.findCargoTypeOption(item) || cargoTypeOption; + + // 从常用货物返回的数据中查找货物类型 + const matchedCargoType = this.findCargoTypeOption(item); + console.log('匹配到的货物类型:', matchedCargoType); + if (matchedCargoType?.path?.length) { - selectedCargo.cargoTypePath = this.cargoPath(matchedCargoType.path); + // 找到匹配的货物类型，回填到当前行 + const fullPath = matchedCargoType.path; + selectedCargo.cargoTypePath = this.cargoPath(fullPath); selectedCargo.cargoType = matchedCargoType.cargoName || selectedCargo.cargoType; selectedCargo.cargoTypeCode = matchedCargoType.cargoCode || matchedCargoType.code || matchedCargoType.id || ''; + + console.log('货物名称选择后反选货物类型:', { + cargoName: selectedCargo.cargoName, + cargoType: selectedCargo.cargoType, + cargoTypePath: selectedCargo.cargoTypePath, + fullPath: fullPath, + matchedCargoType: matchedCargoType, + }); + } else { + console.warn('未找到匹配的货物类型，item数据:', item); + console.warn('当前 cargoTypeFlatOptions 前5项:', this.cargoTypeFlatOptions.slice(0, 5)); } + Object.assign(row, this.normalizeCargo(selectedCargo)); row.value = undefined; this.syncFreightItems(); diff --git a/src/views/business/components/transport-plan-page.vue b/src/views/business/components/transport-plan-page.vue index 7d1634d..d069039 100644 --- a/src/views/business/components/transport-plan-page.vue +++ b/src/views/business/components/transport-plan-page.vue @@ -316,6 +316,25 @@ empty-text="暂无货物信息" > + + + + - - - -