From c862a2860b719f56fcaf609c97a284fbea8701bd Mon Sep 17 00:00:00 2001
From: "zangch@mesnac.com" <zangch@mesnac.com>
Date: Tue, 10 Mar 2026 09:57:40 +0800
Subject: [PATCH] =?UTF-8?q?feat(wms):=20=E4=BC=98=E5=8C=96=E5=8F=91?=
 =?UTF-8?q?=E8=B4=A7=E5=8D=95=E7=BC=96=E8=BE=91=E9=A1=B5=E9=9D=A2=E7=9A=84?=
 =?UTF-8?q?=E8=A1=A8=E5=8D=95=E6=8E=A7=E5=88=B6=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 将硬编码的路由参数条件判断替换为计算属性
- 新增抄送人员表单验证规则和动态显示逻辑
- 重构到货确认相关的表单和验证逻辑
- 移除未使用的到货确认接口导入
- 优化明细表格的编辑权限控制
- 调整流程变量传递逻辑，移除冗余的tManagerId字段
- 修复到货确认节点的审批流程处理方式
---
 src/views/wms/wmsShippingBill/edit.vue  | 200 +++++++++++++-----------
 src/views/wms/wmsShippingBill/index.vue |   2 +-
 2 files changed, 113 insertions(+), 89 deletions(-)

diff --git a/src/views/wms/wmsShippingBill/edit.vue b/src/views/wms/wmsShippingBill/edit.vue
index 1714566..41929a3 100644
--- a/src/views/wms/wmsShippingBill/edit.vue
+++ b/src/views/wms/wmsShippingBill/edit.vue
@@ -50,14 +50,7 @@
       <template #header>
         <div style="text-align: left; font-weight: bold; font-size: 18px">基本信息</div>
       </template>
-      <el-form
-        ref="shippingBillFormRef"
-        :model="form"
-        :loading="buttonLoading"
-        :disabled="routeParams.type === 'view' || routeParams.type === 'approval'"
-        :rules="rules"
-        label-width="120px"
-      >
+      <el-form ref="shippingBillFormRef" :model="form" :loading="buttonLoading" :disabled="mainFormDisabled" :rules="rules" label-width="120px">
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="发货单号" prop="shippingCode">
@@ -205,10 +198,10 @@
           </el-col>
         </el-row>
       </el-form>
-      <el-form label-width="120px">
+      <el-form v-if="isArrivalConfirmApprover" ref="copyManagerFormRef" :model="form" label-width="120px">
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="抄送人员" prop="tManagerId">
+            <el-form-item label="抄送人员" prop="tManagerId" :rules="copyManagerRules">
               <el-select
                 v-model="form.tManagerId"
                 placeholder="请选择抄送人员"
@@ -261,20 +254,13 @@
           </el-col>
           <el-col :span="3">
             <!-- 物料来源切换 -->
-            <el-radio-group
-              v-model="materialSourceType"
-              size="small"
-              @change="handleMaterialSourceChange"
-              :disabled="routeParams.type === 'view' || routeParams.type === 'approval'"
-            >
+            <el-radio-group v-model="materialSourceType" size="small" @change="handleMaterialSourceChange" :disabled="detailFormDisabled">
               <!--              <el-radio-button value="1">ERP物料</el-radio-button>-->
               <el-radio-button value="2">WMS物料</el-radio-button>
             </el-radio-group>
           </el-col>
           <el-col :span="1.5">
-            <el-button type="primary" icon="Plus" @click="handleAddDetail" v-if="routeParams.type !== 'view' && routeParams.type !== 'approval'">
-              新增物料
-            </el-button>
+            <el-button type="primary" icon="Plus" @click="handleAddDetail" v-if="canEditDetailFields"> 新增物料 </el-button>
           </el-col>
         </el-row>
       </template>
@@ -294,7 +280,7 @@
               size="small"
               style="width: 100%"
               @change="calculateTotalPrice(scope.row)"
-              :disabled="routeParams.type === 'view' || routeParams.type === 'approval'"
+              :disabled="detailFormDisabled"
             />
           </template>
         </el-table-column>
@@ -308,7 +294,7 @@
               :controls="false"
               size="small"
               style="width: 100%"
-              :disabled="routeParams.type === 'view' || routeParams.type === 'approval'"
+              :disabled="detailFormDisabled"
               @change="calculateTotalPrice(scope.row)"
             />
           </template>
@@ -320,15 +306,10 @@
         </el-table-column>
         <el-table-column label="备注" align="center" prop="remark" min-width="120">
           <template #default="scope">
