From 4d4e4f5a0290351ed9af5787bbe96d6341a70752 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B8=B8=E7=86=9F=E5=90=B4=E5=BD=A6=E7=A5=96?= Date: Sat, 10 Oct 2026 14:52:51 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/order/com_poOrderDetail.vue | 3 ++- src/views/modules/order/poOrder.vue | 27 +++++++++++++++++-- .../order/poOrderAdvancedQueryConfig.js | 3 ++- src/views/modules/order/poOrder_search.vue | 10 ++++++- src/views/modules/order/poOrder_search_en.vue | 10 ++++++- 5 files changed, 47 insertions(+), 6 deletions(-) diff --git a/src/views/modules/order/com_poOrderDetail.vue b/src/views/modules/order/com_poOrderDetail.vue index 46411cd..ee79981 100644 --- a/src/views/modules/order/com_poOrderDetail.vue +++ b/src/views/modules/order/com_poOrderDetail.vue @@ -69,7 +69,8 @@ export default { '数量': 'PO Qty', 'PO Value': 'PO Value', '金额': 'PO Value', - 'A-Qty': 'A-Qty', + 'ShippedQty': 'ShippedQty', + 'A_Qty': 'A_Qty', 'A-Value': 'A-Value', 'Departure Port': 'Departure Port', '出发港': 'Departure Port', diff --git a/src/views/modules/order/poOrder.vue b/src/views/modules/order/poOrder.vue index dcfe6a4..68669d6 100644 --- a/src/views/modules/order/poOrder.vue +++ b/src/views/modules/order/poOrder.vue @@ -1356,7 +1356,31 @@ export default { columnProp: 'shipQty', headerAlign: 'center', align: 'center', - columnLabel: 'A-Qty', + columnLabel: 'ShippedQty', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 80, + showOverflowTooltip: true, + // ShippedQty(c_ship_qty)由发货流程回写,仅展示。 + editAble: false, + editType: 'text', + selectOptionsKey: '', + selectOptions: null + }, + { + userId: this.$store.state.user.name, + functionId: 812003, + serialNumber: '812003Table1AQtySnapshot', + tableId: '812003Table1', + tableName: 'PO Order', + columnProp: 'aQty', + headerAlign: 'center', + align: 'center', + columnLabel: 'A_Qty', columnHidden: false, columnImage: false, columnSortable: false, @@ -1365,7 +1389,6 @@ export default { fixed: '', columnWidth: 80, showOverflowTooltip: true, - // A-Qty(c_ship_qty)为检验流程回写字段,按业务要求前端仅展示不可直接改写。 editAble: false, editType: 'text', selectOptionsKey: '', diff --git a/src/views/modules/order/poOrderAdvancedQueryConfig.js b/src/views/modules/order/poOrderAdvancedQueryConfig.js index a9eaa40..b6ec647 100644 --- a/src/views/modules/order/poOrderAdvancedQueryConfig.js +++ b/src/views/modules/order/poOrderAdvancedQueryConfig.js @@ -61,7 +61,8 @@ export const PO_ADVANCED_QUERY_FIELD_CONFIG = [ { sortOrder: 13, field: 'basePrice', label: '标准价格', sqlColumn: 'pod.base_price', dataType: 'number' }, { sortOrder: 14, field: 'qty', label: 'PO Qty', sqlColumn: 'pod.qty', dataType: 'number' }, { sortOrder: 14, field: 'value', label: 'PO Value', sqlColumn: 'pod.c_value', dataType: 'number' }, - { sortOrder: 15, field: 'shipQty', label: 'A-Qty', sqlColumn: 'pod.c_ship_qty', dataType: 'number' }, + { sortOrder: 15, field: 'shipQty', label: 'ShippedQty', sqlColumn: 'pod.c_ship_qty', dataType: 'number' }, + { sortOrder: 15, field: 'aQty', label: 'A_Qty', sqlColumn: 'pod.a_qty', dataType: 'number' }, { sortOrder: 16, field: 'sumPrice', label: 'A-Value', sqlColumn: 'pod.c_sum_price', dataType: 'number' }, { sortOrder: 17, field: 'departure', label: 'Departure Port', sqlColumn: 'poh.c_departure', dataType: 'string' }, { sortOrder: 18, field: 'destination', label: 'Destination Port', sqlColumn: 'poh.c_destination', dataType: 'string' }, diff --git a/src/views/modules/order/poOrder_search.vue b/src/views/modules/order/poOrder_search.vue index a9bbb7f..19fdee5 100644 --- a/src/views/modules/order/poOrder_search.vue +++ b/src/views/modules/order/poOrder_search.vue @@ -273,7 +273,15 @@ export default { }, { columnProp: 'shipQty', - columnLabel: 'A-Qty', + columnLabel: 'ShippedQty', + align: 'center', + columnWidth: 90, + showOverflowTooltip: true, + headerAlign: 'center' + }, + { + columnProp: 'aQty', + columnLabel: 'A_Qty', align: 'center', columnWidth: 80, showOverflowTooltip: true, diff --git a/src/views/modules/order/poOrder_search_en.vue b/src/views/modules/order/poOrder_search_en.vue index c1c9503..aa115e7 100644 --- a/src/views/modules/order/poOrder_search_en.vue +++ b/src/views/modules/order/poOrder_search_en.vue @@ -274,7 +274,15 @@ export default { }, { columnProp: 'shipQty', - columnLabel: 'A-Qty', + columnLabel: 'ShippedQty', + align: 'center', + columnWidth: 90, + showOverflowTooltip: true, + headerAlign: 'center' + }, + { + columnProp: 'aQty', + columnLabel: 'A_Qty', align: 'center', columnWidth: 80, showOverflowTooltip: true,