product-inventory-management.git

			@@ -24,6 +24,18 @@
			prefix-icon="Search"
			@change="handleQuery" />
			</el-form-item>
			<el-form-item label="销售类型：">
			<el-select v-model="searchForm.stockType"
			placeholder="请选择"
			clearable
			@change="handleQuery"
			style="width: 150px">
			<el-option label="非废品销售"
			value="qualified" />
			<el-option label="废品销售"
			value="waste" />
			</el-select>
			</el-form-item>
			<el-form-item label="录入日期：">
			<el-date-picker v-model="searchForm.entryDate"
			value-format="YYYY-MM-DD"
			@@ -49,14 +61,15 @@
			</el-button>
			<el-button type="primary"
			plain
			@click="handleImport">导入</el-button>
			@click="handleImport">导入
			</el-button>
			<el-button @click="handleOut">导出</el-button>
			<el-button type="danger"
			plain
			@click="handleDelete">删除</el-button>
			@click="handleDelete">删除 </el-button>
			<el-button type="primary"
			plain
			@click="handlePrint">打印</el-button>
			@click="handlePrint">打印 </el-button>
			</div>
			</div>
			<el-table :data="tableData"
			@@ -82,7 +95,9 @@
			<el-table :data="props.row.children"
			border
			show-summary
			:summary-method="(param) => summarizeChildrenTable(param, props.row)">
			:summary-method="
			(param) => summarizeChildrenTable(param, props.row)
			">
			<el-table-column align="center"
			label="序号"
			type="index" />
			@@ -96,12 +111,17 @@
			width="100px"
			align="center">
			<template #default="scope">
			<el-tag v-if="scope.row.approveStatus === 1 && (!scope.row.shippingDate \|\| !scope.row.shippingCarNumber)"
			type="success">充足</el-tag>
			<el-tag v-else-if="scope.row.approveStatus === 0 && (scope.row.shippingDate \|\| scope.row.shippingCarNumber)"
			type="success">已出库</el-tag>
			<el-tag v-if="scope.row.approveStatus === 1"
			type="success">充足
			</el-tag>
			<el-tag v-else-if="
			scope.row.approveStatus === 0 &&
			scope.row.noQuantity === 0
			"
			type="success">已出库
			</el-tag>
			<el-tag v-else
			type="danger">不足</el-tag>
			type="danger">不足 </el-tag>
			</template>
			</el-table-column>
			<el-table-column label="发货状态"
			@@ -112,6 +132,13 @@
			size="small">
			{{ getShippingStatusText(scope.row) }}
			</el-tag>
			</template>
			</el-table-column>
			<el-table-column label="审批中数量"
			width="120"
			align="center">
			<template #default="scope">
			<span>{{ scope.row.pendingApprovalQuantity \|\| 0 }}</span>
			</template>
			</el-table-column>
			<el-table-column label="快递公司"
			@@ -126,9 +153,10 @@
			<template #default="scope">
			<div>
			<el-tag type="success"
			v-if="scope.row.shippingCarNumber">{{ scope.row.shippingCarNumber }}</el-tag>
			v-if="scope.row.shippingCarNumber">{{ scope.row.shippingCarNumber }}
			</el-tag>
			<el-tag v-else
			type="info">-</el-tag>
			type="info">- </el-tag>
			</div>
			</template>
			</el-table-column>
			@@ -137,14 +165,24 @@
			align="center">
			<template #default="scope">
			<div>
			<div v-if="scope.row.shippingDate">{{ scope.row.shippingDate }}</div>
			<div v-if="scope.row.shippingDate">
			{{ scope.row.shippingDate }}
			</div>
			<el-tag v-else
			type="info">-</el-tag>
			type="info">- </el-tag>
			</div>
			</template>
			</el-table-column>
			<el-table-column label="数量"
			prop="quantity" />
			<el-table-column label="待发货数量"
			prop="noQuantity" />
			<el-table-column label="运费单价(元)"
			prop="freightUnitPrice"
			:formatter="sensitiveAmountFormatter" />
			<el-table-column label="总运费(元)"
			prop="totalFreight"
			:formatter="sensitiveAmountFormatter" />
			<el-table-column label="税率(%)"
			prop="taxRate" />
			<el-table-column label="含税单价(元)"
			@@ -188,6 +226,16 @@
			prop="salesman"
			width="100"
			show-overflow-tooltip />
			<el-table-column label="销售类型"
			prop="stockType"
			width="120"
			align="center">
			<template #default="scope">
			<el-tag :type="scope.row.stockType === 'waste' ? 'warning' : 'success'">
			{{ scope.row.stockType === 'waste' ? '废品销售' : '非废品销售' }}
			</el-tag>
			</template>
			</el-table-column>
			<el-table-column label="项目名称"
			prop="projectName"
			width="180"
			@@ -222,16 +270,26 @@
			show-overflow-tooltip />
			<el-table-column fixed="right"
			label="操作"
			width="130"
			width="220"
			align="center">
			<template #default="scope">
			<el-button link
			type="primary"
			@click="openForm('edit', scope.row)"
			:disabled="!scope.row.isEdit \|\| scope.row.hasProductionRecord \|\| !canEditLedger(scope.row)">编辑</el-button>
			@click="openForm('view', scope.row)">详情
			</el-button>
			<el-button link
			type="primary"
			@click="downLoadFile(scope.row)">附件</el-button>
			@click="openForm('edit', scope.row)"
			:disabled="
			!scope.row.isEdit \|\|
			scope.row.hasProductionRecord \|\|
			!canEditLedger(scope.row)
			">编辑
			</el-button>
			<el-button link
			type="primary"
			@click="openFileDialog(scope.row)">附件
			</el-button>
			</template>
			</el-table-column>
			</el-table>
			@@ -243,7 +301,13 @@
			@pagination="paginationChange" />
			</div>
			<FormDialog v-model="dialogFormVisible"
			:title="operationType === 'add' ? '新增销售台账页面' : '编辑销售台账页面'"
			:title="
			operationType === 'add'
			? '新增销售台账页面'
			: operationType === 'edit'
			? '编辑销售台账页面'
			: '销售台账详情'
			"
			:width="'70%'"
			:operation-type="operationType"
			@close="closeDia"
			@@ -256,9 +320,9 @@
			ref="formRef">
			<!-- 报价单导入入口：放在表单顶部，选择后反显客户/业务员等 -->
			<el-row v-if="operationType === 'add'"
			style="margin-bottom: 10px;">
			style="margin-bottom: 10px">
			<el-col :span="24"
			style="text-align: right;">
			style="text-align: right">
			<el-button type="primary"
			plain
			@click="openQuotationDialog">
			@@ -270,10 +334,24 @@
			<el-col :span="12">
			<el-form-item label="销售合同号："
			prop="salesContractNo">
			<el-input v-model="form.salesContractNo"
			placeholder="自动生成"
			clearable
			disabled />
			<div style="
			display: flex;
			align-items: center;
			gap: 12px;
			width: 100%;
			">
			<el-checkbox v-model="form.autoGenerateContractNo"
			v-if="operationType === 'add'">自动生成
			</el-checkbox>
			<el-input v-model="form.salesContractNo"
			:placeholder="
			form.autoGenerateContractNo ? '保存后自动生成' : '请输入'
			"
			clearable
			:disabled="
			form.autoGenerateContractNo \|\| operationType === 'view'
			" />
			</div>
			</el-form-item>
			</el-col>
			<el-col :span="12">
			@@ -321,6 +399,21 @@
			:disabled="operationType === 'view'" />
			</el-form-item>
			</el-col>
			<el-col :span="12">
			<el-form-item label="销售类型："
			prop="stockType">
			<el-select v-model="form.stockType"
			placeholder="请选择"
			clearable
			:disabled="operationType === 'view'"
			style="width: 100%">
			<el-option label="非废品销售"
			value="qualified" />
			<el-option label="废品销售"
			value="waste" />
			</el-select>
			</el-form-item>
			</el-col>
			</el-row>
			<el-row :gutter="30">
			<el-col :span="12">
			@@ -355,6 +448,7 @@
			:reserve-keyword="false"
			placeholder="请选择"
			clearable
			:disabled="operationType === 'view'"
			@change="changs">
			<el-option v-for="item in userList"
			:key="item.userId"
			@@ -372,7 +466,8 @@
			format="YYYY-MM-DD"
			type="date"
			placeholder="请选择"
			clearable />
			clearable
			:disabled="operationType === 'view'" />
			</el-form-item>
			</el-col>
			</el-row>
			@@ -386,7 +481,8 @@
			format="YYYY-MM-DD"
			type="date"
			placeholder="请选择"
			clearable />
			clearable
			:disabled="operationType === 'view'" />
			</el-form-item>
			</el-col>
			</el-row>
			@@ -395,11 +491,13 @@
			prop="entryDate">
			<el-button v-if="operationType !== 'view'"
			type="primary"
			@click="openProductForm('add')">添加</el-button>
			@click="openProductForm('add')">添加
			</el-button>
			<el-button v-if="operationType !== 'view'"
			plain
			type="danger"
			@click="deleteProduct">删除</el-button>
			@click="deleteProduct">删除
			</el-button>
			</el-form-item>
			</el-row>
			<el-table :data="productData"
			@@ -424,6 +522,12 @@
			prop="unit" />
			<el-table-column label="数量"
			prop="quantity" />
			<el-table-column label="运费单价(元)"
			prop="freightUnitPrice"
			:formatter="formattedNumber" />
			<el-table-column label="总运费(元)"
			prop="totalFreight"
			:formatter="formattedNumber" />
			<el-table-column label="税率(%)"
			prop="taxRate" />
			<el-table-column label="含税单价(元)"
			@@ -440,7 +544,7 @@
			width="150">
			<template #default="scope">
			<el-tag :type="scope.row.isProduction ? 'success' : 'info'">
			{{ scope.row.isProduction ? '是' : '否' }}
			{{ scope.row.isProduction ? "是" : "否" }}
			</el-tag>
			</template>
			</el-table-column>
			@@ -454,7 +558,8 @@
			type="primary"
			size="small"
			:disabled="isProductShipped(scope.row)"
			@click="openProductForm('edit', scope.row,scope.$index)">编辑</el-button>
			@click="openProductForm('edit', scope.row, scope.$index)">编辑
			</el-button>
			</template>
			</el-table-column>
			</el-table>
			@@ -471,11 +576,13 @@
			</el-form-item>
			</el-col>
			</el-row>
			<el-row :gutter="30">
			<el-row v-if="operationType !== 'view'"
			:gutter="30">
			<el-col :span="24">
			<el-form-item label="附件材料："
			prop="salesLedgerFiles">
			<FileUpload v-model:file-list="fileList" />
			<FileUpload v-model:file-list="fileList"
			:disabled="operationType === 'view'" />
			</el-form-item>
			</el-col>
			</el-row>
			@@ -486,19 +593,24 @@
			title="选择审批通过的销售报价单"
			width="80%"
			:close-on-click-modal="false">
			<div style="margin-bottom: 12px; display:flex; gap: 12px; align-items:center;">
			<div style="
			margin-bottom: 12px;
			display: flex;
			gap: 12px;
			align-items: center;
			">
			<el-input v-model="quotationSearchForm.quotationNo"
			placeholder="请输入报价单号"
			clearable
			style="max-width: 260px;"
			style="max-width: 260px"
			@change="fetchQuotationList" />
			<el-input v-model="quotationSearchForm.customer"
			placeholder="请输入客户名称"
			clearable
			style="max-width: 260px;"
			style="max-width: 260px"
			@change="fetchQuotationList" />
			<el-button type="primary"
			@click="fetchQuotationList">搜索</el-button>
			@click="fetchQuotationList">搜索 </el-button>
			<el-button @click="resetQuotationSearch">重置</el-button>
			</div>
			<el-table :data="quotationList"
			@@ -544,7 +656,8 @@
			<template #default="scope">
			<el-button type="primary"
			link
			@click="applyQuotation(scope.row)">选择</el-button>
			@click="applyQuotation(scope.row)">选择
			</el-button>
			</template>
			</el-table-column>
			</el-table>
			@@ -619,12 +732,10 @@
			placeholder="请选择"
			clearable
			@change="calculateFromTaxRate">
			<el-option label="1"
			value="1" />
			<el-option label="6"
			value="6" />
			<el-option label="13"
			value="13" />
			<el-option v-for="dict in tax_rate"
			:key="dict.value"
			:label="dict.label"
			:value="dict.value" />
			</el-select>
			</el-form-item>
			</el-col>
			@@ -652,8 +763,33 @@
			placeholder="请输入"
			clearable
			:precision="2"
			@change="calculateFromQuantity"
			@change="handleQuantityChange"
			style="width: 100%" />
			</el-form-item>
			</el-col>
			</el-row>
			<el-row :gutter="30">
			<el-col :span="12">
			<el-form-item label="运费单价(元)：">
			<el-input-number :step="0.01"
			:min="0"
			v-model="productForm.freightUnitPrice"
			style="width: 100%"
			:precision="2"
			placeholder="请输入"
			clearable
			@change="handleFreightUnitPriceChange" />
			</el-form-item>
			</el-col>
			<el-col :span="12">
			<el-form-item label="总运费(元)：">
			<el-input-number :step="0.01"
			:min="0"
			v-model="productForm.totalFreight"
			style="width: 100%"
			:precision="2"
			placeholder="请输入"
			clearable />
			</el-form-item>
			</el-col>
			</el-row>
			@@ -725,24 +861,24 @@
			:auto-upload="false"
			drag>
			<i class="el-icon-upload"></i>
			<div class="el-upload__text">
			将文件拖到此处，或<em>点击上传</em>
			</div>
			<div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
			<template #tip>
			<div class="el-upload__tip">
			仅支持 xls/xlsx，大小不超过 10MB。
			<el-button link
			type="primary"
			@click="downloadTemplate">下载导入模板</el-button>
			@click="downloadTemplate">下载导入模板
			</el-button>
			</div>
			</template>
			</el-upload>
			</FormDialog>
			<!-- // todo 附件预览相关 -->
			<!-- // todo 附件预览相关 -->
			<!-- 附件列表弹窗 -->
			<FileListDialog ref="fileListRef"
			v-model="fileListDialogVisible"
			title="附件列表" />
			<FileList v-if="fileDialogVisible"
			v-model:visible="fileDialogVisible"
			record-type="sales_ledger"
			:record-id="recordId" />
			<!-- 打印预览弹窗 -->
			<el-dialog v-model="printPreviewVisible"
			title="打印预览"
			@@ -752,16 +888,23 @@
			<div class="print-preview-container">
			<div class="print-preview-header">
			<el-button type="primary"
			@click="executePrint">执行打印</el-button>
			@click="executePrint">执行打印 </el-button>
			<el-button @click="printPreviewVisible = false">关闭预览</el-button>
			</div>
			<div class="print-preview-content">
			<div v-if="printData.length === 0"
			style="text-align: center; padding: 50px; color: #999;">
			style="text-align: center; padding: 50px; color: #999">
			暂无打印数据
			</div>
			<div v-else
			style="text-align: center; padding: 10px; color: #666; font-size: 14px; background: #e8f4fd; margin-bottom: 10px;">
			style="
			text-align: center;
			padding: 10px;
			color: #666;
			font-size: 14px;
			background: #e8f4fd;
			margin-bottom: 10px;
			">
			共 {{ printData.length }} 条数据待打印
			</div>
			<div v-for="(item, index) in printData"
			@@ -806,16 +949,18 @@
			<tbody>
			<tr v-for="product in item.products"
			:key="product.id">
			<td>{{ product.productCategory \|\| '' }}</td>
			<td>{{ product.specificationModel \|\| '' }}</td>
			<td>{{ product.unit \|\| '' }}</td>
			<td>{{ product.taxInclusiveUnitPrice \|\| '0' }}</td>
			<td>{{ product.quantity \|\| '0' }}</td>
			<td>{{ product.taxInclusiveTotalPrice \|\| '0' }}</td>
			<td>{{ product.productCategory \|\| "" }}</td>
			<td>{{ product.specificationModel \|\| "" }}</td>
			<td>{{ product.unit \|\| "" }}</td>
			<td>{{ product.taxInclusiveUnitPrice \|\| "0" }}</td>
			<td>{{ product.quantity \|\| "0" }}</td>
			<td>{{ product.taxInclusiveTotalPrice \|\| "0" }}</td>
			</tr>
			<tr v-if="!item.products \|\| item.products.length === 0">
			<td colspan="6"
			style="text-align: center; color: #999;">暂无产品数据</td>
			style="text-align: center; color: #999">
			暂无产品数据
			</td>
			</tr>
			</tbody>
			<tfoot>
			@@ -824,8 +969,12 @@
			<td class="total-value"></td>
			<td class="total-value"></td>
			<td class="total-value"></td>
			<td class="total-value">{{ getTotalQuantity(item.products) }}</td>
			<td class="total-value">{{ getTotalAmount(item.products) }}</td>
			<td class="total-value">
			{{ getTotalQuantity(item.products) }}
			</td>
			<td class="total-value">
			{{ getTotalAmount(item.products) }}
			</td>
			</tr>
			</tfoot>
			</table>
			@@ -848,7 +997,9 @@
			<div class="footer-row">
			<div class="footer-item">
			<span class="label">操作员：</span>
			<span class="value">{{ userStore.nickName \|\| '撕开前' }}</span>
			<span class="value">{{
			userStore.nickName \|\| "撕开前"
			}}</span>
			</div>
			<div class="footer-item">
			<span class="label">打印日期：</span>
			@@ -877,7 +1028,8 @@
			prop="type">
			<el-select v-model="deliveryForm.type"
			placeholder="请选择发货类型"
			style="width: 100%">
			style="width: 100%"
			@change="handleDeliveryTypeChange">
			<el-option label="货车"
			value="货车" />
			<el-option label="快递"
			@@ -885,12 +1037,104 @@
			</el-select>
			</el-form-item>
			</el-col>
			<el-col :span="24">
			<el-form-item label="待发货数量：">
			<el-input :model-value="currentDeliveryRow?.noQuantity"
			disabled />
			</el-form-item>
			</el-col>
			</el-row>
			<el-row :gutter="30">
			<el-col :span="24"
			v-if="deliveryForm.type === '货车'">
			<el-form-item label="发货车牌号："
			prop="shippingCarNumber">
			<el-input v-model="deliveryForm.shippingCarNumber"
			placeholder="请输入发货车牌号"
			clearable />
			</el-form-item>
			</el-col>
			<el-col :span="24"
			v-else>
			<el-form-item label="快递公司："
			prop="expressCompany">
			<el-input v-model="deliveryForm.expressCompany"
			placeholder="请输入快递公司"
			clearable />
			</el-form-item>
			</el-col>
			</el-row>
			<el-row :gutter="30"
			v-if="deliveryForm.type === '快递'">
			<el-col :span="24">
			<el-form-item label="快递单号："
			prop="expressNumber">
			<el-input v-model="deliveryForm.expressNumber"
			placeholder="请输入快递单号"
			clearable />
			</el-form-item>
			</el-col>
			</el-row>
			<el-row :gutter="30">
			<el-col :span="24">
			<el-form-item label="发货图片：">
			<ImageUpload v-model:file-list="deliveryFileList"
			:limit="9" />
			</el-form-item>
			</el-col>
			</el-row>
			<el-row :gutter="30">
			<el-col :span="24">
			<el-form-item label="库存："
			prop="batchNo">
			<el-table :data="deliveryForm.batchNoList"
			border
			size="small"
			max-height="260"
			style="width: 100%">
			<el-table-column label="批号"
			prop="batchNo"
			min-width="180" />
			<el-table-column label="产品大类"
			prop="productName"
			min-width="100" />
			<el-table-column label="规格型号"
			prop="model"
			min-width="100" />
			<el-table-column label="单位"
			prop="unit"
			min-width="100" />
			<el-table-column label="库存数量"
			min-width="120"
			align="center">
			<template #default="scope">
			{{ getDeliveryBatchQuantity(scope.row) }}
			</template>
			</el-table-column>
			<el-table-column label="发货数量"
			min-width="160"
			align="center">
			<template #default="scope">
			<el-input-number v-model="scope.row.deliveryQuantity"
			:min="0"
			:max="getDeliveryBatchDeliveryMax(scope.row)"
			:precision="2"
			:step="0.01"
			controls-position="right"
			@change="handleDeliveryBatchQuantityChange(scope.row)"
			style="width: 100%" />
			</template>
			</el-table-column>
			</el-table>
			</el-form-item>
			</el-col>
			</el-row>
			</el-form>
			<template #footer>
			<div class="dialog-footer">
			<el-button type="primary"
			@click="submitDelivery">确认发货</el-button>
			@click="submitDelivery">确认发货
			</el-button>
			<el-button @click="closeDeliveryDia">取消</el-button>
			</div>
			</template>
			@@ -904,10 +1148,8 @@
			import { onMounted, ref, getCurrentInstance } from "vue";
			import { addShippingInfo } from "@/api/salesManagement/deliveryLedger.js";
			import { ElMessageBox, ElMessage } from "element-plus";
			import { UploadFilled, Download } from "@element-plus/icons-vue";
			import useUserStore from "@/store/modules/user";
			import { userListNoPage } from "@/api/system/user.js";
			import FileListDialog from "@/components/Dialog/FileListDialog.vue";
			import FormDialog from "@/components/Dialog/FormDialog.vue";
			import { getQuotationList } from "@/api/salesManagement/salesQuotation.js";
			import {
			@@ -922,17 +1164,25 @@
			delLedgerFile,
			getProductInventory,
			} from "@/api/salesManagement/salesLedger.js";
			import { getStockInventoryByModelId } from "@/api/inventoryManagement/stockInventory.js";
			import { getWasteByModelId } from "@/api/inventoryManagement/stockUninventory.js";
			import { modelList, productTreeList } from "@/api/basicData/product.js";
			import useFormData from "@/hooks/useFormData.js";
			import dayjs from "dayjs";
			import { getCurrentDate } from "@/utils/index.js";
			import { useRouter, useRoute } from "vue-router";
			import { listCustomerPrivatePool } from "@/api/basicData/customerFile.js";
			import FileUpload from "@/components/AttachmentUpload/file/index.vue";
			import ImageUpload from "@/components/AttachmentUpload/image/index.vue";
			import { getCurrentDate } from "@/utils/index.js";
			import { listCustomer } from "@/api/basicData/customer.js";

			const FileList = defineAsyncComponent(() =>
			import("@/components/Dialog/FileList.vue")
			);

			const router = useRouter();
			const route = useRoute();
			const userStore = useUserStore();
			const { proxy } = getCurrentInstance();
			const { tax_rate } = proxy.useDict("tax_rate");
			const tableData = ref([]);
			const productData = ref([]);
			const selectedRows = ref([]);
			@@ -948,6 +1198,7 @@
			});
			const total = ref(0);
			const fileList = ref([]);
			const deliveryFileList = ref([]);

			// 用户信息表单弹框数据
			const operationType = ref("");
			@@ -956,13 +1207,16 @@
			searchForm: {
			customerName: "", // 客户名称
			salesContractNo: "", // 销售合同编号
			stockType: "", // 销售类型
			entryDate: null, // 录入日期
			entryDateStart: undefined,
			entryDateEnd: undefined,
			},
			form: {
			salesContractNo: "",
			autoGenerateContractNo: true,
			salesman: "",
			stockType: "qualified",
			customerId: "",
			entryPerson: "",
			entryDate: "",
			@@ -971,9 +1225,11 @@
			productData: [],
			executionDate: "",
			hasProductionRecord: false,
			createTime: "",
			},
			rules: {
			salesman: [{ required: true, message: "请选择", trigger: "change" }],
			stockType: [{ required: true, message: "请选择", trigger: "change" }],
			customerId: [{ required: true, message: "请选择", trigger: "change" }],
			entryPerson: [{ required: true, message: "请选择", trigger: "change" }],
			entryDate: [{ required: true, message: "请选择", trigger: "change" }],
			@@ -993,6 +1249,8 @@
			specificationModel: "",
			unit: "",
			quantity: "",
			freightUnitPrice: "",
			totalFreight: "",
			taxInclusiveUnitPrice: "",
			taxRate: "",
			taxInclusiveTotalPrice: "",
			@@ -1048,11 +1306,114 @@
			// 发货相关
			const deliveryFormVisible = ref(false);
			const currentDeliveryRow = ref(null);
			const getDeliveryBatchQuantity = item => {
			const quantity =
			item?.qualitity ??
			item?.quantity ??
			item?.unLockedQuantity ??
			item?.qualifiedUnLockedQuantity ??
			item?.qualifiedQuantity ??
			item?.stockQuantity;
			return quantity ?? 0;
			};
			const getCurrentDeliveryRowQuantity = () => {
			return Number(currentDeliveryRow.value?.noQuantity \|\| 0);
			};
			const getDeliveryBatchDeliveryMax = row => {
			const productQuantity = getCurrentDeliveryRowQuantity();
			const batchQuantity = Number(getDeliveryBatchQuantity(row) \|\| 0);
			const otherBatchTotal = (deliveryForm.value.batchNoList \|\| []).reduce(
			(sum, item) => {
			if (item?.id === row?.id) return sum;
			return sum + Number(item?.deliveryQuantity \|\| 0);
			},
			0
			);
			const remainingProductQuantity = Math.max(
			0,
			productQuantity - otherBatchTotal
			);
			return Math.max(0, Math.min(batchQuantity, remainingProductQuantity));
			};
			const handleDeliveryBatchQuantityChange = row => {
			const productQuantity = getCurrentDeliveryRowQuantity();
			const batchQuantity = Number(getDeliveryBatchQuantity(row) \|\| 0);
			const otherBatchTotal = (deliveryForm.value.batchNoList \|\| []).reduce(
			(sum, item) => {
			if (item?.id === row?.id) return sum;
			return sum + Number(item?.deliveryQuantity \|\| 0);
			},
			0
			);
			const remainingProductQuantity = Math.max(
			0,
			productQuantity - otherBatchTotal
			);
			const currentValue = Number(row?.deliveryQuantity \|\| 0);

			if (currentValue > batchQuantity) {
			row.deliveryQuantity = batchQuantity;
			proxy.$modal.msgWarning("发货数量不能大于库存数量");
			} else if (currentValue > remainingProductQuantity) {
			row.deliveryQuantity = remainingProductQuantity;
			proxy.$modal.msgWarning("所有批次发货数量之和不能大于待发货数量");
			}
			};
			const getSelectedDeliveryBatchRows = () => {
			return (deliveryForm.value.batchNoList \|\| []).filter(
			item => Number(item?.deliveryQuantity \|\| 0) > 0
			);
			};
			const getDeliveryBatchNoList = async (productModelId, stockType) => {
			if (!productModelId) return [];
			const type = stockType === "waste" ? "waste" : "qualified";
			const res =
			type === "waste"
			? await getWasteByModelId(productModelId)
			: await getStockInventoryByModelId(productModelId);
			const rawList = Array.isArray(res?.data)
			? res.data
			: res?.data?.records \|\| res?.data?.rows \|\| [];
			const seenIds = new Set();
			return rawList
			.filter(item => {
			if (!item?.id \|\| !item?.batchNo \|\| seenIds.has(item.id)) {
			return false;
			}
			seenIds.add(item.id);
			return true;
			})
			.map(item => ({
			...item,
			deliveryQuantity: 0,
			}));
			};
			const validateDeliveryShippingCarNumber = (_rule, value, callback) => {
			if (deliveryForm.value.type === "货车" && !value) {
			return callback(new Error("请输入发货车牌号"));
			}
			callback();
			};
			const validateDeliveryExpressCompany = (_rule, value, callback) => {
			if (deliveryForm.value.type === "快递" && !value) {
			return callback(new Error("请输入快递公司"));
			}
			callback();
			};
			const deliveryFormData = reactive({
			deliveryForm: {
			shippingCarNumber: "",
			expressCompany: "",
			expressNumber: "",
			type: "货车", // 货车, 快递
			},
			deliveryRules: {
			shippingCarNumber: [
			{ validator: validateDeliveryShippingCarNumber, trigger: "blur" },
			],
			expressCompany: [
			{ validator: validateDeliveryExpressCompany, trigger: "blur" },
			],
			type: [{ required: true, message: "请选择发货类型", trigger: "change" }],
			},
			});
			@@ -1252,6 +1613,7 @@
			}
			return null; // 没有找到节点，返回null
			};

			function convertIdToValue(data) {
			return data.map(item => {
			const { id, children, ...rest } = item;
			@@ -1266,6 +1628,7 @@
			return newItem;
			});
			}

			// 根据名称反查产品大类 id，便于仅存名称时的反显
			function findNodeIdByLabel(nodes, label) {
			if (!label) return null;
			@@ -1279,6 +1642,7 @@
			}
			return null;
			}

			// 表格选择数据
			const handleSelectionChange = selection => {
			// 过滤掉子数据
			@@ -1343,6 +1707,8 @@
			}
			if (
			[
			"freightUnitPrice",
			"totalFreight",
			"taxInclusiveUnitPrice",
			"taxInclusiveTotalPrice",
			"taxExclusiveTotalPrice",
			@@ -1354,6 +1720,8 @@
			});
			}
			return proxy.summarizeTable(param, [
			"freightUnitPrice",
			"totalFreight",
			"taxInclusiveUnitPrice",
			"taxInclusiveTotalPrice",
			"taxExclusiveTotalPrice",
			@@ -1371,7 +1739,7 @@
			selectedQuotation.value = null;
			let userLists = await userListNoPage();
			userList.value = userLists.data;
			listCustomerPrivatePool({ current: -1, size: -1 }).then(res => {
			listCustomer({ current: -1, size: -1, type: 0 }).then(res => {
			customerOption.value = res.data.records;
			});
			form.value.entryPerson = userStore.id;
			@@ -1380,6 +1748,12 @@
			form.value.entryDate = getCurrentDate();
			// 签订日期默认为当天
			form.value.executionDate = getCurrentDate();
			// 创建时间默认为当天
			form.value.createTime = dayjs().format("YYYY-MM-DD HH:mm:ss");
			// 默认自动生成销售合同号
			form.value.autoGenerateContractNo = true;
			// 默认非废品销售
			form.value.stockType = "qualified";
			} else {
			currentId.value = row.id;
			getSalesLedgerWithProducts({ id: row.id, type: 1 }).then(res => {
			@@ -1387,6 +1761,8 @@
			form.value.entryPerson = Number(res.entryPerson);
			productData.value = form.value.productData;
			fileList.value = form.value.storageBlobVOs;
			// 编辑时设置自动生成为false，允许手动修改
			form.value.autoGenerateContractNo = false;
			});
			}
			// let userAll = await userStore.getInfo()
			@@ -1408,7 +1784,7 @@
			// 先确保客户列表已加载，便于后续回填 customerId
			if (!customerOption.value \|\| customerOption.value.length === 0) {
			try {
			listCustomerPrivatePool({ current: -1, size: -1 }).then(res => {
			listCustomer({ current: -1, size: -1 }).then(res => {
			customerOption.value = res.data.records;
			});
			} catch (e) {
			@@ -1498,14 +1874,18 @@
			taxExclusiveTotalPrice: taxExclusiveTotalPrice,
			invoiceType: "增普票",
			isProduction: true,
			productId: p.productId,
			productModelId: p.productModelId,
			};
			});

			quotationDialogVisible.value = false;
			};

			function changs(val) {
			console.log(val);
			}

			// 提交表单
			const submitForm = () => {
			proxy.$refs["formRef"].validate(valid => {
			@@ -1519,6 +1899,9 @@
			}
			form.value.storageBlobDTOs = fileList;
			form.value.type = 1;
			if (form.value.autoGenerateContractNo) {
			form.value.salesContractNo = "";
			}
			addOrUpdateSalesLedger(form.value).then(res => {
			proxy.$modal.msgSuccess("提交成功");
			closeDia();
			@@ -1551,6 +1934,12 @@
			proxy.resetForm("productFormRef");
			if (type === "edit") {
			productForm.value = { ...row };
			if (productForm.value.freightUnitPrice === undefined) {
			productForm.value.freightUnitPrice = "";
			}
			if (productForm.value.totalFreight === undefined) {
			productForm.value.totalFreight = "";
			}
			productIndex.value = index;
			// 编辑时根据产品大类名称反查 tree 节点 id，并加载规格型号列表
			try {
			@@ -1581,6 +1970,7 @@
			getProductOptions();
			}
			productFormVisible.value = true;
			computeTotalFreight();
			};
			// 提交产品表单
			const submitProduct = () => {
			@@ -1627,14 +2017,10 @@
			}

			if (operationType.value === "add") {
			productSelectedRows.value.forEach(selectedRow => {
			const index = productData.value.findIndex(
			product => product.id === selectedRow.id
			);
			if (index !== -1) {
			productData.value.splice(index, 1);
			}
			});
			productData.value = productData.value.filter(
			item => !productSelectedRows.value.includes(item)
			);
			productSelectedRows.value = [];
			} else {
			let ids = [];
			if (productSelectedRows.value.length > 0) {
			@@ -1836,282 +2222,286 @@

			// 构建打印内容
			let printContent = `
			<!DOCTYPE html>
			<html>
			<head>
			<meta charset="UTF-8">
			<title>打印预览</title>
			<style>
			body {
			margin: 0;
			padding: 0;
			font-family: "SimSun", serif;
			background: white;
			}
			.print-page {
			width: 200mm;
			height: 75mm;
			padding: 10mm;
			padding-left: 20mm;
			background: white;
			box-sizing: border-box;
			page-break-after: always;
			page-break-inside: avoid;
			}
			.print-page:last-child {
			page-break-after: avoid;
			}
			.delivery-note {
			width: 100%;
			height: 100%;
			font-size: 12px;
			line-height: 1.2;
			display: flex;
			flex-direction: column;
			color: #000;
			}
			.header {
			text-align: center;
			margin-bottom: 8px;
			}
			.company-name {
			font-size: 18px;
			font-weight: bold;
			margin-bottom: 4px;
			}
			.document-title {
			font-size: 16px;
			font-weight: bold;
			}
			.info-section {
			margin-bottom: 8px;
			display: flex;
			justify-content: space-between;
			align-items: center;
			}
			.info-row {
			line-height: 20px;
			}
			.label {
			font-weight: bold;
			width: 60px;
			font-size: 12px;
			}
			.value {
			margin-right: 20px;
			min-width: 80px;
			font-size: 12px;
			}
			.table-section {
			margin-bottom: 40px;
			// flex: 0.6;
			}
			.product-table {
			width: 100%;
			border-collapse: collapse;
			border: 1px solid #000;
			}
			.product-table th, .product-table td {
			border: 1px solid #000;
			padding: 6px;
			text-align: center;
			font-size: 12px;
			line-height: 1.4;
			}
			.product-table th {
			font-weight: bold;
			}
			.total-value {
			font-weight: bold;
			}
			.footer-section {
			margin-top: auto;
			}
			.footer-row {
			display: flex;
			margin-bottom: 3px;
			line-height: 22px;
			justify-content: space-between;
			}
			.footer-item {
			display: flex;
			margin-right: 20px;
			}
			.footer-item .label {
			font-weight: bold;
			width: 80px;
			font-size: 12px;
			}
			.footer-item .value {
			min-width: 80px;
			font-size: 12px;
			}
			.address-item .address-value {
			min-width: 200px;
			}
			@media print {
			body {
			margin: 0;
			padding: 0;
			}
			.print-page {
			margin: 0;
			padding: 10mm;
			/* padding-left: 20mm; */
			page-break-inside: avoid;
			page-break-after: always;
			}
			.print-page:last-child {
			page-break-after: avoid;
			}
			}
			</style>
			</head>
			<body>
			`;
			<!DOCTYPE html>
			<html>
			<head>
			<meta charset="UTF-8">
			<title>打印预览</title>
			<style>
			body {
			margin: 0;
			padding: 0;
			font-family: "SimSun", serif;
			background: white;
			}
			.print-page {
			width: 200mm;
			height: 75mm;
			padding: 10mm;
			padding-left: 20mm;
			background: white;
			box-sizing: border-box;
			page-break-after: always;
			page-break-inside: avoid;
			}
			.print-page:last-child {
			page-break-after: avoid;
			}
			.delivery-note {
			width: 100%;
			height: 100%;
			font-size: 12px;
			line-height: 1.2;
			display: flex;
			flex-direction: column;
			color: #000;
			}
			.header {
			text-align: center;
			margin-bottom: 8px;
			}
			.company-name {
			font-size: 18px;
			font-weight: bold;
			margin-bottom: 4px;
			}
			.document-title {
			font-size: 16px;
			font-weight: bold;
			}
			.info-section {
			margin-bottom: 8px;
			display: flex;
			justify-content: space-between;
			align-items: center;
			}
			.info-row {
			line-height: 20px;
			}
			.label {
			font-weight: bold;
			width: 60px;
			font-size: 12px;
			}
			.value {
			margin-right: 20px;
			min-width: 80px;
			font-size: 12px;
			}
			.table-section {
			margin-bottom: 40px;
			// flex: 0.6;
			}
			.product-table {
			width: 100%;
			border-collapse: collapse;
			border: 1px solid #000;
			}
			.product-table th, .product-table td {
			border: 1px solid #000;
			padding: 6px;
			text-align: center;
			font-size: 12px;
			line-height: 1.4;
			}
			.product-table th {
			font-weight: bold;
			}
			.total-value {
			font-weight: bold;
			}
			.footer-section {
			margin-top: auto;
			}
			.footer-row {
			display: flex;
			margin-bottom: 3px;
			line-height: 22px;
			justify-content: space-between;
			}
			.footer-item {
			display: flex;
			margin-right: 20px;
			}
			.footer-item .label {
			font-weight: bold;
			width: 80px;
			font-size: 12px;
			}
			.footer-item .value {
			min-width: 80px;
			font-size: 12px;
			}
			.address-item .address-value {
			min-width: 200px;
			}
			@media print {
			body {
			margin: 0;
			padding: 0;
			}
			.print-page {
			margin: 0;
			padding: 10mm;
			/* padding-left: 20mm; */
			page-break-inside: avoid;
			page-break-after: always;
			}
			.print-page:last-child {
			page-break-after: avoid;
			}
			}
			</style>
			</head>
			<body>
			`;

			// 为每条数据生成打印页面
			printData.value.forEach((item, index) => {
			printContent += `
			<div class="print-page">
			<div class="delivery-note">
			<div class="header">
			<div class="document-title">零售发货单</div>
			</div>

			<div class="info-section">
			<div class="info-row">
			<div>
			<span class="label">发货日期：</span>
			<span class="value">${formatDate(
			item.createTime
			)}</span>
			</div>
			<div>
			<span class="label">客户名称：</span>
			<span class="value">${
			item.customerName
			}</span>
			</div>
			</div>
			<div class="info-row">
			<span class="label">单号：</span>
			<span class="value">${
			item.salesContractNo \|\|
			""
			}</span>
			</div>
			</div>
			<div class="print-page">
			<div class="delivery-note">
			<div class="header">
			<div class="document-title">零售发货单</div>
			</div>

			<div class="table-section">
			<table class="product-table">
			<thead>
			<tr>
			<th>产品名称</th>
			<th>规格型号</th>
			<th>单位</th>
			<th>单价</th>
			<th>零售数量</th>
			<th>零售金额</th>
			</tr>
			</thead>
			<tbody>
			${
			item.products &&
			item.products
			.length > 0
			? item.products
			.map(
			product => `
			<tr>
			<td>${
			product.productCategory \|\|
			""
			}</td>
			<td>${
			product.specificationModel \|\|
			""
			}</td>
			<td>${
			product.unit \|\|
			""
			}</td>
			<td>${
			product.taxInclusiveUnitPrice \|\|
			"0"
			}</td>
			<td>${
			product.quantity \|\|
			"0"
			}</td>
			<td>${
			product.taxInclusiveTotalPrice \|\|
			"0"
			}</td>
			</tr>
			`
			)
			.join("")
			: '<tr><td colspan="6" style="text-align: center; color: #999;">暂无产品数据</td></tr>'
			}
			</tbody>
			<tfoot>
			<tr>
			<td class="label">合计</td>
			<td class="total-value"></td>
			<td class="total-value"></td>
			<td class="total-value"></td>
			<td class="total-value">${getTotalQuantityForPrint(
			item.products
			)}</td>
			<td class="total-value">${getTotalAmountForPrint(
			item.products
			)}</td>
			</tr>
			</tfoot>
			</table>
			</div>
			<div class="info-section">
			<div class="info-row">
			<div>
			<span class="label">发货日期：</span>
			<span class="value">${formatDate(
			item.createTime
			)}</span>
			</div>
			<div>
			<span class="label">客户名称：</span>
			<span class="value">${
			item.customerName
			}</span>
			</div>
			</div>
			<div class="info-row">
			<span class="label">单号：</span>
			<span class="value">${
			item.salesContractNo \|\|
			""
			}</span>
			</div>
			</div>

			<div class="footer-section">
			<div class="footer-row">
			<div class="footer-item">
			<span class="label">收货电话：</span>
			<span class="value"></span>
			</div>
			<div class="footer-item">
			<span class="label">收货人：</span>
			<span class="value"></span>
			</div>
			<div class="footer-item address-item">
			<span class="label">收货地址：</span>
			<span class="value address-value"></span>
			</div>
			</div>
			<div class="footer-row">
			<div class="footer-item">
			<span class="label">操作员：</span>
			<span class="value">${
			userStore.nickName \|\|
			"撕开前"
			}</span>
			</div>
			<div class="footer-item">
			<span class="label">打印日期：</span>
			<span class="value">${formatDateTime(
			new Date()
			)}</span>
			</div>
			</div>
			</div>
			</div>
			</div>
			`;
			<div class="table-section">
			<table class="product-table">
			<thead>
			<tr>
			<th>产品名称</th>
			<th>规格型号</th>
			<th>单位</th>
			<th>单价</th>
			<th>零售数量</th>
			<th>零售金额</th>
			</tr>
			</thead>
			<tbody>
			${
			item.products &&
			item
			.products
			.length >
			0
			? item.products
			.map(
			product => `
			<tr>
			<td>${
			product.productCategory \|\|
			""
			}</td>
			<td>${
			product.specificationModel \|\|
			""
			}</td>
			<td>${
			product.unit \|\|
			""
			}</td>
			<td>${
			product.taxInclusiveUnitPrice \|\|
			"0"
			}</td>
			<td>${
			product.quantity \|\|
			"0"
			}</td>
			<td>${
			product.taxInclusiveTotalPrice \|\|
			"0"
			}</td>
			</tr>
			`
			)
			.join(
			""
			)
			: '<tr><td colspan="6" style="text-align: center; color: #999;">暂无产品数据</td></tr>'
			}
			</tbody>
			<tfoot>
			<tr>
			<td class="label">合计</td>
			<td class="total-value"></td>
			<td class="total-value"></td>
			<td class="total-value"></td>
			<td class="total-value">${getTotalQuantityForPrint(
			item.products
			)}</td>
			<td class="total-value">${getTotalAmountForPrint(
			item.products
			)}</td>
			</tr>
			</tfoot>
			</table>
			</div>

			<div class="footer-section">
			<div class="footer-row">
			<div class="footer-item">
			<span class="label">收货电话：</span>
			<span class="value"></span>
			</div>
			<div class="footer-item">
			<span class="label">收货人：</span>
			<span class="value"></span>
			</div>
			<div class="footer-item address-item">
			<span class="label">收货地址：</span>
			<span class="value address-value"></span>
			</div>
			</div>
			<div class="footer-row">
			<div class="footer-item">
			<span class="label">操作员：</span>
			<span class="value">${
			userStore.nickName \|\|
			"撕开前"
			}</span>
			</div>
			<div class="footer-item">
			<span class="label">打印日期：</span>
			<span class="value">${formatDateTime(
			new Date()
			)}</span>
			</div>
			</div>
			</div>
			</div>
			</div>
			`;
			});

			printContent += `
			</body>
			</html>
			`;
			</body>
			</html>
			`;

			// 写入内容到新窗口
			printWindow.document.write(printContent);
			@@ -2129,11 +2519,7 @@
			// 格式化日期
			const formatDate = dateString => {
			if (!dateString) return getCurrentDate();
			const date = new Date(dateString);
			const year = date.getFullYear();
			const month = String(date.getMonth() + 1).padStart(2, "0");
			const day = String(date.getDate()).padStart(2, "0");
			return `${year}/${month}/${day}`;
			return dayjs(dateString).format("YYYY/MM/DD HH:mm:ss");
			};
			// 格式化日期时间
			const formatDateTime = date => {
			@@ -2297,6 +2683,33 @@
			isCalculating.value = false;
			};

			const computeTotalFreight = () => {
			const hasQuantity =
			productForm.value.quantity !== "" &&
			productForm.value.quantity !== null &&
			productForm.value.quantity !== undefined;
			const hasFreightUnitPrice =
			productForm.value.freightUnitPrice !== "" &&
			productForm.value.freightUnitPrice !== null &&
			productForm.value.freightUnitPrice !== undefined;
			if (!hasQuantity \|\| !hasFreightUnitPrice) return;

			const quantity = Number(productForm.value.quantity);
			const freightUnitPrice = Number(productForm.value.freightUnitPrice);
			if (!Number.isFinite(quantity) \|\| !Number.isFinite(freightUnitPrice)) return;

			productForm.value.totalFreight = (quantity * freightUnitPrice).toFixed(2);
			};

			const handleQuantityChange = () => {
			computeTotalFreight();
			calculateFromQuantity();
			};

			const handleFreightUnitPriceChange = () => {
			computeTotalFreight();
			};

			// 根据含税单价变化计算总价
			const calculateFromUnitPrice = () => {
			if (!productForm.value.taxRate) {
			@@ -2360,9 +2773,9 @@
			*/
			const getShippingStatusText = row => {
			// 如果已发货（有发货日期或车牌号），显示"已发货"
			if (row.shippingDate \|\| row.shippingCarNumber) {
			return "已发货";
			}
			// if (row.shippingDate \|\| row.shippingCarNumber) {
			// return "已发货";
			// }

			// 获取发货状态字段
			const status = row.shippingStatus;
			@@ -2381,6 +2794,7 @@
			审核拒绝: "审核拒绝",
			审核通过: "审核通过",
			已发货: "已发货",
			部分发货: "部分发货",
			};
			return statusTextMap[statusStr] \|\| "待发货";
			};
			@@ -2391,7 +2805,7 @@
			*/
			const getShippingStatusType = row => {
			// 如果已发货（有发货日期或车牌号），显示绿色
			if (row.shippingDate \|\| row.shippingCarNumber) {
			if (row.shippingStatus === "已发货") {
			return "success";
			}

			@@ -2412,13 +2826,14 @@
			审核拒绝: "danger",
			审核通过: "success",
			已发货: "success",
			部分发货: "warning",
			};
			return typeTextMap[statusStr] \|\| "info";
			};

			/**
			* 判断是否可以发货
			* 只有在产品状态是充足，发货状态是待发货和审核拒绝的时候才可以发货
			* 只有在产品状态是充足，发货状态是待发货、审批中、审核拒绝、部分发货的时候才可以发货
			* @param row 行数据
			*/
			const canShip = row => {
			@@ -2430,45 +2845,57 @@
			// 获取发货状态
			const shippingStatus = row.shippingStatus;

			// 如果已发货（有发货日期或车牌号），不能再次发货
			if (row.shippingDate \|\| row.shippingCarNumber) {
			// 如果已发货，不能再次发货
			if (shippingStatus === "已发货") {
			return false;
			}

			// 发货状态必须是"待发货"或"审核拒绝"
			// 发货状态必须是"待发货"、"审批中"、"审核拒绝"或"部分发货"
			const statusStr = shippingStatus ? String(shippingStatus).trim() : "";
			return statusStr === "待发货" \|\| statusStr === "审核拒绝";
			return (
			statusStr === "待发货" \|\|
			statusStr === "审批中" \|\|
			statusStr === "审核拒绝" \|\|
			statusStr === "部分发货"
			);
			};

			/**
			* 下载文件
			*
			* @param row 下载文件的相关信息对象
			*/
			const fileListRef = ref(null);
			const fileListDialogVisible = ref(false);
			const downLoadFile = row => {
			getSalesLedgerWithProducts({ id: row.id, type: 1 }).then(res => {
			if (fileListRef.value) {
			fileListRef.value.open(res.salesLedgerFiles);
			}
			});
			// 打开附件弹窗
			const recordId = ref(0);
			const fileDialogVisible = ref(false);

			// 打开附件弹框
			const openFileDialog = async row => {
			recordId.value = row.id;
			fileDialogVisible.value = true;
			};

			// 打开发货弹框
			const openDeliveryForm = row => {
			const openDeliveryForm = async row => {
			// 检查是否可以发货
			if (!canShip(row)) {
			proxy.$modal.msgWarning(
			"只有在产品状态是充足，发货状态是待发货或审核拒绝的时候才可以发货"
			"只有在产品状态是充足，发货状态是待发货、审批中、审核拒绝或部分发货的时候才可以发货"
			);
			return;
			}

			currentDeliveryRow.value = row;
			const ledgerRecord = findLedgerRecordByRow(row);
			const stockType = ledgerRecord?.stockType \|\| "qualified";
			const batchNoList = await getDeliveryBatchNoList(
			row.productModelId \|\| row.modelId,
			stockType
			);
			deliveryForm.value = {
			shippingCarNumber: "",
			expressCompany: "",
			expressNumber: "",
			type: "货车",
			batchNo: [],
			batchNoList,
			};
			deliveryFileList.value = [];
			deliveryFormVisible.value = true;
			};

			@@ -2476,13 +2903,56 @@
			const submitDelivery = () => {
			proxy.$refs["deliveryFormRef"].validate(valid => {
			if (valid) {
			const selectedBatchRows = getSelectedDeliveryBatchRows();
			if (selectedBatchRows.length === 0) {
			proxy.$modal.msgWarning("请至少填写一个批号的发货数量");
			return;
			}
			const totalDeliveryQuantity = selectedBatchRows.reduce(
			(sum, item) => sum + Number(item.deliveryQuantity \|\| 0),
			0
			);
			const currentRowNoQuantity = Number(
			currentDeliveryRow.value?.noQuantity \|\| 0
			);
			if (
			currentRowNoQuantity > 0 &&
			totalDeliveryQuantity > currentRowNoQuantity
			) {
			proxy.$modal.msgWarning("批号发货总数不能超过待发货数量");
			return;
			}
			// 保存当前展开的行ID，以便发货后重新加载子表格数据
			const currentExpandedKeys = [...expandedRowKeys.value];
			const salesLedgerId = currentDeliveryRow.value.salesLedgerId;
			deliveryForm.value.batchNo = selectedBatchRows.map(item => item.id);
			const productModelId =
			currentDeliveryRow.value.productModelId \|\|
			currentDeliveryRow.value.modelId;
			addShippingInfo({
			salesLedgerId: salesLedgerId,
			salesLedgerProductId: currentDeliveryRow.value.id,
			type: deliveryForm.value.type,
			shippingCarNumber:
			deliveryForm.value.type === "货车"
			? deliveryForm.value.shippingCarNumber
			: "",
			expressCompany:
			deliveryForm.value.type === "快递"
			? deliveryForm.value.expressCompany
			: "",
			expressNumber:
			deliveryForm.value.type === "快递"
			? deliveryForm.value.expressNumber
			: "",
			storageBlobDTOs: deliveryFileList.value \|\| [],
			batchNo: deliveryForm.value.batchNo,
			batchNoDetailList: selectedBatchRows.map(item => ({
			stockInventoryId: item.id,
			batchNo: item.batchNo,
			quantity: Number(item.deliveryQuantity \|\| 0),
			productModelId: productModelId,
			})),
			}).then(() => {
			proxy.$modal.msgSuccess("发货成功");
			closeDeliveryDia();
			@@ -2515,8 +2985,18 @@
			};

			// 关闭发货弹框
			const handleDeliveryTypeChange = val => {
			if (val === "货车") {
			deliveryForm.value.expressCompany = "";
			deliveryForm.value.expressNumber = "";
			} else {
			deliveryForm.value.shippingCarNumber = "";
			}
			};

			const closeDeliveryDia = () => {
			proxy.resetForm("deliveryFormRef");
			deliveryFileList.value = [];
			deliveryFormVisible.value = false;
			currentDeliveryRow.value = null;
			};
			@@ -2565,6 +3045,7 @@
			justify-content: space-between;
			margin-bottom: 10px;
			}

			.print-preview-dialog {
			.el-dialog__body {
			padding: 0;