fix: 入库单增加颜色和机型

src/views/warehouseManagement/stockLedger/components/details/InWarehouse.vue

@@ -331,6 +331,20 @@ export default {
           showOverflowTooltip: true,
           minWidth: 110
         },
+        {
+          prop: 'colorKey',
+          label: '颜色',
+          align: 'center',
+          showOverflowTooltip: true,
+          minWidth: 110
+        },
+        {
+          prop: 'modelKey',
+          label: '机型',
+          align: 'center',
+          showOverflowTooltip: true,
+          minWidth: 110
+        },
         {
           prop: 'qualityControl',
           label: '质检状态',

src/views/warehouseManagement/stockLedger/components/details/InventoryAllocation.vue

@@ -188,6 +188,20 @@
             align: 'center',
             showOverflowTooltip: true
           },
+          {
+            prop: 'colorKey',
+            label: '颜色',
+            align: 'center',
+            showOverflowTooltip: true,
+            minWidth: 110
+          },
+          {
+            prop: 'modelKey',
+            label: '机型',
+            align: 'center',
+            showOverflowTooltip: true,
+            minWidth: 110
+          },
           {
             prop: 'warehouseName',
             label: '调出区域',

src/views/warehouseManagement/stockLedger/components/details/OutWarehouse.vue

@@ -345,6 +345,20 @@
             showOverflowTooltip: true,
             minWidth: 110
           },
+          {
+            prop: 'colorKey',
+            label: '颜色',
+            align: 'center',
+            showOverflowTooltip: true,
+            minWidth: 110
+          },
+          {
+            prop: 'modelKey',
+            label: '机型',
+            align: 'center',
+            showOverflowTooltip: true,
+            minWidth: 110
+          },
           {
             prop: 'warehouseName',
             label: '仓库',

src/views/warehouseManagement/stockManagement/components/printStockEnterHt.vue

@@ -29,7 +29,7 @@
         <div style="margin-bottom: 20px; width: 100%;">
           <div style="width: 100%; display: flex;">
             <div style="width: 40%;">
-              供应商名称：{{ rowItem.extInfo?.supplierName || '' }}
+              供应商名称：{{ rowItem.supplierNames || '' }}
             </div>
             <div style="width: 30%;">
               日期：{{ rowItem.storageTime || '' }}
@@ -67,7 +67,7 @@
             <tr v-for="(row, index) in rowItem.outInDetailList" :key="index">
               <td style="border: 1px solid #000; padding: 4px; text-align: center;">{{ index + 1 }}</td>
               <td style="border: 1px solid #000; padding: 4px; text-align: center;">{{row.categoryModel || '' }}{{ row.categoryModel && row?.specification ? '/' : '' }}{{ row?.specification || '' }}</td>
-              <td v-if="rowItem.bizType == 6" style="border: 1px solid #000; padding: 4px; text-align: center;">{{ row?.clientName || '' }}</td> 
+              <td v-if="rowItem.bizType == 6" style="border: 1px solid #000; padding: 4px; text-align: center;">{{ rowItem?.clientName || '' }}</td> 
               <td style="border: 1px solid #000; padding: 4px; text-align: center;">{{ row?.colorKey || '' }}</td>
               <td style="border: 1px solid #000; padding: 4px; text-align: center;">{{ row?.measureUnit || '' }}</td>
               <td style="border: 1px solid #000; padding: 4px; text-align: center;">{{ row?.measureQuantity || '' }}</td>
@@ -152,6 +152,10 @@
         console.log('ids~~', ids, rows);
         // 批量获取每个入库单的详情
         const res = await storageApi.getInboundDetailsByIds(ids);
+        res.map(item => {
+          item.supplierNames = [...new Set(item.outInDetailList.map(row => row.supplierName || ''))].join(',');
+          return item
+        })
         this.formData = res;
 
         // 构建仓库映射
@@ -210,7 +214,7 @@
           const totalAmount = this.getTotalAmount(rowItem);
           const warehouseName = this.warehouseMap[rowItem.id] || '';
           const isBizType6 = rowItem.bizType == 6;
-          const supplierValue = rowItem.extInfo?.supplierName || '';
+          const supplierValue = rowItem.supplierNames || '';
 
           const totalCols = isBizType6 ? 9 : 8;
           const colWidths = isBizType6
@@ -230,7 +234,7 @@
               <tr height="24" style="height:24pt;">
                 <td align="center" valign="middle" style="${td}">${index + 1}</td>
                 <td align="center" valign="middle" style="${td}">${item.categoryModel || ''}${item.categoryModel && item.specification ? '/' : ''}${item.specification || ''}</td>
-                ${isBizType6 ? `<td align="center" valign="middle" style="${td}">${item.clientName || ''}</td>` : ''}
+                ${isBizType6 ? `<td align="center" valign="middle" style="${td}">${rowItem?.clientName || ''}</td>` : ''}
                 <td align="center" valign="middle" style="${td}">${item.colorKey || ''}</td>
                 <td align="center" valign="middle" style="${td}">${item.measureUnit || ''}</td>
                 <td align="center" valign="middle" style="${td}">${item.measureQuantity || ''}</td>