fix: 拣胚完成功能修改

src/views/order/factoryOrderNew/component/PickCompleteDialog.vue

@@ -82,7 +82,7 @@
     ref="operateDetailsDialogRef"
     ref="operateDetailsDialogRef"
     title="调整拣胚顺序"
     title="调整拣胚顺序"
     :pickable="true"
     :pickable="true"
-    @adjust-pick-order-success="open"
+    @adjust-pick-order-success="onAdjustPickOrderSuccess"
   />
   />
   <ReceiptProductDialog
   <ReceiptProductDialog
     ref="receiptProductDialogRef"
     ref="receiptProductDialogRef"
@@ -339,7 +339,6 @@ const columns = [
     minWidth: 120,
     minWidth: 120,
   },
   },
   {
   {
-    key: 'skuImage',
     label: 'SKU图片',
     label: 'SKU图片',
     width: 100,
     width: 100,
     align: 'center',
     align: 'center',
@@ -359,14 +358,12 @@ const columns = [
     align: 'center',
     align: 'center',
   },
   },
   {
   {
-    key: 'thirdSkuCode',
     prop: 'thirdSkuCode',
     prop: 'thirdSkuCode',
     label: '库存SKU',
     label: '库存SKU',
     align: 'center',
     align: 'center',
     width: 180,
     width: 180,
   },
   },
   {
   {
-    key: 'selectedQuantity',
     prop: 'selectedQuantity',
     prop: 'selectedQuantity',
     label: '本次拣胚数量',
     label: '本次拣胚数量',
     width: 110,
     width: 110,
@@ -398,7 +395,6 @@ const columns = [
     align: 'right',
     align: 'right',
   },
   },
   {
   {
-    key: 'pickStatus',
     label: '拣胚情况',
     label: '拣胚情况',
     width: 130,
     width: 130,
     align: 'center',
     align: 'center',
@@ -409,14 +405,13 @@ const columns = [
 
 
 const open = async (
 const open = async (
   ids: (number | string)[],
   ids: (number | string)[],
-  adjustOrderIds?: number[],
-  selectedRow?: PickCompleteData,
+  _adjustOrderIds?: number[],
+  _selectedRow?: PickCompleteData,
   options?: {
   options?: {
     title?: string
     title?: string
     submitType?: 'pick' | 'replenish'
     submitType?: 'pick' | 'replenish'
   },
   },
 ) => {
 ) => {
-  const previousPickList = pickData.value?.pickingSituationList ?? []
   selections.value = []
   selections.value = []
   pickData.value = null
   pickData.value = null
   dialogTitle.value = options?.title || '拣胚完成'
   dialogTitle.value = options?.title || '拣胚完成'
@@ -429,20 +424,7 @@ const open = async (
     background: 'rgba(0, 0, 0, 0.3)',
     background: 'rgba(0, 0, 0, 0.3)',
   })
   })
   try {
   try {
-    let pickIds
-    if (selectedRow && adjustOrderIds && adjustOrderIds.length > 0 && !ids) {
-      const adjustPickData = previousPickList.find(
-        (item: PickCompleteData) =>
-          item.thirdSkuCode === selectedRow.thirdSkuCode,
-      )
-      if (adjustPickData) {
-        adjustPickData.allOrderIds = adjustOrderIds
-      }
-      pickIds = previousPickList
-        .map((item: PickCompleteData) => item.allOrderIds)
-        .flat()
-    }
-    const res = await pickCompleteByIdsDataApi(ids || pickIds)
+    const res = await pickCompleteByIdsDataApi(ids)
     if (res.code !== 200) return
     if (res.code !== 200) return
     pickData.value = res.data || null
     pickData.value = res.data || null
     visible.value = true
     visible.value = true
@@ -453,6 +435,27 @@ const open = async (
   }
   }
 }
 }
 
 
+const onAdjustPickOrderSuccess = async (
+  _: unknown,
+  adjustOrderIds: number[],
+  selectedRow: PickCompleteData,
+) => {
+  const previousPickList = pickData.value?.pickingSituationList ?? []
+  if (selectedRow && adjustOrderIds && adjustOrderIds.length > 0) {
+    const adjustPickData = previousPickList.find(
+      (item: PickCompleteData) =>
+        item.thirdSkuCode === selectedRow.thirdSkuCode,
+    )
+    if (adjustPickData) {
+      adjustPickData.availableOrderIds = adjustOrderIds
+    }
+  }
+  pickData.value = {
+    ...pickData.value,
+    pickingSituationList: previousPickList,
+  }
+}
+
 const handleClose = () => {
 const handleClose = () => {
   pickData.value = null
   pickData.value = null
 }
 }
@@ -530,8 +533,10 @@ const handleSubmit = async () => {
     ?.map((item) => item.availableOrderIds)
     ?.map((item) => item.availableOrderIds)
     .flat()
     .flat()
   try {
   try {
+    if (orderIds && orderIds.length > 0) {
       const res = await submitApi.value(orderIds as (number | string)[])
       const res = await submitApi.value(orderIds as (number | string)[])
       if (res.code !== 200) return
       if (res.code !== 200) return
+    }
     const pickFailedOrderList = pickData.value?.pickingSituationList?.filter(
     const pickFailedOrderList = pickData.value?.pickingSituationList?.filter(
       (item) => item.pickingStatus !== 'success',
       (item) => item.pickingStatus !== 'success',
     )
     )
@@ -561,7 +566,7 @@ const handleSubmit = async () => {
         console.error(e)
         console.error(e)
       }
       }
     }
     }
-    ElMessage.success(dialogTitle.value)
+    ElMessage.success('操作成功')
     visible.value = false
     visible.value = false
     emit('success')
     emit('success')
   } catch (e) {
   } catch (e) {