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): 添加装箱单及装箱明细相关功能 

新增装箱单和装箱明细的请求和响应对象，支持装箱单的创建、更新、删除及查询功能。包括装箱单的状态管理和子箱的添加与移除逻辑，提升了系统的功能完整性和用户体验。
pull/871/MERGE
YunaiV 2026-03-08 11:06:22 +08:00
parent e58ffbb681
commit 61d710bc8e
8 changed files with 231 additions and 333 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
src/api/mes/wm/packages/index.ts Normal file
View File

@ -0,0 +1,81 @@
import request from '@/config/axios'
// 装箱单响应 VO
// TODO @AI：VO 改成 WmPackageVO
export interface WmPackageRespVO {
id: number
code: string
parentId?: number
packageDate: number
salesOrderCode?: string
invoiceCode?: string
clientId?: number
clientCode?: string
clientName?: string
clientNickname?: string
length?: number
width?: number
height?: number
sizeUnitId?: number
sizeUnitName?: string
netWeight?: number
grossWeight?: number
weightUnitId?: number
weightUnitName?: string
inspectorUserId?: number
inspectorName?: string
status: number
remark?: string
createTime: string
}
// 装箱单 API
export const WmPackageApi = {
// 创建装箱单
createPackage: async (data: WmPackageRespVO) => {
return await request.post({ url: '/mes/wm/package/create', data })
},
// 修改装箱单
updatePackage: async (data: WmPackageRespVO) => {
return await request.put({ url: '/mes/wm/package/update', data })
},
// 删除装箱单
deletePackage: async (id: number) => {
return await request.delete({ url: '/mes/wm/package/delete?id=' + id })
},
// 获取装箱单详情
getPackage: async (id: number) => {
return await request.get<WmPackageRespVO>({ url: '/mes/wm/package/get?id=' + id })
},
// 分页查询装箱单
getPackagePage: async (params: any) => {
return await request.get({ url: '/mes/wm/package/page', params })
},
// 完成装箱单
finishPackage: async (id: number) => {
return await request.put({ url: '/mes/wm/package/finish?id=' + id })
},
// 添加子箱
// TODO @AI：addChildPackage，且接口地址改成 /mes/wm/package/add-child-package
addSubPackage: async (parentId: number, childId: number) => {
return await request.put({ url: '/mes/wm/package/add-sub-package', params: { parentId, childId } })
},
// 移除子箱
// TODO @AI：removeChildPackage，且接口地址改成 /mes/wm/package/remove-child-package
removeSubPackage: async (childId: number) => {
return await request.put({ url: '/mes/wm/package/remove-sub-package?childId=' + childId })
},
// 获取装箱单精简列表（无父箱 + 已完成状态，用于选择父箱）
// TODO @AI：改成 getChildablePackageSimpleList，且接口地址改成 /mes/wm/package/childable-simple-list；注释改成 可添加为子箱的装箱单精简列表（无父箱 + 已完成状态，用于选择父箱）
getPackageSimpleList: async () => {
return await request.get<WmPackageRespVO[]>({ url: '/mes/wm/package/simple-list' })
}
}

79
src/api/mes/wm/packages/line/index.ts Normal file
View File

