From fd4d5934e89f7dee284cb78b6d4d276b2f283d7d Mon Sep 17 00:00:00 2001
From: yyb <995253665@qq.com>
Date: 星期三, 15 四月 2026 10:53:30 +0800
Subject: [PATCH] 优化销售台账页面：新增产品信息的内联编辑功能，支持产品类别、规格型号、尺寸、数量、含税单价等字段的动态修改，提升用户交互体验

---
 src/views/salesManagement/salesLedger/index.vue |  729 +++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 700 insertions(+), 29 deletions(-)

diff --git a/src/views/salesManagement/salesLedger/index.vue b/src/views/salesManagement/salesLedger/index.vue
index 2f61cdf..1222b2b 100644
--- a/src/views/salesManagement/salesLedger/index.vue
+++ b/src/views/salesManagement/salesLedger/index.vue
@@ -298,7 +298,7 @@
 				</el-row>
 				<el-row>
 					<el-form-item label="浜у搧淇℃伅锛�" prop="entryDate">
-						<el-button v-if="operationType !== 'view'" type="primary" @click="openProductForm('add')">娣诲姞</el-button>
+						<el-button v-if="operationType !== 'view'" type="primary" @click="addProductInline">娣诲姞</el-button>
 						<el-button v-if="operationType !== 'view'" plain type="danger" @click="deleteProduct" >鍒犻櫎</el-button>
 					</el-form-item>
 				</el-row>
@@ -307,38 +307,376 @@
 					<el-table-column align="center" type="selection" width="55" v-if="operationType !== 'view'"
 						:selectable="(row) => !isProductShipped(row)" />
 					<el-table-column align="center" label="搴忓彿" type="index" width="60" />
