fix: 胚衣问题修改

src/types/api/podUsOrder.ts

@@ -143,6 +143,7 @@ export interface ProductList {
   sizeType?: number | null
   sizeType?: number | null
   productMark?: string | null
   productMark?: string | null
   customTagList?: { name: string }[]
   customTagList?: { name: string }[]
+  productMark?: string
 }
 }
 export interface cardImages {
 export interface cardImages {
   title: string
   title: string

src/views/order/podUs/PodMakeOrder.vue

@@ -211,6 +211,17 @@
             <span v-if="item.data" class="number">
             <span v-if="item.data" class="number">
               {{ item.data.pickingNumber }}/{{ item.data.purchaseNumber }}
               {{ item.data.pickingNumber }}/{{ item.data.purchaseNumber }}
             </span>
             </span>
+            <div
+              v-if="
+                item.data &&
+                item.data.productList?.some(
+                  (e) => e.productMark === 'custom_normal',
+                )
+              "
+              class="cb-product-mark"
+            >
+              <div class="red-circle"></div>
+            </div>
           </div>
           </div>
         </div>
         </div>
       </div>
       </div>
@@ -1204,6 +1215,17 @@ const printNormal = async () => {
     color: #ddd;
     color: #ddd;
   }
   }
 }
 }
+.cb-product-mark {
+  position: absolute;
+  top: 0;
+  right: 0;
+  .red-circle {
+    width: 8px;
+    height: 8px;
+    border-radius: 50%;
+    background-color: red;
+  }
+}
 </style>
 </style>
 <style lang="scss">
 <style lang="scss">
 .pod-make-order-dialog {
 .pod-make-order-dialog {

src/views/order/podUs/index.vue

@@ -1390,7 +1390,7 @@
                         </template>
                         </template>
                       </ElDropdown> -->
                       </ElDropdown> -->
                       <div
                       <div
-                        v-if="status === 'WAIT_SHIPMENT'"
+                        v-if="status === 'WAIT_SHIPMENT' && item.productMark !== 'custom_normal'"
                         style="
                         style="
                           display: flex;
                           display: flex;
                           flex-direction: column;
                           flex-direction: column;
@@ -1410,7 +1410,7 @@
                       <!-- f -->
                       <!-- f -->
                     </div>
                     </div>
                     <div
                     <div
-                      v-if="status === 'WAIT_SHIPMENT'"
+                      v-if="status === 'WAIT_SHIPMENT' && item.productMark !== 'custom_normal'"
                       style="display: flex; justify-content: space-between"
                       style="display: flex; justify-content: space-between"
                     >
                     >
                       <el-button
                       <el-button
@@ -1432,7 +1432,7 @@
                       </el-button>
                       </el-button>
                     </div>
                     </div>
                     <div
                     <div
-                      v-if="status === 'WAIT_SHIPMENT'"
+                      v-if="status === 'WAIT_SHIPMENT' && item.productMark !== 'custom_normal'"
                       style="
                       style="
                         display: flex;
                         display: flex;
                         flex-direction: column;
                         flex-direction: column;
@@ -3900,10 +3900,14 @@ watch(
       order.productList?.forEach((product) => {
       order.productList?.forEach((product) => {
         if (!product.previewImgs && product.imageAry) {
         if (!product.previewImgs && product.imageAry) {
           try {
           try {
+            if (product.productMark === 'custom_normal') {
+              product.previewImgs = []
+            } else {
             product.previewImgs =
             product.previewImgs =
-              JSON.parse(product.imageAry)?.filter(
-                (el: { title: string }) => el.title,
-              ) || []
+                JSON.parse(product.imageAry)?.filter(
+                  (el: { title: string }) => el.title,
+                ) || []
+            }
           } catch (error) {
           } catch (error) {
             console.error('JSON解析失败:', error)
             console.error('JSON解析失败:', error)
             product.previewImgs = []
             product.previewImgs = []
@@ -5237,7 +5241,7 @@ const handleMark = (mark: string) => {
       return {
       return {
         name: 'CB',
         name: 'CB',
         color: '#67C23A',
         color: '#67C23A',
-        label: '海外供应',
+        label: '胚衣',
       }
       }
     default:
     default:
       return {
       return {