✨ feat(mes): 新增生产流转卡和装箱单精简列表接口
新增获取生产流转卡和装箱单的精简列表接口,主要用于前端下拉选项选择,提升用户体验。同时,更新条码配置相关逻辑,增加条码配置关联检查,确保数据一致性。pull/871/MERGE
parent
26272b7b12
commit
89b61ba3cd
|
|
@ -47,5 +47,10 @@ export const ProCardApi = {
|
||||||
// 导出生产流转卡 Excel
|
// 导出生产流转卡 Excel
|
||||||
exportCard: async (params: any) => {
|
exportCard: async (params: any) => {
|
||||||
return await request.download({ url: `/mes/pro/card/export-excel`, params })
|
return await request.download({ url: `/mes/pro/card/export-excel`, params })
|
||||||
|
},
|
||||||
|
|
||||||
|
// 获取生产流转卡精简列表
|
||||||
|
getCardSimpleList: async () => {
|
||||||
|
return await request.get<ProCardVO[]>({ url: `/mes/pro/card/simple-list` })
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -76,5 +76,10 @@ export const WmPackageApi = {
|
||||||
// 可添加为子箱的装箱单精简列表(无父箱 + 已完成状态,用于选择父箱)
|
// 可添加为子箱的装箱单精简列表(无父箱 + 已完成状态,用于选择父箱)
|
||||||
getChildablePackageSimpleList: async () => {
|
getChildablePackageSimpleList: async () => {
|
||||||
return await request.get<WmPackageVO[]>({ url: '/mes/wm/package/childable-simple-list' })
|
return await request.get<WmPackageVO[]>({ url: '/mes/wm/package/childable-simple-list' })
|
||||||
|
},
|
||||||
|
|
||||||
|
// 获取装箱单精简列表
|
||||||
|
getPackageSimpleList: async () => {
|
||||||
|
return await request.get<WmPackageVO[]>({ url: '/mes/wm/package/simple-list' })
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,81 @@
|
||||||
|
<!-- MES 流转卡选择器:一次加载全量,前端过滤(支持 code) -->
|
||||||
|
<template>
|
||||||
|
<el-select
|
||||||
|
v-model="selectValue"
|
||||||
|
:placeholder="placeholder"
|
||||||
|
:disabled="disabled"
|
||||||
|
:clearable="clearable"
|
||||||
|
filterable
|
||||||
|
:filter-method="handleFilter"
|
||||||
|
class="!w-1/1"
|
||||||
|
@change="handleChange"
|
||||||
|
>
|
||||||
|
<el-option v-for="item in filteredList" :key="item.id" :label="item.code" :value="item.id">
|
||||||
|
<div class="flex items-center gap-8px">
|
||||||
|
<span>{{ item.code }}</span>
|
||||||
|
<el-tag v-if="item.workOrderCode" size="small" type="info" class="ml-4px">
|
||||||
|
{{ item.workOrderCode }}
|
||||||
|
</el-tag>
|
||||||
|
</div>
|
||||||
|
</el-option>
|
||||||
|
</el-select>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script setup lang="ts">
|
||||||
|
import { ProCardApi, ProCardVO } from '@/api/mes/pro/card'
|
||||||
|
|
||||||
|
defineOptions({ name: 'ProCardSelect' })
|
||||||
|
|
||||||
|
const props = withDefaults(
|
||||||
|
defineProps<{
|
||||||
|
modelValue?: number
|
||||||
|
disabled?: boolean
|
||||||
|
clearable?: boolean
|
||||||
|
placeholder?: string
|
||||||
|
}>(),
|
||||||
|
{
|
||||||
|
disabled: false,
|
||||||
|
clearable: true,
|
||||||
|
placeholder: '请选择流转卡'
|
||||||
|
}
|
||||||
|
)
|
||||||
|
|
||||||
|
const emit = defineEmits<{
|
||||||
|
'update:modelValue': [value: number | undefined]
|
||||||
|
change: [item: ProCardVO | undefined]
|
||||||
|
}>()
|
||||||
|
|
||||||
|
const allList = ref<ProCardVO[]>([])
|
||||||
|
const filteredList = ref<ProCardVO[]>([])
|
||||||
|
|
||||||
|
const selectValue = computed({
|
||||||
|
get: () => props.modelValue,
|
||||||
|
set: (val) => emit('update:modelValue', val)
|
||||||
|
})
|
||||||
|
|
||||||
|
/** 前端过滤(code + workOrderCode) */
|
||||||
|
const handleFilter = (query: string) => {
|
||||||
|
if (!query) {
|
||||||
|
filteredList.value = allList.value
|
||||||
|
return
|
||||||
|
}
|
||||||
|
const keyword = query.toLowerCase()
|
||||||
|
filteredList.value = allList.value.filter(
|
||||||
|
(item) =>
|
||||||
|
item.code?.toLowerCase().includes(keyword) ||
|
||||||
|
item.workOrderCode?.toLowerCase().includes(keyword)
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
/** 选中变化 */
|
||||||
|
const handleChange = (val: number | undefined) => {
|
||||||
|
const item = allList.value.find((o) => o.id === val)
|
||||||
|
emit('change', item)
|
||||||
|
}
|
||||||
|
|
||||||
|
/** 加载流转卡列表 */
|
||||||
|
onMounted(async () => {
|
||||||
|
allList.value = await ProCardApi.getCardSimpleList()
|
||||||
|
filteredList.value = allList.value
|
||||||
|
})
|
||||||
|
</script>
|
||||||
|
|
@ -137,7 +137,35 @@
|
||||||
>
|
>
|
||||||
<TmToolSelect v-model="formData.bizId" @change="handleBizSelect" class="!w-1/1" />
|
<TmToolSelect v-model="formData.bizId" @change="handleBizSelect" class="!w-1/1" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<!-- TODO @芋艿:以下业务类型暂无对应的 Select 组件:PACKAGE(装箱单)、STOCK(库存)、BATCH(批次)、PROCARD(流转卡)、TRANSORDER(流转单) -->
|
<el-form-item
|
||||||
|
v-else-if="formData.bizType === BarcodeBizTypeEnum.PACKAGE"
|
||||||
|
label="装箱单"
|
||||||
|
prop="bizId"
|
||||||
|
>
|
||||||
|
<BarcodePackageSelect v-model="formData.bizId" @change="handleBizSelect" class="!w-1/1" />
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item
|
||||||
|
v-else-if="formData.bizType === BarcodeBizTypeEnum.STOCK"
|
||||||
|
label="库存"
|
||||||
|
prop="bizId"
|
||||||
|
>
|
||||||
|
<WmMaterialStockSelect v-model="formData.bizId" @change="handleBizSelect" class="!w-1/1" />
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item
|
||||||
|
v-else-if="formData.bizType === BarcodeBizTypeEnum.BATCH"
|
||||||
|
label="批次"
|
||||||
|
prop="bizId"
|
||||||
|
>
|
||||||
|
<WmBatchSelect v-model="formData.bizId" @change="handleBizSelect" class="!w-1/1" />
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item
|
||||||
|
v-else-if="formData.bizType === BarcodeBizTypeEnum.PROCARD"
|
||||||
|
label="流转卡"
|
||||||
|
prop="bizId"
|
||||||
|
>
|
||||||
|
<ProCardSelect v-model="formData.bizId" @change="handleBizSelect" class="!w-1/1" />
|
||||||
|
</el-form-item>
|
||||||
|
<!-- TODO 流转单(TRANSORDER)后端模块尚未实现,待后续补充 -->
|
||||||
<el-form-item v-else-if="formData.bizType" label="暂未接入" prop="bizId">
|
<el-form-item v-else-if="formData.bizType" label="暂未接入" prop="bizId">
|
||||||
<el-input-number
|
<el-input-number
|
||||||
v-model="formData.bizId"
|
v-model="formData.bizId"
|
||||||
|
|
@ -194,6 +222,10 @@ import MdWorkshopSelect from '@/views/mes/md/workstation/components/MdWorkshopSe
|
||||||
import MdClientSelect from '@/views/mes/md/client/components/MdClientSelect.vue'
|
import MdClientSelect from '@/views/mes/md/client/components/MdClientSelect.vue'
|
||||||
import TmToolSelect from '@/views/mes/tm/tool/components/TmToolSelect.vue'
|
import TmToolSelect from '@/views/mes/tm/tool/components/TmToolSelect.vue'
|
||||||
import UserSelect from '@/views/system/user/components/UserSelect.vue'
|
import UserSelect from '@/views/system/user/components/UserSelect.vue'
|
||||||
|
import BarcodePackageSelect from './components/BarcodePackageSelect.vue'
|
||||||
|
import WmMaterialStockSelect from '@/views/mes/wm/materialstock/components/WmMaterialStockSelect.vue'
|
||||||
|
import WmBatchSelect from '@/views/mes/wm/batch/components/WmBatchSelect.vue'
|
||||||
|
import ProCardSelect from '@/views/mes/pro/card/components/ProCardSelect.vue'
|
||||||
import { WmWarehouseLocationApi } from '@/api/mes/wm/warehouse/location'
|
import { WmWarehouseLocationApi } from '@/api/mes/wm/warehouse/location'
|
||||||
import { WmWarehouseAreaApi } from '@/api/mes/wm/warehouse/area'
|
import { WmWarehouseAreaApi } from '@/api/mes/wm/warehouse/area'
|
||||||
|
|
||||||
|
|
@ -240,8 +272,28 @@ const handleBizSelect = async (item: any) => {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
formData.value.bizId = item.id
|
formData.value.bizId = item.id
|
||||||
formData.value.bizCode = item.code || item.username
|
// 根据业务类型映射字段
|
||||||
formData.value.bizName = item.name || item.nickname
|
switch (formData.value.bizType) {
|
||||||
|
case BarcodeBizTypeEnum.STOCK:
|
||||||
|
formData.value.bizCode = item.itemCode
|
||||||
|
formData.value.bizName = item.itemName
|
||||||
|
break
|
||||||
|
case BarcodeBizTypeEnum.PACKAGE:
|
||||||
|
formData.value.bizCode = item.code
|
||||||
|
formData.value.bizName = item.clientName || item.code
|
||||||
|
break
|
||||||
|
case BarcodeBizTypeEnum.BATCH:
|
||||||
|
formData.value.bizCode = item.code
|
||||||
|
formData.value.bizName = item.itemName || item.code
|
||||||
|
break
|
||||||
|
case BarcodeBizTypeEnum.PROCARD:
|
||||||
|
formData.value.bizCode = item.code
|
||||||
|
formData.value.bizName = item.workOrderName || item.code
|
||||||
|
break
|
||||||
|
default:
|
||||||
|
formData.value.bizCode = item.code || item.username
|
||||||
|
formData.value.bizName = item.name || item.nickname
|
||||||
|
}
|
||||||
|
|
||||||
// 自动生成条码内容
|
// 自动生成条码内容
|
||||||
if (formData.value.bizType && formData.value.bizCode) {
|
if (formData.value.bizType && formData.value.bizCode) {
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,82 @@
|
||||||
|
<!-- MES 装箱单选择器(条码用):一次加载全量,前端过滤(支持 code) -->
|
||||||
|
<template>
|
||||||
|
<el-select
|
||||||
|
v-model="selectValue"
|
||||||
|
:placeholder="placeholder"
|
||||||
|
:disabled="disabled"
|
||||||
|
:clearable="clearable"
|
||||||
|
filterable
|
||||||
|
:filter-method="handleFilter"
|
||||||
|
class="!w-1/1"
|
||||||
|
@change="handleChange"
|
||||||
|
>
|
||||||
|
<el-option v-for="item in filteredList" :key="item.id" :label="item.code" :value="item.id">
|
||||||
|
<div class="flex items-center gap-8px">
|
||||||
|
<span>{{ item.code }}</span>
|
||||||
|
<el-tag v-if="item.clientName" size="small" type="info" class="ml-4px">
|
||||||
|
{{ item.clientName }}
|
||||||
|
</el-tag>
|
||||||
|
</div>
|
||||||
|
</el-option>
|
||||||
|
</el-select>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script setup lang="ts">
|
||||||
|
import { WmPackageApi, WmPackageVO } from '@/api/mes/wm/packages'
|
||||||
|
|
||||||
|
defineOptions({ name: 'BarcodePackageSelect' })
|
||||||
|
|
||||||
|
const props = withDefaults(
|
||||||
|
defineProps<{
|
||||||
|
modelValue?: number
|
||||||
|
disabled?: boolean
|
||||||
|
clearable?: boolean
|
||||||
|
placeholder?: string
|
||||||
|
}>(),
|
||||||
|
{
|
||||||
|
disabled: false,
|
||||||
|
clearable: true,
|
||||||
|
placeholder: '请选择装箱单'
|
||||||
|
}
|
||||||
|
)
|
||||||
|
|
||||||
|
const emit = defineEmits<{
|
||||||
|
'update:modelValue': [value: number | undefined]
|
||||||
|
change: [item: WmPackageVO | undefined]
|
||||||
|
}>()
|
||||||
|
|
||||||
|
const allList = ref<WmPackageVO[]>([])
|
||||||
|
const filteredList = ref<WmPackageVO[]>([])
|
||||||
|
|
||||||
|
const selectValue = computed({
|
||||||
|
get: () => props.modelValue,
|
||||||
|
set: (val) => emit('update:modelValue', val)
|
||||||
|
})
|
||||||
|
|
||||||
|
/** 前端过滤(code + clientName) */
|
||||||
|
const handleFilter = (query: string) => {
|
||||||
|
if (!query) {
|
||||||
|
filteredList.value = allList.value
|
||||||
|
return
|
||||||
|
}
|
||||||
|
const keyword = query.toLowerCase()
|
||||||
|
filteredList.value = allList.value.filter(
|
||||||
|
(item) =>
|
||||||
|
item.code?.toLowerCase().includes(keyword) ||
|
||||||
|
item.clientName?.toLowerCase().includes(keyword)
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
/** 选中变化 */
|
||||||
|
const handleChange = (val: number | undefined) => {
|
||||||
|
const item = allList.value.find((o) => o.id === val)
|
||||||
|
emit('change', item)
|
||||||
|
}
|
||||||
|
|
||||||
|
/** 加载装箱单列表 */
|
||||||
|
onMounted(async () => {
|
||||||
|
const data = await WmPackageApi.getPackageSimpleList()
|
||||||
|
allList.value = Array.isArray(data) ? data : []
|
||||||
|
filteredList.value = allList.value
|
||||||
|
})
|
||||||
|
</script>
|
||||||
|
|
@ -80,6 +80,12 @@
|
||||||
prop="contentExample"
|
prop="contentExample"
|
||||||
:show-overflow-tooltip="true"
|
:show-overflow-tooltip="true"
|
||||||
/>
|
/>
|
||||||
|
<el-table-column
|
||||||
|
label="默认打印模板"
|
||||||
|
align="center"
|
||||||
|
prop="defaultTemplate"
|
||||||
|
:show-overflow-tooltip="true"
|
||||||
|
/>
|
||||||
<el-table-column
|
<el-table-column
|
||||||
label="自动生成"
|
label="自动生成"
|
||||||
align="center"
|
align="center"
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue