From 1fd2f4545390dae42c7a29e35801e1016171c7c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E8=83=9C=E6=A5=A0?= <2792649152@qq.com> Date: Fri, 20 Oct 2023 14:10:56 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/accountcalendar/index.ts | 5 +++++ src/api/wms/areabasic/index.ts | 5 +++++ src/api/wms/businesstype/index.ts | 5 +++++ src/api/wms/carrier/index.ts | 5 +++++ src/api/wms/condition/index.ts | 5 +++++ src/api/wms/configuration/index.ts | 5 +++++ src/api/wms/configurationsetting/index.ts | 5 +++++ src/api/wms/currencyexchange/index.ts | 5 +++++ src/api/wms/customer/index.ts | 5 +++++ src/api/wms/customerdock/index.ts | 5 +++++ src/api/wms/customeritem/index.ts | 5 +++++ src/api/wms/dock/index.ts | 5 +++++ src/api/wms/documentsetting/index.ts | 5 +++++ src/api/wms/jobsetting/index.ts | 5 +++++ src/api/wms/location/index.ts | 5 +++++ src/api/wms/locationgroup/index.ts | 5 +++++ src/api/wms/owner/index.ts | 5 +++++ src/api/wms/paramsetting/index.ts | 5 +++++ src/api/wms/process/index.ts | 5 +++++ src/api/wms/productionline/index.ts | 5 +++++ src/api/wms/project/index.ts | 5 +++++ src/api/wms/purchaseprice/index.ts | 5 +++++ src/api/wms/recordsetting/index.ts | 5 +++++ src/api/wms/requestsetting/index.ts | 5 +++++ src/api/wms/rule/index.ts | 5 +++++ src/api/wms/saleprice/index.ts | 5 +++++ src/api/wms/shift/index.ts | 5 +++++ src/api/wms/supplier/index.ts | 5 +++++ src/api/wms/supplieritem/index.ts | 5 +++++ src/api/wms/systemcalendar/index.ts | 5 +++++ src/api/wms/team/index.ts | 5 +++++ src/api/wms/transactiontype/index.ts | 5 +++++ src/api/wms/warehouse/index.ts | 5 +++++ src/api/wms/workshop/index.ts | 5 +++++ src/api/wms/workstation/index.ts | 5 +++++ src/components/BasicForm/src/BasicForm.vue | 10 ++++++++++ src/views/wms/accountcalendar/index.vue | 3 ++- src/views/wms/areabasic/index.vue | 9 +++------ src/views/wms/businesstype/index.vue | 11 ++++------- src/views/wms/carrier/index.vue | 3 ++- src/views/wms/condition/index.vue | 3 ++- src/views/wms/configuration/index.vue | 7 ++++--- src/views/wms/configurationsetting/index.vue | 3 ++- src/views/wms/currencyexchange/index.vue | 3 ++- src/views/wms/customer/index.vue | 3 ++- src/views/wms/customerdock/index.vue | 7 ++----- src/views/wms/customeritem/index.vue | 7 ++----- src/views/wms/dock/index.vue | 7 ++----- src/views/wms/documentsetting/index.vue | 3 ++- src/views/wms/jobsetting/index.vue | 3 ++- src/views/wms/location/index.vue | 3 ++- src/views/wms/locationgroup/index.vue | 7 ++----- src/views/wms/owner/index.vue | 3 ++- src/views/wms/paramsetting/index.vue | 3 ++- src/views/wms/process/index.vue | 7 ++----- src/views/wms/productionline/index.vue | 7 ++----- src/views/wms/project/index.vue | 7 ++----- src/views/wms/purchaseprice/index.vue | 7 ++----- src/views/wms/recordsetting/index.vue | 3 ++- src/views/wms/requestsetting/index.vue | 3 ++- src/views/wms/rule/index.vue | 3 ++- src/views/wms/saleprice/index.vue | 11 ++++------- src/views/wms/shift/index.vue | 3 ++- src/views/wms/supplier/index.vue | 3 ++- src/views/wms/supplieritem/index.vue | 9 +++------ src/views/wms/systemcalendar/index.vue | 3 ++- src/views/wms/team/index.vue | 3 ++- src/views/wms/transactiontype/index.vue | 3 ++- src/views/wms/warehouse/index.vue | 3 ++- src/views/wms/workshop/index.vue | 3 ++- src/views/wms/workstation/index.vue | 7 ++----- 71 files changed, 263 insertions(+), 95 deletions(-) diff --git a/src/api/wms/accountcalendar/index.ts b/src/api/wms/accountcalendar/index.ts index 24f646855..582df5361 100644 --- a/src/api/wms/accountcalendar/index.ts +++ b/src/api/wms/accountcalendar/index.ts @@ -42,3 +42,8 @@ export const deleteAccountcalendar = async (id: number) => { export const exportAccountcalendar = async (params) => { return await request.download({ url: `/wms/accountcalendar/export-excel`, params }) } + +// 下载用户导入模板 +export const importTemplate = () => { + return request.download({ url: '/wms/accountcalendar/get-import-template' }) +} \ No newline at end of file diff --git a/src/api/wms/areabasic/index.ts b/src/api/wms/areabasic/index.ts index f2182f46c..df31c9da1 100644 --- a/src/api/wms/areabasic/index.ts +++ b/src/api/wms/areabasic/index.ts @@ -42,3 +42,8 @@ export const deleteArea = async (id: number) => { export const exportArea = async (params) => { return await request.download({ url: `/wms/areabasic/export-excel`, params }) } + +// 下载用户导入模板 +export const importTemplate = () => { + return request.download({ url: '/wms/areabasic/get-import-template' }) +} \ No newline at end of file diff --git a/src/api/wms/businesstype/index.ts b/src/api/wms/businesstype/index.ts index 8ebb52fa3..83174db53 100644 --- a/src/api/wms/businesstype/index.ts +++ b/src/api/wms/businesstype/index.ts @@ -52,3 +52,8 @@ export const deleteBusinesstype = async (id: number) => { export const exportBusinesstype = async (params) => { return await request.download({ url: `/wms/businesstype/export-excel`, params }) } + +// 下载用户导入模板 +export const importTemplate = () => { + return request.download({ url: '/wms/businesstype/get-import-template' }) +} \ No newline at end of file diff --git a/src/api/wms/carrier/index.ts b/src/api/wms/carrier/index.ts index db868adc5..9f169dc6a 100644 --- a/src/api/wms/carrier/index.ts +++ b/src/api/wms/carrier/index.ts @@ -50,3 +50,8 @@ export const deleteCarrier = async (id: number) => { export const exportCarrier = async (params) => { return await request.download({ url: `/wms/carrier/export-excel`, params }) } + +// 下载用户导入模板 +export const importTemplate = () => { + return request.download({ url: '/wms/carrier/get-import-template' }) +} \ No newline at end of file diff --git a/src/api/wms/condition/index.ts b/src/api/wms/condition/index.ts index 32d792c42..16bb79da4 100644 --- a/src/api/wms/condition/index.ts +++ b/src/api/wms/condition/index.ts @@ -38,3 +38,8 @@ export const deleteCondition = async (id: number) => { export const exportCondition = async (params) => { return await request.download({ url: `/wms/condition/export-excel`, params }) } + +// 下载用户导入模板 +export const importTemplate = () => { + return request.download({ url: '/wms/condition/get-import-template' }) +} \ No newline at end of file diff --git a/src/api/wms/configuration/index.ts b/src/api/wms/configuration/index.ts index 19410fe54..ae9c25310 100644 --- a/src/api/wms/configuration/index.ts +++ b/src/api/wms/configuration/index.ts @@ -38,3 +38,8 @@ export const deleteConfiguration = async (id: number) => { export const exportConfiguration = async (params) => { return await request.download({ url: `/wms/configuration/export-excel`, params }) } + +// 下载用户导入模板 +export const importTemplate = () => { + return request.download({ url: '/wms/configuration/get-import-template' }) +} \ No newline at end of file diff --git a/src/api/wms/configurationsetting/index.ts b/src/api/wms/configurationsetting/index.ts index c6e00c40f..cfc842697 100644 --- a/src/api/wms/configurationsetting/index.ts +++ b/src/api/wms/configurationsetting/index.ts @@ -40,3 +40,8 @@ export const deleteConfigurationsetting = async (id: number) => { export const exportConfigurationsetting = async (params) => { return await request.download({ url: `/wms/configurationsetting/export-excel`, params }) } + +// 下载用户导入模板 +export const importTemplate = () => { + return request.download({ url: '/wms/configurationsetting/get-import-template' }) +} \ No newline at end of file diff --git a/src/api/wms/currencyexchange/index.ts b/src/api/wms/currencyexchange/index.ts index ac12d6b22..f56a6f71b 100644 --- a/src/api/wms/currencyexchange/index.ts +++ b/src/api/wms/currencyexchange/index.ts @@ -39,3 +39,8 @@ export const deleteCurrencyexchange = async (id: number) => { export const exportCurrencyexchange = async (params) => { return await request.download({ url: `/wms/currencyexchange/export-excel`, params }) } + +// 下载用户导入模板 +export const importTemplate = () => { + return request.download({ url: '/wms/currencyexchange/get-import-template' }) +} \ No newline at end of file diff --git a/src/api/wms/customer/index.ts b/src/api/wms/customer/index.ts index ad259c4db..494b920a8 100644 --- a/src/api/wms/customer/index.ts +++ b/src/api/wms/customer/index.ts @@ -50,3 +50,8 @@ export const deleteCustomer = async (id: number) => { export const exportCustomer = async (params) => { return await request.download({ url: `/wms/customer/export-excel`, params }) } + +// 下载用户导入模板 +export const importTemplate = () => { + return request.download({ url: '/wms/customer/get-import-template' }) +} diff --git a/src/api/wms/customerdock/index.ts b/src/api/wms/customerdock/index.ts index de30ea128..471e34ece 100644 --- a/src/api/wms/customerdock/index.ts +++ b/src/api/wms/customerdock/index.ts @@ -46,3 +46,8 @@ export const deleteCustomerdock = async (id: number) => { export const exportCustomerdock = async (params) => { return await request.download({ url: `/wms/customerdock/export-excel`, params }) } + +// 下载用户导入模板 +export const importTemplate = () => { + return request.download({ url: '/wms/customerdock/get-import-template' }) +} diff --git a/src/api/wms/customeritem/index.ts b/src/api/wms/customeritem/index.ts index c4a31ecc1..8da7893fa 100644 --- a/src/api/wms/customeritem/index.ts +++ b/src/api/wms/customeritem/index.ts @@ -46,3 +46,8 @@ export const deleteCustomeritem = async (id: number) => { export const exportCustomeritem = async (params) => { return await request.download({ url: `/wms/customeritem/export-excel`, params }) } + +// 下载用户导入模板 +export const importTemplate = () => { + return request.download({ url: '/wms/customeritem/get-import-template' }) +} \ No newline at end of file diff --git a/src/api/wms/dock/index.ts b/src/api/wms/dock/index.ts index 307bebe94..894986ba7 100644 --- a/src/api/wms/dock/index.ts +++ b/src/api/wms/dock/index.ts @@ -46,3 +46,8 @@ export const deleteDock = async (id: number) => { export const exportDock = async (params) => { return await request.download({ url: `/wms/dock/export-excel`, params }) } + +// 下载用户导入模板 +export const importTemplate = () => { + return request.download({ url: '/wms/dock/get-import-template' }) +} \ No newline at end of file diff --git a/src/api/wms/documentsetting/index.ts b/src/api/wms/documentsetting/index.ts index ee9b4ade3..b09c9e193 100644 --- a/src/api/wms/documentsetting/index.ts +++ b/src/api/wms/documentsetting/index.ts @@ -47,3 +47,8 @@ export const deleteDocumentsetting = async (id: number) => { export const exportDocumentsetting = async (params) => { return await request.download({ url: `/wms/documentsetting/export-excel`, params }) } + +// 下载用户导入模板 +export const importTemplate = () => { + return request.download({ url: '/wms/documentsetting/get-import-template' }) +} \ No newline at end of file diff --git a/src/api/wms/jobsetting/index.ts b/src/api/wms/jobsetting/index.ts index 1ed025b18..45442c0d8 100644 --- a/src/api/wms/jobsetting/index.ts +++ b/src/api/wms/jobsetting/index.ts @@ -49,3 +49,8 @@ export const deleteJobsetting = async (id: number) => { export const exportJobsetting = async (params) => { return await request.download({ url: `/wms/jobsetting/export-excel`, params }) } + +// 下载用户导入模板 +export const importTemplate = () => { + return request.download({ url: '/wms/jobsetting/get-import-template' }) +} \ No newline at end of file diff --git a/src/api/wms/location/index.ts b/src/api/wms/location/index.ts index 75f9c9606..09dd937d4 100644 --- a/src/api/wms/location/index.ts +++ b/src/api/wms/location/index.ts @@ -53,3 +53,8 @@ export const deleteLocation = async (id: number) => { export const exportLocation = async (params) => { return await request.download({ url: `/wms/location/export-excel`, params }) } + +// 下载用户导入模板 +export const importTemplate = () => { + return request.download({ url: '/wms/location/get-import-template' }) +} \ No newline at end of file diff --git a/src/api/wms/locationgroup/index.ts b/src/api/wms/locationgroup/index.ts index 0e9456607..b7e316b1a 100644 --- a/src/api/wms/locationgroup/index.ts +++ b/src/api/wms/locationgroup/index.ts @@ -41,3 +41,8 @@ export const deleteLocationgroup = async (id: number) => { export const exportLocationgroup = async (params) => { return await request.download({ url: `/wms/locationgroup/export-excel`, params }) } + +// 下载用户导入模板 +export const importTemplate = () => { + return request.download({ url: '/wms/locationgroup/get-import-template' }) +} \ No newline at end of file diff --git a/src/api/wms/owner/index.ts b/src/api/wms/owner/index.ts index d2520b883..d453b6148 100644 --- a/src/api/wms/owner/index.ts +++ b/src/api/wms/owner/index.ts @@ -50,3 +50,8 @@ export const deleteOwner = async (id: number) => { export const exportOwner = async (params) => { return await request.download({ url: `/wms/owner/export-excel`, params }) } + +// 下载用户导入模板 +export const importTemplate = () => { + return request.download({ url: '/wms/owner/get-import-template' }) +} \ No newline at end of file diff --git a/src/api/wms/paramsetting/index.ts b/src/api/wms/paramsetting/index.ts index 992d80e24..533b92540 100644 --- a/src/api/wms/paramsetting/index.ts +++ b/src/api/wms/paramsetting/index.ts @@ -41,3 +41,8 @@ export const deleteParamsetting = async (id: number) => { export const exportParamsetting = async (params) => { return await request.download({ url: `/wms/paramsetting/export-excel`, params }) } + +// 下载用户导入模板 +export const importTemplate = () => { + return request.download({ url: '/wms/paramsetting/get-import-template' }) +} \ No newline at end of file diff --git a/src/api/wms/process/index.ts b/src/api/wms/process/index.ts index de95f5b4e..954a4a662 100644 --- a/src/api/wms/process/index.ts +++ b/src/api/wms/process/index.ts @@ -42,3 +42,8 @@ export const deleteProcess = async (id: number) => { export const exportProcess = async (params) => { return await request.download({ url: `/wms/process/export-excel`, params }) } + +// 下载用户导入模板 +export const importTemplate = () => { + return request.download({ url: '/wms/process/get-import-template' }) +} \ No newline at end of file diff --git a/src/api/wms/productionline/index.ts b/src/api/wms/productionline/index.ts index 0d7ff8a94..fb097d48d 100644 --- a/src/api/wms/productionline/index.ts +++ b/src/api/wms/productionline/index.ts @@ -43,3 +43,8 @@ export const deleteProductionline = async (id: number) => { export const exportProductionline = async (params) => { return await request.download({ url: `/wms/productionline/export-excel`, params }) } + +// 下载用户导入模板 +export const importTemplate = () => { + return request.download({ url: '/wms/productionline/get-import-template' }) +} \ No newline at end of file diff --git a/src/api/wms/project/index.ts b/src/api/wms/project/index.ts index 8652e22f7..37d754e8b 100644 --- a/src/api/wms/project/index.ts +++ b/src/api/wms/project/index.ts @@ -40,3 +40,8 @@ export const deleteProject = async (id: number) => { export const exportProject = async (params) => { return await request.download({ url: `/wms/project/export-excel`, params }) } + +// 下载用户导入模板 +export const importTemplate = () => { + return request.download({ url: '/wms/project/get-import-template' }) +} \ No newline at end of file diff --git a/src/api/wms/purchaseprice/index.ts b/src/api/wms/purchaseprice/index.ts index c0ba7b4db..9583dc310 100644 --- a/src/api/wms/purchaseprice/index.ts +++ b/src/api/wms/purchaseprice/index.ts @@ -40,3 +40,8 @@ export const deletePurchaseprice = async (id: number) => { export const exportPurchaseprice = async (params) => { return await request.download({ url: `/wms/purchaseprice/export-excel`, params }) } + +// 下载用户导入模板 +export const importTemplate = () => { + return request.download({ url: '/wms/purchaseprice/get-import-template' }) +} diff --git a/src/api/wms/recordsetting/index.ts b/src/api/wms/recordsetting/index.ts index c47b31f48..9c8e32ca2 100644 --- a/src/api/wms/recordsetting/index.ts +++ b/src/api/wms/recordsetting/index.ts @@ -39,3 +39,8 @@ export const deleteRecordsetting = async (id: number) => { export const exportRecordsetting = async (params) => { return await request.download({ url: `/wms/recordsetting/export-excel`, params }) } + +// 下载用户导入模板 +export const importTemplate = () => { + return request.download({ url: '/wms/recordsetting/get-import-template' }) +} \ No newline at end of file diff --git a/src/api/wms/requestsetting/index.ts b/src/api/wms/requestsetting/index.ts index d246d0c76..ffc184456 100644 --- a/src/api/wms/requestsetting/index.ts +++ b/src/api/wms/requestsetting/index.ts @@ -43,3 +43,8 @@ export const deleteRequestsetting = async (id: number) => { export const exportRequestsetting = async (params) => { return await request.download({ url: `/wms/requestsetting/export-excel`, params }) } + +// 下载用户导入模板 +export const importTemplate = () => { + return request.download({ url: '/wms/requestsetting/get-import-template' }) +} \ No newline at end of file diff --git a/src/api/wms/rule/index.ts b/src/api/wms/rule/index.ts index 9234a7b88..81fc49f20 100644 --- a/src/api/wms/rule/index.ts +++ b/src/api/wms/rule/index.ts @@ -39,3 +39,8 @@ export const deleteRule = async (id: number) => { export const exportRule = async (params) => { return await request.download({ url: `/wms/rule/export-excel`, params }) } + +// 下载用户导入模板 +export const importTemplate = () => { + return request.download({ url: '/wms/rule/get-import-template' }) +} \ No newline at end of file diff --git a/src/api/wms/saleprice/index.ts b/src/api/wms/saleprice/index.ts index 73c00ef3f..4748b345e 100644 --- a/src/api/wms/saleprice/index.ts +++ b/src/api/wms/saleprice/index.ts @@ -40,3 +40,8 @@ export const deleteSaleprice = async (id: number) => { export const exportSaleprice = async (params) => { return await request.download({ url: `/wms/saleprice/export-excel`, params }) } + +// 下载用户导入模板 +export const importTemplate = () => { + return request.download({ url: '/wms/saleprice/get-import-template' }) +} \ No newline at end of file diff --git a/src/api/wms/shift/index.ts b/src/api/wms/shift/index.ts index fe63bea59..f2557e273 100644 --- a/src/api/wms/shift/index.ts +++ b/src/api/wms/shift/index.ts @@ -42,3 +42,8 @@ export const deleteShift = async (id: number) => { export const exportShift = async (params) => { return await request.download({ url: `/wms/shift/export-excel`, params }) } + +// 下载用户导入模板 +export const importTemplate = () => { + return request.download({ url: '/wms/shift/get-import-template' }) +} \ No newline at end of file diff --git a/src/api/wms/supplier/index.ts b/src/api/wms/supplier/index.ts index 73451930c..ed39172a4 100644 --- a/src/api/wms/supplier/index.ts +++ b/src/api/wms/supplier/index.ts @@ -50,3 +50,8 @@ export const deleteSupplier = async (id: number) => { export const exportSupplier = async (params) => { return await request.download({ url: `/wms/supplier/export-excel`, params }) } + +// 下载用户导入模板 +export const importTemplate = () => { + return request.download({ url: '/wms/supplier/get-import-template' }) +} diff --git a/src/api/wms/supplieritem/index.ts b/src/api/wms/supplieritem/index.ts index a9abb5761..dbf46ecfc 100644 --- a/src/api/wms/supplieritem/index.ts +++ b/src/api/wms/supplieritem/index.ts @@ -49,3 +49,8 @@ export const deleteSupplieritem = async (id: number) => { export const exportSupplieritem = async (params) => { return await request.download({ url: `/wms/supplieritem/export-excel`, params }) } + +// 下载用户导入模板 +export const importTemplate = () => { + return request.download({ url: '/wms/supplieritem/get-import-template' }) +} \ No newline at end of file diff --git a/src/api/wms/systemcalendar/index.ts b/src/api/wms/systemcalendar/index.ts index a1d483faa..89c2720ab 100644 --- a/src/api/wms/systemcalendar/index.ts +++ b/src/api/wms/systemcalendar/index.ts @@ -39,3 +39,8 @@ export const deleteSystemcalendar = async (id: number) => { export const exportSystemcalendar = async (params) => { return await request.download({ url: `/wms/systemcalendar/export-excel`, params }) } + +// 下载用户导入模板 +export const importTemplate = () => { + return request.download({ url: '/wms/systemcalendar/get-import-template' }) +} \ No newline at end of file diff --git a/src/api/wms/team/index.ts b/src/api/wms/team/index.ts index 2174cb1cc..9e6c4c13b 100644 --- a/src/api/wms/team/index.ts +++ b/src/api/wms/team/index.ts @@ -40,3 +40,8 @@ export const deleteTeam = async (id: number) => { export const exportTeam = async (params) => { return await request.download({ url: `/wms/team/export-excel`, params }) } + +// 下载用户导入模板 +export const importTemplate = () => { + return request.download({ url: '/wms/team/get-import-template' }) +} \ No newline at end of file diff --git a/src/api/wms/transactiontype/index.ts b/src/api/wms/transactiontype/index.ts index e9efc57d1..ac0070487 100644 --- a/src/api/wms/transactiontype/index.ts +++ b/src/api/wms/transactiontype/index.ts @@ -42,3 +42,8 @@ export const deleteTransactiontype = async (id: number) => { export const exportTransactiontype = async (params) => { return await request.download({ url: `/wms/transactiontype/export-excel`, params }) } + +// 下载用户导入模板 +export const importTemplate = () => { + return request.download({ url: '/wms/transactiontype/get-import-template' }) +} \ No newline at end of file diff --git a/src/api/wms/warehouse/index.ts b/src/api/wms/warehouse/index.ts index fd61d2d0a..0b1b9c326 100644 --- a/src/api/wms/warehouse/index.ts +++ b/src/api/wms/warehouse/index.ts @@ -40,3 +40,8 @@ export const deleteWarehouse = async (id: number) => { export const exportWarehouse = async (params) => { return await request.download({ url: `/wms/warehouse/export-excel`, params }) } + +// 下载用户导入模板 +export const importTemplate = () => { + return request.download({ url: '/wms/warehouse/get-import-template' }) +} \ No newline at end of file diff --git a/src/api/wms/workshop/index.ts b/src/api/wms/workshop/index.ts index ebd59ce56..0620d115f 100644 --- a/src/api/wms/workshop/index.ts +++ b/src/api/wms/workshop/index.ts @@ -40,3 +40,8 @@ export const deleteWorkshop = async (id: number) => { export const exportWorkshop = async (params) => { return await request.download({ url: `/wms/workshop/export-excel`, params }) } + +// 下载用户导入模板 +export const importTemplate = () => { + return request.download({ url: '/wms/workshop/get-import-template' }) +} \ No newline at end of file diff --git a/src/api/wms/workstation/index.ts b/src/api/wms/workstation/index.ts index 24f034794..e227fa763 100644 --- a/src/api/wms/workstation/index.ts +++ b/src/api/wms/workstation/index.ts @@ -49,3 +49,8 @@ export const exportWorkstation = async (params) => { export const importWorkstationTemplate = () => { return request.download({ url: '/wms/workstation/get-import-template' }) } + +// 下载用户导入模板 +export const importTemplate = () => { + return request.download({ url: '/wms/workstation/get-import-template' }) +} diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue index 297d6f92b..1f2ed6bea 100644 --- a/src/components/BasicForm/src/BasicForm.vue +++ b/src/components/BasicForm/src/BasicForm.vue @@ -84,6 +84,16 @@ + +
{ } /** 初始化 **/ -onMounted(() => { +onMounted(async() => { getList() + importTemplateData.templateUrl = await AccountcalendarApi.importTemplate() }) diff --git a/src/views/wms/areabasic/index.vue b/src/views/wms/areabasic/index.vue index 5d9b59dc7..4df456b17 100644 --- a/src/views/wms/areabasic/index.vue +++ b/src/views/wms/areabasic/index.vue @@ -48,7 +48,7 @@ - + diff --git a/src/views/wms/businesstype/index.vue b/src/views/wms/businesstype/index.vue index e44811f3b..07d7366a5 100644 --- a/src/views/wms/businesstype/index.vue +++ b/src/views/wms/businesstype/index.vue @@ -143,10 +143,6 @@ const openForm = (type: string, row?: any) => { // 查询页面返回 const searchTableSuccess = (formField, searchField, val, formRef) => { - console.log(144, formField) - console.log(145, searchField) - console.log(146, val) - console.log(147, formRef) nextTick(() => { const setV = {} setV[formField] = val[0][searchField] @@ -182,7 +178,7 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await BusinesstypeApi.exportBusinesstype(setSearchParams) - download.excel(data, '仓库.xls') + download.excel(data, '业务类型.xls') } catch { } finally { exportLoading.value = false @@ -197,7 +193,7 @@ const handleImport = () => { // 导入附件弹窗所需的参数 const importTemplateData = reactive({ templateUrl: '', - templateTitle: '仓库导入模版.xls' + templateTitle: '业务类型导入模版.xls' }) // 导入成功之后 const importSuccess = () => { @@ -205,7 +201,8 @@ const importSuccess = () => { } /** 初始化 **/ -onMounted(() => { +onMounted(async() => { getList() + importTemplateData.templateUrl = await BusinesstypeApi.importTemplate() }) diff --git a/src/views/wms/carrier/index.vue b/src/views/wms/carrier/index.vue index 307237e90..cc2ea6a93 100644 --- a/src/views/wms/carrier/index.vue +++ b/src/views/wms/carrier/index.vue @@ -177,7 +177,8 @@ const importSuccess = () => { } /** 初始化 **/ -onMounted(() => { +onMounted(async() => { getList() + importTemplateData.templateUrl = await CarrierApi.importTemplate() }) diff --git a/src/views/wms/condition/index.vue b/src/views/wms/condition/index.vue index 492cf8913..13c305f73 100644 --- a/src/views/wms/condition/index.vue +++ b/src/views/wms/condition/index.vue @@ -180,7 +180,8 @@ const importSuccess = () => { } /** 初始化 **/ -onMounted(() => { +onMounted(async() => { getList() + importTemplateData.templateUrl = await ConditionApi.importTemplate() }) \ No newline at end of file diff --git a/src/views/wms/configuration/index.vue b/src/views/wms/configuration/index.vue index 44bfc20db..a7bc37f23 100644 --- a/src/views/wms/configuration/index.vue +++ b/src/views/wms/configuration/index.vue @@ -157,7 +157,7 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await ConfigurationApi.exportConfiguration(setSearchParams) - download.excel(data, '仓库.xls') + download.excel(data, '配置.xls') } catch { } finally { exportLoading.value = false @@ -172,7 +172,7 @@ const handleImport = () => { // 导入附件弹窗所需的参数 const importTemplateData = reactive({ templateUrl: '', - templateTitle: '仓库导入模版.xls' + templateTitle: '配置导入模版.xls' }) // 导入成功之后 const importSuccess = () => { @@ -180,7 +180,8 @@ const importSuccess = () => { } /** 初始化 **/ -onMounted(() => { +onMounted(async() => { getList() + importTemplateData.templateUrl = await ConfigurationApi.importTemplate() }) \ No newline at end of file diff --git a/src/views/wms/configurationsetting/index.vue b/src/views/wms/configurationsetting/index.vue index a175ed31f..b5fe5fbea 100644 --- a/src/views/wms/configurationsetting/index.vue +++ b/src/views/wms/configurationsetting/index.vue @@ -180,7 +180,8 @@ const importSuccess = () => { } /** 初始化 **/ -onMounted(() => { +onMounted(async() => { getList() + importTemplateData.templateUrl = await ConfigurationsettingApi.importTemplate() }) \ No newline at end of file diff --git a/src/views/wms/currencyexchange/index.vue b/src/views/wms/currencyexchange/index.vue index 60ff47002..ef1b287e7 100644 --- a/src/views/wms/currencyexchange/index.vue +++ b/src/views/wms/currencyexchange/index.vue @@ -177,7 +177,8 @@ const importSuccess = () => { } /** 初始化 **/ -onMounted(() => { +onMounted(async() => { getList() + importTemplateData.templateUrl = await CurrencyexchangeApi.importTemplate() }) diff --git a/src/views/wms/customer/index.vue b/src/views/wms/customer/index.vue index fe6a67dd1..ab9d10c60 100644 --- a/src/views/wms/customer/index.vue +++ b/src/views/wms/customer/index.vue @@ -177,7 +177,8 @@ const importSuccess = () => { } /** 初始化 **/ -onMounted(() => { +onMounted(async() => { getList() + importTemplateData.templateUrl = await CustomerApi.importTemplate() }) diff --git a/src/views/wms/customerdock/index.vue b/src/views/wms/customerdock/index.vue index fa3496dce..07a1c4b46 100644 --- a/src/views/wms/customerdock/index.vue +++ b/src/views/wms/customerdock/index.vue @@ -150,10 +150,6 @@ const openForm = (type: string, row?: any) => { // 查询页面返回 const searchTableSuccess = (formField, searchField, val, formRef) => { - console.log(144, formField) - console.log(145, searchField) - console.log(146, val) - console.log(147, formRef) nextTick(() => { const setV = {} setV[formField] = val[0][searchField] @@ -212,7 +208,8 @@ const importSuccess = () => { } /** 初始化 **/ -onMounted(() => { +onMounted(async() => { getList() + importTemplateData.templateUrl = await CustomerdockApi.importTemplate() }) diff --git a/src/views/wms/customeritem/index.vue b/src/views/wms/customeritem/index.vue index cc3afe833..339c72752 100644 --- a/src/views/wms/customeritem/index.vue +++ b/src/views/wms/customeritem/index.vue @@ -144,10 +144,6 @@ const openForm = (type: string, row?: any) => { // 查询页面返回 const searchTableSuccess = (formField, searchField, val, formRef) => { - console.log(144, formField) - console.log(145, searchField) - console.log(146, val) - console.log(147, formRef) nextTick(() => { const setV = {} setV[formField] = val[0][searchField] @@ -206,7 +202,8 @@ const importSuccess = () => { } /** 初始化 **/ -onMounted(() => { +onMounted(async() => { getList() + importTemplateData.templateUrl = await CustomeritemApi.importTemplate() }) diff --git a/src/views/wms/dock/index.vue b/src/views/wms/dock/index.vue index 4f9647426..76456e23e 100644 --- a/src/views/wms/dock/index.vue +++ b/src/views/wms/dock/index.vue @@ -144,10 +144,6 @@ const openForm = (type: string, row?: any) => { // 查询页面返回 const searchTableSuccess = (formField, searchField, val, formRef) => { - console.log(144, formField) - console.log(145, searchField) - console.log(146, val) - console.log(147, formRef) nextTick(() => { const setV = {} setV[formField] = val[0][searchField] @@ -206,7 +202,8 @@ const importSuccess = () => { } /** 初始化 **/ -onMounted(() => { +onMounted(async() => { getList() + importTemplateData.templateUrl = await DockApi.importTemplate() }) diff --git a/src/views/wms/documentsetting/index.vue b/src/views/wms/documentsetting/index.vue index 35b62ee8b..9bdddd6d1 100644 --- a/src/views/wms/documentsetting/index.vue +++ b/src/views/wms/documentsetting/index.vue @@ -180,7 +180,8 @@ const importSuccess = () => { } /** 初始化 **/ -onMounted(() => { +onMounted(async() => { getList() + importTemplateData.templateUrl = await DocumentsettingApi.importTemplate() }) \ No newline at end of file diff --git a/src/views/wms/jobsetting/index.vue b/src/views/wms/jobsetting/index.vue index 2d2f78d78..1aac34ff8 100644 --- a/src/views/wms/jobsetting/index.vue +++ b/src/views/wms/jobsetting/index.vue @@ -180,7 +180,8 @@ const importSuccess = () => { } /** 初始化 **/ -onMounted(() => { +onMounted(async() => { getList() + importTemplateData.templateUrl = await JobsettingApi.importTemplate() }) \ No newline at end of file diff --git a/src/views/wms/location/index.vue b/src/views/wms/location/index.vue index d737a4163..b4e4ceb5e 100644 --- a/src/views/wms/location/index.vue +++ b/src/views/wms/location/index.vue @@ -212,7 +212,8 @@ const importSuccess = () => { } /** 初始化 **/ -onMounted(() => { +onMounted(async() => { getList() + importTemplateData.templateUrl = await LocationApi.importTemplate() }) diff --git a/src/views/wms/locationgroup/index.vue b/src/views/wms/locationgroup/index.vue index 7c1ab264f..6100f32f1 100644 --- a/src/views/wms/locationgroup/index.vue +++ b/src/views/wms/locationgroup/index.vue @@ -144,10 +144,6 @@ const openForm = (type: string, row?: any) => { // 查询页面返回 const searchTableSuccess = (formField, searchField, val, formRef) => { - console.log(144, formField) - console.log(145, searchField) - console.log(146, val) - console.log(147, formRef) nextTick(() => { const setV = {} setV[formField] = val[0][searchField] @@ -206,7 +202,8 @@ const importSuccess = () => { } /** 初始化 **/ -onMounted(() => { +onMounted(async() => { getList() + importTemplateData.templateUrl = await LocationgroupApi.importTemplate() }) diff --git a/src/views/wms/owner/index.vue b/src/views/wms/owner/index.vue index 33b725560..c21ddf27c 100644 --- a/src/views/wms/owner/index.vue +++ b/src/views/wms/owner/index.vue @@ -177,7 +177,8 @@ const importSuccess = () => { } /** 初始化 **/ -onMounted(() => { +onMounted(async() => { getList() + importTemplateData.templateUrl = await OwnerApi.importTemplate() }) diff --git a/src/views/wms/paramsetting/index.vue b/src/views/wms/paramsetting/index.vue index b5eaf8ad5..2ddcc4143 100644 --- a/src/views/wms/paramsetting/index.vue +++ b/src/views/wms/paramsetting/index.vue @@ -180,7 +180,8 @@ const importSuccess = () => { } /** 初始化 **/ -onMounted(() => { +onMounted(async() => { getList() + importTemplateData.templateUrl = await ParamsettingApi.importTemplate() }) \ No newline at end of file diff --git a/src/views/wms/process/index.vue b/src/views/wms/process/index.vue index fd607c6a0..3d0e52bd4 100644 --- a/src/views/wms/process/index.vue +++ b/src/views/wms/process/index.vue @@ -144,10 +144,6 @@ const openForm = (type: string, row?: any) => { // 查询页面返回 const searchTableSuccess = (formField, searchField, val, formRef) => { - console.log(144, formField) - console.log(145, searchField) - console.log(146, val) - console.log(147, formRef) nextTick(() => { const setV = {} setV[formField] = val[0][searchField] @@ -206,7 +202,8 @@ const importSuccess = () => { } /** 初始化 **/ -onMounted(() => { +onMounted(async() => { getList() + importTemplateData.templateUrl = await ProcessApi.importTemplate() }) diff --git a/src/views/wms/productionline/index.vue b/src/views/wms/productionline/index.vue index 183c6d9f0..a81a7428b 100644 --- a/src/views/wms/productionline/index.vue +++ b/src/views/wms/productionline/index.vue @@ -149,10 +149,6 @@ const openForm = (type: string, row?: any) => { // 查询页面返回 const searchTableSuccess = (formField, searchField, val, formRef) => { - console.log(144, formField) - console.log(145, searchField) - console.log(146, val) - console.log(147, formRef) nextTick(() => { const setV = {} setV[formField] = val[0][searchField] @@ -211,7 +207,8 @@ const importSuccess = () => { } /** 初始化 **/ -onMounted(() => { +onMounted(async() => { getList() + importTemplateData.templateUrl = await ProductionlineApi.importTemplate() }) diff --git a/src/views/wms/project/index.vue b/src/views/wms/project/index.vue index 8bbdd38c1..10bfbe7da 100644 --- a/src/views/wms/project/index.vue +++ b/src/views/wms/project/index.vue @@ -138,10 +138,6 @@ const openForm = (type: string, row?: any) => { // 查询页面返回 const searchTableSuccess = (formField, searchField, val, formRef) => { - console.log(144, formField) - console.log(145, searchField) - console.log(146, val) - console.log(147, formRef) nextTick(() => { const setV = {} setV[formField] = val[0][searchField] @@ -200,7 +196,8 @@ const importSuccess = () => { } /** 初始化 **/ -onMounted(() => { +onMounted(async() => { getList() + importTemplateData.templateUrl = await ProjectApi.importTemplate() }) diff --git a/src/views/wms/purchaseprice/index.vue b/src/views/wms/purchaseprice/index.vue index 727cf0ec7..065caabf8 100644 --- a/src/views/wms/purchaseprice/index.vue +++ b/src/views/wms/purchaseprice/index.vue @@ -144,10 +144,6 @@ const openForm = (type: string, row?: any) => { // 查询页面返回 const searchTableSuccess = (formField, searchField, val, formRef) => { - console.log(144, formField) - console.log(145, searchField) - console.log(146, val) - console.log(147, formRef) nextTick(() => { const setV = {} setV[formField] = val[0][searchField] @@ -206,7 +202,8 @@ const importSuccess = () => { } /** 初始化 **/ -onMounted(() => { +onMounted(async() => { getList() + importTemplateData.templateUrl = await PurchasepriceApi.importTemplate() }) diff --git a/src/views/wms/recordsetting/index.vue b/src/views/wms/recordsetting/index.vue index 4301b7f69..9f7e6ba07 100644 --- a/src/views/wms/recordsetting/index.vue +++ b/src/views/wms/recordsetting/index.vue @@ -180,7 +180,8 @@ const importSuccess = () => { } /** 初始化 **/ -onMounted(() => { +onMounted(async() => { getList() + importTemplateData.templateUrl = await RecordsettingApi.importTemplate() }) \ No newline at end of file diff --git a/src/views/wms/requestsetting/index.vue b/src/views/wms/requestsetting/index.vue index 2869d86d9..7e0dff8f1 100644 --- a/src/views/wms/requestsetting/index.vue +++ b/src/views/wms/requestsetting/index.vue @@ -180,7 +180,8 @@ const importSuccess = () => { } /** 初始化 **/ -onMounted(() => { +onMounted(async() => { getList() + importTemplateData.templateUrl = await RequestsettingApi.importTemplate() }) \ No newline at end of file diff --git a/src/views/wms/rule/index.vue b/src/views/wms/rule/index.vue index 13ccb7b95..d694038ed 100644 --- a/src/views/wms/rule/index.vue +++ b/src/views/wms/rule/index.vue @@ -180,7 +180,8 @@ const importSuccess = () => { } /** 初始化 **/ -onMounted(() => { +onMounted(async() => { getList() + importTemplateData.templateUrl = await RuleApi.importTemplate() }) \ No newline at end of file diff --git a/src/views/wms/saleprice/index.vue b/src/views/wms/saleprice/index.vue index 21513bfd1..24f9afb7f 100644 --- a/src/views/wms/saleprice/index.vue +++ b/src/views/wms/saleprice/index.vue @@ -70,12 +70,12 @@ const { t } = useI18n() // 国际化 // 查询列表参数设置 const searchTableParams = ref([{ - formField: 'customerCode', + formField: 'customercode', searchTableTitle: '客户信息', searchTableAllSchemas: Customer.allSchemas, searchTablePage: CustomerApi.getCustomerPage },{ - formField: 'itemCode', + formField: 'itemcode', searchTableTitle: '物料信息', searchTableAllSchemas: ItemBasic.allSchemas, searchTablePage: ItembasicApi.getItembasicPage @@ -144,10 +144,6 @@ const openForm = (type: string, row?: any) => { // 查询页面返回 const searchTableSuccess = (formField, searchField, val, formRef) => { - console.log(144, formField) - console.log(145, searchField) - console.log(146, val) - console.log(147, formRef) nextTick(() => { const setV = {} setV[formField] = val[0][searchField] @@ -206,7 +202,8 @@ const importSuccess = () => { } /** 初始化 **/ -onMounted(() => { +onMounted(async() => { getList() + importTemplateData.templateUrl = await SalepriceApi.importTemplate() }) diff --git a/src/views/wms/shift/index.vue b/src/views/wms/shift/index.vue index d10ae70af..fd555f20d 100644 --- a/src/views/wms/shift/index.vue +++ b/src/views/wms/shift/index.vue @@ -177,7 +177,8 @@ const importSuccess = () => { } /** 初始化 **/ -onMounted(() => { +onMounted(async() => { getList() + importTemplateData.templateUrl = await ShiftApi.importTemplate() }) diff --git a/src/views/wms/supplier/index.vue b/src/views/wms/supplier/index.vue index 7235d3042..571207a59 100644 --- a/src/views/wms/supplier/index.vue +++ b/src/views/wms/supplier/index.vue @@ -177,7 +177,8 @@ const importSuccess = () => { } /** 初始化 **/ -onMounted(() => { +onMounted(async() => { getList() + importTemplateData.templateUrl = await SupplierApi.importTemplate() }) diff --git a/src/views/wms/supplieritem/index.vue b/src/views/wms/supplieritem/index.vue index a93df5787..ef48b835b 100644 --- a/src/views/wms/supplieritem/index.vue +++ b/src/views/wms/supplieritem/index.vue @@ -48,7 +48,7 @@ - + diff --git a/src/views/wms/systemcalendar/index.vue b/src/views/wms/systemcalendar/index.vue index 93640f4af..8f0b9ce67 100644 --- a/src/views/wms/systemcalendar/index.vue +++ b/src/views/wms/systemcalendar/index.vue @@ -177,7 +177,8 @@ const importSuccess = () => { } /** 初始化 **/ -onMounted(() => { +onMounted(async() => { getList() + importTemplateData.templateUrl = await SystemcalendarApi.importTemplate() }) diff --git a/src/views/wms/team/index.vue b/src/views/wms/team/index.vue index 6b28dc0e7..d8d5259c7 100644 --- a/src/views/wms/team/index.vue +++ b/src/views/wms/team/index.vue @@ -177,7 +177,8 @@ const importSuccess = () => { } /** 初始化 **/ -onMounted(() => { +onMounted(async() => { getList() + importTemplateData.templateUrl = await TeamApi.importTemplate() }) \ No newline at end of file diff --git a/src/views/wms/transactiontype/index.vue b/src/views/wms/transactiontype/index.vue index 6752db8a8..dd3c6d7fa 100644 --- a/src/views/wms/transactiontype/index.vue +++ b/src/views/wms/transactiontype/index.vue @@ -180,7 +180,8 @@ const importSuccess = () => { } /** 初始化 **/ -onMounted(() => { +onMounted(async() => { getList() + importTemplateData.templateUrl = await TransactiontypeApi.importTemplate() }) diff --git a/src/views/wms/warehouse/index.vue b/src/views/wms/warehouse/index.vue index 5d26791a1..bf9276778 100644 --- a/src/views/wms/warehouse/index.vue +++ b/src/views/wms/warehouse/index.vue @@ -176,7 +176,8 @@ const importSuccess = () => { } /** 初始化 **/ -onMounted(() => { +onMounted(async() => { getList() + importTemplateData.templateUrl = await WarehouseApi.importTemplate() }) diff --git a/src/views/wms/workshop/index.vue b/src/views/wms/workshop/index.vue index ee8999633..9b5595e03 100644 --- a/src/views/wms/workshop/index.vue +++ b/src/views/wms/workshop/index.vue @@ -176,7 +176,8 @@ const importSuccess = () => { } /** 初始化 **/ -onMounted(() => { +onMounted(async() => { getList() + importTemplateData.templateUrl = await WorkshopApi.importTemplate() }) diff --git a/src/views/wms/workstation/index.vue b/src/views/wms/workstation/index.vue index 770b5ede8..6f85e512f 100644 --- a/src/views/wms/workstation/index.vue +++ b/src/views/wms/workstation/index.vue @@ -155,10 +155,6 @@ const openForm = (type: string, row?: any) => { // 查询页面返回 const searchTableSuccess = (formField, searchField, val, formRef) => { - console.log(144, formField) - console.log(145, searchField) - console.log(146, val) - console.log(147, formRef) nextTick(() => { const setV = {} setV[formField] = val[0][searchField] @@ -217,7 +213,8 @@ const importSuccess = () => { } /** 初始化 **/ -onMounted(() => { +onMounted(async() => { getList() + importTemplateData.templateUrl = await WorkstationApi.importTemplate() }) From ffff480dce6eb89a39d0a7e753f360a3876993f9 Mon Sep 17 00:00:00 2001 From: zhangli <2235006734@qq.com> Date: Fri, 20 Oct 2023 15:13:53 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/detail/index.ts | 35 +++++++ src/components/Detail/src/Detail.vue | 135 +++++++++++-------------- src/components/Remarks/src/Remarks.vue | 41 +++++--- src/views/wms/itembasic/index.vue | 8 +- 4 files changed, 123 insertions(+), 96 deletions(-) create mode 100644 src/api/wms/detail/index.ts diff --git a/src/api/wms/detail/index.ts b/src/api/wms/detail/index.ts new file mode 100644 index 000000000..9bf57f699 --- /dev/null +++ b/src/api/wms/detail/index.ts @@ -0,0 +1,35 @@ +import request from '@/config/axios' + + +// 查询备注列表 +export const getRemarkPage = async (params) => { + return await request.get({ url: `/infra/remark/list`, params }) +} + +// // 查询库区详情 +// export const getArea = async (id: number) => { +// return await request.get({ url: `/wms/areabasic/get?id=` + id }) +// } + +// 新增备注 +export const createRemark= async (data) => { + return await request.post({ url: `/infra/remark/create`, data }) +} +// 查询变更记录列表 +export const getChangeRecordPage = async (params) => { + return await request.get({ url: `/infra/trends/list`, params }) +} +// // 修改库区 +// export const updateArea = async (data: AreaVO) => { +// return await request.put({ url: `/wms/areabasic/update`, data }) +// } + +// // 删除库区 +// export const deleteArea = async (id: number) => { +// return await request.delete({ url: `/wms/areabasic/delete?id=` + id }) +// } + +// // 导出库区 Excel +// export const exportArea = async (params) => { +// return await request.download({ url: `/wms/areabasic/export-excel`, params }) +// } diff --git a/src/components/Detail/src/Detail.vue b/src/components/Detail/src/Detail.vue index c3f0e8d1d..5dc338bbb 100644 --- a/src/components/Detail/src/Detail.vue +++ b/src/components/Detail/src/Detail.vue @@ -1,12 +1,13 @@ @@ -41,7 +38,8 @@ import Annex from '@/components/Annex/src/Annex.vue' import Remarks from '@/components/Remarks/src/Remarks.vue' import ChangeRecord from '@/components/ChangeRecord/src/ChangeRecord.vue' import Tabs from '@/components/Tabs/src/Tabs.vue' -import * as ItembasicApi from '@/api/wms/itembasic' +import * as DetailApi from '@/api/wms/detail' + defineOptions({ name: 'Detail' }) @@ -64,29 +62,15 @@ const props = defineProps({ required: true, default: null }, - // // 可以导入的文件类型 - // accept: { - // type: String, - // required: false, - // default:'.xlsx,.xls' - // }, - // // 是否更新已经存在的用户数据.默认值是1 - // mode: { - // type: Number, - // required: false, - // default: 1 - // }, - // url:{ - // type: String, - // required: false, - // } }) const isShowDrawer = ref(false) -const tabsList = ref(JSON.parse(JSON.stringify(props.tabs?props.tabs:''))) +const detailLoading = ref(false) + +const tabsList = ref(JSON.parse(JSON.stringify(props.tabs ? props.tabs : ''))) -if (tabsList.value&& tabsList.value.length>0) { +if (tabsList.value && tabsList.value.length > 0) { tabsList.value.unshift({ label: '详情', prop: 'Detail' @@ -112,17 +96,11 @@ const annexData = reactive({ time: '2022年12月12日 17:16:00', }] }) -// 备注默认数据 + +// 备注数据 const remarksData = reactive({ - remarksList: [{ - name: '诸葛亮', - text: '转朱阁，低绮户，照无眠。不应有恨，何事长向别时圆？人有悲欢离合，月有阴晴圆缺，此事古难全。但愿人长久，千里共婵娟。', - time: '2023年5月6日 17:16:00', - }, { - name: '刘备', - text: '转朱阁，低绮户，照无眠。不应有恨，何事长向别时圆？人有悲欢离合，月有阴晴圆缺，此事古难全。但愿人长久，千里共婵娟。', - time: '2022年12月12日 17:16:00', - }] + remarksList: [], + data:{} }) // 变更记录默认数据 @@ -151,13 +129,10 @@ const changeRecordData = reactive({ const detailData = ref("")//详情数据 // 导入成功之后 -const importSuccess = () => { +const importSuccess = () => {} - -} /** 搜索按钮操作 */ const handleQuery = () => { - importFormRef.value.open() } @@ -176,64 +151,68 @@ const handleImport = () => { const deleteAnnexSuccess = async () => { console.log('删除成功'); } -// 备注提交成功之后 -const remarksSubmitSucss = () => { - console.log('提交成功'); -} -// 供应商物品数据 -// const supplierItems = reactive({ -// supplierItemsList: [{ -// code: '646456', -// name: '978978' -// }], -// total: 20, -// pageSize: 1, -// currentPage: 2 -// }) - +// Tabs当前选择 const current = ref(0) -const detailLoading = ref(false) -// 获取表格数据 -const { tableObject, tableMethods } = useTable({ - getListApi: ItembasicApi.getItembasicPage // 分页接口 -}) const change = (item, index) => { current.value = index } -// 获得表格的各种操作 -const { getList } = tableMethods -getList() + /** 打开弹窗 */ const titleNameRef = ref() const titleValueRef = ref() -const openDetail = async (row: any, titleName: any, titleValue: any) => { +const openDetail = async (row: any, titleName: any, titleValue: any, tableName: any) => { titleNameRef.value = titleName titleValueRef.value = titleValue + remarksData.data = { + tableId: row.id, + tableName: tableName, + } isShowDrawer.value = true - console.log(216, row) if (row) { detailLoading.value = true try { - // detailData.value = await ItembasicApi.getItembasic(id) detailData.value = row + console.log(detailData.value); + getRemarkList() + getChangeRecordList() + } finally { detailLoading.value = false } } } defineExpose({ openDetail }) // 提供 open 方法，用于打开弹窗 + +// 获取备注列表 +const getRemarkList = async () => { + detailLoading.value = true + try { + remarksData.remarksList = await DetailApi.getRemarkPage(remarksData.data) + } finally { + detailLoading.value = false + } +} +// 备注提交成功之后 +const remarksSubmitScuess = async (remark) => { + detailLoading.value = false + getRemarkList() + getChangeRecordList() +} +// 获取变更记录 +const getChangeRecordList = async () => { + remarksData.remarksList = await DetailApi.getChangeRecordPage(remarksData.data) +} - + diff --git a/src/components/Remarks/src/Remarks.vue b/src/components/Remarks/src/Remarks.vue index eed1779c7..0e91a2e04 100644 --- a/src/components/Remarks/src/Remarks.vue +++ b/src/components/Remarks/src/Remarks.vue @@ -5,22 +5,23 @@
备注
-
+
- + +
-
{{ item.name }}
-
{{ item.time }}
+
{{ item.nickname }}
+
{{formatDate(item.createTime)}}
-
{{ item.text }}
+
{{ item.remark }}
- - + + 确定
@@ -28,30 +29,39 @@ @@ -82,6 +92,7 @@ const handleSubmit = ()=>{ display: flex; align-items: center; justify-content: center; + overflow: hidden; } .item-center { diff --git a/src/views/wms/itembasic/index.vue b/src/views/wms/itembasic/index.vue index 239f512c4..f6bfefd50 100644 --- a/src/views/wms/itembasic/index.vue +++ b/src/views/wms/itembasic/index.vue @@ -14,7 +14,7 @@ total: tableObject.total }" v-model:pageSize="tableObject.pageSize" v-model:currentPage="tableObject.currentPage"> @@ -55,6 +55,8 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons' import { ItemBasicTabsList } from '@/utils/disposition/tabsList' defineOptions({ name: 'Itembasic' }) +const route = useRoute(); //获取路由 + const { tableObject, tableMethods } = useTable({ getListApi: ItembasicApi.getItembasicPage // 分页接口 @@ -142,8 +144,8 @@ const openForm = (type: string, id?: number) => { basicFormRef.value.open(type, id) } const detailRef = ref() -const openDetail = (row: any, titleName: any, titleValue: any) => { - detailRef.value.openDetail(row, titleName, titleValue) +const openDetail = (row: any, titleName: any, titleValue: any, tableNameRef: any) => { + detailRef.value.openDetail(row, titleName, titleValue, tableNameRef) } /** 删除按钮操作 */ From 7d8e0d66e349928eca5ab90cb46540ffc153e3a3 Mon Sep 17 00:00:00 2001 From: zhangli <2235006734@qq.com> Date: Fri, 20 Oct 2023 17:21:10 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E9=AB=98=E5=BA=A6?= =?UTF-8?q?=EF=BC=8C=E5=8F=98=E6=9B=B4=E8=AE=B0=E5=BD=95=E5=92=8C=E5=A4=87?= =?UTF-8?q?=E6=B3=A8=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Detail/src/Detail.vue | 1 + src/components/Search/src/Search.vue | 76 ++-- src/components/Table/src/Table.vue | 5 + src/views/wms/itembasic/index.vue | 7 +- .../wms/purchaseclaimRequestMain/index.vue | 383 +++++------------- 5 files changed, 145 insertions(+), 327 deletions(-) diff --git a/src/components/Detail/src/Detail.vue b/src/components/Detail/src/Detail.vue index 5dc338bbb..7bcadad15 100644 --- a/src/components/Detail/src/Detail.vue +++ b/src/components/Detail/src/Detail.vue @@ -203,6 +203,7 @@ const remarksSubmitScuess = async (remark) => { } // 获取变更记录 const getChangeRecordList = async () => { + remarksData.data.tableId = '1679654720693248010' remarksData.remarksList = await DetailApi.getChangeRecordPage(remarksData.data) } diff --git a/src/components/Search/src/Search.vue b/src/components/Search/src/Search.vue index a9fbe9488..1d41701be 100644 --- a/src/components/Search/src/Search.vue +++ b/src/components/Search/src/Search.vue @@ -7,6 +7,9 @@ import { findIndex } from '@/utils' import { cloneDeep } from 'lodash-es' import { FormSchema } from '@/types/form' +import { useCache } from '@/hooks/web/useCache' +const { wsCache } = useCache() + defineOptions({ name: 'Search' }) const { t } = useI18n() @@ -97,44 +100,49 @@ const setVisible = () => { unref(elFormRef)?.resetFields() visible.value = !unref(visible) } +const Search = ref() +onMounted(() => { + nextTick(() => { + console.log(4) + console.log(Search.value.offsetHeight) + wsCache.set('SearchoffsetHeight', Search.value.offsetHeight) + console.log(wsCache.get('SearchoffsetHeight')) + console.log(4) + }) +})