feat：工厂端&生产软件支持可使用新设备椭圆机#ID:1002994

src/types/api/podCnOrder.ts

@@ -56,6 +56,7 @@ export interface SearchForm {
   blocking?: boolean
   blocking?: boolean
   outOfStock?: boolean
   outOfStock?: boolean
   receiverCountry?: string
   receiverCountry?: string
+  standardDesignImage?: boolean
 }
 }
 export interface PodCnOrderListData {
 export interface PodCnOrderListData {
   id: number
   id: number
@@ -161,6 +162,7 @@ export interface ProductList {
   sizeType?: number | null
   sizeType?: number | null
   customTagList?: { name: string }[]
   customTagList?: { name: string }[]
   outOfStock?: boolean
   outOfStock?: boolean
+  standardDesignImage?: 0 | 1 | 2 | null
 }
 }
 export interface cardImages {
 export interface cardImages {
   title: string
   title: string

src/views/order/podCN/index.vue

@@ -573,6 +573,22 @@
                   ></ElOption>
                   ></ElOption>
                 </ElSelect>
                 </ElSelect>
               </ElFormItem>
               </ElFormItem>
+              <ElFormItem label="规范素材">
+                <ElSelect
+                  v-model="searchForm.standardDesignImage"
+                  placeholder="请选择"
+                  clearable
+                  filterable
+                  style="width: 150px"
+                >
+                  <ElOption
+                    v-for="(_, index) in ['否', '是']"
+                    :key="index"
+                    :value="!!index"
+                    :label="index === 0 ? '否' : '是'"
+                  ></ElOption>
+                </ElSelect>
+              </ElFormItem>
             </ElForm>
             </ElForm>
             <template #reference>
             <template #reference>
               <el-button type="warning" @click="searchVisible = !searchVisible">
               <el-button type="warning" @click="searchVisible = !searchVisible">
@@ -1516,8 +1532,11 @@
                       <span class="goods-item-info-item-label"
                       <span class="goods-item-info-item-label"
                         >申报重量(g):</span
                         >申报重量(g):</span
                       >
                       >
-                      <span :title="item.customsWeight"  class="goods-item-info-item-value">
-                       {{ item.customsWeight }}
+                      <span
+                        :title="item.customsWeight"
+                        class="goods-item-info-item-value"
+                      >
+                        {{ item.customsWeight }}
                       </span>
                       </span>
                     </div>
                     </div>
                     <div class="goods-item-info-item">
                     <div class="goods-item-info-item">
@@ -1874,6 +1893,11 @@
               {{ row.failTime?.replace('T', ' ') }}
               {{ row.failTime?.replace('T', ' ') }}
             </div>
             </div>
           </template>
           </template>
+          <template #standardDesignImage="{ row }">
+            <div style="white-space: pre-line">
+              {{ getStandardDesignImageText(row.standardDesignImage) }}
+            </div>
+          </template>
           <template #failReason="{ row }">
           <template #failReason="{ row }">
             <span style="white-space: pre-line" v-html="row.failReason"></span>
             <span style="white-space: pre-line" v-html="row.failReason"></span>
           </template>
           </template>
@@ -2959,7 +2983,6 @@ import {
 } from '@/api/podCnOrder'
 } from '@/api/podCnOrder'
 import { loadWarehouseListApi, getEmployeeListApi } from '@/api/common'
 import { loadWarehouseListApi, getEmployeeListApi } from '@/api/common'
 
 
-
 // import { logisticsCompanyAllCodelist } from '@/api/logistics.ts'
 // import { logisticsCompanyAllCodelist } from '@/api/logistics.ts'
 import { BaseRespData } from '@/types/api'
 import { BaseRespData } from '@/types/api'
 import ChangeWayDialog from './components/ChangeWayDialog.vue'
 import ChangeWayDialog from './components/ChangeWayDialog.vue'
@@ -3261,6 +3284,10 @@ const pickerOptions = {
     },
     },
   ],
   ],
 }
 }
+const getStandardDesignImageText = (value: number): string => {
+  const map: Record<number, string> = { 0: '否', 1: '是', 2: '混合' }
+  return map[value] ?? '-'
+}
 const timeRange = ref<string[]>([])
 const timeRange = ref<string[]>([])
 const getDateRange = (days = 0, type: 'past' | 'future' = 'past') => {
 const getDateRange = (days = 0, type: 'past' | 'future' = 'past') => {
   const end = dayjs()
   const end = dayjs()
@@ -3917,6 +3944,13 @@ const tableColumns = computed(() => {
         },
         },
       },
       },
       {
       {
+        label: '规范素材',
+        minWidth: 180,
+        prop: 'standardDesignImage',
+        slot: 'standardDesignImage',
+        align: 'center',
+      },
+      {
         label: '失败原因',
         label: '失败原因',
         minWidth: 250,
         minWidth: 250,
         prop: 'failReason',
         prop: 'failReason',