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

f4a56ad5 · zhuzhequan · aea0bb48 · 389c0c09 · f4a56ad5 · f4a56ad5
Commit f4a56ad5 authored Aug 01, 2025 by zhuzhequan
8 changed files
--- a/src/api/podUsOrder.ts
+++ b/src/api/podUsOrder.ts
@@ -8,7 +8,7 @@ import {
  ProductionClient,
  WarehouseListData,
  LogisticsData,
-  ExportParams
+  ExportParams,
 } from '@/types/api/podUsOrder'
 import axios from './axios'
 import { PodMakeOrderData } from '@/types/api/podMakeOrder'
@@ -48,7 +48,7 @@ export function getOrderList(
  currentPage: number,
  pageSize: number,
 ) {
-  return axios.post<never, BasePaginationData<PodUsOrderListData[]>>(
+  return axios.post<never, BasePaginationData<PodUsOrderListData>>(
    '/factory/podJomallOrderUs/list_page',
    {
      ...params,
@@ -338,7 +338,7 @@ export function createLogisticsOrderApi(params: {
  )
 }
-// 创建物流
+// 物流面单上传
 export function uploadExpressSheet(params: {
  trackingNumber: string
  file: File
@@ -347,7 +347,8 @@ export function uploadExpressSheet(params: {
    'factory/podJomallOrderUs/uploadExpressSheet',
    params,
  )
-} // 创建物流
+}
+// 更新物流信息确认
 export function updateSelfLogistics(params: {
  trackingNumber: string
  expressSheet: string

--- a/src/components/TableView.vue
+++ b/src/components/TableView.vue
@@ -12,7 +12,7 @@
      <ElTableColumn
        v-if="selectionable"
        type="selection"
-        width="50"
+        width="40"
        fixed="left"
        header-align="center"
        align="center"
@@ -21,7 +21,7 @@
        v-if="serialNumberable"
        label="序号"
        type="index"
-        width="60"
+        width="55"
        fixed="left"
        header-align="center"
        align="center"

--- a/src/types/api/podUsOrder.ts
+++ b/src/types/api/podUsOrder.ts
@@ -6,7 +6,9 @@ export interface Tab {
 export interface ExportParams extends SearchForm {
  idList?: number[]
  exportAll: boolean
+  status?:string
 }
 export interface SearchForm {
  timeType?: number | null
  shopNumber?: string
@@ -95,6 +97,7 @@ export interface ProductList {
  craftCode?: string
  platform?: string
  imageAry?: string
+  previewImgs?: []
  designImages?: string
  categoryId?: number
  categoryName?: string

--- a/src/views/order/orderTracking/index.vue
+++ b/src/views/order/orderTracking/index.vue
@@ -14,6 +14,7 @@ import {
  getOperationLogApi,
  getOrderTabData,
  getfaceSimplexFileApi,
+  exportPodUSInfo,
 } from '@/api/podUsOrder'
 import {
  SearchForm,
@@ -23,6 +24,7 @@ import {
  PodUsOrderListData,
  LogListData,
  Tab,
+  ExportParams,
 } from '@/types/api/podUsOrder'
 import platformJson from '../../../json/platform.json'
 import dayjs from 'dayjs'
@@ -284,7 +286,7 @@ const goodsColumns = computed(() => {
    },
  ]
 })
-const tableData = ref<PodUsOrderListData[][]>([])
+const tableData = ref<PodUsOrderListData[]>([])
 const goodsData = ref<ProductList[]>([])
 const searchVisible = ref(false)
 const goodsLoading = ref(false)
@@ -371,16 +373,62 @@ const getWeekRange = (weeks = 0, type: 'past' | 'future' = 'past') => {
    type === 'past' ? now.subtract(weeks, 'week') : now.add(weeks, 'week')
  return [start.startOf('week').toDate(), start.endOf('week').toDate()]
 }
+const exportLoading = ref(false)
+const exportVisible = ref(false)
+const exportForm = ref({
+  resource: '',
+})
-async function getData() {}
+const exportData = () => {
+  exportVisible.value = true
+}
+const submitExportForm = async () => {
+  if (exportForm.value.resource === '') {
+    return ElMessage.error('请选择导出类型')
+  }
+  exportLoading.value = true
+  const resourceType = Number(exportForm.value.resource)
+  const params: ExportParams = {
+    exportAll: false,
+    idList: [],
+  }
+  // 使用函数封装映射逻辑
+  const mapIds = (items: PodUsOrderListData[]) =>
+    items.map((el) => Number(el.id))
+  switch (resourceType) {
+    case 0:
+      params.idList = mapIds(tableData.value as PodUsOrderListData[])
+      break
+    case 1:
+      params.idList = mapIds(selection.value)
+      break
+    case 2:
+      params.exportAll = true
+      params.idList = undefined
+      break
+    default:
+      console.error('未知的资源类型:', resourceType)
+  }
+  try {
+    const res = await exportPodUSInfo({
+      ...params,
+      ...(resourceType === 2 ? searchForm.value : {}),
+    })
+    window.open(filePath + res.message, '_blank')
+    exportVisible.value = false
+    exportLoading.value = false
+  } catch (e) {
+    exportVisible.value = false
+    exportLoading.value = false
+  } 
+}
 const handleSizeChange = (pageSize: number) => {
  pagination.value.pageSize = pageSize
-  getData()
+  getOrderListFn()
 }
 const handleCurrentChange = (currentPage: number) => {
  pagination.value.currentPage = currentPage
-  getData()
+  getOrderListFn()
 }
 const productionClient = ref<ProductionClient[]>()
@@ -508,7 +556,7 @@ const resultInfo = ref<
 const resultRefs = ref<InstanceType<typeof ResultInfo> | null>(null)
 /**
- * @description: 创建物流、获取跟踪号、获取打印面单、更改物流、取消物流订单
+ * @description: 获取打印面单
 */
 const getOrderByIdApi = async (type: string) => {
@@ -593,7 +641,6 @@ loadTabData()
 loadProductionClient()
 getUserMark()
 loadCraftList()
-getData()
 getWarehouse()
 onMounted(() => {
@@ -889,6 +936,9 @@ onMounted(() => {
              >
            </span>
          </ElFormItem>
+          <ElFormItem>
+            <ElButton type="success" @click="exportData">导出</ElButton>
+          </ElFormItem>
        </ElForm>
      </el-card>
    </template>
@@ -960,6 +1010,33 @@ onMounted(() => {
      </div>
    </template>
  </split-div>
+  <ElDialog
+    v-model="exportVisible"
+    title="导出选项"
+    width="500px"
+    :close-on-click-modal="false"
+  >
+    <el-form :model="exportForm" label-width="80px">
+      <el-form-item label="" prop="resource">
+        <el-radio-group v-model="exportForm.resource">
+          <el-radio :label="0">导出本页</el-radio>
+          <el-radio :label="1">导出选中</el-radio>
+          <el-radio :label="2">全部</el-radio>
+        </el-radio-group>
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button @click="exportVisible = false">取消</el-button>
+        <el-button
+          :loading="exportLoading"
+          type="primary"
+          @click="submitExportForm"
+          >确认</el-button
+        >
+      </span>
+    </template>
+  </ElDialog>
  <ResultInfo
    ref="resultRefs"
    :list="resultInfo"

--- a/src/views/order/pod/fastProduction.vue
+++ b/src/views/order/pod/fastProduction.vue
@@ -392,8 +392,20 @@ watch(
          { url: d.negativeImage, title: '反面', id: d.negativeDesignId },
        ].filter((el) => el.url)
      } else {
-        arr =
+        arr = Array.isArray(d.imageAry)
-          typeof d.imageAry == 'string' ? JSON.parse(d.imageAry) : d.imageAry
+          ? d.imageAry
+          : typeof d.imageAry === 'string'
+          ? (() => {
+              try {
+                const parsed = JSON.parse(d.imageAry)
+                return parsed
+              } catch {
+                return [{ url: d.imageAry }]
+              }
+            })()
+          : [d.imageAry]?.filter?.((v) => v != null) || []
+        // arr =
+        //   typeof d.imageAry == 'string' ? JSON.parse(d.imageAry) : d.imageAry
        arr = arr.concat([
          { url: d.negativeImage, title: '反面', id: d.negativeDesignId },
        ])
@@ -591,7 +603,10 @@ const trackcodeInput = async () => {
  // AAAB_60527128-9_1_JMSC250121017 新版示例
  const regex = /^[A-Z]{4}_/ //是否以四个大写字母加下划线开头
  if (regex.test(orderNumber)) {
-    orderNumber = orderNumber.split('_')[0] + "-"+ orderNumber.split('_')[orderNumber.split('_').length - 1]
+    orderNumber =
+      orderNumber.split('_')[0] +
+      '-' +
+      orderNumber.split('_')[orderNumber.split('_').length - 1]
  }
  try {
    const res = await getSubOrderBySubOrderNumber(orderNumber)
@@ -612,7 +627,20 @@ const trackcodeInput = async () => {
        { url: d.negativeImage, title: '反面', id: d.negativeDesignId },
      ].filter((el) => el.url)
    } else {
-      arr = typeof d.imageAry == 'string' ? JSON.parse(d.imageAry) : d.imageAry
+      arr = Array.isArray(d.imageAry)
+        ? d.imageAry
+        : typeof d.imageAry === 'string'
+        ? (() => {
+            try {
+              const parsed = JSON.parse(d.imageAry)
+              return parsed
+            } catch {
+              return [{ url: d.imageAry }]
+            }
+          })()
+        : [d.imageAry]?.filter?.((v) => v != null) || []
+      // arr = typeof d.imageAry == 'string' ? JSON.parse(d.imageAry) : d.imageAry
      arr = arr.concat([
        { url: d.negativeImage, title: '反面', id: d.negativeDesignId },
      ])

--- a/src/views/order/pod/index.vue
+++ b/src/views/order/pod/index.vue
@@ -220,7 +220,7 @@
              'TO_BE_CONFIRMED',
              'IN_PRODUCTION',
              'PART_SHIPPING',
-              'WAIT_SHIPMENT',
+              'WAIT_SHIPMENT'
            ].includes(status)
          "
          class="item"
@@ -1449,7 +1449,20 @@ const openDetail = async (id: number) => {
    const res = await getOrderDetail(id)
    if (res.code == 200) {
      if (res.data.imageAry) {
-        res.data.imageAry = JSON.parse(res.data.imageAry as string)
+        const newarr = res.data.imageAry
+        res.data.imageAry = Array.isArray(newarr)
+          ? newarr
+          : typeof newarr === 'string'
+          ? (() => {
+              try {
+                const parsed = JSON.parse(newarr)
+                return parsed
+              } catch {
+                return [{ url: newarr }]
+              }
+            })()
+          : [newarr]?.filter?.((v) => v != null) || []
+        // res.data.imageAry = JSON.parse(res.data.imageAry as string)
      }
      detailData.value = res.data || {}
      detailVisible.value = true
@@ -1457,6 +1470,8 @@ const openDetail = async (id: number) => {
      fastType.value = 0
    }
  } catch (e) {
+    console.log(e)
    //showError(e)
  }
 }
@@ -1691,7 +1706,7 @@ const [searchForm] = useValue<SearchForm>({
  userMark: '',
  customizedQuantity: '',
  order: 'desc',
-  platform:''
+  platform: '',
 })
 const tableColumns = computed<CustomColumn<CardOrderData[]>>(() => {
  return [

--- a/src/views/order/podUs/PodMakeOrder.vue
+++ b/src/views/order/podUs/PodMakeOrder.vue
@@ -247,7 +247,12 @@ const props = defineProps<{
  printOrder: (data: OrderData, callback: (status: boolean) => void) => void
  warehouseList: WarehouseListData[]
 }>()
-const emit = defineEmits(['update:modelValue', 'set-printer', 'refresh'])
+const emit = defineEmits([
+  'update:modelValue',
+  'set-printer',
+  'refresh',
+  'set-warehouseId',
+])
 const visible = computed({
  get() {
    return props.modelValue
@@ -259,6 +264,7 @@ const visible = computed({
 const printDeviceList = ref<string[]>([])
 const sheetPrinter = ref<string>('')
 const productionOrder = ref<string>('')
 const podOrderDetailsData = ref<OrderData>()
 const podOrderDetailsColumns = computed(() => [
@@ -351,7 +357,9 @@ watch(visible, async (value: boolean) => {
    initOrderDetailBox()
    initPrintDevice()
    const locaclPrinter = localStorage.getItem('sheetPrinter')
+    const locaclWarehouseId = localStorage.getItem('locaclWarehouseId')
    if (locaclPrinter) sheetPrinter.value = JSON.parse(locaclPrinter)
+    if (locaclWarehouseId) warehouseId.value = JSON.parse(locaclWarehouseId)
  } else {
    if (userStore.user?.factory.id) {
      socket.send({
@@ -927,6 +935,7 @@ const handleWarehouseChange = (value: string | number) => {
    })
  }
  warehouseId.value = value
+  emit('set-warehouseId', value)
  socket.send({
    code: 'STARTORDER',
    factoryNo: userStore.user?.factory.id,

--- a/src/views/order/podUs/index.vue
+++ b/src/views/order/podUs/index.vue
@@ -465,7 +465,10 @@
          <span v-if="status === 'TO_BE_ARRANGE'" class="item">
            <ElButton type="warning" @click="arrangeFinish">排单完成</ElButton>
          </span>
-          <span v-if="status !== 'BATCH_DOWNLOAD'" class="item">
+          <span
+            v-if="status !== 'BATCH_DOWNLOAD' && status !== 'WAIT_SHIPMENT'"
+            class="item"
+          >
            <ElButton type="primary" @click="downloadMaterial"
              >下载素材</ElButton
            >
@@ -482,16 +485,11 @@
            class="item"
          >
            <ElButton type="success" @click="refreshMaterial">
-              刷新素材
+              刷新商品信息
            </ElButton>
          </span>
          <span v-if="status === 'COMPLETE'" class="item">
-            <ElButton
+            <ElButton type="success" @click="exportData">导出</ElButton>
-              :loading="exportLoading"
-              type="success"
-              @click="exportData"
-              >导出</ElButton
-            >
          </span>
        </ElFormItem>
      </ElForm>
@@ -606,17 +604,31 @@
                  :key="item"
                  class="goods-item"
                >
-                  <div class="goods-item-img">
+                  <div
-                    <img :src="item.variantImage" alt="商品图片" />
+                    class="goods-item-img"
+                    style="display: flex; flex-direction: column"
+                  >
                    <div
-                      v-if="item.customizedQuantity"
+                      v-for="img in item.previewImgs"
-                      class="triangle-box"
+                      :key="img"
-                      :title="`类型:${getQuantityText(
+                      style="text-align: center"
-                        item.customizedQuantity,
-                      )}面`"
                    >
-                      <div class="multi-text">
+                      <img
-                        {{ getQuantityText(item.customizedQuantity) }}
+                        :src="img.url"
+                        alt="商品图片"
+                        style="cursor: pointer"
+                        @click="handlePictureCardPreview(img.url)"
+                      />
+                      <div
+                        v-if="item.customizedQuantity"
+                        class="triangle-box"
+                        :title="`类型:${getQuantityText(
+                          item.customizedQuantity,
+                        )}面`"
+                      >
+                        <div class="multi-text">
+                          {{ getQuantityText(item.customizedQuantity) }}
+                        </div>
                      </div>
                    </div>
                  </div>
@@ -707,7 +719,7 @@
                      </span>
                      <el-icon
                        class="icon"
-                        @click="copy(item.factorySubOrderNumber || '')"
+                        @click.stop="copy(item.factorySubOrderNumber || '')"
                      >
                        <DocumentCopy />
                      </el-icon>
@@ -724,7 +736,7 @@
                      </span>
                      <el-icon
                        class="icon"
-                        @click="copy(item.thirdSubOrderNumber || '')"
+                        @click.stop="copy(item.thirdSubOrderNumber || '')"
                      >
                        <DocumentCopy />
                      </el-icon>
@@ -741,7 +753,15 @@
                        {{ item.supplierProductNo }}
                      </span>
                    </div>
+                    <div class="goods-item-info-item">
+                      <span class="goods-item-info-item-label">克重:</span>
+                      <span
+                        v-if="item.weight"
+                        class="goods-item-info-item-value"
+                      >
+                        {{ item.weight }}g
+                      </span>
+                    </div>
                    <div
                      v-if="item.isReplenishment"
                      class="goods-item-info-item"
@@ -754,12 +774,14 @@
                  </div>
                  <div class="goods-item-info">
                    <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">
-                        {{ item.productPrice }}($)
+                        {{ item.productPrice }}
                      </span>
                    </div>
-                    <div 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-value">
                        {{ item.templatePrice }}($)
@@ -776,7 +798,7 @@
                      <span class="goods-item-info-item-value">
                        {{ item.payAmount }}($)
                      </span>
-                    </div>
+                    </div> -->
                    <div class="goods-item-info-item">
                      <span class="goods-item-info-item-label">{{
@@ -803,6 +825,7 @@
                    <div
                      v-if="status === 'WAIT_SHIPMENT' || status === 'COMPLETE'"
                      class="goods-item-info-item"
+                      style="align-items: start"
                    >
                      <span class="goods-item-info-item-label">补胚数量:</span>
                      <span
@@ -811,24 +834,83 @@
                      >
                        {{ item.replenishmentSumNum || 0 }}
                      </span>
-                      <el-button
+                      <!-- <ElDropdown
                        v-if="status === 'WAIT_SHIPMENT'"
-                        link
+                        style="height: 23px"
                        size="small"
-                        type="success"
+                      >
-                        @click="applyForReplenishment(item)"
+                        <span class="el-dropdown-link"
-                        >申请补胚
+                          >素材接口<el-icon class="el-icon--right"
-                      </el-button>
+                            ><ArrowDown /></el-icon
+                        ></span>
+                        <template #dropdown>
+                          <ElDropdownMenu>
+                            <ElDropdownItem @click="applyForReplenishment(item)"
+                              >申请补胚</ElDropdownItem
+                            >
+                            <ElDropdownItem @click="downloadMaterialItem(item)"
+                              >下载素材</ElDropdownItem
+                            >
+                            <ElDropdownItem
+                              @click="downloadTifItem('tiff', item.id)"
+                              >TIF排版</ElDropdownItem
+                            >
+                            <ElDropdownItem
+                              @click="downloadTifItem('png', item.id)"
+                              >PNG排版</ElDropdownItem
+                            >
+                          </ElDropdownMenu>
+                        </template>
+                      </ElDropdown> -->
+                      <div
+                        v-if="status === 'WAIT_SHIPMENT'"
+                        style="
+                          display: flex;
+                          flex-direction: column;
+                          align-items: center;
+                        "
+                      >
+                        <el-button
+                          link
+                          size="small"
+                          type="success"
+                          style="height: 23px"
+                          @click="applyForReplenishment(item)"
+                          >申请补胚
+                        </el-button>
+                      </div>
                      <!-- f -->
                    </div>
-                    <div class="goods-item-info-item">
+                    <div
-                      <span class="goods-item-info-item-label">克重:</span>
+                      v-if="status === 'WAIT_SHIPMENT'"
-                      <span
+                      style="display: flex; justify-content: space-between"
-                        v-if="item.weight"
+                    >
-                        class="goods-item-info-item-value"
+                      <el-button
-                      >
+                        link
-                        {{ item.weight }}g
+                        size="small"
-                      </span>
+                        type="primary"
+                        style="height: 23px; padding: 0"
+                        @click="downloadMaterialItem(item)"
+                        >下载素材
+                      </el-button>
+                      <el-button
+                        link
+                        size="small"
+                        type="warning"
+                        style="height: 23px; margin: 0"
+                        @click="downloadTifItem('tiff', item.id)"
+                        >TIF排版
+                      </el-button>
+                      <el-button
+                        link
+                        size="small"
+                        type="warning"
+                        style="height: 23px; margin: 0"
+                        @click="downloadTifItem('png', item.id)"
+                        >PNG排版
+                      </el-button>
                    </div>
                  </div>
                </div>
@@ -985,10 +1067,10 @@
          <template #price="{ row }">
            <div class="order-price-box">
              <div class="order-price-item">
-                <span class="order-price-item-label">商品总价：</span>
+                <div class="order-price-item-label">商品总价</div>
-                <span class="order-price-item-value">
+                <div class="order-price-item-value">
-                  {{ row.totalAmount }}($)
+                  {{ row.totalAmount }}
-                </span>
+                </div>
              </div>
              <div
@@ -998,15 +1080,15 @@
                "
                class="order-price-item"
              >
-                <span class="order-price-item-label">物流运费：</span>
+                <div class="order-price-item-label">物流运费</div>
-                <span class="order-price-item-value">
+                <div class="order-price-item-value">
-                  {{ row.payFreight }}($)
+                  {{ row.payFreight }}
-                </span>
+                </div>
              </div>
            </div>
          </template>
          <template #time="{ row }">
-            <el-timeline style="max-width: 600px">
+            <el-timeline>
              <el-timeline-item
                :color="row.createTime ? '#409EFF' : ''"
                :timestamp="row.createTime"
@@ -1155,7 +1237,7 @@
                class="operate-item"
              >
                <ElButton link type="primary" @click="showLogistics(row)">
-                  更新物流信息
+                  更新物流
                </ElButton>
              </span>
              <span
@@ -1291,9 +1373,7 @@
                <div class="flex-between">
                  <div v-if="cardItem.imageAry" class="images-position">
                    <div
-                      v-for="(item, index) in JSON.parse(
+                      v-for="(item, index) in filteredImages(cardItem.imageAry)"
-                        cardItem.imageAry || '',
-                      )"
                      :key="index"
                      :title="item.title"
                      class="item-image"
@@ -1438,7 +1518,7 @@
                  <div class="grid-item">
                    <div
-                      :title="`第三方生产单号:${cardItem?.thirdSubOrderNumber}`"
+                      :title="`订单号:${cardItem?.thirdSubOrderNumber}`"
                      class="grid-item-value orderNumber"
                    >
                      {{ cardItem?.thirdSubOrderNumber }}
@@ -1631,6 +1711,7 @@
    :print-order="printOrder"
    :warehouse-list="warehouseList"
    @set-printer="handlePrinterChange"
+    @set-warehouseId="handleWarehouseIdChange"
    @refresh="onFastRefresh"
  />
  <ElDialog
@@ -1879,7 +1960,12 @@
    <template #footer>
      <span class="dialog-footer">
        <el-button @click="exportVisible = false">取消</el-button>
-        <el-button type="primary" @click="submitExportForm">确认</el-button>
+        <el-button
+          :loading="exportLoading"
+          type="primary"
+          @click="submitExportForm"
+          >确认</el-button
+        >
      </span>
    </template>
  </ElDialog>
@@ -2036,6 +2122,7 @@ const submitExportForm = async () => {
  const params: ExportParams = {
    exportAll: false,
    idList: [],
+    status: status.value,
  }
  // 使用函数封装映射逻辑
  const mapIds = (items: PodUsOrderListData[]) =>
@@ -2167,6 +2254,17 @@ const pickerOptions = {
    },
  ],
 }
+const filteredImages = (imageAry: string | null) => {
+  if (!imageAry) return []
+  try {
+    const parsed = JSON.parse(imageAry)
+    return Array.isArray(parsed)
+      ? parsed.filter((el: { title: string }) => el.title)
+      : []
+  } catch {
+    return []
+  }
+}
 const timeRange = ref<string[]>([])
 const getDateRange = (days = 0, type: 'past' | 'future' = 'past') => {
  const end = dayjs()
@@ -2393,7 +2491,7 @@ const tableColumns = computed(() => {
      label: '商品',
      prop: 'goods',
      slot: 'goods',
-      minWidth: 920,
+      minWidth: 800,
    },
    {
      label: '订单详情',
@@ -2402,16 +2500,16 @@ const tableColumns = computed(() => {
      width: 300,
    },
    {
-      label: '单价',
+      label: '订单金额($)',
      slot: 'price',
-      width: 160,
+      width: 110,
      prop: 'price',
      align: 'left',
    },
    {
      label: '时间',
      slot: 'time',
-      width: 180,
+      width: 170,
      prop: 'time',
      align: 'left',
    },
@@ -2423,7 +2521,7 @@ const tableColumns = computed(() => {
    // },
    {
      label: '异常原因',
-      width: 300,
+      width: 250,
      prop: 'exceptionReason',
      slot: 'exceptionReason',
      align: 'left',
@@ -2431,7 +2529,7 @@ const tableColumns = computed(() => {
    {
      label: '操作',
      slot: 'operate',
-      width: 180,
+      width: 80,
      align: 'center',
      fixed: 'right',
      prop: 'operate',
@@ -2597,6 +2695,31 @@ const {
  },
 })
+watch(
+  () => [...(tableData.value as PodUsOrderListData[])], // 创建新数组避免直接修改原始数据
+  (newData) => {
+    if (!newData?.length) return
+    newData.forEach((order) => {
+      // 使用可选链和空值合并简化判断
+      order.productList?.forEach((product) => {
+        if (!product.previewImgs && product.imageAry) {
+          try {
+            product.previewImgs =
+              JSON.parse(product.imageAry)?.filter(
+                (el: { title: string }) => el.title,
+              ) || []
+          } catch (error) {
+            console.error('JSON解析失败:', error)
+            product.previewImgs = []
+          }
+        }
+      })
+    })
+  },
+  { deep: true, immediate: true }, // 添加immediate确保初始化时执行
+)
 const search = () => {
  selection.value = []
  cardSelection.value = []
@@ -2732,8 +2855,12 @@ const handleConfirm = async () => {
  await loadTabData()
 }
 const copy = (text: string) => {
-  navigator.clipboard.writeText(text)
+  try {
-  ElMessage.success('复制成功')
+    navigator.clipboard.writeText(text)
+    ElMessage.success('复制成功')
+  } catch (err) {
+    console.error('复制失败:', err)
+  }
 }
 const handleUpdateRemark = async (item: ProductList) => {
  ElMessageBox.prompt('请输入备注', '提示', {
@@ -2825,7 +2952,51 @@ const downloadTif = async (type: string) => {
    }
  }
 }
+const downloadTifItem = async (type: string, id: number) => {
+  const loading = ElLoading.service({
+    fullscreen: true,
+    text: '操作中...',
+    background: 'rgba(0, 0, 0, 0.3)',
+  })
+  try {
+    const res = await composingDesignImages([id], type)
+    const url =
+      type === 'tiff'
+        ? `https://ps.jomalls.com/tiff/` + res.message
+        : filePath + res.message
+    if (type === 'tiff') {
+      window.open(url, '_blank')
+    } else {
+      fetch(url)
+        .then((response) => {
+          // 确保响应是 OK
+          if (!response.ok) {
+            throw new Error('网络响应错误')
+          }
+          // 返回图片的二进制数据（Blob）
+          return response.blob()
+        })
+        .then((blob) => {
+          const a = document.createElement('a')
+          a.href = window.URL.createObjectURL(blob)
+          a.target = '_blank'
+          a.download = (res.message as string).split('/')[
+            (res.message as string).split('/').length - 1
+          ]
+          a.click()
+          pngDownloadLoading.value = false
+        })
+        .catch((error) => {
+          console.error('下载图片时出错:', error)
+          pngDownloadLoading.value = false
+        })
+    }
+  } catch (e) {
+    console.log(e)
+  } finally {
+    loading.close()
+  }
+}
 const loadProductionClient = async () => {
  try {
    const res = await getProductionClientApi()
@@ -3227,6 +3398,24 @@ const downloadMaterial = async () => {
    loading.close()
  }
 }
+// 下载单个素材
+const downloadMaterialItem = async (data: PodUsOrderListData) => {
+  const loading = ElLoading.service({
+    fullscreen: true,
+    text: '操作中...',
+    background: 'rgba(0, 0, 0, 0.3)',
+  })
+  try {
+    const res = await downloadMaterialApi([data.id])
+    if (res.code !== 200) return
+    window.open(filePath + res.message)
+  } catch (e) {
+    // showError(e)
+    console.error(e)
+  } finally {
+    loading.close()
+  }
+}
 // 排单完成
 const arrangeFinish = async () => {
@@ -3653,6 +3842,9 @@ const handlePrinterChange = (value: string) => {
  sheetPrinter.value = value
  localStorage.setItem('sheetPrinter', JSON.stringify(value))
 }
+const handleWarehouseIdChange = (value: string) => {
+  localStorage.setItem('locaclWarehouseId', JSON.stringify(value))
+}
 const { getCLodop } = useLodop()
 const printOrder = async (
  data: OrderData,
@@ -3873,7 +4065,9 @@ const loadCraftList = async () => {
  }
 }
 const refreshMaterial = async () => {
-  if (status.value === 'PICKING' || status.value === 'TO_BE_REPLENISHMENT') {
+  if (
+    ['PICKING', 'TO_BE_REPLENISHMENT', 'IN_PRODUCTION'].includes(status.value)
+  ) {
    if (cardSelection.value.length === 0) {
      return ElMessage.warning('请选择数据')
    }
@@ -3889,14 +4083,16 @@ const refreshMaterial = async () => {
  })
  try {
    const res = await refreshMaterialApi({
-      orderIds:
+      orderIds: !['PICKING', 'TO_BE_REPLENISHMENT', 'IN_PRODUCTION'].includes(
-        status.value !== 'PICKING' && status.value !== 'TO_BE_REPLENISHMENT'
+        status.value,
-          ? selection.value.map((item) => item.id).join(',')
+      )
-          : undefined,
+        ? selection.value.map((item) => item.id).join(',')
-      productIds:
+        : undefined,
-        status.value === 'PICKING' || status.value === 'TO_BE_REPLENISHMENT'
+      productIds: ['PICKING', 'TO_BE_REPLENISHMENT', 'IN_PRODUCTION'].includes(
-          ? cardSelection.value.map((item) => item.id).join(',')
+        status.value,
-          : undefined,
+      )
+        ? cardSelection.value.map((item) => item.id).join(',')
+        : undefined,
    })
    if (res.code !== 200) return
    ElMessage.success('刷新成功')
@@ -4203,15 +4399,15 @@ useRouter().beforeEach((to, from, next) => {
 .goods-item {
  display: grid;
-  grid-template-columns: 100px 1fr minmax(180px, 1fr) 180px;
+  grid-template-columns: 100px 1fr minmax(150px, 1fr) 150px;
-  gap: 20px;
+  gap: 15px;
  .goods-item-img {
-    width: 100px;
+    // width: 100px;
-    height: 100px;
+    // height: 65px;
    position: relative;
    img {
-      width: 100%;
+      width: 65%;
    }
  }
@@ -4484,4 +4680,15 @@ useRouter().beforeEach((to, from, next) => {
    flex-wrap: wrap;
  }
 }
+.el-dropdown-link {
+  cursor: pointer;
+  color: var(--el-color-success);
+  display: flex;
+  align-items: center;
+  outline: none;
+}
+.el-timeline-item__wrapper {
+  padding-left: 15px;
+  top: -6px;
+}
 </style>