Commit 438a7e84 by wuqian

新JMPOD

parent 8e1db597
...@@ -73,7 +73,8 @@ export function getCardOrderList( ...@@ -73,7 +73,8 @@ 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',
{ {
params: { params: {
factorySubOrderNumber: orderNumber, factorySubOrderNumber: orderNumber,
...@@ -81,7 +82,16 @@ export function getOrderBySubOrderNumber(orderNumber: string) { ...@@ -81,7 +82,16 @@ export function getOrderBySubOrderNumber(orderNumber: string) {
}, },
) )
} }
export function applyForReplenishmentApi(productIds: string) {
return axios.get<never, BaseRespData<never>>(
'factory/podJomallOrderProduct/applyForReplenishment',
{
params: {
productIds,
},
},
)
}
// 发货保存 // 发货保存
export function saveOrder( export function saveOrder(
sumbitSendOutList: ShipmentOrderRes[], sumbitSendOutList: ShipmentOrderRes[],
......
...@@ -170,13 +170,13 @@ ...@@ -170,13 +170,13 @@
(item.num || 0) - (item.shipmentNum || 0) (item.num || 0) - (item.shipmentNum || 0)
}}</span> }}</span>
</div> </div>
<div class="order-list-expand_item_info_title"> <div v-if="isPod" class="order-list-expand_item_info_title">
<span class="order-list-expand_item_label">工艺:</span> <span class="order-list-expand_item_label">工艺:</span>
<span class="order-list-expand_item_value">{{ <span class="order-list-expand_item_value">{{
!isPod ? item?.processName || '--' : item?.process || '--' item?.processName || '--'
}}</span> }}</span>
</div> </div>
<div v-if="!isPod" class="order-list-expand_item_info_title"> <div v-if="isPod" class="order-list-expand_item_info_title">
<span class="order-list-expand_item_label">工艺简称:</span> <span class="order-list-expand_item_label">工艺简称:</span>
<span class="order-list-expand_item_value">{{ <span class="order-list-expand_item_value">{{
item?.process || '--' item?.process || '--'
......
...@@ -324,7 +324,7 @@ const props = defineProps({ ...@@ -324,7 +324,7 @@ const props = defineProps({
type: String, type: String,
}, },
}) })
const emit = defineEmits(['update:detailVisible', 'close']) const emit = defineEmits(['update:detailVisible', 'close','onSuccess'])
watch( watch(
() => props.detailVisible, () => props.detailVisible,
...@@ -461,9 +461,8 @@ const changeStatus = async () => { ...@@ -461,9 +461,8 @@ const changeStatus = async () => {
setData(TrackingNumber.value) setData(TrackingNumber.value)
}) })
} }
const setData = async (orderNumber: string) => { const setData = async (orderNumber: string) => {
if (detail.value && detail.value?.id) { if (detail.value && detail.value?.id!=-1) {
try { try {
const id = detail.value?.id const id = detail.value?.id
await productionQueryApi(id) await productionQueryApi(id)
...@@ -481,7 +480,7 @@ const setData = async (orderNumber: string) => { ...@@ -481,7 +480,7 @@ const setData = async (orderNumber: string) => {
localStorage.setItem('historyData', JSON.stringify(historyData.value)) localStorage.setItem('historyData', JSON.stringify(historyData.value))
} }
} }
emit('onSuccess')
playAudio('weight_success') playAudio('weight_success')
detail.value = { id: -1, podOrderId: -1, imgList: [] } detail.value = { id: -1, podOrderId: -1, imgList: [] }
} catch (e) { } catch (e) {
......
...@@ -73,6 +73,8 @@ export default function useShipment(callback?: () => void) { ...@@ -73,6 +73,8 @@ export default function useShipment(callback?: () => void) {
isLock.value = false isLock.value = false
await nextTick() await nextTick()
if (shipmentOrderRef.value) { if (shipmentOrderRef.value) {
console.log("shipmentOrderRef.value",shipmentOrderRef.value);
const rowEl = shipmentOrderRef.value.listRef?.querySelector( const rowEl = shipmentOrderRef.value.listRef?.querySelector(
`div[data-id="${rowData.id}"]`, `div[data-id="${rowData.id}"]`,
) )
......
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