From 23ff9ba58505814008984ffd4b8125cc67b9cc12 Mon Sep 17 00:00:00 2001
From: yyb <995253665@qq.com>
Date: 星期五, 27 三月 2026 09:10:14 +0800
Subject: [PATCH] 销售台账，其他金额维护，工艺路线维护，客户地区维护
---
src/views/salesManagement/salesLedger/index.vue | 543 +++++++++++++++++++++++------------------------------
1 files changed, 237 insertions(+), 306 deletions(-)
diff --git a/src/views/salesManagement/salesLedger/index.vue b/src/views/salesManagement/salesLedger/index.vue
index 8b6e024..b9a0e84 100644
--- a/src/views/salesManagement/salesLedger/index.vue
+++ b/src/views/salesManagement/salesLedger/index.vue
@@ -25,13 +25,20 @@
</div>
<div class="table_list">
<div class="actions">
- <div></div>
+ <div>
+ <OtherAmountMaintenanceButton />
+ <ProcessFlowMaintenanceButton />
+ </div>
+ <ProcessFlowConfigSelectDialog
+ v-model:visible="processFlowSelectDialogVisible"
+ @confirm="handleProcessFlowSelectConfirm"
+ />
<div>
<el-button type="primary" @click="openForm('add')">
鏂板鍙拌处
</el-button>
- <el-button type="primary" plain @click="openOtherAmountDialog">
- 鍏朵粬閲戦缁存姢
+ <el-button type="primary" @click="handleBulkDelivery">
+ 鍙戣揣
</el-button>
<el-button type="primary" plain @click="handleImport">瀵煎叆</el-button>
<el-button @click="handleOut">瀵煎嚭</el-button>
@@ -49,7 +56,11 @@
<el-table-column align="center" label="搴忓彿" type="index"/>
<el-table-column label="浜у搧澶х被" prop="productCategory" />
<el-table-column label="瑙勬牸鍨嬪彿" prop="specificationModel" />
- <el-table-column label="鍗曚綅" prop="unit" />
+ <el-table-column label="鍘氬害" prop="thickness" min-width="90">
+ <template #default="scope">
+ {{ scope.row.thickness ?? "" }}
+ </template>
+ </el-table-column>
<el-table-column label="浜у搧鐘舵��"
width="100px"
align="center">
@@ -96,7 +107,7 @@
<el-table-column label="鍚◣鎬讳环(鍏�)" prop="taxInclusiveTotalPrice" :formatter="formattedNumber" />
<el-table-column label="涓嶅惈绋庢�讳环(鍏�)" prop="taxExclusiveTotalPrice" :formatter="formattedNumber" />
<!--鎿嶄綔-->
- <el-table-column Width="60px" label="鎿嶄綔" align="center">
+ <!-- <el-table-column Width="60px" label="鎿嶄綔" align="center">
<template #default="scope">
<el-button
link
@@ -106,7 +117,7 @@
鍙戣揣
</el-button>
</template>
- </el-table-column>
+ </el-table-column> -->
</el-table>
</template>
</el-table-column>
@@ -123,9 +134,10 @@
<el-table-column label="绛捐鏃ユ湡" prop="executionDate" width="120" show-overflow-tooltip />
<el-table-column label="浜や粯鏃ユ湡" prop="deliveryDate" width="120" show-overflow-tooltip />
<el-table-column label="澶囨敞" prop="remarks" width="200" show-overflow-tooltip />
- <el-table-column fixed="right" label="鎿嶄綔" width="130" align="center">
+ <el-table-column fixed="right" label="鎿嶄綔" width="200" align="center">
<template #default="scope">
<el-button link type="primary" @click="openForm('edit', scope.row)" :disabled="!scope.row.isEdit">缂栬緫</el-button>
+ <el-button link type="primary" @click="openProcessFlowSelect(scope.row)" :disabled="!scope.row.isEdit">宸ヨ壓璺嚎</el-button>
<el-button link type="primary" @click="downLoadFile(scope.row)">闄勪欢</el-button>
</template>
</el-table-column>
@@ -229,7 +241,11 @@
<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="unit" />
+ <el-table-column label="鍘氬害" prop="thickness" min-width="90">
+ <template #default="scope">
+ {{ scope.row.thickness ?? "" }}
+ </template>
+ </el-table-column>
<el-table-column label="鏁伴噺" prop="quantity" />
<el-table-column label="绋庣巼(%)" prop="taxRate" />
<el-table-column label="鍚◣鍗曚环(鍏�)" prop="taxInclusiveUnitPrice" :formatter="formattedNumber" />
@@ -247,6 +263,20 @@
<el-col :span="24">
<el-form-item label="澶囨敞锛�" prop="remarks">
<el-input v-model="form.remarks" placeholder="璇疯緭鍏�" clearable type="textarea" :rows="2" :disabled="operationType === 'view'" />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row :gutter="30">
+ <el-col :span="24">
+ <el-form-item label="瀹㈡埛澶囨敞锛�" prop="customerRemarks">
+ <el-input
+ v-model="form.customerRemarks"
+ placeholder="璇疯緭鍏�"
+ clearable
+ type="textarea"
+ :rows="2"
+ :disabled="operationType === 'view'"
+ />
</el-form-item>
</el-col>
</el-row>
@@ -374,8 +404,16 @@
</el-form-item>
</el-col>
<el-col :span="8">
- <el-form-item label="鍗曚綅锛�" prop="unit">
- <el-input v-model="productForm.unit" placeholder="璇疯緭鍏�" clearable />
+ <el-form-item label="鍘氬害锛�" prop="thickness">
+ <el-input-number
+ v-model="productForm.thickness"
+ :min="0"
+ :step="0.000000000000001"
+ :precision="15"
+ style="width: 100%;"
+ placeholder="璇疯緭鍏�"
+ clearable
+ />
</el-form-item>
</el-col>
</el-row>
@@ -564,6 +602,13 @@
</el-form-item>
</el-col>
</el-row>
+ <el-row :gutter="30">
+ <el-col :span="24">
+ <el-form-item label="妤煎眰缂栧彿锛�" prop="floorCode">
+ <el-input v-model="productForm.floorCode" placeholder="璇疯緭鍏ユゼ灞傜紪鍙�" clearable type="textarea" :rows="2" :disabled="operationType === 'view'" />
+ </el-form-item>
+ </el-col>
+ </el-row>
<!-- 鍏朵粬閲戦锛堝崰婊′竴琛岋細绛夊悓浜� 3 鍒楃綉鏍肩殑鏁磋锛� -->
<el-row :gutter="30">
<el-col :span="12">
@@ -684,6 +729,7 @@
</el-button>
</template>
</el-dialog>
+
<!-- 瀵煎叆寮圭獥 -->
<FormDialog
v-model="importUpload.open"
@@ -778,7 +824,7 @@
<tr>
<th>浜у搧鍚嶇О</th>
<th>瑙勬牸鍨嬪彿</th>
- <th>鍗曚綅</th>
+ <th>鍘氬害</th>
<th>鍗曚环</th>
<th>闆跺敭鏁伴噺</th>
<th>闆跺敭閲戦</th>
@@ -788,7 +834,7 @@
<tr v-for="product in item.products" :key="product.id">
<td>{{ product.productCategory || '' }}</td>
<td>{{ product.specificationModel || '' }}</td>
- <td>{{ product.unit || '' }}</td>
+ <td>{{ product.thickness ?? '' }}</td>
<td>{{ product.taxInclusiveUnitPrice || '0' }}</td>
<td>{{ product.quantity || '0' }}</td>
<td>{{ product.taxInclusiveTotalPrice || '0' }}</td>
@@ -916,114 +962,6 @@
</template>
</el-dialog>
- <!-- 鍏朵粬閲戦缁存姢锛堟柊澧�/缂栬緫/鍒犻櫎锛� -->
- <el-dialog
- v-model="otherAmountDialogVisible"
- title="鍏朵粬閲戦缁存姢"
- width="80%"
- :close-on-click-modal="false"
- @close="closeOtherAmountDialog"
- >
- <el-row :gutter="20">
- <el-col :span="14">
- <el-table
- :data="otherAmountRecords"
- border
- v-loading="otherAmountLoading"
- height="55vh"
- >
- <el-table-column label="缂栫爜" prop="code" min-width="120" show-overflow-tooltip />
- <el-table-column label="椤圭洰" prop="processName" min-width="180" show-overflow-tooltip />
- <el-table-column label="鏁伴噺" prop="quantity" min-width="110" :formatter="formattedNumber" />
- <el-table-column label="鍗曚环(鍏�)" prop="unitPrice" min-width="130" :formatter="formattedNumber" />
- <el-table-column label="閲戦(鍏�)" prop="amount" min-width="160" :formatter="formattedNumber" />
- <el-table-column fixed="right" label="鎿嶄綔" width="160" align="center">
- <template #default="scope">
- <el-button link type="primary" size="small" @click="handleOtherEdit(scope.row)">缂栬緫</el-button>
- <el-button link type="danger" size="small" @click="handleOtherDelete(scope.row)">鍒犻櫎</el-button>
- </template>
- </el-table-column>
- </el-table>
-
- <pagination
- v-show="otherAmountTotal > 0"
- :total="otherAmountTotal"
- layout="total, sizes, prev, pager, next, jumper"
- :page="otherAmountPage.current"
- :limit="otherAmountPage.size"
- @pagination="otherAmountPaginationChange"
- />
- </el-col>
-
- <el-col :span="10">
- <div style="padding: 8px 0;">
- <div style="display:flex; justify-content:space-between; align-items:center; margin-bottom: 10px;">
- <div style="font-weight:600;">
- {{ otherAmountOperationType === 'add' ? '鏂板鍏朵粬閲戦' : '缂栬緫鍏朵粬閲戦' }}
- </div>
- <el-button
- type="primary"
- plain
- size="small"
- @click="handleOtherAdd"
- :disabled="otherAmountOperationType === 'add'"
- >
- 鏂板
- </el-button>
- </div>
-
- <el-form
- :model="otherAmountForm"
- label-width="120px"
- label-position="top"
- :rules="otherAmountRules"
- ref="otherAmountFormRef"
- >
- <el-form-item label="缂栫爜">
- <el-input v-model="otherAmountForm.code" placeholder="璇疯緭鍏ョ紪鐮侊紙鍙�夛級" clearable />
- </el-form-item>
-
- <el-form-item label="椤圭洰" prop="processName">
- <el-input v-model="otherAmountForm.processName" placeholder="璇疯緭鍏ラ」鐩悕绉�" clearable />
- </el-form-item>
-
- <el-form-item label="鏁伴噺" prop="quantity">
- <el-input-number
- v-model="otherAmountForm.quantity"
- :min="0"
- :precision="2"
- style="width:100%"
- placeholder="璇疯緭鍏ユ暟閲�"
- clearable
- @change="recalcOtherAmount"
- />
- </el-form-item>
-
- <el-form-item label="鍗曚环(鍏�)" prop="unitPrice">
- <el-input-number
- v-model="otherAmountForm.unitPrice"
- :min="0"
- :precision="2"
- style="width:100%"
- placeholder="璇疯緭鍏ュ崟浠�"
- clearable
- @change="recalcOtherAmount"
- />
- </el-form-item>
-
- <el-form-item label="閲戦(鍏�)">
- <el-input v-model="otherAmountForm.amount" disabled />
- </el-form-item>
-
- <div style="display:flex; justify-content:flex-end; gap: 10px; margin-top: 8px;">
- <el-button @click="closeOtherAmountDialog">鍙栨秷</el-button>
- <el-button type="primary" @click="submitOtherAmountForm">淇濆瓨</el-button>
- </div>
- </el-form>
- </div>
- </el-col>
- </el-row>
- </el-dialog>
</div>
</template>
@@ -1038,6 +976,9 @@
import { userListNoPage } from "@/api/system/user.js";
import FileListDialog from '@/components/Dialog/FileListDialog.vue';
import FormDialog from '@/components/Dialog/FormDialog.vue';
+import OtherAmountMaintenanceButton from "./components/OtherAmountMaintenanceButton.vue";
+import ProcessFlowMaintenanceButton from "./components/ProcessFlowMaintenanceButton.vue";
+import ProcessFlowConfigSelectDialog from "./components/ProcessFlowConfigSelectDialog.vue";
import { getQuotationList } from "@/api/salesManagement/salesQuotation.js";
import {
ledgerListPage,
@@ -1051,14 +992,12 @@
delLedgerFile,
getProductInventory,
salesLedgerProductProcessList,
- salesLedgerProductProcessAdd,
- salesLedgerProductProcessUpdate,
- salesLedgerProductProcessDelete,
} from "@/api/salesManagement/salesLedger.js";
import { modelList, productTreeList } from "@/api/basicData/product.js";
import useFormData from "@/hooks/useFormData.js";
import dayjs from "dayjs";
import { getCurrentDate } from "@/utils/index.js";
+import { salesLedgerProductSetProcessFlowConfig } from "@/api/salesManagement/salesProcessFlowConfig.js";
const userStore = useUserStore();
const { proxy } = getCurrentInstance();
@@ -1077,6 +1016,10 @@
});
const total = ref(0);
const fileList = ref([]);
+
+// 宸ヨ壓璺嚎閰嶇疆閫夋嫨寮圭獥锛堢粦瀹氬埌鍙拌处浜у搧锛�
+const processFlowSelectDialogVisible = ref(false);
+const processFlowSelectLedgerRow = ref(null);
// 鐢ㄦ埛淇℃伅琛ㄥ崟寮规鏁版嵁
const operationType = ref("");
@@ -1119,7 +1062,7 @@
productForm: {
productCategory: "",
specificationModel: "",
- unit: "",
+ thickness:null,
quantity: "",
taxInclusiveUnitPrice: "",
taxRate: "",
@@ -1138,6 +1081,8 @@
processRequirement: "", // 鍔犲伐瑕佹眰
remark: "", // 澶囨敞
salesProductProcessList: [], // 鍏朵粬閲戦锛歔{id, processName, quantity}]
+ processFlowConfigId: null, // 宸ヨ壓娴佺▼閰嶇疆缁戝畾
+ floorCode: "", // 妤煎眰缂栧彿
},
productRules: {
productCategory: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
@@ -1145,7 +1090,7 @@
specificationModel: [
{ required: true, message: "璇烽�夋嫨", trigger: "change" },
],
- unit: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
+ thickness: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
quantity: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
taxInclusiveUnitPrice: [
{ required: true, message: "璇疯緭鍏�", trigger: "blur" },
@@ -1191,7 +1136,7 @@
// 鍙戣揣鐩稿叧
const deliveryFormVisible = ref(false);
-const currentDeliveryRow = ref(null);
+const currentDeliveryRows = ref([]);
const deliveryFormData = reactive({
deliveryForm: {
type: "璐ц溅", // 璐ц溅, 蹇��
@@ -1203,169 +1148,6 @@
},
});
const { deliveryForm, deliveryRules } = toRefs(deliveryFormData);
-
-// 鍏朵粬閲戦缁存姢锛堝伐搴�/娴佺▼閲戦缁存姢锛�
-const otherAmountDialogVisible = ref(false);
-const otherAmountLoading = ref(false);
-const otherAmountRecords = ref([]);
-const otherAmountTotal = ref(0);
-const otherAmountPage = reactive({
- current: 1,
- size: 10,
-});
-
-const otherAmountOperationType = ref("add"); // add/edit
-const otherAmountFormRef = ref(null);
-const otherAmountForm = reactive({
- id: null,
- code: "", // 鍓嶇瀛楁鍚嶏細code锛涘悗绔帴鍙ｅ垪琛ㄨ繑鍥� remark锛屾澶勮繘琛屾槧灏�
- processName: "",
- quantity: 0,
- unitPrice: 0,
- amount: "0.00",
-});
-const otherAmountRules = reactive({
- processName: [{ required: true, message: "璇疯緭鍏ラ」鐩悕绉�", trigger: "change" }],
- quantity: [{ required: true, message: "璇疯緭鍏ユ暟閲�", trigger: "blur" }],
- unitPrice: [{ required: true, message: "璇疯緭鍏ュ崟浠�", trigger: "blur" }],
-});
-
-const recalcOtherAmount = () => {
- const quantity = Number(otherAmountForm.quantity ?? 0) || 0;
- const unitPrice = Number(otherAmountForm.unitPrice ?? 0) || 0;
- otherAmountForm.amount = (quantity * unitPrice).toFixed(2);
-};
-
-const resetOtherAmountForm = (type = "add") => {
- otherAmountOperationType.value = type;
- otherAmountForm.id = null;
- otherAmountForm.code = "";
- otherAmountForm.processName = "";
- otherAmountForm.quantity = 0;
- otherAmountForm.unitPrice = 0;
- otherAmountForm.amount = "0.00";
-};
-
-const openOtherAmountDialog = () => {
- otherAmountDialogVisible.value = true;
- resetOtherAmountForm("add");
- // 鎵撳紑寮规鏃跺埛鏂版暟鎹紝閬垮厤闀挎椂闂村仠鐣欏鑷存暟鎹繃鏈�
- otherAmountPage.current = otherAmountPage.current || 1;
- fetchOtherAmountList();
-};
-
-const closeOtherAmountDialog = () => {
- otherAmountDialogVisible.value = false;
- resetOtherAmountForm("add");
-};
-
-const fetchOtherAmountList = async () => {
- otherAmountLoading.value = true;
- try {
- const params = {
- current: otherAmountPage.current,
- size: otherAmountPage.size,
- };
- const res = await salesLedgerProductProcessList(params);
-
- // 鍏煎涓嶅悓鎺ュ彛鍝嶅簲缁撴瀯锛氬彲鑳芥槸 res.records / res.total 鎴� res.data.records / res.data.total
- const records = res?.records ?? res?.data?.records ?? [];
- const total = res?.total ?? res?.data?.total ?? 0;
-
- otherAmountRecords.value = records.map((item) => {
- const quantity = Number(item.quantity ?? 0) || 0;
- const unitPrice = Number(item.unitPrice ?? 0) || 0;
- const amount = Number(item.amount ?? quantity * unitPrice) || 0;
- return {
- id: item.id,
- code: item.code ?? item.remark ?? "",
- processName: item.processName ?? "",
- quantity,
- unitPrice,
- amount: amount.toFixed(2),
- };
- });
-
- otherAmountTotal.value = total;
- } finally {
- otherAmountLoading.value = false;
- }
-};
-
-const otherAmountPaginationChange = (obj) => {
- otherAmountPage.current = obj.page;
- otherAmountPage.size = obj.limit;
- fetchOtherAmountList();
-};
-
-const handleOtherAdd = () => {
- resetOtherAmountForm("add");
-};
-
-const handleOtherEdit = (row) => {
- if (!row) return;
- otherAmountOperationType.value = "edit";
- otherAmountForm.id = row.id ?? null;
- otherAmountForm.code = row.code ?? "";
- otherAmountForm.processName = row.processName ?? "";
- otherAmountForm.quantity = Number(row.quantity ?? 0) || 0;
- otherAmountForm.unitPrice = Number(row.unitPrice ?? 0) || 0;
- recalcOtherAmount();
-};
-
-const submitOtherAmountForm = () => {
- otherAmountFormRef.value?.validate((valid) => {
- if (!valid) return;
-
- const payload = {
- processName: otherAmountForm.processName,
- quantity: Number(otherAmountForm.quantity) || 0,
- unitPrice: Number(otherAmountForm.unitPrice) || 0,
- amount: Number(otherAmountForm.amount) || 0,
- // 鍒楄〃杩斿洖瀛楁鏄� remark锛岃繖閲屾寜鈥渃ode=remark鈥濆仛鏄犲皠
- remark: otherAmountForm.code,
- // 鍏煎鍚庣鍙兘鐩存帴浣跨敤 code 瀛楁
- code: otherAmountForm.code,
- };
-
- if (otherAmountOperationType.value === "edit") {
- payload.id = otherAmountForm.id;
- salesLedgerProductProcessUpdate(payload).then(() => {
- proxy.$modal.msgSuccess("淇濆瓨鎴愬姛");
- fetchOtherAmountList();
- resetOtherAmountForm("add");
- });
- } else {
- salesLedgerProductProcessAdd(payload).then(() => {
- proxy.$modal.msgSuccess("淇濆瓨鎴愬姛");
- fetchOtherAmountList();
- resetOtherAmountForm("add");
- });
- }
- });
-};
-
-const handleOtherDelete = (row) => {
- if (!row?.id) return;
- ElMessageBox.confirm("纭鍒犻櫎璇ヨ褰曪紵", "鍒犻櫎", {
- confirmButtonText: "纭",
- cancelButtonText: "鍙栨秷",
- type: "warning",
- })
- .then(() => {
- return salesLedgerProductProcessDelete(row.id).then(() => {
- proxy.$modal.msgSuccess("鍒犻櫎鎴愬姛");
- fetchOtherAmountList();
-
- if (otherAmountOperationType.value === "edit" && otherAmountForm.id === row.id) {
- resetOtherAmountForm("add");
- }
- });
- })
- .catch(() => {
- proxy.$modal.msg("宸插彇娑�");
- });
-};
// 浜у搧寮规锛氬叾浠栭噾棰濆閫変笅鎷夛紙鍩轰簬鈥滃叾浠栭噾棰濈淮鎶も�濇煡璇㈡帴鍙ｏ級
const otherAmountSelectOptions = ref([]); // [{id, processName}]
@@ -1636,6 +1418,59 @@
tableLoading.value = false;
});
};
+
+// 鎵撳紑鈥滃伐鑹鸿矾绾块厤缃�濋�夋嫨寮圭獥锛堝繀椤绘樉寮忛�夋嫨锛�
+const openProcessFlowSelect = (ledgerRow) => {
+ if (!ledgerRow) return;
+ if (!ledgerRow.isEdit) return;
+ processFlowSelectLedgerRow.value = ledgerRow;
+ processFlowSelectDialogVisible.value = true;
+};
+
+// 灏嗛厤缃簲鐢ㄥ埌鍙拌处涓嬬殑鎵�鏈夋湭鍙戣揣浜у搧
+const handleProcessFlowSelectConfirm = async (configId) => {
+ const ledgerRow = processFlowSelectLedgerRow.value;
+ if (!ledgerRow?.id) return;
+
+ const finalConfigId = configId ?? null;
+ if (!finalConfigId) return;
+
+ proxy?.$modal?.loading?.("姝ｅ湪搴旂敤宸ヨ壓璺嚎閰嶇疆锛岃绋嶅��...");
+ try {
+ const res = await productList({ salesLedgerId: ledgerRow.id, type: 1 });
+ const products = res?.data ?? res?.records ?? res ?? [];
+ if (!Array.isArray(products) || products.length === 0) {
+ proxy?.$modal?.msgWarning?.("璇ュ彴璐︿笅娌℃湁浜у搧鏁版嵁");
+ return;
+ }
+
+ for (const product of products) {
+ // 宸插彂璐�/瀹℃牳閫氳繃涓嶅彲缂栬緫锛岃烦杩�
+ if (isProductShipped(product)) continue;
+ await salesLedgerProductSetProcessFlowConfig({
+ salesLedgerProductId: product.id,
+ processFlowConfigId: finalConfigId,
+ });
+ }
+
+ proxy?.$modal?.msgSuccess?.("宸ヨ壓璺嚎閰嶇疆搴旂敤鎴愬姛");
+
+ // 鑻ュ綋鍓嶈宸插睍寮�锛屽埛鏂板叾瀛愪骇鍝佸垪琛�
+ if (expandedRowKeys.value.includes(ledgerRow.id)) {
+ const childRes = await productList({ salesLedgerId: ledgerRow.id, type: 1 });
+ const children = childRes?.data ?? childRes?.records ?? childRes ?? [];
+ const index = tableData.value.findIndex((item) => item.id === ledgerRow.id);
+ if (index > -1) {
+ tableData.value[index].children = children;
+ }
+ }
+ } catch (e) {
+ proxy?.$modal?.msgError?.("搴旂敤澶辫触锛岃绋嶅悗閲嶈瘯");
+ } finally {
+ proxy?.$modal?.closeLoading?.();
+ }
+};
+
// 鑾峰彇浜у搧澶х被tree鏁版嵁
const getProductOptions = () => {
// 杩斿洖 Promise锛屼究浜庡湪缂栬緫浜у搧鏃剁瓑寰呭姞杞藉畬鎴�
@@ -1658,10 +1493,8 @@
const index = modelOptions.value.findIndex((item) => item.id === value);
if (index !== -1) {
productForm.value.specificationModel = modelOptions.value[index].model;
- productForm.value.unit = modelOptions.value[index].unit;
} else {
productForm.value.specificationModel = null;
- productForm.value.unit = null;
}
};
const findNodeById = (nodes, productId) => {
@@ -1784,11 +1617,14 @@
form.value.entryDate = getCurrentDate();
// 绛捐鏃ユ湡榛樿涓哄綋澶�
form.value.executionDate = getCurrentDate();
+ form.value.customerRemarks = "";
} else {
currentId.value = row.id;
getSalesLedgerWithProducts({ id: row.id, type: 1 }).then((res) => {
form.value = { ...res };
form.value.entryPerson = Number(res.entryPerson);
+ // 瀛楁鍚嶅吋瀹癸細鍚庣鍙兘杩斿洖 customer_remarks
+ form.value.customerRemarks = res?.customerRemarks ?? res?.customer_remarks ?? "";
productData.value = form.value.productData;
fileList.value = form.value.salesLedgerFiles;
});
@@ -1886,7 +1722,7 @@
// 鍙拌处瀛楁
productCategory: p.product || p.productName || "",
specificationModel: p.specification || "",
- unit: p.unit || "",
+ thickness: p.thickness,
quantity: quantity,
taxRate: taxRate,
taxInclusiveUnitPrice: unitPrice.toFixed(2),
@@ -1901,6 +1737,7 @@
settlePieceArea: 0,
settleTotalArea: 0,
processRequirement: "",
+ floorCode: "",
remark: "",
salesProductProcessList: [],
};
@@ -2007,10 +1844,17 @@
productForm.value.processRequirement =
row?.processRequirement ?? row?.process_requirement ?? "";
productForm.value.remark = row?.remark ?? row?.remarks ?? "";
+ productForm.value.floorCode = row?.floorCode ?? row?.floor_code ?? "";
+ // 宸ヨ壓娴佺▼閰嶇疆缁戝畾瀛楁锛堝悗缁敱鍚庣纭瀛楁鍚嶏級
+ productForm.value.processFlowConfigId =
+ row?.processFlowConfigId ?? row?.process_flow_config_id ?? null;
// 鍛ㄩ暱鍥炴樉锛堝鍚庣杩斿洖锛涙渶缁堜粛浠ュ叕寮忚绠椾负鍑嗭級
productForm.value.perimeter =
row?.perimeter ?? row?.heavyBoxPerimeter ?? row?.heavyboxPerimeter ?? 0;
+
+ // 鍚庣鐩存帴杩斿洖 thickness
+ productForm.value.thickness = row?.thickness;
productForm.value.salesProductProcessList = normalizeOtherAmountsFromRow(row);
productIndex.value = index;
@@ -2055,6 +1899,11 @@
const submitProduct = () => {
proxy.$refs["productFormRef"].validate((valid) => {
if (valid) {
+ // 鍘氬害淇濈暀 15 浣嶅皬鏁帮紝閬垮厤鐢变簬娴偣璁＄畻/杈撳叆瀵艰嚧绮惧害鍋忓樊
+ if (productForm.value.thickness !== null && productForm.value.thickness !== undefined) {
+ productForm.value.thickness = Number(Number(productForm.value.thickness).toFixed(15));
+ }
+
// 闈㈢Н/鎬昏瀛楁鍦ㄦ彁浜ゅ墠鍏滃簳璁＄畻涓�娆�
recalcAreaTotals();
// 鍏朵粬閲戦鍙彁浜� {id, processName, quantity}锛堝悗绔瓧娈碉細salesProductProcessList锛�
@@ -2471,7 +2320,7 @@
<tr>
<th>浜у搧鍚嶇О</th>
<th>瑙勬牸鍨嬪彿</th>
- <th>鍗曚綅</th>
+ <th>鍘氬害</th>
<th>鍗曚环</th>
<th>闆跺敭鏁伴噺</th>
<th>闆跺敭閲戦</th>
@@ -2483,7 +2332,7 @@
<tr>
<td>${product.productCategory || ''}</td>
<td>${product.specificationModel || ''}</td>
- <td>${product.unit || ''}</td>
+ <td>${product.thickness ?? ''}</td>
<td>${product.taxInclusiveUnitPrice || '0'}</td>
<td>${product.quantity || '0'}</td>
<td>${product.taxInclusiveTotalPrice || '0'}</td>
@@ -2926,6 +2775,72 @@
return statusStr === '寰呭彂璐�' || statusStr === '瀹℃牳鎷掔粷';
};
+const handleBulkDelivery = async () => {
+ if (selectedRows.value.length === 0) {
+ proxy.$modal.msgWarning("璇烽�夋嫨鏁版嵁");
+ return;
+ }
+
+ const customerNames = selectedRows.value.map((r) => String(r.customerName || "").trim());
+ const uniqueCustomers = Array.from(new Set(customerNames));
+
+ // 瀹㈡埛鍚嶇О涓嶄竴鑷翠笉鍏佽鍙戣揣
+ if (uniqueCustomers.length > 1) {
+ proxy.$modal.msgWarning("瀹㈡埛鍚嶇О涓嶄竴鑷达紝涓嶅厑璁稿彂璐�");
+ return;
+ }
+
+ // 澶氭潯涓斿鎴蜂竴鑷达細浜屾纭
+ if (selectedRows.value.length > 1) {
+ try {
+ await ElMessageBox.confirm("鏄惁纭鍚堝苟鍙戣揣锛�", "鍚堝苟鍙戣揣", {
+ confirmButtonText: "纭",
+ cancelButtonText: "鍙栨秷",
+ type: "warning",
+ });
+ } catch (e) {
+ proxy.$modal.msg("宸插彇娑�");
+ return;
+ }
+ }
+
+ proxy.$modal.loading("姝ｅ湪鑾峰彇浜у搧鏁版嵁锛岃绋嶅��...");
+ try {
+ const targets = [];
+ for (const ledger of selectedRows.value) {
+ let products = [];
+ try {
+ const res = await productList({ salesLedgerId: ledger.id, type: 1 });
+ products = res?.data || [];
+ } catch {
+ products = [];
+ }
+
+ for (const product of products) {
+ if (!canShip(product)) continue;
+ targets.push({
+ ...product,
+ salesLedgerId: product.salesLedgerId || ledger.id,
+ });
+ }
+ }
+
+ if (targets.length === 0) {
+ proxy.$modal.msgWarning("娌℃湁鍙彂璐х殑鏁版嵁");
+ return;
+ }
+
+ currentDeliveryRows.value = targets;
+ deliveryForm.value = { type: "璐ц溅" };
+ // 閲嶇疆瀹℃壒浜鸿妭鐐癸紙榛樿涓�涓┖鑺傜偣锛�
+ approverNodes.value = [{ id: 1, userId: null }];
+ nextApproverId = 2;
+ deliveryFormVisible.value = true;
+ } finally {
+ proxy.$modal.closeLoading();
+ }
+};
+
/**
* 涓嬭浇鏂囦欢
*
@@ -2949,7 +2864,7 @@
return;
}
- currentDeliveryRow.value = row;
+ currentDeliveryRows.value = [row];
deliveryForm.value = {
type: "璐ц溅",
};
@@ -2972,13 +2887,28 @@
const approveUserIds = approverNodes.value.map(node => node.userId).join(",");
// 淇濆瓨褰撳墠灞曞紑鐨勮ID锛屼互渚垮彂璐у悗閲嶆柊鍔犺浇瀛愯〃鏍兼暟鎹�
const currentExpandedKeys = [...expandedRowKeys.value];
- const salesLedgerId = currentDeliveryRow.value.salesLedgerId;
- addShippingInfo({
- salesLedgerId: salesLedgerId,
- salesLedgerProductId: currentDeliveryRow.value.id,
- type: deliveryForm.value.type,
- approveUserIds,
- })
+
+ const targets = currentDeliveryRows.value || [];
+ if (targets.length === 0) {
+ proxy.$modal.msgWarning("鏈�夋嫨鍙彂璐х殑鏁版嵁");
+ 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,
+ });
+ }
+ };
+
+ run()
.then(() => {
proxy.$modal.msgSuccess("鍙戣揣鎴愬姛");
closeDeliveryDia();
@@ -2986,8 +2916,7 @@
getList().then(() => {
// 濡傛灉涔嬪墠鏈夊睍寮�鐨勮锛岄噸鏂板姞杞借繖浜涜鐨勫瓙琛ㄦ牸鏁版嵁
if (currentExpandedKeys.length > 0) {
- // 浣跨敤 Promise.all 骞惰鍔犺浇鎵�鏈夊睍寮�琛岀殑瀛愯〃鏍兼暟鎹�
- const loadPromises = currentExpandedKeys.map(ledgerId => {
+ const loadPromises = currentExpandedKeys.map((ledgerId) => {
return productList({ salesLedgerId: ledgerId, type: 1 }).then((res) => {
const index = tableData.value.findIndex((item) => item.id === ledgerId);
if (index > -1) {
@@ -2996,12 +2925,14 @@
});
});
Promise.all(loadPromises).then(() => {
- // 鎭㈠灞曞紑鐘舵��
expandedRowKeys.value = currentExpandedKeys;
});
}
});
})
+ .catch(() => {
+ proxy.$modal.msgError("鍙戣揣澶辫触锛岃绋嶅悗閲嶈瘯");
+ });
}
});
};
@@ -3010,7 +2941,7 @@
const closeDeliveryDia = () => {
proxy.resetForm("deliveryFormRef");
deliveryFormVisible.value = false;
- currentDeliveryRow.value = null;
+ currentDeliveryRows.value = [];
};
const currentFactoryName = ref("");
const getCurrentFactoryName = async () => {
--
Gitblit v1.9.3