yudao
/
admin-vue3
mirror of https://gitee.com/yudaocode/yudao-ui-admin-vue3.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

✨ feat(mes): 添加供应商退货单及相关明细功能 

新增供应商退货单、退货单行及退货明细的数据对象和 API 接口，支持供应商退货管理功能。
pull/871/MERGE
YunaiV 2026-02-28 09:56:20 +08:00
parent 3d80f5c216
commit 639ff7645e
10 changed files with 1262 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/api/mes/wm/returnvendor/detail/index.ts Normal file
View File

@ -0,0 +1,48 @@
import request from '@/config/axios'
// MES 供应商退货明细 VO
export interface WmReturnVendorDetailVO {
id?: number
returnVendorId: number
lineId: number
materialStockId: number
itemId: number
quantity: number
batchId?: number
batchCode?: string
warehouseId: number
warehouseName?: string
locationId?: number
locationName?: string
areaId?: number
areaName?: string
remark?: string
}
// MES 供应商退货明细 API
export const WmReturnVendorDetailApi = {
// 查询供应商退货明细列表（按行编号）
getReturnVendorDetailListByLineId: async (lineId: number) => {
return await request.get({ url: '/mes/wm/return-vendor-detail/list-by-line', params: { lineId } })
},
// 查询供应商退货明细详情
getReturnVendorDetail: async (id: number) => {
return await request.get({ url: '/mes/wm/return-vendor-detail/get?id=' + id })
},
// 新增供应商退货明细
createReturnVendorDetail: async (data: WmReturnVendorDetailVO) => {
return await request.post({ url: '/mes/wm/return-vendor-detail/create', data })
},
// 修改供应商退货明细
updateReturnVendorDetail: async (data: WmReturnVendorDetailVO) => {
return await request.put({ url: '/mes/wm/return-vendor-detail/update', data })
},
// 删除供应商退货明细
deleteReturnVendorDetail: async (id: number) => {
return await request.delete({ url: '/mes/wm/return-vendor-detail/delete?id=' + id })
}
}

78
src/api/mes/wm/returnvendor/index.ts Normal file
View File

@ -0,0 +1,78 @@
import request from '@/config/axios'
// MES 供应商退货单 VO
export interface WmReturnVendorVO {
id?: number
code?: string
name: string
poCode?: string
vendorId?: number
vendorName?: string
vendorNickname?: string
batchCode?: string
returnDate?: string
returnReason?: string
transportCode?: string
transportTelephone?: string
status?: number
remark?: string
createTime?: string
}
// MES 供应商退货单 API
export const WmReturnVendorApi = {
// 查询供应商退货单分页
getReturnVendorPage: async (params: any) => {
return await request.get({ url: '/mes/wm/return-vendor/page', params })
},
// 查询供应商退货单详情
getReturnVendor: async (id: number) => {
return await request.get({ url: '/mes/wm/return-vendor/get?id=' + id })
},
// 新增供应商退货单
createReturnVendor: async (data: WmReturnVendorVO) => {
return await request.post({ url: '/mes/wm/return-vendor/create', data })
},
// 修改供应商退货单
updateReturnVendor: async (data: WmReturnVendorVO) => {
return await request.put({ url: '/mes/wm/return-vendor/update', data })
},
// 删除供应商退货单
deleteReturnVendor: async (id: number) => {
return await request.delete({ url: '/mes/wm/return-vendor/delete?id=' + id })
},
// 提交供应商退货单
submitReturnVendor: async (id: number) => {
return await request.put({ url: '/mes/wm/return-vendor/submit?id=' + id })
},
// 执行拣货
stockReturnVendor: async (id: number) => {
return await request.put({ url: '/mes/wm/return-vendor/stock?id=' + id })
},
// 取消供应商退货单
cancelReturnVendor: async (id: number) => {
return await request.put({ url: '/mes/wm/return-vendor/cancel?id=' + id })
},
// 完成供应商退货单（执行退货）
finishReturnVendor: async (id: number) => {
return await request.put({ url: '/mes/wm/return-vendor/finish?id=' + id })
},
// 校验供应商退货单数量（每行明细数量之和是否等于行退货数量）
checkReturnVendorQuantity: async (id: number) => {
return await request.get({ url: '/mes/wm/return-vendor/check-quantity?id=' + id })
},
// 导出供应商退货单 Excel
exportReturnVendor: async (params: any) => {
return await request.download({ url: '/mes/wm/return-vendor/export-excel', params })
}
}

43
src/api/mes/wm/returnvendor/line/index.ts Normal file
View File

