Merge branch 'master' of http://47.99.244.21:9999/qinjianhui/factory_front

# Conflicts:
#	src/views/order/pod/index.vue

src/api/podOrder.ts

@@ -73,7 +73,8 @@ export function getCardOrderList(
 }
 export function getOrderBySubOrderNumber(orderNumber: string) {
   return axios.get<never, BaseRespData<OrderData>>(
-    'factory/podJomallOrder/getOrderBySubOrderNumber',
+    // 'factory/podJomallOrder/getOrderBySubOrderNumber',
+    'factory/podJomallOrder/getOrderProductBySubOrderNumber',
     {
       params: {
         factorySubOrderNumber: orderNumber,
@@ -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(
   sumbitSendOutList: ShipmentOrderRes[],

src/views/order/ProductInfo.vue

@@ -167,16 +167,16 @@
           (item.num || 0) - ((item.shipmentNum || 0) - (item.notPassNum || 0))
         }}</span>
         <span v-else class="order-list-expand_item_value">{{
-            (item.num || 0) - (item.shipmentNum || 0)
-          }}</span>
+          (item.num || 0) - (item.shipmentNum || 0)
+        }}</span>
       </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_value">{{
-          !isPod ? item?.processName || '--' : item?.process || '--'
+          item?.processName || '--'
         }}</span>
       </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_value">{{
           item?.process || '--'

src/views/order/fastProduction.vue

@@ -324,7 +324,7 @@ const props = defineProps({
     type: String,
   },
 })
-const emit = defineEmits(['update:detailVisible', 'close'])
+const emit = defineEmits(['update:detailVisible', 'close','onSuccess'])
 
 watch(
   () => props.detailVisible,
@@ -461,9 +461,8 @@ const changeStatus = async () => {
     setData(TrackingNumber.value)
   })
 }
-
 const setData = async (orderNumber: string) => {
-  if (detail.value && detail.value?.id) {
+  if (detail.value && detail.value?.id!=-1) {
     try {
       const id = detail.value?.id
       await productionQueryApi(id)
@@ -481,7 +480,7 @@ const setData = async (orderNumber: string) => {
           localStorage.setItem('historyData', JSON.stringify(historyData.value))
         }
       }
-
+      emit('onSuccess')
       playAudio('weight_success')
       detail.value = { id: -1, podOrderId: -1, imgList: [] }
     } catch (e) {

src/views/order/hook/podUseShipMent.ts

@@ -73,6 +73,8 @@ export default function useShipment(callback?: () => void) {
       isLock.value = false
       await nextTick()
       if (shipmentOrderRef.value) {
+        console.log("shipmentOrderRef.value",shipmentOrderRef.value);
+        
         const rowEl = shipmentOrderRef.value.listRef?.querySelector(
           `div[data-id="${rowData.id}"]`,
         )