From d48d302bd1da8047d10af89d42fb34dd9f8cdeb4 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期一, 30 三月 2026 11:05:23 +0800
Subject: [PATCH] fix: 总金额计算缺失额外加工费用
---
src/views/salesManagement/salesLedger/index.vue | 1899 +++++++++++++++++++++++++++++++++++-----------------------
1 files changed, 1,149 insertions(+), 750 deletions(-)
diff --git a/src/views/salesManagement/salesLedger/index.vue b/src/views/salesManagement/salesLedger/index.vue
index 5cf762c..dae908a 100644
--- a/src/views/salesManagement/salesLedger/index.vue
+++ b/src/views/salesManagement/salesLedger/index.vue
@@ -25,16 +25,40 @@
</div>
<div class="table_list">
<div class="actions">
- <div></div>
<div>
- <el-button type="primary" @click="openForm('add')">
- 鏂板鍙拌处
- </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>
+ <OtherAmountMaintenanceButton />
+ <ProcessFlowMaintenanceButton />
</div>
+ <ProcessFlowConfigSelectDialog
+ v-model:visible="processFlowSelectDialogVisible"
+ :default-route-id="processFlowSelectDefaultRouteId"
+ :bound-route-name="processFlowSelectBoundRouteName"
+ @confirm="handleProcessFlowSelectConfirm"
+ />
+ <el-space wrap>
+ <el-button type="primary" @click="openForm('add')">鏂板鍙拌处</el-button>
+ <el-button type="primary" @click="handleBulkDelivery">鍙戣揣</el-button>
+ <el-button type="primary" plain @click="handleImport">瀵煎叆</el-button>
+ <el-button @click="handleOut">瀵煎嚭</el-button>
+
+ <el-button type="danger" plain @click="handleDelete">鍒犻櫎</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>
+ </el-space>
</div>
<el-table :data="tableData" border v-loading="tableLoading" @selection-change="handleSelectionChange"
:expand-row-keys="expandedRowKeys" :row-key="(row) => row.id" :row-class-name="tableRowClassName" show-summary style="width: 100%"
@@ -44,17 +68,52 @@
<template #default="props">
<el-table :data="props.row.children" border show-summary :summary-method="summarizeChildrenTable">
<el-table-column align="center" label="搴忓彿" type="index"/>
+ <el-table-column label="妤煎眰缂栧彿" prop="floorCode" min-width="100" show-overflow-tooltip />
<el-table-column label="浜у搧澶х被" prop="productCategory" />
<el-table-column label="瑙勬牸鍨嬪彿" prop="specificationModel" />
- <el-table-column label="鍗曚綅" prop="unit" />
+ <el-table-column label="鍘氬害" prop="thickness" min-width="90">
+ <template #default="scope">
+ {{ scope.row.thickness ?? "" }}
+ </template>
+ </el-table-column>
+ <el-table-column label="瀹�(mm)" prop="width" min-width="80">
+ <template #default="scope">
+ {{ scope.row.width ?? "" }}
+ </template>
+ </el-table-column>
+ <el-table-column label="楂�(mm)" prop="height" min-width="80">
+ <template #default="scope">
+ {{ scope.row.height ?? "" }}
+ </template>
+ </el-table-column>
+ <el-table-column label="鍛ㄩ暱(cm)" prop="perimeter" min-width="90">
+ <template #default="scope">
+ {{ scope.row.perimeter ?? "" }}
+ </template>
+ </el-table-column>
+ <el-table-column label="鎬婚潰绉�(cm虏)" prop="actualTotalArea" min-width="100">
+ <template #default="scope">
+ {{ scope.row.actualTotalArea ?? "" }}
+ </template>
+ </el-table-column>
+ <el-table-column label="鍔犲伐瑕佹眰" prop="processRequirement" min-width="120"
+ show-overflow-tooltip />
+ <el-table-column label="澶囨敞" prop="remark" min-width="120" show-overflow-tooltip />
+ <el-table-column label="閲嶇" prop="heavyBox" min-width="80">
+ <template #default="scope">
+ {{ scope.row.heavyBox ?? "" }}
+ </template>
+ </el-table-column>
<el-table-column label="浜у搧鐘舵��"
width="100px"
align="center">
<template #default="scope">
- <el-tag v-if="scope.row.approveStatus === 1"
+
+ <el-tag v-if="scope.row.approveStatus === 1 && (!scope.row.shippingDate || !scope.row.shippingCarNumber)"
type="success">鍏呰冻</el-tag>
- <el-tag v-else
- type="danger">涓嶈冻</el-tag>
+ <el-tag v-else-if="scope.row.approveStatus === 0 && (scope.row.shippingDate || scope.row.shippingCarNumber)"
+ type="success">宸插嚭搴�</el-tag>
+ <el-tag v-else type="danger">涓嶈冻</el-tag>
</template>
</el-table-column>
<el-table-column label="鍙戣揣鐘舵��" width="140" align="center">
@@ -91,18 +150,17 @@
<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
- type="primary"
- size="small"
+ type="primary"
:disabled="!canShip(scope.row)"
@click="openDeliveryForm(scope.row)">
鍙戣揣
</el-button>
</template>
- </el-table-column>
+ </el-table-column> -->
</el-table>
</template>
</el-table-column>
@@ -118,12 +176,12 @@
<el-table-column label="褰曞叆鏃ユ湡" prop="entryDate" width="120" show-overflow-tooltip />
<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 fixed="right" label="鎿嶄綔" min-width="100" align="center">
+ <el-table-column label="澶囨敞" prop="remarks" width="200" show-overflow-tooltip />
+ <el-table-column fixed="right" label="鎿嶄綔" width="200" align="center">
<template #default="scope">
- <el-button link type="primary" size="small" @click="openForm('edit', scope.row)">缂栬緫</el-button>
-<!-- <el-button link type="primary" size="small" @click="openForm('view', scope.row)">璇︽儏</el-button>-->
- <el-button link type="primary" size="small" @click="downLoadFile(scope.row)">闄勪欢</el-button>
-<!-- <el-button link type="primary" size="small" @click="openDeliveryForm(scope.row)">鍙戣揣</el-button>-->
+ <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>
</el-table>
@@ -226,7 +284,26 @@
<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="瀹�(mm)" prop="width" min-width="80">
+ <template #default="scope">
+ {{ scope.row.width ?? "" }}
+ </template>
+ </el-table-column>
+ <el-table-column label="楂�(mm)" prop="height" min-width="80">
+ <template #default="scope">
+ {{ scope.row.height ?? "" }}
+ </template>
+ </el-table-column>
+ <el-table-column label="闈㈢Н(m虏)" prop="actualTotalArea" min-width="100">
+ <template #default="scope">
+ {{ scope.row.actualTotalArea ?? "" }}
+ </template>
+ </el-table-column>
<el-table-column label="鏁伴噺" prop="quantity" />
<el-table-column label="绋庣巼(%)" prop="taxRate" />
<el-table-column label="鍚◣鍗曚环(鍏�)" prop="taxInclusiveUnitPrice" :formatter="formattedNumber" />
@@ -242,14 +319,28 @@
</el-table>
<el-row :gutter="30">
<el-col :span="24">
- <el-form-item label="澶囨敞路锛�" prop="remark">
- <el-input v-model="form.remark" placeholder="璇疯緭鍏�" clearable type="textarea" :rows="2" :disabled="operationType === 'view'" />
+ <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="remark">
+ <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>
+ <el-row :gutter="30">
+ <el-col :span="24">
+ <el-form-item label="闄勪欢鏉愭枡锛�" prop="salesLedgerFiles">
<el-upload v-model:file-list="fileList" :action="upload.url" multiple ref="fileUpload" auto-upload
:headers="upload.headers" :before-upload="handleBeforeUpload" :on-error="handleUploadError"
:on-success="handleUploadSuccess" :on-remove="handleRemove">
@@ -318,6 +409,15 @@
</el-table-column>
</el-table>
+ <pagination
+ v-show="quotationPage.total > 0"
+ :total="quotationPage.total"
+ layout="total, sizes, prev, pager, next, jumper"
+ :page="quotationPage.current"
+ :limit="quotationPage.size"
+ @pagination="quotationPaginationChange"
+ />
+
<template #footer>
<el-button @click="quotationDialogVisible = false">鍏抽棴</el-button>
</template>
@@ -325,88 +425,370 @@
<FormDialog
v-model="productFormVisible"
:title="productOperationType === 'add' ? '鏂板浜у搧' : '缂栬緫浜у搧'"
- :width="'40%'"
+ :width="'60%'"
:operation-type="productOperationType"
@close="closeProductDia"
@confirm="submitProduct"
@cancel="closeProductDia">
<el-form :model="productForm" label-width="140px" label-position="top" :rules="productRules" ref="productFormRef">
+ <!-- 姣忚涓変釜锛氫骇鍝佸ぇ绫�/瑙勬牸鍨嬪彿/鍗曚綅 -->
<el-row :gutter="30">
- <el-col :span="24">
+ <el-col :span="8">
<el-form-item label="浜у搧澶х被锛�" prop="productCategory">
- <!-- <el-select v-model="productForm.productCategory" placeholder="璇烽�夋嫨" clearable>
- <el-option v-for="item in userList" :key="item.nickName" :label="item.nickName" :value="item.nickName"/>
- </el-select> -->
- <el-tree-select v-model="productForm.productCategory" placeholder="璇烽�夋嫨" clearable check-strictly
- @change="getModels" :data="productOptions" :render-after-expand="false" style="width: 100%" />
+ <el-tree-select
+ v-model="productForm.productCategory"
+ placeholder="璇烽�夋嫨"
+ clearable
+ check-strictly
+ @change="getModels"
+ :data="productOptions"
+ :render-after-expand="false"
+ style="width: 100%"
+ />
</el-form-item>
</el-col>
- </el-row>
- <el-row :gutter="30">
- <el-col :span="24">
+ <el-col :span="8">
<el-form-item label="瑙勬牸鍨嬪彿锛�" prop="productModelId">
- <el-select v-model="productForm.productModelId" placeholder="璇烽�夋嫨" clearable @change="getProductModel" filterable>
+ <el-select
+ v-model="productForm.productModelId"
+ placeholder="璇烽�夋嫨"
+ clearable
+ @change="getProductModel"
+ filterable
+ style="width: 100%"
+ >
<el-option v-for="item in modelOptions" :key="item.id" :label="item.model" :value="item.id" />
</el-select>
</el-form-item>
</el-col>
- </el-row>
- <el-row :gutter="30">
- <el-col :span="12">
- <el-form-item label="鍗曚綅锛�" prop="unit">
- <el-input v-model="productForm.unit" placeholder="璇疯緭鍏�" clearable />
+ <el-col :span="8">
+ <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-col :span="12">
+ </el-row>
+
+ <!-- 姣忚涓変釜锛氱◣鐜�/鍚◣鍗曚环/鏁伴噺 -->
+ <el-row :gutter="30">
+ <el-col :span="8">
<el-form-item label="绋庣巼(%)锛�" prop="taxRate">
- <el-select v-model="productForm.taxRate" placeholder="璇烽�夋嫨" clearable @change="calculateFromTaxRate">
+ <el-select v-model="productForm.taxRate" placeholder="璇烽�夋嫨" clearable @change="calculateFromTaxRate" style="width: 100%">
<el-option label="1" value="1" />
<el-option label="6" value="6" />
<el-option label="13" value="13" />
</el-select>
</el-form-item>
</el-col>
- </el-row>
- <el-row :gutter="30">
- <el-col :span="12">
+ <el-col :span="8">
<el-form-item label="鍚◣鍗曚环(鍏�)锛�" prop="taxInclusiveUnitPrice">
- <el-input-number :step="0.01" :min="0" v-model="productForm.taxInclusiveUnitPrice" style="width: 100%"
- :precision="2"
- placeholder="璇疯緭鍏�" clearable @change="calculateFromUnitPrice" />
+ <el-input-number
+ :step="0.01"
+ :min="0"
+ v-model="productForm.taxInclusiveUnitPrice"
+ style="width: 100%"
+ :precision="2"
+ placeholder="璇疯緭鍏�"
+ clearable
+ @change="calculateFromUnitPrice"
+ />
</el-form-item>
</el-col>
- <el-col :span="12">
+ <el-col :span="8">
<el-form-item label="鏁伴噺锛�" prop="quantity">
- <el-input-number :step="0.1" :min="0" v-model="productForm.quantity" placeholder="璇疯緭鍏�" clearable
- :precision="2"
- @change="calculateFromQuantity" style="width: 100%" />
+ <el-input-number
+ :step="0.1"
+ :min="0"
+ v-model="productForm.quantity"
+ placeholder="璇疯緭鍏�"
+ clearable
+ :precision="2"
+ @change="() => { calculateFromQuantity(); recalcAreaTotals(); }"
+ style="width: 100%"
+ />
</el-form-item>
</el-col>
</el-row>
+
+ <!-- 姣忚涓変釜锛氬惈绋庢�讳环/涓嶅惈绋庢�讳环/鍙戠エ绫诲瀷 -->
<el-row :gutter="30">
- <el-col :span="12">
+ <el-col :span="8">
<el-form-item label="鍚◣鎬讳环(鍏�)锛�" prop="taxInclusiveTotalPrice">
<el-input v-model="productForm.taxInclusiveTotalPrice" placeholder="璇疯緭鍏�" clearable @change="calculateFromTotalPrice" />
</el-form-item>
</el-col>
- <el-col :span="12">
+ <el-col :span="8">
<el-form-item label="涓嶅惈绋庢�讳环(鍏�)锛�" prop="taxExclusiveTotalPrice">
<el-input v-model="productForm.taxExclusiveTotalPrice" placeholder="璇疯緭鍏�" clearable @change="calculateFromExclusiveTotalPrice" />
</el-form-item>
</el-col>
- </el-row>
- <el-row :gutter="30">
- <el-col :span="12">
+ <el-col :span="8">
<el-form-item label="鍙戠エ绫诲瀷锛�" prop="invoiceType">
- <el-select v-model="productForm.invoiceType" placeholder="璇烽�夋嫨" clearable>
+ <el-select v-model="productForm.invoiceType" placeholder="璇烽�夋嫨" clearable style="width: 100%">
<el-option label="澧炴櫘绁�" value="澧炴櫘绁�" />
<el-option label="澧炰笓绁�" value="澧炰笓绁�" />
</el-select>
</el-form-item>
</el-col>
</el-row>
+
+ <!-- 姣忚涓変釜锛氬/楂�/瀹為檯鍗曠墖闈㈢Н -->
+ <el-row :gutter="30">
+ <el-col :span="8">
+ <el-form-item label="瀹�(mm)锛�" prop="width">
+ <el-input-number
+ v-model="productForm.width"
+ :min="0"
+ :step="1"
+ :precision="2"
+ style="width: 100%"
+ placeholder="璇疯緭鍏ュ(mm)"
+ clearable
+ @change="recalcAreaFromWidthHeight"
+ />
+ </el-form-item>
+ </el-col>
+ <el-col :span="8">
+ <el-form-item label="楂�(mm)锛�" prop="height">
+ <el-input-number
+ v-model="productForm.height"
+ :min="0"
+ :step="1"
+ :precision="2"
+ style="width: 100%"
+ placeholder="璇疯緭鍏ラ珮(mm)"
+ clearable
+ @change="recalcAreaFromWidthHeight"
+ />
+ </el-form-item>
+ </el-col>
+ <el-col :span="8">
+ <el-form-item label="鍛ㄩ暱(cm)锛�" prop="perimeter">
+ <el-input-number
+ v-model="productForm.perimeter"
+ :min="0"
+ :step="0.01"
+ :precision="2"
+ style="width: 100%"
+ placeholder="璇疯緭鍏�"
+ clearable
+ :disabled="true"
+ />
+ </el-form-item>
+ </el-col>
+ </el-row>
+
+ <!-- 姣忚涓変釜锛氬疄闄呭崟鐗囬潰绉�/瀹為檯鎬婚潰绉�/缁撶畻鍗曠墖闈㈢Н -->
+ <el-row :gutter="30">
+ <el-col :span="8">
+ <el-form-item label="瀹為檯鍗曠墖闈㈢Н(銕�)锛�" prop="actualPieceArea">
+ <el-input-number
+ v-model="productForm.actualPieceArea"
+ :min="0"
+ :step="0.00001"
+ :precision="5"
+ style="width: 100%"
+ placeholder="璇疯緭鍏�"
+ clearable
+ @change="recalcAreaTotals"
+ />
+ </el-form-item>
+ </el-col>
+ <el-col :span="8">
+ <el-form-item label="瀹為檯鎬婚潰绉�(銕�)锛�" prop="actualTotalArea">
+ <el-input-number
+ v-model="productForm.actualTotalArea"
+ :min="0"
+ :step="0.00001"
+ :precision="5"
+ style="width: 100%"
+ placeholder="璇疯緭鍏�"
+ clearable
+ />
+ </el-form-item>
+ </el-col>
+ <el-col :span="8">
+ <el-form-item label="缁撶畻鍗曠墖闈㈢Н(銕�)锛�" prop="settlePieceArea">
+ <el-input-number
+ v-model="productForm.settlePieceArea"
+ :min="0"
+ :step="0.00001"
+ :precision="5"
+ style="width: 100%"
+ placeholder="璇疯緭鍏�"
+ clearable
+ @change="() => { recalcAreaTotals(); calculateFromUnitPrice(true); }"
+ />
+ </el-form-item>
+ </el-col>
+ <el-col :span="8">
+ <el-form-item label="缁撶畻鎬婚潰绉�(銕�)锛�" prop="settleTotalArea">
+ <el-input-number
+ v-model="productForm.settleTotalArea"
+ :min="0"
+ :step="0.00001"
+ :precision="5"
+ style="width: 100%"
+ placeholder="璇疯緭鍏�"
+ clearable
+ />
+ </el-form-item>
+ </el-col>
+ <el-col :span="8">
+ <el-form-item label="缁撶畻鎬婚潰绉�(銕�)锛�" prop="settleTotalArea">
+ <el-input-number
+ v-model="productForm.settleTotalArea"
+ :min="0"
+ :step="0.00001"
+ :precision="5"
+ style="width: 100%"
+ placeholder="璇疯緭鍏�"
+ clearable
+ />
+ </el-form-item>
+ </el-col>
+ <el-col :span="8">
+ <el-form-item label="閲嶇锛�" prop="heavyBox">
+ <el-input v-model="productForm.heavyBox" placeholder="璇疯緭鍏�" clearable @change="calculateFromExclusiveTotalPrice" />
+ </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">
+ <el-form-item label="鍔犲伐瑕佹眰锛�" prop="processRequirement">
+ <el-input v-model="productForm.processRequirement" placeholder="璇疯緭鍏ュ姞宸ヨ姹�" clearable />
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="澶囨敞锛�" prop="remark">
+ <el-input v-model="productForm.remark" placeholder="璇疯緭鍏ュ娉�" clearable />
+ </el-form-item>
+ </el-col>
+ </el-row>
+
+ <el-row :gutter="30">
+ <el-col :span="24">
+ <el-form-item>
+ <template #label>
+ <div style="display:flex; align-items:center; gap: 12px; width: 100%;">
+ <div style="font-weight: 600; color: #303133;">鍏朵粬閲戦锛�</div>
+ <div style="color:#909399; font-size: 13px; flex: 1;">
+ 宸查�夋嫨 {{ productForm?.salesProductProcessList?.length || 0 }} 椤�
+ </div>
+ <el-button
+ v-if="operationType !== 'view'"
+ type="primary"
+ plain
+ size="small"
+ @click="startAddOtherAmount"
+ >
+ 鏂板
+ </el-button>
+ </div>
+ </template>
+
+ <div style="display:flex; flex-direction:column; gap: 12px;">
+ <div v-if="Array.isArray(productForm?.salesProductProcessList) && productForm.salesProductProcessList.length > 0"
+ style="display:flex; flex-wrap:wrap; gap: 12px; align-items:flex-start;"
+ >
+ <div
+ v-for="(item, index) in productForm.salesProductProcessList"
+ :key="String(item.id) + '_' + index"
+ style="display:flex; gap: 10px; align-items:center; padding: 10px 12px; border: 1px solid #ebeef5; border-radius: 8px; box-sizing:border-box; min-width: 0;"
+ :style="getOtherAmountCardFlexStyle()"
+ >
+ <div style="flex: 1; min-width: 0;">
+ <el-tag type="info" style="width: 100%; overflow:hidden; text-overflow:ellipsis; white-space:nowrap;">
+ {{ item.processName }}
+ </el-tag>
+ </div>
+ <div style="flex: 1;">
+ <el-input-number
+ v-model="item.quantity"
+ :min="0"
+ :step="1"
+ :precision="0"
+ style="width: 100%;"
+ placeholder="璇疯緭鍏ユ暟閲�"
+ :disabled="operationType === 'view'"
+ @change="calculateFromUnitPrice(true)"
+ />
+ </div>
+ <el-button
+ v-if="operationType !== 'view'"
+ type="danger"
+ link
+ size="small"
+ @click="removeOtherAmountAt(index)"
+ >
+ 鍒犻櫎
+ </el-button>
+ </div>
+ </div>
+
+ <div v-else style="color:#909399; font-size: 13px;">
+ 鏆傛棤鍏朵粬閲戦
+ </div>
+ </div>
+ </el-form-item>
+ </el-col>
+ </el-row>
</el-form>
</FormDialog>
+ <!-- 鍏朵粬閲戦锛氭柊澧炲脊妗� -->
+ <el-dialog
+ v-model="otherAmountAddDialogVisible"
+ title="鏂板鍏朵粬閲戦"
+ width="520px"
+ :close-on-click-modal="false"
+ >
+ <div style="padding: 4px 0 10px;">
+ <div style="font-size: 14px; color: #606266; margin-bottom: 10px;">
+ 璇烽�夋嫨瑕佹柊澧炵殑鍏朵粬閲戦椤圭洰
+ </div>
+ <el-select
+ v-model="otherAmountAddId"
+ filterable
+ clearable
+ placeholder="璇烽�夋嫨鍏朵粬閲戦椤圭洰"
+ style="width: 100%;"
+ :disabled="operationType === 'view'"
+ >
+ <el-option
+ v-for="item in otherAmountSelectOptions"
+ :key="item.id"
+ :label="item.processName"
+ :value="item.id"
+ />
+ </el-select>
+ </div>
+ <template #footer>
+ <el-button @click="cancelAddOtherAmount">鍙栨秷</el-button>
+ <el-button
+ type="primary"
+ @click="confirmAddOtherAmount"
+ :disabled="operationType === 'view' || otherAmountAddId === null || otherAmountAddId === undefined || otherAmountAddId === ''"
+ >
+ 纭娣诲姞
+ </el-button>
+ </template>
+ </el-dialog>
+
<!-- 瀵煎叆寮圭獥 -->
<FormDialog
v-model="importUpload.open"
@@ -448,123 +830,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="company-name">榧庤瘹鐟炲疄涓氭湁闄愯矗浠诲叕鍙�</div>
- <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"
@@ -622,7 +887,6 @@
<div>
<el-button
type="danger"
- size="small"
@click="removeApproverNode(index)"
v-if="approverNodes.length > 1"
>鍒犻櫎</el-button>
@@ -640,6 +904,7 @@
</div>
</template>
</el-dialog>
+
</div>
</template>
@@ -649,11 +914,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,
@@ -664,12 +932,25 @@
delLedger,
addOrUpdateSalesLedgerProduct,
delProduct,
- delLedgerFile, getProductInventory,
+ delLedgerFile,
+ getProductInventory,
+ salesLedgerProductProcessList,
+ 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();
@@ -688,6 +969,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("");
@@ -730,13 +1018,27 @@
productForm: {
productCategory: "",
specificationModel: "",
- unit: "",
+ thickness:null,
quantity: "",
taxInclusiveUnitPrice: "",
taxRate: "",
taxInclusiveTotalPrice: "",
taxExclusiveTotalPrice: "",
invoiceType: "",
+ // 鏂板锛氬昂瀵�/闈㈢Н/鍔犲伐涓庡叾浠栭噾棰�
+ width: 0, // 瀹�(mm)
+ height: 0, // 楂�(mm)
+ perimeter: 0, // 鍛ㄩ暱(cm) = (瀹�+楂�)*2锛屽楂樹负 mm
+ // 闈㈢Н瀛楁锛堛帯锛�
+ actualPieceArea: 0, // 瀹為檯鍗曠墖闈㈢Н(銕�)
+ actualTotalArea: 0, // 瀹為檯鎬婚潰绉�(銕�)
+ settlePieceArea: 0, // 缁撶畻鍗曠墖闈㈢Н(銕�)
+ settleTotalArea: 0, // 缁撶畻鎬婚潰绉�(銕�)
+ processRequirement: "", // 鍔犲伐瑕佹眰
+ remark: "", // 澶囨敞
+ salesProductProcessList: [], // 鍏朵粬閲戦锛歔{id, processName, quantity}]
+ processFlowConfigId: null, // 宸ヨ壓娴佺▼閰嶇疆缁戝畾
+ floorCode: "", // 妤煎眰缂栧彿
},
productRules: {
productCategory: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
@@ -744,7 +1046,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" },
@@ -768,10 +1070,6 @@
// 璁剧疆涓婁紶鐨勮姹傚ご閮�
headers: { Authorization: "Bearer " + getToken() },
});
-// 鎵撳嵃鐩稿叧
-const printPreviewVisible = ref(false);
-const printData = ref([]);
-
// 鎶ヤ环鍗曞鍏ョ浉鍏�
const quotationDialogVisible = ref(false);
const quotationLoading = ref(false);
@@ -780,22 +1078,196 @@
quotationNo: "",
customer: "",
});
+// 鎶ヤ环鍗曞脊妗嗗垎椤�
+const quotationPage = reactive({
+ current: 1,
+ size: 10,
+ total: 0,
+});
const selectedQuotation = ref(null);
// 鍙戣揣鐩稿叧
const deliveryFormVisible = ref(false);
-const currentDeliveryRow = ref(null);
+const currentDeliveryRows = ref([]);
const deliveryFormData = reactive({
deliveryForm: {
type: "璐ц溅", // 璐ц溅, 蹇��
},
deliveryRules: {
- type: [
+ type: [
{ required: true, message: "璇烽�夋嫨鍙戣揣绫诲瀷", trigger: "change" }
]
},
});
const { deliveryForm, deliveryRules } = toRefs(deliveryFormData);
+
+// 浜у搧寮规锛氬叾浠栭噾棰濆閫変笅鎷夛紙鍩轰簬鈥滃叾浠栭噾棰濈淮鎶も�濇煡璇㈡帴鍙ｏ級
+const otherAmountSelectOptions = ref([]); // [{id, processName}]
+const otherAmountSelectOptionsLoading = ref(false);
+
+const fetchOtherAmountSelectOptions = async (force = false) => {
+ if (!force && otherAmountSelectOptions.value.length > 0) return;
+ otherAmountSelectOptionsLoading.value = true;
+ try {
+ const params = {
+ current: 1,
+ // 涓嬫媺妗嗗敖閲忎竴娆℃�ф媺鍏紝閬垮厤澶氭鍒嗛〉褰卞搷閫夋嫨浣撻獙
+ size: 1000,
+ };
+ const res = await salesLedgerProductProcessList(params);
+ const records = res?.records ?? res?.data?.records ?? [];
+
+ otherAmountSelectOptions.value = records.map((item) => ({
+ id: item.id,
+ processName: item.processName ?? "",
+ unitPrice: item.unitPrice ?? 0,
+ }));
+ } finally {
+ otherAmountSelectOptionsLoading.value = false;
+ }
+};
+
+const normalizeOtherAmountsFromRow = (row) => {
+ if (!row) return [];
+ const raw =
+ row.other_amounts ??
+ row.otherAmounts ??
+ row.otherAmountProjects ??
+ row.otherAmountList ??
+ row.salesProductProcessList ??
+ [];
+
+ if (!Array.isArray(raw)) return [];
+ if (raw.length === 0) return [];
+
+ // 鎯呭喌1锛氬悗绔洿鎺ヨ繑鍥� [{id, processName}...]
+ if (typeof raw[0] === "object") {
+ return raw
+ .map((it) => {
+ const id = it?.id ?? it?.processId ?? it?.otherAmountId ?? null;
+ const quantity =
+ Number(
+ it?.quantity ??
+ it?.processQuantity ??
+ it?.otherQuantity ??
+ it?.process_quantity ??
+ it?.other_amount_quantity
+ ) || 0;
+ return {
+ id,
+ processName: it?.processName ?? "",
+ quantity,
+ };
+ })
+ .filter((it) => it.id !== null && it.id !== undefined && it.id !== "");
+ }
+
+ // 鎯呭喌2锛氬悗绔彧杩斿洖 ids: [1,2,3]
+ return raw
+ .map((id) => ({
+ id,
+ processName: "",
+ quantity: 0,
+ }))
+ .filter((it) => it.id !== null && it.id !== undefined && it.id !== "");
+};
+
+const mergeOtherAmountOptionsBySelection = (selected) => {
+ const list = Array.isArray(selected) ? selected : [];
+ for (const s of list) {
+ const exists = otherAmountSelectOptions.value.some((o) => String(o.id) === String(s.id));
+ if (!exists) {
+ otherAmountSelectOptions.value.push({
+ id: s.id,
+ processName: s.processName ?? "",
+ });
+ }
+ }
+};
+
+const fillOtherAmountProcessName = (selected) => {
+ const list = Array.isArray(selected) ? selected : [];
+ return list.map((s) => {
+ const opt = otherAmountSelectOptions.value.find((o) => String(o.id) === String(s.id));
+ return {
+ id: s.id,
+ processName: opt?.processName ?? s.processName ?? "",
+ unitPrice: opt?.unitPrice ?? s.unitPrice ?? 0,
+ quantity: Number(s.quantity ?? 0) || 0,
+ };
+ });
+};
+
+// 鈥滃叾浠栭噾棰濃�濆崱鐗囧竷灞�锛氬彧鏈変竴鏉℃椂鍗犳弧鏁磋锛�>=2鏃朵袱鍒楁帓甯�
+const getOtherAmountCardFlexStyle = () => {
+ const list = productForm.value?.salesProductProcessList;
+ const len = Array.isArray(list) ? list.length : 0;
+ if (len === 1) {
+ return { flex: "0 0 100%", maxWidth: "100%", width: "100%" };
+ }
+ return {
+ flex: "0 0 calc(50% - 6px)",
+ maxWidth: "calc(50% - 6px)",
+ width: "calc(50% - 6px)",
+ };
+};
+
+// 鍏朵粬閲戦锛氱偣鍑烩�滄柊澧炩�濆悗鍦ㄥ脊绐楅噷閫夋嫨涓�涓」鐩�
+const otherAmountAddDialogVisible = ref(false);
+const otherAmountAddId = ref(null);
+
+const startAddOtherAmount = () => {
+ if (operationType.value === "view") return;
+ otherAmountAddDialogVisible.value = true;
+ otherAmountAddId.value = null;
+ // 閫氬父 openProductForm 宸茬粡鎷夎繃 options锛岃繖閲屽厹搴�
+ if (otherAmountSelectOptions.value.length === 0) {
+ fetchOtherAmountSelectOptions(true);
+ }
+};
+
+const cancelAddOtherAmount = () => {
+ otherAmountAddDialogVisible.value = false;
+ otherAmountAddId.value = null;
+};
+
+const handleOtherAmountSelected = (id) => {
+ const selectedId = id ?? otherAmountAddId.value;
+ if (selectedId === null || selectedId === undefined || selectedId === "") return;
+ const opt = otherAmountSelectOptions.value.find((o) => String(o.id) === String(selectedId));
+ if (!opt) return;
+
+ const exists = (productForm.value?.salesProductProcessList ?? []).some(
+ (it) => String(it?.id) === String(opt.id)
+ );
+ if (exists) {
+ proxy.$modal.msgWarning("璇ュ叾浠栭噾棰濋」鐩凡娣诲姞");
+ return;
+ }
+
+ productForm.value.salesProductProcessList.push({
+ id: opt.id,
+ processName: opt.processName,
+ unitPrice: opt.unitPrice ?? 0,
+ quantity: 0,
+ });
+ calculateFromUnitPrice(true);
+
+ // 閫夋嫨瀹屾垚鍚庡叧闂脊绐楋紝涓嬩竴娆″彲鍐嶆鐐瑰嚮鈥滄柊澧炩�濈户缁坊鍔�
+ otherAmountAddDialogVisible.value = false;
+ otherAmountAddId.value = null;
+};
+
+const confirmAddOtherAmount = () => {
+ handleOtherAmountSelected(otherAmountAddId.value);
+};
+
+const removeOtherAmountAt = (index) => {
+ if (operationType.value === "view") return;
+ if (!Array.isArray(productForm.value?.salesProductProcessList)) return;
+ productForm.value.salesProductProcessList.splice(index, 1);
+ calculateFromUnitPrice(true);
+};
// 鍙戣揣瀹℃壒浜鸿妭鐐癸紙浠垮崗鍚屽鎵� infoFormDia.vue锛�
const approverNodes = ref([{ id: 1, userId: null }]);
@@ -903,6 +1375,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锛屼究浜庡湪缂栬緫浜у搧鏃剁瓑寰呭姞杞藉畬鎴�
@@ -925,10 +1477,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) => {
@@ -1004,8 +1554,10 @@
// 娣诲姞琛ㄨ绫诲悕鏂规硶
const tableRowClassName = ({ row }) => {
- const diff = row.deliveryDaysDiff;
+ if (!row.deliveryDate) return '';
+ if (row.isFh) return '';
+ const diff = row.deliveryDaysDiff;
if (diff === 15) {
return 'yellow';
} else if (diff === 10) {
@@ -1049,11 +1601,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;
});
@@ -1072,6 +1627,8 @@
const openQuotationDialog = async () => {
if (operationType.value === "view") return;
quotationDialogVisible.value = true;
+ // 鎵撳紑寮圭獥鏃堕噸缃垎椤靛埌绗竴椤�
+ quotationPage.current = 1;
// 鍏堢‘淇濆鎴峰垪琛ㄥ凡鍔犺浇锛屼究浜庡悗缁洖濉� customerId
if (!customerOption.value || customerOption.value.length === 0) {
try {
@@ -1088,14 +1645,15 @@
quotationLoading.value = true;
try {
const params = {
- // 鍏煎鍚庣鍒嗛〉瀛楁锛氳繖閲屾部鐢ㄦ姤浠烽〉闈㈠凡鏈夊彲鐢ㄧ殑瀛楁鍛藉悕
- currentPage: 1,
- pageSize: 100,
+ // 鍚庣鍒嗛〉瀛楁锛歝urrent / size
+ current: quotationPage.current,
+ size: quotationPage.size,
...quotationSearchForm,
status: "閫氳繃",
};
const res = await getQuotationList(params);
quotationList.value = res?.data?.records || [];
+ quotationPage.total = res?.data?.total || 0;
} finally {
quotationLoading.value = false;
}
@@ -1104,7 +1662,15 @@
const resetQuotationSearch = async () => {
quotationSearchForm.quotationNo = "";
quotationSearchForm.customer = "";
+ quotationPage.current = 1;
await fetchQuotationList();
+};
+
+// 鎶ヤ环鍗曞脊妗嗗垎椤靛垏鎹�
+const quotationPaginationChange = (obj) => {
+ quotationPage.current = obj.page;
+ quotationPage.size = obj.limit;
+ fetchQuotationList();
};
// 閫変腑鎶ヤ环鍗曞悗鍥炲～鍒板彴璐﹁〃鍗�
@@ -1133,20 +1699,32 @@
productData.value = products.map((p) => {
const quantity = Number(p.quantity ?? 0) || 0;
const unitPrice = Number(p.unitPrice ?? 0) || 0;
+ const settlePieceArea = Number(p.settlePieceArea ?? 0) || 1;
const taxRate = "13"; // 榛樿 13%锛屼究浜庣洿鎺ユ彁浜わ紙濡傞渶鍙湪浜у搧涓嚜琛屼慨鏀癸級
- const taxInclusiveTotalPrice = (unitPrice * quantity).toFixed(2);
+ const taxInclusiveTotalPrice = (unitPrice * settlePieceArea * quantity).toFixed(2);
const taxExclusiveTotalPrice = proxy.calculateTaxExclusiveTotalPrice(taxInclusiveTotalPrice, taxRate);
return {
// 鍙拌处瀛楁
productCategory: p.product || p.productName || "",
specificationModel: p.specification || "",
- unit: p.unit || "",
+ thickness: p.thickness,
quantity: quantity,
taxRate: taxRate,
taxInclusiveUnitPrice: unitPrice.toFixed(2),
taxInclusiveTotalPrice: taxInclusiveTotalPrice,
taxExclusiveTotalPrice: taxExclusiveTotalPrice,
invoiceType: "澧炴櫘绁�",
+ // 鏂板锛氶粯璁ゅ�硷紙閬垮厤鍚庣画鎻愪氦鏃跺瓧娈电己澶憋級
+ width: 0,
+ height: 0,
+ actualPieceArea: 0,
+ actualTotalArea: 0,
+ settlePieceArea: 0,
+ settleTotalArea: 0,
+ processRequirement: "",
+ floorCode: "",
+ remark: "",
+ salesProductProcessList: [],
};
});
@@ -1234,8 +1812,36 @@
productOperationType.value = type;
productForm.value = {};
proxy.resetForm("productFormRef");
+ // 纭繚澶氶�夐」榛樿鏄暟缁勶紝閬垮厤 el-select multiple 鎶ラ敊
+ productForm.value.salesProductProcessList = [];
+ otherAmountAddDialogVisible.value = false;
+ otherAmountAddId.value = null;
if (type === "edit") {
productForm.value = { ...row };
+
+ // 瀛楁鍛藉悕鍏煎锛氫紭鍏堥┘宄帮紙濡� actualPieceArea锛夛紝鍏煎鍚庣鍙兘杩斿洖涓嬪垝绾匡紙濡� actual_piece_area锛�
+ productForm.value.actualPieceArea = row?.actualPieceArea ?? row?.actual_piece_area ?? 0;
+ productForm.value.actualTotalArea = row?.actualTotalArea ?? row?.actual_total_area ?? 0;
+ productForm.value.settlePieceArea = row?.settlePieceArea ?? row?.settle_piece_area ?? 0;
+ productForm.value.settleTotalArea = row?.settleTotalArea ?? row?.settle_total_area ?? 0;
+
+ // 鍔犲伐瑕佹眰/澶囨敞鍏煎锛氬悗绔彲鑳戒娇鐢ㄥ叾瀹冨懡鍚�
+ 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;
// 缂栬緫鏃舵牴鎹骇鍝佸ぇ绫诲悕绉板弽鏌� tree 鑺傜偣 id锛屽苟鍔犺浇瑙勬牸鍨嬪彿鍒楄〃
try {
@@ -1258,8 +1864,19 @@
// 鍔犺浇澶辫触鏃朵繚鎸佸彲缂栬緫锛屼笉涓柇寮圭獥
console.error("鍔犺浇浜у搧瑙勬牸鍨嬪彿澶辫触", e);
}
+
+ // 鏍规嵁褰撳墠瀹介珮閲嶆柊璁＄畻鍛ㄩ暱涓庨潰绉�
+ recalcPerimeterFromWidthHeight();
+ recalcAreaFromWidthHeight();
+
+ // 鍥炴樉鈥滃叾浠栭噾棰濃�濆閫夛細鍏堟媺鍙栦笅鎷夐�夐」锛屽啀琛ラ綈 processName
+ await fetchOtherAmountSelectOptions(true);
+ mergeOtherAmountOptionsBySelection(productForm.value.salesProductProcessList);
+ productForm.value.salesProductProcessList = fillOtherAmountProcessName(productForm.value.salesProductProcessList);
} else {
getProductOptions()
+ // 鏂板鏃朵笅鎷夐�夐」鍔犺浇涓�娆″嵆鍙�
+ fetchOtherAmountSelectOptions(true);
}
productFormVisible.value = true;
};
@@ -1267,6 +1884,26 @@
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锛�
+ productForm.value.salesProductProcessList = (Array.isArray(productForm.value.salesProductProcessList)
+ ? productForm.value.salesProductProcessList
+ : []
+ )
+ .map((it) => ({
+ id: it?.id,
+ processName: it?.processName ?? "",
+ unitPrice: Number(it?.unitPrice ?? 0) || 0,
+ quantity: Number(it?.quantity ?? 0) || 0,
+ }))
+ .filter((it) => it.id !== null && it.id !== undefined && it.id !== "");
+
if (operationType.value === "edit") {
submitProductEdit();
} else {
@@ -1344,6 +1981,8 @@
const closeProductDia = () => {
proxy.resetForm("productFormRef");
productFormVisible.value = false;
+ otherAmountAddDialogVisible.value = false;
+ otherAmountAddId.value = null;
};
// 瀵煎叆
const handleImport = () => {
@@ -1444,365 +2083,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="company-name">榧庤瘹鐟炲疄涓氭湁闄愯矗浠诲叕鍙�</div>
- <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 = () => {
@@ -1813,12 +2205,16 @@
if (!productForm.value.quantity) {
return;
}
- // 鍚◣鎬讳环璁＄畻
- productForm.value.taxInclusiveTotalPrice =
- proxy.calculateTaxIncludeTotalPrice(
- productForm.value.taxInclusiveUnitPrice,
- productForm.value.quantity
- );
+ const settlePieceArea = parseFloat(productForm.value.settlePieceArea) || 1;
+ // 鍚◣鎬讳环璁＄畻 = 鍗曚环 * 缁撶畻闈㈢Н * 鏁伴噺 + 鍏朵粬閲戦鎬诲拰
+ const basePrice = proxy.calculateTaxIncludeTotalPrice(
+ productForm.value.taxInclusiveUnitPrice * settlePieceArea,
+ productForm.value.quantity
+ );
+ const otherAmountTotal = (productForm.value.salesProductProcessList || []).reduce((total, item) => {
+ return total + (Number(item.unitPrice) || 0) * (Number(item.quantity) || 0);
+ }, 0);
+ productForm.value.taxInclusiveTotalPrice = (parseFloat(basePrice) + otherAmountTotal).toFixed(2);
if (productForm.value.taxRate) {
// 涓嶅惈绋庢�讳环璁＄畻
productForm.value.taxExclusiveTotalPrice =
@@ -1827,6 +2223,64 @@
productForm.value.taxRate
);
}
+};
+
+// 鏂板锛氬昂瀵�(瀹介珮)涓庨潰绉�(鍗曠墖/鎬昏)鑱斿姩
+const recalcAreaTotals = () => {
+ const qty = Number(productForm.value.quantity ?? 0) || 0;
+ const actualPiece = Number(productForm.value.actualPieceArea ?? 0) || 0;
+ const settlePiece = Number(productForm.value.settlePieceArea ?? 0) || 0;
+
+ productForm.value.actualTotalArea = Number((actualPiece * qty).toFixed(5));
+ productForm.value.settleTotalArea = Number((settlePiece * qty).toFixed(5));
+};
+
+// 鏂板锛氬懆闀�(cm)锛堥噸绠県eavyBox鍛ㄩ暱锛�
+// width/height 鍗曚綅涓� mm锛屽洜姝ゅ懆闀�(cm)闇�瑕侀櫎浠� 10
+const recalcPerimeterFromWidthHeight = () => {
+ const width = Number(productForm.value.width ?? 0) || 0;
+ const height = Number(productForm.value.height ?? 0) || 0;
+
+ if (width <= 0 || height <= 0) {
+ productForm.value.perimeter = 0;
+ return;
+ }
+
+ // 鍛ㄩ暱 = (瀹� + 楂�) * 2锛屽崟浣嶄粠 mm 杞负 cm锛�/10
+ productForm.value.perimeter = Number((((width + height) * 2) / 10).toFixed(2));
+};
+
+const recalcAreaFromWidthHeight = () => {
+ const width = Number(productForm.value.width ?? 0) || 0;
+ const height = Number(productForm.value.height ?? 0) || 0;
+
+ if (width <= 0 || height <= 0) {
+ // 瀹介珮涓虹┖/涓�0鏃讹紝鎶婂崟鐗囬潰绉笌鎬婚潰绉疆涓�0
+ productForm.value.actualPieceArea = 0;
+ productForm.value.actualTotalArea = 0;
+ productForm.value.perimeter = 0;
+
+ // 鍙湁鍦ㄧ粨绠楀崟鐗囬潰绉篃涓虹┖/涓�0鏃讹紝鎵嶅悓姝ョ疆0锛岄伩鍏嶈鐩栫敤鎴锋墜鍔ㄥ～鍐�
+ const settlePiece = Number(productForm.value.settlePieceArea ?? 0) || 0;
+ if (!settlePiece) {
+ productForm.value.settlePieceArea = 0;
+ }
+ productForm.value.settleTotalArea = Number(
+ ((Number(productForm.value.settlePieceArea ?? 0) || 0) * (Number(productForm.value.quantity ?? 0) || 0)).toFixed(5)
+ );
+ return;
+ }
+
+ const computedPieceArea = (width * height) / 1e6; // mm*mm -> 銕�
+ const computed = Number(computedPieceArea.toFixed(5));
+
+ productForm.value.actualPieceArea = computed;
+ productForm.value.settlePieceArea = computed;
+
+ recalcPerimeterFromWidthHeight();
+ recalcAreaTotals();
+ // 闈㈢Н鏇存柊鍚庯紝閲嶆柊璁＄畻鍚◣鎬讳环 = 鍗曚环 * 缁撶畻闈㈢Н * 鏁伴噺
+ calculateFromUnitPrice(true);
};
// 鏍规嵁鍚◣鎬讳环璁＄畻鍚◣鍗曚环鍜屾暟閲�
@@ -1842,8 +2296,12 @@
isCalculating.value = true;
- // 璁＄畻鍚◣鍗曚环 = 鍚◣鎬讳环 / 鏁伴噺
- productForm.value.taxInclusiveUnitPrice = (totalPrice / quantity).toFixed(2);
+ // 璁＄畻鍚◣鍗曚环 = (鍚◣鎬讳环 - 鍏朵粬閲戦鎬诲拰) / 鏁伴噺
+ const otherAmountTotal = (productForm.value.salesProductProcessList || []).reduce((total, item) => {
+ return total + (Number(item.unitPrice) || 0) * (Number(item.quantity) || 0);
+ }, 0);
+ const basePrice = totalPrice - otherAmountTotal;
+ productForm.value.taxInclusiveUnitPrice = (basePrice / quantity).toFixed(2);
// 濡傛灉鏈夌◣鐜囷紝璁＄畻涓嶅惈绋庢�讳环
if (productForm.value.taxRate) {
@@ -1880,8 +2338,12 @@
const inclusiveTotalPrice = exclusiveTotalPrice / (1 - taxRateDecimal);
productForm.value.taxInclusiveTotalPrice = inclusiveTotalPrice.toFixed(2);
- // 璁＄畻鍚◣鍗曚环 = 鍚◣鎬讳环 / 鏁伴噺
- productForm.value.taxInclusiveUnitPrice = (inclusiveTotalPrice / quantity).toFixed(2);
+ // 璁＄畻鍚◣鍗曚环 = (鍚◣鎬讳环 - 鍏朵粬閲戦鎬诲拰) / 鏁伴噺
+ const otherAmountTotal = (productForm.value.salesProductProcessList || []).reduce((total, item) => {
+ return total + (Number(item.unitPrice) || 0) * (Number(item.quantity) || 0);
+ }, 0);
+ const basePrice = inclusiveTotalPrice - otherAmountTotal;
+ productForm.value.taxInclusiveUnitPrice = (basePrice / quantity).toFixed(2);
isCalculating.value = false;
};
@@ -1893,19 +2355,24 @@
return;
}
if (isCalculating.value) return;
-
+
const quantity = parseFloat(productForm.value.quantity);
const unitPrice = parseFloat(productForm.value.taxInclusiveUnitPrice);
-
+ const settlePieceArea = parseFloat(productForm.value.settlePieceArea) || 1;
+
if (!quantity || quantity <= 0 || !unitPrice) {
return;
}
-
+
isCalculating.value = true;
-
- // 璁＄畻鍚◣鎬讳环
- productForm.value.taxInclusiveTotalPrice = (unitPrice * quantity).toFixed(2);
-
+
+ // 璁＄畻鍚◣鎬讳环 = 鍗曚环 * 缁撶畻闈㈢Н * 鏁伴噺 + 鍏朵粬閲戦鎬诲拰
+ const basePrice = unitPrice * settlePieceArea * quantity;
+ const otherAmountTotal = (productForm.value.salesProductProcessList || []).reduce((total, item) => {
+ return total + (Number(item.unitPrice) || 0) * (Number(item.quantity) || 0);
+ }, 0);
+ productForm.value.taxInclusiveTotalPrice = (basePrice + otherAmountTotal).toFixed(2);
+
// 濡傛灉鏈夌◣鐜囷紝璁＄畻涓嶅惈绋庢�讳环
if (productForm.value.taxRate) {
productForm.value.taxExclusiveTotalPrice =
@@ -1914,30 +2381,35 @@
productForm.value.taxRate
);
}
-
+
isCalculating.value = false;
};
// 鏍规嵁鍚◣鍗曚环鍙樺寲璁＄畻鎬讳环
-const calculateFromUnitPrice = () => {
+const calculateFromUnitPrice = (silent = false) => {
if (!productForm.value.taxRate) {
- proxy.$modal.msgWarning("璇峰厛閫夋嫨绋庣巼");
+ if (!silent) proxy.$modal.msgWarning("璇峰厛閫夋嫨绋庣巼");
return;
}
if (isCalculating.value) return;
-
+
const quantity = parseFloat(productForm.value.quantity);
const unitPrice = parseFloat(productForm.value.taxInclusiveUnitPrice);
-
+ const settlePieceArea = parseFloat(productForm.value.settlePieceArea) || 1;
+
if (!quantity || quantity <= 0 || !unitPrice) {
return;
}
-
+
isCalculating.value = true;
-
- // 璁＄畻鍚◣鎬讳环
- productForm.value.taxInclusiveTotalPrice = (unitPrice * quantity).toFixed(2);
-
+
+ // 璁＄畻鍚◣鎬讳环 = 鍗曚环 * 缁撶畻闈㈢Н * 鏁伴噺 + 鍏朵粬閲戦鎬诲拰
+ const basePrice = unitPrice * settlePieceArea * quantity;
+ const otherAmountTotal = (productForm.value.salesProductProcessList || []).reduce((total, item) => {
+ return total + (Number(item.unitPrice) || 0) * (Number(item.quantity) || 0);
+ }, 0);
+ productForm.value.taxInclusiveTotalPrice = (basePrice + otherAmountTotal).toFixed(2);
+
// 濡傛灉鏈夌◣鐜囷紝璁＄畻涓嶅惈绋庢�讳环
if (productForm.value.taxRate) {
productForm.value.taxExclusiveTotalPrice =
@@ -1946,7 +2418,7 @@
productForm.value.taxRate
);
}
-
+
isCalculating.value = false;
};
@@ -2062,6 +2534,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();
+ }
+};
+
/**
* 涓嬭浇鏂囦欢
*
@@ -2085,7 +2623,7 @@
return;
}
- currentDeliveryRow.value = row;
+ currentDeliveryRows.value = [row];
deliveryForm.value = {
type: "璐ц溅",
};
@@ -2108,13 +2646,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();
@@ -2122,8 +2675,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) {
@@ -2132,12 +2684,14 @@
});
});
Promise.all(loadPromises).then(() => {
- // 鎭㈠灞曞紑鐘舵��
expandedRowKeys.value = currentExpandedKeys;
});
}
});
})
+ .catch(() => {
+ proxy.$modal.msgError("鍙戣揣澶辫触锛岃绋嶅悗閲嶈瘯");
+ });
}
});
};
@@ -2146,7 +2700,7 @@
const closeDeliveryDia = () => {
proxy.resetForm("deliveryFormRef");
deliveryFormVisible.value = false;
- currentDeliveryRow.value = null;
+ currentDeliveryRows.value = [];
};
const currentFactoryName = ref("");
const getCurrentFactoryName = async () => {
@@ -2183,6 +2737,17 @@
background-color: #F4DEFA;
}
+.other-amount-select {
+ /* 澶氶�夋爣绛惧尯鍩熷己鍒跺崟琛岋紝涓嶈杈撳叆妗嗛殢鏍囩鎹㈣鑰屾媺楂橀珮搴� */
+ :deep .el-select__tags {
+ display: flex;
+ flex-wrap: nowrap !important;
+ white-space: nowrap;
+ overflow: hidden;
+ max-height: 32px;
+ }
+}
+
.table_list {
margin-top: unset;
}
@@ -2191,171 +2756,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