feat(shipping): 1.发货的时候需要填出库批号，选入库批号 2.可以按批号，批量入库 3.销售退货将发货单号改成出库批号

liding

2026-06-01 fe44869e3ab926c3e1065145337b79eb6e2fb2cd

feat(shipping): 1.发货的时候需要填出库批号，选入库批号
2.可以按批号，批量入库
3.销售退货将发货单号改成出库批号

 src/views/inventoryManagement/dispatchLog/Record.vue

@@ -1,154 +1,149 @@
<template>
  <div>
    <div class="search_form"
         style="margin-bottom: 10px">
      <el-form ref="searchFormRef"
               :model="searchForm"
               class="demo-form-inline">
    <div class="search_form" style="margin-bottom: 10px">
      <el-form ref="searchFormRef" :model="searchForm" class="demo-form-inline">
        <el-row :gutter="20">
          <el-col :span="4">
            <el-form-item label="出库日期"
                          prop="timeStr">
              <el-date-picker v-model="searchForm.timeStr"
            <el-form-item label="出库日期" prop="timeStr">
              <el-date-picker
                v-model="searchForm.timeStr"
                              type="date"
                              placeholder="请选择日期"
                              value-format="YYYY-MM-DD"
                              format="YYYY-MM-DD"
                              clearable />
                clearable
              />
            </el-form-item>
          </el-col>
          <el-col :span="4">
            <el-form-item label="产品大类"
                          prop="productName">
              <el-input v-model="searchForm.productName"
            <el-form-item label="产品大类" prop="productName">
              <el-input
                v-model="searchForm.productName"
                        style="width: 240px"
                        placeholder="请输入"
                        clearable />
                clearable
              />
            </el-form-item>
          </el-col>
          <el-col :span="4">
            <el-form-item label="规格型号"
                          prop="model">
              <el-input v-model="searchForm.model"
            <el-form-item label="规格型号" prop="model">
              <el-input
                v-model="searchForm.model"
                        style="width: 240px"
                        placeholder="请输入"
                        clearable />
                clearable
              />
            </el-form-item>
          </el-col>
          <el-col :span="4">
            <el-form-item label="批号"
                          prop="batchNo">
              <el-input v-model="searchForm.batchNo"
            <el-form-item label="批号" prop="batchNo">
              <el-input
                v-model="searchForm.batchNo"
                        style="width: 240px"
                        placeholder="请输入"
                        clearable />
                clearable
              />
            </el-form-item>
          </el-col>
          <el-col :span="4">
            <el-form-item label="来源"
                          prop="recordType">
              <el-select v-model="searchForm.recordType"
            <el-form-item label="来源" prop="recordType">
              <el-select
                v-model="searchForm.recordType"
                         style="width: 240px"
                         placeholder="请选择"
                         clearable>
                <el-option v-for="item in stockRecordTypeOptions"
                clearable
              >
                <el-option
                  v-for="item in stockRecordTypeOptions"
                           :key="item.value"
                           :label="item.label"
                           :value="item.value" />
                  :value="item.value"
                />
              </el-select>
            </el-form-item>
          </el-col>
          <!-- 按钮 -->
          <el-col :span="4">
            <el-form-item>
              <el-button type="primary"
                         @click="getList">
                搜索
              </el-button>
              <el-button @click="resetSearch">
                重置
              </el-button>
              <el-button type="primary" @click="getList"> 搜索 </el-button>
              <el-button @click="resetSearch"> 重置 </el-button>
            </el-form-item>
          </el-col>
        </el-row>
      </el-form>
    </div>
    <div class="actions">
      <el-button type="primary"
                 @click="handleBatchApprove">审批</el-button>
      <el-button type="primary" @click="handleBatchApprove">审批</el-button>
      <el-button @click="handleOut">导出</el-button>
      <el-button type="danger"
                 plain
                 @click="handleDelete">删除</el-button>
      <el-button type="primary"
                 plain
                 @click="handlePrint">打印</el-button>
      <el-button type="danger" plain @click="handleDelete">删除</el-button>
      <el-button type="primary" plain @click="handlePrint">打印</el-button>
    </div>
    <div class="table_list">
      <el-table :data="tableData"
      <el-table
        :data="tableData"
                border
                v-loading="tableLoading"
                @selection-change="handleSelectionChange"
                :expand-row-keys="expandedRowKeys"
                :row-key="(row) => row.id"
                style="width: 100%"
                height="calc(100vh - 18.5em)">
        <el-table-column align="center"
                         type="selection"
                         width="55" />
        <el-table-column align="center"
                         label="序号"
                         type="index"
                         width="60" />
        <el-table-column label="出库批次"
        height="calc(100vh - 18.5em)"
      >
        <el-table-column align="center" type="selection" width="55" />
        <el-table-column align="center" label="序号" type="index" width="60" />
        <el-table-column
          label="出库批次"
                         prop="outboundBatches"
                         min-width="100"
                         show-overflow-tooltip />
        <el-table-column label="出库日期"
                         prop="createTime"
                         show-overflow-tooltip />
        <el-table-column label="产品大类"
          show-overflow-tooltip
        />
        <el-table-column
          label="出库日期"
          prop="updateTime"
          show-overflow-tooltip
        />
        <el-table-column
          label="产品大类"
                         prop="productName"
                         show-overflow-tooltip />
        <el-table-column label="规格型号"
                         prop="model"
                         show-overflow-tooltip />
        <el-table-column label="批号"
                         prop="batchNo"
                         show-overflow-tooltip />
        <el-table-column label="单位"
                         prop="unit"
                         show-overflow-tooltip />
        <el-table-column label="出库数量"
          show-overflow-tooltip
        />
        <el-table-column label="规格型号" prop="model" show-overflow-tooltip />
        <el-table-column label="批号" prop="batchNo" show-overflow-tooltip />
        <el-table-column label="单位" prop="unit" show-overflow-tooltip />
        <el-table-column
          label="出库数量"
                         prop="stockOutNum"
                         show-overflow-tooltip />
        <el-table-column label="出库人"
                         prop="createBy"
                         show-overflow-tooltip />
        <el-table-column label="来源"
                         prop="recordType"
                         show-overflow-tooltip>
          show-overflow-tooltip
        />
        <el-table-column label="出库人" prop="createBy" show-overflow-tooltip />
        <el-table-column label="来源" prop="recordType" show-overflow-tooltip>
          <template #default="scope">
            {{ getRecordType(scope.row.recordType) }}
          </template>
        </el-table-column>
        <el-table-column label="审批状态"
        <el-table-column
          label="审批状态"
                         prop="approvalStatus"
                         show-overflow-tooltip>
          show-overflow-tooltip
        >
          <template #default="scope">
            <el-tag :type="getApprovalStatusTagType(scope.row.approvalStatus)"
                    size="small">
            <el-tag
              :type="getApprovalStatusTagType(scope.row.approvalStatus)"
              size="small"
            >
              {{ getApprovalStatusLabel(scope.row.approvalStatus) }}
            </el-tag>
          </template>
        </el-table-column>
      </el-table>
      <pagination v-show="total > 0"
      <pagination
        v-show="total > 0"
                  :total="total"
                  layout="total, sizes, prev, pager, next, jumper"
                  :page="page.current"
                  :limit="page.size"
                  @pagination="paginationChange" />
        @pagination="paginationChange"
      />
    </div>
  </div>
