From 812dbdd2c97f0417870eb90e53966dfaf95a1ba9 Mon Sep 17 00:00:00 2001 From: lidm0086 Date: Wed, 18 Sep 2024 15:24:55 +0800 Subject: [PATCH] HL-6034 --- src/api/wms/saleShipmentMain/index.ts | 6 ------ src/api/wms/saleShipmentMainRecord/index.ts | 4 ++++ src/utils/disposition/defaultButtons.ts | 4 ++-- .../saleShipmentMainRecord/index.vue | 13 +++++++++++++ .../saleShipmentMainRecord.data.ts | 19 +++++++++---------- .../saleShipmentMainRequest/index.vue | 14 +------------- 6 files changed, 29 insertions(+), 31 deletions(-) diff --git a/src/api/wms/saleShipmentMain/index.ts b/src/api/wms/saleShipmentMain/index.ts index b0b6b60b5..a3e3c94eb 100644 --- a/src/api/wms/saleShipmentMain/index.ts +++ b/src/api/wms/saleShipmentMain/index.ts @@ -98,9 +98,3 @@ export const agree = async (id) => { export const handle = async (id) => { return await request.put({ url: `/wms/sale-shipment-main-request/handle?id=` + id }) } - -// 处理-结算出库废弃 -export const abort = async (id) => { - return await request.put({ url: `/wms/sale-shipment-main-request/abort?id=` + id }) -} - diff --git a/src/api/wms/saleShipmentMainRecord/index.ts b/src/api/wms/saleShipmentMainRecord/index.ts index d21937a41..dc193daa9 100644 --- a/src/api/wms/saleShipmentMainRecord/index.ts +++ b/src/api/wms/saleShipmentMainRecord/index.ts @@ -60,3 +60,7 @@ export const exportSaleShipmentMainRecord = async (params) => { export const importTemplate = () => { return request.download({ url: '/wms/sale-shipment-main-record/get-import-template' }) } +// 处理-结算出库撤销 +export const abort = async (id) => { + return await request.put({ url: `/wms/sale-shipment-main-record/abort?id=` + id }) +} diff --git a/src/utils/disposition/defaultButtons.ts b/src/utils/disposition/defaultButtons.ts index 5fe8852ca..8d9ec527d 100644 --- a/src/utils/disposition/defaultButtons.ts +++ b/src/utils/disposition/defaultButtons.ts @@ -648,8 +648,8 @@ export function mainListHandleBtn(option: any) { // 主列表-申请流程-作废按钮 export function mainListAbortBtn(option: any) { return __defaultBtnOption(option, { - label: t(`ts.终止`).replace('ts.', ''), - name: 'mainAbort', + label: t(`ts.撤销`).replace('ts.', ''), + name: 'abort', hide: false, type: 'primary', color: '', diff --git a/src/views/wms/deliversettlementManage/saleShipmentMainRecord/index.vue b/src/views/wms/deliversettlementManage/saleShipmentMainRecord/index.vue index 9509e5a9b..4e83e6db6 100644 --- a/src/views/wms/deliversettlementManage/saleShipmentMainRecord/index.vue +++ b/src/views/wms/deliversettlementManage/saleShipmentMainRecord/index.vue @@ -74,6 +74,7 @@ import TableHead from '@/components/TableHead/src/TableHead.vue' import Detail from '@/components/Detail/src/Detail.vue' import { formatDate } from '@/utils/formatTime' import { usePageLoading } from '@/hooks/web/usePageLoading' +import * as saleShipmentMainRecordApi from "@/api/wms/saleShipmentMainRecord"; const { loadStart, loadDone } = usePageLoading() defineOptions({ name: 'SaleShipmentMainRecord' }) @@ -146,6 +147,7 @@ const buttonBaseClick = (val, item) => { const butttondata = [ // defaultButtons.mainListEditBtn({hasPermi:'wms:sale-shipment-main-record:update'}), // 编辑 // defaultButtons.mainListDeleteBtn({hasPermi:'wms:sale-shipment-main-record:delete'}), // 删除 + defaultButtons.mainListAbortBtn({hasPermi:'wms:sale-shipment-main-request:abort'}), // 撤销 ] // 列表-操作按钮事件 @@ -154,6 +156,17 @@ const buttonTableClick = async (val, row) => { openForm('update', row) } else if (val == 'delete') { // 删除 handleDelete(row.id) + } else if (val == 'abort') { // 终止 + await message.confirm('确认要撤销吗？') + tableObject.loading = true + saleShipmentMainRecordApi.abort(row.masterId).then(() => { + message.success(t('common.updateSuccess')) + tableObject.loading = false + buttonBaseClick('refresh',null) + }).catch(err => { + tableObject.loading = false + console.log(err) + }) } } diff --git a/src/views/wms/deliversettlementManage/saleShipmentMainRecord/saleShipmentMainRecord.data.ts b/src/views/wms/deliversettlementManage/saleShipmentMainRecord/saleShipmentMainRecord.data.ts index 9c9b9e88b..b2d8dc569 100644 --- a/src/views/wms/deliversettlementManage/saleShipmentMainRecord/saleShipmentMainRecord.data.ts +++ b/src/views/wms/deliversettlementManage/saleShipmentMainRecord/saleShipmentMainRecord.data.ts @@ -91,7 +91,6 @@ export const SaleShipmentMainRecord = useCrudSchemas(reactive([ field: 'available', dictType: DICT_TYPE.TRUE_FALSE, sort: 'custom', - dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', isTable:false }, @@ -146,15 +145,15 @@ export const SaleShipmentMainRecord = useCrudSchemas(reactive([ sort: 'custom', isTable:false }, - // { - // label: '操作', - // field: 'action', - // isForm: false, - // table: { - // width: 150, - // fixed: 'right' - // } - // } + { + label: '操作', + field: 'action', + isForm: false, + table: { + width: 150, + fixed: 'right' + } + } ])) // 表单校验 diff --git a/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue b/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue index 0846beac2..7f8cff2c0 100644 --- a/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue +++ b/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue @@ -249,7 +249,6 @@ const butttondata = (row,$index) => { defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:sale-shipment-main-request:refused'}), // 驳回 defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:sale-shipment-main-request:agree'}), // 审批通过 defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']),hasPermi:'wms:sale-shipment-main-request:handle'}), // 处理 - // defaultButtons.mainListAbortBtn({hide:isShowMainButton(row,['8']),hasPermi:'wms:sale-shipment-main-request:abort'}), // 终止 // defaultButtons.mainListDeleteBtn({hasPermi:'wms:sale-shipment-main-request:delete'}), // 删除 ] } @@ -324,18 +323,7 @@ const buttonTableClick = async (val, row) => { tableObject.loading = false console.log(err) }) - } else if (val == 'mainAbort') { // 结算出库废弃 - await message.confirm('确认要终止吗？') - tableObject.loading = true - SaleShipmentMainApi.abort(row.masterId).then(() => { - message.success(t('common.updateSuccess')) - tableObject.loading = false - buttonBaseClick('refresh',null) - }).catch(err => { - tableObject.loading = false - console.log(err) - }) - }else if (val == 'edit') { // 编辑 + } else if (val == 'edit') { // 编辑 openForm('update', row) } else if (val == 'delete') { // 删除 handleDelete(row.id)