From 0dadd48fa23109f8bb4087654d8e2dad0cbd8f20 Mon Sep 17 00:00:00 2001
From: yyb <995253665@qq.com>
Date: 星期三, 15 四月 2026 13:28:00 +0800
Subject: [PATCH] 新增入库功能至销售台账页面，支持选择入库状态并执行入库操作，提升用户交互体验
---
src/views/salesManagement/salesLedger/index.vue | 1384 ++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 1,252 insertions(+), 132 deletions(-)
diff --git a/src/views/salesManagement/salesLedger/index.vue b/src/views/salesManagement/salesLedger/index.vue
index f4643a5..0965cf1 100644
--- a/src/views/salesManagement/salesLedger/index.vue
+++ b/src/views/salesManagement/salesLedger/index.vue
@@ -3,8 +3,23 @@
<div class="search_form">
<el-form :model="searchForm" :inline="true">
<el-form-item label="瀹㈡埛鍚嶇О锛�">
- <el-input v-model="searchForm.customerName" placeholder="璇疯緭鍏�" clearable prefix-icon="Search"
- @change="handleQuery" />
+ <el-select
+ v-model="searchForm.customerId"
+ filterable
+ placeholder="璇烽�夋嫨瀹㈡埛鍚嶇О"
+ clearable
+ style="width: 220px"
+ @change="handleQuery"
+ >
+ <el-option
+ v-for="item in customerOption"
+ :key="item.id"
+ :label="item.customerName"
+ :value="item.id"
+ >
+ {{ item.customerName + "鈥斺��" + item.taxpayerIdentificationNumber }}
+ </el-option>
+ </el-select>
</el-form-item>
<el-form-item label="閿�鍞悎鍚屽彿锛�">
<el-input v-model="searchForm.salesContractNo" placeholder="璇疯緭鍏�" clearable prefix-icon="Search"
@@ -17,6 +32,20 @@
<el-form-item label="褰曞叆鏃ユ湡锛�">
<el-date-picker v-model="searchForm.entryDate" value-format="YYYY-MM-DD" format="YYYY-MM-DD" type="daterange"
placeholder="璇烽�夋嫨" clearable @change="changeDaterange" />
+ </el-form-item>
+ <el-form-item label="鍙戣揣鐘舵�侊細">
+ <el-select v-model="searchForm.deliveryStatus" placeholder="璇烽�夋嫨" clearable style="width: 140px">
+ <el-option label="鏈彂璐�" :value="1" />
+ <el-option label="瀹℃壒涓�" :value="2" />
+ <el-option label="瀹℃壒澶辫触" :value="3" />
+ <el-option label="宸插彂璐�" :value="4" />
+ </el-select>
+ </el-form-item>
+ <el-form-item label="鍏ュ簱鐘舵�侊細">
+ <el-select v-model="searchForm.stockStatus" placeholder="璇烽�夋嫨" clearable style="width: 140px">
+ <el-option label="鏈叆搴�" :value="0" />
+ <el-option label="宸插叆搴�" :value="1" />
+ </el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="handleQuery"> 鎼滅储 </el-button>
@@ -36,6 +65,7 @@
@confirm="handleProcessFlowSelectConfirm"
/>
<el-space wrap>
+ <el-button type="primary" @click="handleSalesStock">鍏ュ簱</el-button>
<el-button type="primary" @click="openForm('add')">鏂板鍙拌处</el-button>
<el-button type="primary" @click="handleBulkDelivery">鍙戣揣</el-button>
<el-button type="primary" plain @click="handleImport">瀵煎叆</el-button>
@@ -68,6 +98,7 @@
<template #default="props">
<el-table :data="props.row.children" border show-summary :summary-method="summarizeChildrenTable">
<el-table-column align="center" label="搴忓彿" type="index"/>
+ <el-table-column label="妤煎眰缂栧彿" prop="floorCode" min-width="100" show-overflow-tooltip />
<el-table-column label="浜у搧澶х被" prop="productCategory" />
<el-table-column label="瑙勬牸鍨嬪彿" prop="specificationModel" />
<el-table-column label="鍘氬害" prop="thickness" min-width="90">
@@ -75,6 +106,34 @@
{{ scope.row.thickness ?? "" }}
</template>
</el-table-column>
+ <el-table-column label="瀹�(mm)" prop="width" min-width="80">
+ <template #default="scope">
+ {{ scope.row.width ?? "" }}
+ </template>
+ </el-table-column>
+ <el-table-column label="楂�(mm)" prop="height" min-width="80">
+ <template #default="scope">
+ {{ scope.row.height ?? "" }}
+ </template>
+ </el-table-column>
+ <el-table-column label="鍛ㄩ暱(cm)" prop="perimeter" min-width="90">
+ <template #default="scope">
+ {{ scope.row.perimeter ?? "" }}
+ </template>
+ </el-table-column>
+ <el-table-column label="鎬婚潰绉�(cm虏)" prop="actualTotalArea" min-width="100">
+ <template #default="scope">
+ {{ scope.row.actualTotalArea ?? "" }}
+ </template>
+ </el-table-column>
+ <el-table-column label="鍔犲伐瑕佹眰" prop="processRequirement" min-width="120"
+ show-overflow-tooltip />
+ <el-table-column label="澶囨敞" prop="remark" min-width="120" show-overflow-tooltip />
+ <el-table-column label="閲嶇" prop="heavyBox" min-width="80">
+ <template #default="scope">
+ {{ scope.row.heavyBox ?? "" }}
+ </template>
+ </el-table-column>
<el-table-column label="浜у搧鐘舵��"
width="100px"
align="center">
@@ -87,13 +146,13 @@
<el-tag v-else type="danger">涓嶈冻</el-tag>
</template>
</el-table-column>
- <el-table-column label="鍙戣揣鐘舵��" width="140" align="center">
+ <!-- <el-table-column label="鍙戣揣鐘舵��" width="140" align="center">
<template #default="scope">
<el-tag :type="getShippingStatusType(scope.row)" size="small">
{{ getShippingStatusText(scope.row) }}
</el-tag>
</template>
- </el-table-column>
+ </el-table-column> -->
<el-table-column label="蹇�掑叕鍙�" prop="expressCompany" show-overflow-tooltip />
<el-table-column label="蹇�掑崟鍙�" prop="expressNumber" show-overflow-tooltip />
<el-table-column label="鍙戣揣杞︾墝" minWidth="100px" align="center">
@@ -140,9 +199,25 @@
<el-table-column label="瀹㈡埛鍚嶇О" prop="customerName" width="300" show-overflow-tooltip />
<el-table-column label="涓氬姟鍛�" prop="salesman" width="100" show-overflow-tooltip />
<el-table-column label="椤圭洰鍚嶇О" prop="projectName" width="180" show-overflow-tooltip />
- <el-table-column label="浠樻鏂瑰紡" prop="paymentMethod" show-overflow-tooltip />
<el-table-column label="鍚堝悓閲戦(鍏�)" prop="contractAmount" width="220" show-overflow-tooltip
:formatter="formattedNumber" />
+ <el-table-column label="鍙戣揣鐘舵��" width="140" align="center">
+ <template #default="scope">
+ <el-tag v-if="Number(scope.row.deliveryStatus) === 1" type="info">鏈彂璐�</el-tag>
+ <el-tag v-else-if="Number(scope.row.deliveryStatus) === 2" type="warning">瀹℃壒涓�</el-tag>
+ <el-tag v-else-if="Number(scope.row.deliveryStatus) === 3" type="danger">瀹℃壒涓嶉�氳繃</el-tag>
+ <el-tag v-else-if="Number(scope.row.deliveryStatus) === 4" type="primary">瀹℃壒閫氳繃</el-tag>
+ <el-tag v-else-if="Number(scope.row.deliveryStatus) === 5" type="success">宸插彂璐�</el-tag>
+ <el-tag v-else type="info">-</el-tag>
+ </template>
+ </el-table-column>
+ <el-table-column label="鍏ュ簱鐘舵��" width="120" align="center">
+ <template #default="scope">
+ <el-tag v-if="Number(scope.row.stockStatus) === 0" type="info">鏈叆搴�</el-tag>
+ <el-tag v-else-if="Number(scope.row.stockStatus) === 1" type="success">宸插叆搴�</el-tag>
+ <el-tag v-else type="info">-</el-tag>
+ </template>
+ </el-table-column>
<el-table-column label="褰曞叆浜�" prop="entryPersonName" width="100" show-overflow-tooltip />
<el-table-column label="褰曞叆鏃ユ湡" prop="entryDate" width="120" show-overflow-tooltip />
<el-table-column label="绛捐鏃ユ湡" prop="executionDate" width="120" show-overflow-tooltip />
@@ -188,7 +263,7 @@
<el-row :gutter="30">
<el-col :span="12">
<el-form-item label="瀹㈡埛鍚嶇О锛�" prop="customerId">
- <el-select v-model="form.customerId" placeholder="璇烽�夋嫨" clearable :disabled="operationType === 'view'">
+ <el-select v-model="form.customerId" filterable placeholder="璇烽�夋嫨" clearable :disabled="operationType === 'view'">
<el-option v-for="item in customerOption" :key="item.id" :label="item.customerName" :value="item.id">
{{
item.customerName + "鈥斺��" + item.taxpayerIdentificationNumber
@@ -210,11 +285,12 @@
format="YYYY-MM-DD" type="date" placeholder="璇烽�夋嫨" clearable :disabled="operationType === 'view'" />
</el-form-item>
</el-col>
- <el-col :span="12">
- <el-form-item label="浠樻鏂瑰紡">
- <el-input v-model="form.paymentMethod" placeholder="璇疯緭鍏�" clearable :disabled="operationType === 'view'" />
- </el-form-item>
- </el-col>
+ <el-col :span="12">
+ <el-form-item label="浜よ揣鏃ユ湡锛�" prop="deliveryDate">
+ <el-date-picker style="width: 100%" v-model="form.deliveryDate" value-format="YYYY-MM-DD" format="YYYY-MM-DD"
+ type="date" placeholder="璇烽�夋嫨" clearable />
+ </el-form-item>
+ </el-col>
</el-row>
<el-row :gutter="30">
<el-col :span="12">
@@ -234,17 +310,16 @@
</el-form-item>
</el-col>
</el-row>
- <el-row :gutter="30">
- <el-col :span="12">
- <el-form-item label="浜よ揣鏃ユ湡锛�" prop="entryDate">
- <el-date-picker style="width: 100%" v-model="form.deliveryDate" value-format="YYYY-MM-DD" format="YYYY-MM-DD"
- type="date" placeholder="璇烽�夋嫨" clearable />
- </el-form-item>
- </el-col>
- </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"
+ :disabled="hasEditingProductRow()"
+ @click="addProductInline"
+ >
+ 娣诲姞
+ </el-button>
<el-button v-if="operationType !== 'view'" plain type="danger" @click="deleteProduct" >鍒犻櫎</el-button>
</el-form-item>
</el-row>
@@ -253,23 +328,456 @@
<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="thickness" min-width="90">
+ <el-table-column label="浜у搧澶х被" prop="productCategory" min-width="160">
<template #default="scope">
- {{ scope.row.thickness ?? "" }}
+ <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="quantity" />
- <el-table-column label="绋庣巼(%)" prop="taxRate" />
- <el-table-column label="鍚◣鍗曚环(鍏�)" prop="taxInclusiveUnitPrice" :formatter="formattedNumber" />
- <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="specificationModel" min-width="160">
<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.productModelId"
+ placeholder="璇烽�夋嫨"
+ clearable
+ filterable
+ style="width: 100%"
+ @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="鍘氬害(mm)" prop="thickness" min-width="160">
+ <template #default="scope">
+ <el-input-number
+ v-if="scope.row.__editing"
+ v-model="scope.row.thickness"
+ :min="0"
+ :step="0.000000000000001"
+ :precision="15"
+ style="width: 100%"
+ placeholder="璇疯緭鍏�"
+ clearable
+ />
+ <span v-else>{{ scope.row.thickness ?? "" }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column label="瀹�(mm)" prop="width" min-width="160">
+ <template #default="scope">
+ <el-input-number
+ v-if="scope.row.__editing"
+ v-model="scope.row.width"
+ :min="0"
+ :step="1"
+ :precision="2"
+ style="width:100%"
+ placeholder="璇疯緭鍏�"
+ clearable
+ @change="() => handleInlineSizeChange(scope.row)"
+ @input="() => handleInlineSizeChange(scope.row)"
+ />
+ <span v-else>{{ scope.row.width ?? "" }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column label="楂�(mm)" prop="height" min-width="160">
+ <template #default="scope">
+ <el-input-number
+ v-if="scope.row.__editing"
+ v-model="scope.row.height"
+ :min="0"
+ :step="1"
+ :precision="2"
+ style="width: 100%"
+ placeholder="璇疯緭鍏�"
+ clearable
+ @change="() => handleInlineSizeChange(scope.row)"
+ @input="() => handleInlineSizeChange(scope.row)"
+ />
+ <span v-else>{{ scope.row.height ?? "" }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column label="缁撶畻鍗曠墖闈㈢Н(銕�)" prop="settlePieceArea" min-width="160">
+ <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: 100%"
+ placeholder="璇疯緭鍏�"
+ clearable
+ @change="() => handleInlineSettleAreaChange(scope.row)"
+ />
+ <span v-else>{{ scope.row.settlePieceArea ?? "" }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column label="鏁伴噺" prop="quantity" min-width="150">
+ <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: 100%"
+ placeholder="璇疯緭鍏�"
+ clearable
+ @change="() => handleInlineQuantityChange(scope.row)"
+ @input="() => handleInlineQuantityChange(scope.row)"
+ />
+ <span v-else>{{ scope.row.quantity ?? "" }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column label="闈㈢Н(m虏)" prop="actualTotalArea" min-width="160">
+ <template #default="scope">
+ <el-input-number
+ v-if="scope.row.__editing"
+ v-model="scope.row.actualTotalArea"
+ :min="0"
+ :step="0.00001"
+ :precision="5"
+ style="width: 100%"
+ placeholder="鑷姩璁＄畻"
+ />
+ <span v-else>{{ scope.row.actualTotalArea ?? "" }}</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: 100%"
+ v-model="scope.row.taxInclusiveUnitPrice"
+ placeholder="璇疯緭鍏�"
+ clearable
+ @change="() => handleInlineUnitPriceChange(scope.row)"
+ @input="() => 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="120">
+ <template #default="scope">
+ <el-select
+ v-if="scope.row.__editing"
+ v-model="scope.row.taxRate"
+ placeholder="璇烽�夋嫨"
+ clearable
+ style="width: 100%"
+ @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" min-width="120"/>
+ <el-table-column label="涓嶅惈绋庢�讳环(鍏�)" prop="taxExclusiveTotalPrice" :formatter="formattedNumber" min-width="120"/>
+ <el-table-column label="鍙戠エ绫诲瀷" prop="invoiceType" min-width="120">
+ <template #default="scope">
+ <el-select
+ v-if="scope.row.__editing"
+ v-model="scope.row.invoiceType"
+ placeholder="璇烽�夋嫨"
+ clearable
+ style="width: 100%"
+ >
+ <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="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: 100%"
+ />
+ <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: 100%"
+ />
+ <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: 100%"
+ />
+ <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: 100%"
+ />
+ <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="560"
+ trigger="click"
+ :hide-after="0"
+ :visible="scope.row.__otherAmountPopoverVisible"
+ @update:visible="(val) => handleOtherAmountPopoverVisibleChange(scope.row, val)"
+ >
+ <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="scope.row.__inlineOtherAmountAdding"
+ style="display:flex; flex-direction:column; gap: 8px; margin-bottom: 10px;"
+ @click.stop
+ >
+ <el-select
+ v-model="scope.row.__inlineOtherAmountAddId"
+ filterable
+ clearable
+ placeholder="璇烽�夋嫨鍏朵粬閲戦椤圭洰"
+ style="width: 100%;"
+ >
+ <el-option
+ v-for="item in otherAmountSelectOptions"
+ :key="item.id"
+ :label="item.processName"
+ :value="item.id"
+ />
+ </el-select>
+ <div style="display:flex; justify-content:flex-end; gap: 8px;">
+ <el-button
+ size="small"
+ @click="scope.row.__inlineOtherAmountAdding = false; scope.row.__inlineOtherAmountAddId = null"
+ >
+ 鍙栨秷
+ </el-button>
+ <el-button
+ type="primary"
+ size="small"
+ :disabled="scope.row.__inlineOtherAmountAddId === null || scope.row.__inlineOtherAmountAddId === undefined || scope.row.__inlineOtherAmountAddId === ''"
+ @click="confirmAddOtherAmountForRow(scope.row)"
+ >
+ 纭娣诲姞
+ </el-button>
+ </div>
+ </div>
+
+ <div v-if="Array.isArray(scope.row.salesProductProcessList) && scope.row.salesProductProcessList.length > 0"
+ style="display:flex; flex-wrap:wrap; gap: 8px;"
+ >
+ <div
+ v-for="(item, idx) in scope.row.salesProductProcessList"
+ :key="String(item.id) + '_' + idx"
+ style="display:flex; align-items:center; gap: 8px; flex: 0 0 calc(50% - 4px); max-width: calc(50% - 4px);"
+ >
+ <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="560"
+ trigger="click"
+ :hide-after="0"
+ :visible="scope.row.__otherAmountPopoverVisible"
+ @update:visible="(val) => handleOtherAmountPopoverVisibleChange(scope.row, val)"
+ >
+ <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="scope.row.__inlineOtherAmountAdding"
+ style="display:flex; flex-direction:column; gap: 8px; margin-bottom: 10px;"
+ @click.stop
+ >
+ <el-select
+ v-model="scope.row.__inlineOtherAmountAddId"
+ filterable
+ clearable
+ placeholder="璇烽�夋嫨鍏朵粬閲戦椤圭洰"
+ style="width: 100%;"
+ :disabled="isProductShipped(scope.row)"
+ >
+ <el-option
+ v-for="item in otherAmountSelectOptions"
+ :key="item.id"
+ :label="item.processName"
+ :value="item.id"
+ />
+ </el-select>
+ <div style="display:flex; justify-content:flex-end; gap: 8px;">
+ <el-button
+ size="small"
+ :disabled="isProductShipped(scope.row)"
+ @click="scope.row.__inlineOtherAmountAdding = false; scope.row.__inlineOtherAmountAddId = null"
+ >
+ 鍙栨秷
+ </el-button>
+ <el-button
+ type="primary"
+ size="small"
+ :disabled="isProductShipped(scope.row) || scope.row.__inlineOtherAmountAddId === null || scope.row.__inlineOtherAmountAddId === undefined || scope.row.__inlineOtherAmountAddId === ''"
+ @click="confirmAddOtherAmountForRow(scope.row)"
+ >
+ 纭娣诲姞
+ </el-button>
+ </div>
+ </div>
+
+ <div v-if="Array.isArray(scope.row.salesProductProcessList) && scope.row.salesProductProcessList.length > 0"
+ style="display:flex; flex-wrap:wrap; gap: 8px;"
+ >
+ <div
+ v-for="(item, idx) in scope.row.salesProductProcessList"
+ :key="String(item.id) + '_' + idx"
+ style="display:flex; align-items:center; gap: 8px; flex: 0 0 calc(50% - 4px); max-width: calc(50% - 4px);"
+ >
+ <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>
@@ -395,6 +903,8 @@
v-model="productForm.productCategory"
placeholder="璇烽�夋嫨"
clearable
+ filterable
+ :filter-node-method="filterProductCategoryNode"
check-strictly
@change="getModels"
:data="productOptions"
@@ -435,15 +945,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="6" value="6" />
- <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"
@@ -455,6 +956,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">
@@ -677,11 +1189,12 @@
<el-input-number
v-model="item.quantity"
:min="0"
- :step="0.1"
- :precision="2"
+ :step="1"
+ :precision="0"
style="width: 100%;"
placeholder="璇疯緭鍏ユ暟閲�"
:disabled="operationType === 'view'"
+ @change="calculateFromUnitPrice(true)"
/>
</div>
<el-button
@@ -866,7 +1379,7 @@
<script setup>
import { getToken } from "@/utils/auth";
import pagination from "@/components/PIMTable/Pagination.vue";
-import {onMounted, ref, getCurrentInstance} from "vue";
+import {onMounted, ref, getCurrentInstance, watch, nextTick} from "vue";
import { addShippingInfo } from "@/api/salesManagement/deliveryLedger.js";
import { ElMessageBox, ElMessage } from "element-plus";
import { ArrowDown } from "@element-plus/icons-vue";
@@ -896,6 +1409,7 @@
getSalesOrder,
getSalesInvoices,
getSalesLabel,
+ salesStock,
} from "@/api/salesManagement/salesLedger.js";
import { modelList, productTreeList } from "@/api/basicData/product.js";
import useFormData from "@/hooks/useFormData.js";
@@ -938,10 +1452,13 @@
const data = reactive({
searchForm: {
customerName: "", // 瀹㈡埛鍚嶇О
+ customerId: "", // 瀹㈡埛ID锛堟煡璇笅鎷夛級
salesContractNo: "", // 閿�鍞悎鍚岀紪鍙�
entryDate: null, // 褰曞叆鏃ユ湡
entryDateStart: undefined,
entryDateEnd: undefined,
+ deliveryStatus: undefined, // 鍙戣揣鐘舵�侊細1鏈彂璐� 2瀹℃壒涓� 3瀹℃壒澶辫触 4宸插彂璐�
+ stockStatus: undefined, // 鍏ュ簱鐘舵�侊細0鏈叆搴� 1宸插叆搴�
},
form: {
salesContractNo: "",
@@ -965,6 +1482,17 @@
});
const { form, rules } = toRefs(data);
const { form: searchForm } = useFormData(data.searchForm);
+
+// 鏂板鍙拌处锛氬綍鍏ユ棩鏈熷彉鏇存椂锛屼氦璐ф棩鏈熼粯璁や繚鎸佷负褰曞叆鏃ユ湡鍚庣 7 澶�
+watch(
+ () => [operationType.value, form.value?.entryDate],
+ () => {
+ if (operationType.value !== "add") return;
+ const ed = form.value?.entryDate;
+ if (!ed) return;
+ form.value.deliveryDate = dayjs(ed).add(7, "day").format("YYYY-MM-DD");
+ }
+);
// 浜у搧琛ㄥ崟寮规鏁版嵁
const productFormVisible = ref(false);
const productOperationType = ref("");
@@ -998,27 +1526,396 @@
productRules: {
productCategory: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
productModelId: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
- specificationModel: [
- { required: true, message: "璇烽�夋嫨", trigger: "change" },
- ],
- thickness: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
- quantity: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
- taxInclusiveUnitPrice: [
- { required: true, message: "璇疯緭鍏�", trigger: "blur" },
- ],
- taxRate: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
- taxInclusiveTotalPrice: [
- { required: true, message: "璇疯緭鍏�", trigger: "blur" },
- ],
- taxExclusiveTotalPrice: [
- { required: true, message: "璇疯緭鍏�", trigger: "blur" },
- ],
- invoiceType: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
},
});
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.__inlineOtherAmountAdding === undefined || row.__inlineOtherAmountAdding === null) row.__inlineOtherAmountAdding = false;
+ if (row.__inlineOtherAmountAddId === undefined) row.__inlineOtherAmountAddId = null;
+ 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 hasEditingProductRow = () => {
+ return (productData.value || []).some((r) => r && r.__editing);
+};
+
+const addProductInline = async () => {
+ if (operationType.value === "view") return;
+ if (hasEditingProductRow()) {
+ proxy.$modal.msgWarning("璇峰厛淇濆瓨鎴栧彇娑堝綋鍓嶇紪杈戣");
+ return;
+ }
+ 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();
+ // 鎻愪氦鍏滃簳锛氱◣鐜�/鏁伴噺鏈～鏃舵寜鏁板瓧 0 浼犻��
+ row.taxRate = Number(row.taxRate ?? 0) || 0;
+ row.quantity = Number(row.quantity ?? 0) || 0;
+
+ // 瑙勮寖鍖栧叾浠栭噾棰濇彁浜ょ粨鏋�
+ 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;
+ otherAmountAddTargetRow.value = row;
+ await fetchOtherAmountSelectOptions(true);
+ mergeOtherAmountOptionsBySelection(row.salesProductProcessList);
+ row.salesProductProcessList = fillOtherAmountProcessName(row.salesProductProcessList);
+ // 鍙仛鏁版嵁鍑嗗涓庢墦寮�娴眰锛堟柊澧炵敱娴眰鍐呮寜閽Е鍙戯級
+ row.__otherAmountPopoverVisible = true;
+};
+
+const keepOtherAmountPopoverOpenKey = ref(null);
+const keepOtherAmountPopoverOpenUntil = ref(0);
+
+const getOtherAmountRowKey = (row) => String(row?.__tempKey ?? row?.id ?? "");
+
+const lockOtherAmountPopoverOpen = (row, durationMs = 1200) => {
+ const key = getOtherAmountRowKey(row);
+ if (!key) return;
+ keepOtherAmountPopoverOpenKey.value = key;
+ keepOtherAmountPopoverOpenUntil.value = Date.now() + durationMs;
+};
+
+const handleOtherAmountPopoverVisibleChange = (row, visible) => {
+ if (!row) return;
+ if (visible) {
+ row.__otherAmountPopoverVisible = true;
+ return;
+ }
+ if (row.__inlineOtherAmountAdding) {
+ row.__otherAmountPopoverVisible = true;
+ return;
+ }
+ const key = getOtherAmountRowKey(row);
+ const shouldKeepOpen = Boolean(
+ key &&
+ keepOtherAmountPopoverOpenKey.value === key &&
+ Date.now() < keepOtherAmountPopoverOpenUntil.value
+ );
+ row.__otherAmountPopoverVisible = shouldKeepOpen;
+};
+
+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);
+ row.__inlineOtherAmountAddId = null;
+ row.__inlineOtherAmountAdding = true;
+ row.__otherAmountPopoverVisible = true;
+};
+
+const confirmAddOtherAmountForRow = (row) => {
+ if (!row) return;
+ ensureProductRowDefaults(row);
+ productForm.value = row;
+ const selectedId = row.__inlineOtherAmountAddId;
+ if (selectedId === null || selectedId === undefined || selectedId === "") return;
+ const opt = otherAmountSelectOptions.value.find((o) => String(o.id) === String(selectedId));
+ if (!opt) return;
+ const exists = (row.salesProductProcessList ?? []).some(
+ (it) => String(it?.id) === String(opt.id)
+ );
+ if (exists) {
+ proxy.$modal.msgWarning("璇ュ叾浠栭噾棰濋」鐩凡娣诲姞");
+ return;
+ }
+ row.salesProductProcessList.push({
+ id: opt.id,
+ processName: opt.processName,
+ unitPrice: opt.unitPrice ?? 0,
+ quantity: 0,
+ });
+ row.__inlineOtherAmountAddId = null;
+ row.__inlineOtherAmountAdding = false;
+ row.__otherAmountPopoverVisible = true;
+ calculateFromUnitPrice(true);
+};
+
+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",
@@ -1049,7 +1946,7 @@
type: "璐ц溅", // 璐ц溅, 蹇��
},
deliveryRules: {
- type: [
+ type: [
{ required: true, message: "璇烽�夋嫨鍙戣揣绫诲瀷", trigger: "change" }
]
},
@@ -1075,6 +1972,7 @@
otherAmountSelectOptions.value = records.map((item) => ({
id: item.id,
processName: item.processName ?? "",
+ unitPrice: item.unitPrice ?? 0,
}));
} finally {
otherAmountSelectOptionsLoading.value = false;
@@ -1146,6 +2044,7 @@
return {
id: s.id,
processName: opt?.processName ?? s.processName ?? "",
+ unitPrice: opt?.unitPrice ?? s.unitPrice ?? 0,
quantity: Number(s.quantity ?? 0) || 0,
};
});
@@ -1168,6 +2067,8 @@
// 鍏朵粬閲戦锛氱偣鍑烩�滄柊澧炩�濆悗鍦ㄥ脊绐楅噷閫夋嫨涓�涓」鐩�
const otherAmountAddDialogVisible = ref(false);
const otherAmountAddId = ref(null);
+const otherAmountAddTargetRow = ref(null);
+const otherAmountAddTargetRowKey = ref(null);
const startAddOtherAmount = () => {
if (operationType.value === "view") return;
@@ -1182,6 +2083,10 @@
const cancelAddOtherAmount = () => {
otherAmountAddDialogVisible.value = false;
otherAmountAddId.value = null;
+ otherAmountAddTargetRow.value = null;
+ otherAmountAddTargetRowKey.value = null;
+ keepOtherAmountPopoverOpenKey.value = null;
+ keepOtherAmountPopoverOpenUntil.value = 0;
};
const handleOtherAmountSelected = (id) => {
@@ -1201,12 +2106,35 @@
productForm.value.salesProductProcessList.push({
id: opt.id,
processName: opt.processName,
+ unitPrice: opt.unitPrice ?? 0,
quantity: 0,
});
+ calculateFromUnitPrice(true);
- // 閫夋嫨瀹屾垚鍚庡叧闂脊绐楋紝涓嬩竴娆″彲鍐嶆鐐瑰嚮鈥滄柊澧炩�濈户缁坊鍔�
+ // 閫夋嫨瀹屾垚鍚庡叧闂�滄柊澧炲叾浠栭噾棰濃�濆脊绐楋紝骞朵繚鎸佽鍐呪�滃叾浠栭噾棰濃�濆脊灞傚紑鍚紝渚夸簬鐩存帴濉啓鏁伴噺
otherAmountAddDialogVisible.value = false;
otherAmountAddId.value = null;
+ const reopenOtherAmountPopover = () => {
+ let targetRow = otherAmountAddTargetRow.value;
+ const rowKey = otherAmountAddTargetRowKey.value;
+ if (rowKey) {
+ const matchedRow = (productData.value || []).find(
+ (it) => String(it?.__tempKey ?? it?.id ?? "") === rowKey
+ );
+ if (matchedRow) targetRow = matchedRow;
+ }
+ if (targetRow && typeof targetRow === "object") {
+ lockOtherAmountPopoverOpen(targetRow, 1500);
+ targetRow.__otherAmountPopoverVisible = true;
+ }
+ };
+ nextTick(() => {
+ reopenOtherAmountPopover();
+ setTimeout(reopenOtherAmountPopover, 0);
+ setTimeout(reopenOtherAmountPopover, 80);
+ });
+ otherAmountAddTargetRow.value = null;
+ otherAmountAddTargetRowKey.value = null;
};
const confirmAddOtherAmount = () => {
@@ -1217,6 +2145,7 @@
if (operationType.value === "view") return;
if (!Array.isArray(productForm.value?.salesProductProcessList)) return;
productForm.value.salesProductProcessList.splice(index, 1);
+ calculateFromUnitPrice(true);
};
// 鍙戣揣瀹℃壒浜鸿妭鐐癸紙浠垮崗鍚屽鎵� infoFormDia.vue锛�
@@ -1311,6 +2240,21 @@
const params = { ...rest, ...page };
// 绉婚櫎褰曞叆鏃ユ湡鐨勯粯璁ゅ�艰缃紝鍙繚鐣欒寖鍥存棩鏈熷瓧娈�
delete params.entryDate;
+ // 鏌ヨ瀹㈡埛鍚嶇О涓庢柊澧炰繚鎸佷竴鑷达細鍏堥�� customerId锛屽啀鏄犲皠涓� customerName 鏌ヨ
+ const selectedCustomer = (customerOption.value || []).find(
+ (item) => String(item?.id ?? "") === String(params.customerId ?? "")
+ );
+ if (selectedCustomer?.customerName) {
+ params.customerName = String(selectedCustomer.customerName).trim();
+ } else {
+ const cn = params.customerName != null ? String(params.customerName).trim() : "";
+ if (cn) {
+ params.customerName = cn;
+ } else {
+ delete params.customerName;
+ }
+ }
+ delete params.customerId;
return ledgerListPage(params)
.then((res) => {
tableLoading.value = false;
@@ -1324,6 +2268,43 @@
.catch(() => {
tableLoading.value = false;
});
+};
+
+// 鍏ュ簱锛堥攢鍞彴璐� -> 鍏ュ簱鐘舵�侊級
+const handleSalesStock = async () => {
+ if (selectedRows.value.length !== 1) {
+ ElMessage.warning("璇峰嬀閫変竴鏉″彴璐︽暟鎹繘琛屽叆搴�");
+ return;
+ }
+ const row = selectedRows.value[0] || {};
+ const id = row?.id;
+ if (!id) {
+ ElMessage.warning("鎵�閫夋暟鎹己灏慽d锛屾棤娉曞叆搴�");
+ return;
+ }
+ if (Number(row.stockStatus) === 1) {
+ ElMessage.info("璇ュ彴璐﹀凡鍏ュ簱锛屾棤闇�閲嶅鎿嶄綔");
+ return;
+ }
+ try {
+ await ElMessageBox.confirm("纭瀵规墍閫夊彴璐︽墽琛屽叆搴擄紵", "鎻愮ず", {
+ confirmButtonText: "纭畾",
+ cancelButtonText: "鍙栨秷",
+ type: "warning",
+ });
+ } catch {
+ return;
+ }
+ proxy?.$modal?.loading?.("姝ｅ湪鍏ュ簱锛岃绋嶅��...");
+ try {
+ await salesStock({ id });
+ proxy?.$modal?.msgSuccess?.("鍏ュ簱鎴愬姛");
+ await getList();
+ } catch (e) {
+ proxy?.$modal?.msgError?.("鍏ュ簱澶辫触锛岃绋嶅悗閲嶈瘯");
+ } finally {
+ proxy?.$modal?.closeLoading?.();
+ }
};
// 鎵撳紑鈥滃伐鑹鸿矾绾块厤缃�濋�夋嫨寮圭獥锛堝繀椤绘樉寮忛�夋嫨锛�
@@ -1418,18 +2399,44 @@
};
// 鑾峰彇tree瀛愭暟鎹�
const getModels = (value) => {
+ // 浜у搧澶х被鍙樺寲鏃讹紝閲嶇疆瑙勬牸鍨嬪彿涓庡帤搴︼紝閬垮厤鏃у�兼畫鐣�
+ productForm.value.productModelId = null;
+ productForm.value.specificationModel = "";
+ productForm.value.thickness = null;
+
+ if (!value) {
+ productForm.value.productCategory = "";
+ modelOptions.value = [];
+ return;
+ }
+
productForm.value.productCategory = findNodeById(productOptions.value, value);
modelList({ id: value }).then((res) => {
- modelOptions.value = res;
+ modelOptions.value = res || [];
});
};
const getProductModel = (value) => {
const index = modelOptions.value.findIndex((item) => item.id === value);
if (index !== -1) {
productForm.value.specificationModel = modelOptions.value[index].model;
+ const selectedModel = modelOptions.value[index];
+ const modelThickness =
+ selectedModel?.thickness ??
+ selectedModel?.modelThickness ??
+ selectedModel?.thick ??
+ null;
+ productForm.value.thickness =
+ modelThickness === null || modelThickness === undefined || modelThickness === ""
+ ? null
+ : Number(modelThickness);
} else {
productForm.value.specificationModel = null;
+ productForm.value.thickness = null;
}
+};
+const filterProductCategoryNode = (value, data) => {
+ if (!value) return true;
+ return String(data?.label || "").toLowerCase().includes(String(value).toLowerCase());
};
const findNodeById = (nodes, productId) => {
for (let i = 0; i < nodes.length; i++) {
@@ -1445,15 +2452,18 @@
}
return null; // 娌℃湁鎵惧埌鑺傜偣锛岃繑鍥瀗ull
};
-function convertIdToValue(data) {
+function convertIdToValue(data, level = 0) {
return data.map((item) => {
const { id, children, ...rest } = item;
+ const hasChildren = Array.isArray(children) && children.length > 0;
const newItem = {
...rest,
value: id, // 灏� id 鏀逛负 value
+ // 浠呭厑璁稿彾瀛愯妭鐐硅閫夋嫨锛堟湁瀛愯妭鐐圭殑鍒嗙被鑺傜偣缁熶竴绂佺敤锛�
+ disabled: Boolean(rest?.disabled) || hasChildren,
};
- if (children && children.length > 0) {
- newItem.children = convertIdToValue(children);
+ if (hasChildren) {
+ newItem.children = convertIdToValue(children, level + 1);
}
return newItem;
@@ -1570,6 +2580,9 @@
// }
// });
form.value.entryDate = getCurrentDate(); // 璁剧疆榛樿褰曞叆鏃ユ湡涓哄綋鍓嶆棩鏈�
+ if (type === "add") {
+ form.value.deliveryDate = dayjs(form.value.entryDate).add(7, "day").format("YYYY-MM-DD");
+ }
dialogFormVisible.value = true;
};
@@ -1724,8 +2737,21 @@
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;
+ rest.taxRate = Number(rest.taxRate ?? 0) || 0;
+ rest.quantity = Number(rest.quantity ?? 0) || 0;
+ return rest;
+ });
+ form.value.productData = proxy.HaveJson(cleanedProducts);
} else {
proxy.$modal.msgWarning("璇锋坊鍔犱骇鍝佷俊鎭�");
return;
@@ -1736,7 +2762,9 @@
}
form.value.tempFileIds = tempFileIds;
form.value.type = 1;
- addOrUpdateSalesLedger(form.value).then((res) => {
+ const submitPayload = { ...form.value };
+ delete submitPayload.paymentMethod;
+ addOrUpdateSalesLedger(submitPayload).then((res) => {
proxy.$modal.msgSuccess("鎻愪氦鎴愬姛");
closeDia();
getList();
@@ -1841,17 +2869,21 @@
// 闈㈢Н/鎬昏瀛楁鍦ㄦ彁浜ゅ墠鍏滃簳璁＄畻涓�娆�
recalcAreaTotals();
+ // 鎻愪氦鍏滃簳锛氱◣鐜�/鏁伴噺鏈～鏃舵寜鏁板瓧 0 浼犻��
+ productForm.value.taxRate = Number(productForm.value.taxRate ?? 0) || 0;
+ productForm.value.quantity = Number(productForm.value.quantity ?? 0) || 0;
// 鍏朵粬閲戦鍙彁浜� {id, processName, quantity}锛堝悗绔瓧娈碉細salesProductProcessList锛�
productForm.value.salesProductProcessList = (Array.isArray(productForm.value.salesProductProcessList)
- ? productForm.value.salesProductProcessList
- : []
- )
- .map((it) => ({
- id: it?.id,
- processName: it?.processName ?? "",
- quantity: Number(it?.quantity ?? 0) || 0,
- }))
- .filter((it) => it.id !== null && it.id !== undefined && it.id !== "");
+ ? productForm.value.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 !== "");
if (operationType.value === "edit") {
submitProductEdit();
@@ -1893,9 +2925,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);
}
@@ -2155,12 +3196,15 @@
return;
}
const settlePieceArea = parseFloat(productForm.value.settlePieceArea) || 1;
- // 鍚◣鎬讳环璁＄畻 = 鍗曚环 * 缁撶畻闈㈢Н * 鏁伴噺
- productForm.value.taxInclusiveTotalPrice =
- proxy.calculateTaxIncludeTotalPrice(
- productForm.value.taxInclusiveUnitPrice * settlePieceArea,
- productForm.value.quantity
- );
+ // 鍚◣鎬讳环璁＄畻 = 鍗曚环 * 缁撶畻闈㈢Н * 鏁伴噺 + 鍏朵粬閲戦鎬诲拰
+ const basePrice = proxy.calculateTaxIncludeTotalPrice(
+ productForm.value.taxInclusiveUnitPrice * settlePieceArea,
+ productForm.value.quantity
+ );
+ const otherAmountTotal = (productForm.value.salesProductProcessList || []).reduce((total, item) => {
+ return total + (Number(item.unitPrice) || 0) * (Number(item.quantity) || 0);
+ }, 0);
+ productForm.value.taxInclusiveTotalPrice = (parseFloat(basePrice) + otherAmountTotal).toFixed(2);
if (productForm.value.taxRate) {
// 涓嶅惈绋庢�讳环璁＄畻
productForm.value.taxExclusiveTotalPrice =
@@ -2242,8 +3286,12 @@
isCalculating.value = true;
- // 璁＄畻鍚◣鍗曚环 = 鍚◣鎬讳环 / 鏁伴噺
- productForm.value.taxInclusiveUnitPrice = (totalPrice / quantity).toFixed(2);
+ // 璁＄畻鍚◣鍗曚环 = (鍚◣鎬讳环 - 鍏朵粬閲戦鎬诲拰) / 鏁伴噺
+ const otherAmountTotal = (productForm.value.salesProductProcessList || []).reduce((total, item) => {
+ return total + (Number(item.unitPrice) || 0) * (Number(item.quantity) || 0);
+ }, 0);
+ const basePrice = totalPrice - otherAmountTotal;
+ productForm.value.taxInclusiveUnitPrice = (basePrice / quantity).toFixed(2);
// 濡傛灉鏈夌◣鐜囷紝璁＄畻涓嶅惈绋庢�讳环
if (productForm.value.taxRate) {
@@ -2259,10 +3307,10 @@
// 鏍规嵁涓嶅惈绋庢�讳环璁＄畻鍚◣鍗曚环鍜屾暟閲�
const calculateFromExclusiveTotalPrice = () => {
- if (!productForm.value.taxRate) {
- proxy.$modal.msgWarning("璇峰厛閫夋嫨绋庣巼");
- return;
- }
+ // if (!productForm.value.taxRate) {
+ // proxy.$modal.msgWarning("璇峰厛閫夋嫨绋庣巼");
+ // return;
+ // }
if (isCalculating.value) return;
const exclusiveTotalPrice = parseFloat(productForm.value.taxExclusiveTotalPrice);
@@ -2280,18 +3328,22 @@
const inclusiveTotalPrice = exclusiveTotalPrice / (1 - taxRateDecimal);
productForm.value.taxInclusiveTotalPrice = inclusiveTotalPrice.toFixed(2);
- // 璁＄畻鍚◣鍗曚环 = 鍚◣鎬讳环 / 鏁伴噺
- productForm.value.taxInclusiveUnitPrice = (inclusiveTotalPrice / quantity).toFixed(2);
+ // 璁＄畻鍚◣鍗曚环 = (鍚◣鎬讳环 - 鍏朵粬閲戦鎬诲拰) / 鏁伴噺
+ const otherAmountTotal = (productForm.value.salesProductProcessList || []).reduce((total, item) => {
+ return total + (Number(item.unitPrice) || 0) * (Number(item.quantity) || 0);
+ }, 0);
+ const basePrice = inclusiveTotalPrice - otherAmountTotal;
+ productForm.value.taxInclusiveUnitPrice = (basePrice / quantity).toFixed(2);
isCalculating.value = false;
};
// 鏍规嵁鏁伴噺鍙樺寲璁＄畻鎬讳环
const calculateFromQuantity = () => {
- if (!productForm.value.taxRate) {
- proxy.$modal.msgWarning("璇峰厛閫夋嫨绋庣巼");
- return;
- }
+ // if (!productForm.value.taxRate) {
+ // proxy.$modal.msgWarning("璇峰厛閫夋嫨绋庣巼");
+ // return;
+ // }
if (isCalculating.value) return;
const quantity = parseFloat(productForm.value.quantity);
@@ -2304,8 +3356,12 @@
isCalculating.value = true;
- // 璁＄畻鍚◣鎬讳环 = 鍗曚环 * 缁撶畻闈㈢Н * 鏁伴噺
- productForm.value.taxInclusiveTotalPrice = (unitPrice * settlePieceArea * quantity).toFixed(2);
+ // 璁＄畻鍚◣鎬讳环 = 鍗曚环 * 缁撶畻闈㈢Н * 鏁伴噺 + 鍏朵粬閲戦鎬诲拰
+ const basePrice = unitPrice * settlePieceArea * quantity;
+ const otherAmountTotal = (productForm.value.salesProductProcessList || []).reduce((total, item) => {
+ return total + (Number(item.unitPrice) || 0) * (Number(item.quantity) || 0);
+ }, 0);
+ productForm.value.taxInclusiveTotalPrice = (basePrice + otherAmountTotal).toFixed(2);
// 濡傛灉鏈夌◣鐜囷紝璁＄畻涓嶅惈绋庢�讳环
if (productForm.value.taxRate) {
@@ -2321,10 +3377,10 @@
// 鏍规嵁鍚◣鍗曚环鍙樺寲璁＄畻鎬讳环
const calculateFromUnitPrice = (silent = false) => {
- if (!productForm.value.taxRate) {
- if (!silent) proxy.$modal.msgWarning("璇峰厛閫夋嫨绋庣巼");
- return;
- }
+ // if (!productForm.value.taxRate) {
+ // if (!silent) proxy.$modal.msgWarning("璇峰厛閫夋嫨绋庣巼");
+ // return;
+ // }
if (isCalculating.value) return;
const quantity = parseFloat(productForm.value.quantity);
@@ -2337,8 +3393,12 @@
isCalculating.value = true;
- // 璁＄畻鍚◣鎬讳环 = 鍗曚环 * 缁撶畻闈㈢Н * 鏁伴噺
- productForm.value.taxInclusiveTotalPrice = (unitPrice * settlePieceArea * quantity).toFixed(2);
+ // 璁＄畻鍚◣鎬讳环 = 鍗曚环 * 缁撶畻闈㈢Н * 鏁伴噺 + 鍏朵粬閲戦鎬诲拰
+ const basePrice = unitPrice * settlePieceArea * quantity;
+ const otherAmountTotal = (productForm.value.salesProductProcessList || []).reduce((total, item) => {
+ return total + (Number(item.unitPrice) || 0) * (Number(item.quantity) || 0);
+ }, 0);
+ productForm.value.taxInclusiveTotalPrice = (basePrice + otherAmountTotal).toFixed(2);
// 濡傛灉鏈夌◣鐜囷紝璁＄畻涓嶅惈绋庢�讳环
if (productForm.value.taxRate) {
@@ -2354,10 +3414,10 @@
// 鏍规嵁绋庣巼鍙樺寲璁＄畻涓嶅惈绋庢�讳环
const calculateFromTaxRate = () => {
- if (!productForm.value.taxRate) {
- proxy.$modal.msgWarning("璇峰厛閫夋嫨绋庣巼");
- return;
- }
+ // if (!productForm.value.taxRate) {
+ // proxy.$modal.msgWarning("璇峰厛閫夋嫨绋庣巼");
+ // return;
+ // }
if (isCalculating.value) return;
const inclusiveTotalPrice = parseFloat(productForm.value.taxInclusiveTotalPrice);
@@ -2446,11 +3506,23 @@
* @param row 琛屾暟鎹�
*/
const canShip = (row) => {
+
// 浜у搧鐘舵�佸繀椤绘槸鍏呰冻锛坅pproveStatus === 1锛�
if (row.approveStatus !== 1) {
return false;
}
+ // 濡傛灉鍚庣杩斿洖浜嗗彴璐︾骇鍙戣揣鐘舵�侊紙deliveryStatus锛�
+ // 1=宸插彂璐э紝鍒欑姝㈠啀娆″彂璐�
+ const deliveryStatus = row.deliveryStatus;
+ if (
+ deliveryStatus !== null &&
+ deliveryStatus !== undefined &&
+ String(deliveryStatus).trim() !== ""
+ ) {
+ if (Number(deliveryStatus) === 1) return false;
+ }
+
// 鑾峰彇鍙戣揣鐘舵��
const shippingStatus = row.shippingStatus;
@@ -2468,6 +3540,44 @@
if (selectedRows.value.length === 0) {
proxy.$modal.msgWarning("璇烽�夋嫨鏁版嵁");
return;
+ }
+
+ // 鍙厑璁搞�愭湭鍙戣揣/瀹℃壒澶辫触銆戣繘鍏ュ彂璐ф祦绋�
+ const canDeliveryLedgers = selectedRows.value.filter((r) => {
+ const status = Number(r.deliveryStatus);
+ return status === 1 || status === 3;
+ });
+ if (canDeliveryLedgers.length === 0) {
+ proxy.$modal.msgWarning("浠呮湭鍙戣揣鎴栧鎵瑰け璐ョ殑鍙拌处鍙互鍙戣揣");
+ return;
+ }
+
+ // 宸插彂璐у彴璐︼細寮圭獥鎻愰啋锛屼笉鑳藉啀娆″彂璐э紙4 瑙嗕负宸插彂璐э級
+ const shippedLedgers = selectedRows.value.filter((r) => Number(r.deliveryStatus) === 4);
+ if (shippedLedgers.length === selectedRows.value.length) {
+ try {
+ await ElMessageBox.alert("鎵�閫夐攢鍞彴璐﹀潎宸插彂璐э紝涓嶈兘鍐嶆鍙戣揣銆�", "鎻愮ず", {
+ type: "warning",
+ confirmButtonText: "鐭ラ亾浜�",
+ });
+ } catch {
+ /* 鍏抽棴寮圭獥 */
+ }
+ return;
+ }
+ if (shippedLedgers.length > 0) {
+ try {
+ await ElMessageBox.alert(
+ "閫変腑鐨勯攢鍞彴璐︿腑鍖呭惈宸插彂璐ц褰曪紝宸插彂璐х殑涓嶈兘鍐嶆鍙戣揣锛岀郴缁熷皢浠呬负鏈彂璐у彴璐﹀鐞嗐��",
+ "鎻愮ず",
+ {
+ type: "warning",
+ confirmButtonText: "鐭ラ亾浜�",
+ }
+ );
+ } catch {
+ return;
+ }
}
const customerNames = selectedRows.value.map((r) => String(r.customerName || "").trim());
@@ -2497,14 +3607,22 @@
try {
const targets = [];
for (const ledger of selectedRows.value) {
+
+ //濡傛灉宸茬粡鏄�滃鎵逛腑(2)鈥濇垨鈥滃凡鍙戣揣(4)鈥濓紝鍒欒烦杩囷紝涓嶅厑璁搁噸澶嶆搷浣�
+ const status = Number(ledger.deliveryStatus);
+ if (status === 2 || status === 4) {
+ console.warn(`鍙拌处缂栧彿 ${ledger.salesContractNo} 鐘舵�佷负 ${status}锛岃烦杩囧彂璐);
+ continue;
+ }
+
let products = [];
try {
const res = await productList({ salesLedgerId: ledger.id, type: 1 });
products = res?.data || [];
- } catch {
+ } catch (error) {
products = [];
+ console.error('璇锋眰鍙戠敓寮傚父', error);
}
-
for (const product of products) {
if (!canShip(product)) continue;
targets.push({
@@ -2513,7 +3631,6 @@
});
}
}
-
if (targets.length === 0) {
proxy.$modal.msgWarning("娌℃湁鍙彂璐х殑鏁版嵁");
return;
@@ -2545,14 +3662,15 @@
});
}
-// 鎵撳紑鍙戣揣寮规
+// 鎵撳紑鍙戣揣寮规锛堝崟鏉★級
const openDeliveryForm = (row) => {
- // 妫�鏌ユ槸鍚﹀彲浠ュ彂璐�
- if (!canShip(row)) {
- proxy.$modal.msgWarning("鍙湁鍦ㄤ骇鍝佺姸鎬佹槸鍏呰冻锛屽彂璐х姸鎬佹槸寰呭彂璐ф垨瀹℃牳鎷掔粷鐨勬椂鍊欐墠鍙互鍙戣揣");
+ // 鍙厑璁搞�愭湭鍙戣揣/瀹℃壒澶辫触銆戝彂璐э紱宸插彂璐�/瀹℃壒涓笉鍏佽
+ const status = Number(row.deliveryStatus);
+ if (status !== 1 && status !== 3) {
+ proxy.$modal.msgWarning("鍙湁鍙戣揣鐘舵�佷负鏈彂璐ф垨瀹℃壒澶辫触鐨勮褰曟墠鍙互鍙戣揣");
return;
}
-
+
currentDeliveryRows.value = [row];
deliveryForm.value = {
type: "璐ц溅",
@@ -2583,19 +3701,18 @@
return;
}
- // 渚濇鍙戣揣锛堥伩鍏嶅苟鍙戜笅搴撳瓨鎵ｅ噺/鐘舵�佹洿鏂颁簰鐩稿奖鍝嶏級
- const run = async () => {
- for (const item of targets) {
- const salesLedgerId = item.salesLedgerId;
- if (!salesLedgerId) continue;
- await addShippingInfo({
- salesLedgerId,
- salesLedgerProductId: item.id,
- type: deliveryForm.value.type,
- approveUserIds,
- });
- }
- };
+ // 鎸夊彴璐︾淮搴﹀幓閲嶏紝姣忎釜 salesLedgerId 鍙皟鐢ㄤ竴娆″彂璐ф帴鍙�
+ const uniqueLedgerIds = [...new Set(targets.map((item) => item.salesLedgerId).filter(Boolean))];
+
+ const run = async () => {
+ for (const salesLedgerId of uniqueLedgerIds) {
+ await addShippingInfo({
+ salesLedgerId,
+ type: deliveryForm.value.type,
+ approveUserIds,
+ });
+ }
+ };
run()
.then(() => {
@@ -2639,6 +3756,9 @@
};
onMounted(() => {
getList();
+ customerList().then((res) => {
+ customerOption.value = res;
+ });
userListNoPage().then(res => {
userList.value = res.data;
})
--
Gitblit v1.9.3