update

src/business/table/columns.ts

@@ -76,7 +76,7 @@ export const pcTableColumnMap = new Map<TableColumnKey, Ermcp.TableColumn[]>([
         { prop: 'zspolishtypedisplay', label: '抛光' },
         { prop: 'zssymmetrytypedisplay', label: '对称' },
         { prop: 'zsfluorescencetypedisplay', label: '荧光' },
-        { prop: 'zssize', label: '尺寸' },
+        { prop: 'zssizedisplay', label: '尺寸' },
         { prop: 'operate', label: '操作' }
     ]],
     // 挂牌大厅-我的出售
@@ -104,7 +104,7 @@ export const pcTableColumnMap = new Map<TableColumnKey, Ermcp.TableColumn[]>([
         { prop: 'zspolishtypedisplay', label: '抛光' },
         { prop: 'zssymmetrytypedisplay', label: '对称' },
         { prop: 'zsfluorescencetypedisplay', label: '荧光' },
-        { prop: 'zssize', label: '尺寸' },
+        { prop: 'zssizedisplay', label: '尺寸' },
         { prop: 'operate', label: '操作' }
     ]],
     // 挂牌大厅-我的摘牌

src/business/trade/listing.ts

@@ -49,7 +49,7 @@ export function useBuyOrderListing() {
         ZSCrystalType: [],
         Origin: '',
         ZSStyleType: [],
-        ZSCZColor1Type: [],
+        ZSCZColor3Type: [],
     })
 
     const enums = {

src/packages/pc/views/trade/purchase/index.vue

@@ -16,10 +16,6 @@
             <template #header>
                 <app-auth-operation :menus="['trade_purchase_add']" @closed="onRefresh" />
             </template>
-            <!-- 颜色 -->
-            <template #zscolortypedisplay="{ row }">
-                {{ row.zscategory === Category.Fancy ? row.zsczcolor3typedisplay : row.zscolortypedisplay }}
-            </template>
             <!-- 操作 -->
             <template #operate="{ row }">
                 <app-auth-operation type="dropdown" :menus="handleOperateButtons(row)" :options="{ selectedRow: row }"
@@ -35,7 +31,6 @@
 
 <script lang="ts" setup>
 import { ElMessage } from 'element-plus'
-import { Category } from '@/constants/diamond'
 import { useDataFilter } from '@/hooks/datatable'
 import { usePurchaseOrder } from '@/business/trade/list'
 import { useComposeTable } from '@pc/components/base/table'

src/types/proto/trade.d.ts

@@ -46,9 +46,9 @@ declare global {
             ZSCrystalType: number[]; // 晶型
             Origin: string; // 原产地
             ZSStyleType: number[]; // 款式
-            ZSCZColor1Type: number[]; // 彩钻颜色1
+            ZSCZColor1Type?: number[]; // 彩钻颜色1
             ZSCZColor2Type?: number[]; // 彩钻颜色2
-            ZSCZColor3Type?: number[]; // 彩钻颜色3
+            ZSCZColor3Type: number[]; // 彩钻颜色3
             Remark?: string; // 备注
             WarehouseIDs?: number[]; // 仓库ID
         }