Merge remote-tracking branch 'origin/dev' into dev

87593839 · zhuzhequan · e624075d · de3dccbb · 87593839 · 87593839
Commit 87593839 authored Dec 16, 2025 by zhuzhequan
7 changed files
--- a/src/types/api/podCnOrder.ts
+++ b/src/types/api/podCnOrder.ts
@@ -139,6 +139,7 @@ export interface ProductList {
  tagIds?: string
  isProduction?: boolean
  createTime?: string
+  startStockingTime?: string | null
  updateTime?: string
  remark?: string | null
  version?: number

--- a/src/types/api/podMakeOrder.ts
+++ b/src/types/api/podMakeOrder.ts
@@ -54,6 +54,7 @@ export interface ProductList {
  variantImage?: string
  podJomallUsNo?: string
  podJomallCnNo?: string
+  thirdSkuCode?: string
  previewImgs?: { sort?: string | number; title?: string; url: string }[]
 }

--- a/src/types/api/podUsOrder.ts
+++ b/src/types/api/podUsOrder.ts
@@ -138,6 +138,7 @@ export interface ProductList {
  tagIds?: string
  isProduction?: boolean
  createTime?: string
+  startStockingTime?: string | null
  updateTime?: string
  remark?: string | null
  version?: number

--- a/src/views/order/podCN/PodMakeOrder.vue
+++ b/src/views/order/podCN/PodMakeOrder.vue
@@ -463,7 +463,18 @@ watch(
  (val) => {
    if (val && val.productList?.length)
      val.productList.forEach((el) => {
-        if (!el.previewImgs) el.previewImgs = JSON.parse(el.imageAry || '[]')
+        if (!el.previewImgs) {
+          if (
+            el.productMark === 'custom_normal' ||
+            el.productMark === 'normal'
+          ) {
+            el.previewImgs = [{ url: el.variantImage || '' }]
+          } else {
+            el.previewImgs = el.imageAry
+              ? JSON.parse(el.imageAry)
+              : [{ url: el.variantImage }]
+          }
+        }
      })
  },
  { deep: true },
@@ -492,7 +503,13 @@ const renderItemBox = (bool: boolean) => {
  if (!boxItem) boxItem = { data: { productList: [] } }
  const { data } = boxItem
  data?.productList?.forEach((el) => {
-    if (!el.previewImgs) el.previewImgs = JSON.parse(el.imageAry || '[]')
+    if (!el.previewImgs || !el.previewImgs.length) {
+      if (el.productMark === 'custom_normal' || el.productMark === 'normal') {
+        el.previewImgs = [{ url: el.variantImage || '' }]
+      } else {
+        el.previewImgs = JSON.parse(el.imageAry || '[]')
+      }
+    }
  })
  if (!data) {
    renderLock = false
@@ -513,6 +530,7 @@ const renderItemBox = (bool: boolean) => {
    }
  }
  if (currentCode) {
+    if (!currentCode.startsWith('JM')) {
      const parts = currentCode.split('_')
      currentCode =
        parts.length > 3 && parts[3].startsWith('CNPSC')
@@ -520,8 +538,15 @@ const renderItemBox = (bool: boolean) => {
          : parts.length > 1
          ? parts[1]
          : parts[0]
+    }
+    console.log(540, currentCode)
    for (const product of productList) {
-      if (product.podJomallCnNo === currentCode) {
+      if (
+        product.podJomallCnNo === currentCode ||
+        product.thirdSkuCode === currentCode
+      ) {
        coverImage.value = product.previewImgs?.[0]?.url || ''
        nextTick(() => {
          tableRef.value?.setCurrentRow(product)

--- a/src/views/order/podCN/index.vue
+++ b/src/views/order/podCN/index.vue
@@ -1604,6 +1604,15 @@
                  {{ row.lanshouAddress }}
                </span>
              </div>
+              <div
+                v-if="['TO_BE_CONFIRMED', 'STOCK_OUT'].includes(status)"
+                class="order-detail-item"
+              >
+                <span class="order-detail-item-label">订单延期时间:</span>
+                <span class="order-detail-item-value red-time">
+                  {{ calculateDelayTime(row) }}
+                </span>
+              </div>
            </div>
          </template>
          <template #price="{ row }">
@@ -5463,7 +5472,10 @@ watch(
  },
  { deep: true, immediate: true }, // 添加immediate确保初始化时执行
 )
+// 当前时间响应式变量（每60秒更新一次）
+const currentTime = ref(new Date())
+// 定时器实例
+let timer: number | null = null
 onMounted(() => {
  loadTabData()
  getUserMark()
@@ -5471,8 +5483,45 @@ onMounted(() => {
  getCustomTagList()
  loadCraftList()
  getlogisticsCompanyAllCodelist()
+  // 每60秒更新一次当前时间
+  timer = window.setInterval(() => {
+    currentTime.value = new Date()
+  }, 60000)
+})
+// 计算时间差（小时数）并向上取整
+const calculateHoursDifference = (startDateString?: string): string => {
+  if (!startDateString) return '--'
+  try {
+    const startTime = new Date(startDateString)
+    const diffInMs = currentTime.value.getTime() - startTime.getTime()
+    // 转换为小时并取整:ceil向上或者round:四舍五入
+    const hours = Math.round(diffInMs / (1000 * 60 * 60))
+    return `${hours}小时`
+  } catch (error) {
+    console.error('日期解析错误:', error)
+    return '--'
+  }
+}
+// 根据订单状态计算延期时间
+const calculateDelayTime = computed(() => (row: ProductList) => {
+  switch (status.value) {
+    case 'TO_BE_CONFIRMED':
+      return row.createTime ? calculateHoursDifference(row.createTime) : '--'
+    case 'STOCK_OUT':
+      return row.startStockingTime
+        ? calculateHoursDifference(row.startStockingTime)
+        : '--'
+    default:
+      return '--'
+  }
+})
+onBeforeUnmount(() => {
+  // 组件卸载时清除定时器
+  if (timer) {
+    clearInterval(timer)
+    timer = null
+  }
 })
 const handleShipmentAreaCommand = (command: number) => {
  shipmentArea.value = command
  search()
@@ -5843,6 +5892,10 @@ useEnterKeyTrigger({
    text-overflow: ellipsis;
    white-space: nowrap;
  }
+  .red-time {
+    color: red;
+    font-weight: bold;
+  }
 }
 .card-list {

--- a/src/views/order/podUs/PodMakeOrder.vue
+++ b/src/views/order/podUs/PodMakeOrder.vue
@@ -435,7 +435,10 @@ watch(
    if (val && val.productList?.length)
      val.productList.forEach((el) => {
        if (!el.previewImgs) {
-          if (el.productMark === 'custom_normal') {
+          if (
+            el.productMark === 'custom_normal' ||
+            el.productMark === 'normal'
+          ) {
            el.previewImgs = [{ url: el.variantImage || '' }]
          } else {
            el.previewImgs = el.imageAry
@@ -468,11 +471,11 @@ const renderItemBox = (bool: boolean) => {
  if (!boxItem) boxItem = { data: { productList: [] } }
  const { data } = boxItem
  data?.productList?.forEach((el) => {
-    if (!el.previewImgs) {
+    if (!el.previewImgs || !el.previewImgs.length) {
      if (el.productMark === 'custom_normal' || el.productMark === 'normal') {
        el.previewImgs = [{ url: el.variantImage || '' }]
      } else {
-        el.previewImgs = JSON.parse(el.imageAry)
+        el.previewImgs = JSON.parse(el.imageAry || '[]')
      }
    }
  })
@@ -495,6 +498,7 @@ const renderItemBox = (bool: boolean) => {
    }
  }
  if (currentCode) {
+    if (!currentCode.startsWith('JM')) {
      const parts = currentCode.split('_')
      currentCode =
        parts.length > 3 && parts[3].startsWith('USPSC')
@@ -502,8 +506,13 @@ const renderItemBox = (bool: boolean) => {
          : parts.length > 1
          ? parts[1]
          : parts[0]
+    }
+    console.log(540, currentCode)
    for (const product of productList) {
-      if (product.podJomallUsNo === currentCode) {
+      if (
+        product.podJomallUsNo === currentCode ||
+        product.thirdSkuCode === currentCode
+      ) {
        coverImage.value = product.previewImgs?.[0]?.url || ''
        console.log(441, coverImage.value)

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