Skip to content

F
factory_front
Commit 2ca6824d by wuqian
Options

发货新优化

parent d4c308fc
Showing with 78 additions and 33 deletions
src/api/podOrder.ts
...@@ -74,10 +74,10 @@ export function getCardOrderList( ...@@ -74,10 +74,10 @@ export function getCardOrderList(
export function getOrderBySubOrderNumber(orderNumber: string) { export function getOrderBySubOrderNumber(orderNumber: string) {
return axios.get<never, BaseRespData<OrderData>>( return axios.get<never, BaseRespData<OrderData>>(
// 'factory/podJomallOrder/getOrderBySubOrderNumber', // 'factory/podJomallOrder/getOrderBySubOrderNumber',
'factory/podJomallOrder/getOrderProductBySubOrderNumber', 'factory/podJomallOrder/getOrderProductByThirdSubOrderNumber',
{ {
params: { params: {
factorySubOrderNumber: orderNumber, thirdSubOrderNumber: orderNumber,
}, },
}, },
) )
......
src/views/order/Shipment.vue
...@@ -75,14 +75,28 @@ ...@@ -75,14 +75,28 @@
<span class="label">SKU:</span> <span class="label">SKU:</span>
<span class="value">{{ item.baseSku || '--' }}</span> <span class="value">{{ item.baseSku || '--' }}</span>
</div> </div>
<div class="shipment-info-item-content-item--info"> <div v-if="!isPod" class="shipment-info-item-content-item--info">
<span class="label">生产单号:</span> <span class="label">生产单号:</span>
<span class="value">{{ <span class="value">{{ item.subOrderNumber || '--' }}</span>
isPod </div>
? item.factorySubOrderNumber || '--' <div v-if="isPod" class="shipment-info-item-content-item--info2">
: item.subOrderNumber || '--' <div>
}}</span> <span class="label">工厂单号:</span>
<span class="value">{{
item.factorySubOrderNumber || '--'
}}</span>
</div>
<div>
<span class="label">生产单号:</span>
<span class="value">{{
item.thirdSubOrderNumber || '--'
}}</span>
</div>
</div> </div>
<!-- <div v-if="isPod" class="shipment-info-item-content-item--info">
<span class="label">生产单号:</span>
<span class="value">{{ item.thirdSubOrderNumber || '--' }}</span>
</div> -->
<div <div
class="shipment-info-item-content-item--info" class="shipment-info-item-content-item--info"
style="width: 90px; flex: none" style="width: 90px; flex: none"
...@@ -239,7 +253,7 @@ const onShipment = async (item: ProductList) => { ...@@ -239,7 +253,7 @@ const onShipment = async (item: ProductList) => {
} }
.shipment-info { .shipment-info {
width: 50%; width: 54%;
border: 1px solid #eee; border: 1px solid #eee;
overflow: auto; overflow: auto;
font-size: 13px; font-size: 13px;
...@@ -312,6 +326,21 @@ const onShipment = async (item: ProductList) => { ...@@ -312,6 +326,21 @@ const onShipment = async (item: ProductList) => {
margin-right: 6px; margin-right: 6px;
} }
} }
.shipment-info-item-content-item--info2 {
padding-left: 5px;
border-right: 1px solid #eee;
flex: 1;
display: flex;
flex-direction: column;
align-items: center;
align-items: flex-start;
div {
margin-bottom: 5px;
}
.label {
margin-right: 6px;
}
}
.shipment-info-item-content-item--info:last-child { .shipment-info-item-content-item--info:last-child {
border-right: 0; border-right: 0;
......
src/views/order/hook/podUseShipMent.ts
...@@ -45,7 +45,8 @@ export default function useShipment(callback?: () => void) { ...@@ -45,7 +45,8 @@ export default function useShipment(callback?: () => void) {
let rowData let rowData
const code1 = code?.split('_')[0] const code1 = code?.split('_')[0]
for (const item of orderList.value) { for (const item of orderList.value) {
rowData = item.productList?.find((jj) => jj.factorySubOrderNumber === code1) // rowData = item.productList?.find((jj) => jj.factorySubOrderNumber === code1)
rowData = item.productList?.find((jj) => `${item.userMark}-${jj.thirdSubOrderNumber}` === code1)
if (rowData) { if (rowData) {
rowData.factoryOrderNumber = item.factoryOrderNumber rowData.factoryOrderNumber = item.factoryOrderNumber
break break
...@@ -122,7 +123,8 @@ export default function useShipment(callback?: () => void) { ...@@ -122,7 +123,8 @@ export default function useShipment(callback?: () => void) {
const code1 = code?.split('_')[0] const code1 = code?.split('_')[0]
for (const item of data.productList || []) { for (const item of data.productList || []) {
item.count = 0 item.count = 0
if (item.factorySubOrderNumber === code1) { // if (item.factorySubOrderNumber === code1) {
if (`${data.userMark}-${item.thirdSubOrderNumber}` === code1) {
item.count = 1 item.count = 1
currentRow.value = item currentRow.value = item
if (currentRow.value) { if (currentRow.value) {
......
src/views/order/pod/index.vue
...@@ -183,13 +183,16 @@ ...@@ -183,13 +183,16 @@
> >
</span> </span>
</div> </div>
<template v-if="[ <template
v-if="
[
'IN_PRODUCTION', 'IN_PRODUCTION',
'WAIT_SHIPMENT', 'WAIT_SHIPMENT',
'TO_BE_REPLENISHMENT', 'TO_BE_REPLENISHMENT',
'INVALID', 'INVALID',
].includes(status) ].includes(status)
"> "
>
<div <div
v-if="CardOrderList.length" v-if="CardOrderList.length"
v-loading="loading" v-loading="loading"
...@@ -310,11 +313,17 @@ ...@@ -310,11 +313,17 @@
</el-tooltip> </el-tooltip>
</el-col> </el-col>
<el-col :span="10" :offset="0" style="text-align: right"> <el-col :span="10" :offset="0" style="text-align: right">
<span v-if="status === 'INVALID'">
数量：{{ cardItem?.num }}
</span>
<el-tooltip <el-tooltip
v-else
class="item" class="item"
effect="dark" effect="dark"
:content=" :content="
status === 'IN_PRODUCTION' ['TO_BE_REPLENISHMENT', 'IN_PRODUCTION'].includes(
status,
)
? '未生产数量' ? '未生产数量'
: '已生产数量' : '已生产数量'
" "
...@@ -322,7 +331,9 @@ ...@@ -322,7 +331,9 @@
> >
<span <span
>数量：{{ >数量：{{
status === 'IN_PRODUCTION' ['TO_BE_REPLENISHMENT', 'IN_PRODUCTION'].includes(
status,
)
? cardItem?.notPassNum ? cardItem?.notPassNum
: cardItem?.passNum : cardItem?.passNum
}}</span }}</span
...@@ -351,22 +362,26 @@ ...@@ -351,22 +362,26 @@
> >
{{ cardItem?.variantSku }} {{ cardItem?.variantSku }}
</span> </span>
</el-tooltip> </el-col>
</el-col> <el-col :span="10" :offset="0" style="text-align: right">
<el-col :span="10" :offset="0" style="text-align: right"> <el-tooltip
<span v-if="status === 'INVALID'"> class="item"
数量：{{ cardItem?.num }} effect="dark"
</span> :content="'货号'"
<el-tooltip placement="bottom"
v-else >
class="item" <span>货号：{{ cardItem?.supplierItemNo }}</span>
effect="dark" </el-tooltip>
:content=" </el-col>
['TO_BE_REPLENISHMENT', 'IN_PRODUCTION'].includes( </el-row>
status, <el-row style="margin-top: 5px">
) <el-col
? '未生产数量' :span="12"
: '已生产数量' :offset="0"
style="
white-space: nowrap;
display: flex;
align-items: center;
" "
> >
<span>工艺：</span> <span>工艺：</span>
...@@ -661,7 +676,7 @@ ...@@ -661,7 +676,7 @@
v-model="shipmentVisible" v-model="shipmentVisible"
title="发货" title="发货"
:close-on-click-modal="false" :close-on-click-modal="false"
width="1600px" width="1600PX"
top="6vh" top="6vh"
@opened="onShipmentDialogOpened" @opened="onShipmentDialogOpened"
> >
...@@ -1205,7 +1220,6 @@ const { ...@@ -1205,7 +1220,6 @@ const {
onPageSizeChange: handleSizeChange, onPageSizeChange: handleSizeChange,
} = usePageList<OrderData | CardOrderData>({ } = usePageList<OrderData | CardOrderData>({
query: async (page, pageSize) => { query: async (page, pageSize) => {
console.log(111111)
const commonParams = { const commonParams = {
...searchForm.value, ...searchForm.value,
status: status.value, status: status.value,
......
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