Merge branch 'dev' of http://47.122.114.111:9999/qinjianhui/factory_front into dev

src/api/podCnOrder.ts

@@ -311,6 +311,14 @@ export function getSuperPodBoxListApi(factoryNo: number | string) {
   )
   )
 }
 }
 
 
+// 超级播种墙配货 获取pod订单拣货箱子详情
+export function printNormalPdf(ids:  string) {
+  return axios.get<never, BaseRespData<string>>(
+    'factory/podJomallOrderCn/printPickPdf',
+    { params: { ids } },
+  )
+}
+
 // 播种墙配货 打单完成
 // 播种墙配货 打单完成
 export function submitInspectionApi(
 export function submitInspectionApi(
   data: { id: number; version?: number }[],
   data: { id: number; version?: number }[],

src/components/RenderColumn.vue

 <template>
 <template>
   <template v-if="col.subs?.length">
   <template v-if="col.subs?.length">
     <ElTableColumn
     <ElTableColumn
+      show-overflow-tooltip
       header-align="center"
       header-align="center"
       :label="col.label"
       :label="col.label"
       :align="col.align"
       :align="col.align"
@@ -31,7 +32,7 @@
       </template>
       </template>
     </ElTableColumn>
     </ElTableColumn>
   </template>
   </template>
-  <ElTableColumn v-else header-align="center" v-bind="col">
+  <ElTableColumn  v-else header-align="center" v-bind="col">
     <template #header="{ column, $index }">
     <template #header="{ column, $index }">
       <component
       <component
         :is="() => col.headerRender(column, $index)"
         :is="() => col.headerRender(column, $index)"

src/types/api/podCnOrder.ts

@@ -15,6 +15,7 @@ export interface ExportParams extends SearchForm {
 export interface SearchForm {
 export interface SearchForm {
   timeType?: number | null
   timeType?: number | null
   shopNumber?: string
   shopNumber?: string
+  productMark?: string
   shipmentType?: string | number
   shipmentType?: string | number
   replaceShipment?: string | number
   replaceShipment?: string | number
   userMark?: string
   userMark?: string
@@ -97,6 +98,7 @@ export interface PodCnOrderListData {
 export interface ProductList {
 export interface ProductList {
   id: number
   id: number
   podJomallOrderCnId: number
   podJomallOrderCnId: number
+  productMark?: string
   thirdSubOrderNumber?: string
   thirdSubOrderNumber?: string
   thirdStockSku?: string
   thirdStockSku?: string
   factorySubOrderNumber?: string
   factorySubOrderNumber?: string

src/types/api/podMakeOrder.ts

@@ -51,7 +51,7 @@ export interface ProductList {
   variantImage?: string
   variantImage?: string
   podJomallUsNo?: string
   podJomallUsNo?: string
   podJomallCnNo?: string
   podJomallCnNo?: string
-  previewImgs?: { sort: string | number; title: string; url: string }[]
+  previewImgs?: { sort?: string | number; title?: string; url: string }[]
 }
 }
 
 
 export interface LogisticBill {
 export interface LogisticBill {