From f3590d3b29112c8d18315c1f7e93c8a57b27e3ec Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期三, 10 六月 2026 17:19:00 +0800
Subject: [PATCH] feat：销售台账顺序和导出顺序优化
---
src/views/salesManagement/salesLedger/index.vue | 929 ++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 710 insertions(+), 219 deletions(-)
diff --git a/src/views/salesManagement/salesLedger/index.vue b/src/views/salesManagement/salesLedger/index.vue
index 083d3db..3498e5c 100644
--- a/src/views/salesManagement/salesLedger/index.vue
+++ b/src/views/salesManagement/salesLedger/index.vue
@@ -64,10 +64,14 @@
:value="1" />
<el-option label="瀹℃壒涓�"
:value="2" />
- <el-option label="瀹℃壒澶辫触"
+ <el-option label="瀹℃壒涓嶉�氳繃"
:value="3" />
- <el-option label="宸插彂璐�"
+ <el-option label="瀹℃壒閫氳繃"
:value="4" />
+ <el-option label="宸插彂璐�"
+ :value="5" />
+ <el-option label="閮ㄥ垎鍙戣揣"
+ :value="6" />
</el-select>
</el-form-item>
<el-form-item label="鍏ュ簱鐘舵�侊細">
@@ -81,6 +85,17 @@
:value="1" />
<el-option label="宸插叆搴�"
:value="2" />
+ </el-select>
+ </el-form-item>
+ <el-form-item label="璁㈠崟鐘舵�侊細">
+ <el-select v-model="searchForm.orderStatus"
+ placeholder="璇烽�夋嫨"
+ clearable
+ style="width: 140px">
+ <el-option label="杩涜涓�"
+ :value="0" />
+ <el-option label="宸插畬鎴�"
+ :value="1" />
</el-select>
</el-form-item>
<el-form-item>
@@ -101,11 +116,22 @@
@confirm="handleProcessFlowSelectConfirm" />
<el-space wrap>
<el-button type="primary"
- @click="handleSalesStock">鍏ュ簱</el-button>
+ @click="handleAudit"
+ :disabled="isBatchButtonDisabled('audit')">瀹℃牳</el-button>
+ <el-button type="primary"
+ @click="handleReverseAudit"
+ :disabled="isBatchButtonDisabled('reverseAudit')">鍙嶅</el-button>
+ <el-button type="warning"
+ @click="handleMarkCompleted"
+ :disabled="isBatchButtonDisabled('markCompleted')">鏍囪瀹屾垚</el-button>
+ <el-button type="primary"
+ @click="handleSalesStock"
+ :disabled="isBatchButtonDisabled('stock')">鍏ュ簱</el-button>
<el-button type="primary"
@click="openForm('add')">鏂板鍙拌处</el-button>
<el-button type="primary"
- @click="handleBulkDelivery">鍙戣揣</el-button>
+ @click="handleBulkDelivery"
+ :disabled="isBatchButtonDisabled('delivery')">鍙戣揣</el-button>
<el-button type="primary"
plain
@click="handleImport">瀵煎叆</el-button>
@@ -118,18 +144,20 @@
</el-button>
<template #dropdown>
<el-dropdown-menu>
- <el-dropdown-item command="notShipped">鏈彂璐�</el-dropdown-item>
- <el-dropdown-item command="shipped">宸插彂璐�</el-dropdown-item>
+ <el-dropdown-item command="notShipped">鏈嚭搴�</el-dropdown-item>
+ <el-dropdown-item command="shipped">宸插嚭搴�</el-dropdown-item>
</el-dropdown-menu>
</template>
</el-dropdown>
<el-button @click="handleOut">瀵煎嚭</el-button>
<el-button type="danger"
plain
- @click="handleDelete">鍒犻櫎</el-button>
+ @click="handleDelete"
+ :disabled="isBatchButtonDisabled('delete')">鍒犻櫎</el-button>
<el-dropdown @command="handlePrintCommand">
<el-button type="primary"
- plain>
+ plain
+ :disabled="isBatchButtonDisabled('print')">
鎵撳嵃鍗曟嵁<el-icon class="el-icon--right">
<ArrowDown />
</el-icon>
@@ -144,7 +172,8 @@
</el-dropdown>
<el-button type="primary"
plain
- @click="handlePrintLabel">鎵撳嵃鏍囩</el-button>
+ @click="handlePrintLabel"
+ :disabled="isBatchButtonDisabled('print')">鎵撳嵃鏍囩</el-button>
</el-space>
</div>
<el-table :data="tableData"
@@ -158,7 +187,7 @@
style="width: 100%"
:summary-method="summarizeMainTable"
@expand-change="expandChange"
- height="calc(100vh - 18.5em)">
+ height="calc(100vh - 22em)">
<el-table-column align="center"
type="selection"
width="55"
@@ -238,6 +267,8 @@
<template #default="scope">
<el-tag v-if="scope.row.approveStatus === 1 && (!scope.row.shippingDate || !scope.row.shippingCarNumber)"
type="success">鍏呰冻</el-tag>
+ <el-tag v-else-if="scope.row.approveStatus === 1 && scope.row.shippingDate && scope.row.shippingCarNumber"
+ type="success">宸插嚭搴�</el-tag>
<el-tag v-else-if="scope.row.approveStatus === 0 && (scope.row.shippingDate || scope.row.shippingCarNumber)"
type="success">宸插嚭搴�</el-tag>
<el-tag v-else
@@ -249,7 +280,7 @@
align="center">
<template #default="scope">
<el-tag v-if="scope.row.productStockStatus == 1"
- type="warning">閮ㄥ垎鍏ュ簱</el-tag>
+ type="warning">閮ㄥ垎鍏ュ簱</el-tag>
<el-tag v-else-if="scope.row.productStockStatus == 2"
type="success">宸插叆搴�</el-tag>
<el-tag v-else-if="scope.row.productStockStatus == 0"
@@ -369,8 +400,22 @@
type="primary">瀹℃壒閫氳繃</el-tag>
<el-tag v-else-if="Number(scope.row.deliveryStatus) === 5"
type="success">宸插彂璐�</el-tag>
+ <el-tag v-else-if="Number(scope.row.deliveryStatus) === 6"
+ type="warning">閮ㄥ垎鍙戣揣</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.reviewStatus) === 0"
+ type="warning">寰呭鏍�</el-tag>
+ <el-tag v-else-if="Number(scope.row.reviewStatus) === 1"
+ type="success">宸插鏍�</el-tag>
+ <el-tag v-else
+ type="info">寰呭鏍�</el-tag>
</template>
</el-table-column>
<el-table-column label="鍏ュ簱鐘舵��"
@@ -383,8 +428,34 @@
type="success">閮ㄥ垎鍏ュ簱</el-tag>
<el-tag v-else-if="Number(scope.row.stockStatus) === 2"
type="success">宸插叆搴�</el-tag>
+ <el-tag v-else-if="Number(scope.row.stockStatus) === 3"
+ type="warning">瀹℃壒涓�</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.orderStatus) === 1"
+ type="success">宸插畬鎴�</el-tag>
+ <el-tag v-else
+ type="info">杩涜涓�</el-tag>
+ </template>
+ </el-table-column>
+ <el-table-column label="鏍囩鎵撳嵃"
+ width="90"
+ align="center">
+ <template #default="scope">
+ <span>{{ scope.row.labelPrintCount ?? 0 }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column label="鍗曟嵁鎵撳嵃"
+ width="90"
+ align="center">
+ <template #default="scope">
+ <span>{{ scope.row.documentPrintCount ?? 0 }}</span>
</template>
</el-table-column>
<el-table-column label="褰曞叆浜�"
@@ -419,17 +490,18 @@
<el-button link
type="primary"
@click="openForm('edit', scope.row)"
- :disabled="!scope.row.isEdit">缂栬緫</el-button>
+ :disabled="Number(scope.row.orderStatus) === 1">缂栬緫</el-button>
<el-button link
type="primary"
@click="openProcessFlowSelect(scope.row)"
- :disabled="!scope.row.isEdit">宸ヨ壓璺嚎</el-button>
+ :disabled="Number(scope.row.reviewStatus) !== 1 || Number(scope.row.orderStatus) === 1">宸ヨ壓璺嚎</el-button>
<el-button link
type="primary"
@click="downLoadFile(scope.row)">闄勪欢</el-button>
<el-button link
type="primary"
- @click="openLedgerQrDialog(scope.row)">浜岀淮鐮�</el-button>
+ @click="openLedgerQrDialog(scope.row)"
+ :disabled="Number(scope.row.orderStatus) === 1">浜岀淮鐮�</el-button>
</template>
</el-table-column>
</el-table>
@@ -441,9 +513,9 @@
@pagination="paginationChange" />
</div>
<FormDialog v-model="dialogFormVisible"
- :title="operationType === 'add' ? '鏂板閿�鍞彴璐﹂〉闈�' : '缂栬緫閿�鍞彴璐﹂〉闈�'"
+ :title="isCompletedOrder ? '鏌ョ湅閿�鍞彴璐﹂〉闈紙宸插畬鎴愶級' : operationType === 'add' ? '鏂板閿�鍞彴璐﹂〉闈�' : '缂栬緫閿�鍞彴璐﹂〉闈�'"
:width="'70%'"
- :operation-type="operationType"
+ :operation-type="isCompletedOrder ? 'detail' : operationType"
@close="closeDia"
@confirm="submitForm"
@cancel="closeDia">
@@ -481,7 +553,7 @@
<el-select v-model="form.salesman"
placeholder="璇烽�夋嫨"
clearable
- :disabled="operationType === 'view'">
+ :disabled="operationType === 'view' || isReviewedEdit">
<el-option v-for="item in userList"
:key="item.nickName"
:label="item.nickName"
@@ -498,7 +570,7 @@
filterable
placeholder="璇烽�夋嫨"
clearable
- :disabled="operationType === 'view'">
+ :disabled="operationType === 'view' || isReviewedEdit">
<el-option v-for="item in customerOption"
:key="item.id"
:label="item.customerName"
@@ -514,7 +586,7 @@
<el-input v-model="form.projectName"
placeholder="璇疯緭鍏�"
clearable
- :disabled="operationType === 'view'" />
+ :disabled="operationType === 'view' || isReviewedEdit" />
</el-form-item>
</el-col>
</el-row>
@@ -529,7 +601,7 @@
type="date"
placeholder="璇烽�夋嫨"
clearable
- :disabled="operationType === 'view'" />
+ :disabled="operationType === 'view' || isReviewedEdit" />
</el-form-item>
</el-col>
<el-col :span="12">
@@ -541,7 +613,8 @@
format="YYYY-MM-DD"
type="date"
placeholder="璇烽�夋嫨"
- clearable />
+ clearable
+ :disabled="operationType === 'view' || isReviewedEdit" />
</el-form-item>
</el-col>
</el-row>
@@ -555,7 +628,8 @@
:reserve-keyword="false"
placeholder="璇烽�夋嫨"
clearable
- @change="changs">
+ @change="changs"
+ :disabled="operationType === 'view' || isReviewedEdit">
<el-option v-for="item in userList"
:key="item.userId"
:label="item.nickName"
@@ -572,7 +646,8 @@
format="YYYY-MM-DD"
type="date"
placeholder="璇烽�夋嫨"
- clearable />
+ clearable
+ :disabled="operationType === 'view' || isReviewedEdit" />
</el-form-item>
</el-col>
</el-row>
@@ -581,13 +656,14 @@
prop="entryDate">
<el-button v-if="operationType !== 'view'"
type="primary"
- :disabled="hasEditingProductRow()"
+ :disabled="hasEditingProductRow() || isReviewedEdit"
@click="addProductInline">
娣诲姞
</el-button>
<el-button v-if="operationType !== 'view'"
plain
type="danger"
+ :disabled="isReviewedEdit"
@click="deleteProduct">鍒犻櫎</el-button>
</el-form-item>
</el-row>
@@ -619,7 +695,8 @@
:render-after-expand="false"
style="width: 100%"
:filter-node-method="filterProductCategoryNode"
- @change="(val) => handleInlineProductCategoryChange(scope.row, val)" />
+ @change="(val) => handleInlineProductCategoryChange(scope.row, val)"
+ :disabled="isReviewedEdit" />
<span v-else>{{ scope.row.productCategory ?? "" }}</span>
</template>
</el-table-column>
@@ -633,7 +710,8 @@
clearable
filterable
style="width: 100%"
- @change="(val) => handleInlineProductModelChange(scope.row, val)">
+ @change="(val) => handleInlineProductModelChange(scope.row, val)"
+ :disabled="isReviewedEdit">
<el-option v-for="item in modelOptions"
:key="item.id"
:label="item.model"
@@ -654,94 +732,23 @@
:precision="2"
style="width: 100%"
placeholder="璇疯緭鍏�"
- clearable />
+ clearable
+ :disabled="isReviewedEdit" />
<span v-else>{{ scope.row.thickness ?? "" }}</span>
</template>
</el-table-column>
- <el-table-column label="瀹�(mm)"
- prop="width"
- min-width="160">
+ <el-table-column label="妤煎眰缂栧彿"
+ prop="floorCode"
+ min-width="250"
+ show-overflow-tooltip>
<template #default="scope">
- <el-input-number v-if="scope.row.__editing"
- controls-position="right"
- 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"
- controls-position="right"
- 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="200">
- <template #default="scope">
- <el-input-number v-if="scope.row.__editing"
- controls-position="right"
- v-model="scope.row.settlePieceArea"
- :min="0"
- :step="1"
- :precision="4"
- style="width: 100%"
- placeholder="璇疯緭鍏�"
- clearable
- @change="() => handleInlineSettleAreaChange(scope.row)" />
- <span v-else>{{ scope.row.settlePieceArea ? Number(scope.row.settlePieceArea).toFixed(4) : "" }}</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"
- controls-position="right"
- v-model="scope.row.quantity"
- :step="1"
- :min="0"
- :precision="0"
- 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="200">
- <template #default="scope">
- <el-input-number v-if="scope.row.__editing"
- controls-position="right"
- v-model="scope.row.actualTotalArea"
- :min="0"
- :step="1"
- :precision="4"
- style="width: 100%"
- placeholder="鑷姩璁＄畻" />
- <span v-else>{{ scope.row.actualTotalArea ? Number(scope.row.actualTotalArea).toFixed(4) : "" }}</span>
+ <el-input v-if="scope.row.__editing"
+ v-model="scope.row.floorCode"
+ placeholder="璇疯緭鍏�"
+ clearable
+ style="width: 100%"
+ :disabled="isReviewedEdit" />
+ <span v-else>{{ scope.row.floorCode ?? "" }}</span>
</template>
</el-table-column>
<el-table-column label="鍚◣鍗曚环(鍏�)"
@@ -761,6 +768,97 @@
<span v-else>{{ formattedNumber(null, null, scope.row.taxInclusiveUnitPrice) }}</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"
+ controls-position="right"
+ v-model="scope.row.width"
+ :min="0"
+ :step="1"
+ :precision="2"
+ style="width:100%"
+ placeholder="璇疯緭鍏�"
+ clearable
+ @change="() => handleInlineSizeChange(scope.row)"
+ @input="() => handleInlineSizeChange(scope.row)"
+ :disabled="isReviewedEdit" />
+ <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"
+ controls-position="right"
+ v-model="scope.row.height"
+ :min="0"
+ :step="1"
+ :precision="2"
+ style="width: 100%"
+ placeholder="璇疯緭鍏�"
+ clearable
+ @change="() => handleInlineSizeChange(scope.row)"
+ @input="() => handleInlineSizeChange(scope.row)"
+ :disabled="isReviewedEdit" />
+ <span v-else>{{ scope.row.height ?? "" }}</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"
+ controls-position="right"
+ v-model="scope.row.quantity"
+ :step="1"
+ :min="0"
+ :precision="0"
+ style="width: 100%"
+ placeholder="璇疯緭鍏�"
+ clearable
+ @change="() => handleInlineQuantityChange(scope.row)"
+ @input="() => handleInlineQuantityChange(scope.row)"
+ :disabled="isReviewedEdit" />
+ <span v-else>{{ scope.row.quantity ?? "" }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column label="缁撶畻鍗曠墖闈㈢Н(銕�)"
+ prop="settlePieceArea"
+ min-width="200">
+ <template #default="scope">
+ <el-input-number v-if="scope.row.__editing"
+ controls-position="right"
+ v-model="scope.row.settlePieceArea"
+ :min="0"
+ :step="1"
+ :precision="4"
+ style="width: 100%"
+ placeholder="璇疯緭鍏�"
+ clearable
+ @change="() => handleInlineSettleAreaChange(scope.row)"
+ :disabled="isReviewedEdit" />
+ <span v-else>{{ scope.row.settlePieceArea ? Number(scope.row.settlePieceArea).toFixed(4) : "" }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column label="闈㈢Н(m虏)"
+ prop="actualTotalArea"
+ min-width="200">
+ <template #default="scope">
+ <el-input-number v-if="scope.row.__editing"
+ controls-position="right"
+ v-model="scope.row.actualTotalArea"
+ :min="0"
+ :step="1"
+ :precision="4"
+ style="width: 100%"
+ placeholder="鑷姩璁＄畻"
+ :disabled="isReviewedEdit" />
+ <span v-else>{{ scope.row.actualTotalArea ? Number(scope.row.actualTotalArea).toFixed(4) : "" }}</span>
+ </template>
+ </el-table-column>
<el-table-column label="绋庣巼(%)"
prop="taxRate"
min-width="120">
@@ -770,7 +868,8 @@
placeholder="璇烽�夋嫨"
clearable
style="width: 100%"
- @change="() => handleInlineTaxRateChange(scope.row)">
+ @change="() => handleInlineTaxRateChange(scope.row)"
+ :disabled="isReviewedEdit">
<el-option label="1"
value="1" />
<el-option label="3"
@@ -793,23 +892,6 @@
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"
@@ -819,8 +901,27 @@
v-model="scope.row.processRequirement"
placeholder="璇疯緭鍏�"
clearable
- style="width: 100%" />
+ style="width: 100%"
+ :disabled="isReviewedEdit" />
<span v-else>{{ scope.row.processRequirement ?? "" }}</span>
+ </template>
+ </el-table-column>
+ <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%"
+ :disabled="isReviewedEdit">
+ <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="澶囨敞"
@@ -832,21 +933,9 @@
v-model="scope.row.remark"
placeholder="璇疯緭鍏�"
clearable
- style="width: 100%" />
+ style="width: 100%"
+ :disabled="isReviewedEdit" />
<span v-else>{{ scope.row.remark ?? "" }}</span>
- </template>
- </el-table-column>
- <el-table-column label="妤煎眰缂栧彿"
- prop="floorCode"
- min-width="250"
- 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="閲嶇"
@@ -857,7 +946,8 @@
v-model="scope.row.heavyBox"
placeholder="璇疯緭鍏�"
clearable
- style="width: 100%" />
+ style="width: 100%"
+ :disabled="isReviewedEdit" />
<span v-else>{{ scope.row.heavyBox ?? "" }}</span>
</template>
</el-table-column>
@@ -958,20 +1048,32 @@
</el-popover>
</template>
<template v-else>
- <el-button link
+ <!-- 宸插鏍告ā寮忥細鍙兘淇敼鍗曚环 -->
+ <el-button v-if="isReviewedEdit"
+ link
type="primary"
size="small"
:disabled="isProductShipped(scope.row)"
- @click="editProductInline(scope.row, scope.$index)">
- 缂栬緫
+ @click="editPriceOnly(scope.row)">
+ 淇敼鍗曚环
</el-button>
- <el-button link
- type="primary"
- size="small"
- :disabled="isProductShipped(scope.row) || hasEditingProductRow()"
- @click="copyProductInline(scope.row, scope.$index)">
- 澶嶅埗鏂板缓
- </el-button>
+ <!-- 鏈鏍告ā寮忥細瀹屾暣缂栬緫 -->
+ <template v-if="!isReviewedEdit">
+ <el-button link
+ type="primary"
+ size="small"
+ :disabled="isProductShipped(scope.row)"
+ @click="editProductInline(scope.row, scope.$index)">
+ 缂栬緫
+ </el-button>
+ <el-button link
+ type="primary"
+ size="small"
+ :disabled="isProductShipped(scope.row)"
+ @click="copyProductInline(scope.row, scope.$index)">
+ 澶嶅埗鏂板缓
+ </el-button>
+ </template>
<el-popover :width="560"
trigger="click"
:hide-after="0"
@@ -993,7 +1095,7 @@
<el-button type="primary"
plain
size="small"
- :disabled="isProductShipped(scope.row)"
+ :disabled="isProductShipped(scope.row) || isReviewedEdit"
@click="startAddOtherAmountForRow(scope.row)">
鏂板
</el-button>
@@ -1006,7 +1108,7 @@
clearable
placeholder="璇烽�夋嫨棰濆鍔犲伐椤圭洰"
style="width: 100%;"
- :disabled="isProductShipped(scope.row)">
+ :disabled="isProductShipped(scope.row) || isReviewedEdit">
<el-option v-for="item in otherAmountSelectOptions"
:key="item.id"
:label="item.processName"
@@ -1014,13 +1116,13 @@
</el-select>
<div style="display:flex; justify-content:flex-end; gap: 8px;">
<el-button size="small"
- :disabled="isProductShipped(scope.row)"
+ :disabled="isProductShipped(scope.row) || isReviewedEdit"
@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 === ''"
+ :disabled="isProductShipped(scope.row) || isReviewedEdit || scope.row.__inlineOtherAmountAddId === null || scope.row.__inlineOtherAmountAddId === undefined || scope.row.__inlineOtherAmountAddId === ''"
@click="confirmAddOtherAmountForRow(scope.row)">
纭娣诲姞
</el-button>
@@ -1041,12 +1143,12 @@
:precision="0"
style="width: 120px;"
placeholder="鏁伴噺"
- :disabled="operationType === 'view' || isProductShipped(scope.row)"
+ :disabled="operationType === 'view' || isProductShipped(scope.row) || isReviewedEdit"
@change="handleOtherAmountQuantityChange(scope.row)" />
<el-button type="danger"
link
size="small"
- :disabled="isProductShipped(scope.row)"
+ :disabled="isProductShipped(scope.row) || isReviewedEdit"
@click="removeOtherAmountAtForRow(scope.row, idx)">
鍒犻櫎
</el-button>
@@ -1070,7 +1172,7 @@
clearable
type="textarea"
:rows="2"
- :disabled="operationType === 'view'" />
+ :disabled="operationType === 'view' || isReviewedEdit" />
</el-form-item>
</el-col>
</el-row>
@@ -1083,7 +1185,7 @@
clearable
type="textarea"
:rows="2"
- :disabled="operationType === 'view'" />
+ :disabled="operationType === 'view' || isReviewedEdit" />
</el-form-item>
</el-col>
</el-row>
@@ -1102,9 +1204,9 @@
:on-success="handleUploadSuccess"
:on-remove="handleRemove">
<el-button type="primary"
- v-if="operationType !== 'view'">涓婁紶</el-button>
+ v-if="operationType !== 'view' || isCompletedOrder">涓婁紶</el-button>
<template #tip
- v-if="operationType !== 'view'">
+ v-if="operationType !== 'view' || isCompletedOrder">
<div class="el-upload__tip">
鏂囦欢鏍煎紡鏀寔
doc锛宒ocx锛寈ls锛寈lsx锛宲pt锛宲ptx锛宲df锛宼xt锛寈ml锛宩pg锛宩peg锛宲ng锛実if锛宐mp锛宺ar锛寊ip锛�7z
@@ -1787,16 +1889,54 @@
</el-button>
</div>
</el-dialog>
+ <!-- 鍙嶅鏍稿脊绐� -->
+ <el-dialog v-model="reverseAuditDialogVisible"
+ title="鍙嶅鏍哥‘璁�"
+ width="500px"
+ :close-on-click-modal="false"
+ class="reverse-audit-dialog">
+ <el-form label-width="110px"
+ label-position="left">
+ <el-form-item label="鍙嶅鏍哥被鍨�">
+ <el-radio-group v-model="reverseAuditForm.counterReviewType">
+ <el-radio :label="1">
+ <span>浣滃簾璁㈠崟</span>
+ <span style="color: #909399; font-size: 12px; margin-left: 4px;">锛堜笉鐢熸垚鏂拌鍗曪級</span>
+ </el-radio>
+ <el-radio :label="2">
+ <span>閲嶆柊鐢熸垚</span>
+ <span style="color: #909399; font-size: 12px; margin-left: 4px;">锛堣烦杞埌鏂板椤甸潰缂栬緫锛�</span>
+ </el-radio>
+ </el-radio-group>
+ </el-form-item>
+ <el-form-item label="鍙嶅鏍稿師鍥�">
+ <el-input v-model="reverseAuditForm.counterReviewDesc"
+ type="textarea"
+ :rows="4"
+ placeholder="璇疯緭鍏ュ弽瀹℃牳鍘熷洜" />
+ </el-form-item>
+ </el-form>
+ <div class="reverse-audit-warning">
+ <el-icon style="color: #E6A23C; margin-right: 4px;"><WarningFilled /></el-icon>
+ 娉ㄦ剰锛氬弽瀹℃牳灏嗚嚜鍔ㄤ綔搴熻璁㈠崟瀵瑰簲鐨勬墍鏈夊叆搴撱�佸嚭搴撱�佸彂璐у崟鎹�
+ </div>
+ <template #footer>
+ <el-button @click="reverseAuditDialogVisible = false">鍙栨秷</el-button>
+ <el-button type="danger"
+ @click="confirmReverseAudit"
+ :disabled="!reverseAuditForm.counterReviewType || !reverseAuditForm.counterReviewDesc.trim()">纭鍙嶅鏍�</el-button>
+ </template>
+ </el-dialog>
</div>
</template>
<script setup>
import { getToken } from "@/utils/auth";
import pagination from "@/components/PIMTable/Pagination.vue";
- import { onMounted, ref, getCurrentInstance, watch, nextTick } from "vue";
+ import { onMounted, ref, reactive, 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";
+ import { ArrowDown, WarningFilled } from "@element-plus/icons-vue";
import useUserStore from "@/store/modules/user";
import { approveUserList } from "@/api/collaborativeApproval/approvalProcess.js";
import { userListNoPage } from "@/api/system/user.js";
@@ -1825,6 +1965,9 @@
getSalesInvoices,
getSalesLabel,
salesStock,
+ counterReview,
+ markOrderCompleted,
+ incrementPrintCount,
} from "@/api/salesManagement/salesLedger.js";
import { modelList, productTreeList } from "@/api/basicData/product.js";
import useFormData from "@/hooks/useFormData.js";
@@ -1931,9 +2074,14 @@
const ctx = canvas.getContext("2d");
canvas.width = Math.max(QR_SIZE + horizontalPad * 2, 280);
ctx.font = `${fontSize}px "Microsoft YaHei", "PingFang SC", sans-serif`;
- const lines = wrapLedgerQrTextLines(ctx, label, canvas.width - horizontalPad * 2);
+ const lines = wrapLedgerQrTextLines(
+ ctx,
+ label,
+ canvas.width - horizontalPad * 2
+ );
const textBlockHeight = lines.length * lineHeight;
- canvas.height = padTop + QR_SIZE + gapAfterQr + textBlockHeight + bottomPad;
+ canvas.height =
+ padTop + QR_SIZE + gapAfterQr + textBlockHeight + bottomPad;
ctx.fillStyle = "#ffffff";
ctx.fillRect(0, 0, canvas.width, canvas.height);
@@ -1989,6 +2137,10 @@
// 鐢ㄦ埛淇℃伅琛ㄥ崟寮规鏁版嵁
const operationType = ref("");
const dialogFormVisible = ref(false);
+ // 宸插畬鎴愯鍗曟爣璁帮細view 妯″紡浣嗛檮浠朵笂浼犱粛鍙敤
+ const isCompletedOrder = ref(false);
+ // 宸插鏍歌鍗曠紪杈戞ā寮忥細鍙兘淇敼鍗曚环锛屽叾浠栧瓧娈电鐢�
+ const isReviewedEdit = ref(false);
const data = reactive({
searchForm: {
customerName: "", // 瀹㈡埛鍚嶇О
@@ -1999,8 +2151,10 @@
entryDate: null, // 褰曞叆鏃ユ湡
entryDateStart: undefined,
entryDateEnd: undefined,
- deliveryStatus: undefined, // 鍙戣揣鐘舵�侊細1鏈彂璐� 2瀹℃壒涓� 3瀹℃壒澶辫触 4宸插彂璐�
+ deliveryStatus: undefined, // 鍙戣揣鐘舵�侊細1鏈彂璐� 2瀹℃壒涓� 3瀹℃壒涓嶉�氳繃 4瀹℃壒閫氳繃 5宸插彂璐� 6閮ㄥ垎鍙戣揣
stockStatus: undefined, // 鍏ュ簱鐘舵�侊細0鏈叆搴� 1閮ㄥ垎鍏ュ簱 2宸插叆搴�
+ reviewStatus: undefined, // 瀹℃牳鐘舵�侊細0寰呭鏍� 1宸插鏍� 2宸插弽瀹�
+ orderStatus: undefined, // 璁㈠崟鐘舵�侊細0杩涜涓� 1宸插畬鎴�
},
form: {
salesContractNo: "",
@@ -2012,6 +2166,8 @@
maintenanceTime: "",
productData: [],
executionDate: "",
+ reviewStatus: undefined,
+ stockStatus: undefined,
},
rules: {
salesman: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
@@ -2209,13 +2365,22 @@
copied.productModelId = row.productModelId ?? null;
copied.specificationModel = row.specificationModel ?? "";
copied.thickness =
- row.thickness !== null && row.thickness !== undefined && row.thickness !== ""
+ row.thickness !== null &&
+ row.thickness !== undefined &&
+ row.thickness !== ""
? Number(row.thickness)
: null;
+ copied.floorCode = row?.floorCode ?? row?.floor_code ?? "";
- // 澶嶅埗鏂板缓浠呭甫鍑轰骇鍝佸ぇ绫讳笌瑙勬牸鍨嬪彿锛屽叾浠栨暟瀛楀瓧娈靛叏閮ㄧ暀绌猴紝閬垮厤鍑虹幇 0.00
+ const srcUnit = row?.taxInclusiveUnitPrice;
+ const unitNum =
+ srcUnit !== null && srcUnit !== undefined && srcUnit !== ""
+ ? Number(srcUnit)
+ : NaN;
+ copied.taxInclusiveUnitPrice = Number.isFinite(unitNum) ? unitNum : null;
+
+ // 澶嶅埗鏂板缓甯﹀嚭锛氫骇鍝佸ぇ绫汇�佽鏍煎瀷鍙枫�佸帤搴︺�佹ゼ灞傜紪鍙枫�佸崟浠凤紱鍏朵綑鏁伴噺/闈㈢Н/鎬讳环绛夌暀绌猴紝閬垮厤鍑虹幇 0.00
copied.quantity = null;
- copied.taxInclusiveUnitPrice = null;
copied.taxInclusiveTotalPrice = null;
copied.taxExclusiveTotalPrice = null;
copied.width = null;
@@ -2243,6 +2408,15 @@
productData.value.push(copied);
editingProductRow.value = copied;
productForm.value = copied;
+ };
+
+ /** 宸插鏍歌鍗曪細浠呬慨鏀瑰惈绋庡崟浠� */
+ const editPriceOnly = (row) => {
+ if (operationType.value === "view") return;
+ if (!row) return;
+ stopOtherEditingRows();
+ row.__editing = true;
+ row.__priceOnly = true; // 鏍囪鍙慨鏀瑰崟浠�
};
const editProductInline = async (row, index) => {
@@ -2337,10 +2511,6 @@
}
if (row.actualTotalArea <= 0) {
proxy.$modal.msgWarning("闈㈢Н蹇呴』澶т簬0");
- return false;
- }
- if (row.taxInclusiveUnitPrice <= 0) {
- proxy.$modal.msgWarning("鍚◣鍗曚环蹇呴』澶т簬0");
return false;
}
if (!row.productModelId) {
@@ -2908,7 +3078,15 @@
notShipped: "/sales/ledger/salesHistory/notShippingImport",
shipped: "/sales/ledger/salesHistory/shippingImport",
};
-
+ const HISTORY_IMPORT_TEMPLATE_URL_MAP = {
+ notShipped: "/sales/ledger/salesHistory/notShippingImportTemplate",
+ shipped: "/sales/ledger/salesHistory/shippingImportTemplate",
+ };
+ const HISTORY_IMPORT_TEMPLATE_FILE_NAME_MAP = {
+ notShipped: "閿�鍞彂璐у巻鍙叉暟鎹鍏ユā鏉�-鏈彂璐�.xlsx",
+ shipped: "閿�鍞彂璐у巻鍙叉暟鎹鍏ユā鏉�-宸插彂璐�.xlsx",
+ };
+ const currentImportCommand = ref("default");
const changeDaterange = value => {
if (value) {
searchForm.entryDateStart = dayjs(value[0]).format("YYYY-MM-DD");
@@ -2918,6 +3096,43 @@
searchForm.entryDateEnd = undefined;
}
handleQuery();
+ };
+
+ /** 鎵归噺鎸夐挳绂佺敤鍒ゆ柇锛氭牴鎹�変腑琛岀殑瀹℃牳鐘舵�佸拰璁㈠崟鐘舵�佹帶鍒舵寜閽彲鐢ㄦ��
+ * 鏈鏍�(0)锛氬彧鑳藉鏍搞�佸垹闄ゃ�佺紪杈�
+ * 宸插鏍�(1)锛氬彲浠ュ弽瀹°�佸叆搴撱�佸彂璐с�佸鍑恒�佹墦鍗般�佸伐鑹鸿矾绾�
+ * 宸插畬鎴�(orderStatus=1)锛氭墍鏈夋搷浣滄寜閽鐢�
+ * 鏈�変腑浠讳綍琛屾椂鎵�鏈夋壒閲忔寜閽鐢�
+ */
+ const isBatchButtonDisabled = (action) => {
+ if (selectedRows.value.length === 0) return true;
+ const hasCompleted = selectedRows.value.some(r => Number(r.orderStatus) === 1);
+ // 宸插畬鎴愯鍗曪細鎵�鏈夋搷浣滄寜閽鐢�
+ if (hasCompleted && action !== 'markCompleted') return true;
+ const statuses = selectedRows.value.map(r => Number(r.reviewStatus));
+ const allUnreviewed = statuses.every(s => s === 0);
+ const allReviewed = statuses.every(s => s === 1);
+ switch (action) {
+ case 'audit':
+ return !allUnreviewed;
+ case 'reverseAudit':
+ return !allReviewed;
+ case 'stock':
+ return !allReviewed;
+ case 'delivery':
+ return !allReviewed;
+ case 'export':
+ return !allReviewed;
+ case 'delete':
+ return !allUnreviewed;
+ case 'print':
+ return !allReviewed;
+ case 'markCompleted':
+ // 鍙湁宸插鏍镐笖鏈畬鎴愮殑璁㈠崟鎵嶈兘鏍囪瀹屾垚
+ return !allReviewed || hasCompleted;
+ default:
+ return false;
+ }
};
// 鏌ヨ鍒楄〃
@@ -2931,6 +3146,165 @@
expandedRowKeys.value = [];
getList();
};
+
+ /** 瀹℃牳鎸夐挳鎿嶄綔 */
+ const handleAudit = async () => {
+ if (selectedRows.value.length === 0) {
+ proxy.$modal.msgWarning("璇烽�夋嫨瑕佸鏍哥殑鏁版嵁");
+ return;
+ }
+ const canNotAudit = selectedRows.value.filter(
+ row => Number(row.reviewStatus) !== 0
+ );
+ if (canNotAudit.length > 0) {
+ proxy.$modal.msgWarning("閫変腑鐨勬暟鎹腑鍖呭惈闈炲緟瀹℃牳椤癸紝璇烽噸鏂伴�夋嫨");
+ return;
+ }
+
+ // 褰曞叆浜轰笉鑳藉鏍歌鏉℃暟鎹�
+ const isEntryPerson = selectedRows.value.some(
+ row => String(row.entryPerson) === String(userStore.id)
+ );
+ if (isEntryPerson) {
+ proxy.$modal.msgWarning("褰曞叆浜轰笉鑳藉鏍歌嚜宸辨彁浜ょ殑鏁版嵁");
+ return;
+ }
+
+ try {
+ await ElMessageBox.confirm("鏄惁纭瀹℃牳閫変腑鐨勯攢鍞彴璐︼紵", "鎻愮ず", {
+ confirmButtonText: "纭畾",
+ cancelButtonText: "鍙栨秷",
+ type: "warning",
+ });
+ for (const row of selectedRows.value) {
+ await addOrUpdateSalesLedger({ ...row, reviewStatus: 1 });
+ }
+ proxy.$modal.msgSuccess("瀹℃牳鎴愬姛");
+ getList();
+ } catch (error) {
+ console.log(error);
+ }
+ };
+
+ /** 鍙嶅鏍稿脊绐楃姸鎬� */
+ const reverseAuditDialogVisible = ref(false);
+ const reverseAuditForm = reactive({
+ counterReviewType: null,
+ counterReviewDesc: "",
+ });
+
+ /** 鍙嶅鎸夐挳鎿嶄綔 鈥� 鎵撳紑寮圭獥 */
+ const handleReverseAudit = () => {
+ if (selectedRows.value.length === 0) {
+ proxy.$modal.msgWarning("璇烽�夋嫨瑕佸弽瀹℃牳鐨勬暟鎹�");
+ return;
+ }
+ const canNotReverse = selectedRows.value.filter(
+ row => Number(row.reviewStatus) !== 1
+ );
+ if (canNotReverse.length > 0) {
+ proxy.$modal.msgWarning("閫変腑鐨勬暟鎹腑鍖呭惈闈炲凡瀹℃牳椤癸紝璇烽噸鏂伴�夋嫨");
+ return;
+ }
+ // 閲嶇疆寮圭獥琛ㄥ崟
+ reverseAuditForm.counterReviewType = null;
+ reverseAuditForm.counterReviewDesc = "";
+ reverseAuditDialogVisible.value = true;
+ };
+
+ /** 鍙嶅鏍哥‘璁ゆ搷浣� */
+ const confirmReverseAudit = async () => {
+ if (!reverseAuditForm.counterReviewType) {
+ proxy.$modal.msgWarning("璇烽�夋嫨鍙嶅鏍哥被鍨�");
+ return;
+ }
+ if (!reverseAuditForm.counterReviewDesc.trim()) {
+ proxy.$modal.msgWarning("璇疯緭鍏ュ弽瀹℃牳鍘熷洜");
+ return;
+ }
+ try {
+ const ids = selectedRows.value.map(row => row.id);
+ const res = await counterReview({
+ ids,
+ counterReviewType: reverseAuditForm.counterReviewType,
+ counterReviewDesc: reverseAuditForm.counterReviewDesc,
+ });
+ reverseAuditDialogVisible.value = false;
+ proxy.$modal.msgSuccess("鍙嶅鏍告垚鍔�");
+
+ // 閲嶆柊鐢熸垚绫诲瀷锛氳烦杞埌鏂板鍙拌处椤甸潰锛堥濉暟鎹級
+ if (reverseAuditForm.counterReviewType === 2 && res.newLedgerIds && res.newLedgerIds.length > 0) {
+ // 鍗曟潯鍙嶅鏃惰烦杞埌鏂板椤甸潰缂栬緫鏂板彴璐�
+ if (res.newLedgerIds.length === 1) {
+ const newId = res.newLedgerIds[0];
+ getSalesLedgerWithProducts({ id: newId, type: 1 }).then(detail => {
+ openFormWithPreFill(detail);
+ });
+ }
+ }
+ getList();
+ } catch (error) {
+ console.log(error);
+ }
+ };
+
+ /** 鏍囪瀹屾垚鎿嶄綔 */
+ const handleMarkCompleted = async () => {
+ if (selectedRows.value.length === 0) {
+ proxy.$modal.msgWarning("璇烽�夋嫨瑕佹爣璁板畬鎴愮殑鏁版嵁");
+ return;
+ }
+ const cannotComplete = selectedRows.value.filter(
+ row => Number(row.reviewStatus) !== 1 || Number(row.orderStatus) === 1
+ );
+ if (cannotComplete.length > 0) {
+ proxy.$modal.msgWarning("閫変腑鐨勬暟鎹腑鍖呭惈闈炲凡瀹℃牳鎴栧凡瀹屾垚鐨勯」锛岃閲嶆柊閫夋嫨");
+ return;
+ }
+ try {
+ await ElMessageBox.confirm(
+ "鏍囪瀹屾垚鍚庤鍗曞皢鍙樹负鍙锛屽彧鑳芥煡鐪嬪拰涓婁紶涓嬭浇闄勪欢锛屼笉鍙挙閿�銆傛槸鍚︾‘璁わ紵",
+ "鎻愮ず",
+ { confirmButtonText: "纭畾", cancelButtonText: "鍙栨秷", type: "warning" }
+ );
+ const ids = selectedRows.value.map(row => row.id);
+ await markOrderCompleted({ ids });
+ proxy.$modal.msgSuccess("鏍囪瀹屾垚鎴愬姛");
+ getList();
+ } catch {
+ // 鐢ㄦ埛鍙栨秷
+ }
+ };
+
+ /** 鐢ㄩ濉暟鎹墦寮�鏂板鍙拌处椤甸潰锛堥噸鏂扮敓鎴愬満鏅級 */
+ const openFormWithPreFill = async (detail) => {
+ operationType.value = "add";
+ form.value = {};
+ productData.value = [];
+ selectedQuotation.value = null;
+ let userLists = await userListNoPage();
+ userList.value = userLists.data;
+ customerList().then(res => {
+ customerOption.value = res;
+ });
+ // 棰勫～鍘熷彴璐︽暟鎹埌鏂板琛ㄥ崟
+ form.value.customerId = detail.customerId;
+ form.value.customerName = detail.customerName;
+ form.value.projectName = detail.projectName;
+ form.value.salesman = detail.salesman;
+ form.value.entryPerson = Number(userStore.id);
+ form.value.entryDate = getCurrentDate();
+ form.value.executionDate = detail.executionDate || getCurrentDate();
+ form.value.deliveryDate = detail.deliveryDate;
+ form.value.paymentMethod = detail.paymentMethod;
+ form.value.contractAmount = detail.contractAmount;
+ form.value.remarks = detail.remarks;
+ form.value.customerRemarks = detail.customerRemarks ?? detail.customer_remarks ?? "";
+ productData.value = detail.productData || [];
+ form.value.deliveryDate = dayjs(form.value.entryDate).add(7, "day").format("YYYY-MM-DD");
+ dialogFormVisible.value = true;
+ };
+
const paginationChange = obj => {
page.current = obj.page;
page.size = obj.limit;
@@ -2940,7 +3314,7 @@
tableLoading.value = true;
const { entryDate, ...rest } = searchForm;
// 灏嗚寖鍥存棩鏈熷瓧娈典紶閫掔粰鍚庣
- const params = { ...rest, ...page };
+ const params = { ...rest, ...page, reviewStatusList: [0, 1] };
// 绉婚櫎褰曞叆鏃ユ湡鐨勯粯璁ゅ�艰缃紝鍙繚鐣欒寖鍥存棩鏈熷瓧娈�
delete params.entryDate;
// 鏌ヨ瀹㈡埛鍚嶇О涓庢柊澧炰繚鎸佷竴鑷达細鍏堥�� customerId锛屽啀鏄犲皠涓� customerName 鏌ヨ
@@ -2958,15 +3332,13 @@
delete params.customerName;
}
}
- const widthValue =
- params.width != null ? String(params.width).trim() : "";
+ const widthValue = params.width != null ? String(params.width).trim() : "";
if (widthValue) {
params.width = widthValue;
} else {
delete params.width;
}
- const heightValue =
- params.height != null ? String(params.height).trim() : "";
+ const heightValue = params.height != null ? String(params.height).trim() : "";
if (heightValue) {
params.height = heightValue;
} else {
@@ -3011,6 +3383,10 @@
return;
}
const row = selectedRows.value[0] || {};
+ if (Number(row.reviewStatus) !== 1) {
+ ElMessage.warning("鍙湁宸插鏍哥殑鍙拌处鎵嶈兘杩涜鍏ュ簱鎿嶄綔");
+ return;
+ }
const id = row?.id;
if (!id) {
ElMessage.warning("鎵�閫夋暟鎹己灏慽d锛屾棤娉曞叆搴�");
@@ -3040,7 +3416,9 @@
const res = await productList({ salesLedgerId: id, type: 1 });
stockProductList.value = [];
stockProductList.value =
- res.data.filter(item => item.productStockStatus == 0 || item.productStockStatus == 1) || [];
+ res.data.filter(
+ item => item.productStockStatus == 0 || item.productStockStatus == 1
+ ) || [];
} catch (e) {
proxy?.$modal?.msgError?.("鑾峰彇浜у搧鎴栧鎵逛汉澶辫触");
} finally {
@@ -3071,9 +3449,16 @@
proxy?.$modal?.loading?.("姝ｅ湪鍏ュ簱锛岃绋嶅��...");
try {
- const approveUserIds = stockApproverNodes.value.map(node => node.userId).join(",");
+ const approveUserIds = stockApproverNodes.value
+ .map(node => node.userId)
+ .join(",");
const approveUserName = stockApproverNodes.value
- .map(node => stockApproverOptions.value.find(item => String(item.userId) === String(node.userId))?.userName)
+ .map(
+ node =>
+ stockApproverOptions.value.find(
+ item => String(item.userId) === String(node.userId)
+ )?.userName
+ )
.filter(Boolean)
.join(",");
await salesStock({
@@ -3095,7 +3480,11 @@
// 鎵撳紑鈥滃伐鑹鸿矾绾块厤缃�濋�夋嫨寮圭獥锛堝繀椤绘樉寮忛�夋嫨锛�
const openProcessFlowSelect = async ledgerRow => {
if (!ledgerRow) return;
- if (!ledgerRow.isEdit) return;
+ if (Number(ledgerRow.reviewStatus) !== 1) {
+ proxy.$modal.msgWarning("鍙湁宸插鏍哥殑鍙拌处鎵嶈兘閫夋嫨宸ヨ壓璺嚎");
+ return;
+ }
+ // if (!ledgerRow.isEdit) return;
processFlowSelectLedgerRow.value = ledgerRow;
processFlowSelectDefaultRouteId.value = null;
@@ -3391,10 +3780,16 @@
};
// 鎵撳紑寮规
const openForm = async (type, row) => {
- operationType.value = type;
+ // 宸插畬鎴愯鍗曞己鍒朵负鍙妯″紡锛屼絾闄勪欢涓婁紶浠嶅彲鐢�
+ const isCompleted = Number(row?.orderStatus) === 1;
+ const effectiveType = isCompleted ? 'view' : type;
+ operationType.value = effectiveType;
+ isCompletedOrder.value = isCompleted;
form.value = {};
productData.value = [];
selectedQuotation.value = null;
+ // 宸插鏍歌鍗曠紪杈戞椂锛屾爣璁板彧鑳戒慨鏀瑰崟浠凤紙宸插畬鎴愯鍗曞凡寮哄埗view锛屾澶勪笉浼氬啀鍛戒腑锛�
+ isReviewedEdit.value = effectiveType === "edit" && Number(row?.reviewStatus) === 1;
let userLists = await userListNoPage();
userList.value = userLists.data;
customerList().then(res => {
@@ -3631,6 +4026,8 @@
}
form.value.tempFileIds = tempFileIds;
form.value.type = 1;
+ form.value.reviewStatus = form.value.reviewStatus ?? 0; // 榛樿瀹℃牳鐘舵�佷负寰呭鏍�
+ form.value.stockStatus = 0; // 榛樿鍏ュ簱鐘舵�佷负鏈叆搴�
const submitPayload = { ...form.value };
delete submitPayload.paymentMethod;
addOrUpdateSalesLedger(submitPayload).then(res => {
@@ -3645,6 +4042,8 @@
const closeDia = () => {
proxy.resetForm("formRef");
dialogFormVisible.value = false;
+ isCompletedOrder.value = false;
+ isReviewedEdit.value = false;
};
const productIndex = ref(0);
@@ -3875,18 +4274,33 @@
};
// 瀵煎叆
const handleImport = () => {
+ currentImportCommand.value = "default";
openImportDialog("瀵煎叆閿�鍞彴璐�", "/sales/ledger/import");
};
// 鍘嗗彶杩佺Щ
const handleHistoryImportCommand = command => {
const url = HISTORY_IMPORT_URL_MAP[command];
if (!url) return;
- const title = command === "shipped" ? "鍘嗗彶杩佺Щ-宸插彂璐�" : "鍘嗗彶杩佺Щ-鏈彂璐�";
+ currentImportCommand.value = command;
+ const title = command === "shipped" ? "鍘嗗彶杩佺Щ-宸插嚭搴�" : "鍘嗗彶杩佺Щ-鏈嚭搴�";
openImportDialog(title, url);
};
// 涓嬭浇瀵煎叆妯℃澘
const downloadTemplate = () => {
+ const command = currentImportCommand.value;
+ if (command && command !== "default") {
+ const templateUrl = HISTORY_IMPORT_TEMPLATE_URL_MAP[command];
+ const fileName = HISTORY_IMPORT_TEMPLATE_FILE_NAME_MAP[command];
+ if (templateUrl) {
+ proxy.download(
+ templateUrl,
+ {},
+ fileName || "閿�鍞彂璐у巻鍙叉暟鎹鍏ユā鏉�.xlsx"
+ );
+ return;
+ }
+ }
proxy.download("/sales/ledger/exportTemplate", {}, "閿�鍞彴璐﹀鍏ユā鏉�.xlsx");
};
const onClose = () => {
@@ -3902,19 +4316,34 @@
proxy.$refs["importUploadRef"].submit();
};
- // 瀵煎嚭
+ // 瀵煎嚭锛堟寜褰撳墠鏌ヨ鏉′欢瀵煎嚭锛�
const handleOut = () => {
- ElMessageBox.confirm("閫変腑鐨勫唴瀹瑰皢琚鍑猴紝鏄惁纭瀵煎嚭锛�", "瀵煎嚭", {
- confirmButtonText: "纭",
- cancelButtonText: "鍙栨秷",
- type: "warning",
- })
- .then(() => {
- proxy.download("/sales/ledger/export", {}, "閿�鍞彴璐�.xlsx");
- })
- .catch(() => {
- proxy.$modal.msg("宸插彇娑�");
- });
+ // 鏋勫缓鏌ヨ鍙傛暟锛堜笌 getList 淇濇寔涓�鑷达級
+ const { entryDate, ...rest } = searchForm;
+ const params = { ...rest };
+
+ // 澶勭悊褰曞叆鏃ユ湡鑼冨洿
+ if (entryDate && entryDate.length === 2) {
+ params.entryDateStart = entryDate[0];
+ params.entryDateEnd = entryDate[1];
+ }
+
+ // 澶勭悊瀹㈡埛鍚嶇О鏌ヨ
+ const selectedCustomer = (customerOption.value || []).find(
+ item => String(item?.id ?? "") === String(params.customerId ?? "")
+ );
+ if (selectedCustomer?.customerName) {
+ params.customerName = String(selectedCustomer.customerName).trim();
+ }
+ delete params.customerId;
+
+ // 澶勭悊浜у搧瀹介珮鏌ヨ鍙傛暟
+ const widthValue = params.width != null ? String(params.width).trim() : "";
+ const heightValue = params.height != null ? String(params.height).trim() : "";
+ if (!widthValue) delete params.width;
+ if (!heightValue) delete params.height;
+
+ proxy.download("/sales/ledger/exportWithProducts", params, "閿�鍞彴璐�.xlsx");
};
/** 鍒ゆ柇鍗曚釜浜у搧鏄惁宸插彂璐э紙鏍规嵁shippingStatus鍒ゆ柇锛屽凡鍙戣揣鎴栧鏍搁�氳繃涓嶅彲缂栬緫鍜屽垹闄わ級 */
const isProductShipped = product => {
@@ -3945,6 +4374,15 @@
return;
}
const ids = selectedRows.value.map(item => item.id);
+
+ // 妫�鏌ユ槸鍚︽湁宸插鏍哥殑鍙拌处
+ const audited = selectedRows.value.filter(
+ row => Number(row.reviewStatus) === 1
+ );
+ if (audited.length > 0) {
+ proxy.$modal.msgWarning("閫変腑鐨勬暟鎹腑鍖呭惈宸插鏍搁」锛屼笉鑳藉垹闄�");
+ return;
+ }
// 妫�鏌ユ槸鍚︽湁宸茶繘琛屽彂璐ф垨鍙戣揣瀹屾垚鐨勯攢鍞鍗曪紝鑻ユ湁鍒欎笉鍏佽鍒犻櫎
const cannotDeleteNames = [];
@@ -3993,11 +4431,20 @@
command !== "salesDeliveryNote"
)
return;
+
+ if (selectedRows.value.length === 0) {
+ proxy.$modal.msgWarning("璇疯嚦灏戦�夋嫨涓�鏉￠攢鍞彴璐︽暟鎹繘琛屾墦鍗�");
+ return;
+ }
+ const hasUnapproved = selectedRows.value.some(
+ row => Number(row.reviewStatus) !== 1
+ );
+ if (hasUnapproved) {
+ proxy.$modal.msgWarning("閫変腑鐨勬暟鎹腑鍖呭惈鏈鏍搁」锛屾棤娉曟墦鍗�");
+ return;
+ }
+
if (command === "salesDeliveryNote") {
- if (selectedRows.value.length === 0) {
- proxy.$modal.msgWarning("璇疯嚦灏戦�夋嫨涓�鏉￠攢鍞彴璐︽暟鎹繘琛屾墦鍗�");
- return;
- }
const customerNames = Array.from(
new Set(
selectedRows.value.map(item => String(item?.customerName ?? "").trim())
@@ -4033,6 +4480,10 @@
const res = await getSalesInvoices(selectedIds);
const salesInvoiceData = res?.data ?? {};
await printSalesDeliveryNote(salesInvoiceData, selectedRow, selectedIds);
+ // 鎵撳嵃鎴愬姛鍚庨�掑鍗曟嵁鎵撳嵃娆℃暟
+ selectedIds.forEach(id => {
+ incrementPrintCount({ id, printType: 'document' }).catch(() => {});
+ });
} catch (error) {
console.error("鎵撳嵃閿�鍞彂璐у崟澶辫触:", error);
proxy.$modal.msgError("鎵撳嵃澶辫触锛岃绋嶅悗閲嶈瘯");
@@ -4058,12 +4509,15 @@
const res = await getSalesOrder(selectedId);
const salesOrderData = res?.data ?? {};
printSalesOrder(salesOrderData);
+ // 鎵撳嵃鎴愬姛鍚庨�掑鍗曟嵁鎵撳嵃娆℃暟
+ incrementPrintCount({ id: selectedId, printType: 'document' }).catch(() => {});
} else {
const res = await getProcessCard(selectedId);
const processCardData = res?.data ?? {};
// 琛ラ綈浜岀淮鐮佹墍闇�鐨勫彴璐︽爣璇嗭紙鍚庣鏁版嵁鏈夋椂涓嶅甫 id锛�
if (processCardData && typeof processCardData === "object") {
- processCardData.salesLedgerId = processCardData.salesLedgerId ?? selectedId;
+ processCardData.salesLedgerId =
+ processCardData.salesLedgerId ?? selectedId;
processCardData.salesContractNo =
(processCardData.salesContractNo ?? "").trim() ||
String(selectedRow?.salesContractNo ?? "").trim();
@@ -4087,8 +4541,12 @@
return;
}
await printFinishedProcessCard(processCardData);
+ // 鎵撳嵃鎴愬姛鍚庨�掑鍗曟嵁鎵撳嵃娆℃暟
+ incrementPrintCount({ id: selectedId, printType: 'document' }).catch(() => {});
} else {
await printFinishedProcessCard(processCardData);
+ // 鎵撳嵃鎴愬姛鍚庨�掑鍗曟嵁鎵撳嵃娆℃暟
+ incrementPrintCount({ id: selectedId, printType: 'document' }).catch(() => {});
}
}
} catch (error) {
@@ -4112,7 +4570,12 @@
return;
}
- const selectedId = selectedRows.value[0]?.id;
+ const selectedRow = selectedRows.value[0];
+ if (Number(selectedRow?.reviewStatus) !== 1) {
+ proxy.$modal.msgWarning("鍙湁宸插鏍哥殑鍙拌处鎵嶈兘杩涜鏍囩鎵撳嵃");
+ return;
+ }
+ const selectedId = selectedRow?.id;
if (!selectedId) {
proxy.$modal.msgWarning("褰撳墠閫夋嫨鏁版嵁缂哄皯ID锛屾棤娉曟墦鍗版爣绛�");
return;
@@ -4127,6 +4590,8 @@
return;
}
printSalesLabel(labelList);
+ // 鎵撳嵃鎴愬姛鍚庨�掑鏍囩鎵撳嵃娆℃暟
+ incrementPrintCount({ id: selectedId, printType: 'label' }).catch(() => {});
} catch (error) {
console.error("鎵撳嵃鏍囩澶辫触:", error);
proxy.$modal.msgError("鎵撳嵃鏍囩澶辫触锛岃绋嶅悗閲嶈瘯");
@@ -4481,15 +4946,15 @@
return false;
}
- // 濡傛灉鍚庣杩斿洖浜嗗彴璐︾骇鍙戣揣鐘舵�侊紙deliveryStatus锛�
- // 1=宸插彂璐э紝鍒欑姝㈠啀娆″彂璐�
+ // 鍙拌处绾у彂璐х姸鎬侊紙deliveryStatus锛夛細2瀹℃壒涓��5宸插彂璐� 鏃朵笉鍙啀鍙戣捣鏈鍙戣揣锛�6閮ㄥ垎鍙戣揣浠嶅彲鎸夋槑缁嗙户缁彂
const deliveryStatus = row.deliveryStatus;
if (
deliveryStatus !== null &&
deliveryStatus !== undefined &&
String(deliveryStatus).trim() !== ""
) {
- if (Number(deliveryStatus) === 1) return false;
+ const ds = Number(deliveryStatus);
+ if (ds === 2 || ds === 5) return false;
}
// 鑾峰彇鍙戣揣鐘舵��
@@ -4545,12 +5010,15 @@
return;
}
- // 鍙厑璁搞�愭湭鍙戣揣/瀹℃壒澶辫触銆戣繘鍏ュ彂璐ф祦绋�
+ // 鍏佽锛�1鏈彂璐с��3瀹℃壒涓嶉�氳繃銆�4瀹℃壒閫氳繃銆�6閮ㄥ垎鍙戣揣锛涗笉鍏佽锛�2瀹℃壒涓��5宸插彂璐�
const statusItem = selectedRows.value[0].deliveryStatus;
+ const ledgerAllowsDelivery = s => [1, 3, 4, 6].includes(Number(s));
let isTrue = true;
selectedRows.value.forEach(row => {
- if (row.deliveryStatus != 1 && row.deliveryStatus != 3) {
- proxy.$modal.msgWarning("浠呮湭鍙戣揣鎴栧鎵瑰け璐ョ殑鍙拌处鍙互鍙戣揣");
+ if (!ledgerAllowsDelivery(row.deliveryStatus)) {
+ proxy.$modal.msgWarning(
+ "浠呮湭鍙戣揣銆佸鎵逛笉閫氳繃銆佸鎵归�氳繃鎴栭儴鍒嗗彂璐х殑鍙拌处鍙互鍙戣揣"
+ );
isTrue = false;
return;
}
@@ -4587,9 +5055,9 @@
return;
}
- // 宸插彂璐у彴璐︼細寮圭獥鎻愰啋锛屼笉鑳藉啀娆″彂璐э紙4 瑙嗕负宸插彂璐э級
+ // 宸插叏閮ㄥ彂璐э紙5锛夌殑鍙拌处锛氬脊绐楁彁閱掞紝涓嶈兘鍐嶆鍙戣揣
const shippedLedgers = selectedRows.value.filter(
- r => Number(r.deliveryStatus) === 4
+ r => Number(r.deliveryStatus) === 5
);
if (shippedLedgers.length === selectedRows.value.length) {
try {
@@ -4646,9 +5114,9 @@
try {
const targets = [];
for (const ledger of selectedRows.value) {
- //濡傛灉宸茬粡鏄�滃鎵逛腑(2)鈥濇垨鈥滃凡鍙戣揣(4)鈥濓紝鍒欒烦杩囷紝涓嶅厑璁搁噸澶嶆搷浣�
+ // 瀹℃壒涓�(2)銆佸凡鍏ㄩ儴鍙戣揣(5) 璺宠繃锛涢儴鍒嗗彂璐�(6) 绛変粛鏀堕泦鍙彂鏄庣粏
const status = Number(ledger.deliveryStatus);
- if (status === 2 || status === 4) {
+ if (status === 2 || status === 5) {
console.warn(
`鍙拌处缂栧彿 ${ledger.salesContractNo} 鐘舵�佷负 ${status}锛岃烦杩囧彂璐
);
@@ -4704,10 +5172,11 @@
// 鎵撳紑鍙戣揣寮规锛堝崟鏉★級
const openDeliveryForm = async row => {
- // 鍙厑璁搞�愭湭鍙戣揣/瀹℃壒澶辫触銆戝彂璐э紱宸插彂璐�/瀹℃壒涓笉鍏佽
const status = Number(row.deliveryStatus);
- if (status !== 1 && status !== 3) {
- proxy.$modal.msgWarning("鍙湁鍙戣揣鐘舵�佷负鏈彂璐ф垨瀹℃壒澶辫触鐨勮褰曟墠鍙互鍙戣揣");
+ if (![1, 3, 4, 6].includes(status)) {
+ proxy.$modal.msgWarning(
+ "鍙湁鍙戣揣鐘舵�佷负鏈彂璐с�佸鎵逛笉閫氳繃銆佸鎵归�氳繃鎴栭儴鍒嗗彂璐х殑璁板綍鎵嶅彲浠ュ彂璐�"
+ );
return;
}
@@ -4770,6 +5239,7 @@
const run = async () => {
for (const salesLedgerId of uniqueLedgerIds) {
await addShippingInfo({
+ scanOutbound: false,
salesLedgerId,
type: deliveryForm.value.type,
approveUserIds,
@@ -4943,4 +5413,25 @@
flex: 0 0 100%;
}
}
+
+ .reverse-audit-warning {
+ display: flex;
+ align-items: flex-start;
+ padding: 10px 12px;
+ margin-top: 8px;
+ background-color: #fdf6ec;
+ border: 1px solid #faecd8;
+ border-radius: 4px;
+ color: #e6a23c;
+ font-size: 13px;
+ line-height: 1.6;
+ }
+
+ .reverse-audit-dialog .el-radio {
+ display: flex;
+ align-items: center;
+ height: 36px;
+ margin-right: 0;
+ margin-bottom: 8px;
+ }
</style>
--
Gitblit v1.9.3