</template>
@@ -216,7 +211,7 @@
    getList();
  };

  const paginationChange = obj => {
const paginationChange = (obj) => {
    page.current = obj.page;
    page.size = obj.limit;
    getList();
@@ -228,10 +223,10 @@
      ...page,
      topParentProductId: props.topParentProductId,
    })
      .then(res => {
    .then((res) => {
        tableLoading.value = false;
        tableData.value = res.data.records;
        tableData.value.map(item => {
      tableData.value.map((item) => {
          item.children = [];
        });
        total.value = res.data.total;
@@ -241,9 +236,9 @@
      });
  };

  const getRecordType = recordType => {
const getRecordType = (recordType) => {
    return (
      stockRecordTypeOptions.value.find(item => item.value === recordType)
    stockRecordTypeOptions.value.find((item) => item.value === recordType)
        ?.label || ""
    );
  };
@@ -261,7 +256,7 @@
    REJECTED: "驳回",
  };

  const getApprovalStatusLabel = status => {
const getApprovalStatusLabel = (status) => {
    if (status === null || status === undefined || status === "") {
      return "待审批";
    }
@@ -269,7 +264,7 @@
  };

  // 通过/驳回固定色；其余（含待审批、空值、未映射但文案为待审批）统一用 warning 预警色
  const getApprovalStatusTagType = status => {
const getApprovalStatusTagType = (status) => {
    if (
      status === 1 ||
      status === "1" ||
@@ -290,20 +285,20 @@
  // 获取来源类型选项
  const fetchStockRecordTypeOptions = () => {
    if (props.type === "0") {
      findAllQualifiedStockOutRecordTypeOptions().then(res => {
    findAllQualifiedStockOutRecordTypeOptions().then((res) => {
        stockRecordTypeOptions.value = res.data;
      });
      return;
    }
    findAllUnQualifiedStockOutRecordTypeOptions().then(res => {
  findAllUnQualifiedStockOutRecordTypeOptions().then((res) => {
      stockRecordTypeOptions.value = res.data;
    });
  };

  // 表格选择数据
  const handleSelectionChange = selection => {
const handleSelectionChange = (selection) => {
    // 过滤掉子数据
    selectedRows.value = selection.filter(item => item.id);
  selectedRows.value = selection.filter((item) => item.id);
    console.log("selection", selectedRows.value);
  };
  const expandedRowKeys = ref([]);
@@ -313,7 +308,7 @@
      proxy.$modal.msgWarning("请选择数据");
      return;
    }
    const ids = selectedRows.value.map(item => item.id);
  const ids = selectedRows.value.map((item) => item.id);
    ElMessageBox.confirm("请选择审批结果", "审批", {
      confirmButtonText: "通过",
      cancelButtonText: "驳回",
@@ -330,7 +325,7 @@
            proxy.$modal.msgError("审批通过失败");
          });
      })
      .catch(action => {
    .catch((action) => {
        if (action === "cancel") {
          batchApproveStockOutRecords({ ids, approvalStatus: 2 })
            .then(() => {
@@ -369,7 +364,7 @@
  const handleDelete = () => {
    let ids = [];
    if (selectedRows.value.length > 0) {
      ids = selectedRows.value.map(item => item.id);
    ids = selectedRows.value.map((item) => item.id);
    } else {
      proxy.$modal.msgWarning("请选择数据");
      return;
@@ -380,7 +375,7 @@
      type: "warning",
    })
      .then(() => {
        delPendingStockOut(ids).then(res => {
      delPendingStockOut(ids).then((res) => {
          proxy.$modal.msgSuccess("删除成功");
          getList();
        });
@@ -659,7 +654,7 @@
  };

  // 格式化日期
  const formatDate = dateString => {
const formatDate = (dateString) => {
    if (!dateString) return getCurrentDate();
    const date = new Date(dateString);
    const year = date.getFullYear();
@@ -669,7 +664,7 @@
  };

  // 格式化日期时间
  const formatDateTime = date => {
const formatDateTime = (date) => {
    const year = date.getFullYear();
    const month = String(date.getMonth() + 1).padStart(2, "0");
    const day = String(date.getDate()).padStart(2, "0");

 src/views/officeProcessAutomation/ApproveManage/approve-list/approveListConstants.js

@@ -473,12 +473,13 @@
}

/** 组装审批提交 DTO */
export function buildApproveInstanceDto(row, uiResult, comment) {
export function buildApproveInstanceDto(row, uiResult, comment, extraData = {}) {
  const opinion = (comment || "").trim();
  return {
    id: row?.id,
    approveAction: mapApproveActionToApi(uiResult),
    approveComment: opinion || (uiResult === "approved" ? "同意" : ""),
    ...extraData,
  };
}


 src/views/officeProcessAutomation/ApproveManage/approve-list/components/ApproveDetailPanel.vue

@@ -3,32 +3,44 @@
  <div class="approve-detail-panel">
    <div class="detail-block">
      <div class="detail-block-title">基本信息</div>
      <el-descriptions :column="2"
                       border>
        <el-descriptions-item label="业务单号">{{ row.bizId || row.id || "—" }}</el-descriptions-item>
      <el-descriptions :column="2" border>
        <el-descriptions-item label="业务单号">{{
          row.bizId || row.id || "—"
        }}</el-descriptions-item>
        <el-descriptions-item label="审批状态">
          <el-tag :type="approvalStatusTagType(row.approvalStatus)"
          <el-tag
            :type="approvalStatusTagType(row.approvalStatus)"
                  size="small"
                  effect="plain">
            effect="plain"
          >
            {{ approvalStatusLabel(row.approvalStatus) }}
          </el-tag>
        </el-descriptions-item>
        <el-descriptions-item label="审批类型">
          <span class="approve-type-cell"
                :style="approvalTypeStyle(row.approvalType)">
          <span
            class="approve-type-cell"
            :style="approvalTypeStyle(row.approvalType)"
          >
            {{ approvalTypeLabel(row.approvalType) }}
          </span>
        </el-descriptions-item>
        <el-descriptions-item label="申请人编号">{{ row.applicantNo || "—" }}</el-descriptions-item>
        <el-descriptions-item label="申请人名称">{{ row.applicantName || "—" }}</el-descriptions-item>
        <el-descriptions-item label="申请摘要">{{ row.summary || "—" }}</el-descriptions-item>
        <el-descriptions-item v-if="row.rejectReason"
        <el-descriptions-item label="申请人编号">{{
          row.applicantNo || "—"
        }}</el-descriptions-item>
        <el-descriptions-item label="申请人名称">{{
          row.applicantName || "—"
        }}</el-descriptions-item>
        <el-descriptions-item label="申请摘要">{{
          row.summary || "—"
        }}</el-descriptions-item>
        <el-descriptions-item
          v-if="row.rejectReason"
                              label="驳回原因"
                              :span="2">
          :span="2"
        >
          <span class="reject-text">{{ row.rejectReason }}</span>
        </el-descriptions-item>
        <el-descriptions-item label="创建时间"
                              :span="2">
        <el-descriptions-item label="创建时间" :span="2">
          {{ formatDisplayTime(row.createTime) }}
        </el-descriptions-item>
      </el-descriptions>
@@ -36,36 +48,81 @@
    <div class="detail-block">
      <div class="detail-block-title">填报内容</div>
      <!-- 默认表单展示 -->
      <FormPayloadFields v-if="!isSpecialApprovalType"
      <FormPayloadFields
        v-if="!isSpecialApprovalType"
                         :fields="formResolved.fields"
                         :form-payload="formResolved.formPayload"
                         readonly />
        readonly
      />
      
      <!-- 发货审批详情 -->
      <template v-else-if="row.businessType === 7">
        <div v-if="detailData.shippingInfo" class="shipment-detail">
          <el-divider content-position="left">发货详情</el-divider>
          <el-descriptions :column="2" border>
            <el-descriptions-item label="销售订单">{{ detailData.shippingInfo.salesContractNo || "--" }}</el-descriptions-item>
            <el-descriptions-item label="发货订单号">{{ detailData.shippingInfo.shippingNo || "--" }}</el-descriptions-item>
            <el-descriptions-item label="客户名称">{{ detailData.shippingInfo.customerName || "--" }}</el-descriptions-item>
            <el-descriptions-item label="发货类型">{{ detailData.shippingInfo.type || "--" }}</el-descriptions-item>
            <el-descriptions-item label="发货日期">{{ detailData.shippingInfo.shippingDateDate || "--" }}</el-descriptions-item>
            <el-descriptions-item label="审核状态">{{ detailData.shippingInfo.status || "--" }}</el-descriptions-item>
            <el-descriptions-item label="发货车牌号">{{ detailData.shippingInfo.shippingCarNumber || "--" }}</el-descriptions-item>
            <el-descriptions-item label="快递公司">{{ detailData.shippingInfo.expressCompany || "--" }}</el-descriptions-item>
            <el-descriptions-item label="快递单号" :span="2">{{ detailData.shippingInfo.expressNumber || "--" }}</el-descriptions-item>
            <el-descriptions-item label="销售订单">{{
              detailData.shippingInfo.salesContractNo || "--"
            }}</el-descriptions-item>
            <el-descriptions-item label="出库批号">{{
              detailData.shippingInfo.outboundBatches || "--"
            }}</el-descriptions-item>
            <el-descriptions-item label="客户名称">{{
              detailData.shippingInfo.customerName || "--"
            }}</el-descriptions-item>
            <el-descriptions-item label="发货类型">{{
              detailData.shippingInfo.type || "--"
            }}</el-descriptions-item>
            <el-descriptions-item label="发货日期">{{
              detailData.shippingInfo.shippingDateDate || "--"
            }}</el-descriptions-item>
            <el-descriptions-item label="审核状态">{{
              detailData.shippingInfo.status || "--"
            }}</el-descriptions-item>
            <el-descriptions-item label="发货车牌号">{{
              detailData.shippingInfo.shippingCarNumber || "--"
            }}</el-descriptions-item>
            <el-descriptions-item label="快递公司">{{
              detailData.shippingInfo.expressCompany || "--"
            }}</el-descriptions-item>
            <el-descriptions-item label="快递单号" :span="2">{{
              detailData.shippingInfo.expressNumber || "--"
            }}</el-descriptions-item>
          </el-descriptions>
          <div v-if="detailData.shippingProductDetailDtoList.length" style="margin-top: 20px;">
          <div
            v-if="detailData.shippingProductDetailDtoList.length"
            style="margin-top: 20px"
          >
            <h4>产品明细</h4>
            <el-table :data="detailData.shippingProductDetailDtoList"
            <el-table
              :data="detailData.shippingProductDetailDtoList"
                      border
                      size="small"
                      style="width: 100%">
              <el-table-column label="批号" prop="batchNo" min-width="160" show-overflow-tooltip />
              <el-table-column label="产品名称" prop="productName" min-width="160" show-overflow-tooltip />
              <el-table-column label="规格型号" prop="specificationModel" min-width="160" show-overflow-tooltip />
              <el-table-column label="发货数量" prop="deliveryQuantity" min-width="120" align="center" />
              style="width: 100%"
            >
              <el-table-column
                label="批号"
                prop="batchNo"
                min-width="160"
                show-overflow-tooltip
              />
              <el-table-column
                label="产品名称"
                prop="productName"
                min-width="160"
                show-overflow-tooltip
              />
              <el-table-column
                label="规格型号"
                prop="specificationModel"
                min-width="160"
                show-overflow-tooltip
              />
              <el-table-column
                label="发货数量"
                prop="deliveryQuantity"
                min-width="120"
                align="center"
              />
            </el-table>
          </div>
        </div>
@@ -76,33 +133,53 @@
        <div v-if="detailData" class="procurement-detail">
          <el-divider content-position="left">采购详情</el-divider>
          <el-descriptions :column="2" border>
            <el-descriptions-item label="采购合同号">{{ detailData.purchaseContractNumber || "--" }}</el-descriptions-item>
            <el-descriptions-item label="供应商名称">{{ detailData.supplierName || "--" }}</el-descriptions-item>
            <el-descriptions-item label="项目名称">{{ detailData.projectName || "--" }}</el-descriptions-item>
            <el-descriptions-item label="销售合同号">{{ detailData.salesContractNo || "--" }}</el-descriptions-item>
            <el-descriptions-item label="签订日期">{{ detailData.executionDate || "--" }}</el-descriptions-item>
            <el-descriptions-item label="录入日期">{{ detailData.entryDate || "--" }}</el-descriptions-item>
            <el-descriptions-item label="付款方式">{{ detailData.paymentMethod || "--" }}</el-descriptions-item>
            <el-descriptions-item label="采购合同号">{{
              detailData.purchaseContractNumber || "--"
            }}</el-descriptions-item>
            <el-descriptions-item label="供应商名称">{{
              detailData.supplierName || "--"
            }}</el-descriptions-item>
            <el-descriptions-item label="项目名称">{{
              detailData.projectName || "--"
            }}</el-descriptions-item>
            <el-descriptions-item label="销售合同号">{{
              detailData.salesContractNo || "--"
            }}</el-descriptions-item>
            <el-descriptions-item label="签订日期">{{
              detailData.executionDate || "--"
            }}</el-descriptions-item>
            <el-descriptions-item label="录入日期">{{
              detailData.entryDate || "--"
            }}</el-descriptions-item>
            <el-descriptions-item label="付款方式">{{
              detailData.paymentMethod || "--"
            }}</el-descriptions-item>
            <el-descriptions-item label="合同金额" :span="2">
              <span style="font-size: 18px; color: #e6a23c; font-weight: bold;">
              <span style="font-size: 18px; color: #e6a23c; font-weight: bold">
                ¥{{ Number(detailData.contractAmount ?? 0).toFixed(2) }}
              </span>
            </el-descriptions-item>
          </el-descriptions>
          <div v-if="detailData.productData.length" style="margin-top: 20px;">
          <div v-if="detailData.productData.length" style="margin-top: 20px">
            <h4>产品明细</h4>
            <el-table :data="detailData.productData"
                      border
                      style="width: 100%">
            <el-table :data="detailData.productData" border style="width: 100%">
              <el-table-column prop="productCategory" label="产品名称" />
              <el-table-column prop="specificationModel" label="规格型号" />
              <el-table-column prop="unit" label="单位" />
              <el-table-column prop="quantity" label="数量" />
              <el-table-column prop="taxInclusiveUnitPrice" label="含税单价">
                <template #default="scope">¥{{ Number(scope.row.taxInclusiveUnitPrice ?? 0).toFixed(2) }}</template>
                <template #default="scope"
                  >¥{{
                    Number(scope.row.taxInclusiveUnitPrice ?? 0).toFixed(2)
                  }}</template
                >
              </el-table-column>
              <el-table-column prop="taxInclusiveTotalPrice" label="含税总价">
                <template #default="scope">¥{{ Number(scope.row.taxInclusiveTotalPrice ?? 0).toFixed(2) }}</template>
                <template #default="scope"
                  >¥{{
                    Number(scope.row.taxInclusiveTotalPrice ?? 0).toFixed(2)
                  }}</template
                >
              </el-table-column>
            </el-table>
          </div>
@@ -114,63 +191,83 @@
        <div v-if="detailData" class="quotation-detail">
          <el-divider content-position="left">报价详情</el-divider>
          <el-descriptions :column="2" border>
            <el-descriptions-item label="报价单号">{{ detailData.quotationNo || "--" }}</el-descriptions-item>
            <el-descriptions-item label="客户名称">{{ detailData.customer || "--" }}</el-descriptions-item>
            <el-descriptions-item label="业务员">{{ detailData.salesperson || "--" }}</el-descriptions-item>
            <el-descriptions-item label="报价日期">{{ detailData.quotationDate || "--" }}</el-descriptions-item>
            <el-descriptions-item label="有效期至">{{ detailData.validDate || "--" }}</el-descriptions-item>
            <el-descriptions-item label="付款方式">{{ detailData.paymentMethod || "--" }}</el-descriptions-item>
            <el-descriptions-item label="报价单号">{{
              detailData.quotationNo || "--"
            }}</el-descriptions-item>
            <el-descriptions-item label="客户名称">{{
              detailData.customer || "--"
            }}</el-descriptions-item>
            <el-descriptions-item label="业务员">{{
              detailData.salesperson || "--"
            }}</el-descriptions-item>
            <el-descriptions-item label="报价日期">{{
              detailData.quotationDate || "--"
            }}</el-descriptions-item>
            <el-descriptions-item label="有效期至">{{
              detailData.validDate || "--"
            }}</el-descriptions-item>
            <el-descriptions-item label="付款方式">{{
              detailData.paymentMethod || "--"
            }}</el-descriptions-item>
            <el-descriptions-item label="报价总额" :span="2">
              <span style="font-size: 18px; color: #e6a23c; font-weight: bold;">
              <span style="font-size: 18px; color: #e6a23c; font-weight: bold">
                ¥{{ Number(detailData.totalAmount ?? 0).toFixed(2) }}
              </span>
            </el-descriptions-item>
          </el-descriptions>
          <div v-if="detailData.products?.length" style="margin-top: 20px;">
          <div v-if="detailData.products?.length" style="margin-top: 20px">
            <h4>产品明细</h4>
            <el-table :data="detailData.products"
                      border
                      style="width: 100%">
            <el-table :data="detailData.products" border style="width: 100%">
              <el-table-column prop="product" label="产品名称" />
              <el-table-column prop="specification" label="规格型号" />
              <el-table-column prop="unit" label="单位" />
              <el-table-column prop="unitPrice" label="单价">
                <template #default="scope">¥{{ Number(scope.row.unitPrice ?? 0).toFixed(2) }}</template>
                <template #default="scope"
                  >¥{{ Number(scope.row.unitPrice ?? 0).toFixed(2) }}</template
                >
              </el-table-column>
            </el-table>
          </div>
          <div v-if="detailData.remark" style="margin-top: 20px;">
          <div v-if="detailData.remark" style="margin-top: 20px">
            <h4>备注</h4>
            <p>{{ detailData.remark }}</p>
          </div>
        </div>
      </template>
    </div>
    <div v-if="attachmentList.length"
         class="detail-block">
    <div v-if="attachmentList.length" class="detail-block">
      <div class="detail-block-title">附件列表</div>
      <div class="attachment-list">
        <div v-for="file in attachmentList"
        <div
          v-for="file in attachmentList"
             :key="file.id"
             class="attachment-item">
          class="attachment-item"
        >
          <el-icon class="file-icon">
            <Paperclip />
          </el-icon>
          <span class="file-name"
                :title="file.name || file.originalFilename">
          <span class="file-name" :title="file.name || file.originalFilename">
            {{ file.name || file.originalFilename }}
          </span>
          <div class="file-actions">
            <el-link v-if="file.previewURL || file.url"
            <el-link
              v-if="file.previewURL || file.url"
                     type="primary"
                     :underline="false"
                     @click="openFile(file.previewURL || file.url)">预览</el-link>
            <el-divider v-if="(file.previewURL || file.url) && file.downloadURL"
                        direction="vertical" />
            <el-link v-if="file.downloadURL"
              @click="openFile(file.previewURL || file.url)"
              >预览</el-link
            >
            <el-divider
              v-if="(file.previewURL || file.url) && file.downloadURL"
              direction="vertical"
            />
            <el-link
              v-if="file.downloadURL"
                     type="primary"
                     :underline="false"
                     @click="openFile(file.downloadURL)">下载</el-link>
              @click="openFile(file.downloadURL)"
              >下载</el-link
            >
          </div>
        </div>
      </div>
@@ -197,7 +294,6 @@
  });

  const formResolved = computed(() => resolveInstanceFormFields(props.row));


  // 是否为特殊审批类型（采购、发货、报价）
  const isSpecialApprovalType = computed(() => {

 src/views/officeProcessAutomation/ApproveManage/approve-list/useApproveList.js

@@ -664,8 +664,13 @@
    if (approveSubmitting.value) return { ok: false };
    approveSubmitting.value = true;
    try {
      // 发货审批时传递出库批号
      const extraData = {};
      if (Number(row.businessType) === 7 && detailData.value?.shippingInfo?.outboundBatches) {
        extraData.outboundBatches = detailData.value.shippingInfo.outboundBatches;
      }
      await approveApprovalInstance(
        buildApproveInstanceDto(row, result, approveOpinion.value)
        buildApproveInstanceDto(row, result, approveOpinion.value, extraData)
      );
      approveDialog.visible = false;
      await fetchApprovalList();

 src/views/salesManagement/salesLedger/index.vue

@@ -1083,6 +1083,15 @@
              />
            </el-form-item>
          </el-col>
          <el-col :span="24" v-if="deliveryForm.type === '货车'">
            <el-form-item label="出库批号：" prop="outboundBatches">
              <el-input
                v-model="deliveryForm.outboundBatches"
                placeholder="请输入出库批号"
                clearable
              />
            </el-form-item>
          </el-col>
          <el-col :span="24" v-else>
            <el-form-item label="快递公司：" prop="expressCompany">
              <el-input
@@ -1421,6 +1430,7 @@
    expressCompany: "",
    expressNumber: "",
    type: "货车", // 货车, 快递
    outboundBatches: "",
  },
  deliveryRules: {
    shippingCarNumber: [
@@ -2880,6 +2890,7 @@
    type: "货车",
    batchNo: [],
    batchNoList,
    outboundBatches: "",
  };
  deliveryFileList.value = [];
  deliveryFormVisible.value = true;
@@ -2923,6 +2934,10 @@
          deliveryForm.value.type === "货车"
            ? deliveryForm.value.shippingCarNumber
            : "",
        outboundBatches:
          deliveryForm.value.type === "货车"
            ? deliveryForm.value.outboundBatches
            : "",
        expressCompany:
          deliveryForm.value.type === "快递"
            ? deliveryForm.value.expressCompany