feat: 打印生产单等功能

71f385c2 · qinjianhui · 17e3c2c4 · 71f385c2 · 71f385c2 · 71f385c2
Commit 71f385c2 authored Mar 26, 2026 by qinjianhui
12 changed files
--- a/src/api/factoryOrderNew.ts
+++ b/src/api/factoryOrderNew.ts
@@ -36,6 +36,30 @@ export function getFactoryOrderNewListApi(
  )
 }
+/** 请求体与 `factory/podOrder/list_page` 一致 */
+export function getPodOrderAcceptedStatisticsApi(
+  data: SearchForm,
+  currentPage: number,
+  pageSize: number,
+  status?: string,
+  subStatus?: number,
+) {
+  return axios.post<
+    never,
+    BaseRespData<{
+      acceptedOutOfStockCount?: number
+      pendingCount?: number
+      totalCount?: number
+    }>
+  >('factory/podOrder/acceptedStatistics', {
+    ...data,
+    currentPage,
+    pageSize,
+    status,
+    acceptedStatus: subStatus,
+  })
+}
 export function getFactoryOrderNewDetailApi(id: number | string) {
  return axios.get<never, BaseRespData<ProductListData[]>>(
    'factory/podOrderProduct/getListByPodOrderId',
@@ -68,7 +92,7 @@ export function cancelOrderApi(ids: (number | string)[]) {
 export function refreshProductInfoApi(ids: (number | string)[]) {
  return axios.post<never, BaseRespData<void>>(
-    'factory/orderNew/refreshProductInfo',
+    'factory/podOrderProduct/refreshProductInfo',
    { ids },
  )
 }
@@ -84,10 +108,17 @@ export function confirmOrderWithWarehouseApi(
  ids: (number | string)[],
  warehouseId: number | string,
 ) {
-  return axios.post<never, BaseRespData<void>>(
+  return axios.post<
-    'factory/podOrder/ordersAccepted',
+    never,
-    { podOrderIds: ids, warehouseId },
+    BaseRespData<
-  )
+      {
+        factoryOrderNumber?: string
+        message?: string
+        id: number | string
+        status?: boolean
+      }[]
+    >
+  >('factory/podOrder/ordersAccepted', { podOrderIds: ids, warehouseId })
 }
 export function cancelOrderWithReasonApi(
@@ -129,7 +160,7 @@ export function archiveOrderApi(ids: (number | string)[]) {
 export function printPickOrderApi(ids: (number | string)[]) {
  return axios.post<never, BaseRespData<void>>(
-    'factory/orderNew/printPickOrder',
+    'factory/podOrderOperation/printPickPdf',
    { ids },
  )
 }
@@ -159,8 +190,8 @@ export function restockCheckApi(id: number | string) {
 export function pickCompleteApi(ids: (number | string)[]) {
  return axios.post<never, BaseRespData<PickCompleteData[]>>(
-    'factory/orderNew/pickComplete',
+    'factory/podOrderOperation/listByIds',
-    { ids },
+    ids,
  )
 }
@@ -265,7 +296,11 @@ export function arrangeFinishApi(
    type?: string
  },
 ) {
-  return axios.post<never, BaseRespData<never>>(url, params)
+  return axios.post<never, BaseRespData<never>>(url, {
+    operationIdList: params.productIdList,
+    templateWidth: params.templateWidth,
+    type: params.type,
+  })
 }
 export function downloadMaterialApi(id: number[]) {

--- a/src/components/CommonCard.vue
+++ b/src/components/CommonCard.vue
 <template>
  <div class="commodity-card" :class="{ active: active }">
    <div class="commodity-card-image">
-      <div class="before"></div>
+      <div class="before" :style="{ paddingTop: paddingTop }"></div>
      <div class="image">
        <img :src="mainImageSrc" />
      </div>
@@ -110,6 +110,7 @@ interface Props {
  imageField?: string
  imageListField?: string
  imagePathField?: string
+  paddingTop?: string
 }
 // 定义默认值
@@ -122,6 +123,7 @@ const props = withDefaults(defineProps<Props>(), {
  imageField: 'variantImage',
  imageListField: 'imageList',
  imagePathField: 'imagePath',
+  paddingTop: '120%',
 })
 // 获取主图片源
@@ -217,7 +219,6 @@ const copy = (text: string) => {
 .before {
  height: 0;
-  padding-top: 120%;
 }
 .image {

--- a/src/types/api/factoryOrderNew.ts
+++ b/src/types/api/factoryOrderNew.ts
@@ -33,6 +33,7 @@ export interface SearchForm {
  logisticsCompanyCode?: string
  interceptStatus?: boolean
  standardDesignImage?: number
+  productMarkList?: string[]
 }
 export interface FactoryOrderNewListData {
@@ -86,29 +87,73 @@ export interface FactoryOrderNewListData {
 export interface ProductListData {
  id: number
-  orderId?: number
+  podOrderId: number
-  productImage?: string
+  factoryCode?: string
  productName?: string
+  baseSku?: string
  variantSku?: string
-  stockSku?: string
+  variantImage?: string
+  // 后端字段名兼容（部分接口返回 snake_case）
+  variant_image?: string
+  productMark?: 'custom_part'
+  diyId?: string
+  templateType?: number
+  customTemplateItemId?: number
+  endProductId?: string
+  craftSource?: number
  craftCode?: string
  craftName?: string
-  styleNo?: string
+  craftType?: string
-  price?: number
+  customizedQuantity: number
-  quantity?: number
+  categoryId?: number
+  categoryName?: string
+  productPrice?: number
+  templatePrice?: number
+  craftPrice?: number
+  imageAry?: string
+  designImages?: string
+  trimDesignImages?: string
+  sizeType?: number
+  num?: number
+  passNum?: number
+  notPassNum?: number
+  payAmount?: number
  weight?: number
-  availableQuantity?: number
+  createTime?: string
-  stockQuantity?: number
+  updateTime?: string
-  occupiedQuantity?: number
+  version?: number
-  customsNameEnglish?: string
-  customsNameChinese?: string
-  customsWeight?: number
-  customsValue?: number
  remark?: string
 }
 export interface operateOrderListData {
  id: number
-  podOrderProductId: number
+  operationNo?: string
+  podOrderId?: number
+  podOrderNo?: string
+  podOrderProductId?: number
+  baseSku?: string
+  variantSku?: string
+  variantImage?: string
+  thirdSpuCode?: string
+  thirdSkuCode?: string
+  supplierProductNo?: string
+  productName?: string
+  productMark?: string
+  customizedQuantity?: number
+  quantity?: number
+  isReplenishment?: boolean
+  totalProductionNum?: number
+  status?: string
+  outOfStock?: boolean
+  arrange?: boolean
+  version?: number
+  createTime?: string
+  updateTime?: string
+  factoryNo?: number
+  factoryCode?: string
+  factoryCountryCode?: string
+  warehouseId?: number
+  namespace?: string
+  statusName?: string
  [key: string]: unknown
 }

--- a/src/utils/hooks/usePageList.ts
+++ b/src/utils/hooks/usePageList.ts
@@ -26,12 +26,15 @@ export default function usePageList<T>(options: UsePageListOptions<T>) {
    sumTotalPrice: 0,
    sumNotPassNum: 0,
  })
+  /** 防止快速切换查询条件时，旧请求晚返回覆盖新数据 */
+  const loadRequestId = ref(0)
  const loadData = async () => {
    const { query } = options
+    const myId = ++loadRequestId.value
    try {
      loading.value = true
-      // Promise 链式调用
      const res = await query(currentPage.value, pageSize.value)
+      if (myId !== loadRequestId.value) return
      if (statistics.value) {
        totalData.value = res as never
        total.value = res.page!.total
@@ -45,10 +48,13 @@ export default function usePageList<T>(options: UsePageListOptions<T>) {
        data.value = res.records
      }
    } catch (error) {
+      if (myId !== loadRequestId.value) return
      console.error(error)
      // showError(error)
    } finally {
-      loading.value = false
+      if (myId === loadRequestId.value) {
+        loading.value = false
+      }
    }
  }

--- a/src/views/order/factoryOrderNew/component/ArrangeDialog.vue
+++ b/src/views/order/factoryOrderNew/component/ArrangeDialog.vue
@@ -108,8 +108,8 @@ const handleSubmit = async () => {
    ElMessage.success('操作成功')
    visible.value = false
    emit('success')
-  } catch (e: unknown) {
+  } catch (e) {
-    ElMessage.error((e as Error)?.message || '排单失败')
+    console.error(e)
  } finally {
    submitting.value = false
  }

--- a/src/views/order/factoryOrderNew/component/CardLayout.vue
+++ b/src/views/order/factoryOrderNew/component/CardLayout.vue
--- a/src/views/order/factoryOrderNew/component/ConfirmOrderDialog.vue
+++ b/src/views/order/factoryOrderNew/component/ConfirmOrderDialog.vue
@@ -25,7 +25,7 @@
    </ElForm>
    <template #footer>
      <div class="dialog-footer" style="text-align: center">
-      <ElButton @click="visible = false">取消</ElButton>
+        <ElButton @click="visible = false">取消</ElButton>
        <ElButton type="primary" :loading="submitLoading" @click="handleSubmit">
          确认
        </ElButton>
@@ -36,14 +36,18 @@
 <script setup lang="ts">
 import { ref, reactive } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
 import { loadWarehouseListApi } from '@/api/common'
 import { confirmOrderWithWarehouseApi } from '@/api/factoryOrderNew'
 import type { WarehouseListData } from '@/types'
 const emit = defineEmits<{
-  success: []
+  success: [data: {
+    factoryOrderNumber?: string
+    message?: string
+    id: number | string
+    status?: boolean
+  }[]]
 }>()
 const visible = ref(false)
@@ -57,7 +61,9 @@ const form = reactive({
 })
 const rules: FormRules = {
-  warehouseId: [{ required: true, message: '请选择发货仓库', trigger: 'change' }],
+  warehouseId: [
+    { required: true, message: '请选择发货仓库', trigger: 'change' },
+  ],
 }
 const loadWarehouseList = async () => {
@@ -85,14 +91,15 @@ const handleSubmit = async () => {
  await formRef.value.validate()
  submitLoading.value = true
  try {
-    await confirmOrderWithWarehouseApi(orderIds.value, form.warehouseId)
+    const res = await confirmOrderWithWarehouseApi(
-    ElMessage.success('接单成功')
+      orderIds.value,
+      form.warehouseId,
+    )
+    if (res.code !== 200) return
    visible.value = false
-    emit('success')
+    emit('success', res.data)
-  } catch (e: unknown) {
+  } catch (e) {
-    ElMessageBox.alert((e as Error)?.message || '接单失败', '接单失败', {
+    console.error(e)
-      type: 'error',
-    })
  } finally {
    submitLoading.value = false
  }

--- a/src/views/order/factoryOrderNew/component/PickCompleteDialog.vue
+++ b/src/views/order/factoryOrderNew/component/PickCompleteDialog.vue
@@ -22,11 +22,11 @@
      >
        <template #skuImage="{ row }">
          <el-image
-            v-if="row.skuImage"
+            v-if="row.variantImage"
-            :src="row.skuImage"
+            :src="row.variantImage"
            style="width: 50px; height: 50px"
            fit="contain"
-            :preview-src-list="[row.skuImage]"
+            :preview-src-list="[row.variantImage]"
            preview-teleported
          />
        </template>

--- a/src/views/order/factoryOrderNew/component/SuspendDialog.vue
+++ b/src/views/order/factoryOrderNew/component/SuspendDialog.vue
@@ -6,12 +6,13 @@
    :close-on-click-modal="false"
    @close="handleClose"
  >
-    <ElForm ref="formRef" :model="form" :rules="rules" label-width="130px">
+    <ElForm ref="formRef" :model="form" :rules="rules" label-width="140px">
      <ElFormItem label="挂起原因" prop="pauseReason">
        <ElSelect
          v-model="form.pauseReason"
          placeholder="请选择挂起原因"
          style="width: 100%"
+          clearable
        >
          <ElOption
            v-for="item in suspendReasons"
@@ -26,6 +27,7 @@
          v-model="form.needCustomerHandle"
          placeholder="请选择"
          style="width: 100%"
+          clearable
        >
          <ElOption
            v-for="item in customerHandleOptions"

--- a/src/views/order/factoryOrderNew/index.vue
+++ b/src/views/order/factoryOrderNew/index.vue
--- a/src/views/order/podCN/components/ResultInfo.vue
+++ b/src/views/order/podCN/components/ResultInfo.vue
@@ -33,7 +33,7 @@
      <div style="margin: 15px 0"></div>
      <el-checkbox-group v-model="selectedList" @change="checkChange">
        <div style="display: block" v-for="(item, index) in list" :key="index">
-          <el-checkbox :value="item">
+          <el-checkbox :value="item" style="user-select: text;">
            {{ '工厂订单号:' + item.factoryOrderNumber + ' ' + item.message }}
          </el-checkbox>
        </div>

--- a/src/views/order/podCN/index.vue
+++ b/src/views/order/podCN/index.vue
@@ -1047,8 +1047,8 @@
    <div class="header-filter-tab">
      <div class="tabs">
        <div
-          v-for="item in tabsNav"
+          v-for="(item, tabIndex) in tabsNav"
-          :key="item.status"
+          :key="`${tabIndex}-${item.status ?? ''}`"
          class="tabs-node"
          :class="item.status === status ? 'tabs-node_active' : ''"
          @click="changeTab(item)"
@@ -2079,6 +2079,7 @@
      </div>
      <div
        v-else
+        :key="status"
        v-loading="loading"
        element-loading-text="加载中..."
        class="card-wrapper flex-1 flex-column overflow-hidden"
@@ -4845,9 +4846,9 @@ const cancelOrder = async () => {
 }
 const cardSelection = ref<ProductList[]>([])
 const cardClick = (data: ProductList) => {
-  const status = isSelectStatused(data)
+  const selected = isSelectStatused(data)
-  if (status) {
+  if (selected) {
    cardSelection.value = cardSelection.value.filter(
      (item: ProductList) => item.id !== data.id,
    )