fix: 操作单添加类型

src/views/order/factoryOrderNew/component/CardLayout.vue

 <template>
 <template>
-  <div v-loading="loading" class="card-layout">
+  <div v-loading="loading" element-loading-text="加载中..." class="card-layout">
     <div v-if="cardData.length > 0" class="card-content">
     <div v-if="cardData.length > 0" class="card-content">
       <div class="card-grid">
       <div class="card-grid">
         <div
         <div
@@ -103,6 +103,16 @@
             <template #operations>
             <template #operations>
               <div class="flex-row flex-row-gap6">
               <div class="flex-row flex-row-gap6">
                 <div
                 <div
+                  v-if="
+                    item?.productMark === 'custom_normal' ||
+                    item?.productMark === 'normal'
+                  "
+                  class="product-mark-badge"
+                  :title="`类型:${setProductMark(item?.productMark)}面`"
+                >
+                  {{ setProductMark(item?.productMark) }}
+                </div>
+                <div
                   v-if="item.customizedQuantity"
                   v-if="item.customizedQuantity"
                   class="quantity-badge"
                   class="quantity-badge"
                   :class="
                   :class="
@@ -414,6 +424,12 @@ const clearSelection = () => {
   selectedItems.value = []
   selectedItems.value = []
   emit('selection-change', [])
   emit('selection-change', [])
 }
 }
+function setProductMark(productMark: string) {
+  if (!productMark) return ''
+  if (productMark === 'custom_normal') return 'CB'
+  if (productMark === 'normal') return 'G'
+  return ''
+}
 
 
 const getSelectedIds = () => selectedItems.value.map((i) => i.id)
 const getSelectedIds = () => selectedItems.value.map((i) => i.id)
 const getPlatformImg = (code: string) => {
 const getPlatformImg = (code: string) => {
@@ -509,6 +525,17 @@ defineExpose({ clearSelection, getSelectedIds, refresh })
   background-color: #e6a23c;
   background-color: #e6a23c;
 }
 }
 
 
+.product-mark-badge {
+  border: 2px solid #F56C6C;
+  color: #F56C6C;
+  font-weight: 700;
+  height: 28px;
+  width: 28px;
+  text-align: center;
+  border-radius: 6px;
+  font-size: 16px;
+}
+
 .card-info-grid {
 .card-info-grid {
   display: grid;
   display: grid;
   grid-template-columns: 1fr 150px;
   grid-template-columns: 1fr 150px;

src/views/order/factoryOrderNew/index.vue

@@ -665,7 +665,11 @@
       <div v-if="isTableLayout" class="table-content">
       <div v-if="isTableLayout" class="table-content">
         <splitDiv size="55">
         <splitDiv size="55">
           <template #top>
           <template #top>
-            <div v-loading="loading" class="table-list flex-1 overflow-hidden">
+            <div
+              v-loading="loading"
+              element-loading-text="加载中..."
+              class="table-list flex-1 overflow-hidden"
+            >
               <TableView
               <TableView
                 ref="tableRef"
                 ref="tableRef"
                 highlight-current-row
                 highlight-current-row
@@ -749,7 +753,11 @@
               @tab-click="handleTabClick"
               @tab-click="handleTabClick"
             >
             >
               <el-tab-pane name="product" label="包含商品">
               <el-tab-pane name="product" label="包含商品">
-                <div v-loading="subLoading" class="sub-table-wrapper">
+                <div
+                  v-loading="subLoading"
+                  element-loading-text="加载中..."
+                  class="sub-table-wrapper"
+                >
                   <TableView
                   <TableView
                     :paginated-data="productList"
                     :paginated-data="productList"
                     :columns="productColumns"
                     :columns="productColumns"
@@ -758,7 +766,11 @@
                 </div>
                 </div>
               </el-tab-pane>
               </el-tab-pane>
               <el-tab-pane name="log" label="操作日志">
               <el-tab-pane name="log" label="操作日志">
-                <div v-loading="subLoading" class="detail-table-content">
+                <div
+                  v-loading="subLoading"
+                  element-loading-text="加载中..."
+                  class="detail-table-content"
+                >
                   <LogList style="height: 100%" :log-list="logList" />
                   <LogList style="height: 100%" :log-list="logList" />
                   <div v-if="!logList.length" class="empty-content">
                   <div v-if="!logList.length" class="empty-content">
                     暂无数据
                     暂无数据