Commit c7c265e7 by wusiyi

feat:订单质检流程#1011236

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