版本变更3.22

This commit is contained in:
dxc
2026-05-15 13:03:13 +08:00
parent 38c71147a2
commit f9dd8b6536
2 changed files with 22 additions and 9 deletions

View File

@ -234,7 +234,7 @@ const handleLogout = () => {
<footer v-if="!isLoginPage" class="app-footer"> <footer v-if="!isLoginPage" class="app-footer">
<span class="version-tag"> <span class="version-tag">
<el-icon style="vertical-align: middle; margin-right: 4px"><InfoFilled /></el-icon> <el-icon style="vertical-align: middle; margin-right: 4px"><InfoFilled /></el-icon>
当前版本:V3.21 当前版本:V3.22
</span> </span>
</footer> </footer>

View File

@ -192,14 +192,14 @@
<el-dialog v-model="bomSelectVisible" title="按 BOM 套餐添加" width="700px" destroy-on-close :close-on-click-modal="false"> <el-dialog v-model="bomSelectVisible" title="按 BOM 套餐添加" width="700px" destroy-on-close :close-on-click-modal="false">
<el-form label-width="100px"> <el-form label-width="100px">
<el-form-item label="选择产品"> <el-form-item label="选择产品">
<el-select v-model="selectedBomNo" filterable placeholder="请选择启用状态的 BOM 配方" style="width: 100%" @change="() => {}"> <el-tree-select
<el-option v-model="selectedBomNo"
v-for="b in bomOptions" :data="treeData"
:key="`${b.bom_no}_${b.version}`" filterable
:label="`${b.parent_name} - ${b.version}`" placeholder="请选择启用的 BOM 配方"
:value="b.bom_no" :render-after-expand="false"
/> style="width: 100%"
</el-select> />
</el-form-item> </el-form-item>
<el-form-item label="生产套数"> <el-form-item label="生产套数">
<el-input-number v-model="bomSets" :min="1" label="套" style="width: 200px;" :disabled="!userStore.hasPermission('outbound_selection:operation')" /> <el-input-number v-model="bomSets" :min="1" label="套" style="width: 200px;" :disabled="!userStore.hasPermission('outbound_selection:operation')" />
@ -487,6 +487,19 @@ const selectedBomNo = ref('')
const bomSets = ref(1) const bomSets = ref(1)
const currentBomDetail = ref<any[]>([]) // 当前选中的BOM明细 const currentBomDetail = ref<any[]>([]) // 当前选中的BOM明细
// BOM 树形数据(将分组数据映射为 el-tree-select 需要的结构)
const treeData = computed(() => {
return (bomOptions.value || []).map(group => ({
value: `group_${group.category}`, // 仅作唯一标识
label: `${group.category} (${group.count})`,
disabled: true, // 禁止选中分类本身
children: (group.items || []).map((b: any) => ({
value: b.bom_no,
label: `${b.parent_name} - ${b.version}`
}))
}))
})
// 打印相关 // 打印相关
const currentTime = ref('') const currentTime = ref('')