Merge branch 'hurx'

src/views/order/saleOrder/sendDetail.vue

@@ -4,7 +4,7 @@
       <!-- 订单信息 -->
       <el-descriptions title="订单信息" :column="2" border class="custom-descriptions">
         <el-descriptions-item label="订单编号">{{ orderDetail.orderNo }}</el-descriptions-item>
-        <el-descriptions-item label="发货单编号">{{ orderDetail.shipmentNo }}</el-descriptions-item>
+        <el-descriptions-item label="发货单编号">{{ shipmentNoList }}</el-descriptions-item>
         <el-descriptions-item label="订单总金额">{{ orderDetail.totalAmount }}</el-descriptions-item>
         <el-descriptions-item label="支付状态">
           <dict-tag :options="payment_status" :value="orderDetail.paymentStatus" />
@@ -14,7 +14,7 @@
         </el-descriptions-item>
         <el-descriptions-item label="下单时间">{{ orderDetail.orderTime }}</el-descriptions-item>
         <el-descriptions-item label="确认时间">{{ orderDetail.confirmTime }}</el-descriptions-item>
-        <el-descriptions-item label="发货时间">{{ orderDetail.shippingTime }}</el-descriptions-item>
+        <!-- <el-descriptions-item label="发货时间">{{ orderDetail.shippingTime }}</el-descriptions-item> -->
         <el-descriptions-item label="签收时间">{{ orderDetail.receivingTime }}</el-descriptions-item>
       </el-descriptions>
     </el-card>
@@ -333,6 +333,18 @@ const totalQuantitySent = computed(() => {
   }, 0);
 });
 
+// 计算发货单编号列表（从 orderDeliverList 中提取 deliverCode 用逗号拼接）
+const shipmentNoList = computed(() => {
+  if (!orderDeliverList.value || orderDeliverList.value.length === 0) {
+    return orderDetail.value.shipmentNo || '--';
+  }
+  const deliverCodes = orderDeliverList.value
+    .map((deliver) => (deliver as any).deliverCode)
+    .filter((code) => code)
+    .join(',');
+  return deliverCodes || '--';
+});
+
 // 获取部门详细信息
 const getDeptDetail = async (deptId: string) => {
   try {