-					<el-table-column label="浜у搧澶х被" prop="productCategory" />
-					<el-table-column label="瑙勬牸鍨嬪彿" prop="specificationModel" />
+					<el-table-column label="浜у搧澶х被" prop="productCategory" min-width="160">
+						<template #default="scope">
+							<el-tree-select
+								v-if="scope.row.__editing"
+								v-model="scope.row.__productCategoryId"
+								placeholder="璇烽�夋嫨"
+								clearable
+								filterable
+								check-strictly
+								:data="productOptions"
+								:render-after-expand="false"
+								style="width: 100%"
+								:filter-node-method="filterProductCategoryNode"
+								@change="(val) => handleInlineProductCategoryChange(scope.row, val)"
+							/>
+							<span v-else>{{ scope.row.productCategory ?? "" }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="瑙勬牸鍨嬪彿" prop="specificationModel" min-width="140">
+						<template #default="scope">
+							<el-select
+								v-if="scope.row.__editing"
+								v-model="scope.row.productModelId"
+								placeholder="璇烽�夋嫨"
+								clearable
+								filterable
+								style="width: 140px"
+								@change="(val) => handleInlineProductModelChange(scope.row, val)"
+							>
+								<el-option v-for="item in modelOptions" :key="item.id" :label="item.model" :value="item.id" />
+							</el-select>
+							<span v-else>{{ scope.row.specificationModel ?? "" }}</span>
+						</template>
+					</el-table-column>
 					<el-table-column label="鍘氬害" prop="thickness" min-width="90">
 						<template #default="scope">
-							{{ scope.row.thickness ?? "" }}
+							<el-input-number
+								v-if="scope.row.__editing"
+								v-model="scope.row.thickness"
+								:min="0"
+								:step="0.000000000000001"
+								:precision="15"
+								style="width: 110px"
+								placeholder="璇疯緭鍏�"
+								clearable
+							/>
+							<span v-else>{{ scope.row.thickness ?? "" }}</span>
 						</template>
 					</el-table-column>
 					<el-table-column label="瀹�(mm)" prop="width" min-width="80">
 						<template #default="scope">
-							{{ scope.row.width ?? "" }}
+							<el-input-number
+								v-if="scope.row.__editing"
+								v-model="scope.row.width"
+								:min="0"
+								:step="1"
+								:precision="2"
+								style="width: 110px"
+								placeholder="璇疯緭鍏�"
+								clearable
+								@change="() => handleInlineSizeChange(scope.row)"
+							/>
+							<span v-else>{{ scope.row.width ?? "" }}</span>
 						</template>
 					</el-table-column>
 					<el-table-column label="楂�(mm)" prop="height" min-width="80">
 						<template #default="scope">
-							{{ scope.row.height ?? "" }}
+							<el-input-number
+								v-if="scope.row.__editing"
+								v-model="scope.row.height"
+								:min="0"
+								:step="1"
+								:precision="2"
+								style="width: 110px"
+								placeholder="璇疯緭鍏�"
+								clearable
+								@change="() => handleInlineSizeChange(scope.row)"
+							/>
+							<span v-else>{{ scope.row.height ?? "" }}</span>
 						</template>
 					</el-table-column>
 					<el-table-column label="闈㈢Н(m虏)" prop="actualTotalArea" min-width="100">
 						<template #default="scope">
-							{{ scope.row.actualTotalArea ?? "" }}
+							<el-input-number
+								v-if="scope.row.__editing"
+								v-model="scope.row.actualTotalArea"
+								:min="0"
+								:step="0.00001"
+								:precision="5"
+								style="width: 120px"
+								placeholder="鑷姩璁＄畻"
+								:disabled="true"
+							/>
+							<span v-else>{{ scope.row.actualTotalArea ?? "" }}</span>
 						</template>
 					</el-table-column>
-					<el-table-column label="鏁伴噺" prop="quantity" />
-					<el-table-column label="绋庣巼(%)" prop="taxRate" />
-					<el-table-column label="鍚◣鍗曚环(鍏�)" prop="taxInclusiveUnitPrice" :formatter="formattedNumber" />
+					<el-table-column label="鏁伴噺" prop="quantity" min-width="90">
+						<template #default="scope">
+							<el-input-number
+								v-if="scope.row.__editing"
+								v-model="scope.row.quantity"
+								:step="0.1"
+								:min="0"
+								:precision="2"
+								style="width: 110px"
+								placeholder="璇疯緭鍏�"
+								clearable
+								@change="() => handleInlineQuantityChange(scope.row)"
+							/>
+							<span v-else>{{ scope.row.quantity ?? "" }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="鍚◣鍗曚环(鍏�)" prop="taxInclusiveUnitPrice" min-width="140">
+						<template #default="scope">
+							<el-input-number
+								v-if="scope.row.__editing"
+								:step="0.01"
+								:min="0"
+								:precision="2"
+								style="width: 120px"
+								v-model="scope.row.taxInclusiveUnitPrice"
+								placeholder="璇疯緭鍏�"
+								clearable
+								@change="() => handleInlineUnitPriceChange(scope.row)"
+							/>
+							<span v-else>{{ formattedNumber(null, null, scope.row.taxInclusiveUnitPrice ?? 0) }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="绋庣巼(%)" prop="taxRate" min-width="90">
+						<template #default="scope">
+							<el-select
+								v-if="scope.row.__editing"
+								v-model="scope.row.taxRate"
+								placeholder="璇烽�夋嫨"
+								clearable
+								style="width: 90px"
+								@change="() => handleInlineTaxRateChange(scope.row)"
+							>
+								<el-option label="1" value="1" />
+								<el-option label="3" value="3" />
+								<el-option label="6" value="6" />
+								<el-option label="9" value="9" />
+								<el-option label="13" value="13" />
+							</el-select>
+							<span v-else>{{ scope.row.taxRate ?? "" }}</span>
+						</template>
+					</el-table-column>
 					<el-table-column label="鍚◣鎬讳环(鍏�)" prop="taxInclusiveTotalPrice" :formatter="formattedNumber" />
 					<el-table-column label="涓嶅惈绋庢�讳环(鍏�)" prop="taxExclusiveTotalPrice" :formatter="formattedNumber" />
-					<el-table-column fixed="right" label="鎿嶄綔" min-width="60" align="center" v-if="operationType !== 'view'">
+					<el-table-column label="鍙戠エ绫诲瀷" prop="invoiceType" min-width="120">
 						<template #default="scope">
-							<el-button link type="primary" size="small" 
-								:disabled="isProductShipped(scope.row)"
-								@click="openProductForm('edit', scope.row,scope.$index)">缂栬緫</el-button>
+							<el-select
+								v-if="scope.row.__editing"
+								v-model="scope.row.invoiceType"
+								placeholder="璇烽�夋嫨"
+								clearable
+								style="width: 120px"
+							>
+								<el-option label="澧炴櫘绁�" value="澧炴櫘绁�" />
+								<el-option label="澧炰笓绁�" value="澧炰笓绁�" />
+							</el-select>
+							<span v-else>{{ scope.row.invoiceType ?? "" }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="缁撶畻鍗曠墖闈㈢Н(銕�)" prop="settlePieceArea" min-width="140">
+						<template #default="scope">
+							<el-input-number
+								v-if="scope.row.__editing"
+								v-model="scope.row.settlePieceArea"
+								:min="0"
+								:step="0.00001"
+								:precision="5"
+								style="width: 140px"
+								placeholder="璇疯緭鍏�"
+								clearable
+								@change="() => handleInlineSettleAreaChange(scope.row)"
+							/>
+							<span v-else>{{ scope.row.settlePieceArea ?? "" }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="鍔犲伐瑕佹眰" prop="processRequirement" min-width="160" show-overflow-tooltip>
+						<template #default="scope">
+							<el-input
+								v-if="scope.row.__editing"
+								v-model="scope.row.processRequirement"
+								placeholder="璇疯緭鍏�"
+								clearable
+								style="width: 160px"
+							/>
+							<span v-else>{{ scope.row.processRequirement ?? "" }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="澶囨敞" prop="remark" min-width="140" show-overflow-tooltip>
+						<template #default="scope">
+							<el-input
+								v-if="scope.row.__editing"
+								v-model="scope.row.remark"
+								placeholder="璇疯緭鍏�"
+								clearable
+								style="width: 140px"
+							/>
+							<span v-else>{{ scope.row.remark ?? "" }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="妤煎眰缂栧彿" prop="floorCode" min-width="140" show-overflow-tooltip>
+						<template #default="scope">
+							<el-input
+								v-if="scope.row.__editing"
+								v-model="scope.row.floorCode"
+								placeholder="璇疯緭鍏�"
+								clearable
+								style="width: 140px"
+							/>
+							<span v-else>{{ scope.row.floorCode ?? "" }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="閲嶇" prop="heavyBox" min-width="100">
+						<template #default="scope">
+							<el-input
+								v-if="scope.row.__editing"
+								v-model="scope.row.heavyBox"
+								placeholder="璇疯緭鍏�"
+								clearable
+								style="width: 110px"
+							/>
+							<span v-else>{{ scope.row.heavyBox ?? "" }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column fixed="right" label="鎿嶄綔" min-width="220" align="center" v-if="operationType !== 'view'">
+						<template #default="scope">
+							<template v-if="scope.row.__editing">
+								<el-button link type="primary" size="small" @click="saveProductInline(scope.row, scope.$index)">淇濆瓨</el-button>
+								<el-button link type="danger" size="small" @click="cancelProductInline(scope.row, scope.$index)">鍙栨秷</el-button>
+								<el-popover
+									:width="420"
+									trigger="click"
+									:hide-after="0"
+									v-model:visible="scope.row.__otherAmountPopoverVisible"
+								>
+									<template #reference>
+										<el-button
+											link
+											type="primary"
+											size="small"
+											@click="openOtherAmountInline(scope.row)"
+										>
+											鍏朵粬閲戦({{ (scope.row.salesProductProcessList || []).length || 0 }})
+										</el-button>
+									</template>
+
+									<div style="display:flex; align-items:center; justify-content:space-between; gap: 10px; margin-bottom: 8px;">
+										<div style="font-weight: 600; color:#303133;">
+											鍏朵粬閲戦
+										</div>
+										<el-button type="primary" plain size="small" @click="startAddOtherAmountForRow(scope.row)">
+											鏂板
+										</el-button>
+									</div>
+
+									<div v-if="Array.isArray(scope.row.salesProductProcessList) && scope.row.salesProductProcessList.length > 0"
+										style="display:flex; flex-direction:column; gap: 8px;"
+									>
+										<div
+											v-for="(item, idx) in scope.row.salesProductProcessList"
+											:key="String(item.id) + '_' + idx"
+											style="display:flex; align-items:center; gap: 8px;"
+										>
+											<el-tag type="info" style="max-width: 170px; overflow:hidden; text-overflow:ellipsis; white-space:nowrap;">
+												{{ item.processName }}
+											</el-tag>
+											<el-input-number
+												v-model="item.quantity"
+												:min="0"
+												:step="1"
+												:precision="0"
+												style="width: 120px;"
+												placeholder="鏁伴噺"
+												:disabled="operationType === 'view'"
+												@change="handleOtherAmountQuantityChange(scope.row)"
+											/>
+											<el-button type="danger" link size="small" @click="removeOtherAmountAtForRow(scope.row, idx)">
+												鍒犻櫎
+											</el-button>
+										</div>
+									</div>
+									<div v-else style="color:#909399; font-size: 13px;">
+										鏆傛棤鍏朵粬閲戦
+									</div>
+								</el-popover>
+							</template>
+							<template v-else>
+								<el-button
+									link
+									type="primary"
+									size="small"
+									:disabled="isProductShipped(scope.row)"
+									@click="editProductInline(scope.row, scope.$index)"
+								>
+									缂栬緫
+								</el-button>
+								<el-popover
+									:width="420"
+									trigger="click"
+									:hide-after="0"
+									v-model:visible="scope.row.__otherAmountPopoverVisible"
+								>
+									<template #reference>
+										<el-button
+											link
+											type="primary"
+											size="small"
+											:disabled="isProductShipped(scope.row)"
+											@click="openOtherAmountInline(scope.row)"
+										>
+											鍏朵粬閲戦({{ (scope.row.salesProductProcessList || []).length || 0 }})
+										</el-button>
+									</template>
+
+									<div style="display:flex; align-items:center; justify-content:space-between; gap: 10px; margin-bottom: 8px;">
+										<div style="font-weight: 600; color:#303133;">
+											鍏朵粬閲戦
+										</div>
+										<el-button
+											type="primary"
+											plain
+											size="small"
+											:disabled="isProductShipped(scope.row)"
+											@click="startAddOtherAmountForRow(scope.row)"
+										>
+											鏂板
+										</el-button>
+									</div>
+
+									<div v-if="Array.isArray(scope.row.salesProductProcessList) && scope.row.salesProductProcessList.length > 0"
+										style="display:flex; flex-direction:column; gap: 8px;"
+									>
+										<div
+											v-for="(item, idx) in scope.row.salesProductProcessList"
+											:key="String(item.id) + '_' + idx"
+											style="display:flex; align-items:center; gap: 8px;"
+										>
+											<el-tag type="info" style="max-width: 170px; overflow:hidden; text-overflow:ellipsis; white-space:nowrap;">
+												{{ item.processName }}
+											</el-tag>
+											<el-input-number
+												v-model="item.quantity"
+												:min="0"
+												:step="1"
+												:precision="0"
+												style="width: 120px;"
+												placeholder="鏁伴噺"
+												:disabled="operationType === 'view' || isProductShipped(scope.row)"
+												@change="handleOtherAmountQuantityChange(scope.row)"
+											/>
+											<el-button
+												type="danger"
+												link
+												size="small"
+												:disabled="isProductShipped(scope.row)"
+												@click="removeOtherAmountAtForRow(scope.row, idx)"
+											>
+												鍒犻櫎
+											</el-button>
+										</div>
+									</div>
+									<div v-else style="color:#909399; font-size: 13px;">
+										鏆傛棤鍏朵粬閲戦
+									</div>
+								</el-popover>
+							</template>
 						</template>
 					</el-table-column>
 				</el-table>
@@ -506,17 +844,6 @@
 				<!-- 姣忚涓変釜锛氱◣鐜�/鍚◣鍗曚环/鏁伴噺 -->
 				<el-row :gutter="30">
 					<el-col :span="8">
-						<el-form-item label="绋庣巼(%)锛�" prop="taxRate">
-							<el-select v-model="productForm.taxRate" placeholder="璇烽�夋嫨" clearable @change="calculateFromTaxRate" style="width: 100%">
-								<el-option label="1" value="1" />
-								<el-option label="3" value="3" />
-								<el-option label="6" value="6" />
-								<el-option label="9" value="9" />
-								<el-option label="13" value="13" />
-							</el-select>
-						</el-form-item>
-					</el-col>
-					<el-col :span="8">
 						<el-form-item label="鍚◣鍗曚环(鍏�)锛�" prop="taxInclusiveUnitPrice">
 							<el-input-number
 								:step="0.01"
@@ -528,6 +855,17 @@
 								clearable
 								@change="calculateFromUnitPrice"
 							/>
+						</el-form-item>
+					</el-col>
+					<el-col :span="8">
+						<el-form-item label="绋庣巼(%)锛�" prop="taxRate">
+							<el-select v-model="productForm.taxRate" placeholder="璇烽�夋嫨" clearable @change="calculateFromTaxRate" style="width: 100%">
+								<el-option label="1" value="1" />
+								<el-option label="3" value="3" />
+								<el-option label="6" value="6" />
+								<el-option label="9" value="9" />
+								<el-option label="13" value="13" />
+							</el-select>
 						</el-form-item>
 					</el-col>
 					<el-col :span="8">
@@ -1090,6 +1428,319 @@
 const { productForm, productRules } = toRefs(productFormData);
 // 闃叉寰幆璁＄畻鐨勬爣蹇�
 const isCalculating = ref(false);
+
+// 浜у搧琛屽唴缂栬緫锛氬彧鍏佽鍚屾椂缂栬緫涓�琛�
+const editingProductRow = ref(null);
+
+const ensureProductRowDefaults = (row) => {
+	if (!row || typeof row !== "object") return;
+	if (!Array.isArray(row.salesProductProcessList)) row.salesProductProcessList = [];
+	if (row.__otherAmountPopoverVisible === undefined || row.__otherAmountPopoverVisible === null) row.__otherAmountPopoverVisible = false;
+	if (row.width === undefined || row.width === null) row.width = 0;
+	if (row.height === undefined || row.height === null) row.height = 0;
+	if (row.perimeter === undefined || row.perimeter === null) row.perimeter = 0;
+	if (row.actualPieceArea === undefined || row.actualPieceArea === null) row.actualPieceArea = 0;
+	if (row.actualTotalArea === undefined || row.actualTotalArea === null) row.actualTotalArea = 0;
+	if (row.settlePieceArea === undefined || row.settlePieceArea === null) row.settlePieceArea = 0;
+	if (row.settleTotalArea === undefined || row.settleTotalArea === null) row.settleTotalArea = 0;
+	if (row.processRequirement === undefined || row.processRequirement === null) row.processRequirement = "";
+	if (row.remark === undefined || row.remark === null) row.remark = "";
+	if (row.floorCode === undefined || row.floorCode === null) row.floorCode = "";
+	if (row.invoiceType === undefined || row.invoiceType === null) row.invoiceType = "";
+	if (row.taxRate === undefined || row.taxRate === null) row.taxRate = "";
+	if (row.quantity === undefined || row.quantity === null) row.quantity = 0;
+	if (row.taxInclusiveUnitPrice === undefined || row.taxInclusiveUnitPrice === null) row.taxInclusiveUnitPrice = 0;
+	if (row.taxInclusiveTotalPrice === undefined || row.taxInclusiveTotalPrice === null) row.taxInclusiveTotalPrice = 0;
+	if (row.taxExclusiveTotalPrice === undefined || row.taxExclusiveTotalPrice === null) row.taxExclusiveTotalPrice = 0;
+};
+
+const stopOtherEditingRows = () => {
+	(productData.value || []).forEach((r) => {
+		if (r && r.__editing) r.__editing = false;
+	});
+	editingProductRow.value = null;
+};
+
+const addProductInline = async () => {
+	if (operationType.value === "view") return;
+	// 宸叉湁琛屽湪缂栬緫鏃讹紝鍏堝彇娑堝叾缂栬緫鐘舵�侊紝閬垮厤娣蜂贡
+	stopOtherEditingRows();
+	await getProductOptions();
+	await fetchOtherAmountSelectOptions(true);
+	const row = {
+		id: null,
+		__tempKey: `__temp_${Date.now()}_${Math.random().toString(16).slice(2)}`,
+		__editing: true,
+		__isNew: true,
+		__productCategoryId: null,
+		productCategory: "",
+		productModelId: null,
+		specificationModel: "",
+		thickness: null,
+		quantity: 0,
+		taxInclusiveUnitPrice: 0,
+		taxRate: "",
+		taxInclusiveTotalPrice: 0,
+		taxExclusiveTotalPrice: 0,
+		invoiceType: "",
+		width: 0,
+		height: 0,
+		perimeter: 0,
+		actualPieceArea: 0,
+		actualTotalArea: 0,
+		settlePieceArea: 0,
+		settleTotalArea: 0,
+		processRequirement: "",
+		remark: "",
+		salesProductProcessList: [],
+		processFlowConfigId: null,
+		floorCode: "",
+		heavyBox: "",
+	};
+	productData.value.push(row);
+	editingProductRow.value = row;
+	// 璁╃幇鏈夌殑璁＄畻/鍏朵粬閲戦閫昏緫澶嶇敤褰撳墠琛�
+	productForm.value = row;
+};
+
+const editProductInline = async (row, index) => {
+	if (operationType.value === "view") return;
+	if (!row) return;
+	if (isProductShipped(row)) {
+		proxy.$modal.msgWarning("宸插彂璐ф垨瀹℃牳閫氳繃鐨勪骇鍝佷笉鑳界紪杈�");
+		return;
+	}
+	stopOtherEditingRows();
+	await getProductOptions();
+	await fetchOtherAmountSelectOptions(true);
+	ensureProductRowDefaults(row);
+	// 浜у搧澶х被 tree-select 鍥炴樉锛氬悕绉� -> id
+	row.__productCategoryId = findNodeIdByLabel(productOptions.value, row.productCategory);
+
+	// 鍏煎鍚庣瀛楁鍛藉悕锛堜繚鎸佸師閫昏緫锛�
+	row.actualPieceArea = row?.actualPieceArea ?? row?.actual_piece_area ?? 0;
+	row.actualTotalArea = row?.actualTotalArea ?? row?.actual_total_area ?? 0;
+	row.settlePieceArea = row?.settlePieceArea ?? row?.settle_piece_area ?? 0;
+	row.settleTotalArea = row?.settleTotalArea ?? row?.settle_total_area ?? 0;
+	row.processRequirement = row?.processRequirement ?? row?.process_requirement ?? "";
+	row.remark = row?.remark ?? row?.remarks ?? "";
+	row.floorCode = row?.floorCode ?? row?.floor_code ?? "";
+	row.processFlowConfigId = row?.processFlowConfigId ?? row?.process_flow_config_id ?? null;
+	row.perimeter = row?.perimeter ?? row?.heavyBoxPerimeter ?? row?.heavyboxPerimeter ?? 0;
+	row.thickness = row?.thickness;
+
+	row.salesProductProcessList = normalizeOtherAmountsFromRow(row);
+	mergeOtherAmountOptionsBySelection(row.salesProductProcessList);
+	row.salesProductProcessList = fillOtherAmountProcessName(row.salesProductProcessList);
+
+	// 澶囦唤鐢ㄤ簬鍙栨秷
+	row.__backup = JSON.parse(JSON.stringify(row));
+	row.__editing = true;
+	editingProductRow.value = row;
+	productForm.value = row;
+
+	// 鏍规嵁浜у搧澶х被鍚嶇О鍙嶆煡 tree 鑺傜偣 id锛屽苟鍔犺浇瑙勬牸鍨嬪彿鍒楄〃
+	try {
+		const options = productOptions.value && productOptions.value.length > 0 ? productOptions.value : await getProductOptions();
+		const categoryId = findNodeIdByLabel(options, row.productCategory);
+		if (categoryId) {
+			const models = await modelList({ id: categoryId });
+			modelOptions.value = models || [];
+			const currentModel = (modelOptions.value || []).find((m) => m.model === row.specificationModel);
+			if (currentModel) row.productModelId = currentModel.id;
+		}
+	} catch (e) {
+		console.error("鍔犺浇浜у搧瑙勬牸鍨嬪彿澶辫触", e);
+	}
+
+	// 鍚屾璁＄畻涓�娆�
+	recalcPerimeterFromWidthHeight();
+	recalcAreaFromWidthHeight();
+};
+
+const validateInlineProductRow = (row) => {
+	if (!row) return false;
+	if (!row.productCategory) {
+		proxy.$modal.msgWarning("璇烽�夋嫨浜у搧澶х被");
+		return false;
+	}
+	if (!row.productModelId) {
+		proxy.$modal.msgWarning("璇烽�夋嫨瑙勬牸鍨嬪彿");
+		return false;
+	}
+	return true;
+};
+
+const saveProductInline = async (row, index) => {
+	if (operationType.value === "view") return;
+	if (!row) return;
+	if (isProductShipped(row)) {
+		proxy.$modal.msgWarning("宸插彂璐ф垨瀹℃牳閫氳繃鐨勪骇鍝佷笉鑳界紪杈�");
+		return;
+	}
+	// 纭繚 productForm 鎸囧悜褰撳墠琛岋紝浠ュ鐢ㄨ绠楅�昏緫
+	productForm.value = row;
+	ensureProductRowDefaults(row);
+
+	if (!validateInlineProductRow(row)) return;
+
+	// 鍘氬害绮惧害澶勭悊
+	if (row.thickness !== null && row.thickness !== undefined && row.thickness !== "") {
+		row.thickness = Number(Number(row.thickness).toFixed(15));
+	}
+
+	// 鎻愪氦鍓嶅厹搴曡绠椾竴娆★紙娌跨敤鍘熼�昏緫锛�
+	recalcAreaTotals();
+
+	// 瑙勮寖鍖栧叾浠栭噾棰濇彁浜ょ粨鏋�
+	row.salesProductProcessList = (Array.isArray(row.salesProductProcessList) ? row.salesProductProcessList : [])
+		.map((it) => ({
+			id: it?.id,
+			processName: it?.processName ?? "",
+			unitPrice: Number(it?.unitPrice ?? 0) || 0,
+			quantity: Number(it?.quantity ?? 0) || 0,
+		}))
+		.filter((it) => it.id !== null && it.id !== undefined && it.id !== "");
+
+	// 瑙勬牸鍨嬪彿锛氭牴鎹� productModelId 鍥炲～鍚嶇О
+	const model = (modelOptions.value || []).find((m) => String(m.id) === String(row.productModelId));
+	if (model?.model) row.specificationModel = model.model;
+
+	if (operationType.value === "edit") {
+		// 鍙拌处宸插瓨鍦細璧板師鎺ュ彛淇濆瓨鍒板悗绔紝鍐嶅洖鎷夊埛鏂�
+		const payload = { ...row, salesLedgerId: currentId.value, type: 1 };
+		delete payload.__backup;
+		delete payload.__editing;
+		delete payload.__isNew;
+		delete payload.__productCategoryId;
+		delete payload.__tempKey;
+		await addOrUpdateSalesLedgerProduct(payload);
+		proxy.$modal.msgSuccess("鎻愪氦鎴愬姛");
+		await getSalesLedgerWithProducts({ id: currentId.value, type: 1 }).then((res) => {
+			productData.value = res.productData;
+		});
+	} else {
+		// 鏂板鍙拌处锛氫粎鍦ㄦ湰鍦� productData 鐢熸晥锛屾渶缁堥殢鍙拌处涓�璧锋彁浜�
+		row.__isNew = false;
+		row.__editing = false;
+		delete row.__backup;
+	}
+
+	stopOtherEditingRows();
+};
+
+const cancelProductInline = (row, index) => {
+	if (!row) return;
+	if (row.__isNew) {
+		productData.value.splice(index, 1);
+	} else if (row.__backup) {
+		const restored = JSON.parse(JSON.stringify(row.__backup));
+		// 淇濈暀 id 涓庣姸鎬佸瓧娈�
+		const keepId = row.id;
+		Object.keys(row).forEach((k) => delete row[k]);
+		Object.assign(row, restored);
+		row.id = keepId;
+		row.__editing = false;
+		delete row.__backup;
+	}
+	stopOtherEditingRows();
+};
+
+const openOtherAmountInline = async (row) => {
+	if (!row) return;
+	if (operationType.value === "view") return;
+	if (isProductShipped(row)) {
+		proxy.$modal.msgWarning("宸插彂璐ф垨瀹℃牳閫氳繃鐨勪骇鍝佷笉鑳界紪杈�");
+		return;
+	}
+	ensureProductRowDefaults(row);
+	productForm.value = row;
+	await fetchOtherAmountSelectOptions(true);
+	mergeOtherAmountOptionsBySelection(row.salesProductProcessList);
+	row.salesProductProcessList = fillOtherAmountProcessName(row.salesProductProcessList);
+	// 鍙仛鏁版嵁鍑嗗涓庢墦寮�娴眰锛堟柊澧炵敱娴眰鍐呮寜閽Е鍙戯級
+	row.__otherAmountPopoverVisible = true;
+};
+
+const startAddOtherAmountForRow = async (row) => {
+	if (!row) return;
+	if (operationType.value === "view") return;
+	if (isProductShipped(row)) {
+		proxy.$modal.msgWarning("宸插彂璐ф垨瀹℃牳閫氳繃鐨勪骇鍝佷笉鑳界紪杈�");
+		return;
+	}
+	ensureProductRowDefaults(row);
+	productForm.value = row;
+	await fetchOtherAmountSelectOptions(true);
+	mergeOtherAmountOptionsBySelection(row.salesProductProcessList);
+	row.salesProductProcessList = fillOtherAmountProcessName(row.salesProductProcessList);
+	startAddOtherAmount();
+};
+
+const removeOtherAmountAtForRow = (row, index) => {
+	if (!row) return;
+	if (operationType.value === "view") return;
+	if (isProductShipped(row)) return;
+	productForm.value = row;
+	removeOtherAmountAt(index);
+};
+
+const handleOtherAmountQuantityChange = (row) => {
+	if (!row) return;
+	productForm.value = row;
+	calculateFromUnitPrice(true);
+};
+
+const handleInlineProductCategoryChange = async (row, val) => {
+	if (!row) return;
+	productForm.value = row;
+	// 澶嶇敤鍘熸湁閫昏緫锛氫細鍐欏叆 productCategory(鍚嶇О)銆侀噸缃鏍�/鍘氬害骞舵媺鍙栧瀷鍙�
+	await getModels(val);
+	// 琛屽唴缂栬緫鏃舵妸閫変腑鐨� id 璁板綍涓嬫潵锛屼究浜庡洖鏄�
+	row.__productCategoryId = val;
+};
+
+const handleInlineProductModelChange = (row, val) => {
+	if (!row) return;
+	productForm.value = row;
+	// 澶嶇敤鍘熸湁閫昏緫锛氫細鍐欏叆 specificationModel銆佸帤搴�
+	getProductModel(val);
+};
+
+const handleInlineSizeChange = (row) => {
+	if (!row) return;
+	productForm.value = row;
+	recalcPerimeterFromWidthHeight();
+	recalcAreaFromWidthHeight();
+	recalcAreaTotals();
+};
+
+const handleInlineUnitPriceChange = (row) => {
+	if (!row) return;
+	productForm.value = row;
+	calculateFromUnitPrice();
+	recalcAreaTotals();
+};
+
+const handleInlineQuantityChange = (row) => {
+	if (!row) return;
+	productForm.value = row;
+	calculateFromQuantity();
+	recalcAreaTotals();
+};
+
+const handleInlineTaxRateChange = (row) => {
+	if (!row) return;
+	productForm.value = row;
+	calculateFromTaxRate();
+};
+
+const handleInlineSettleAreaChange = (row) => {
+	if (!row) return;
+	productForm.value = row;
+	recalcAreaTotals();
+	calculateFromUnitPrice(true);
+};
 const upload = reactive({
 	// 涓婁紶鐨勫湴鍧�
 	url: import.meta.env.VITE_APP_BASE_API + "/file/upload",
@@ -1844,8 +2495,19 @@
 	proxy.$refs["formRef"].validate((valid) => {
 		if (valid) {
 			console.log('productData.value--', productData.value)
+			// 琛屽唴缂栬緫鏈繚瀛樻椂涓嶅厑璁告彁浜わ紝閬垮厤鑴忔暟鎹�/涓存椂瀛楁杩涘叆鍚庣
+			const hasEditingRow = (productData.value || []).some((r) => r && r.__editing);
+			if (hasEditingRow) {
+				proxy.$modal.msgWarning("浜у搧淇℃伅瀛樺湪鏈繚瀛樼殑缂栬緫琛岋紝璇峰厛淇濆瓨鎴栧彇娑�");
+				return;
+			}
 			if (productData.value !== null && productData.value.length > 0) {
-				form.value.productData = proxy.HaveJson(productData.value);
+				const cleanedProducts = (productData.value || []).map((p) => {
+					if (!p || typeof p !== "object") return p;
+					const { __editing, __isNew, __backup, __productCategoryId, __tempKey, __otherAmountPopoverVisible, ...rest } = p;
+					return rest;
+				});
+				form.value.productData = proxy.HaveJson(cleanedProducts);
 			} else {
 				proxy.$modal.msgWarning("璇锋坊鍔犱骇鍝佷俊鎭�");
 				return;
@@ -2016,9 +2678,18 @@
 	
 	if (operationType.value === "add") {
 		productSelectedRows.value.forEach((selectedRow) => {
-			const index = productData.value.findIndex(
-				(product) => product.id === selectedRow.id
-			);
+			const index = productData.value.findIndex((product) => {
+				if (!product || !selectedRow) return false;
+				// 鏂板琛� id 涓虹┖鏃讹紝鐢ㄤ复鏃� key 瀹氫綅
+				if (product.id != null && selectedRow.id != null) {
+					return String(product.id) === String(selectedRow.id);
+				}
+				return (
+					product.__tempKey &&
+					selectedRow.__tempKey &&
+					String(product.__tempKey) === String(selectedRow.__tempKey)
+				);
+			});
 			if (index !== -1) {
 				productData.value.splice(index, 1);
 			}

--
Gitblit v1.9.3