@ -0,0 +1,43 @@
import request from '@/config/axios'
// MES 供应商退货单行 VO
export interface WmReturnVendorLineVO {
id?: number
returnVendorId: number
itemId: number
itemCode?: string
itemName?: string
specification?: string
unitMeasureName?: string
quantity: number
batchId?: number
remark?: string
}
// MES 供应商退货单行 API
export const WmReturnVendorLineApi = {
// 查询供应商退货单行分页
getReturnVendorLinePage: async (params: any) => {
return await request.get({ url: '/mes/wm/return-vendor-line/page', params })
},
// 查询供应商退货单行详情
getReturnVendorLine: async (id: number) => {
return await request.get({ url: '/mes/wm/return-vendor-line/get?id=' + id })
},
// 新增供应商退货单行
createReturnVendorLine: async (data: WmReturnVendorLineVO) => {
return await request.post({ url: '/mes/wm/return-vendor-line/create', data })
},
// 修改供应商退货单行
updateReturnVendorLine: async (data: WmReturnVendorLineVO) => {
return await request.put({ url: '/mes/wm/return-vendor-line/update', data })
},
// 删除供应商退货单行
deleteReturnVendorLine: async (id: number) => {
return await request.delete({ url: '/mes/wm/return-vendor-line/delete?id=' + id })
}
}

3
src/utils/dict.ts
View File

@ -296,5 +296,8 @@ export enum DICT_TYPE {
MES_WM_ITEM_RECEIPT_STATUS = 'mes_wm_item_receipt_status', // MES 物料接收单状态
MES_WM_PRODUCTION_ISSUE_STATUS = 'mes_wm_production_issue_status', // MES 领料出库单状态
MES_PRODUCT_PRODUCE_STATUS = 'mes_product_produce_status', // MES 生产入库单状态
MES_RETURN_VENDOR_STATUS = 'mes_return_vendor_status', // MES 供应商退货单状态
MES_WM_QUALITY_STATUS = 'mes_wm_quality_status', // MES 质量状态
MES_WM_RETURN_ISSUE_STATUS = 'mes_wm_return_issue_status', // MES 生产退料单状态
MES_WM_RETURN_ISSUE_TYPE = 'mes_wm_return_issue_type', // MES 退料类型
}

18
src/views/mes/utils/constants.ts
View File

