From 6a5ea9fd6535b6e483d8499c47f1844e94cdd997 Mon Sep 17 00:00:00 2001 From: TengXF <302828528@qq.com> Date: Tue, 23 Jul 2024 19:47:47 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E6=94=B6=E8=B4=A7?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E3=80=81=E5=AE=A2=E6=88=B7=E6=94=B6=E8=B4=A7?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E3=80=81=E5=AE=A2=E6=88=B7=E9=80=80=E8=B4=A7?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=EF=BC=8C=E6=89=B9=E6=AC=A1=E3=80=81=E5=8C=85?= =?UTF-8?q?=E8=A3=85=E8=A7=84=E6=A0=BC=E3=80=81=E5=8C=85=E8=A3=85=E6=95=B0?= =?UTF-8?q?=E9=87=8F=E6=B2=A1=E6=9C=89=E5=B8=A6=E5=87=BA=E3=80=81bug?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../customerreceiptRecordMain.data.ts | 17 ++++++++++++---- .../customerreceiptRequestMain.data.ts | 2 +- .../customerreturnRecordMain.data.ts | 20 ++++++++++++++++++- 3 files changed, 33 insertions(+), 6 deletions(-) diff --git a/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRecordMain/customerreceiptRecordMain.data.ts b/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRecordMain/customerreceiptRecordMain.data.ts index 976ac1f58..14f139488 100644 --- a/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRecordMain/customerreceiptRecordMain.data.ts +++ b/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRecordMain/customerreceiptRecordMain.data.ts @@ -483,15 +483,15 @@ export const CustomerreceiptRecordDetail = useCrudSchemas(reactive }, { label: '批次', - field: 'batch', + field: 'fromBatch', sort: 'custom', table: { width: 150 }, }, { - label: '包装代码', - field: 'packingNumber', + label: '包装号', + field: 'fromPackingNumber', sort: 'custom', table: { width: 150 @@ -506,7 +506,16 @@ export const CustomerreceiptRecordDetail = useCrudSchemas(reactive }, }, { - label: '数量', + label: '包装数量', + field: 'packQty', + sort: 'custom', + table: { + width: 150 + }, + isSearch: false, + }, + { + label: '收货数量', field: 'qty', sort: 'custom', table: { diff --git a/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/customerreceiptRequestMain.data.ts b/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/customerreceiptRequestMain.data.ts index 19d5b35c8..a39a9ce07 100644 --- a/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/customerreceiptRequestMain.data.ts +++ b/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/customerreceiptRequestMain.data.ts @@ -586,7 +586,7 @@ export const CustomerreceiptRequestDetail = useCrudSchemas(reactive( }, }, { - label: '数量', + label: '包装规格', + field: 'packUnit', + sort: 'custom', + table: { + width: 150 + }, + isSearch: false, + }, + { + label: '包装数量', + field: 'packQty', + sort: 'custom', + table: { + width: 150 + }, + isSearch: false, + }, + { + label: '退货数量', field: 'qty', sort: 'custom', table: { From 75ba7ab185d3117e3a28871e681327e0def12a4b Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Tue, 23 Jul 2024 19:50:46 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E7=BB=B4=E4=BF=AE=E5=A4=87=E4=BB=B6?= =?UTF-8?q?=E9=80=80=E8=B4=A7=E8=AE=B0=E5=BD=95=E5=AF=BC=E5=87=BA=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/purchasereturnRecordMain/index.ts | 10 ++++++++++ .../purchasereturnRecordSpareMain/index.vue | 4 ++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/api/wms/purchasereturnRecordMain/index.ts b/src/api/wms/purchasereturnRecordMain/index.ts index caa8fc615..27fa9161e 100644 --- a/src/api/wms/purchasereturnRecordMain/index.ts +++ b/src/api/wms/purchasereturnRecordMain/index.ts @@ -75,6 +75,16 @@ export const exportPurchasereturnRecordMain = async (params) => { } } +// 导出维修备件退货记录主 Excel +export const exportPurchasereturnRecordMainSpare = async (params) => { + if (params.isSearch) { + const data = {...params} + return await request.downloadPost({ url: `/wms/purchasereturn-record-main/export-excel-senior-spare`, data }) + } else { + return await request.download({url: `/wms/purchasereturn-record-main/export-excel-spare`, params}) + } +} + // 导出采购退货记录主 Excel export const exportPurchasereturnRecordMainSCP = async (params) => { if (params.isSearch) { diff --git a/src/views/wms/purchasereceiptManage/purchasereturnspare/purchasereturnRecordSpareMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturnspare/purchasereturnRecordSpareMain/index.vue index b45a912ed..5f5e2b9ed 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturnspare/purchasereturnRecordSpareMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereturnspare/purchasereturnRecordSpareMain/index.vue @@ -172,8 +172,8 @@ const handleExport = async () => { const data = await PurchasereturnRecordMainApi.exportPurchasereturnRecordMainSCP(tableObject.params) download.excel(data, `${t('ts.采购退货记录主')}.xlsx`) }else{ - const data = await PurchasereturnRecordMainApi.exportPurchasereturnRecordMain(tableObject.params) - download.excel(data, `${t('ts.采购退货记录主')}.xlsx`) + const data = await PurchasereturnRecordMainApi.exportPurchasereturnRecordMainSpare(tableObject.params) + download.excel(data, `维修备件退货记录主.xlsx`) } } catch { From 3582e2d195e5a0fd6e6391a8374619f4a15a58f2 Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Wed, 24 Jul 2024 09:07:32 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E7=BB=B4=E4=BF=AE=E5=A4=87=E4=BB=B6?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/purchasereturnRequestMain/index.ts | 10 ++++++++++ .../purchasereturnRequestSpareMain/index.vue | 4 ++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/api/wms/purchasereturnRequestMain/index.ts b/src/api/wms/purchasereturnRequestMain/index.ts index 10be8d9e6..03cad7705 100644 --- a/src/api/wms/purchasereturnRequestMain/index.ts +++ b/src/api/wms/purchasereturnRequestMain/index.ts @@ -73,6 +73,16 @@ export const exportPurchasereturnRequestMain = async (params) => { } } +// 导出采购退货申请主 Excel +export const exportPurchasereturnRequestMainSpare = async (params) => { + if (params.isSearch) { + const data = {...params} + return await request.downloadPost({ url: `/wms/purchasereturn-request-main/export-excel-senior-spare`, data }) + } else { + return await request.download({url: `/wms/purchasereturn-request-main/export-excel-spare`, params}) + } +} + // 下载用户导入模板 export const importTemplate = () => { return request.download({ url: '/wms/purchasereturn-request-main/get-import-template' }) diff --git a/src/views/wms/purchasereceiptManage/purchasereturnspare/purchasereturnRequestSpareMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturnspare/purchasereturnRequestSpareMain/index.vue index 758a5cfff..d3a256cab 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturnspare/purchasereturnRequestSpareMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereturnspare/purchasereturnRequestSpareMain/index.vue @@ -699,10 +699,10 @@ const handleExport = async () => { await message.exportConfirm() // 发起导出 exportLoading.value = true - const data = await PurchasereturnRequestMainApi.exportPurchasereturnRequestMain( + const data = await PurchasereturnRequestMainApi.exportPurchasereturnRequestMainSpare( tableObject.params ) - download.excel(data, '采购退货申请主.xlsx') + download.excel(data, '维修备件退货申请主.xlsx') } catch { } finally { exportLoading.value = false From df725a4834c7d3d49f614a6276085ad9625d6059 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Wed, 24 Jul 2024 09:15:19 +0800 Subject: [PATCH 4/4] =?UTF-8?q?scp=E9=87=87=E8=B4=AD=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E5=A4=B1=E5=8E=BB=E7=84=A6=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchaseMain/purchaseMain.data.ts | 36 ++++++++++++++++--- 1 file changed, 32 insertions(+), 4 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts index 42551cc5c..87b5c0300 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts @@ -4,7 +4,7 @@ import * as SupplierApi from '@/api/wms/supplier' import { Supplier } from '@/views/wms/basicDataManage/supplierManage/supplier/supplier.data' import * as SupplieritemApi from '@/api/wms/supplieritem' import { Supplieritem } from '@/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data' -import {validateHanset,validateEmail} from '@/utils/validator' +import { validateHanset, validateEmail } from '@/utils/validator' const { t } = useI18n() // 国际化 /** @@ -44,7 +44,15 @@ export const PurchaseMain = useCrudSchemas(reactive([ key: 'available', value: 'TRUE', isMainValue: false - }] + }], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: 'true', + isFormModel: true + }], // 失去焦点校验参数 } } }, @@ -421,7 +429,6 @@ export const PurchaseDetail = useCrudSchemas(reactive([ multiple:true,//多选 isInpuFocusShow: true, searchListPlaceholder: '请选择供应商物料', - isShowTableFormSearch: true, searchField: 'itemCode', searchTitle: '供应商物料信息', searchAllSchemas: Supplieritem.allSchemas, @@ -435,7 +442,19 @@ export const PurchaseDetail = useCrudSchemas(reactive([ key: 'available', value: 'TRUE', isMainValue: false - }] + }], + verificationPage: SupplieritemApi.getSupplierItemListByCodes, // tableForm下方输入框校验失去焦点之后是否正确的方法 + isShowTableFormSearch: true, //tableForm下方是否出现输入框 + isRepeat: true,//tableForm下方输入框是否可以重复添加该条数据 + // 失去焦点校验参数 + verificationParams: [{ + key: 'itemCode', + action: '==', + value: '', + isMainValue: false, + isSearch: 'true', + isFormModel: true, + }] }, form: { // labelMessage: '信息提示说明！！！', @@ -455,6 +474,15 @@ export const PurchaseDetail = useCrudSchemas(reactive([ key: 'available', value: 'TRUE', isMainValue: false + }], + // 失去焦点校验参数 + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: 'true', + isFormModel: true, }] } }