diff --git a/src/api/wms/productreceiptRequestMain/index.ts b/src/api/wms/productreceiptRequestMain/index.ts index 7958c93a5..9a049f627 100644 --- a/src/api/wms/productreceiptRequestMain/index.ts +++ b/src/api/wms/productreceiptRequestMain/index.ts @@ -64,4 +64,4 @@ export const exportProductreceiptRequestMain = async (params) => { // 下载用户导入模板 export const importTemplate = () => { return request.download({ url: '/wms/productreceipt-request-main/get-import-template' }) -} \ No newline at end of file +} diff --git a/src/api/wms/purchasereceiptRequestMain/index.ts b/src/api/wms/purchasereceiptRequestMain/index.ts index 5c908c7fe..9b15e960b 100644 --- a/src/api/wms/purchasereceiptRequestMain/index.ts +++ b/src/api/wms/purchasereceiptRequestMain/index.ts @@ -70,4 +70,34 @@ export const exportPurchasereceiptRequestMain = async (params) => { // 下载用户导入模板 export const importTemplate = () => { return request.download({ url: '/wms/purchasereceipt-request-main/get-import-template' }) -} \ No newline at end of file +} + +// 关闭采购收货申请主 Excel +export const closeProductreceiptRequestMain = async (id) => { + return await request.put({ url: `/wms/purchasereceipt-request-main/close?id=` + id }) +} + +// 重新添加采购收货申请主 Excel +export const reAddProductreceiptRequestMain = async (id) => { + return await request.put({ url: `/wms/purchasereceipt-request-main/reAdd?id=` + id }) +} + +// 提交采购收货申请主 Excel +export const submitProductreceiptRequestMain = async (id) => { + return await request.put({ url: `/wms/purchasereceipt-request-main/submit?id=` + id }) +} + +// 审批通过采购收货申请主 Excel +export const agreeProductreceiptRequestMain = async (id) => { + return await request.put({ url: `/wms/purchasereceipt-request-main/agree?id=` + id }) +} + +// 审批驳回采购收货申请主 Excel +export const refusedProductreceiptRequestMain = async (id) => { + return await request.put({ url: `/wms/purchasereceipt-request-main/refused?id=` + id }) +} + +// 处理驳回采购收货申请主 Excel +export const handleProductreceiptRequestMain = async (id) => { + return await request.put({ url: `/wms/purchasereceipt-request-main/handle?id=` + id }) +} diff --git a/src/locales/en-US.ts b/src/locales/en-US.ts index 4f4d4895d..75bd2a270 100644 --- a/src/locales/en-US.ts +++ b/src/locales/en-US.ts @@ -54,7 +54,19 @@ export default { updateTime: 'Update Time', copy: 'Copy', copySuccess: 'Copy Success', - copyError: 'Copy Error' + copyError: 'Copy Error', + closeSuccess: 'Close Success', + reAddSuccess: 'ReAdd Success', + submitSuccess: 'Submit Success', + agreeSuccess: 'Agree Success', + refusedSuccess: 'Refused Success', + handleSuccess: 'Handle Success', + confirmColse: 'Confirm Close?', + confirmReAdd: 'Confirm ReAdd?', + confirmAgree: 'Confirm Agree?', + confirmRefused: 'Confirm Refused?', + confirmHandle: 'Confirm Handle?', + confirmSubmit: 'Confirm Submit?', }, error: { noPermission: `Sorry, you don't have permission to access this page.`, diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts index cc4bb47ea..7de6a0572 100644 --- a/src/locales/zh-CN.ts +++ b/src/locales/zh-CN.ts @@ -54,7 +54,19 @@ export default { updateTime: '更新时间', copy: '复制', copySuccess: '复制成功', - copyError: '复制失败' + copyError: '复制失败', + closeSuccess: '关闭成功', + reAddSuccess: '重新添加成功', + submitSuccess: '提交成功', + agreeSuccess: '审批通过成功', + refusedSuccess: '审批驳回成功', + handleSuccess: '执行成功', + confirmColse: '确认关闭吗？', + confirmReAdd: '确认重新添加吗？', + confirmAgree: '确认审批通过吗？', + confirmRefused: '确认审批驳回吗？', + confirmHandle: '确认处理吗？', + confirmSubmit: '确认提交吗？', }, error: { noPermission: `抱歉，您无权访问此页面。`, diff --git a/src/utils/disposition/defaultButtons.ts b/src/utils/disposition/defaultButtons.ts index a44cc592b..e98f3ac3c 100644 --- a/src/utils/disposition/defaultButtons.ts +++ b/src/utils/disposition/defaultButtons.ts @@ -316,6 +316,19 @@ export function mainListApproveBtn(option:any) { }) } +// 主列表-申请流程-处理按钮 +export function mainListHandleBtn(option:any) { + return __defaultBtnOption(option,{ + label: '处理', + name: 'mainHandle', + hide: false, + type: 'primary', + color: '', + link: true, // 文本展现按钮 + hasPermi: '' + }) +} + // 主列表-订单流程-发布按钮 export function mainListOrderPubBtn(option:any) { return __defaultBtnOption(option,{ diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue index 1bdbee7e7..ebc221e49 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue @@ -148,29 +148,15 @@ const { getList, setSearchParams } = tableMethods // 列表头部按钮 const HeadButttondata = [ - defaultButtons.defaultAddBtn({hasPermi:'wms:purchasereceipt-request-main:create'}), // 新增——需要手动修改下权限 - defaultButtons.defaultImportBtn({hasPermi:'wms:purchasereceipt-request-main:import'}), // 导入 defaultButtons.defaultExportBtn({hasPermi:'wms:purchasereceipt-request-main:export'}), // 导出 defaultButtons.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFilterBtn(null), // 筛选 defaultButtons.defaultSetBtn(null), // 设置 - // { - // label: '自定义扩展按钮', - // name: 'zdy', - // hide: false, - // type: 'primary', - // icon: 'Select', - // color: '' - // }, ] // 头部按钮事件 const buttonBaseClick = (val, item) => { - if (val == 'add') { // 新增 - openForm('create') - } else if (val == 'import') { // 导入 - handleImport() - } else if (val == 'export') { // 导出 + if (val == 'export') { // 导出 handleExport() } else if (val == 'refresh') { // 刷新 getList() @@ -193,33 +179,31 @@ const isShowMainButton = (row,val) => { const butttondata = (row) => { return [ defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6'])}), // 关闭 - defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5'])}), // 重新添加 + defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['5'])}), //重新添加 defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1'])}), // 提交审批 defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2'])}), // 驳回 defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2'])}), // 审批通过 - defaultButtons.mainListEditBtn({hasPermi:'wms:purchasereceipt-request-main:update'}), // 编辑 - defaultButtons.mainListDeleteBtn({hasPermi:'wms:purchasereceipt-request-main:delete'}), // 删除 + defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3'])}), // 处理 + defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:purchasereceipt-request-main:update'}), // 编辑 ] } - - // 列表-操作按钮事件 const buttonTableClick = async (val, row) => { if (val == 'mainClose') { // 关闭 - console.log('列表-操作按钮事件-关闭') + handleClose(row.id) } else if (val == 'mainReAdd') { // 重新添加 - console.log('列表-操作按钮事件-重新添加') + handleReAdd(row.id) } else if (val == 'mainSubmit') { // 提交审批 - console.log('列表-操作按钮事件-提交审批') + handleSubmit(row.id) } else if (val == 'mainTurnDown') { // 驳回 - console.log('列表-操作按钮事件-驳回') + handleRefused(row.id) } else if (val == 'mainApprove') { // 审批通过 - console.log('列表-操作按钮事件-审批通过') + handleAgree(row.id) + } else if (val == 'mainHandle') { // 处理 + handleHandle(row.id) } else if (val == 'edit') { // 编辑 openForm('update', row) - } else if (val == 'delete') { // 删除 - handleDelete(row.id) } } @@ -236,15 +220,62 @@ const openDetail = (row: any, titleName: any, titleValue: any) => { detailRef.value.openDetail(row, titleName, titleValue) } -/** 删除按钮操作 */ -const handleDelete = async (id: number) => { +/** 关闭按钮操作 */ +const handleClose = async (id: number) => { + try { + await message.confirm(t('common.confirmColse')) + await PurchasereceiptRequestMainApi.closeProductreceiptRequestMain(id) + message.success(t('common.closeSuccess')) + await getList() + } catch {} +} + +/** 重新添加按钮操作 */ +const handleReAdd = async (id: number) => { + try { + await message.confirm(t('common.confirmReAdd')) + await PurchasereceiptRequestMainApi.reAddProductreceiptRequestMain(id) + message.success(t('common.reAddSuccess')) + await getList() + } catch {} +} + +/** 审批通过按钮操作 */ +const handleAgree = async (id: number) => { + try { + await message.confirm(t('common.confirmAgree')) + await PurchasereceiptRequestMainApi.agreeProductreceiptRequestMain(id) + message.success(t('common.agreeSuccess')) + await getList() + } catch {} +} + +/** 审批驳回按钮操作 */ +const handleRefused = async (id: number) => { + try { + await message.confirm(t('common.confirmRefused')) + await PurchasereceiptRequestMainApi.refusedProductreceiptRequestMain(id) + message.success(t('common.refusedSuccess')) + await getList() + } catch {} +} + +/** 处理按钮操作 */ +const handleHandle = async (id: number) => { + try { + await message.confirm(t('common.confirmHandle')) + await PurchasereceiptRequestMainApi.handleProductreceiptRequestMain(id) + message.success(t('common.handleSuccess')) + await getList() + } catch {} +} + +/** 提交按钮操作 */ +const handleSubmit = async (id: number) => { try { - // 删除的二次确认 - await message.delConfirm() - // 发起删除 - await PurchasereceiptRequestMainApi.deletePurchasereceiptRequestMain(id) - message.success(t('common.delSuccess')) - // 刷新列表 + await message.confirm(t('common.confirmSubmit')) + await PurchasereceiptRequestMainApi.submitProductreceiptRequestMain(id) + message.success(t('common.closeSuccess')) await getList() } catch {} } diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts index f329a5d0f..d16d61ae9 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts @@ -418,7 +418,7 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive( isDetail: false, isForm: false, table: { - width: 300, + width: 230, fixed: 'right' }, } @@ -995,4 +995,4 @@ export const PurchasereceiptRequestDetailRules = reactive({ itemCode: [ { required: true, message: '请输入物品代码', trigger: 'change' } ], -}) \ No newline at end of file +})