-            <el-input
-              v-model="scope.row.remark"
-              placeholder="备注"
-              size="small"
-              :disabled="routeParams.type === 'view' || routeParams.type === 'approval'"
-            />
+            <el-input v-model="scope.row.remark" placeholder="备注" size="small" :disabled="detailFormDisabled" />
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" width="80" fixed="right" v-if="routeParams.type !== 'view' && routeParams.type !== 'approval'">
+        <el-table-column label="操作" align="center" width="80" fixed="right" v-if="canEditDetailFields">
           <template #default="scope">
             <el-button link type="danger" icon="Delete" @click="handleDeleteDetail(scope.$index)">删除</el-button>
           </template>
@@ -457,14 +438,8 @@
 </template>
 
 <script setup name="WmsShippingBillEdit" lang="ts">
-import {
-  addWmsShippingBill,
-  arrivalConfirmShippingBill,
-  getWmsShippingBill,
-  shippingBillSubmitAndFlowStart,
-  updateWmsShippingBill
-} from '@/api/wms/wmsShippingBill';
-import { WmsShippingArrivalConfirmForm, WmsShippingBillForm } from '@/api/wms/wmsShippingBill/types';
+import { addWmsShippingBill, getWmsShippingBill, shippingBillSubmitAndFlowStart, updateWmsShippingBill } from '@/api/wms/wmsShippingBill';
+import { WmsShippingBillForm } from '@/api/wms/wmsShippingBill/types';
 import { useUserStore } from '@/store/modules/user';
 import { getTask } from '@/api/workflow/task';
 import type { FlowTaskVO } from '@/api/workflow/task/types';
