From 7f14d49bc977331d16f25497755ecf7bab84ac02 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Sun, 18 Aug 2024 11:17:41 +0800 Subject: [PATCH] =?UTF-8?q?HL-5341SCP=E6=AD=A3=E5=BC=8F=E7=8E=AF=E5=A2=83?= =?UTF-8?q?=EF=BC=8C=E5=9C=A8=E7=94=B3=E8=AF=B7=E5=88=97=E8=A1=A8=E4=B8=AD?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E4=B8=8D=E6=98=BE=E7=A4=BA=E4=BD=9C=E5=BA=9F?= =?UTF-8?q?=E7=9A=84=E7=94=B3=E8=AF=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierinvoice/supplierinvoiceRecordMain/index.vue | 7 ++++++- .../supplierinvoiceRecordMain.data.ts | 7 +++++++ .../supplierinvoice/supplierinvoiceRequestMain/index.vue | 8 +++++++- .../supplierinvoiceRequestMain.data.ts | 7 +++++++ .../supplierinvoiceRequestMainDifference/index.vue | 7 ++++++- .../supplierinvoiceRequestMainDifference.data.ts | 7 +++++++ 6 files changed, 40 insertions(+), 3 deletions(-) diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue index 0ee70f35b..c794151db 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue @@ -280,7 +280,12 @@ const searchList = (model)=>{ model.postingDate[1] = model.postingDate[1].replace('00:00:00','23:59:59') } selectionRows.value = [] - setSearchParams(model) + let model1 = { + ...model, + statuss: model.status.join(',')?model.status.join(','):'' + } + delete model1.status + setSearchParams(model1) } const selectionRows = ref([]) const tableRef = ref() diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts index e14b82825..615b53c71 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts @@ -73,6 +73,13 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, + search: { + componentProps: { + multiple: true, + collapseTags: true, + collapseTagsTooltip: true, + } + }, isSearch: true, form: { value: '1', diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue index 8c363166d..06298c5ca 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue @@ -378,7 +378,12 @@ const searchTableParams = ref([ const formPurchasePassRef = ref() const searchList = (model) => { selectionRows.value = [] - setSearchParams(model) + let model1 = { + ...model, + statuss: model.status.join(',')?model.status.join(','):'' + } + delete model1.status + setSearchParams(model1) } const selectionRows = ref([]) const tableRef = ref() @@ -1175,6 +1180,7 @@ const handleExport = async () => { paramsData = { ...paramsData, checkNums: rows } } console.log('批量导出', paramsData) + return try { // 导出的二次确认 await message.exportConfirm() diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts index 07379eceb..2ccc023cc 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts @@ -220,6 +220,13 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive( }, sortTableDefault:9, isSearch: true, + search: { + componentProps: { + multiple: true, + collapseTags: true, + collapseTagsTooltip: true, + } + }, form: { value: '1', componentProps: { diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/index.vue index 815f5fb61..a3358fa02 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/index.vue +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/index.vue @@ -185,7 +185,12 @@ const searchList = (model)=>{ model.endDifferencePrice = endDifferencePrice.value console.log('searchList',model) selectionRows.value = [] - setSearchParams(model) + let model1 = { + ...model, + statuss: model.status.join(',')?model.status.join(','):'' + } + delete model1.status + setSearchParams(model1) } const resetList = (model)=>{ staDifferencePrice.value = null diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/supplierinvoiceRequestMainDifference.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/supplierinvoiceRequestMainDifference.data.ts index 44b57812b..eb3e00cfb 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/supplierinvoiceRequestMainDifference.data.ts +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/supplierinvoiceRequestMainDifference.data.ts @@ -212,6 +212,13 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive( }, sortTableDefault:9, isSearch: true, + search: { + componentProps: { + multiple: true, + collapseTags: true, + collapseTagsTooltip: true, + } + }, form: { value: '1', componentProps: {