Merge branch 'dev' into 'master'

podus 显示货号和变体sku

See merge request !64

src/components/CommonCard.vue

@@ -123,7 +123,7 @@ const props = withDefaults(defineProps<Props>(), {
 // 获取主图片源
 // 获取主图片源
 const mainImageSrc = computed<string>(() => {
 const mainImageSrc = computed<string>(() => {
   const item = props.cardItem as IndexableObject;
   const item = props.cardItem as IndexableObject;
-  
+
   // 使用索引访问避免联合类型的属性访问问题
   // 使用索引访问避免联合类型的属性访问问题
   if (
   if (
     props.imageField === 'variantImage' &&
     props.imageField === 'variantImage' &&

src/types/api/podUsOrder.ts

@@ -82,6 +82,7 @@ export interface ProductList {
   id: number
   id: number
   podJomallOrderUsId: number
   podJomallOrderUsId: number
   thirdSubOrderNumber?: string
   thirdSubOrderNumber?: string
+  thirdStockSku?: string
   factorySubOrderNumber?: string
   factorySubOrderNumber?: string
   factoryCode?: string
   factoryCode?: string
   productName?: string
   productName?: string

src/views/order/podUs/index.vue

@@ -660,7 +660,7 @@
                         <DocumentCopy />
                         <DocumentCopy />
                       </el-icon>
                       </el-icon>
                     </div>
                     </div>
-                    <div v-if="item.thirdStockSku" class="goods-item-info-item">
+                    <div class="goods-item-info-item">
                       <span class="goods-item-info-item-label">货号:</span>
                       <span class="goods-item-info-item-label">货号:</span>
                       <span class="goods-item-info-item-value">
                       <span class="goods-item-info-item-value">
                         {{ item.thirdStockSku }}
                         {{ item.thirdStockSku }}
@@ -741,6 +741,7 @@
                         {{ item.supplierProductNo }}
                         {{ item.supplierProductNo }}
                       </span>
                       </span>
                     </div>
                     </div>
+
                     <div
                     <div
                       v-if="item.isReplenishment"
                       v-if="item.isReplenishment"
                       class="goods-item-info-item"
                       class="goods-item-info-item"
@@ -1340,15 +1341,15 @@
                   </div>
                   </div>
                   <div class="grid-item">
                   <div class="grid-item">
                     <div
                     <div
-                      :title="`Base SKU:${cardItem?.baseSku || ''}`"
+                      :title="`variant SKU: ${cardItem?.variantSku || ''}`"
                       class="grid-item-value orderNumber"
                       class="grid-item-value orderNumber"
                     >
                     >
-                      {{ cardItem?.baseSku }}
+                      {{ cardItem?.variantSku }}
                       <el-icon
                       <el-icon
                         class="icon"
                         class="icon"
                         style="margin-left: 3px"
                         style="margin-left: 3px"
                         size="14"
                         size="14"
-                        @click="copy(cardItem?.baseSku || '')"
+                        @click="copy(cardItem?.variantSku || '')"
                       >
                       >
                         <DocumentCopy />
                         <DocumentCopy />
                       </el-icon>
                       </el-icon>
@@ -1400,6 +1401,15 @@
                       {{ cardItem?.supplierProductNo }}
                       {{ cardItem?.supplierProductNo }}
                     </span>
                     </span>
                   </div>
                   </div>
+                  <div class="grid-item">
+                    <span class="grid-item-label">货号：</span>
+                    <span
+                      :title="`货号: ${cardItem?.thirdStockSku}`"
+                      class="grid-item-value"
+                    >
+                      {{ cardItem?.thirdStockSku }}
+                    </span>
+                  </div>
 
 
                   <div
                   <div
                     class="grid-item"
                     class="grid-item"