@ -0,0 +1,79 @@
import request from '@/config/axios'
// ==================== 装箱明细 ====================
// 装箱明细保存请求 VO
// TODO @AI：不要 save，直接用 WmPackageLineRespVO
export interface WmPackageLineSaveReqVO {
id?: number
packageId: number
materialStockId?: number
itemId: number
quantity: number
workOrderId?: number
warehouseId?: number
locationId?: number
areaId?: number
expireDate?: number
remark?: string
}
// 装箱明细响应 VO
// TODO @AI：VO 改成 WmPackageLineVO
export interface WmPackageLineRespVO {
id: number
packageId: number
materialStockId?: number
itemId: number
itemCode?: string
itemName?: string
specification?: string
unitMeasureName?: string
quantity: number
workOrderId?: number
workOrderCode?: string
batchCode?: string
warehouseId?: number
warehouseName?: string
locationId?: number
locationName?: string
areaId?: number
areaName?: string
expireDate?: number
remark?: string
createTime: string
}
// 装箱明细 API
export const WmPackageLineApi = {
// 创建装箱明细
createPackageLine: async (data: WmPackageLineSaveReqVO) => {
return await request.post({ url: '/mes/wm/package-line/create', data })
},
// 修改装箱明细
updatePackageLine: async (data: WmPackageLineSaveReqVO) => {
return await request.put({ url: '/mes/wm/package-line/update', data })
},
// 删除装箱明细
deletePackageLine: async (id: number) => {
return await request.delete({ url: '/mes/wm/package-line/delete?id=' + id })
},
// 获取装箱明细详情
getPackageLine: async (id: number) => {
return await request.get<WmPackageLineRespVO>({ url: '/mes/wm/package-line/get?id=' + id })
},
// 分页查询装箱明细
getPackageLinePage: async (params: any) => {
return await request.get({ url: '/mes/wm/package-line/page', params })
},
// 根据装箱单 ID 获取明细列表
// TODO @AI：这个接口不需要；是不是前后端都删除掉
getPackageLineListByPackageId: async (packageId: number) => {
return await request.get({ url: '/mes/wm/package-line/list-by-package-id', params: { packageId } })
}
}

174
src/api/mes/wm/wmpackage/index.ts
View File

@ -1,174 +0,0 @@
import request from '@/config/axios'
// TODO @AI：拆成两个，一个 index.ts，一个 linde/index.ts 两个；
// ==================== 装箱单主表 ====================
// 装箱单保存请求 VO
// TODO @AI：不需要独立的 SaveReqVO；直接用 WmPackageRespVO
export interface WmPackageSaveReqVO {
id?: number
code: string
parentId?: number
packageDate: number
soCode?: string
invoiceCode?: string
clientId?: number
length?: number
width?: number
height?: number
sizeUnitId?: number
netWeight?: number
grossWeight?: number
weightUnitId?: number
inspectorUserId?: number
status?: number
remark?: string
}
// 装箱单响应 VO
export interface WmPackageRespVO {
id: number
code: string
parentId?: number
packageDate: number
soCode?: string
invoiceCode?: string
clientId?: number
clientCode?: string
clientName?: string
clientNickname?: string
length?: number
width?: number
height?: number
sizeUnitId?: number
sizeUnitName?: string
netWeight?: number
grossWeight?: number
weightUnitId?: number
weightUnitName?: string
inspectorUserId?: number
inspectorName?: string
status: number
remark?: string
// TODO @AI：后端不用返回 children；前端根据 parentId 直接 handleTree 就好了
children?: WmPackageRespVO[]
createTime: string
}
// 装箱单 API
export const WmPackageApi = {
// 创建装箱单
createPackage: async (data: WmPackageSaveReqVO) => {
return await request.post({ url: '/mes/wm/package/create', data })
},
// 修改装箱单
updatePackage: async (data: WmPackageSaveReqVO) => {
return await request.put({ url: '/mes/wm/package/update', data })
},
// 删除装箱单
deletePackage: async (id: number) => {
return await request.delete({ url: '/mes/wm/package/delete?id=' + id })
},
// 获取装箱单详情
getPackage: async (id: number) => {
return await request.get<WmPackageRespVO>({ url: '/mes/wm/package/get?id=' + id })
},
// 分页查询装箱单
getPackagePage: async (params: any) => {
return await request.get({ url: '/mes/wm/package/page', params })
},
// 导出装箱单 Excel
exportPackage: async (params: any) => {
return await request.download({ url: '/mes/wm/package/export-excel', params })
},
// 完成装箱单
finishPackage: async (id: number) => {
return await request.put({ url: '/mes/wm/package/finish?id=' + id })
},
// 获取装箱单树形结构
getPackageTree: async (params?: any) => {
return await request.get({ url: '/mes/wm/package/tree', params })
}
}
// ==================== 装箱明细 ====================
// 装箱明细保存请求 VO
export interface WmPackageLineSaveReqVO {
id?: number
packageId: number
materialStockId?: number
itemId: number
quantity: number
workOrderId?: number
warehouseId?: number
locationId?: number
areaId?: number
expireDate?: number
remark?: string
}
// 装箱明细响应 VO
export interface WmPackageLineRespVO {
id: number
packageId: number
materialStockId?: number
itemId: number
itemCode?: string
itemName?: string
specification?: string
unitMeasureName?: string
quantity: number
workOrderId?: number
workOrderCode?: string
batchCode?: string
warehouseId?: number
warehouseName?: string
locationId?: number
locationName?: string
areaId?: number
areaName?: string
expireDate?: number
remark?: string
createTime: string
}
// 装箱明细 API
export const WmPackageLineApi = {
// 创建装箱明细
createPackageLine: async (data: WmPackageLineSaveReqVO) => {
return await request.post({ url: '/mes/wm/package-line/create', data })
},
// 修改装箱明细
updatePackageLine: async (data: WmPackageLineSaveReqVO) => {
return await request.put({ url: '/mes/wm/package-line/update', data })
},
// 删除装箱明细
deletePackageLine: async (id: number) => {
return await request.delete({ url: '/mes/wm/package-line/delete?id=' + id })
},
// 获取装箱明细详情
getPackageLine: async (id: number) => {
return await request.get<WmPackageLineRespVO>({ url: '/mes/wm/package-line/get?id=' + id })
},
// 分页查询装箱明细
getPackageLinePage: async (params: any) => {
return await request.get({ url: '/mes/wm/package-line/page', params })
},
// 根据装箱单 ID 获取明细列表
getPackageLineListByPackageId: async (packageId: number) => {
return await request.get({ url: '/mes/wm/package-line/list-by-package-id', params: { packageId } })
}
}