@ -218,6 +218,24 @@ export const MesWmProductionIssueStatusEnum = {
CANCELED: MesOrderStatusConstants.CANCELLED
}
/** MES 供应商退货单状态枚举 */
export const MesWmReturnVendorStatusEnum = {
PREPARE: MesOrderStatusConstants.DRAFT,
APPROVING: MesOrderStatusConstants.APPROVING,
APPROVED: MesOrderStatusConstants.APPROVED,
FINISHED: MesOrderStatusConstants.FINISHED,
CANCELED: MesOrderStatusConstants.CANCELLED
}
/** MES 生产退料单状态枚举 */
export const MesWmReturnIssueStatusEnum = {
PREPARE: MesOrderStatusConstants.DRAFT,
APPROVING: MesOrderStatusConstants.APPROVING,
APPROVED: MesOrderStatusConstants.APPROVED,
FINISHED: MesOrderStatusConstants.FINISHED,
CANCELED: MesOrderStatusConstants.CANCELLED
}
/** MES 生产入库单状态枚举 */
export const MesWmProductProduceStatusEnum = {
PREPARE: MesOrderStatusConstants.DRAFT,

155
src/views/mes/wm/returnvendor/ReturnVendorDetailForm.vue Normal file
View File

@ -0,0 +1,155 @@
<!-- MES 供应商退货拣货明细表单弹窗 -->
<template>
<Dialog :title="dialogTitle" v-model="dialogVisible" width="600px">
<el-form
ref="formRef"
:model="formData"
:rules="formRules"
label-width="110px"
v-loading="formLoading"
>
<el-form-item label="物料" prop="itemId">
<MdItemSelect v-model="formData.itemId" disabled />
</el-form-item>
<el-form-item label="退货仓库" prop="warehouseId">
<WmWarehouseSelect v-model="formData.warehouseId" />
</el-form-item>
<el-form-item label="库区" prop="locationId" v-if="formData.warehouseId">
<WmWarehouseLocationSelect
v-model="formData.locationId"
:warehouse-id="formData.warehouseId"
/>
</el-form-item>
<el-form-item label="库位" prop="areaId" v-if="formData.locationId">
<WmWarehouseAreaSelect v-model="formData.areaId" :location-id="formData.locationId" />
</el-form-item>
<el-form-item label="批次号" prop="batchCode">
<el-input v-model="formData.batchCode" placeholder="请输入批次号" />
</el-form-item>
<el-form-item label="数量" prop="quantity">
<el-input-number
v-model="formData.quantity"
:precision="2"
:min="0"
controls-position="right"
class="!w-1/1"
/>
</el-form-item>
</el-form>
<template #footer>
<el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
<el-button @click="dialogVisible = false">取 消</el-button>
</template>
</Dialog>
</template>
<script setup lang="ts">
import {
WmReturnVendorDetailApi,
WmReturnVendorDetailVO
} from '@/api/mes/wm/returnvendor/detail'
import MdItemSelect from '@/views/mes/md/item/components/MdItemSelect.vue'
import WmWarehouseSelect from '@/views/mes/wm/warehouse/components/WmWarehouseSelect.vue'
import WmWarehouseLocationSelect from '@/views/mes/wm/warehouse/components/WmWarehouseLocationSelect.vue'
import WmWarehouseAreaSelect from '@/views/mes/wm/warehouse/components/WmWarehouseAreaSelect.vue'
defineOptions({ name: 'ReturnVendorDetailForm' })
const props = defineProps<{
returnVendorId: number
}>()
const emit = defineEmits(['success'])
const { t } = useI18n() // 国际化
const message = useMessage() // 消息弹窗
const dialogVisible = ref(false) // 弹窗的是否展示
const dialogTitle = ref('') // 弹窗的标题
const formLoading = ref(false) // 表单的加载中
const formType = ref('') // 表单的类型：create / update
const currentLineId = ref<number>() // 当前操作的行 ID
const formRef = ref() // 表单 Ref
const formData = ref({
id: undefined as number | undefined,
lineId: undefined as number | undefined,
returnVendorId: undefined as number | undefined,
itemId: undefined as number | undefined,
quantity: undefined as number | undefined,
batchCode: undefined as string | undefined,
warehouseId: undefined as number | undefined,
locationId: undefined as number | undefined,
areaId: undefined as number | undefined
})
const formRules = reactive({
itemId: [{ required: true, message: '物料不能为空', trigger: 'change' }],
warehouseId: [{ required: true, message: '退货仓库不能为空', trigger: 'change' }],
locationId: [{ required: true, message: '库区不能为空', trigger: 'change' }],
areaId: [{ required: true, message: '库位不能为空', trigger: 'change' }],
quantity: [{ required: true, message: '数量不能为空', trigger: 'blur' }]
})
/** 打开弹窗 */
const open = async (type: string, lineId: number, itemId?: number, detailId?: number) => {
dialogVisible.value = true
dialogTitle.value = type === 'create' ? '添加拣货明细' : '编辑拣货明细'
formType.value = type
currentLineId.value = lineId
resetForm()
// 修改时，设置数据
if (detailId) {
formLoading.value = true
try {
formData.value = await WmReturnVendorDetailApi.getReturnVendorDetail(detailId)
} finally {
formLoading.value = false
}
} else if (itemId) {
formData.value.itemId = itemId
}
}
defineExpose({ open })
/** 提交表单 */
const submitForm = async () => {
// 校验表单
await formRef.value.validate()
// 提交请求
formLoading.value = true
try {
const data = {
...formData.value,
returnVendorId: props.returnVendorId,
lineId: currentLineId.value
} as unknown as WmReturnVendorDetailVO
if (formType.value === 'create') {
await WmReturnVendorDetailApi.createReturnVendorDetail(data)
message.success(t('common.createSuccess'))
} else {
await WmReturnVendorDetailApi.updateReturnVendorDetail(data)
message.success(t('common.updateSuccess'))
}
dialogVisible.value = false
// 发送操作成功的事件
emit('success', currentLineId.value)
} finally {
formLoading.value = false
}
}
/** 重置表单 */
const resetForm = () => {
formData.value = {
id: undefined,
lineId: undefined,
returnVendorId: undefined,
itemId: undefined,
quantity: undefined,
batchCode: undefined,
warehouseId: undefined,
locationId: undefined,
areaId: undefined
}
formRef.value?.resetFields()
}
</script>

76
src/views/mes/wm/returnvendor/ReturnVendorDetailList.vue Normal file
View File

@ -0,0 +1,76 @@
<!-- MES 供应商退货拣货明细列表（展开行内嵌子组件） -->
<template>
<div class="pl-60px pr-20px py-10px">
<el-table v-loading="loading" :data="list" border size="small">
<el-table-column label="批次号" align="center" prop="batchCode" min-width="120" />
<el-table-column label="仓库名称" align="center" prop="warehouseName" min-width="100" />
<el-table-column label="库区名称" align="center" prop="locationName" min-width="100" />
<el-table-column label="库位名称" align="center" prop="areaName" min-width="100" />
<el-table-column label="数量" align="center" prop="quantity" width="100" />
<el-table-column
v-if="props.formType === 'stock'"
label="操作"
align="center"
width="120"
fixed="right"
>
<template #default="scope">
<el-button link type="primary" @click="emit('edit-detail', scope.row.id)">
编辑
</el-button>
<el-button link type="danger" @click="handleDelete(scope.row.id)">删除</el-button>
</template>
</el-table-column>
</el-table>
</div>
</template>
<script setup lang="ts">
import {
WmReturnVendorDetailApi,
WmReturnVendorDetailVO
} from '@/api/mes/wm/returnvendor/detail'
defineOptions({ name: 'ReturnVendorDetailList' })
const props = defineProps<{
returnVendorId: number
lineId: number
itemId: number
formType: string
}>()
const emit = defineEmits(['edit-detail'])
const { t } = useI18n() // 国际化
const message = useMessage() // 消息弹窗
const loading = ref(false) // 列表的加载中
const list = ref<WmReturnVendorDetailVO[]>([]) // 明细列表
/** 查询明细列表 */
const getList = async () => {
loading.value = true
try {
list.value = await WmReturnVendorDetailApi.getReturnVendorDetailListByLineId(props.lineId)
} finally {
loading.value = false
}
}
defineExpose({ getList })
/** 删除拣货明细 */
const handleDelete = async (detailId: number) => {
try {
await message.delConfirm()
await WmReturnVendorDetailApi.deleteReturnVendorDetail(detailId)
message.success(t('common.delSuccess'))
await getList()
} catch {}
}
/** 初始化：延迟加载，展开时才触发 */
onMounted(() => {
getList()
})
</script>

260
src/views/mes/wm/returnvendor/ReturnVendorForm.vue Normal file
View File

@ -0,0 +1,260 @@
<template>
<Dialog :title="dialogTitle" v-model="dialogVisible" width="960px">
<el-form
ref="formRef"
:model="formData"
:rules="formRules"
label-width="110px"
v-loading="formLoading"
>
<el-row>
<el-col :span="8">
<el-form-item label="退货单编号" prop="code">
<el-input
v-model="formData.code"
placeholder="请输入退货单编号"
:disabled="isHeaderReadonly"
>
<template #append>
<el-button @click="generateCode" :disabled="formType !== 'create'">
生成
</el-button>
</template>
</el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="退货单名称" prop="name">
<el-input
v-model="formData.name"
placeholder="请输入退货单名称"
:disabled="isHeaderReadonly"
/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="供应商" prop="vendorId">
<MdVendorSelect v-model="formData.vendorId" :disabled="isHeaderReadonly" />
</el-form-item>
</el-col>
<!-- TODO @AI：字段完整拼写 -->
<el-col :span="8">
<el-form-item label="采购订单号" prop="poCode">
<el-input
v-model="formData.poCode"
placeholder="请输入采购订单号"
:disabled="isHeaderReadonly"
/>
</el-form-item>
</el-col>
<!-- TODO @AI：供应商 select（必填） -->
<el-col :span="8">
<el-form-item label="退货日期" prop="returnDate">
<el-date-picker
v-model="formData.returnDate"
type="datetime"
value-format="YYYY-MM-DD HH:mm:ss"
placeholder="选择退货日期"
:disabled="isHeaderReadonly"
class="!w-full"
/>
</el-form-item>
</el-col>
<!-- TODO @AI：不需要批次号 -->
<el-col :span="8">
<el-form-item label="批次号" prop="batchCode">
<el-input
v-model="formData.batchCode"
placeholder="请输入批次号"
:disabled="isHeaderReadonly"
/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="退货原因" prop="returnReason">
<el-input
v-model="formData.returnReason"
placeholder="请输入退货原因"
:disabled="isHeaderReadonly"
/>
</el-form-item>
</el-col>
<!-- TODO @AI：运单号 -->
<el-col :span="8">
<el-form-item label="物流单号" prop="transportCode">
<el-input
v-model="formData.transportCode"
placeholder="请输入物流单号"
:disabled="isHeaderReadonly"
/>
</el-form-item>
</el-col>
<!-- TODO @AI：联系人 -->
<el-col :span="8">
<el-form-item label="联系电话" prop="transportTelephone">
<el-input
v-model="formData.transportTelephone"
placeholder="请输入联系电话"
:disabled="isHeaderReadonly"
/>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="备注" prop="remark">
<el-input
v-model="formData.remark"
type="textarea"
placeholder="请输入备注"
:disabled="isHeaderReadonly"
/>
</el-form-item>
</el-col>
</el-row>
</el-form>
<!-- 非新建模式展示行项目信息（退货物料） -->
<template v-if="formData.id">
<el-divider content-position="center">物料信息</el-divider>
<ReturnVendorLineList :return-vendor-id="formData.id" :form-type="formType" />
</template>
<template #footer>
<el-button v-if="isUpdate" @click="submitForm" type="primary" :disabled="formLoading">
确 定
</el-button>
<el-button v-if="isStock" @click="handleStock" type="primary" :disabled="formLoading">
执行拣货
</el-button>
<el-button @click="dialogVisible = false">取 消</el-button>
</template>
</Dialog>
</template>
<script setup lang="ts">
import { generateRandomStr } from '@/utils'
import { WmReturnVendorApi, WmReturnVendorVO } from '@/api/mes/wm/returnvendor'
import MdVendorSelect from '@/views/mes/md/vendor/components/MdVendorSelect.vue'
import ReturnVendorLineList from './ReturnVendorLineList.vue'
defineOptions({ name: 'ReturnVendorForm' })
const message = useMessage() // 消息弹窗
const dialogVisible = ref(false) // 弹窗的是否展示
const formLoading = ref(false) // 表单的加载中
const formType = ref<string>('create') // 表单的类型：create / update / stock / detail
const formData = ref({
id: undefined as number | undefined,
code: undefined,
name: undefined,
poCode: undefined,
vendorId: undefined,
batchCode: undefined,
returnDate: undefined,
returnReason: undefined,
transportCode: undefined,
transportTelephone: undefined,
remark: undefined
})
const formRules = reactive({
code: [{ required: true, message: '退货单编号不能为空', trigger: 'blur' }],
name: [{ required: true, message: '退货单名称不能为空', trigger: 'blur' }],
returnDate: [{ required: true, message: '退货日期不能为空', trigger: 'change' }]
})
const formRef = ref() // 表单 Ref
const isUpdate = computed(() => ['create', 'update'].includes(formType.value)) // 是否为编辑模式
const isStock = computed(() => formType.value === 'stock') // 是否为拣货模式
const isHeaderReadonly = computed(() => ['stock', 'detail'].includes(formType.value)) // 是否只读
const dialogTitle = computed(() => {
const titles = {
create: '新增供应商退货单',
update: '编辑供应商退货单',
stock: '执行拣货',
detail: '供应商退货单详情'
}
return titles[formType.value] || formType.value
})
/** 生成退货单编号 */
const generateCode = () => {
formData.value.code = 'RV' + generateRandomStr(10)
}
/** 打开弹窗 */
const open = async (type: string, id?: number) => {
dialogVisible.value = true
formType.value = type
resetForm()
// 修改/拣货/详情时，加载数据
if (id) {
formLoading.value = true
try {
formData.value = await WmReturnVendorApi.getReturnVendor(id)
} finally {
formLoading.value = false
}
}
}
defineExpose({ open })
/** 提交表单（create/update 模式） */
const emit = defineEmits(['success'])
const submitForm = async () => {
// 校验表单
await formRef.value.validate()
// 提交请求
formLoading.value = true
try {
const data = formData.value as unknown as WmReturnVendorVO
if (formType.value === 'create') {
const res = await WmReturnVendorApi.createReturnVendor(data)
message.success('新增成功')
formData.value.id = res
formType.value = 'update'
} else {
await WmReturnVendorApi.updateReturnVendor(data)
message.success('修改成功')
}
// 发送操作成功的事件
emit('success')
} finally {
formLoading.value = false
}
}
/** 执行拣货 */
const handleStock = async () => {
try {
formLoading.value = true
// 校验退货数量与拣货数量是否一致
const quantityMatch = await WmReturnVendorApi.checkReturnVendorQuantity(formData.value.id!)
if (!quantityMatch) {
await message.confirm('退货数量与拣货数量不一致，确认执行拣货？')
}
await WmReturnVendorApi.stockReturnVendor(formData.value.id!)
message.success('拣货成功')
dialogVisible.value = false
emit('success')
} catch {
} finally {
formLoading.value = false
}
}
/** 重置表单 */
const resetForm = () => {
formData.value = {
id: undefined,
code: undefined,
name: undefined,
poCode: undefined,
vendorId: undefined,
batchCode: undefined,
returnDate: undefined,
returnReason: undefined,
transportCode: undefined,
transportTelephone: undefined,
remark: undefined
}
formRef.value?.resetFields()
}
</script>

279
src/views/mes/wm/returnvendor/ReturnVendorLineList.vue Normal file
View File

@ -0,0 +1,279 @@
<!-- MES 供应商退货单行列表子组件 -->
<template>
<div>
<el-button v-if="isUpdate" type="primary" plain @click="openForm('create')" class="mb-10px">
<Icon icon="ep:plus" class="mr-5px" /> 添加物料
</el-button>
<el-table
v-loading="loading"
:data="list"
:stripe="true"
:show-overflow-tooltip="true"
border
:row-key="(row: any) => row.id"
>
<el-table-column type="expand">
<template #default="scope">
<ReturnVendorDetailList
:ref="(el: any) => setDetailListRef(scope.row.id, el)"
:return-vendor-id="props.returnVendorId"
:line-id="scope.row.id"
:item-id="scope.row.itemId"
:form-type="props.formType"
@edit-detail="
(detailId: number) =>
openDetailForm('update', scope.row.id, scope.row.itemId, detailId)
"
/>
</template>
</el-table-column>
<el-table-column label="物料编码" align="center" prop="itemCode" min-width="120" />
<el-table-column label="物料名称" align="center" prop="itemName" min-width="140" />
<el-table-column label="规格型号" align="center" prop="specification" min-width="120" />
<el-table-column label="单位" align="center" prop="unitMeasureName" width="80" />
<el-table-column label="退货数量" align="center" prop="quantity" width="100" />
<!-- TODO @AI：批次号 -->
<el-table-column
v-if="isUpdate || isStock"
label="操作"
align="center"
width="160"
fixed="right"
>
<template #default="scope">
<el-button v-if="isUpdate" link type="primary" @click="openForm('update', scope.row.id)">
编辑
</el-button>
<el-button v-if="isUpdate" link type="danger" @click="handleDelete(scope.row.id)">
删除
</el-button>
<el-button v-if="isStock" link type="success" @click="handlePicking(scope.row.id)">
拣货
</el-button>
</template>
</el-table-column>
</el-table>
<Pagination
:total="total"
v-model:page="queryParams.pageNo"
v-model:limit="queryParams.pageSize"
@pagination="getList"
/>
</div>
<!-- 添加/编辑行弹窗 -->
<Dialog :title="dialogTitle" v-model="dialogVisible" width="960px">
<el-form
ref="formRef"
:model="formData"
:rules="formRules"
label-width="110px"
v-loading="formLoading"
>
<el-row>
<el-col :span="8">
<el-form-item label="产品物料" prop="itemId">
<MdItemSelect
v-model="formData.itemId"
placeholder="请选择产品物料"
class="!w-1/1"
@change="handleItemChange"
/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="退货数量" prop="quantity">
<el-input-number
v-model="formData.quantity"
:precision="2"
:min="0"
controls-position="right"
class="!w-1/1"
/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="备注" prop="remark">
<el-input v-model="formData.remark" type="textarea" placeholder="请输入备注" />
</el-form-item>
</el-col>
</el-row>
</el-form>
<template #footer>
<el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
<el-button @click="dialogVisible = false">取 消</el-button>
</template>
</Dialog>
<!-- 拣货明细添加/编辑弹窗 -->
<ReturnVendorDetailForm
ref="detailFormRef"
:return-vendor-id="props.returnVendorId"
@success="onDetailFormSuccess"
/>
</template>
<script setup lang="ts">
import { WmReturnVendorLineApi, WmReturnVendorLineVO } from '@/api/mes/wm/returnvendor/line'
import MdItemSelect from '@/views/mes/md/item/components/MdItemSelect.vue'
import ReturnVendorDetailList from './ReturnVendorDetailList.vue'
import ReturnVendorDetailForm from './ReturnVendorDetailForm.vue'
defineOptions({ name: 'ReturnVendorLineList' })
const props = defineProps<{
returnVendorId: number
formType: string
}>()
const { t } = useI18n() // 国际化
const message = useMessage() // 消息弹窗
const isUpdate = computed(() => ['create', 'update'].includes(props.formType)) // 是否为编辑模式
const isStock = computed(() => props.formType === 'stock') // 是否为拣货模式
// ==================== 列表 ====================
const loading = ref(false) // 列表的加载中
const list = ref<WmReturnVendorLineVO[]>([]) // 行列表
const total = ref(0) // 列表的总页数
const queryParams = reactive({
pageNo: 1,
pageSize: 10,
returnVendorId: undefined as number | undefined
})
/** 查询行列表 */
const getList = async () => {
loading.value = true
try {
queryParams.returnVendorId = props.returnVendorId
const data = await WmReturnVendorLineApi.getReturnVendorLinePage(queryParams)
list.value = data.list
total.value = data.total
} finally {
loading.value = false
}
}
/** 删除 */
const handleDelete = async (id: number) => {
try {
await message.delConfirm()
await WmReturnVendorLineApi.deleteReturnVendorLine(id)
message.success(t('common.delSuccess'))
await getList()
} catch {}
}
// ==================== 添加/编辑表单 ====================
const dialogVisible = ref(false) // 弹窗的是否展示
const dialogTitle = ref('') // 弹窗的标题
const formLoading = ref(false) // 表单的加载中
const lineFormType = ref('') // 行表单的类型
const formData = ref({
id: undefined,
returnVendorId: undefined as number | undefined,
itemId: undefined,
quantity: undefined,
remark: undefined
})
const formRules = reactive({
itemId: [{ required: true, message: '物料不能为空', trigger: 'change' }],
quantity: [{ required: true, message: '退货数量不能为空', trigger: 'blur' }]
})
const formRef = ref() // 表单 Ref
/** 物料变化时，自动填充信息 */
const handleItemChange = (item: any) => {
if (item) {
formData.value.itemId = item.id
}
}
/** 打开表单弹窗 */
const openForm = async (type: string, id?: number) => {
dialogVisible.value = true
dialogTitle.value = type === 'create' ? '添加供应商退货单行' : '修改供应商退货单行'
lineFormType.value = type
resetForm()
if (id) {
formLoading.value = true
try {
formData.value = await WmReturnVendorLineApi.getReturnVendorLine(id)
} finally {
formLoading.value = false
}
}
}
/** 提交表单 */
const submitForm = async () => {
await formRef.value.validate()
formLoading.value = true
try {
const data = {
...formData.value,
returnVendorId: props.returnVendorId
} as unknown as WmReturnVendorLineVO
if (lineFormType.value === 'create') {
await WmReturnVendorLineApi.createReturnVendorLine(data)
message.success(t('common.createSuccess'))
} else {
await WmReturnVendorLineApi.updateReturnVendorLine(data)
message.success(t('common.updateSuccess'))
}
dialogVisible.value = false
await getList()
} finally {
formLoading.value = false
}
}
/** 重置表单 */
const resetForm = () => {
formData.value = {
id: undefined,
returnVendorId: undefined,
itemId: undefined,
quantity: undefined,
remark: undefined
}
formRef.value?.resetFields()
}
// ==================== 展开行：拣货明细 ====================
const detailListRefs = ref<Record<number, InstanceType<typeof ReturnVendorDetailList>>>({})
/** 缓存子组件 ref */
const setDetailListRef = (lineId: number, el: any) => {
if (el) {
detailListRefs.value[lineId] = el
}
}
// ==================== 拣货明细表单（LineList 层级持有） ====================
const detailFormRef = ref()
/** 拣货：直接打开明细创建表单 */
const handlePicking = (lineId: number) => {
const row = list.value.find((r) => r.id === lineId)
openDetailForm('create', lineId, row?.itemId)
}
/** 打开拣货明细表单 */
const openDetailForm = (type: string, lineId: number, itemId?: number, detailId?: number) => {
detailFormRef.value.open(type, lineId, itemId, detailId)
}
/** 明细表单提交成功后，刷新已展开行的 DetailList */
const onDetailFormSuccess = (lineId: number) => {
detailListRefs.value[lineId]?.getList()
}
/** 初始化 */
onMounted(async () => {
await getList()
})
</script>

302
src/views/mes/wm/returnvendor/index.vue Normal file
View File

@ -0,0 +1,302 @@
<template>
<ContentWrap>
<el-form
class="-mb-15px"
:model="queryParams"
ref="queryFormRef"
:inline="true"
label-width="100px"
>
<el-form-item label="退货单编号" prop="code">
<el-input
v-model="queryParams.code"
placeholder="请输入退货单编号"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="退货单名称" prop="name">
<el-input
v-model="queryParams.name"
placeholder="请输入退货单名称"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<!-- TODO @AI：采购订单编号 -->
<!-- TODO @AI：供应商筛选 -->
<!-- TODO @AI：去掉 returnDate、status；包括前后端； -->
<el-form-item label="退货日期" prop="returnDate">
<el-date-picker
v-model="queryParams.returnDate"
value-format="YYYY-MM-DD HH:mm:ss"
type="daterange"
start-placeholder="开始日期"
end-placeholder="结束日期"
:default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="单据状态" prop="status">
<el-select
v-model="queryParams.status"
placeholder="请选择单据状态"
clearable
class="!w-240px"
>
<el-option
v-for="dict in getIntDictOptions(DICT_TYPE.MES_RETURN_VENDOR_STATUS)"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item>
<el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
<el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
<el-button
type="primary"
plain
@click="openForm('create')"
v-hasPermi="['mes:wm-return-vendor:create']"
>
<Icon icon="ep:plus" class="mr-5px" /> 新增
</el-button>
<el-button
type="success"
plain
@click="handleExport"
:loading="exportLoading"
v-hasPermi="['mes:wm-return-vendor:export']"
>
<Icon icon="ep:download" class="mr-5px" /> 导出
</el-button>
</el-form-item>
</el-form>
</ContentWrap>
<ContentWrap>
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
<el-table-column label="退货单编号" align="center" prop="code" min-width="160">
<template #default="scope">
<el-button link type="primary" @click="openForm('detail', scope.row.id)">
{{ scope.row.code }}
</el-button>
</template>
</el-table-column>
<el-table-column label="退货单名称" align="center" prop="name" min-width="150" />
<el-table-column label="采购订单号" align="center" prop="poCode" min-width="140" />
<!-- TODO @AI：拆成供应商编码、供应商名称 -->
<el-table-column label="供应商" align="center" prop="vendorName" min-width="150" />
<!-- TODO @AI：去掉 batchCode 字段-->
<el-table-column label="批次号" align="center" prop="batchCode" min-width="120" />
<el-table-column
label="退货日期"
align="center"
prop="returnDate"
:formatter="dateFormatter2"
width="180px"
/>
<!-- TODO @AI：去掉 returnReason 字段-->
<el-table-column label="退货原因" align="center" prop="returnReason" min-width="150" />
<el-table-column label="单据状态" align="center" prop="status" min-width="110">
<template #default="scope">
<dict-tag :type="DICT_TYPE.MES_RETURN_VENDOR_STATUS" :value="scope.row.status" />
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="240" fixed="right">
<template #default="scope">
<!-- 草稿：编辑、提交、删除 -->
<el-button
link
type="primary"
@click="openForm('update', scope.row.id)"
v-hasPermi="['mes:wm-return-vendor:update']"
v-if="scope.row.status === MesWmReturnVendorStatusEnum.PREPARE"
>
编辑
</el-button>
<el-button
link
type="warning"
@click="handleSubmit(scope.row.id)"
v-hasPermi="['mes:wm-return-vendor:update']"
v-if="scope.row.status === MesWmReturnVendorStatusEnum.PREPARE"
>
提交
</el-button>
<el-button
link
type="danger"
@click="handleDelete(scope.row.id)"
v-hasPermi="['mes:wm-return-vendor:delete']"
v-if="scope.row.status === MesWmReturnVendorStatusEnum.PREPARE"
>
删除
</el-button>
<!-- 待拣货：执行拣货 -->
<el-button
link
type="success"
@click="openForm('stock', scope.row.id)"
v-hasPermi="['mes:wm-return-vendor:update']"
v-if="scope.row.status === MesWmReturnVendorStatusEnum.APPROVING"
>
执行拣货
</el-button>
<!-- 待执行退货：完成 -->
<el-button
link
type="success"
@click="handleFinish(scope.row.id)"
v-hasPermi="['mes:wm-return-vendor:update-status']"
v-if="scope.row.status === MesWmReturnVendorStatusEnum.APPROVED"
>
完成
</el-button>
<!-- 待拣货、待执行退货：取消 -->
<el-button
link
type="danger"
@click="handleCancel(scope.row.id)"
v-hasPermi="['mes:wm-return-vendor:update']"
v-if="
[
MesWmReturnVendorStatusEnum.APPROVING,
MesWmReturnVendorStatusEnum.APPROVED
].includes(scope.row.status)
"
>
取消
</el-button>
</template>
</el-table-column>
</el-table>
<Pagination
:total="total"
v-model:page="queryParams.pageNo"
v-model:limit="queryParams.pageSize"
@pagination="getList"
/>
</ContentWrap>
<ReturnVendorForm ref="formRef" @success="getList" />
</template>
<script setup lang="ts">
import { dateFormatter2 } from '@/utils/formatTime'
import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
import download from '@/utils/download'
import { WmReturnVendorApi, WmReturnVendorVO } from '@/api/mes/wm/returnvendor'
import ReturnVendorForm from './ReturnVendorForm.vue'
import { MesWmReturnVendorStatusEnum } from '@/views/mes/utils/constants'
defineOptions({ name: 'MesWmReturnVendor' })
const message = useMessage() // 消息弹窗
const { t } = useI18n() // 国际化
const loading = ref(true) // 列表的加载中
const list = ref<WmReturnVendorVO[]>([]) // 列表的数据
const total = ref(0) // 列表的总页数
const exportLoading = ref(false) // 导出的加载中
const queryParams = reactive({
pageNo: 1,
pageSize: 10,
code: undefined,
name: undefined,
status: undefined,
returnDate: undefined
})
const queryFormRef = ref() // 搜索的表单
const formRef = ref() // 表单弹窗
/** 查询列表 */
const getList = async () => {
loading.value = true
try {
const data = await WmReturnVendorApi.getReturnVendorPage(queryParams)
list.value = data.list
total.value = data.total
} finally {
loading.value = false
}
}
/** 搜索按钮操作 */
const handleQuery = () => {
queryParams.pageNo = 1
getList()
}
/** 重置按钮操作 */
const resetQuery = () => {
queryFormRef.value.resetFields()
handleQuery()
}
/** 添加/修改操作 */
const openForm = (type: string, id?: number) => {
formRef.value.open(type, id)
}
/** 提交按钮操作 */
const handleSubmit = async (id: number) => {
try {
await message.confirm('确认提交该退货单？')
await WmReturnVendorApi.submitReturnVendor(id)
message.success('提交成功')
await getList()
} catch {}
}
/** 删除按钮操作 */
const handleDelete = async (id: number) => {
try {
await message.delConfirm()
await WmReturnVendorApi.deleteReturnVendor(id)
message.success(t('common.delSuccess'))
await getList()
} catch {}
}
/** 取消按钮操作 */
const handleCancel = async (id: number) => {
try {
await message.confirm('确认取消该供应商退货单？取消后不可恢复。')
await WmReturnVendorApi.cancelReturnVendor(id)
message.success('取消成功')
await getList()
} catch {}
}
/** 完成按钮操作 */
const handleFinish = async (id: number) => {
try {
await message.confirm('确认完成该退货单并执行退货？')
await WmReturnVendorApi.finishReturnVendor(id)
message.success('完成成功')
await getList()
} catch {}
}
/** 导出按钮操作 */
const handleExport = async () => {
try {
await message.exportConfirm()
exportLoading.value = true
const data = await WmReturnVendorApi.exportReturnVendor(queryParams)
download.excel(data, '供应商退货单.xls')
} catch {
} finally {
exportLoading.value = false
}
}
onMounted(() => {
getList()
})
</script>