From 23a49fc2971051521b7f6ff56ea983620c846035 Mon Sep 17 00:00:00 2001
From: yangzifeng <2547435354@qq.com>
Date: Fri, 6 Mar 2026 09:47:55 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=87=BA=E5=BA=93=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E7=9A=84=E6=89=93=E5=8D=B0=E5=8D=95=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/printBill/bill.vue | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/components/printBill/bill.vue b/src/components/printBill/bill.vue
index 32c0e84..929b1a5 100644
--- a/src/components/printBill/bill.vue
+++ b/src/components/printBill/bill.vue
@@ -25,7 +25,7 @@
           </tr>
           <tr v-if="!isRuKu">
             <td class="label-td">项目编号：</td>
-            <td class="value-td" colspan="3">{{ billAllObj[0]?.xmNo }}</td>
+            <td class="value-td" colspan="3">{{ billAllObj[0]?.bizType == 1 ? xmNo  :billAllObj[0]?.xmNo }}</td>
           </tr>
           <tr v-if="!isRuKu">
             <td class="label-td">项目描述：</td>
@@ -80,7 +80,7 @@
             <th>数量</th>
             <th>库位码</th>
             <th>订单编号</th>
-            <th v-if="isRuKu">项目编号</th>
+            <th>项目编号</th>
             <th v-if="isRuKu">项目描述</th>
             <th>备注</th>
             <th>身份码</th>
@@ -96,7 +96,7 @@
             <td style="text-align: center;">{{ item.realQty }}</td>
             <td style="text-align: center;">{{ item.pcode }}</td>
             <td style="text-align: center;">{{ item.sapNo }}</td>
-            <td v-if="isRuKu" style="text-align: center;">{{ item.xmNo }}</td>
+            <td style="text-align: center;">{{ item.xmNo }}</td>
             <td v-if="isRuKu" style="text-align: center;">{{ item.xmMs }}</td>
             <td style="text-align: center;">{{ item.remark }}</td>
             <td style="text-align: center;">{{ item.entityId }}</td>
@@ -134,6 +134,17 @@ const isRuKu = computed(() => {
   return props.billAllObj[0]?.bizType == 0;
 });
 
+// 获取不同的项目编号
+const xmNo = computed(() => {
+  const validXmMsValues = props.billAllObj
+    .map(item => item.xmNo) // 提取所有 xmMs 属性值
+    .filter(value => !!value); // 过滤掉 null/undefined/空字符串等假值
+  // 3. 去重：得到所有不同的 xmMs 值
+  const uniqueXmMs = [...new Set(validXmMsValues)];
+  // 4. 核心逻辑：多个值用 + 拼接，单个值直接返回，无值返回空字符串
+  return uniqueXmMs.length > 1 ? uniqueXmMs.join('、') : uniqueXmMs[0] || '';
+});
+
 // 获取不同的项目描述
 const xmMs = computed(() => {
   const validXmMsValues = props.billAllObj