From 7de7862e8feaaefdf5e9492867db12013a88e9fc Mon Sep 17 00:00:00 2001
From: zhangwencui <1064582902@qq.com>
Date: 星期五, 29 五月 2026 15:07:04 +0800
Subject: [PATCH] 销售台账审核反审核功能
---
src/views/salesManagement/reverseAuditHistory/index.vue | 472 ++++++++++++++++++++++++++
src/views/salesManagement/salesLedger/index.vue | 231 +++++++++---
src/api/salesManagement/reverseAuditHistory.js | 27 +
src/views/inventoryManagement/receiptManagement/Record.vue | 299 ++++++++--------
4 files changed, 826 insertions(+), 203 deletions(-)
diff --git a/src/api/salesManagement/reverseAuditHistory.js b/src/api/salesManagement/reverseAuditHistory.js
new file mode 100644
index 0000000..da988c2
--- /dev/null
+++ b/src/api/salesManagement/reverseAuditHistory.js
@@ -0,0 +1,27 @@
+import request from "@/utils/request";
+
+// 鍒嗛〉鏌ヨ鍙嶅鍘嗗彶
+export function reverseAuditHistoryList(query) {
+ return request({
+ url: "/sales/ledger/reverseAuditHistory/list",
+ method: "get",
+ params: query,
+ });
+}
+
+// 淇濆瓨鍙嶅蹇収
+export function saveReverseAuditSnapshot(data) {
+ return request({
+ url: "/sales/ledger/reverseAuditHistory/save",
+ method: "post",
+ data,
+ });
+}
+
+// 鑾峰彇蹇収璇︽儏
+export function getReverseAuditSnapshotDetail(id) {
+ return request({
+ url: `/sales/ledger/reverseAuditHistory/${id}`,
+ method: "get",
+ });
+}
diff --git a/src/views/inventoryManagement/receiptManagement/Record.vue b/src/views/inventoryManagement/receiptManagement/Record.vue
index aefac4e..700a792 100644
--- a/src/views/inventoryManagement/receiptManagement/Record.vue
+++ b/src/views/inventoryManagement/receiptManagement/Record.vue
@@ -9,26 +9,26 @@
value-format="YYYY-MM-DD"
format="YYYY-MM-DD"
clearable
- @change="handleQuery"/>
+ @change="handleQuery" />
<span class="search_title ml10">浜у搧澶х被锛�</span>
<el-input v-model="searchForm.productName"
style="width: 240px"
placeholder="璇疯緭鍏�"
- clearable/>
+ clearable />
<span class="search_title ml10">鍚堝悓鍙凤細</span>
<el-input v-model="searchForm.salesContractNo"
style="width: 240px"
placeholder="璇疯緭鍏ュ悎鍚屽彿"
- clearable/>
+ clearable />
<span class="search_title ml10">鏉ユ簮锛�</span>
<el-select v-model="searchForm.recordType"
- style="width: 240px"
- placeholder="璇烽�夋嫨"
- clearable>
+ style="width: 240px"
+ placeholder="璇烽�夋嫨"
+ clearable>
<el-option v-for="item in stockRecordTypeOptions"
:key="item.value"
:label="item.label"
- :value="item.value"/>
+ :value="item.value" />
</el-select>
<el-button type="primary"
@click="handleQuery"
@@ -54,40 +54,40 @@
height="calc(100vh - 18.5em)">
<el-table-column align="center"
type="selection"
- width="55"/>
+ width="55" />
<el-table-column align="center"
label="搴忓彿"
type="index"
- width="60"/>
+ width="60" />
<el-table-column label="鍏ュ簱鎵规"
prop="inboundBatches"
width="280"
- show-overflow-tooltip/>
+ show-overflow-tooltip />
<el-table-column label="鍚堝悓鍙�"
prop="salesContractNo"
- show-overflow-tooltip/>
+ show-overflow-tooltip />
<el-table-column label="鍏ュ簱鏃堕棿"
prop="createTime"
:formatter="formatTableDateYmd"
- show-overflow-tooltip/>
+ show-overflow-tooltip />
<el-table-column label="浜у搧澶х被"
prop="productName"
- show-overflow-tooltip/>
+ show-overflow-tooltip />
<el-table-column label="瑙勬牸鍨嬪彿"
prop="model"
- show-overflow-tooltip/>
- <el-table-column label="鍘氬害(mm)"
- prop="thickness"
- show-overflow-tooltip />
+ show-overflow-tooltip />
+ <el-table-column label="鍘氬害(mm)"
+ prop="thickness"
+ show-overflow-tooltip />
<el-table-column label="鍗曚綅"
prop="unit"
- show-overflow-tooltip/>
+ show-overflow-tooltip />
<el-table-column label="鍏ュ簱鏁伴噺"
prop="stockInNum"
- show-overflow-tooltip/>
+ show-overflow-tooltip />
<el-table-column label="鍏ュ簱浜�"
prop="createBy"
- show-overflow-tooltip/>
+ show-overflow-tooltip />
<el-table-column label="鏉ユ簮"
prop="recordType"
show-overflow-tooltip>
@@ -101,170 +101,171 @@
layout="total, sizes, prev, pager, next, jumper"
:page="page.current"
:limit="page.size"
- @pagination="pageProductChange"/>
+ @pagination="pageProductChange" />
</div>
</div>
</template>
<script setup>
-import pagination from "@/components/PIMTable/Pagination.vue";
-import {
- ref,
- reactive,
- toRefs,
- onMounted,
- getCurrentInstance,
-} from "vue";
-import {ElMessageBox} from "element-plus";
-import {
- getStockInRecordListPage,
- batchDeleteStockInRecords,
-} from "@/api/inventoryManagement/stockInRecord.js";
-import {
- findAllQualifiedStockInRecordTypeOptions, findAllUnQualifiedStockInRecordTypeOptions,
-} from "@/api/basicData/enum.js";
-import {parseTime} from "@/utils/ruoyi";
+ import pagination from "@/components/PIMTable/Pagination.vue";
+ import { ref, reactive, toRefs, onMounted, getCurrentInstance } from "vue";
+ import { ElMessageBox } from "element-plus";
+ import {
+ getStockInRecordListPage,
+ batchDeleteStockInRecords,
+ } from "@/api/inventoryManagement/stockInRecord.js";
+ import {
+ findAllQualifiedStockInRecordTypeOptions,
+ findAllUnQualifiedStockInRecordTypeOptions,
+ } from "@/api/basicData/enum.js";
+ import { parseTime } from "@/utils/ruoyi";
-const {proxy} = getCurrentInstance();
+ const { proxy } = getCurrentInstance();
-const formatTableDateYmd = (row, column, cellValue) => {
- if (cellValue == null || cellValue === "") {
- return "";
- }
- return parseTime(cellValue, "{y}-{m}-{d}") || "";
-};
+ const formatTableDateYmd = (row, column, cellValue) => {
+ if (cellValue == null || cellValue === "") {
+ return "";
+ }
+ return parseTime(cellValue, "{y}-{m}-{d}") || "";
+ };
-const props = defineProps({
- type: {
- type: String,
- required: true,
- default: '0'
- }
-})
+ const props = defineProps({
+ type: {
+ type: String,
+ required: true,
+ default: "0",
+ },
+ });
-const tableData = ref([]);
-const selectedRows = ref([]);
-const tableLoading = ref(false);
-// 鏉ユ簮绫诲瀷閫夐」
-const stockRecordTypeOptions = ref([]);
-const page = reactive({
- current: 1,
- size: 10,
-});
-const total = ref(0);
+ const tableData = ref([]);
+ const selectedRows = ref([]);
+ const tableLoading = ref(false);
+ // 鏉ユ簮绫诲瀷閫夐」
+ const stockRecordTypeOptions = ref([]);
+ const page = reactive({
+ current: 1,
+ size: 10,
+ });
+ const total = ref(0);
-const data = reactive({
- searchForm: {
- productName: "",
- salesContractNo: "",
- timeStr: "",
- recordType: "",
- },
-});
-const {searchForm} = toRefs(data);
-// 鏌ヨ鍒楄〃
-/** 鎼滅储鎸夐挳鎿嶄綔 */
-const handleQuery = () => {
- page.current = 1;
- getList();
-};
+ const data = reactive({
+ searchForm: {
+ productName: "",
+ salesContractNo: "",
+ timeStr: "",
+ recordType: "",
+ },
+ });
+ const { searchForm } = toRefs(data);
+ // 鏌ヨ鍒楄〃
+ /** 鎼滅储鎸夐挳鎿嶄綔 */
+ const handleQuery = () => {
+ page.current = 1;
+ getList();
+ };
-const getRecordType = (recordType) => {
- return stockRecordTypeOptions.value.find(item => item.value === recordType)?.label || ''
-}
+ const getRecordType = recordType => {
+ return (
+ stockRecordTypeOptions.value.find(item => item.value === recordType)
+ ?.label || ""
+ );
+ };
-const pageProductChange = obj => {
- page.current = obj.page;
- page.size = obj.limit;
- getList();
-};
+ const pageProductChange = obj => {
+ page.current = obj.page;
+ page.size = obj.limit;
+ getList();
+ };
-const getList = () => {
- tableLoading.value = true;
- const params = {...page, type: props.type};
- params.timeStr = searchForm.value.timeStr;
- params.productName = searchForm.value.productName;
- params.salesContractNo = searchForm.value.salesContractNo;
- params.recordType = searchForm.value.recordType;
- getStockInRecordListPage(params)
+ const getList = () => {
+ tableLoading.value = true;
+ const params = { ...page, type: props.type };
+ params.timeStr = searchForm.value.timeStr;
+ params.productName = searchForm.value.productName;
+ params.salesContractNo = searchForm.value.salesContractNo;
+ params.recordType = searchForm.value.recordType;
+ getStockInRecordListPage(params)
.then(res => {
tableData.value = res.data.records;
total.value = res.data.total || 0;
- }).finally(() => {
- tableLoading.value = false;
- })
-};
-
-// 鑾峰彇鏉ユ簮绫诲瀷閫夐」
-const fetchStockRecordTypeOptions = () => {
- if (props.type === '0') {
- findAllQualifiedStockInRecordTypeOptions()
- .then(res => {
- stockRecordTypeOptions.value = res.data;
- })
- return
- }
- findAllUnQualifiedStockInRecordTypeOptions()
- .then(res => {
- stockRecordTypeOptions.value = res.data;
})
-}
+ .finally(() => {
+ tableLoading.value = false;
+ });
+ };
-// 琛ㄦ牸閫夋嫨鏁版嵁
-const handleSelectionChange = selection => {
- selectedRows.value = selection.filter(item => item.id);
-};
+ // 鑾峰彇鏉ユ簮绫诲瀷閫夐」
+ const fetchStockRecordTypeOptions = () => {
+ if (props.type === "0") {
+ findAllQualifiedStockInRecordTypeOptions().then(res => {
+ stockRecordTypeOptions.value = res.data;
+ });
+ return;
+ }
+ findAllUnQualifiedStockInRecordTypeOptions().then(res => {
+ stockRecordTypeOptions.value = res.data;
+ });
+ };
-const expandedRowKeys = ref([]);
+ // 琛ㄦ牸閫夋嫨鏁版嵁
+ const handleSelectionChange = selection => {
+ selectedRows.value = selection.filter(item => item.id);
+ };
-// 瀵煎嚭
-const handleOut = () => {
- ElMessageBox.confirm("鏄惁纭瀵煎嚭锛�", "瀵煎嚭", {
- confirmButtonText: "纭",
- cancelButtonText: "鍙栨秷",
- type: "warning",
- })
+ const expandedRowKeys = ref([]);
+
+ // 瀵煎嚭
+ const handleOut = () => {
+ ElMessageBox.confirm("鏄惁纭瀵煎嚭锛�", "瀵煎嚭", {
+ confirmButtonText: "纭",
+ cancelButtonText: "鍙栨秷",
+ type: "warning",
+ })
.then(() => {
// 鏍规嵁涓嶅悓鐨� tab 绫诲瀷璋冪敤涓嶅悓鐨勫鍑烘帴鍙�
- proxy.download("/stockInRecord/exportStockInRecord", {type: props.type}, props.type === '0' ? "鍚堟牸鍏ュ簱.xlsx" : "涓嶅悎鏍煎叆搴�.xlsx");
+ proxy.download(
+ "/stockInRecord/exportStockInRecord",
+ { type: props.type },
+ props.type === "0" ? "鍚堟牸鍏ュ簱.xlsx" : "涓嶅悎鏍煎叆搴�.xlsx"
+ );
})
.catch(() => {
proxy.$modal.msg("宸插彇娑�");
});
-};
+ };
-// 鍒犻櫎
-const handleDelete = () => {
- if (selectedRows.value.length === 0) {
- proxy.$modal.msgWarning("璇烽�夋嫨鏁版嵁");
- return;
- }
- const ids = selectedRows.value.map(item => item.id);
+ // 鍒犻櫎
+ const handleDelete = () => {
+ if (selectedRows.value.length === 0) {
+ proxy.$modal.msgWarning("璇烽�夋嫨鏁版嵁");
+ return;
+ }
+ const ids = selectedRows.value.map(item => item.id);
- ElMessageBox.confirm("閫変腑鐨勫唴瀹瑰皢琚垹闄わ紝鏄惁纭鍒犻櫎锛�", "鍒犻櫎", {
- confirmButtonText: "纭",
- cancelButtonText: "鍙栨秷",
- type: "warning",
- })
+ ElMessageBox.confirm("閫変腑鐨勫唴瀹瑰皢琚垹闄わ紝鏄惁纭鍒犻櫎锛�", "鍒犻櫎", {
+ confirmButtonText: "纭",
+ cancelButtonText: "鍙栨秷",
+ type: "warning",
+ })
.then(() => {
batchDeleteStockInRecords(ids)
- .then(() => {
- proxy.$modal.msgSuccess("鍒犻櫎鎴愬姛");
- getList();
- })
- .catch(() => {
- proxy.$modal.msgError("鍒犻櫎澶辫触");
- });
+ .then(() => {
+ proxy.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+ getList();
+ })
+ .catch(() => {
+ proxy.$modal.msgError("鍒犻櫎澶辫触");
+ });
})
.catch(() => {
proxy.$modal.msg("宸插彇娑�");
});
-};
+ };
-onMounted(() => {
- getList();
- fetchStockRecordTypeOptions();
-});
+ onMounted(() => {
+ getList();
+ fetchStockRecordTypeOptions();
+ });
</script>
<style scoped lang="scss"></style>
diff --git a/src/views/salesManagement/reverseAuditHistory/index.vue b/src/views/salesManagement/reverseAuditHistory/index.vue
new file mode 100644
index 0000000..5ff6540
--- /dev/null
+++ b/src/views/salesManagement/reverseAuditHistory/index.vue
@@ -0,0 +1,472 @@
+<template>
+ <div class="app-container">
+ <div class="search_form">
+ <el-form :model="searchForm"
+ :inline="true">
+ <el-form-item label="瀹㈡埛鍚嶇О锛�">
+ <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
+ @change="handleQuery" />
+ </el-form-item>
+ <el-form-item label="椤圭洰鍚嶇О锛�">
+ <el-input v-model="searchForm.projectName"
+ placeholder="璇疯緭鍏�"
+ clearable
+ @change="handleQuery" />
+ </el-form-item>
+ <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="handleQuery" />
+ </el-form-item>
+ <el-form-item>
+ <el-button type="primary"
+ @click="handleQuery">鎼滅储</el-button>
+ <el-button @click="resetQuery">閲嶇疆</el-button>
+ </el-form-item>
+ </el-form>
+ </div>
+ <div class="table_list">
+ <el-table :data="tableData"
+ border
+ v-loading="loading">
+ <el-table-column label="搴忓彿"
+ type="index"
+ width="60"
+ align="center" />
+ <el-table-column label="鍙嶅鏃堕棿"
+ prop="counterReviewTime"
+ align="center">
+ <template #default="scope">
+ {{ formatTime(scope.row.counterReviewTime) }}
+ </template>
+ </el-table-column>
+ <el-table-column label="鍙嶅浜�"
+ prop="counterReviewPerson"
+ align="center" />
+ <el-table-column label="閿�鍞悎鍚屽彿"
+ prop="salesContractNo" />
+ <el-table-column label="瀹㈡埛鍚嶇О"
+ prop="customerName"
+ show-overflow-tooltip />
+ <el-table-column label="椤圭洰鍚嶇О"
+ prop="projectName"
+ show-overflow-tooltip />
+ <el-table-column label="鍚堝悓閲戦(鍏�)"
+ prop="contractAmount"
+ align="right">
+ <template #default="scope">
+ {{ formattedNumber(null, null, scope.row.contractAmount) }}
+ </template>
+ </el-table-column>
+ <el-table-column label="鎿嶄綔"
+ width="100"
+ align="center"
+ fixed="right">
+ <template #default="scope">
+ <el-button link
+ type="primary"
+ @click="handleView(scope.row)">鏌ョ湅蹇収</el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ <pagination v-show="total > 0"
+ :total="total"
+ :page="page.current"
+ :limit="page.size"
+ @pagination="paginationChange" />
+ </div>
+ <!-- 蹇収璇︽儏瀵硅瘽妗� -->
+ <el-dialog v-model="dialogVisible"
+ title="鍙嶅鏁版嵁蹇収璇︽儏"
+ width="85%">
+ <div class="snapshot-detail">
+ <el-divider content-position="left">鍩烘湰淇℃伅</el-divider>
+ <el-descriptions border
+ :column="3">
+ <el-descriptions-item label="閿�鍞悎鍚屽彿">{{ currentSnapshot.salesContractNo }}</el-descriptions-item>
+ <el-descriptions-item label="涓氬姟鍛�">{{ currentSnapshot.salesman }}</el-descriptions-item>
+ <el-descriptions-item label="瀹㈡埛鍚嶇О">{{ currentSnapshot.customerName }}</el-descriptions-item>
+ <el-descriptions-item label="椤圭洰鍚嶇О">{{ currentSnapshot.projectName }}</el-descriptions-item>
+ <el-descriptions-item label="绛捐鏃ユ湡">{{ currentSnapshot.executionDate }}</el-descriptions-item>
+ <el-descriptions-item label="浜よ揣鏃ユ湡">{{ currentSnapshot.deliveryDate }}</el-descriptions-item>
+ <el-descriptions-item label="褰曞叆浜�">{{ currentSnapshot.entryPersonName || currentSnapshot.entryPerson }}</el-descriptions-item>
+ <el-descriptions-item label="褰曞叆鏃ユ湡">{{ currentSnapshot.entryDate }}</el-descriptions-item>
+ <el-descriptions-item label="鍚堝悓閲戦(鍏�)">{{ formattedNumber(null, null, currentSnapshot.contractAmount) }}</el-descriptions-item>
+ <el-descriptions-item label="鍙嶅鏃堕棿">{{ formatTime(currentSnapshot.counterReviewTime) }}</el-descriptions-item>
+ <el-descriptions-item label="鍙嶅浜�">{{ currentSnapshot.counterReviewPerson }}</el-descriptions-item>
+ </el-descriptions>
+ <el-divider content-position="left"
+ style="margin-top: 30px;">浜у搧淇℃伅</el-divider>
+ <el-table :data="currentSnapshot.productData"
+ border
+ stripe
+ show-summary
+ :summary-method="summarizeMainTable">
+ <el-table-column align="center"
+ label="搴忓彿"
+ type="index"
+ width="60" />
+ <el-table-column label="浜у搧澶х被"
+ prop="productCategory"
+ min-width="120"
+ show-overflow-tooltip />
+ <el-table-column label="瑙勬牸鍨嬪彿"
+ prop="specificationModel"
+ min-width="150"
+ show-overflow-tooltip />
+ <el-table-column label="鍘氬害(mm)"
+ prop="thickness"
+ width="90"
+ align="center" />
+ <el-table-column label="妤煎眰缂栧彿"
+ prop="floorCode"
+ min-width="120"
+ show-overflow-tooltip />
+ <el-table-column label="鍚◣鍗曚环(鍏�)"
+ prop="taxInclusiveUnitPrice"
+ width="110"
+ align="right">
+ <template #default="scope">
+ {{ formattedNumber(null, null, scope.row.taxInclusiveUnitPrice) }}
+ </template>
+ </el-table-column>
+ <el-table-column label="瀹�(mm)"
+ prop="width"
+ width="80"
+ align="center" />
+ <el-table-column label="楂�(mm)"
+ prop="height"
+ width="80"
+ align="center" />
+ <el-table-column label="鏁伴噺"
+ prop="quantity"
+ width="80"
+ align="center" />
+ <el-table-column label="缁撶畻鍗曠墖闈㈢Н(銕�)"
+ prop="settlePieceArea"
+ width="130"
+ align="center">
+ <template #default="scope">
+ {{ scope.row.settlePieceArea ? Number(scope.row.settlePieceArea).toFixed(4) : "" }}
+ </template>
+ </el-table-column>
+ <el-table-column label="闈㈢Н(m虏)"
+ prop="actualTotalArea"
+ width="110"
+ align="center">
+ <template #default="scope">
+ {{ scope.row.actualTotalArea ? Number(scope.row.actualTotalArea).toFixed(4) : "" }}
+ </template>
+ </el-table-column>
+ <el-table-column label="绋庣巼(%)"
+ prop="taxRate"
+ width="80"
+ align="center" />
+ <el-table-column label="鍚◣鎬讳环(鍏�)"
+ prop="taxInclusiveTotalPrice"
+ width="110"
+ align="right">
+ <template #default="scope">
+ {{ formattedNumber(null, null, scope.row.taxInclusiveTotalPrice) }}
+ </template>
+ </el-table-column>
+ <el-table-column label="涓嶅惈绋庢�讳环(鍏�)"
+ prop="taxExclusiveTotalPrice"
+ width="110"
+ align="right">
+ <template #default="scope">
+ {{ formattedNumber(null, null, scope.row.taxExclusiveTotalPrice) }}
+ </template>
+ </el-table-column>
+ <el-table-column label="鍔犲伐瑕佹眰"
+ prop="processRequirement"
+ min-width="150"
+ show-overflow-tooltip />
+ <el-table-column label="鍙戠エ绫诲瀷"
+ prop="invoiceType"
+ width="100"
+ align="center" />
+ <el-table-column label="棰濆鍔犲伐"
+ min-width="180">
+ <template #default="scope">
+ <div v-if="scope.row.salesProductProcessList && scope.row.salesProductProcessList.length > 0">
+ <el-tag v-for="(item, idx) in scope.row.salesProductProcessList"
+ :key="idx"
+ size="small"
+ type="info"
+ style="margin: 2px;">
+ {{ item.processName }} ({{ item.quantity }})
+ </el-tag>
+ </div>
+ </template>
+ </el-table-column>
+ <el-table-column label="澶囨敞"
+ prop="remark"
+ min-width="120"
+ show-overflow-tooltip />
+ <el-table-column label="閲嶇"
+ prop="heavyBox"
+ width="100"
+ show-overflow-tooltip />
+ </el-table>
+ <el-row :gutter="30"
+ style="margin-top: 20px;">
+ <el-col :span="12">
+ <div class="remark-section">
+ <div class="label">澶囨敞锛�</div>
+ <div class="content">{{ currentSnapshot.remarks || "鏃�" }}</div>
+ </div>
+ </el-col>
+ <el-col :span="12">
+ <div class="remark-section">
+ <div class="label">瀹㈡埛澶囨敞锛�</div>
+ <div class="content">{{ currentSnapshot.customerRemarks || "鏃�" }}</div>
+ </div>
+ </el-col>
+ </el-row>
+ </div>
+ <template #footer>
+ <el-button @click="dialogVisible = false">鍏抽棴</el-button>
+ </template>
+ </el-dialog>
+ </div>
+</template>
+
+<script setup>
+ import { ref, reactive, onMounted, getCurrentInstance } from "vue";
+ import {
+ customerList,
+ ledgerListPage,
+ getSalesLedgerWithProducts,
+ } from "@/api/salesManagement/salesLedger.js";
+ import pagination from "@/components/PIMTable/Pagination.vue";
+ import dayjs from "dayjs";
+
+ const { proxy } = getCurrentInstance();
+ const loading = ref(false);
+ const tableData = ref([]);
+ const total = ref(0);
+ const dialogVisible = ref(false);
+ const currentSnapshot = ref({});
+ const customerOption = ref([]);
+
+ const searchForm = reactive({
+ customerId: undefined,
+ salesContractNo: "",
+ projectName: "",
+ width: undefined,
+ height: undefined,
+ entryDate: [],
+ deliveryStatus: undefined,
+ stockStatus: undefined,
+ reverseAuditDate: [],
+ });
+
+ const page = reactive({
+ current: 1,
+ size: 10,
+ });
+
+ const getList = () => {
+ loading.value = true;
+
+ const params = {
+ ...page,
+ salesContractNo: searchForm.salesContractNo,
+ projectName: searchForm.projectName,
+ width: searchForm.width,
+ height: searchForm.height,
+ deliveryStatus: searchForm.deliveryStatus,
+ stockStatus: searchForm.stockStatus,
+ reviewStatus: 2, // 鍥哄畾浼�2
+ beginTime: searchForm.reverseAuditDate?.[0],
+ endTime: searchForm.reverseAuditDate?.[1],
+ entryDateStart: searchForm.entryDate?.[0],
+ entryDateEnd: searchForm.entryDate?.[1],
+ };
+
+ // 鏌ヨ瀹㈡埛鍚嶇О涓庡彴璐︿繚鎸佷竴鑷达細鍏堥�� customerId锛屽啀鏄犲皠涓� customerName 鏌ヨ
+ const selectedCustomer = (customerOption.value || []).find(
+ item => String(item?.id ?? "") === String(searchForm.customerId ?? "")
+ );
+ if (selectedCustomer?.customerName) {
+ params.customerName = String(selectedCustomer.customerName).trim();
+ }
+
+ ledgerListPage(params)
+ .then(res => {
+ tableData.value = res.records || [];
+ total.value = res.total || 0;
+ })
+ .catch(err => {
+ console.error("鑾峰彇鍙嶅鍘嗗彶澶辫触:", err);
+ tableData.value = [];
+ total.value = 0;
+ })
+ .finally(() => {
+ loading.value = false;
+ });
+ };
+
+ const handleQuery = () => {
+ page.current = 1;
+ getList();
+ };
+
+ const paginationChange = obj => {
+ page.current = obj.page;
+ page.size = obj.limit;
+ getList();
+ };
+
+ const resetQuery = () => {
+ searchForm.customerId = undefined;
+ searchForm.salesContractNo = "";
+ searchForm.projectName = "";
+ searchForm.width = undefined;
+ searchForm.height = undefined;
+ searchForm.entryDate = [];
+ searchForm.deliveryStatus = undefined;
+ searchForm.stockStatus = undefined;
+ searchForm.reverseAuditDate = [];
+ page.current = 1;
+ handleQuery();
+ };
+
+ const getCustomerOption = () => {
+ customerList().then(res => {
+ customerOption.value = res || [];
+ });
+ };
+
+ const handleView = row => {
+ getSalesLedgerWithProducts({ id: row.id, type: 1 }).then(res => {
+ currentSnapshot.value = { ...res };
+ // 瀛楁鍚嶅吋瀹瑰鐞嗭紝涓庨攢鍞彴璐︿繚鎸佷竴鑷�
+ currentSnapshot.value.customerRemarks =
+ res?.customerRemarks ?? res?.customer_remarks ?? "";
+ dialogVisible.value = true;
+ });
+ };
+
+ const formattedNumber = (row, column, cellValue) => {
+ if (cellValue == null || cellValue === "") return "0.00";
+ return Number(cellValue).toLocaleString("zh-CN", {
+ minimumFractionDigits: 2,
+ maximumFractionDigits: 2,
+ });
+ };
+
+ const formatTime = time => {
+ if (!time) return "";
+ return dayjs(time).format("YYYY-MM-DD HH:mm:ss");
+ };
+
+ const summarizeMainTable = param => {
+ const { columns, data } = param;
+ const sums = [];
+ columns.forEach((column, index) => {
+ if (index === 0) {
+ sums[index] = "鍚堣";
+ return;
+ }
+ const prop = column.property;
+ if (
+ [
+ "quantity",
+ "actualTotalArea",
+ "taxInclusiveTotalPrice",
+ "taxExclusiveTotalPrice",
+ ].includes(prop)
+ ) {
+ const values = data.map(item => Number(item[prop]));
+ if (!values.every(value => isNaN(value))) {
+ const sum = values.reduce((prev, curr) => {
+ const value = Number(curr);
+ if (!isNaN(value)) {
+ return prev + curr;
+ } else {
+ return prev;
+ }
+ }, 0);
+ if (prop === "quantity") {
+ sums[index] = sum;
+ } else if (prop === "actualTotalArea") {
+ sums[index] = sum.toFixed(4);
+ } else {
+ sums[index] = sum.toLocaleString("zh-CN", {
+ minimumFractionDigits: 2,
+ maximumFractionDigits: 2,
+ });
+ }
+ } else {
+ sums[index] = "";
+ }
+ } else {
+ sums[index] = "";
+ }
+ });
+ return sums;
+ };
+
+ onMounted(() => {
+ getCustomerOption();
+ getList();
+ });
+</script>
+
+<style scoped lang="scss">
+ .app-container {
+ padding: 20px;
+ }
+ .search_form {
+ margin-bottom: 20px;
+ }
+ .table_list {
+ background: #fff;
+ padding: 20px;
+ border-radius: 4px;
+ }
+ .snapshot-detail {
+ max-height: 70vh;
+ overflow-y: auto;
+ padding-right: 10px;
+
+ .remark-section {
+ margin-bottom: 15px;
+ .label {
+ font-weight: bold;
+ color: #606266;
+ margin-bottom: 8px;
+ }
+ .content {
+ padding: 10px;
+ background-color: #f5f7fa;
+ border-radius: 4px;
+ min-height: 40px;
+ white-space: pre-wrap;
+ }
+ }
+ }
+</style>
diff --git a/src/views/salesManagement/salesLedger/index.vue b/src/views/salesManagement/salesLedger/index.vue
index 3914dd9..f7c5c6e 100644
--- a/src/views/salesManagement/salesLedger/index.vue
+++ b/src/views/salesManagement/salesLedger/index.vue
@@ -105,6 +105,10 @@
@confirm="handleProcessFlowSelectConfirm" />
<el-space wrap>
<el-button type="primary"
+ @click="handleAudit">瀹℃牳</el-button>
+ <el-button type="primary"
+ @click="handleReverseAudit">鍙嶅</el-button>
+ <el-button type="primary"
@click="handleSalesStock">鍏ュ簱</el-button>
<el-button type="primary"
@click="openForm('add')">鏂板鍙拌处</el-button>
@@ -255,7 +259,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"
@@ -381,6 +385,18 @@
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="鍏ュ簱鐘舵��"
width="120"
align="center">
@@ -433,7 +449,7 @@
<el-button link
type="primary"
@click="openProcessFlowSelect(scope.row)"
- :disabled="!scope.row.isEdit">宸ヨ壓璺嚎</el-button>
+ :disabled="!scope.row.isEdit || Number(scope.row.reviewStatus) === 1">宸ヨ壓璺嚎</el-button>
<el-button link
type="primary"
@click="downLoadFile(scope.row)">闄勪欢</el-button>
@@ -491,7 +507,7 @@
<el-select v-model="form.salesman"
placeholder="璇烽�夋嫨"
clearable
- :disabled="operationType === 'view'">
+ :disabled="operationType === 'view' || Number(form.reviewStatus) === 1">
<el-option v-for="item in userList"
:key="item.nickName"
:label="item.nickName"
@@ -508,7 +524,7 @@
filterable
placeholder="璇烽�夋嫨"
clearable
- :disabled="operationType === 'view'">
+ :disabled="operationType === 'view' || Number(form.reviewStatus) === 1">
<el-option v-for="item in customerOption"
:key="item.id"
:label="item.customerName"
@@ -524,7 +540,7 @@
<el-input v-model="form.projectName"
placeholder="璇疯緭鍏�"
clearable
- :disabled="operationType === 'view'" />
+ :disabled="operationType === 'view' || Number(form.reviewStatus) === 1" />
</el-form-item>
</el-col>
</el-row>
@@ -539,7 +555,7 @@
type="date"
placeholder="璇烽�夋嫨"
clearable
- :disabled="operationType === 'view'" />
+ :disabled="operationType === 'view' || Number(form.reviewStatus) === 1" />
</el-form-item>
</el-col>
<el-col :span="12">
@@ -551,7 +567,8 @@
format="YYYY-MM-DD"
type="date"
placeholder="璇烽�夋嫨"
- clearable />
+ clearable
+ :disabled="operationType === 'view' || Number(form.reviewStatus) === 1" />
</el-form-item>
</el-col>
</el-row>
@@ -565,7 +582,8 @@
:reserve-keyword="false"
placeholder="璇烽�夋嫨"
clearable
- @change="changs">
+ @change="changs"
+ :disabled="operationType === 'view' || Number(form.reviewStatus) === 1">
<el-option v-for="item in userList"
:key="item.userId"
:label="item.nickName"
@@ -582,7 +600,8 @@
format="YYYY-MM-DD"
type="date"
placeholder="璇烽�夋嫨"
- clearable />
+ clearable
+ :disabled="operationType === 'view' || Number(form.reviewStatus) === 1" />
</el-form-item>
</el-col>
</el-row>
@@ -591,13 +610,14 @@
prop="entryDate">
<el-button v-if="operationType !== 'view'"
type="primary"
- :disabled="hasEditingProductRow()"
+ :disabled="hasEditingProductRow() || Number(form.reviewStatus) === 1"
@click="addProductInline">
娣诲姞
</el-button>
<el-button v-if="operationType !== 'view'"
plain
type="danger"
+ :disabled="Number(form.reviewStatus) === 1"
@click="deleteProduct">鍒犻櫎</el-button>
</el-form-item>
</el-row>
@@ -629,7 +649,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="Number(form.reviewStatus) === 1" />
<span v-else>{{ scope.row.productCategory ?? "" }}</span>
</template>
</el-table-column>
@@ -643,7 +664,8 @@
clearable
filterable
style="width: 100%"
- @change="(val) => handleInlineProductModelChange(scope.row, val)">
+ @change="(val) => handleInlineProductModelChange(scope.row, val)"
+ :disabled="Number(form.reviewStatus) === 1">
<el-option v-for="item in modelOptions"
:key="item.id"
:label="item.model"
@@ -664,7 +686,8 @@
:precision="2"
style="width: 100%"
placeholder="璇疯緭鍏�"
- clearable />
+ clearable
+ :disabled="Number(form.reviewStatus) === 1" />
<span v-else>{{ scope.row.thickness ?? "" }}</span>
</template>
</el-table-column>
@@ -677,7 +700,8 @@
v-model="scope.row.floorCode"
placeholder="璇疯緭鍏�"
clearable
- style="width: 100%" />
+ style="width: 100%"
+ :disabled="Number(form.reviewStatus) === 1" />
<span v-else>{{ scope.row.floorCode ?? "" }}</span>
</template>
</el-table-column>
@@ -712,7 +736,8 @@
placeholder="璇疯緭鍏�"
clearable
@change="() => handleInlineSizeChange(scope.row)"
- @input="() => handleInlineSizeChange(scope.row)" />
+ @input="() => handleInlineSizeChange(scope.row)"
+ :disabled="Number(form.reviewStatus) === 1" />
<span v-else>{{ scope.row.width ?? "" }}</span>
</template>
</el-table-column>
@@ -730,7 +755,8 @@
placeholder="璇疯緭鍏�"
clearable
@change="() => handleInlineSizeChange(scope.row)"
- @input="() => handleInlineSizeChange(scope.row)" />
+ @input="() => handleInlineSizeChange(scope.row)"
+ :disabled="Number(form.reviewStatus) === 1" />
<span v-else>{{ scope.row.height ?? "" }}</span>
</template>
</el-table-column>
@@ -748,7 +774,8 @@
placeholder="璇疯緭鍏�"
clearable
@change="() => handleInlineQuantityChange(scope.row)"
- @input="() => handleInlineQuantityChange(scope.row)" />
+ @input="() => handleInlineQuantityChange(scope.row)"
+ :disabled="Number(form.reviewStatus) === 1" />
<span v-else>{{ scope.row.quantity ?? "" }}</span>
</template>
</el-table-column>
@@ -765,7 +792,8 @@
style="width: 100%"
placeholder="璇疯緭鍏�"
clearable
- @change="() => handleInlineSettleAreaChange(scope.row)" />
+ @change="() => handleInlineSettleAreaChange(scope.row)"
+ :disabled="Number(form.reviewStatus) === 1" />
<span v-else>{{ scope.row.settlePieceArea ? Number(scope.row.settlePieceArea).toFixed(4) : "" }}</span>
</template>
</el-table-column>
@@ -780,7 +808,8 @@
:step="1"
:precision="4"
style="width: 100%"
- placeholder="鑷姩璁$畻" />
+ placeholder="鑷姩璁$畻"
+ :disabled="Number(form.reviewStatus) === 1" />
<span v-else>{{ scope.row.actualTotalArea ? Number(scope.row.actualTotalArea).toFixed(4) : "" }}</span>
</template>
</el-table-column>
@@ -793,7 +822,8 @@
placeholder="璇烽�夋嫨"
clearable
style="width: 100%"
- @change="() => handleInlineTaxRateChange(scope.row)">
+ @change="() => handleInlineTaxRateChange(scope.row)"
+ :disabled="Number(form.reviewStatus) === 1">
<el-option label="1"
value="1" />
<el-option label="3"
@@ -825,10 +855,11 @@
v-model="scope.row.processRequirement"
placeholder="璇疯緭鍏�"
clearable
- style="width: 100%" />
+ style="width: 100%"
+ :disabled="Number(form.reviewStatus) === 1" />
<span v-else>{{ scope.row.processRequirement ?? "" }}</span>
</template>
- </el-table-column>
+ </el-table-column>
<el-table-column label="鍙戠エ绫诲瀷"
prop="invoiceType"
min-width="120">
@@ -837,7 +868,8 @@
v-model="scope.row.invoiceType"
placeholder="璇烽�夋嫨"
clearable
- style="width: 100%">
+ style="width: 100%"
+ :disabled="Number(form.reviewStatus) === 1">
<el-option label="澧炴櫘绁�"
value="澧炴櫘绁�" />
<el-option label="澧炰笓绁�"
@@ -855,7 +887,8 @@
v-model="scope.row.remark"
placeholder="璇疯緭鍏�"
clearable
- style="width: 100%" />
+ style="width: 100%"
+ :disabled="Number(form.reviewStatus) === 1" />
<span v-else>{{ scope.row.remark ?? "" }}</span>
</template>
</el-table-column>
@@ -867,7 +900,8 @@
v-model="scope.row.heavyBox"
placeholder="璇疯緭鍏�"
clearable
- style="width: 100%" />
+ style="width: 100%"
+ :disabled="Number(form.reviewStatus) === 1" />
<span v-else>{{ scope.row.heavyBox ?? "" }}</span>
</template>
</el-table-column>
@@ -978,7 +1012,7 @@
<el-button link
type="primary"
size="small"
- :disabled="isProductShipped(scope.row) || hasEditingProductRow()"
+ :disabled="isProductShipped(scope.row) || Number(form.reviewStatus) === 1"
@click="copyProductInline(scope.row, scope.$index)">
澶嶅埗鏂板缓
</el-button>
@@ -1003,7 +1037,7 @@
<el-button type="primary"
plain
size="small"
- :disabled="isProductShipped(scope.row)"
+ :disabled="isProductShipped(scope.row) || Number(form.reviewStatus) === 1"
@click="startAddOtherAmountForRow(scope.row)">
鏂板
</el-button>
@@ -1016,7 +1050,7 @@
clearable
placeholder="璇烽�夋嫨棰濆鍔犲伐椤圭洰"
style="width: 100%;"
- :disabled="isProductShipped(scope.row)">
+ :disabled="isProductShipped(scope.row) || Number(form.reviewStatus) === 1">
<el-option v-for="item in otherAmountSelectOptions"
:key="item.id"
:label="item.processName"
@@ -1024,13 +1058,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) || Number(form.reviewStatus) === 1"
@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) || Number(form.reviewStatus) === 1 || scope.row.__inlineOtherAmountAddId === null || scope.row.__inlineOtherAmountAddId === undefined || scope.row.__inlineOtherAmountAddId === ''"
@click="confirmAddOtherAmountForRow(scope.row)">
纭娣诲姞
</el-button>
@@ -1051,12 +1085,12 @@
:precision="0"
style="width: 120px;"
placeholder="鏁伴噺"
- :disabled="operationType === 'view' || isProductShipped(scope.row)"
+ :disabled="operationType === 'view' || isProductShipped(scope.row) || Number(form.reviewStatus) === 1"
@change="handleOtherAmountQuantityChange(scope.row)" />
<el-button type="danger"
link
size="small"
- :disabled="isProductShipped(scope.row)"
+ :disabled="isProductShipped(scope.row) || Number(form.reviewStatus) === 1"
@click="removeOtherAmountAtForRow(scope.row, idx)">
鍒犻櫎
</el-button>
@@ -1080,7 +1114,7 @@
clearable
type="textarea"
:rows="2"
- :disabled="operationType === 'view'" />
+ :disabled="operationType === 'view' || Number(form.reviewStatus) === 1" />
</el-form-item>
</el-col>
</el-row>
@@ -1093,7 +1127,7 @@
clearable
type="textarea"
:rows="2"
- :disabled="operationType === 'view'" />
+ :disabled="operationType === 'view' || Number(form.reviewStatus) === 1" />
</el-form-item>
</el-col>
</el-row>
@@ -1941,9 +1975,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);
@@ -2011,6 +2050,7 @@
entryDateEnd: undefined,
deliveryStatus: undefined, // 鍙戣揣鐘舵�侊細1鏈彂璐� 2瀹℃壒涓� 3瀹℃壒涓嶉�氳繃 4瀹℃壒閫氳繃 5宸插彂璐� 6閮ㄥ垎鍙戣揣
stockStatus: undefined, // 鍏ュ簱鐘舵�侊細0鏈叆搴� 1閮ㄥ垎鍏ュ簱 2宸插叆搴�
+ reviewStatus: undefined, // 瀹℃牳鐘舵�侊細0寰呭鏍� 1宸插鏍� 2宸插弽瀹�
},
form: {
salesContractNo: "",
@@ -2022,6 +2062,8 @@
maintenanceTime: "",
productData: [],
executionDate: "",
+ reviewStatus: undefined,
+ stockStatus: undefined,
},
rules: {
salesman: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
@@ -2219,7 +2261,9 @@
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 ?? "";
@@ -2354,10 +2398,6 @@
}
if (row.actualTotalArea <= 0) {
proxy.$modal.msgWarning("闈㈢Н蹇呴』澶т簬0");
- return false;
- }
- if (row.taxInclusiveUnitPrice <= 0) {
- proxy.$modal.msgWarning("鍚◣鍗曚环蹇呴』澶т簬0");
return false;
}
if (!row.productModelId) {
@@ -2956,6 +2996,67 @@
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;
+ }
+ 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 handleReverseAudit = async () => {
+ 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;
+ }
+ try {
+ await ElMessageBox.confirm("鏄惁纭鍙嶅閫変腑鐨勯攢鍞彴璐︼紵", "鎻愮ず", {
+ confirmButtonText: "纭畾",
+ cancelButtonText: "鍙栨秷",
+ type: "warning",
+ });
+
+ for (const row of selectedRows.value) {
+ await addOrUpdateSalesLedger({ ...row, reviewStatus: 2 });
+ }
+
+ proxy.$modal.msgSuccess("鍙嶅鎴愬姛");
+ getList();
+ } catch (error) {
+ console.log(error);
+ }
+ };
+
const paginationChange = obj => {
page.current = obj.page;
page.size = obj.limit;
@@ -2965,7 +3066,7 @@
tableLoading.value = true;
const { entryDate, ...rest } = searchForm;
// 灏嗚寖鍥存棩鏈熷瓧娈典紶閫掔粰鍚庣
- const params = { ...rest, ...page };
+ const params = { ...rest, ...page, reviewStatusList: [0, 1] };
// 绉婚櫎褰曞叆鏃ユ湡鐨勯粯璁ゅ�艰缃紝鍙繚鐣欒寖鍥存棩鏈熷瓧娈�
delete params.entryDate;
// 鏌ヨ瀹㈡埛鍚嶇О涓庢柊澧炰繚鎸佷竴鑷达細鍏堥�� customerId锛屽啀鏄犲皠涓� customerName 鏌ヨ
@@ -2983,15 +3084,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 {
@@ -3065,7 +3164,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 {
@@ -3096,9 +3197,16 @@
proxy?.$modal?.loading?.("姝e湪鍏ュ簱锛岃绋嶅��...");
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({
@@ -3656,6 +3764,8 @@
}
form.value.tempFileIds = tempFileIds;
form.value.type = 1;
+ form.value.reviewStatus = 0; // 榛樿瀹℃牳鐘舵�佷负寰呭鏍�
+ form.value.stockStatus = 0; // 榛樿鍏ュ簱鐘舵�佷负鏈叆搴�
const submitPayload = { ...form.value };
delete submitPayload.paymentMethod;
addOrUpdateSalesLedger(submitPayload).then(res => {
@@ -3919,7 +4029,11 @@
const templateUrl = HISTORY_IMPORT_TEMPLATE_URL_MAP[command];
const fileName = HISTORY_IMPORT_TEMPLATE_FILE_NAME_MAP[command];
if (templateUrl) {
- proxy.download(templateUrl, {}, fileName || "閿�鍞彂璐у巻鍙叉暟鎹鍏ユā鏉�.xlsx");
+ proxy.download(
+ templateUrl,
+ {},
+ fileName || "閿�鍞彂璐у巻鍙叉暟鎹鍏ユā鏉�.xlsx"
+ );
return;
}
}
@@ -3981,6 +4095,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 = [];
@@ -4099,7 +4222,8 @@
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();
@@ -4583,8 +4707,7 @@
// 鍏佽锛�1鏈彂璐с��3瀹℃壒涓嶉�氳繃銆�4瀹℃壒閫氳繃銆�6閮ㄥ垎鍙戣揣锛涗笉鍏佽锛�2瀹℃壒涓��5宸插彂璐�
const statusItem = selectedRows.value[0].deliveryStatus;
- const ledgerAllowsDelivery = s =>
- [1, 3, 4, 6].includes(Number(s));
+ const ledgerAllowsDelivery = s => [1, 3, 4, 6].includes(Number(s));
let isTrue = true;
selectedRows.value.forEach(row => {
if (!ledgerAllowsDelivery(row.deliveryStatus)) {
@@ -4811,7 +4934,7 @@
const run = async () => {
for (const salesLedgerId of uniqueLedgerIds) {
await addShippingInfo({
- scanOutbound: false,
+ scanOutbound: false,
salesLedgerId,
type: deliveryForm.value.type,
approveUserIds,
--
Gitblit v1.9.3