From 2b64e4c72dffdbe8c3e9738cbd2a46aff5bc367e Mon Sep 17 00:00:00 2001 From: fengyuan_yang <1976974459@qq.com> Date: Thu, 18 Jun 2026 10:29:53 +0800 Subject: [PATCH] =?UTF-8?q?2026-06-18=20=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/qc/inboundNotification.vue | 2 +- src/views/modules/qc/outboundNotification.vue | 2 +- .../modules/warehouse/labelTransactionLog.vue | 102 ++++++++---------- 3 files changed, 49 insertions(+), 57 deletions(-) diff --git a/src/views/modules/qc/inboundNotification.vue b/src/views/modules/qc/inboundNotification.vue index b442153..1182e1e 100644 --- a/src/views/modules/qc/inboundNotification.vue +++ b/src/views/modules/qc/inboundNotification.vue @@ -199,7 +199,7 @@ - 打开 + 打开 diff --git a/src/views/modules/qc/outboundNotification.vue b/src/views/modules/qc/outboundNotification.vue index 61827db..e7ff13f 100644 --- a/src/views/modules/qc/outboundNotification.vue +++ b/src/views/modules/qc/outboundNotification.vue @@ -200,7 +200,7 @@ - 打开 + 打开 diff --git a/src/views/modules/warehouse/labelTransactionLog.vue b/src/views/modules/warehouse/labelTransactionLog.vue index db71468..1729c5c 100644 --- a/src/views/modules/warehouse/labelTransactionLog.vue +++ b/src/views/modules/warehouse/labelTransactionLog.vue @@ -202,17 +202,12 @@ - - - - - - - - - - - + + @@ -279,6 +274,20 @@ import { getSiteAndBuByUserName2 } from '@/api/qc/qc.js' import { getWarehouseList } from '@/api/wms/wms.js' import excel from '@/utils/excel-util.js' // 导入导出工具类 +const DOCUMENT_TYPE_LIST = [ + { label: '采购入库', value: '采购入库' }, + { label: '采购退货', value: '采购退货' }, + { label: '生产领料', value: '生产领料' }, + { label: '生产退仓', value: '生产退仓' }, + { label: '生产入库', value: '生产入库' }, + { label: '入库倒冲', value: '入库倒冲' }, + { label: '销售出库', value: '销售出库' }, + { label: '销售退货', value: '销售退货' }, + { label: '其他入库', value: '其他入库' }, + { label: '其他出库', value: '其他出库' }, + { label: '移库调拨', value: '移库调拨' } +] + export default { data() { return { @@ -302,18 +311,8 @@ export default { warehouseIdList: [] // 仓库筛选条件，支持多选 }, // 变动类型列表（不包含"变动明细"） - documentTypeList: [ - { label: '采购入库', value: '采购入库' }, - { label: '采购退货', value: '采购退货' }, - { label: '生产领料', value: '生产领料' }, - { label: '生产退仓', value: '生产退仓' }, - { label: '生产入库', value: '生产入库' }, - { label: '销售出库', value: '销售出库' }, - { label: '销售退货', value: '销售退货' }, - { label: '其他入库', value: '其他入库' }, - { label: '其他出库', value: '其他出库' }, - { label: '移库调拨', value: '移库调拨' } - ], + documentTypeList: DOCUMENT_TYPE_LIST, + tabList: [{ label: '变动明细', value: 'all' }, ...DOCUMENT_TYPE_LIST], activeTab: 'all', dataList: [], dataListLoading: false, @@ -438,25 +437,10 @@ export default { // 查询列表 getDataList() { this.dataListLoading = true - const params = { - buNo: this.searchData.buNo, - documentType: this.activeTab === 'all' ? this.searchData.documentType : this.activeTab, - rollNo: this.searchData.rollNo, - partNo: this.searchData.partNo, - partDesc: this.searchData.partDesc, - spec: this.searchData.spec, - startDate: this.searchData.startDate || '', - endDate: this.searchData.endDate || '', - transactionId: this.searchData.transactionId, - documentNo: this.searchData.documentNo, - orderNo: this.searchData.orderNo, - orderLineNo: this.searchData.orderLineNo, - batchNo: this.searchData.batchNo, - syncedFlag: this.searchData.syncedFlag, - warehouseIdList: this.searchData.warehouseIdList, // 仓库筛选条件 + const params = this.buildQueryParams({ page: this.pageIndex, limit: this.pageSize - } + }) labelTransactionLogList(params).then(({ data }) => { this.dataListLoading = false @@ -508,21 +492,7 @@ export default { } // 构造导出参数（与查询一致，但不分页） const exportParams = { - buNo: this.searchData.buNo, - documentType: this.activeTab === 'all' ? this.searchData.documentType : this.activeTab, - rollNo: this.searchData.rollNo, - partNo: this.searchData.partNo, - partDesc: this.searchData.partDesc, - spec: this.searchData.spec, - startDate: this.searchData.startDate || '', - endDate: this.searchData.endDate || '', - transactionId: this.searchData.transactionId, - documentNo: this.searchData.documentNo, - orderNo: this.searchData.orderNo, - orderLineNo: this.searchData.orderLineNo, - batchNo: this.searchData.batchNo, - syncedFlag: this.searchData.syncedFlag, - warehouseIdList: this.searchData.warehouseIdList, // 仓库筛选条件 + ...this.buildQueryParams(), userName: this.$store.state.user.name, page: 1, limit: 999999 // 使用大数字代替-1，SQL Server的FETCH子句不支持负数 @@ -563,6 +533,28 @@ export default { this.dataListSelections = val }, + // 构造查询参数，统一查询和导出的筛选逻辑 + buildQueryParams(extraParams = {}) { + return { + buNo: this.searchData.buNo, + documentType: this.activeTab === 'all' ? this.searchData.documentType : this.activeTab, + rollNo: this.searchData.rollNo, + partNo: this.searchData.partNo, + partDesc: this.searchData.partDesc, + spec: this.searchData.spec, + startDate: this.searchData.startDate || '', + endDate: this.searchData.endDate || '', + transactionId: this.searchData.transactionId, + documentNo: this.searchData.documentNo, + orderNo: this.searchData.orderNo, + orderLineNo: this.searchData.orderLineNo, + batchNo: this.searchData.batchNo, + syncedFlag: this.searchData.syncedFlag, + warehouseIdList: this.searchData.warehouseIdList, // 仓库筛选条件 + ...extraParams + } + }, + // 异常重试 exceptionRetryHandle() { if (this.dataListSelections.length === 0) {