From ba648b2376df9698751add5418481029b70af7d7 Mon Sep 17 00:00:00 2001 From: yejiaxing <591141169@qq.com> Date: Fri, 1 Dec 2023 17:31:12 +0800 Subject: [PATCH 1/2] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierdeliver/purchasePlanMain/index.vue | 3 ++- .../supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts | 4 ++-- .../supplierdeliverRequestMain.data.ts | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue index db519c5b1..000c0b82a 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue @@ -103,13 +103,14 @@ setV[formField] = val[0][searchField] setV['poNumber'] = val[0]['number'] setV['poLine'] = val[0]['lineNumber'] + formRef.setValues(setV) await PurchaseDetailApi.getPurchaseDetailPage({ number: setV['poNumber'], lineNumber: setV['poLine'], }).then(res => { if (res.list.length == 1) { + // 叶佳兴 setV['itemCode'] = res.list[0].itemCode - formRef.setValues(setV) } }) }) diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts index 4bc604bae..c38816691 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts @@ -304,7 +304,7 @@ export const PurchasePlanDetail = useCrudSchemas(reactive([ searchPage: PurchaseDetailApi.getPurchaseDetailPage, searchCondition: [{ key: 'number', - value: 'poNumber', + value: 'number', isMainValue: true }, { @@ -324,7 +324,7 @@ export const PurchasePlanDetail = useCrudSchemas(reactive([ searchPage: PurchaseDetailApi.getPurchaseDetailPage, searchCondition: [{ key: 'number', - value: 'number', + value: 'poNumber', isMainValue: true }, { diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts index e9d0aea7d..d71759e18 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts @@ -57,7 +57,7 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive( width: 150 }, isSearch: true, - isForm: false + isForm: true }, { label: '供应商代码', @@ -1011,4 +1011,4 @@ export const SupplierdeliverRequestDetailRules = reactive({ itemCode: [ { required: true, message: '请选择物品代码', trigger: 'change' } ], -}) \ No newline at end of file +}) From 29e53a8811d6fddbd70863b30565bf481c8a3087 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Mon, 4 Dec 2023 08:48:19 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E7=9B=98=E7=82=B9=EF=BC=8C=E9=87=87?= =?UTF-8?q?=E8=B4=AD=E6=94=B6=E8=B4=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/purchasereceiptRecordMain/index.ts | 7 ++++++- src/components/TableForm/src/TableForm.vue | 2 +- src/utils/dict.ts | 1 + .../purchasereceiptJobMain/purchasereceiptJobMain.data.ts | 4 ++-- .../purchasereceipt/purchasereceiptRecordMain/index.vue | 2 +- 5 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/api/wms/purchasereceiptRecordMain/index.ts b/src/api/wms/purchasereceiptRecordMain/index.ts index ea0c4c832..7c61327e9 100644 --- a/src/api/wms/purchasereceiptRecordMain/index.ts +++ b/src/api/wms/purchasereceiptRecordMain/index.ts @@ -66,7 +66,12 @@ export const deletePurchasereceiptRecordMain = async (id: number) => { // 导出采购收货记录主 Excel export const exportPurchasereceiptRecordMain = async (params) => { - return await request.download({ url: `/wms/purchasereceipt-record-main/export-excel`, params }) + if (params.isSearch) { + const data = {...params} + return await request.downloadPost({ url: `/wms/purchasereceipt-record-main/export-excel-senior`, data }) + } else { + return await request.download({ url: `/wms/purchasereceipt-record-main/export-excel`, params }) + } } // 下载用户导入模板 diff --git a/src/components/TableForm/src/TableForm.vue b/src/components/TableForm/src/TableForm.vue index 93e8260b4..f194382c8 100644 --- a/src/components/TableForm/src/TableForm.vue +++ b/src/components/TableForm/src/TableForm.vue @@ -112,7 +112,7 @@ :allow-create="headerItem?.tableForm.allowCreate" style="width: 100%" :placeholder="headerItem?.tableForm?.placeholder || '请选择' + headerItem.label" - @change="formSelectChange(row[headerItem.field], $event)"> + @change="formSelectChange(headerItem.field, $event)"> ([ }, { label: '承接人', - field: 'acceptUserId', + field: 'acceptUserName', sort: 'custom', table: { width: 150 @@ -247,7 +247,7 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive([ }, { label: '完成人', - field: 'completeUserId', + field: 'completeUserName', sort: 'custom', table: { width: 150 diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue index 6b9f776c5..add12c4f8 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue @@ -138,7 +138,7 @@ const handleExport = async () => { await message.exportConfirm() // 发起导出 exportLoading.value = true - const data = await PurchasereceiptRecordMainApi.exportPurchasereceiptRecordMain(setSearchParams) + const data = await PurchasereceiptRecordMainApi.exportPurchasereceiptRecordMain(tableObject.params) download.excel(data, '采购收货记录主.xlsx') } catch { } finally {