From 53e0b9466d3fdd3e5caf7c42e476fffdb468bc2a Mon Sep 17 00:00:00 2001
From: yyb <995253665@qq.com>
Date: 星期五, 27 三月 2026 17:17:22 +0800
Subject: [PATCH] 1
---
src/views/salesManagement/salesLedger/index.vue | 1329 +++++++++++++++++----------------------------------------
1 files changed, 391 insertions(+), 938 deletions(-)
diff --git a/src/views/salesManagement/salesLedger/index.vue b/src/views/salesManagement/salesLedger/index.vue
index 8b6e024..9ec8ef2 100644
--- a/src/views/salesManagement/salesLedger/index.vue
+++ b/src/views/salesManagement/salesLedger/index.vue
@@ -25,18 +25,39 @@
</div>
<div class="table_list">
<div class="actions">
- <div></div>
+ <div>
+ <OtherAmountMaintenanceButton />
+ <ProcessFlowMaintenanceButton />
+ </div>
+ <ProcessFlowConfigSelectDialog
+ v-model:visible="processFlowSelectDialogVisible"
+ :default-route-id="processFlowSelectDefaultRouteId"
+ :bound-route-name="processFlowSelectBoundRouteName"
+ @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>
<el-button type="danger" plain @click="handleDelete">鍒犻櫎</el-button>
- <el-button type="primary" plain @click="handlePrint">鎵撳嵃</el-button>
+ <el-dropdown @command="handlePrintCommand">
+ <el-button type="primary" plain>
+ 鎵撳嵃鍗曟嵁<el-icon class="el-icon--right"><ArrowDown /></el-icon>
+ </el-button>
+ <template #dropdown>
+ <el-dropdown-menu>
+ <el-dropdown-item command="finishedProcessCard">鐢熶骇娴佺▼鍗★紙鎴愬搧锛�</el-dropdown-item>
+ <el-dropdown-item command="salesOrder">閿�鍞鍗�</el-dropdown-item>
+ <el-dropdown-item command="salesDeliveryNote">閿�鍞彂璐у崟</el-dropdown-item>
+ </el-dropdown-menu>
+ </template>
+ </el-dropdown>
+ <el-button type="primary" plain @click="handlePrintLabel">鎵撳嵃鏍囩</el-button>
</div>
</div>
<el-table :data="tableData" border v-loading="tableLoading" @selection-change="handleSelectionChange"
@@ -49,7 +70,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 +121,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 +131,7 @@
鍙戣揣
</el-button>
</template>
- </el-table-column>
+ </el-table-column> -->
</el-table>
</template>
</el-table-column>
@@ -123,9 +148,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 +255,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 +277,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 +418,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 +616,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 +743,7 @@
</el-button>
</template>
</el-dialog>
+
<!-- 瀵煎叆寮圭獥 -->
<FormDialog
v-model="importUpload.open"
@@ -725,122 +785,6 @@
v-model="fileListDialogVisible"
title="闄勪欢鍒楄〃"
/>
- <!-- 鎵撳嵃棰勮寮圭獥 -->
- <el-dialog
- v-model="printPreviewVisible"
- title="鎵撳嵃棰勮"
- width="90%"
- :close-on-click-modal="false"
- class="print-preview-dialog"
- >
- <div class="print-preview-container">
- <div class="print-preview-header">
- <el-button type="primary" @click="executePrint">鎵ц鎵撳嵃</el-button>
- <el-button @click="printPreviewVisible = false">鍏抽棴棰勮</el-button>
- </div>
- <div class="print-preview-content">
- <div v-if="printData.length === 0" style="text-align: center; padding: 50px; color: #999;">
- 鏆傛棤鎵撳嵃鏁版嵁
- </div>
- <div v-else style="text-align: center; padding: 10px; color: #666; font-size: 14px; background: #e8f4fd; margin-bottom: 10px;">
- 鍏� {{ printData.length }} 鏉℃暟鎹緟鎵撳嵃
- </div>
- <div v-for="(item, index) in printData" :key="index" class="print-page">
- <div class="delivery-note">
- <div class="header">
- <div class="document-title">闆跺敭鍙戣揣鍗�</div>
- </div>
-
- <div class="info-section">
- <div class="info-row">
- <div>
- <span class="label">鍙戣揣鏃ユ湡锛�</span>
- <span class="value">{{ formatDate(item.createTime) }}</span>
- </div>
- <div>
- <span class="label">鍙戣揣杞︾墝鍙凤細</span>
- <span class="value">{{ item.shippingCarNumber }}</span>
- </div>
- </div>
- <div class="info-row">
- <div>
- <span class="label">瀹㈡埛鍚嶇О锛�</span>
- <span class="value">{{ item.customerName }}</span>
- </div>
- <span class="label">鍗曞彿锛�</span>
- <span class="value">{{ item.salesContractNo }}</span>
- </div>
- </div>
-
- <div class="table-section">
- <table class="product-table">
- <thead>
- <tr>
- <th>浜у搧鍚嶇О</th>
- <th>瑙勬牸鍨嬪彿</th>
- <th>鍗曚綅</th>
- <th>鍗曚环</th>
- <th>闆跺敭鏁伴噺</th>
- <th>闆跺敭閲戦</th>
- </tr>
- </thead>
- <tbody>
- <tr v-for="product in item.products" :key="product.id">
- <td>{{ product.productCategory || '' }}</td>
- <td>{{ product.specificationModel || '' }}</td>
- <td>{{ product.unit || '' }}</td>
- <td>{{ product.taxInclusiveUnitPrice || '0' }}</td>
- <td>{{ product.quantity || '0' }}</td>
- <td>{{ product.taxInclusiveTotalPrice || '0' }}</td>
- </tr>
- <tr v-if="!item.products || item.products.length === 0">
- <td colspan="6" style="text-align: center; color: #999;">鏆傛棤浜у搧鏁版嵁</td>
- </tr>
- </tbody>
- <tfoot>
- <tr>
- <td class="label">鍚堣</td>
- <td class="total-value"></td>
- <td class="total-value"></td>
- <td class="total-value"></td>
- <td class="total-value">{{ getTotalQuantity(item.products) }}</td>
- <td class="total-value">{{ getTotalAmount(item.products) }}</td>
- </tr>
- </tfoot>
- </table>
- </div>
-
- <div class="footer-section">
- <div class="footer-row">
- <div class="footer-item">
- <span class="label">鏀惰揣鐢佃瘽锛�</span>
- <span class="value"></span>
- </div>
- <div class="footer-item">
- <span class="label">鏀惰揣浜猴細</span>
- <span class="value"></span>
- </div>
- <div class="footer-item address-item">
- <span class="label">鏀惰揣鍦板潃锛�</span>
- <span class="value address-value"></span>
- </div>
- </div>
- <div class="footer-row">
- <div class="footer-item">
- <span class="label">鎿嶄綔鍛橈細</span>
- <span class="value">{{ userStore.nickName || '鎾曞紑鍓�' }}</span>
- </div>
- <div class="footer-item">
- <span class="label">鎵撳嵃鏃ユ湡锛�</span>
- <span class="value">{{ formatDateTime(new Date()) }}</span>
- </div>
- </div>
- </div>
- </div>
- </div>
- </div>
- </div>
- </el-dialog>
<!-- 鍙戣揣寮规 -->
<el-dialog
v-model="deliveryFormVisible"
@@ -916,114 +860,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>
@@ -1033,11 +869,14 @@
import {onMounted, ref, getCurrentInstance} from "vue";
import { addShippingInfo } from "@/api/salesManagement/deliveryLedger.js";
import { ElMessageBox, ElMessage } from "element-plus";
-import { UploadFilled, Download } from "@element-plus/icons-vue";
+import { ArrowDown } from "@element-plus/icons-vue";
import useUserStore from "@/store/modules/user";
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 +890,22 @@
delLedgerFile,
getProductInventory,
salesLedgerProductProcessList,
- salesLedgerProductProcessAdd,
- salesLedgerProductProcessUpdate,
- salesLedgerProductProcessDelete,
+ saleProcessBind,
+ getSaleProcessBindInfo,
+ getProcessCard,
+ getSalesOrder,
+ getSalesInvoices,
+ getSalesLabel,
} 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 { printFinishedProcessCard } from "./components/processCardPrint.js";
+import { printSalesOrder } from "./components/salesOrderPrint.js";
+import { printSalesDeliveryNote } from "./components/salesDeliveryPrint.js";
+import { printSalesLabel } from "./components/salesLabelPrint.js";
+// import { salesLedgerProductSetProcessFlowConfig } from "@/api/salesManagement/salesProcessFlowConfig.js";
const userStore = useUserStore();
const { proxy } = getCurrentInstance();
@@ -1077,6 +924,13 @@
});
const total = ref(0);
const fileList = ref([]);
+
+// 宸ヨ壓璺嚎閰嶇疆閫夋嫨寮圭獥锛堢粦瀹氬埌鍙拌处浜у搧锛�
+const processFlowSelectDialogVisible = ref(false);
+const processFlowSelectLedgerRow = ref(null);
+const processFlowSelectDefaultRouteId = ref(null);
+const processFlowSelectBoundRouteId = ref(null);
+const processFlowSelectBoundRouteName = ref("");
// 鐢ㄦ埛淇℃伅琛ㄥ崟寮规鏁版嵁
const operationType = ref("");
@@ -1119,7 +973,7 @@
productForm: {
productCategory: "",
specificationModel: "",
- unit: "",
+ thickness:null,
quantity: "",
taxInclusiveUnitPrice: "",
taxRate: "",
@@ -1138,6 +992,8 @@
processRequirement: "", // 鍔犲伐瑕佹眰
remark: "", // 澶囨敞
salesProductProcessList: [], // 鍏朵粬閲戦锛歔{id, processName, quantity}]
+ processFlowConfigId: null, // 宸ヨ壓娴佺▼閰嶇疆缁戝畾
+ floorCode: "", // 妤煎眰缂栧彿
},
productRules: {
productCategory: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
@@ -1145,7 +1001,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" },
@@ -1169,10 +1025,6 @@
// 璁剧疆涓婁紶鐨勮姹傚ご閮�
headers: { Authorization: "Bearer " + getToken() },
});
-// 鎵撳嵃鐩稿叧
-const printPreviewVisible = ref(false);
-const printData = ref([]);
-
// 鎶ヤ环鍗曞鍏ョ浉鍏�
const quotationDialogVisible = ref(false);
const quotationLoading = ref(false);
@@ -1191,7 +1043,7 @@
// 鍙戣揣鐩稿叧
const deliveryFormVisible = ref(false);
-const currentDeliveryRow = ref(null);
+const currentDeliveryRows = ref([]);
const deliveryFormData = reactive({
deliveryForm: {
type: "璐ц溅", // 璐ц溅, 蹇��
@@ -1203,169 +1055,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 +1325,86 @@
tableLoading.value = false;
});
};
+
+// 鎵撳紑鈥滃伐鑹鸿矾绾块厤缃�濋�夋嫨寮圭獥锛堝繀椤绘樉寮忛�夋嫨锛�
+const openProcessFlowSelect = async (ledgerRow) => {
+ if (!ledgerRow) return;
+ if (!ledgerRow.isEdit) return;
+
+ processFlowSelectLedgerRow.value = ledgerRow;
+ processFlowSelectDefaultRouteId.value = null;
+ processFlowSelectBoundRouteId.value = null;
+ processFlowSelectBoundRouteName.value = "";
+
+ try {
+ const res = await getSaleProcessBindInfo(ledgerRow.id);
+ const info = res?.data ?? res ?? {};
+ const boundId =
+ info?.processRouteId ??
+ info?.routeId ??
+ info?.id ??
+ null;
+ const boundName =
+ info?.processRouteName ??
+ info?.routeName ??
+ info?.name ??
+ "";
+ processFlowSelectBoundRouteId.value = boundId;
+ processFlowSelectBoundRouteName.value = boundName;
+ processFlowSelectDefaultRouteId.value = boundId;
+ } catch (e) {
+ // 鏌ヨ澶辫触鏃舵寜鏈粦瀹氬鐞嗭紝涓嶉樆濉炲脊绐�
+ processFlowSelectBoundRouteId.value = null;
+ processFlowSelectBoundRouteName.value = "";
+ processFlowSelectDefaultRouteId.value = null;
+ }
+
+ processFlowSelectDialogVisible.value = true;
+};
+
+// 缁戝畾宸ヨ壓璺嚎鍒板綋鍓嶅彴璐︽暟鎹�
+const handleProcessFlowSelectConfirm = async (routeId) => {
+ const ledgerRow = processFlowSelectLedgerRow.value;
+ if (!ledgerRow?.id) return;
+
+ const finalRouteId = routeId ?? null;
+ if (!finalRouteId) return;
+
+ const oldRouteId = processFlowSelectBoundRouteId.value;
+ if (oldRouteId !== null && oldRouteId !== undefined && oldRouteId !== "" && String(oldRouteId) !== String(finalRouteId)) {
+ try {
+ await ElMessageBox.confirm(
+ "璇ヨ鍗曞凡缁戝畾宸ヨ壓璺嚎锛屾槸鍚︾‘瀹氭洿鎹紵",
+ "鎻愮ず",
+ {
+ confirmButtonText: "纭畾",
+ cancelButtonText: "鍙栨秷",
+ type: "warning",
+ }
+ );
+ } catch {
+ return;
+ }
+ }
+
+ proxy?.$modal?.loading?.("姝ｅ湪缁戝畾宸ヨ壓璺嚎锛岃绋嶅��...");
+ try {
+ await saleProcessBind({
+ salesLedgerId: ledgerRow.id,
+ processRouteId: finalRouteId,
+ });
+
+ proxy?.$modal?.msgSuccess?.("宸ヨ壓璺嚎缁戝畾鎴愬姛");
+ processFlowSelectDialogVisible.value = false;
+ // 缁戝畾鍚庡埛鏂板垪琛紝纭繚鎿嶄綔鍒楀啀娆＄偣鍑昏兘鍥炴樉缁戝畾
+ await getList();
+ } catch (e) {
+ proxy?.$modal?.msgError?.("缁戝畾澶辫触锛岃绋嶅悗閲嶈瘯");
+ } finally {
+ proxy?.$modal?.closeLoading?.();
+ }
+};
+
// 鑾峰彇浜у搧澶х被tree鏁版嵁
const getProductOptions = () => {
// 杩斿洖 Promise锛屼究浜庡湪缂栬緫浜у搧鏃剁瓑寰呭姞杞藉畬鎴�
@@ -1658,10 +1427,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 +1551,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 +1656,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 +1671,7 @@
settlePieceArea: 0,
settleTotalArea: 0,
processRequirement: "",
+ floorCode: "",
remark: "",
salesProductProcessList: [],
};
@@ -2007,10 +1778,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 +1833,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锛�
@@ -2248,364 +2031,118 @@
});
};
-// 鎵撳嵃鍔熻兘
-const handlePrint = async () => {
- if (selectedRows.value.length === 0) {
- proxy.$modal.msgWarning("璇烽�夋嫨瑕佹墦鍗扮殑鏁版嵁");
+const handlePrintCommand = async (command) => {
+ if (command !== "finishedProcessCard" && command !== "salesOrder" && command !== "salesDeliveryNote") 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()))
+ );
+ if (customerNames.length > 1) {
+ proxy.$modal.msgWarning("浠呮敮鎸佺浉鍚屽鎴峰悕绉扮殑閿�鍞彴璐﹀悎骞跺彂璐ф墦鍗�");
+ return;
+ }
+ } else if (selectedRows.value.length !== 1) {
+ proxy.$modal.msgWarning("璇烽�夋嫨涓�鏉￠攢鍞彴璐︽暟鎹繘琛屾墦鍗�");
return;
}
-
- // 鏄剧ず鍔犺浇鐘舵��
- proxy.$modal.loading("姝ｅ湪鑾峰彇浜у搧鏁版嵁锛岃绋嶅��...");
-
- try {
- // 涓烘瘡涓�変腑鐨勯攢鍞彴璐﹁褰曟煡璇㈠搴旂殑浜у搧鏁版嵁
- const printDataWithProducts = [];
-
- for (const row of selectedRows.value) {
- try {
- // 璋冪敤productList鎺ュ彛鏌ヨ浜у搧鏁版嵁
- const productRes = await productList({ salesLedgerId: row.id, type: 1 });
-
- // 灏嗕骇鍝佹暟鎹暣鍚堝埌閿�鍞彴璐﹁褰曚腑
- const rowWithProducts = {
- ...row,
- products: productRes.data || []
- };
-
- printDataWithProducts.push(rowWithProducts);
- } catch (error) {
- console.error(`鑾峰彇閿�鍞彴璐� ${row.id} 鐨勪骇鍝佹暟鎹け璐�:`, error);
- // 鍗充娇鏌愪釜璁板綍鐨勪骇鍝佹暟鎹幏鍙栧け璐ワ紝涔熻鍖呭惈璇ヨ褰�
- printDataWithProducts.push({
- ...row,
- products: []
- });
- }
+
+ const selectedRow = selectedRows.value[0];
+ const selectedId = selectedRow?.id;
+ if (command === "salesDeliveryNote") {
+ const selectedIds = selectedRows.value
+ .map((item) => item?.id)
+ .filter((id) => id !== null && id !== undefined && id !== "");
+ if (selectedIds.length !== selectedRows.value.length) {
+ proxy.$modal.msgWarning("褰撳墠閫夋嫨鏁版嵁瀛樺湪缂哄皯ID鐨勮褰曪紝鏃犳硶鎵撳嵃");
+ return;
}
-
- printData.value = printDataWithProducts;
- console.log('鎵撳嵃鏁版嵁锛堝寘鍚骇鍝侊級:', printData.value);
- printPreviewVisible.value = true;
-
+ const loadingText =
+ command === "salesOrder"
+ ? "姝ｅ湪鑾峰彇閿�鍞鍗曟暟鎹紝璇风◢鍊�..."
+ : command === "salesDeliveryNote"
+ ? "姝ｅ湪鑾峰彇閿�鍞彂璐у崟鏁版嵁锛岃绋嶅��..."
+ : "姝ｅ湪鑾峰彇鐢熶骇娴佺▼鍗℃暟鎹紝璇风◢鍊�...";
+ proxy.$modal.loading(loadingText);
+ try {
+ const res = await getSalesInvoices(selectedIds);
+ const salesInvoiceData = res?.data ?? {};
+ printSalesDeliveryNote(salesInvoiceData, selectedRow);
+ } catch (error) {
+ console.error("鎵撳嵃閿�鍞彂璐у崟澶辫触:", error);
+ proxy.$modal.msgError("鎵撳嵃澶辫触锛岃绋嶅悗閲嶈瘯");
+ } finally {
+ proxy.$modal.closeLoading();
+ }
+ return;
+ }
+ if (!selectedId) {
+ proxy.$modal.msgWarning("褰撳墠閫夋嫨鏁版嵁缂哄皯ID锛屾棤娉曟墦鍗�");
+ return;
+ }
+
+ const loadingText =
+ command === "salesOrder"
+ ? "姝ｅ湪鑾峰彇閿�鍞鍗曟暟鎹紝璇风◢鍊�..."
+ : command === "salesDeliveryNote"
+ ? "姝ｅ湪鑾峰彇閿�鍞彂璐у崟鏁版嵁锛岃绋嶅��..."
+ : "姝ｅ湪鑾峰彇鐢熶骇娴佺▼鍗℃暟鎹紝璇风◢鍊�...";
+ proxy.$modal.loading(loadingText);
+ try {
+ if (command === "salesOrder") {
+ const res = await getSalesOrder(selectedId);
+ const salesOrderData = res?.data ?? {};
+ printSalesOrder(salesOrderData);
+ } else {
+ const res = await getProcessCard(selectedId);
+ const processCardData = res?.data ?? {};
+ printFinishedProcessCard(processCardData);
+ }
} catch (error) {
- console.error('鑾峰彇浜у搧鏁版嵁澶辫触:', error);
- proxy.$modal.msgError("鑾峰彇浜у搧鏁版嵁澶辫触锛岃閲嶈瘯");
+ console.error(
+ command === "salesOrder"
+ ? "鎵撳嵃閿�鍞鍗曞け璐�:"
+ : command === "salesDeliveryNote"
+ ? "鎵撳嵃閿�鍞彂璐у崟澶辫触:"
+ : "鎵撳嵃鐢熶骇娴佺▼鍗″け璐�:",
+ error
+ );
+ proxy.$modal.msgError("鎵撳嵃澶辫触锛岃绋嶅悗閲嶈瘯");
} finally {
proxy.$modal.closeLoading();
}
};
-// 鎵ц鎵撳嵃
-const executePrint = () => {
- console.log('寮�濮嬫墽琛屾墦鍗帮紝鏁版嵁鏉℃暟:', printData.value.length);
- console.log('鎵撳嵃鏁版嵁:', printData.value);
-
- // 鍒涘缓涓�涓柊鐨勬墦鍗扮獥鍙�
- const printWindow = window.open('', '_blank', 'width=800,height=600');
-
- // 鏋勫缓鎵撳嵃鍐呭
- let printContent = `
- <!DOCTYPE html>
- <html>
- <head>
- <meta charset="UTF-8">
- <title>鎵撳嵃棰勮</title>
- <style>
- body {
- margin: 0;
- padding: 0;
- font-family: "SimSun", serif;
- background: white;
- }
- .print-page {
- width: 200mm;
- height: 75mm;
- padding: 10mm;
- padding-left: 20mm;
- background: white;
- box-sizing: border-box;
- page-break-after: always;
- page-break-inside: avoid;
- }
- .print-page:last-child {
- page-break-after: avoid;
- }
- .delivery-note {
- width: 100%;
- height: 100%;
- font-size: 12px;
- line-height: 1.2;
- display: flex;
- flex-direction: column;
- color: #000;
- }
- .header {
- text-align: center;
- margin-bottom: 8px;
- }
- .company-name {
- font-size: 18px;
- font-weight: bold;
- margin-bottom: 4px;
- }
- .document-title {
- font-size: 16px;
- font-weight: bold;
- }
- .info-section {
- margin-bottom: 8px;
- display: flex;
- justify-content: space-between;
- align-items: center;
- }
- .info-row {
- line-height: 20px;
- }
- .label {
- font-weight: bold;
- width: 60px;
- font-size: 12px;
- }
- .value {
- margin-right: 20px;
- min-width: 80px;
- font-size: 12px;
- }
- .table-section {
- margin-bottom: 40px;
- // flex: 0.6;
- }
- .product-table {
- width: 100%;
- border-collapse: collapse;
- border: 1px solid #000;
- }
- .product-table th, .product-table td {
- border: 1px solid #000;
- padding: 6px;
- text-align: center;
- font-size: 12px;
- line-height: 1.4;
- }
- .product-table th {
- font-weight: bold;
- }
- .total-value {
- font-weight: bold;
- }
- .footer-section {
- margin-top: auto;
- }
- .footer-row {
- display: flex;
- margin-bottom: 3px;
- line-height: 22px;
- justify-content: space-between;
- }
- .footer-item {
- display: flex;
- margin-right: 20px;
- }
- .footer-item .label {
- font-weight: bold;
- width: 80px;
- font-size: 12px;
- }
- .footer-item .value {
- min-width: 80px;
- font-size: 12px;
- }
- .address-item .address-value {
- min-width: 200px;
- }
- @media print {
- body {
- margin: 0;
- padding: 0;
- }
- .print-page {
- margin: 0;
- padding: 10mm;
- /* padding-left: 20mm; */
- page-break-inside: avoid;
- page-break-after: always;
- }
- .print-page:last-child {
- page-break-after: avoid;
- }
- }
- </style>
- </head>
- <body>
- `;
-
- // 涓烘瘡鏉℃暟鎹敓鎴愭墦鍗伴〉闈�
- printData.value.forEach((item, index) => {
- printContent += `
- <div class="print-page">
- <div class="delivery-note">
- <div class="header">
- <div class="document-title">闆跺敭鍙戣揣鍗�</div>
- </div>
-
- <div class="info-section">
- <div class="info-row">
- <div>
- <span class="label">鍙戣揣鏃ユ湡锛�</span>
- <span class="value">${formatDate(item.createTime)}</span>
- </div>
- <div>
- <span class="label">瀹㈡埛鍚嶇О锛�</span>
- <span class="value">${item.customerName}</span>
- </div>
- </div>
- <div class="info-row">
- <span class="label">鍗曞彿锛�</span>
- <span class="value">${item.salesContractNo || ''}</span>
- </div>
- </div>
- <div class="table-section">
- <table class="product-table">
- <thead>
- <tr>
- <th>浜у搧鍚嶇О</th>
- <th>瑙勬牸鍨嬪彿</th>
- <th>鍗曚綅</th>
- <th>鍗曚环</th>
- <th>闆跺敭鏁伴噺</th>
- <th>闆跺敭閲戦</th>
- </tr>
- </thead>
- <tbody>
- ${item.products && item.products.length > 0 ?
- item.products.map(product => `
- <tr>
- <td>${product.productCategory || ''}</td>
- <td>${product.specificationModel || ''}</td>
- <td>${product.unit || ''}</td>
- <td>${product.taxInclusiveUnitPrice || '0'}</td>
- <td>${product.quantity || '0'}</td>
- <td>${product.taxInclusiveTotalPrice || '0'}</td>
- </tr>
- `).join('') :
- '<tr><td colspan="6" style="text-align: center; color: #999;">鏆傛棤浜у搧鏁版嵁</td></tr>'
+const handlePrintLabel = async () => {
+ if (selectedRows.value.length !== 1) {
+ proxy.$modal.msgWarning("璇烽�夋嫨涓�鏉￠攢鍞彴璐︽暟鎹繘琛屾爣绛炬墦鍗�");
+ return;
+ }
+
+ const selectedId = selectedRows.value[0]?.id;
+ if (!selectedId) {
+ proxy.$modal.msgWarning("褰撳墠閫夋嫨鏁版嵁缂哄皯ID锛屾棤娉曟墦鍗版爣绛�");
+ return;
+ }
+
+ proxy.$modal.loading("姝ｅ湪鑾峰彇鏍囩鏁版嵁锛岃绋嶅��...");
+ try {
+ const res = await getSalesLabel(selectedId);
+ const labelList = res?.data ?? [];
+ if (!Array.isArray(labelList) || labelList.length === 0) {
+ proxy.$modal.msgWarning("鏆傛棤鍙墦鍗版爣绛炬暟鎹�");
+ return;
}
- </tbody>
- <tfoot>
- <tr>
- <td class="label">鍚堣</td>
- <td class="total-value"></td>
- <td class="total-value"></td>
- <td class="total-value"></td>
- <td class="total-value">${getTotalQuantityForPrint(item.products)}</td>
- <td class="total-value">${getTotalAmountForPrint(item.products)}</td>
- </tr>
- </tfoot>
- </table>
- </div>
-
- <div class="footer-section">
- <div class="footer-row">
- <div class="footer-item">
- <span class="label">鏀惰揣鐢佃瘽锛�</span>
- <span class="value"></span>
- </div>
- <div class="footer-item">
- <span class="label">鏀惰揣浜猴細</span>
- <span class="value"></span>
- </div>
- <div class="footer-item address-item">
- <span class="label">鏀惰揣鍦板潃锛�</span>
- <span class="value address-value"></span>
- </div>
- </div>
- <div class="footer-row">
- <div class="footer-item">
- <span class="label">鎿嶄綔鍛橈細</span>
- <span class="value">${userStore.nickName || '鎾曞紑鍓�'}</span>
- </div>
- <div class="footer-item">
- <span class="label">鎵撳嵃鏃ユ湡锛�</span>
- <span class="value">${formatDateTime(new Date())}</span>
- </div>
- </div>
- </div>
- </div>
- </div>
- `;
- });
-
- printContent += `
- </body>
- </html>
- `;
-
- // 鍐欏叆鍐呭鍒版柊绐楀彛
- printWindow.document.write(printContent);
- printWindow.document.close();
-
- // 绛夊緟鍐呭鍔犺浇瀹屾垚鍚庢墦鍗�
- printWindow.onload = () => {
- setTimeout(() => {
- printWindow.print();
- printWindow.close();
- printPreviewVisible.value = false;
- }, 500);
- };
-};
-// 鏍煎紡鍖栨棩鏈�
-const formatDate = (dateString) => {
- if (!dateString) return getCurrentDate();
- const date = new Date(dateString);
- const year = date.getFullYear();
- const month = String(date.getMonth() + 1).padStart(2, "0");
- const day = String(date.getDate()).padStart(2, "0");
- return `${year}/${month}/${day}`;
-};
-// 鏍煎紡鍖栨棩鏈熸椂闂�
-const formatDateTime = (date) => {
- const year = date.getFullYear();
- const month = String(date.getMonth() + 1).padStart(2, "0");
- const day = String(date.getDate()).padStart(2, "0");
- const hours = String(date.getHours()).padStart(2, "0");
- const minutes = String(date.getMinutes()).padStart(2, "0");
- const seconds = String(date.getSeconds()).padStart(2, "0");
- return `${year}/${month}/${day} ${hours}:${minutes}:${seconds}`;
-};
-// 璁＄畻浜у搧鎬绘暟閲�
-const getTotalQuantity = (products) => {
- if (!products || products.length === 0) return '0';
- const total = products.reduce((sum, product) => {
- return sum + (parseFloat(product.quantity) || 0);
- }, 0);
- return total.toFixed(2);
-};
-
-// 璁＄畻浜у搧鎬婚噾棰�
-const getTotalAmount = (products) => {
- if (!products || products.length === 0) return '0';
- const total = products.reduce((sum, product) => {
- return sum + (parseFloat(product.taxInclusiveTotalPrice) || 0);
- }, 0);
- return total.toFixed(2);
-};
-
-// 鐢ㄤ簬鎵撳嵃鐨勮绠楀嚱鏁�
-const getTotalQuantityForPrint = (products) => {
- if (!products || products.length === 0) return '0';
- const total = products.reduce((sum, product) => {
- return sum + (parseFloat(product.quantity) || 0);
- }, 0);
- return total.toFixed(2);
-};
-
-const getTotalAmountForPrint = (products) => {
- if (!products || products.length === 0) return '0';
- const total = products.reduce((sum, product) => {
- return sum + (parseFloat(product.taxInclusiveTotalPrice) || 0);
- }, 0);
- return total.toFixed(2);
+ printSalesLabel(labelList);
+ } catch (error) {
+ console.error("鎵撳嵃鏍囩澶辫触:", error);
+ proxy.$modal.msgError("鎵撳嵃鏍囩澶辫触锛岃绋嶅悗閲嶈瘯");
+ } finally {
+ proxy.$modal.closeLoading();
+ }
};
const mathNum = () => {
@@ -2926,6 +2463,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 +2552,7 @@
return;
}
- currentDeliveryRow.value = row;
+ currentDeliveryRows.value = [row];
deliveryForm.value = {
type: "璐ц溅",
};
@@ -2972,13 +2575,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 +2604,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 +2613,14 @@
});
});
Promise.all(loadPromises).then(() => {
- // 鎭㈠灞曞紑鐘舵��
expandedRowKeys.value = currentExpandedKeys;
});
}
});
})
+ .catch(() => {
+ proxy.$modal.msgError("鍙戣揣澶辫触锛岃绋嶅悗閲嶈瘯");
+ });
}
});
};
@@ -3010,7 +2629,7 @@
const closeDeliveryDia = () => {
proxy.resetForm("deliveryFormRef");
deliveryFormVisible.value = false;
- currentDeliveryRow.value = null;
+ currentDeliveryRows.value = [];
};
const currentFactoryName = ref("");
const getCurrentFactoryName = async () => {
@@ -3066,171 +2685,5 @@
display: flex;
justify-content: space-between;
margin-bottom: 10px;
-}
-.print-preview-dialog {
- .el-dialog__body {
- padding: 0;
- max-height: 80vh;
- overflow-y: auto;
- }
-}
-
-.print-preview-container {
- .print-preview-header {
- padding: 15px;
- border-bottom: 1px solid #e4e7ed;
- text-align: center;
-
- .el-button {
- margin: 0 10px;
- }
- }
-
- .print-preview-content {
- padding: 20px;
- background-color: #f5f5f5;
- min-height: 400px;
- }
-}
-
-.print-page {
- width: 220mm;
- height: 90mm;
- padding: 10mm;
- margin: 0 auto;
- background: white;
- box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
- margin-bottom: 10px;
- box-sizing: border-box;
-}
-
-.delivery-note {
- width: 100%;
- height: 100%;
- font-family: "SimSun", serif;
- font-size: 10px;
- line-height: 1.2;
- display: flex;
- flex-direction: column;
-}
-
-.header {
- text-align: center;
- margin-bottom: 8px;
-
- .company-name {
- font-size: 18px;
- font-weight: bold;
- margin-bottom: 4px;
- }
-
- .document-title {
- font-size: 16px;
- font-weight: bold;
- }
-}
-
-.info-section {
- margin-bottom: 8px;
- display: flex;
- justify-content: space-between;
- align-items: center;
-
- .info-row {
- line-height: 20px;
-
- .label {
- font-weight: bold;
- width: 60px;
- font-size: 14px;
- }
-
- .value {
- margin-right: 20px;
- min-width: 80px;
- font-size: 14px;
- }
- }
-}
-
-.table-section {
- margin-bottom: 4px;
- flex: 1;
-
- .product-table {
- width: 100%;
- border-collapse: collapse;
- border: 1px solid #000;
-
- th, td {
- border: 1px solid #000;
- padding: 6px;
- text-align: center;
- font-size: 14px;
- line-height: 1.4;
- }
-
- th {
- font-weight: bold;
- }
-
- .total-label {
- text-align: right;
- font-weight: bold;
- }
-
- .total-value {
- font-weight: bold;
- }
- }
-}
-
-.footer-section {
- .footer-row {
- display: flex;
- margin-bottom: 3px;
- line-height: 20px;
- justify-content: space-between;
-
- .footer-item {
- display: flex;
- margin-right: 20px;
-
- .label {
- font-weight: bold;
- width: 80px;
- font-size: 14px;
- }
-
- .value {
- min-width: 80px;
- font-size: 14px;
- }
-
- &.address-item {
- .address-value {
- min-width: 200px;
- }
- }
- }
- }
-}
-
-@media print {
- .app-container {
- display: none;
- }
-
- .print-page {
- box-shadow: none;
- margin: 0;
- padding: 10mm;
- padding-left: 20mm;
- page-break-inside: avoid;
- page-break-after: always;
- }
- .print-page:last-child {
- page-break-after: avoid;
- }
}
</style>
--
Gitblit v1.9.3