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: 'soNumber', - sort: 'custom', - table: { - width: 150 - }, - tableForm:{ - isInpuFocusShow: true, // 开启查询弹窗 - searchListPlaceholder: '请选择销售订单号', - searchField: 'number', - searchTitle: '销售订单信息', - searchAllSchemas: SaleDetail.allSchemas, - searchPage: SaleDetailApi.getSaleDetailPage, - searchCondition: [{ - key: 'available', - value: 'TRUE', - isMainValue: false - }] - }, - form: { - // labelMessage: '信息提示说明！！！', - componentProps: { - isSearchList: true, - searchListPlaceholder: '请选择销售订单号', - searchField: 'number', - searchTitle: '销售订单信息', - searchAllSchemas: SaleDetail.allSchemas, - searchPage: SaleDetailApi.getSaleDetailPage, - searchCondition: [{ - key: 'available', - value: 'TRUE', - isMainValue: false - }] - } - } - }, - { - label: '销售订单行', - field: 'soLine', - sort: 'custom', - table: { - width: 150 - }, - tableForm: { - disabled: true - }, - form: { - componentProps: { - disabled: true - } - } - }, + // { + // label: '销售订单号', + // field: 'soNumber', + // sort: 'custom', + // table: { + // width: 150 + // }, + // tableForm:{ + // isInpuFocusShow: true, // 开启查询弹窗 + // searchListPlaceholder: '请选择销售订单号', + // searchField: 'number', + // searchTitle: '销售订单信息', + // searchAllSchemas: SaleDetail.allSchemas, + // searchPage: SaleDetailApi.getSaleDetailPage, + // searchCondition: [{ + // key: 'available', + // value: 'TRUE', + // isMainValue: false + // }] + // }, + // form: { + // // labelMessage: '信息提示说明！！！', + // componentProps: { + // isSearchList: true, + // searchListPlaceholder: '请选择销售订单号', + // searchField: 'number', + // searchTitle: '销售订单信息', + // searchAllSchemas: SaleDetail.allSchemas, + // searchPage: SaleDetailApi.getSaleDetailPage, + // searchCondition: [{ + // key: 'available', + // value: 'TRUE', + // isMainValue: false + // }] + // } + // } + // }, + // { + // label: '销售订单行', + // field: 'soLine', + // sort: 'custom', + // table: { + // width: 150 + // }, + // tableForm: { + // disabled: true + // }, + // form: { + // componentProps: { + // disabled: true + // } + // } + // }, { label: '客户月台', field: 'customerDockCode', diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts index 2c2a801f7..8184c1bf6 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts @@ -219,7 +219,7 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive([ }, { 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 { 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 +})