@@ -506,13 +481,19 @@ const { shipping_mode, shipping_status, shipping_bill_status, material_source_ty
 const buttonLoading = ref(false);
 const shippingBillFormRef = ref<ElFormInstance>();
 const arrivalConfirmFormRef = ref<ElFormInstance>();
+const copyManagerFormRef = ref<ElFormInstance>();
+
+type ArrivalConfirmFormModel = {
+  shippingBillId: string | number;
+  isAllReceiving: string;
+  arrivalReceiptOssId: string;
+};
 
 // 到货确认表单数据
-const arrivalConfirmForm = ref<WmsShippingArrivalConfirmForm>({
+const arrivalConfirmForm = ref<ArrivalConfirmFormModel>({
   shippingBillId: '',
   isAllReceiving: '0',
-  arrivalReceiptOssId: '',
-  taskId: ''
+  arrivalReceiptOssId: ''
 });
 
 watch(
@@ -524,32 +505,69 @@ watch(
 
 const currentTask = ref<FlowTaskVO | null>(null);
 
+const isArrivalConfirmTask = computed(() => currentTask.value?.nodeCode === 'arrival-confirm');
+
+const isCurrentTaskBusinessMatched = computed(() => {
+  const taskBusinessId = String(currentTask.value?.businessId || '').trim();
+  const shippingBillId = String(form.value.shippingBillId || '').trim();
+  if (!taskBusinessId) {
+    return true;
+  }
+  return taskBusinessId === shippingBillId;
+});
+
 // 是否显示到货确认区块：审批模式 + 到货确认节点 + 当前用户是申请人
 const isArrivalConfirmApprover = computed(() => {
   return (
     routeParams.value.type === 'approval' &&
-    form.value.needArrivalConfirm === '1' &&
-    currentTask.value?.nodeCode === 'arrival-confirm' &&
-    String(currentTask.value?.businessId || '') === String(form.value.shippingBillId || '') &&
-    String(userStore.userId) === String(form.value.createBy)
+    String(form.value.needArrivalConfirm || '') === '1' &&
+    isArrivalConfirmTask.value &&
+    isCurrentTaskBusinessMatched.value &&
+    String(userStore.userId || '') === String(form.value.createBy || '')
   );
 });
 
-const isArrivalConfirmNode = computed(() => {
-  return (
-    routeParams.value.type === 'approval' &&
-    currentTask.value?.nodeCode === 'arrival-confirm' &&
-    String(currentTask.value?.businessId || '') === String(form.value.shippingBillId || '')
-  );
+const isViewMode = computed(() => routeParams.value.type === 'view');
+
+const isDraftFlowStatus = computed(() => {
+  if (!form.value.shippingBillId) {
+    return true;
+  }
+  return String(form.value.flowStatus || '') === 'draft';
 });
 
+const canEditBusinessFields = computed(() => {
+  // 基础信息与明细仅允许草稿态维护，审批中任何节点都不能通过编辑页修改这些业务字段
+  return !isViewMode.value && routeParams.value.type !== 'approval' && isDraftFlowStatus.value;
+});
+
+const mainFormDisabled = computed(() => !canEditBusinessFields.value);
+
+const canEditDetailFields = computed(() => canEditBusinessFields.value);
+
+const detailFormDisabled = computed(() => !canEditDetailFields.value);
+
+const validateCopyManager = (rule: any, value: unknown, callback: (error?: Error) => void) => {
+  if (!isArrivalConfirmApprover.value) {
+    callback();
+    return;
+  }
+  const selectedIds = toWorkflowUserIdArray(value);
+  if (!selectedIds || selectedIds.length === 0) {
+    callback(new Error('请选择抄送人员'));
+    return;
+  }
+  callback();
+};
+
+const copyManagerRules = [{ validator: validateCopyManager, trigger: 'change' }];
+
 const canEditCopyManager = computed(() => {
-  if (routeParams.value.type === 'view') {
+  if (isViewMode.value) {
     return false;
   }
-  const flowStatus = String(form.value.flowStatus || '');
-  // Why：字段级权限仅控制“抄送人员”，规则为草稿可改、到货确认节点可改
-  return flowStatus === 'draft' || isArrivalConfirmNode.value;
+  // 抄送人员仅在到货确认节点由申请人选择
+  return isArrivalConfirmApprover.value;
 });
 
 const copyManagerDisabled = computed(() => !canEditCopyManager.value);
@@ -709,7 +727,7 @@ const buildFlowCopyVariables = async (submitData: WmsShippingBillForm) => {
   }
 
   // 绑定合同时优先取合同负责人作为流程抄送人，保证流程变量完整
-  // Why：统一归一为 tManagerId，流程节点只关心当前业务口径下的实际抄送人
+  // 统一归一为 tManagerId，流程节点只关心当前业务口径下的实际抄送人
   if (bindType === '2' && !tManagerId && submitData.contractId) {
     try {
       const contractRes = await getContractInfo(submitData.contractId);
@@ -733,18 +751,21 @@ const buildFlowCopyVariables = async (submitData: WmsShippingBillForm) => {
 };
 
 const prepareTaskVariables = async () => {
-  const { tManagerId } = await buildFlowCopyVariables(form.value as WmsShippingBillForm);
-  if (tManagerId) {
-    // Why：到货确认节点配置了 ${tManagerId} 抄送表达式，审批时必须显式传入，避免解析为空
-    taskVariables.value = { tManagerId };
+  if (!isArrivalConfirmApprover.value) {
+    taskVariables.value = {};
     return true;
   }
-  // 部门负责人节点流转到到货确认节点时，若未传 tManagerId 会触发流程抄送解析异常
-  if (currentTask.value?.nodeCode === 'dept-leader') {
-    proxy?.$modal.msgError('未获取到到货确认抄送人ID(tManagerId)，请先维护合同负责人或项目抄送人员');
+  const valid = await copyManagerFormRef.value?.validate().catch(() => false);
+  if (!valid) {
     return false;
   }
-  taskVariables.value = {};
+  const tManagerId = normalizeWorkflowUserIds((form.value as any).tManagerId);
+  if (!tManagerId) {
+    proxy?.$modal.msgError('请选择抄送人员');
+    return false;
+  }
+  // Why：抄送人员不落库，只在到货确认节点审批时作为流程变量传递
+  taskVariables.value = { tManagerId };
   return true;
 };
 
@@ -755,7 +776,7 @@ const syncCopyManagerSelection = async () => {
   }
   const { tManagerId } = await buildFlowCopyVariables(form.value as WmsShippingBillForm);
   if (tManagerId) {
-    // Why：编辑历史单据时回显抄送人员，保持与 orderActivate 一样“可见可改”
+    // 编辑历史单据时回显抄送人员，保持与 orderActivate 一样“可见可改”
     (form.value as any).tManagerId = toWorkflowUserIdArray(tManagerId);
   }
 };
@@ -802,13 +823,13 @@ const submitContractSelect = () => {
 
 /** 打开项目选择弹窗 */
 const openProjectSelect = () => {
-  if (routeParams.value.type === 'view' || routeParams.value.type === 'approval') return;
+  if (!canEditBusinessFields.value) return;
   projectSelectRef.value?.open();
 };
 
 /** 打开合同选择弹窗 */
 const openContractSelect = () => {
-  if (routeParams.value.type === 'view' || routeParams.value.type === 'approval') return;
+  if (!canEditBusinessFields.value) return;
   contractDialog.visible = true;
   contractQueryParams.value.pageNum = 1;
   getContractList();
@@ -903,6 +924,9 @@ const handleMaterialSourceChange = () => {
 
 /** 新增物料 */
 const handleAddDetail = () => {
+  if (!canEditDetailFields.value) {
+    return;
+  }
   if (materialSourceType.value === '1') {
     // ERP物料选择
     saleMaterialSelectRef.value?.openDialog();
@@ -993,6 +1017,9 @@ const confirmWmsMaterialSelect = () => {
 
 /** 删除明细 */
 const handleDeleteDetail = (index: number) => {
+  if (!canEditDetailFields.value) {
+    return;
+  }
   detailsList.value.splice(index, 1);
 };
 
@@ -1017,19 +1044,12 @@ const submitForm = async (status: string, mode: boolean) => {
       // 提交流程：设置流程编码与变量，驱动审批流
       // 提交审批 - 后端发起流程模式
       submitData.flowCode = FlowCodeEnum.SHIPPING_BILL_CODE;
-      const { tManagerId } = await buildFlowCopyVariables(submitData);
-      if (!tManagerId) {
-        proxy?.$modal.msgError('未获取到到货确认抄送人ID(tManagerId)，请先维护合同负责人或项目抄送人员');
-        return;
-      }
-      submitData.tManagerId = tManagerId;
       // 流程变量
       submitData.variables = {
         shippingBillId: submitData.shippingBillId,
         shippingCode: submitData.shippingCode,
         projectName: submitData.projectName,
-        customerName: submitData.customerName,
-        tManagerId
+        customerName: submitData.customerName
       };
       // 流程实例业务扩展字段
       submitData.bizExt = {
@@ -1158,11 +1178,28 @@ const handleApprovalRecord = () => {
 
 // 提交回调
 const submitCallback = async () => {
+  if (isArrivalConfirmApprover.value) {
+    const valid = await arrivalConfirmFormRef.value?.validate().catch(() => false);
+    if (!valid) return;
+    const saveData: WmsShippingBillForm = {
+      shippingBillId: form.value.shippingBillId,
+      projectId: form.value.projectId,
+      contractId: form.value.contractId,
+      isAllReceiving: arrivalConfirmForm.value.isAllReceiving,
+      arrivalReceiptOssId: arrivalConfirmForm.value.arrivalReceiptOssId,
+      // 到货确认存储时同步维护发货状态，避免审批提交后状态与到货标识不一致
+      shippingStatus: arrivalConfirmForm.value.isAllReceiving === '0' ? '3' : '2'
+    };
+    await updateWmsShippingBill(saveData);
+    form.value.isAllReceiving = saveData.isAllReceiving;
+    form.value.arrivalReceiptOssId = saveData.arrivalReceiptOssId;
+    form.value.shippingStatus = saveData.shippingStatus;
+  }
   await proxy?.$tab.closePage(route);
   router.go(-1);
 };
 
-// 审批（到货确认节点时，先保存到货业务数据，再走流程审批）
+// 审批（到货确认节点先校验，再打开审批弹窗）
 const approvalVerifyOpen = async () => {
   if (routeParams.value.type === 'approval' && routeParams.value.taskId) {
     const taskLoaded = await loadCurrentTask();
@@ -1172,22 +1209,9 @@ const approvalVerifyOpen = async () => {
     }
   }
   if (isArrivalConfirmApprover.value) {
-    // 到货确认节点：先校验并保存到货业务数据
-    // 校验到货确认表单
+    // 到货确认节点：先校验到货确认表单，业务字段在 submitCallback 中统一存储
     const valid = await arrivalConfirmFormRef.value?.validate().catch(() => false);
     if (!valid) return;
-    // 先调用到货确认接口保存业务数据
-    arrivalConfirmForm.value.shippingBillId = form.value.shippingBillId!;
-    arrivalConfirmForm.value.taskId = String(routeParams.value.taskId);
-    try {
-      const res = await arrivalConfirmShippingBill(arrivalConfirmForm.value);
-      Object.assign(form.value, res.data);
-      arrivalConfirmForm.value.isAllReceiving = res.data.isAllReceiving || arrivalConfirmForm.value.isAllReceiving;
-      arrivalConfirmForm.value.arrivalReceiptOssId = res.data.arrivalReceiptOssId || arrivalConfirmForm.value.arrivalReceiptOssId;
-    } catch (error) {
-      console.error('到货确认保存失败:', error);
-      return;
-    }
   }
   const prepared = await prepareTaskVariables();
   if (!prepared) return;
diff --git a/src/views/wms/wmsShippingBill/index.vue b/src/views/wms/wmsShippingBill/index.vue
index cca7097..8b90100 100644
--- a/src/views/wms/wmsShippingBill/index.vue
+++ b/src/views/wms/wmsShippingBill/index.vue
@@ -33,7 +33,7 @@
                 <el-option v-for="dict in need_arrival_confirm" :key="dict.value" :label="dict.label" :value="dict.value" />
               </el-select>
             </el-form-item>
-            <el-form-item label="到货标识" prop="isAllReceiving">
+            <el-form-item label="是否全部到货" prop="isAllReceiving">
               <el-select v-model="queryParams.isAllReceiving" placeholder="请选择到货标识" clearable style="width: 180px">
                 <el-option v-for="dict in is_all_receiving" :key="dict.value" :label="dict.label" :value="dict.value" />
               </el-select>