From c60927eb38b9aca29a1011f7a69c709d1ae128aa Mon Sep 17 00:00:00 2001
From: "zangch@mesnac.com" <zangch@mesnac.com>
Date: Tue, 17 Mar 2026 16:08:03 +0800
Subject: [PATCH] =?UTF-8?q?fix(wmsShippingBill/edit):=20=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E5=88=B0=E8=B4=A7=E7=A1=AE=E8=AE=A4=E5=8C=BA=E5=9D=97=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- type=view：显示“全部到货确认”区块，只读不可改。
  type=approval 但不是“到货确认节点申请人”：不显示该区块。
  type=approval 且当前任务节点是 arrival-confirm，并且当前登录人是申请人：显示该区块，可录入。

- 我调整的是 showArrivalConfirmSection 的显示条件：
  查看页按已有到货确认数据/需到货确认来展示。
  审批页只看 isArrivalConfirmApprover，不再给其它审批节点或其它审批人展示。
---
 src/views/wms/wmsShippingBill/edit.vue | 61 +++++++++++++++++++++++---
 1 file changed, 56 insertions(+), 5 deletions(-)

diff --git a/src/views/wms/wmsShippingBill/edit.vue b/src/views/wms/wmsShippingBill/edit.vue
index 3311746..bfc1749 100644
--- a/src/views/wms/wmsShippingBill/edit.vue
+++ b/src/views/wms/wmsShippingBill/edit.vue
@@ -14,14 +14,19 @@
       />
     </el-card>
 
-    <!-- 全部到货确认区块：仅到货确认节点允许申请人录入 -->
-    <el-card v-if="isArrivalConfirmApprover" shadow="never" style="margin-top: 10px; border: 1px solid #e6a23c">
+    <!-- 全部到货确认区块：查看/审批页都展示，仅到货确认节点允许申请人录入 -->
+    <el-card
+      v-if="showArrivalConfirmSection"
+      shadow="never"
+      style="margin-top: 10px"
+      :style="isArrivalConfirmApprover ? 'border: 1px solid #e6a23c' : ''"
+    >
       <template #header>
-        <div style="text-align: left; font-weight: bold; font-size: 16px; color: #e6a23c">
-          <el-icon style="margin-right: 6px"><Warning /></el-icon>全部到货确认
+        <div style="text-align: left; font-weight: bold; font-size: 16px" :style="isArrivalConfirmApprover ? 'color: #e6a23c' : ''">
+          <el-icon v-if="isArrivalConfirmApprover" style="margin-right: 6px"><Warning /></el-icon>全部到货确认
         </div>
       </template>
-      <el-form :model="arrivalConfirmForm" label-width="120px" ref="arrivalConfirmFormRef">
+      <el-form v-if="isArrivalConfirmApprover" :model="arrivalConfirmForm" label-width="120px" ref="arrivalConfirmFormRef">
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="全部到货标识" prop="isAllReceiving" :rules="[{ required: true, message: '请选择全部到货标识', trigger: 'change' }]">
@@ -43,6 +48,31 @@
           </el-col>
         </el-row>
       </el-form>
+      <el-form v-else :model="form" label-width="120px" disabled>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="全部到货标识">
+              <dict-tag :options="is_all_receiving" :value="form.isAllReceiving" />
+              <span v-if="!form.isAllReceiving">-</span>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="到货确认时间">
+              <span>{{ proxy?.parseTime(form.arrivalConfirmTime, '{y}-{m}-{d} {h}:{i}:{s}') || '-' }}</span>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="到货确认人">
+              <span>{{ form.arrivalConfirmByName || '-' }}</span>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="收货单附件">
+              <fileUpload v-model="form.arrivalReceiptOssId" :limit="5" disabled />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
     </el-card>
 
     <!-- 基本信息区域 -->
@@ -525,6 +555,19 @@ const isArrivalConfirmApprover = computed(() => {
   );
 });
 
+const showArrivalConfirmSection = computed(() => {
+  const hasArrivalConfirmData =
+    String(form.value.needArrivalConfirm || '') === '1' ||
+    !!form.value.isAllReceiving ||
+    !!form.value.arrivalConfirmTime ||
+    !!form.value.arrivalConfirmByName ||
+    !!form.value.arrivalReceiptOssId;
+  if (isViewMode.value) {
+    return hasArrivalConfirmData;
+  }
+  return isArrivalConfirmApprover.value;
+});
+
 const isViewMode = computed(() => routeParams.value.type === 'view');
 
 const isDraftFlowStatus = computed(() => {
@@ -655,8 +698,16 @@ const initFormData: WmsShippingBillForm = {
   warehouseName: undefined,
   outStockBillStatus: '1', // 默认暂存
   flowStatus: 'draft',
+  needArrivalConfirm: undefined,
+  isAllReceiving: undefined,
+  arrivalReceiptOssId: undefined,
+  arrivalConfirmTime: undefined,
+  arrivalConfirmBy: undefined,
+  arrivalConfirmByName: undefined,
   shippingStatus: '1', // 默认待发货
   remark: undefined,
+  createBy: undefined,
+  createTime: undefined,
   detailsList: []
 };