From 12c5c5aa914676016626c378483d18c531a9d059 Mon Sep 17 00:00:00 2001 From: yejiaxing <591141169@qq.com> Date: Fri, 15 Dec 2023 17:03:48 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E7=B4=A2=E8=B5=94=E7=94=A8?= =?UTF-8?q?=E4=BE=8B=E4=B8=8A=E4=BC=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/purchaseclaimRequestMain/index.ts | 26 +++- .../wms/supplierdeliverRecordDetail/index.ts | 7 +- .../wms/supplierinvoiceRequestMain/index.ts | 5 - .../supplierdeliverRequestMain/index.vue | 2 +- .../purchaseclaimRecordMain.data.ts | 30 +--- .../purchaseclaimRequestMain/index.vue | 143 ++++++++++++++---- .../purchaseclaimRequestMain.data.ts | 30 +--- .../supplierinvoiceRequestMain/index.vue | 24 +-- 8 files changed, 150 insertions(+), 117 deletions(-) diff --git a/src/api/wms/purchaseclaimRequestMain/index.ts b/src/api/wms/purchaseclaimRequestMain/index.ts index 1d206c0b8..392f87385 100644 --- a/src/api/wms/purchaseclaimRequestMain/index.ts +++ b/src/api/wms/purchaseclaimRequestMain/index.ts @@ -51,6 +51,30 @@ export const deletePurchaseclaimRequestMain = async (id: number) => { return await request.delete({ url: `/wms/purchaseclaim-request-main/delete?id=` + id }) } +// 打开供应商发货申请主 +export const opePurchaseclaimRequestMain = async (id: number) => { + return await request.post({ url: `/wms/purchaseclaim-request-main/open?id=` + id }) +} +// 关闭供应商发货申请主 +export const cloPurchaseclaimRequestMain = async (id: number) => { + return await request.post({ url: `/wms/purchaseclaim-request-main/close?id=` + id }) +} +// 提交审批供应商发货申请主 +export const subPurchaseclaimRequestMain = async (id: number) => { + return await request.post({ url: `/wms/purchaseclaim-request-main/sub?id=` + id }) +} +// 审批通过供应商发货申请主 +export const appPurchaseclaimRequestMain = async (id: number) => { + return await request.post({ url: `/wms/purchaseclaim-request-main/app?id=` + id }) +} +// 驳回供应商发货申请主 +export const rejPurchaseclaimRequestMain = async (id: number) => { + return await request.post({ url: `/wms/purchaseclaim-request-main/rej?id=` + id }) +} +// 处理 +export const genRecordsPurchaseclaimRequestMain = async (id) => { + return await request.post({ url: `/wms/purchaseclaim-request-main/genRecords?id=` + id }) +} // 导出采购索赔申请主 Excel export const exportPurchaseclaimRequestMain = async (params) => { return await request.download({ url: `/wms/purchaseclaim-request-main/export-excel`, params }) @@ -59,4 +83,4 @@ export const exportPurchaseclaimRequestMain = async (params) => { // 下载用户导入模板 export const importTemplate = () => { return request.download({ url: '/wms/purchaseclaim-request-main/get-import-template' }) -} \ No newline at end of file +} diff --git a/src/api/wms/supplierdeliverRecordDetail/index.ts b/src/api/wms/supplierdeliverRecordDetail/index.ts index cd581fa78..d346cbbd9 100644 --- a/src/api/wms/supplierdeliverRecordDetail/index.ts +++ b/src/api/wms/supplierdeliverRecordDetail/index.ts @@ -51,6 +51,11 @@ export const getSupplierdeliverRecordDetailPage = async (params) => { } } +// 查询采供应商发货记录子列表 +export const getSupplierdeliverRecordDetailList = async (params) => { + return await request.get({ url: `/wms/supplierdeliver-record-detail/allList`, params }) +} + // 查询供应商发货记录子详情 export const getSupplierdeliverRecordDetail = async (id: number) => { return await request.get({ url: `/wms/supplierdeliver-record-detail/get?id=` + id }) @@ -79,4 +84,4 @@ export const exportSupplierdeliverRecordDetail = async (params) => { // 下载用户导入模板 export const importTemplate = () => { return request.download({ url: '/wms/supplierdeliver-record-detail/get-import-template' }) -} \ No newline at end of file +} diff --git a/src/api/wms/supplierinvoiceRequestMain/index.ts b/src/api/wms/supplierinvoiceRequestMain/index.ts index 07773fd35..067f556cb 100644 --- a/src/api/wms/supplierinvoiceRequestMain/index.ts +++ b/src/api/wms/supplierinvoiceRequestMain/index.ts @@ -55,8 +55,3 @@ export const deleteSupplierinvoiceRequestMain = async (id: number) => { export const exportSupplierinvoiceRequestMain = async (params) => { return await request.download({ url: `/wms/supplierinvoice-request-main/export-excel`, params }) } - -// 下载用户导入模板 -export const importTemplate = () => { - return request.download({ url: '/wms/supplierinvoice-request-main/get-import-template' }) -} \ No newline at end of file diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue index 0c850f78d..339a390c3 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue @@ -221,7 +221,7 @@ handleApp(row.id) } else if (val == 'mainPlanTur') { // 驳回按钮 handleTur(row.id) - }else if (val == 'genRecords') { // 驳回按钮 + }else if (val == 'genRecords') { // 处理 genRecords(row.id) }else if (val == 'edit') { // 编辑 openForm('update', row) diff --git a/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRecordMain/purchaseclaimRecordMain.data.ts b/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRecordMain/purchaseclaimRecordMain.data.ts index e4c9f6174..15e61c7fc 100644 --- a/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRecordMain/purchaseclaimRecordMain.data.ts +++ b/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRecordMain/purchaseclaimRecordMain.data.ts @@ -240,14 +240,6 @@ export const PurchaseclaimRecordDetail = useCrudSchemas(reactive([ width: 150 } }, - { - label: '替代批次', - field: 'altBatch', - sort: 'custom', - table: { - width: 150 - } - }, { label: '订单号', field: 'poNumber', @@ -268,7 +260,6 @@ export const PurchaseclaimRecordDetail = useCrudSchemas(reactive([ label: '原因', field: 'reason', isTable: true, - dictType: DICT_TYPE.PURCHASE_RETURN_REASON, dictClass: 'string', sort: 'custom', table: { @@ -313,25 +304,6 @@ export const PurchaseclaimRecordDetail = useCrudSchemas(reactive([ width: 150 } }, - { - label: '接口类型', - field: 'interfaceType', - dictType: DICT_TYPE.INTERFACE_TYPE, - dictClass: 'string', - isTable: true, - sort: 'custom', - table: { - width: 150 - } - }, - { - label: '任务明细ID', - field: 'jobDetailId', - sort: 'custom', - table: { - width: 150 - } - }, { label: '是否可用', field: 'available', @@ -398,4 +370,4 @@ export const PurchaseclaimRecordDetailRules = reactive({ creator: [ { required: true, message: '请输入创建者', trigger: 'blur' } ], -}) \ No newline at end of file +}) diff --git a/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/index.vue b/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/index.vue index aafbe5238..cb5121f73 100644 --- a/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/index.vue +++ b/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/index.vue @@ -55,6 +55,7 @@ import { getAccessToken } from '@/utils/auth' import download from '@/utils/download' import * as PurchaseclaimRequestMainApi from '@/api/wms/purchaseclaimRequestMain' + import * as SupplierdeliverRecordDetailApi from '@/api/wms/supplierdeliverRecordDetail' import * as PurchaseclaimRequestDetailApi from '@/api/wms/purchaseclaimRequestDetail' import { PurchaseclaimRequestMain, PurchaseclaimRequestMainRules, PurchaseclaimRequestDetail, PurchaseclaimRequestDetailRules } from './purchaseclaimRequestMain.data' import * as defaultButtons from '@/utils/disposition/defaultButtons' @@ -79,10 +80,10 @@ // 查询页面返回 const searchTableSuccess = (formField, searchField, val, formRef, type, row) => { - + nextTick(() => { if (type == 'tableForm') { - + // 子表查询页赋值 row[formField] = val[0][searchField] row['poLine'] = val[0]['poLine'] @@ -99,11 +100,10 @@ // 主表查询页赋值 const setV = {} setV[formField] = val[0][searchField] - if(formField=='asnNumber'){ - // 获取子表数据 getBomDisassemble - PurchasePlanDetailApi.getPurchasePlanDetailList({ - number: val[0]['asnNumber']}).then(res => { + // 获取子表数据 getSupplierdeliverRecordDetailList + SupplierdeliverRecordDetailApi.getSupplierdeliverRecordDetailList({ + asnNumber: val[0]['asnNumber']}).then(res => { if (res) tableData.value = res; tableData.value.forEach(item=>{ item.batch = item.toBatch @@ -113,11 +113,6 @@ console.log(err) }) } - - - - - setV['ppNumber'] = val[0]['ppNumber'] setV['supplierCode'] = val[0]['supplierCode'] formRef.setValues(setV) @@ -128,7 +123,7 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef) => { console.log(456) nextTick(() => { - + const setV = {} setV[formField] = val[0][searchField] setV['poLine'] = val[0]['poLine'] @@ -189,14 +184,25 @@ // 列表-操作按钮 const buttondata = (row) => { return [ - defaultButtons.mainListCloseBtn({ hide: isShowMainButton(row, ['1', '2', '3', '4', '6']) }), // 关闭 - defaultButtons.mainListReAddBtn({ hide: isShowMainButton(row, ['4', '5']) }), // 重新添加 - defaultButtons.mainListSubmitBtn({ hide: isShowMainButton(row, ['1']) }), // 提交审批 - defaultButtons.mainListTurnDownBtn({ hide: isShowMainButton(row, ['2']) }), // 驳回 - defaultButtons.mainListApproveBtn({ hide: isShowMainButton(row, ['2']) }), // 审批通过 + defaultButtons.mainListPurchasePlanOpeBtn({ hide: isShowMainButton(row, ['5']) }), // 打开 + defaultButtons.mainListPurchasePlanCloBtn({ hide: isShowMainButton(row, ['1', '2', '4']) }), // 关闭 + defaultButtons.mainListPlanSubBtn({ hide: isShowMainButton(row, ['1']) }), // 提交审批 + defaultButtons.mainListPlanAppBtn({ hide: isShowMainButton(row, ['2']) }), // 审批通过 + defaultButtons.mainListPlanTurBtn({ hide: isShowMainButton(row, ['2']) }), // 驳回按钮 defaultButtons.mainListEditBtn({ hide: isShowMainButton(row, ['1']), hasPermi: 'wms:purchaseclaim-request-main:update' }), // 编辑 defaultButtons.mainListDeleteBtn({ hide: isShowMainButton(row, ['1']), hasPermi: 'wms:purchaseclaim-request-main:delete' }), // 删除 defaultButtons.mainListPointBtn(null), // 打印 + // 生成记录 + { + label: '处理', + name: 'genRecords', + hide: isShowMainButton(row, ['3']), + type: 'primary', + icon: '', + color: '', + hasPermi: '', + link: true, // 文本展现按钮 + }, ] } @@ -211,17 +217,19 @@ // 列表-操作按钮事件 const buttonTableClick = async (val, row) => { - if (val == 'mainClose') { // 关闭 - console.log('列表-操作按钮事件-关闭') - } else if (val == 'mainReAdd') { // 重新添加 - console.log('列表-操作按钮事件-重新添加') - } else if (val == 'mainSubmit') { // 提交审批 - console.log('列表-操作按钮事件-提交审批') - } else if (val == 'mainTurnDown') { // 驳回 - console.log('列表-操作按钮事件-驳回') - } else if (val == 'mainApprove') { // 审批通过 - console.log('列表-操作按钮事件-审批通过') - } else if (val == 'edit') { // 编辑 + if (val == 'mainPurPlanOpe') { // 打开 + handleOpe(row.id) + } else if (val == 'mainPurPlanClo') {// 关闭 + handleClo(row.id) + } else if (val == 'mainPlanSub') { // 提交审批 + handleSub(row.id) + } else if (val == 'mainPlanApp') { // 审批通过 + handleApp(row.id) + } else if (val == 'mainPlanTur') { // 驳回按钮 + handleTur(row.id) + }else if (val == 'genRecords') { // 驳回按钮 + genRecords(row.id) + }else if (val == 'edit') { // 编辑 // const res = await ItempackagingApi.getItempackaging(row.id) openForm('update', row) } else if (val == 'delete') { // 删除 @@ -260,6 +268,85 @@ await getList() } catch { } } + + + /** 关闭按钮操作 */ + const handleClo = async (id : number) => { + try { + // 关闭的二次确认 + await message.confirm('是否关闭所选中数据？') + // 发起关闭 + await PurchaseclaimRequestMainApi.cloPurchaseclaimRequestMain(id) + message.success(t('关闭成功!')) + // 刷新列表 + await getList() + } catch { } + } + + /** 打开按钮操作 */ + const handleOpe = async (id : number) => { + try { + // 打开的二次确认 + await message.confirm('是否打开所选中数据？') + // 发起打开 + await PurchaseclaimRequestMainApi.opePurchaseclaimRequestMain(id) + message.success(t('打开成功!')) + // 刷新列表 + await getList() + } catch { } + } + + /** 提交审批按钮操作 */ + const handleSub = async (id : number) => { + try { + // 提交审批的二次确认 + await message.confirm('是否提交审批所选中数据？') + // 发起提交审批 + await PurchaseclaimRequestMainApi.subPurchaseclaimRequestMain(id) + message.success(t('提交审批成功!')) + // 刷新列表 + await getList() + } catch { } + } + + /** 审批通过按钮操作 */ + const handleApp = async (id : number) => { + try { + // 审批通过的二次确认 + await message.confirm('是否审批通过所选中数据？') + // 发起审批通过 + await PurchaseclaimRequestMainApi.appPurchaseclaimRequestMain(id) + message.success(t('审批通过成功!')) + // 刷新列表 + await getList() + } catch { } + } + + /** 驳回按钮操作 */ + const handleTur = async (id : number) => { + try { + // 驳回的二次确认 + await message.confirm('是否驳回所选中数据？') + // 发起驳回 + await PurchaseclaimRequestMainApi.rejPurchaseclaimRequestMain(id) + message.success(t('驳回成功!')) + // 刷新列表 + await getList() + } catch { } + } + + /** 处理按钮操作 */ + const genRecords = async (id : number) => { + try { + // 处理的二次确认 + await message.confirm('是否处理所选中数据？') + // 发起处理 + await PurchaseclaimRequestMainApi.genRecordsPurchaseclaimRequestMain(id) + message.success(t('处理成功!')) + // 刷新列表 + await getList() + } catch { } + } /** 导出按钮操作 */ const handleExport = async () => { diff --git a/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/purchaseclaimRequestMain.data.ts b/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/purchaseclaimRequestMain.data.ts index 31603ae4f..ee794ef04 100644 --- a/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/purchaseclaimRequestMain.data.ts +++ b/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/purchaseclaimRequestMain.data.ts @@ -375,13 +375,6 @@ export const PurchaseclaimRequestDetail = useCrudSchemas(reactive( width: 150 }, }, - { - label: '替代批次', - field: 'altBatch', - table: { - width: 150 - }, - }, { label: '原因', field: 'reason', @@ -436,27 +429,6 @@ export const PurchaseclaimRequestDetail = useCrudSchemas(reactive( width: 150 }, }, - { - label: '物品描述1', - field: 'itemDesc1', - table: { - width: 150 - }, - }, - { - label: '物品描述2', - field: 'itemDesc2', - table: { - width: 150 - }, - }, - { - label: '项目代码', - field: 'projectCode', - table: { - width: 150 - }, - }, { label: '数量', field: 'qty', @@ -576,4 +548,4 @@ export const PurchaseclaimRequestDetailRules = reactive({ uom: [ { required: true, message: '请输入计量单位', trigger: 'change' } ], -}) \ No newline at end of file +}) diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue index 077597f06..d1cecca12 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue @@ -71,10 +71,6 @@ :apiDelete="SupplierinvoiceRequestDetailApi.deleteSupplierinvoiceRequestDetail" :Echo="Echo" /> - - -