50
src/views/mes/wm/wmpackage/PackageForm.vue → src/views/mes/wm/packages/PackageForm.vue
View File

@ -1,6 +1,5 @@
<template>
<Dialog :title="dialogTitle" v-model="dialogVisible" width="1100px">
<!-- TODO @AI：每行 3 个； -->
<el-form
ref="formRef"
:model="formData"
@ -32,6 +31,7 @@
/>
</el-form-item>
</el-col>
<!-- TODO @AI：不需要父箱；这里要不把“检查员”，挪上来； -->
<el-col :span="8">
<el-form-item label="父箱" prop="parentId">
<WmPackageSelect
@ -44,8 +44,8 @@
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="销售订单编号" prop="soCode">
<el-input v-model="formData.soCode" placeholder="请输入销售订单编号" />
<el-form-item label="销售订单编号" prop="salesOrderCode">
<el-input v-model="formData.salesOrderCode" placeholder="请输入销售订单编号" />
</el-form-item>
</el-col>
<el-col :span="8">
@ -53,8 +53,6 @@
<el-input v-model="formData.invoiceCode" placeholder="请输入发票编号" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="客户" prop="clientId">
<MdClientSelect v-model="formData.clientId" :disabled="isDetail" />
@ -62,8 +60,12 @@
</el-col>
</el-row>
<el-row>
<!-- TODO @AI：长度、宽度、高度、尺寸单位；在一行；可能这里一行 4 个了 -->
<el-col :span="8">
<el-form-item label="尺寸单位" prop="sizeUnitId">
<MdUnitMeasureSelect v-model="formData.sizeUnitId" :disabled="isDetail" />
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="箱长度" prop="length">
<el-input-number
v-model="formData.length"
@ -74,7 +76,7 @@
/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="5">
<el-form-item label="箱宽度" prop="width">
<el-input-number
v-model="formData.width"
@ -85,7 +87,7 @@
/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="5">
<el-form-item label="箱高度" prop="height">
<el-input-number
v-model="formData.height"
@ -99,14 +101,11 @@
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="尺寸单位" prop="sizeUnitId">
<MdUnitMeasureSelect v-model="formData.sizeUnitId" :disabled="isDetail" />
<el-form-item label="重量单位" prop="weightUnitId">
<MdUnitMeasureSelect v-model="formData.weightUnitId" :disabled="isDetail" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<!-- TODO @AI：净重、毛重、重量单位 一行； -->
<el-col :span="8">
<el-col :span="5">
<el-form-item label="净重" prop="netWeight">
<el-input-number
v-model="formData.netWeight"
@ -117,7 +116,7 @@
/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="5">
<el-form-item label="毛重" prop="grossWeight">
<el-input-number
v-model="formData.grossWeight"
@ -128,11 +127,6 @@
/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="重量单位" prop="weightUnitId">
<MdUnitMeasureSelect v-model="formData.weightUnitId" :disabled="isDetail" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
@ -152,10 +146,10 @@
<!-- 编辑/详情时展示子表信息 -->
<template v-if="formType !== 'create' && formData.id">
<el-tabs v-model="activeTab" class="mt-15px">
<el-tab-pane label="子箱列表" name="subPackage">
<el-tab-pane label="子箱" name="subPackage">
<SubPackageList :package-id="formData.id" :form-type="formType" />
</el-tab-pane>
<el-tab-pane label="装箱明细" name="packageLine">
<el-tab-pane label="装箱清单" name="packageLine">
<PackageLineList :package-id="formData.id" :form-type="formType" />
</el-tab-pane>
</el-tabs>
@ -171,7 +165,7 @@
<script setup lang="ts">
import { generateRandomStr } from '@/utils'
import { WmPackageApi, WmPackageSaveReqVO } from '@/api/mes/wm/wmpackage'
import { WmPackageApi, WmPackageRespVO } from '@/api/mes/wm/packages'
import MdClientSelect from '@/views/mes/md/client/components/MdClientSelect.vue'
import MdUnitMeasureSelect from '@/views/mes/md/unitmeasure/components/MdUnitMeasureSelect.vue'
import UserSelect from '@/views/system/user/components/UserSelect.vue'
@ -179,6 +173,8 @@ import WmPackageSelect from './components/WmPackageSelect.vue'
import SubPackageList from './SubPackageList.vue'
import PackageLineList from './PackageLineList.vue'
// TODO @AI：参考 /Users/yunai/Java/yudao-all-in-one/yudao-ui-admin-vue3/src/views/system/user/UserForm.vue 注释；
defineOptions({ name: 'PackageForm' })
const { t } = useI18n()
@ -202,7 +198,7 @@ const formData = ref({
code: undefined as string | undefined,
parentId: undefined as number | undefined,
packageDate: undefined as number | undefined,
soCode: undefined as string | undefined,
salesOrderCode: undefined as string | undefined,
invoiceCode: undefined as string | undefined,
clientId: undefined as number | undefined,
length: undefined as number | undefined,
@ -249,7 +245,7 @@ const submitForm = async () => {
await formRef.value.validate()
formLoading.value = true
try {
const data = formData.value as unknown as WmPackageSaveReqVO
const data = formData.value as unknown as WmPackageRespVO
if (formType.value === 'create') {
const res = await WmPackageApi.createPackage(data)
message.success(t('common.createSuccess'))
@ -260,8 +256,8 @@ const submitForm = async () => {
await WmPackageApi.updatePackage(data)
message.success(t('common.updateSuccess'))
dialogVisible.value = false
emit('success')
}
emit('success')
} finally {
formLoading.value = false
}
@ -274,7 +270,7 @@ const resetForm = () => {
code: undefined,
parentId: undefined,
packageDate: undefined,
soCode: undefined,
salesOrderCode: undefined,
invoiceCode: undefined,
clientId: undefined,
length: undefined,

29
src/views/mes/wm/wmpackage/PackageLineList.vue → src/views/mes/wm/packages/PackageLineList.vue
View File

@ -1,13 +1,7 @@
<!-- MES 装箱明细列表子组件 -->
<template>
<div>
<el-button
v-if="isEditable"
type="primary"
plain
@click="openForm('create')"
class="mb-10px"
>
<el-button v-if="isEditable" 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>
@ -17,6 +11,7 @@
<el-table-column label="单位" align="center" prop="unitMeasureName" width="80" />
<el-table-column label="装箱数量" align="center" prop="quantity" width="100" />
<el-table-column label="生产工单编号" align="center" prop="workOrderCode" min-width="140" />
<!-- TODO @芋艿：批次号？到底怎么设置好？ -->
<el-table-column label="批次号" align="center" prop="batchCode" min-width="120" />
<el-table-column
label="有效期"
@ -25,6 +20,7 @@
:formatter="dateFormatter2"
width="120"
/>
<!-- TODO @AI：去掉 warehouseName、locationName、areaName 字段；前端、后端都是；表单也是，没用； -->
<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" />
@ -55,10 +51,7 @@
<el-row>
<el-col :span="8">
<el-form-item label="生产工单" prop="workOrderId">
<ProWorkOrderSelect
v-model="formData.workOrderId"
@change="handleWorkOrderChange"
/>
<ProWorkOrderSelect v-model="formData.workOrderId" @change="handleWorkOrderChange" />
</el-form-item>
</el-col>
<el-col :span="8">
@ -78,6 +71,7 @@
</el-form-item>
</el-col>
</el-row>
<!-- TODO @AI：只展示一个只读的物料选择器，然后 handleWorkOrderChange 选择后去设置就 ok 了；前端只传递 itemId -->
<el-row>
<el-col :span="8">
<el-form-item label="产品物料编码">
@ -110,10 +104,7 @@
<el-row>
<el-col :span="8">
<el-form-item label="仓库" prop="warehouseId">
<WmWarehouseSelect
v-model="formData.warehouseId"
@change="handleWarehouseChange"
/>
<WmWarehouseSelect v-model="formData.warehouseId" @change="handleWarehouseChange" />
</el-form-item>
</el-col>
<el-col :span="8">
@ -126,13 +117,11 @@
</el-col>
<el-col :span="8">
<el-form-item label="库位" prop="areaId">
<WmWarehouseAreaSelect
v-model="formData.areaId"
:warehouse-id="formData.warehouseId"
/>
<WmWarehouseAreaSelect v-model="formData.areaId" :warehouse-id="formData.warehouseId" />
</el-form-item>
</el-col>
</el-row>
<!-- TODO @芋艿：批次号？到底怎么设置好？ -->
<el-row>
<el-col :span="8">
<el-form-item label="有效期" prop="expireDate">
@ -167,7 +156,7 @@ import {
WmPackageLineApi,
WmPackageLineRespVO,
WmPackageLineSaveReqVO
} from '@/api/mes/wm/wmpackage'
} from '@/api/mes/wm/packages/line'
import ProWorkOrderSelect from '@/views/mes/pro/workorder/components/ProWorkOrderSelect.vue'
import WmWarehouseSelect from '@/views/mes/wm/warehouse/components/WmWarehouseSelect.vue'
import WmWarehouseLocationSelect from '@/views/mes/wm/warehouse/components/WmWarehouseLocationSelect.vue'

40
src/views/mes/wm/wmpackage/SubPackageList.vue → src/views/mes/wm/packages/SubPackageList.vue
View File

@ -1,16 +1,11 @@
<!-- MES 子箱列表子组件 -->
<template>
<div>
<el-button
v-if="isEditable"
type="primary"
plain
@click="openForm('create')"
class="mb-10px"
>
<el-button v-if="isEditable" 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>
<!-- TODO @AI：参考 /Users/yunai/Java/yudao-all-in-one/yudao-ui-admin-vue3/src/views/mes/wm/packages/index.vue 列表，只是没树、筛选； -->
<el-table-column label="装箱单编号" align="center" prop="code" min-width="160">
<template #default="scope">
<el-link type="primary" @click="handleView(scope.row.id)">
@ -73,7 +68,7 @@
<script setup lang="ts">
import { dateFormatter2 } from '@/utils/formatTime'
import { DICT_TYPE } from '@/utils/dict'
import { WmPackageApi, WmPackageRespVO } from '@/api/mes/wm/wmpackage'
import { WmPackageApi, WmPackageRespVO } from '@/api/mes/wm/packages'
import { MesWmPackageStatusEnum } from '@/views/mes/utils/constants'
import WmPackageSelect from './components/WmPackageSelect.vue'
@ -97,9 +92,13 @@ const list = ref<WmPackageRespVO[]>([])
const getList = async () => {
loading.value = true
try {
// 获取当前装箱单详情，取其 children
const data = await WmPackageApi.getPackage(props.packageId)
list.value = data.children || []
// 通过分页查询，筛选 parentId 为当前装箱单的记录
const data = await WmPackageApi.getPackagePage({
pageNo: 1,
pageSize: 100,
parentId: props.packageId
})
list.value = data.list || []
} finally {
loading.value = false
}
@ -108,20 +107,15 @@ const getList = async () => {
/** 查看子箱详情（打开新弹窗） */
const handleView = (id: number) => {
// 通过打开详情弹窗查看
window.open(`/mes/wm/wmpackage?id=${id}`, '_blank')
window.open(`/mes/wm/packages?id=${id}`, '_blank')
}
/** 移除子箱：将子箱的 parentId 清空 */
const handleRemoveChild = async (childId: number) => {
try {
// TODO @AI：增加一个 delete subpackage 的接口，直接传递 childId 就行了；
// DONE @AI：增加一个 delete subpackage 的接口，直接传递 childId 就行了；
await message.confirm('确认将该装箱单从子箱列表中移除？')
// 获取子箱信息，将其 parentId 置为 0
const childData = await WmPackageApi.getPackage(childId)
await WmPackageApi.updatePackage({
...childData,
parentId: 0
})
await WmPackageApi.removeSubPackage(childId)
message.success('移除成功')
await getList()
} catch {}
@ -150,12 +144,8 @@ const submitForm = async () => {
await formRef.value.validate()
formLoading.value = true
try {
const childData = await WmPackageApi.getPackage(formData.value.childId!)
// TODO @AI：单独有个 add subpackage 的接口；
await WmPackageApi.updatePackage({
...childData,
parentId: props.packageId
})
// DONE @AI：单独有个 add subpackage 的接口；
await WmPackageApi.addSubPackage(props.packageId, formData.value.childId!)
message.success(t('common.createSuccess'))
dialogVisible.value = false
await getList()

30
src/views/mes/wm/wmpackage/components/WmPackageSelect.vue → src/views/mes/wm/packages/components/WmPackageSelect.vue
View File

@ -27,7 +27,7 @@
</template>
<script setup lang="ts">
import { WmPackageApi, WmPackageRespVO } from '@/api/mes/wm/wmpackage'
import { WmPackageApi, WmPackageRespVO } from '@/api/mes/wm/packages'
defineOptions({ name: 'WmPackageSelect' })
@ -61,7 +61,9 @@ const selectValue = computed({
/** 获取排除后的列表 */
const getAvailableList = () => {
if (!props.excludeId) return allList.value
if (!props.excludeId) {
return allList.value
}
return allList.value.filter((item) => item.id !== props.excludeId)
}
@ -86,28 +88,10 @@ const handleChange = (val: number | undefined) => {
emit('change', item)
}
/** 加载装箱单列表（扁平化） */
/** 加载装箱单列表（无父箱 + 已完成状态） */
const loadList = async () => {
// TODO @AI：不用 tree 树形结构；单独一个接口：
// 1. 没有父
// 2. 状态是完成的；
const tree = await WmPackageApi.getPackageTree()
// 将树形结构扁平化
const flatList: WmPackageRespVO[] = []
const flatten = (items: WmPackageRespVO[]) => {
for (const item of items) {
flatList.push(item)
if (item.children?.length) {
flatten(item.children)
}
}
}
if (Array.isArray(tree)) {
flatten(tree)
} else if (tree?.list) {
flatten(tree.list)
}
allList.value = flatList
const data = await WmPackageApi.getPackageSimpleList()
allList.value = Array.isArray(data) ? data : []
filteredList.value = getAvailableList()
}

81
src/views/mes/wm/wmpackage/index.vue → src/views/mes/wm/packages/index.vue
View File

@ -16,9 +16,9 @@
class="!w-240px"
/>
</el-form-item>
<el-form-item label="销售订单编号" prop="soCode">
<el-form-item label="销售订单编号" prop="salesOrderCode">
<el-input
v-model="queryParams.soCode"
v-model="queryParams.salesOrderCode"
placeholder="请输入销售订单编号"
clearable
@keyup.enter="handleQuery"
@ -28,33 +28,8 @@
<el-form-item label="客户" prop="clientId">
<MdClientSelect v-model="queryParams.clientId" class="!w-240px" />
</el-form-item>
<!-- TODO @AI：增加检测员的 select； -->
<!-- TODO @AI：packageDate、status 去掉这样的检测条件，前后端都是 -->
<el-form-item label="装箱日期" prop="packageDate">
<el-date-picker
v-model="queryParams.packageDate"
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_WM_PACKAGE_STATUS)"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
<el-form-item label="检查员" prop="inspectorUserId">
<UserSelect v-model="queryParams.inspectorUserId" class="!w-240px" />
</el-form-item>
<el-form-item>
<el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
@ -67,15 +42,6 @@
>
<Icon icon="ep:plus" class="mr-5px" /> 新增
</el-button>
<el-button
type="success"
plain
@click="handleExport"
:loading="exportLoading"
v-hasPermi="['mes:wm-package:export']"
>
<Icon icon="ep:download" class="mr-5px" /> 导出
</el-button>
</el-form-item>
</el-form>
</ContentWrap>
@ -90,6 +56,7 @@
:tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
default-expand-all
>
<!-- TODO @AI：编号需要 fixed，可以一直被看到，这个列表太长了 -->
<el-table-column label="装箱单编号" align="center" prop="code" min-width="160">
<template #default="scope">
<el-link type="primary" @click="openForm('detail', scope.row.id)">
@ -104,7 +71,7 @@
:formatter="dateFormatter2"
width="120"
/>
<el-table-column label="销售订单编号" align="center" prop="soCode" min-width="140" />
<el-table-column label="销售订单编号" align="center" prop="salesOrderCode" min-width="140" />
<el-table-column label="发票编号" align="center" prop="invoiceCode" min-width="120" />
<el-table-column label="客户编码" align="center" prop="clientCode" min-width="100" />
<el-table-column label="客户名称" align="center" prop="clientName" min-width="120" />
@ -166,14 +133,17 @@
<script setup lang="ts">
import { dateFormatter2 } from '@/utils/formatTime'
import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
import download from '@/utils/download'
import { WmPackageApi, WmPackageRespVO } from '@/api/mes/wm/wmpackage'
import { DICT_TYPE } from '@/utils/dict'
import { handleTree } from '@/utils/tree'
import { WmPackageApi, WmPackageRespVO } from '@/api/mes/wm/packages'
import MdClientSelect from '@/views/mes/md/client/components/MdClientSelect.vue'
import UserSelect from '@/views/system/user/components/UserSelect.vue'
import PackageForm from './PackageForm.vue'
import { MesWmPackageStatusEnum } from '@/views/mes/utils/constants'
defineOptions({ name: 'MesWmPackage' })
// TODO @AI：注释风格，参考 /Users/yunai/Java/yudao-all-in-one/yudao-ui-admin-vue3/src/views/system/user/index.vue
defineOptions({ name: 'MesWmPackages' })
const message = useMessage()
const { t } = useI18n()
@ -181,15 +151,13 @@ const { t } = useI18n()
const loading = ref(true)
const list = ref<WmPackageRespVO[]>([])
const total = ref(0)
const exportLoading = ref(false)
const queryParams = reactive({
pageNo: 1,
pageSize: 10,
code: undefined,
soCode: undefined,
salesOrderCode: undefined,
clientId: undefined,
packageDate: undefined,
status: undefined
inspectorUserId: undefined
})
const queryFormRef = ref()
@ -197,9 +165,8 @@ const queryFormRef = ref()
const getList = async () => {
loading.value = true
try {
// TODO @AI：获取分页后，根据 list 转换成 handleTree 就好了；
const data = await WmPackageApi.getPackageTree(queryParams)
list.value = data.list
const data = await WmPackageApi.getPackagePage(queryParams)
list.value = handleTree(data.list)
total.value = data.total
} finally {
loading.value = false
@ -244,20 +211,6 @@ const handleDelete = async (id: number) => {
} catch {}
}
/** 导出 */
// TODO @AI：不需要导出功能，前后端都去掉；
const handleExport = async () => {
try {
await message.exportConfirm()
exportLoading.value = true
const data = await WmPackageApi.exportPackage(queryParams)
download.excel(data, '装箱单.xls')
} catch {
} finally {
exportLoading.value = false
}
}
/** 初始化 */
onMounted(async () => {
await getList()