ts 报错

c6122b30 · zhuzhequan · aeb4f4a5 · c6122b30 · c6122b30 · c6122b30
Commit c6122b30 authored Mar 01, 2025 by zhuzhequan
Showing with 69 additions and 90 deletions

components.d.ts
+3 -1

src/components/CardPods.vue
+3 -3

src/types/api/podOrder.ts
+14 -14

src/views/order/ProductInfo.vue
+4 -1

src/views/order/index.vue
+1 -0

src/views/order/pod/index.vue
+44 -71

No files found.
--- a/components.d.ts
+++ b/components.d.ts
@@ -7,8 +7,11 @@ export {}
 declare module 'vue' {
  export interface GlobalComponents {
+    CardPods: typeof import('./src/components/CardPods.vue')['default']
    CardWrapper: typeof import('./src/components/CardWrapper.vue')['default']
    ElButton: typeof import('element-plus/es')['ElButton']
+    ElCarousel: typeof import('element-plus/es')['ElCarousel']
+    ElCarouselItem: typeof import('element-plus/es')['ElCarouselItem']
    ElCheckbox: typeof import('element-plus/es')['ElCheckbox']
    ElCol: typeof import('element-plus/es')['ElCol']
    ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider']
@@ -49,7 +52,6 @@ declare module 'vue' {
    RouterView: typeof import('vue-router')['RouterView']
    ShipmentOrderDetail: typeof import('./src/components/ShipmentOrderDetail.vue')['default']
    SplitDiv: typeof import('./src/components/splitDiv/splitDiv.vue')['default']
-    TableColumn: typeof import('./src/components/TableColumn.vue')['default']
    TableView: typeof import('./src/components/TableView.vue')['default']
    UploadImage: typeof import('./src/components/UploadImage.vue')['default']
    WangEditor: typeof import('./src/components/WangEditor.vue')['default']

--- a/src/components/CardPods.vue
+++ b/src/components/CardPods.vue
@@ -3,7 +3,7 @@
    <div class="commodity-card-image">
      <div class="before"></div>
      <div class="image">
-        <img :src="cardItem.variantImage" />
+        <img :src="typeof cardItem.variantImage === 'string' ? cardItem.variantImage : ''" />
      </div>
      <div class="img_top_left">
        <span class="select-icon"></span>
@@ -27,10 +27,10 @@
 <script setup lang="ts">
 import { PropType } from 'vue'
-import { PodProductList } from '@/types/api/podOrder'
+import { PodProductList, CardOrderData } from '@/types/api/podOrder'
 defineProps({
  cardItem: {
-    type: Object as PropType<PodProductList>,
+    type: Object as PropType<PodProductList | CardOrderData>,
    required: true,
  },
 })

--- a/src/types/api/podOrder.ts
+++ b/src/types/api/podOrder.ts
@@ -47,11 +47,11 @@ export interface CardOrderData {
  lanshouPost: string | null
  manuscriptUrl: string | null
  manuscriptStatus: number | null
-  createTime: string | null
+  createTime: string | undefined
-  updateTime: string | null
+  updateTime: string | undefined
  remark: string | null
  userMark: string | null
-  namespace: string | null
+  namespace: string | undefined
  productList: PodProductList[]
  internalMemoList: string | null
  [propName: string]: string | number | boolean | undefined | unknown
@@ -68,31 +68,31 @@ export interface imageAryInter {
 }
 export interface PodProductList {
  id: number
-  podOrderId: number
+  podOrderId?: number
  thirdSubOrderNumber?: string
  factorySubOrderNumber?: string
-  factoryOrderNumber?: string | null
+  factoryOrderNumber?: string | undefined
  shopNumber?: string
  supplierItemNo?: string | null
  baseSku?: string
  productName?: string
  variantSku?: string
  variantImage?: string
-  imageAry?: string | imageAryInter[] | null
+  imageAry?: string | imageAryInter[] | undefined
-  images?: cardImages[] | null
+  images?: cardImages[] | undefined
-  designImages?: string | null
+  designImages?: string | undefined
-  process?: string | null
+  process?: string | undefined
-  podProcessName?: string | null
+  podProcessName?: string | undefined
-  productionFileId?: string | null
+  productionFileId?: string | undefined
  customizedQuantity?: number
  num?: number | string
  shipmentNu?: number
  costPrice?: number
  price?: number
  processPrice?: number
-  weight?: number | null
+  weight?: number | undefined
-  version?: number | null
+  version?: number | undefined
-  remark?: string | null
+  remark?: string | undefined
  createTime?: string
  updateTime?: string
  [propName: string]: string | number | boolean | undefined | unknown

--- a/src/views/order/ProductInfo.vue
+++ b/src/views/order/ProductInfo.vue
@@ -163,9 +163,12 @@
      </div>
      <div class="order-list-expand_item_info_title">
        <span class="order-list-expand_item_label">未发数:</span>
-        <span class="order-list-expand_item_value">{{
+        <span v-if="!isPod" class="order-list-expand_item_value">{{
          (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>
      </div>
      <div class="order-list-expand_item_info_title">
        <span class="order-list-expand_item_label">工艺:</span>

--- a/src/views/order/index.vue
+++ b/src/views/order/index.vue
@@ -291,6 +291,7 @@
                    >
                      <ProductInfo
                        :row="row"
+                        :is-pod="false"
                        :status="statusCode"
                        @update-remark="handleUpdateRemark"
                        @again-generated="handleAgainGenerated"

--- a/src/views/order/pod/index.vue
+++ b/src/views/order/pod/index.vue