product-inventory-management.git

			@@ -234,9 +234,13 @@
			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('view', scope.row)">详情
			</el-button>
			<el-button link
			type="primary"
			@click="openForm('edit', scope.row)"
			@@ -257,7 +261,7 @@
			@pagination="paginationChange" />
			</div>
			<FormDialog v-model="dialogFormVisible"
			:title="operationType === 'add' ? '新增销售台账页面' : '编辑销售台账页面'"
			:title="operationType === 'add' ? '新增销售台账页面' : (operationType === 'edit' ? '编辑销售台账页面' : '销售台账详情')"
			:width="'70%'"
			:operation-type="operationType"
			@close="closeDia"
			@@ -284,10 +288,15 @@
			<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">
			@@ -369,6 +378,7 @@
			:reserve-keyword="false"
			placeholder="请选择"
			clearable
			:disabled="operationType === 'view'"
			@change="changs">
			<el-option v-for="item in userList"
			:key="item.userId"
			@@ -386,7 +396,8 @@
			format="YYYY-MM-DD"
			type="date"
			placeholder="请选择"
			clearable />
			clearable
			:disabled="operationType === 'view'" />
			</el-form-item>
			</el-col>
			</el-row>
			@@ -400,7 +411,8 @@
			format="YYYY-MM-DD"
			type="date"
			placeholder="请选择"
			clearable />
			clearable
			:disabled="operationType === 'view'" />
			</el-form-item>
			</el-col>
			</el-row>
			@@ -488,11 +500,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>
			@@ -708,7 +722,7 @@
			</el-select>
			</el-form-item>
			</el-col>
			<el-col :span="12">
			<!-- <el-col :span="12">
			<el-form-item label="是否生产："
			prop="isProduction">
			<el-radio-group v-model="productForm.isProduction">
			@@ -718,7 +732,7 @@
			:value="false" />
			</el-radio-group>
			</el-form-item>
			</el-col>
			</el-col>-->
			</el-row>
			</el-form>
			</FormDialog>
			@@ -898,7 +912,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="快递"
			@@ -914,8 +929,47 @@
			</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="批号："
			<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
			@@ -925,6 +979,15 @@
			<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">
			@@ -990,6 +1053,7 @@
			import useFormData from "@/hooks/useFormData.js";
			import dayjs from "dayjs";
			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";

			@@ -1017,6 +1081,7 @@
			});
			const total = ref(0);
			const fileList = ref([]);
			const deliveryFileList = ref([]);

			// 用户信息表单弹框数据
			const operationType = ref("");
			@@ -1031,6 +1096,7 @@
			},
			form: {
			salesContractNo: "",
			autoGenerateContractNo: true,
			salesman: "",
			customerId: "",
			entryPerson: "",
			@@ -1195,11 +1261,32 @@
			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" }],
			},
			});
			@@ -1521,7 +1608,7 @@
			selectedQuotation.value = null;
			let userLists = await userListNoPage();
			userList.value = userLists.data;
			listCustomer({ 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;
			@@ -1530,6 +1617,8 @@
			form.value.entryDate = getCurrentDate();
			// 签订日期默认为当天
			form.value.executionDate = getCurrentDate();
			// 默认自动生成销售合同号
			form.value.autoGenerateContractNo = true;
			} else {
			currentId.value = row.id;
			getSalesLedgerWithProducts({ id: row.id, type: 1 }).then(res => {
			@@ -1537,6 +1626,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()
			@@ -1648,6 +1739,8 @@
			taxExclusiveTotalPrice: taxExclusiveTotalPrice,
			invoiceType: "增普票",
			isProduction: true,
			productId: p.productId,
			productModelId: p.productModelId,
			};
			});

			@@ -1671,6 +1764,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();
			@@ -1779,14 +1875,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) {
			@@ -1988,286 +2080,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="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="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="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>
			`;
			<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);
			@@ -2537,6 +2629,7 @@
			审核拒绝: "审核拒绝",
			审核通过: "审核通过",
			已发货: "已发货",
			部分发货: "部分发货",
			};
			return statusTextMap[statusStr] \|\| "待发货";
			};
			@@ -2568,6 +2661,7 @@
			审核拒绝: "danger",
			审核通过: "success",
			已发货: "success",
			部分发货: "warning",
			};
			return typeTextMap[statusStr] \|\| "info";
			};
			@@ -2593,7 +2687,11 @@

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

			// 打开附件弹窗
			@@ -2621,10 +2719,14 @@
			row.productModelId \|\| row.modelId
			);
			deliveryForm.value = {
			shippingCarNumber: "",
			expressCompany: "",
			expressNumber: "",
			type: "货车",
			batchNo: [],
			batchNoList,
			};
			deliveryFileList.value = [];
			deliveryFormVisible.value = true;
			};

			@@ -2662,6 +2764,19 @@
			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,
			@@ -2701,8 +2816,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;
			};
			@@ -2919,4 +3044,4 @@
			page-break-after: avoid;
			}
			}
			</style>
			</style>