product-inventory-management.git

			@@ -91,7 +91,7 @@
			<el-table-column label="含税总价(元)" prop="taxInclusiveTotalPrice" :formatter="formattedNumber" />
			<el-table-column label="不含税总价(元)" prop="taxExclusiveTotalPrice" :formatter="formattedNumber" />
			<!--操作-->
			<el-table-column Width="60px" label="操作" align="center">
			<el-table-column width="100" label="操作" align="center" fixed="right">
			<template #default="scope">
			<el-button
			link
			@@ -119,7 +119,7 @@
			<el-table-column label="签订日期" prop="executionDate" width="120" show-overflow-tooltip />
			<el-table-column label="交付日期" prop="deliveryDate" width="120" show-overflow-tooltip />
			<el-table-column label="备注" prop="remarks" width="200" show-overflow-tooltip />
			<el-table-column fixed="right" label="操作" min-width="100" align="center">
			<el-table-column fixed="right" label="操作" width="100" align="center">
			<template #default="scope">
			<el-button link type="primary" size="small" @click="openForm('edit', scope.row)">编辑</el-button>
			<!-- <el-button link type="primary" size="small" @click="openForm('view', scope.row)">详情</el-button>-->
			@@ -145,7 +145,7 @@
			<el-row :gutter="30">
			<el-col :span="12">
			<el-form-item label="销售合同号：" prop="salesContractNo">
			<el-input v-model="form.salesContractNo" placeholder="自动生成" clearable disabled />
			<el-input v-model="form.salesContractNo" placeholder="自动生成或手动输入" clearable :disabled="operationType === 'view'" />
			</el-form-item>
			</el-col>
			<el-col :span="12">
			@@ -243,14 +243,14 @@
			</el-table>
			<el-row :gutter="30">
			<el-col :span="24">
			<el-form-item label="备注·：" prop="remark">
			<el-input v-model="form.remark" placeholder="请输入" clearable type="textarea" :rows="2" :disabled="operationType === 'view'" />
			<el-form-item label="备注：" prop="remarks">
			<el-input v-model="form.remarks" placeholder="请输入" clearable type="textarea" :rows="2" :disabled="operationType === 'view'" />
			</el-form-item>
			</el-col>
			</el-row>
			<el-row :gutter="30">
			<el-col :span="24">
			<el-form-item label="附件材料：" prop="remark">
			<el-form-item label="附件材料：" prop="salesLedgerFiles">
			<el-upload v-model:file-list="fileList" :action="upload.url" multiple ref="fileUpload" auto-upload
			:headers="upload.headers" :before-upload="handleBeforeUpload" :on-error="handleUploadError"
			:on-success="handleUploadSuccess" :on-remove="handleRemove">
			@@ -339,7 +339,7 @@
			<el-option v-for="item in userList" :key="item.nickName" :label="item.nickName" :value="item.nickName"/>
			</el-select> -->
			<el-tree-select v-model="productForm.productCategory" placeholder="请选择" clearable check-strictly
			@change="getModels" :data="productOptions" :render-after-expand="false" style="width: 100%" />
			@change="getModels" :data="productOptions" :render-after-expand="false" filterable style="width: 100%" />
			</el-form-item>
			</el-col>
			</el-row>
			@@ -574,21 +574,6 @@
			@close="closeDeliveryDia"
			>
			<el-form :model="deliveryForm" label-width="120px" label-position="top" :rules="deliveryRules" ref="deliveryFormRef">
			<el-row :gutter="30">
			<el-col :span="24">
			<el-form-item label="发货类型：" prop="type">
			<el-select
			v-model="deliveryForm.type"
			placeholder="请选择发货类型"
			style="width: 100%"
			>
			<el-option label="货车" value="货车" />
			<el-option label="快递" value="快递" />
			</el-select>
			</el-form-item>
			</el-col>
			</el-row>

			<!-- 审批人选择（仿协同审批里的审批人节点选择） -->
			<el-row>
			<el-col :span="24">
			@@ -787,14 +772,8 @@
			const deliveryFormVisible = ref(false);
			const currentDeliveryRow = ref(null);
			const deliveryFormData = reactive({
			deliveryForm: {
			type: "货车", // 货车, 快递
			},
			deliveryRules: {
			type: [
			{ required: true, message: "请选择发货类型", trigger: "change" }
			]
			},
			deliveryForm: {},
			deliveryRules: {},
			});
			const { deliveryForm, deliveryRules } = toRefs(deliveryFormData);

			@@ -922,6 +901,7 @@
			modelOptions.value = res;
			});
			};

			const getProductModel = (value) => {
			const index = modelOptions.value.findIndex((item) => item.id === value);
			if (index !== -1) {
			@@ -1005,6 +985,7 @@

			// 添加表行类名方法
			const tableRowClassName = ({ row }) => {
			if (!row.deliveryDate) return '';
			if (row.isFh) return '';

			const diff = row.deliveryDaysDiff;
			@@ -2004,7 +1985,8 @@
			'审核中': '审核中',
			'审核拒绝': '审核拒绝',
			'审核通过': '审核通过',
			'已发货': '已发货'
			'已发货': '已发货',
			'已撤销': '已撤销'
			};
			return statusTextMap[statusStr] \|\| '待发货';
			};
			@@ -2034,6 +2016,7 @@
			'待审核': 'info',
			'审核中': 'warning',
			'审核拒绝': 'danger',
			'已撤销': 'danger',
			'审核通过': 'success',
			'已发货': 'success'
			};
			@@ -2042,7 +2025,7 @@

			/**
			* 判断是否可以发货
			* 只有在产品状态是充足，发货状态是待发货和审核拒绝的时候才可以发货
			* 只有在产品状态是充足，发货状态是待发货、审核拒绝和已撤销的时候才可以发货
			* @param row 行数据
			*/
			const canShip = (row) => {
			@@ -2059,9 +2042,9 @@
			return false;
			}

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

			/**
			@@ -2108,14 +2091,13 @@
			return;
			}
			const approveUserIds = approverNodes.value.map(node => node.userId).join(",");
			// 保存当前展开的行ID，以便发货后重新加载子表格数据
			const currentExpandedKeys = [...expandedRowKeys.value];
			const salesLedgerId = currentDeliveryRow.value.salesLedgerId;
			addShippingInfo({
			salesLedgerId: salesLedgerId,
			salesLedgerProductId: currentDeliveryRow.value.id,
			type: deliveryForm.value.type,
			approveUserIds,
			shippingTotal: currentDeliveryRow.value.quantity,
			approveUserIds,
			})
			.then(() => {
			proxy.$modal.msgSuccess("发货成功");