Commit 74787dd3 by wusiyi

fix:修复接收到其他配货区信息导致箱子列表展示错乱bug #1001961

parent 8967b965
...@@ -580,7 +580,7 @@ ...@@ -580,7 +580,7 @@
class="item" class="item"
> >
<ElButton type="success" @click="handlePrintProductionOrder" <ElButton type="success" @click="handlePrintProductionOrder"
>打印操作</ElButton >打印生产</ElButton
> >
</span> </span>
<span v-if="status === 'PENDING_PICK'" class="item"> <span v-if="status === 'PENDING_PICK'" class="item">
...@@ -607,15 +607,18 @@ ...@@ -607,15 +607,18 @@
>补胚失败</ElButton >补胚失败</ElButton
> >
</span> </span>
<span <span v-if="status === 'IN_PRODUCTION' && isEnableSorting" class="item">
v-if="status === 'PENDING_PACKING' && isEnableSorting"
class="item"
>
<ElButton type="primary" @click="handleSeedingWall('sort')" <ElButton type="primary" @click="handleSeedingWall('sort')"
>配货分拣</ElButton >配货分拣</ElButton
> >
</span> </span>
<span v-if="status === 'PENDING_PACKING'" class="item"> <span
v-if="
status === 'PENDING_PACKING' ||
(status === 'IN_PRODUCTION' && !isEnableSorting)
"
class="item"
>
<ElButton type="success" @click="handleSeedingWall('print')" <ElButton type="success" @click="handleSeedingWall('print')"
>配货打单</ElButton >配货打单</ElButton
> >
...@@ -1521,9 +1524,9 @@ const getListQueryPayload = () => { ...@@ -1521,9 +1524,9 @@ const getListQueryPayload = () => {
} }
const getCraft = async () => { const getCraft = async () => {
const res = await getPodOrderCraftApi() const res = await getPodOrderCraftApi()
const data: CraftListData[] = res.data const data: CraftListData[] = res.data
podCraftList.value = data.map((item: CraftListData) => ({ podCraftList.value = data.map((item:CraftListData) => ({
id: item.craftCode, id: item.craftCode,
name: item.craftName, name: item.craftName,
warehouseName: processTypeMap[item.craftType] ?? '其他', warehouseName: processTypeMap[item.craftType] ?? '其他',
...@@ -1927,19 +1930,19 @@ const mainColumns = computed(() => [ ...@@ -1927,19 +1930,19 @@ const mainColumns = computed(() => [
}, },
{ {
prop: 'statusName', prop: 'statusName',
label: '挂起前状态', label:'挂起前状态',
minWidth: 120, minWidth: 120,
hidden: status.value !== 'SUSPEND', hidden:status.value !== 'SUSPEND',
align: 'center', align: 'center'
}, },
{ {
prop: 'statusName', prop: 'statusName',
hidden: status.value === 'SUSPEND', hidden:status.value === 'SUSPEND',
label: '订单状态', label: '订单状态',
minWidth: 120, minWidth: 120,
align: 'center', align: 'center',
render: (row: FactoryOrderNewListData) => { render: (row: FactoryOrderNewListData) => {
return <span>{row.pause ? '挂起' : row.statusName}</span> return <span>{ row.pause ? '挂起' : row.statusName}</span>
}, },
}, },
{ {
...@@ -2924,7 +2927,10 @@ const handleSeedingWall = (type: 'print' | 'sort') => { ...@@ -2924,7 +2927,10 @@ const handleSeedingWall = (type: 'print' | 'sort') => {
/** LODOP 单例不可并发,打印串行 */ /** LODOP 单例不可并发,打印串行 */
let printOrderChain: Promise<void> = Promise.resolve() let printOrderChain: Promise<void> = Promise.resolve()
const printOrder = (data: OrderData, callback: (status: boolean) => void) => { const printOrder = (
data: OrderData,
callback: (status: boolean) => void,
) => {
const run = async () => { const run = async () => {
const lodop = getCLodop(null, null) const lodop = getCLodop(null, null)
if (!lodop) { if (!lodop) {
......
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