Commit 855bac29 by wusiyi

fix: 配货分拣修改配货区名称展示

parent e11d0ead
...@@ -306,6 +306,7 @@ export interface SortingList { ...@@ -306,6 +306,7 @@ export interface SortingList {
defaultWarehouse: 0 | 1 defaultWarehouse: 0 | 1
matchType: 1 | 2 // 匹配类型:1=所有条件(且) 2=任一条件(或) matchType: 1 | 2 // 匹配类型:1=所有条件(且) 2=任一条件(或)
conditions: SortingRuleCondition[] // 配货规则 conditions: SortingRuleCondition[] // 配货规则
name?: string // 配货区名称
} }
// 配货分拣 详情 // 配货分拣 详情
......
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
<ElOption <ElOption
v-for="item in sortingAreaList" v-for="item in sortingAreaList"
:key="item.id" :key="item.id"
:label="item.areaName + ' - ' + item.warehouseName" :label="item.name"
:value="item.id" :value="item.id"
/> />
</ElSelect> </ElSelect>
...@@ -153,11 +153,8 @@ ...@@ -153,11 +153,8 @@
<div class="right-panel"> <div class="right-panel">
<div class="sorting-area-content"> <div class="sorting-area-content">
{{ {{
(sortingAreaList.find((item) => item.id === sortingAreaId) sortingAreaList.find((item) => item.id === sortingAreaId)?.name ||
?.areaName || '') + ''
' - ' +
(sortingAreaList.find((item) => item.id === sortingAreaId)
?.warehouseName || '')
}} }}
</div> </div>
<div class="platform-filter"> <div class="platform-filter">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment