From 40c1138a3fc7ea11536a661f543a55c30be24382 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期一, 02 十一月 2026 16:51:25 +0800
Subject: [PATCH] feat(costStatistics): - 新增全局汇总信息,展示筛选结果条数与全部费用合计 - 保存费用后自动刷新数据并同步已勾选行状态
---
src/components/Table/lims-table.vue | 12 +
src/views/CNAS/systemManagement/customerSatisfaction/index.vue | 206 ++-------------------------------
src/utils/orderRates.js | 10 +
src/views/business/costStatistics/index.vue | 127 +++++++++++++++------
src/api/business/insOrderRates.js | 4
5 files changed, 132 insertions(+), 227 deletions(-)
diff --git a/src/api/business/insOrderRates.js b/src/api/business/insOrderRates.js
index 566b8f9..24506c9 100644
--- a/src/api/business/insOrderRates.js
+++ b/src/api/business/insOrderRates.js
@@ -1,6 +1,10 @@
// 璐圭敤缁熻椤甸潰鐩稿叧鎺ュ彛
import request from '@/utils/request'
+export function selectRatesSummary(query) {
+ return request({ url: '/insOrderRates/selectRatesSummary', method: 'get', params: query })
+}
+
// 鏌ヨ璁㈠崟鍒楄〃
export function selectRatesPage(query) {
return request({
diff --git a/src/components/Table/lims-table.vue b/src/components/Table/lims-table.vue
index 946cca8..cd1b02c 100644
--- a/src/components/Table/lims-table.vue
+++ b/src/components/Table/lims-table.vue
@@ -20,7 +20,7 @@
@current-change="currentChange"
@selection-change="handleSelectionChange"
>
- <el-table-column v-if="isSelection" align="center" type="selection" width="55" />
+ <el-table-column v-if="isSelection" align="center" type="selection" width="55" :reserve-selection="reserveSelection" />
<el-table-column align="center" label="搴忓彿" type="index" width="60" :index="indexMethod" />
<el-table-column
@@ -122,6 +122,10 @@
const props = defineProps({
isSelection: {
+ type: Boolean,
+ default: false
+ },
+ reserveSelection: {
type: Boolean,
default: false
},
@@ -268,7 +272,11 @@
})
})
-defineExpose({ setCurrent })
+function clearSelection() {
+ multipleTable.value?.clearSelection()
+}
+
+defineExpose({ setCurrent, clearSelection })
</script>
<style scoped>
diff --git a/src/utils/orderRates.js b/src/utils/orderRates.js
new file mode 100644
index 0000000..3322521
--- /dev/null
+++ b/src/utils/orderRates.js
@@ -0,0 +1,10 @@
+import Big from 'big.js'
+
+export function orderAmount(row) {
+ return new Big(Number(row.isDiscount) === 1 && row.discountAmount != null && row.discountAmount !== ''
+ ? row.discountAmount : (row.totalPrice || 0))
+}
+
+export function sumOrderAmounts(rows) {
+ return rows.reduce((total, row) => total.plus(orderAmount(row)), new Big(0)).toFixed(2)
+}
diff --git a/src/views/CNAS/systemManagement/customerSatisfaction/index.vue b/src/views/CNAS/systemManagement/customerSatisfaction/index.vue
index 200c674..89413b8 100644
--- a/src/views/CNAS/systemManagement/customerSatisfaction/index.vue
+++ b/src/views/CNAS/systemManagement/customerSatisfaction/index.vue
@@ -4,11 +4,8 @@
<div class="search">
<div>
<el-form :model="searchForm" ref="searchForm" size="small" :inline="true">
- <el-form-item label="瀹㈡埛鍚嶇О" prop="unitName" v-if="tabIndex === '0'">
+ <el-form-item label="瀹㈡埛鍚嶇О" prop="unitName">
<el-input v-model="searchForm.unitName" clearable size="small"></el-input>
- </el-form-item>
- <el-form-item label="鏂囦欢鍚嶇О" prop="fileName" v-if="tabIndex === '1'">
- <el-input v-model="searchForm1.fileName" clearable size="small"></el-input>
</el-form-item>
<el-form-item>
<el-button type="primary" size="small" @click="searchList">鏌ヨ</el-button>
@@ -17,39 +14,17 @@
</el-form>
</div>
<div>
- <el-button v-if="tabIndex === '0'" size="small" type="primary" @click="openFormDia('add')">鏂� 澧�</el-button>
- <el-button v-if="tabIndex === '0'" size="small" type="primary" @click="openExportDialog">瀵� 鍑�</el-button>
- <el-upload v-if="tabIndex === '1'" ref='upload' :action="action" :before-upload="beforeUpload"
- :headers="uploadHeader" :on-error="onError" :on-success="handleSuccessUp" :show-file-list="false"
- accept='.jpg,.jpeg,.png,.gif,.doc,.docx,.xls,.xlsx,.ppt,.pptx,.pdf,.zip,.rar'>
- <el-button :loading="upLoading" size="small" type="primary">瀵煎叆</el-button>
- </el-upload>
+ <el-button size="small" type="primary" @click="openFormDia('add')">鏂� 澧�</el-button>
+ <el-button size="small" type="primary" @click="openExportDialog">瀵� 鍑�</el-button>
</div>
</div>
<div class="table">
- <div class="table-tab">
- <el-radio-group v-model="tabIndex" @change="searchList" size="small">
- <el-radio-button value="0">瀹㈡埛婊℃剰搴�</el-radio-button>
- <el-radio-button value="1">缁煎悎鍒嗘瀽</el-radio-button>
- </el-radio-group>
- </div>
- <div v-if="tabIndex === '0'">
- <limsTable :column="tableColumn" :height="'calc(100vh - 22em)'" :table-data="tableData"
- :table-loading="tableLoading" @pagination="pagination"
- :page="page">
- </limsTable>
- </div>
- <div v-if="tabIndex === '1'">
- <limsTable :column="tableColumn1" :height="'calc(100vh - 22em)'" :table-data="tableData1"
- :table-loading="tableLoading1" @pagination="pagination0">
- </limsTable>
- </div>
+ <limsTable :column="tableColumn" :height="'calc(100vh - 22em)'" :table-data="tableData"
+ :table-loading="tableLoading" @pagination="pagination"
+ :page="page">
+ </limsTable>
</div>
</div>
- <el-dialog v-model="lookDialogVisible" fullscreen title="鏌ョ湅闄勪欢" top="5vh" width="800px">
- <filePreview v-if="lookDialogVisible" :currentFile="{}" :fileUrl="javaApi + '/word/' + currentInfo.fileUrl"
- style="height: 90vh;overflow-y: auto;" />
- </el-dialog>
<el-dialog v-model="exportDialogVisible" title="瀵煎嚭骞村害姹囨��" width="360px" :close-on-click-modal="false">
<el-form label-width="80px">
<el-form-item label="姹囨�诲勾搴�">
@@ -72,30 +47,23 @@
<script>
import limsTable from "@/components/Table/lims-table.vue";
import FormDialog from './components/formDialog.vue';
-import filePreview from '@/components/Preview/filePreview.vue'
import limsAttachment from '@/components/Attachment/lims-attachment.vue'
import {
pageClientSatisfaction,
- pageAnalyseFile,
delClientSatisfaction,
- delAnalyseFile,
exportAnnualSummary,
} from '@/api/cnas/systemManagement/customerSatisfaction.js'
export default {
name: 'CustomerSatisfaction',
// import 寮曞叆鐨勭粍浠堕渶瑕佹敞鍏ュ埌瀵硅薄涓墠鑳戒娇鐢�
- components: { filePreview, FormDialog, limsTable, limsAttachment },
+ components: { FormDialog, limsTable, limsAttachment },
data() {
// 杩欓噷瀛樻斁鏁版嵁
return {
searchForm: {
unitName: '',
},
- searchForm1: {
- fileName: '',
- },
- tabIndex: '0',
tableColumn: [
{
label: '瀹㈡埛鍚嶇О',
@@ -192,62 +160,7 @@
current: 1,
total: 0,
},
- tableColumn1: [
- {
- label: '闄勪欢鍚嶇О',
- prop: 'fileName',
- minWidth: '100'
- },
- {
- label: '鍒涘缓浜�',
- prop: 'userName',
- minWidth: '100'
- },
- {
- label: '鍒涘缓鏃堕棿',
- prop: 'createTime',
- minWidth: '100'
- },
- {
- dataType: 'action',
- label: '鎿嶄綔',
- operation: [
- {
- name: '棰勮',
- type: 'text',
- clickFun: (row) => {
- this.handleLook(row)
- }
- },
- {
- name: '涓嬭浇',
- type: 'text',
- clickFun: (row) => {
- this.upload(row);
- },
- },
- {
- name: '鍒犻櫎',
- type: 'text',
- color: 'var(--el-color-danger)',
- clickFun: (row) => {
- this.delFile(row)
- }
- }
- ]
- }
- ],
- tableData1: [],
- tableLoading1: false,
- page1: {
- size: 20,
- current: 1,
- total: 0,
- },
formDialog: false,
- upLoading: false,
- currentInfo: {},
- lookDialogVisible: false,
exportDialogVisible: false,
exportYear: String(new Date().getFullYear()),
exportLoading: false,
@@ -260,29 +173,15 @@
methods: {
// 鏌ヨ鍒楄〃
searchList() {
- const entity = this.tabIndex === '0' ? this.searchForm : this.searchForm1
- const page = this.tabIndex === '0' ? this.page : this.page1
- if (this.tabIndex === '0') {
- this.tableLoading = true
- pageClientSatisfaction({ ...entity, ...page }).then(res => {
- this.tableLoading = false
- this.tableData = res.data.records
- this.page.total = res.data.total
- }).catch(err => {
- console.log('err---', err);
- this.tableLoading = false
- })
- } else {
- this.tableLoading1 = true
- pageAnalyseFile({ ...entity, ...page }).then(res => {
- this.tableLoading1 = false
- this.tableData1 = res.data.records
- this.page1.total = res.data.total
- }).catch(err => {
- console.log('err---', err);
- this.tableLoading1 = false
- })
- }
+ this.tableLoading = true
+ pageClientSatisfaction({ ...this.searchForm, ...this.page }).then(res => {
+ this.tableLoading = false
+ this.tableData = res.data.records
+ this.page.total = res.data.total
+ }).catch(err => {
+ console.log('err---', err);
+ this.tableLoading = false
+ })
},
openFormDia(type, row) {
this.formDialog = true
@@ -333,30 +232,7 @@
// 閲嶇疆鏌ヨ鏉′欢
resetSearchForm() {
this.searchForm.unitName = '';
- this.searchForm1.fileName = '';
this.searchList()
- },
- // 瀵煎叆娴佺▼
- beforeUpload(file) {
- if (file.size > 1024 * 1024 * 10) {
- this.$message.error('涓婁紶鏂囦欢涓嶈秴杩�10M');
- this.$refs.upload.clearFiles()
- return false;
- } else {
- this.upLoading = true;
- return true;
- }
- },
- onError(err, file, fileList) {
- this.$message.error('涓婁紶澶辫触')
- this.$refs.upload.clearFiles()
- },
- handleSuccessUp(response) {
- this.upLoading = false;
- if (response.code == 200) {
- this.$message.success('涓婁紶鎴愬姛');
- this.searchList()
- }
},
// 鍒犻櫎瀹㈡埛婊℃剰搴�
delPlan(row) {
@@ -381,56 +257,12 @@
});
});
},
- // 鏌ョ湅鏂囦欢
- handleLook(row) {
- this.currentInfo = row
- this.lookDialogVisible = true
- },
- // 涓嬭浇瀹㈡埛绂忓缓
- upload(row) {
- this.$download.saveAs(row.fileUrl, row.fileName);
- },
- // 鍒犻櫎瀹㈡埛鍒嗘瀽闄勪欢
- delFile(row) {
- this.$confirm('姝ゆ搷浣滃皢姘镐箙鍒犻櫎璇ユ暟鎹�, 鏄惁缁х画?', '鎻愮ず', {
- confirmButtonText: '纭畾',
- cancelButtonText: '鍙栨秷',
- type: 'warning'
- }).then(() => {
- this.tableLoading = true
- delAnalyseFile({ analyseFileId: row.analyseFileId }).then(res => {
- this.tableLoading = false
- this.$message.success('鍒犻櫎鎴愬姛')
- this.searchList()
- }).catch(err => {
- this.tableLoading = false
- console.log('err---', err);
- })
- }).catch(() => {
- this.$message({
- type: 'info',
- message: '宸插彇娑堝垹闄�'
- });
- });
- },
// 鍒嗛〉
pagination({ page, limit }) {
this.page.current = page;
this.page.size = limit;
this.searchList();
},
- // 鍒嗛〉
- pagination0({ page, limit }) {
- this.page.current = page;
- this.page.size = limit;
- this.searchList();
- },
- },
- // 鐢ㄤ簬涓婁紶鏂囦欢鐨勪俊鎭�
- computed: {
- action() {
- return this.javaApi + '/clientSatisfaction/uploadAnalyseFile'
- }
},
};
</script>
@@ -440,9 +272,5 @@
height: 46px;
display: flex;
justify-content: space-between;
-}
-
-.table-tab {
- margin: 0 0 20px 0;
}
</style>
diff --git a/src/views/business/costStatistics/index.vue b/src/views/business/costStatistics/index.vue
index fac168e..ed405aa 100644
--- a/src/views/business/costStatistics/index.vue
+++ b/src/views/business/costStatistics/index.vue
@@ -1,6 +1,6 @@
<template>
<!-- 璐圭敤缁熻椤甸潰-->
- <div class="capacity-scope">
+ <div class="capacity-scope" v-loading="feeSaving">
<div class="search">
<div>
<el-form :model="entity" ref="entity" size="small" :inline="true">
@@ -34,9 +34,10 @@
</div>
</div>
<div>
- <lims-table :tableData="tableData" :column="column"
+ <lims-table ref="ratesTable" :tableData="tableData" :column="column"
:height="'calc(100vh - 300px)'" @pagination="pagination"
:isSelection="true" :handleSelectionChange="handleSelectionChange"
+ rowKey="id" :reserveSelection="true"
:page="page" :tableLoading="tableLoading">
<template #isDiscount="{ row }">
<el-select v-model="row.isDiscount" size="small" style="width: 80px"
@@ -57,9 +58,14 @@
</template>
</lims-table>
</div>
- <div class="sum-bar">
+ <div class="sum-bar" v-loading="tableLoading">
+ <span class="all-summary">绛涢�夌粨鏋� <b class="sum-count">{{ summary ? summary.count : '鈥�' }}</b> 鏉★紝
+ 鍏ㄩ儴璐圭敤锛�<b class="sum-amount">楼{{ summary ? formatAmount(summary.totalAmount) : '鈥�' }}</b>
+ <small>锛堝寘鍚墍鏈夊垎椤碉級</small>
+ </span>
<span>宸插嬀閫� <b class="sum-count">{{ selectedRows.length }}</b> 鏉�</span>
- <span>鎬婚噾棰濓細<b class="sum-amount">楼{{ selectedTotal }}</b></span>
+ <span>鍕鹃�夊悎璁★細<b class="sum-amount">楼{{ selectedTotal }}</b></span>
+ <el-button link type="primary" :disabled="!selectedRows.length" @click="clearSelection">娓呯┖鍕鹃��</el-button>
</div>
<viewInfoDia ref="viewInfoDia" v-if="viewInfoDia"></viewInfoDia>
</div>
@@ -68,7 +74,9 @@
<script>
import limsTable from "@/components/Table/lims-table.vue";
import viewInfoDia from "./components/viewInfoDia.vue";
-import {selectRatesPage, updateOrderFee} from "@/api/business/insOrderRates";
+import {selectRatesPage, selectRatesSummary, updateOrderFee} from "@/api/business/insOrderRates";
+import {sumOrderAmounts} from "@/utils/orderRates";
+import Big from 'big.js';
import {selectCustomPageList} from "@/api/system/customer";
import { ElMessage } from "element-plus";
@@ -77,10 +85,16 @@
data() {
return {
entity: {
+ entrustCode: null,
sample: null,
company: null,
},
monthRange: [],
+ appliedFilters: {},
+ summary: null,
+ savedRows: {},
+ requestVersion: 0,
+ feeSaving: false,
tableData: [],
tableLoading: false,
column: [
@@ -165,12 +179,7 @@
computed: {
// 鍕鹃�夊悎璁★細鏈変紭鎯犱笖濉簡浼樻儬鍚庨噾棰濈殑鎸変紭鎯犲悗閲戦绠楋紝鍚﹀垯鎸夋�讳环绠�
selectedTotal() {
- const total = this.selectedRows.reduce((sum, row) => {
- const useDiscount = row.isDiscount === 1 && row.discountAmount !== null && row.discountAmount !== undefined
- const amount = Number(useDiscount ? row.discountAmount : row.totalPrice)
- return sum + (isFinite(amount) ? amount : 0)
- }, 0)
- return total.toFixed(2)
+ return sumOrderAmounts(this.selectedRows)
}
},
mounted() {
@@ -179,19 +188,45 @@
},
methods :{
refreshTable() {
- this.tableLoading = true
const [startMonth, endMonth] = this.monthRange || []
- selectRatesPage({ ...this.page, ...this.entity, startMonth, endMonth }).then(res => {
- this.tableLoading = false
- this.tableData = (res.data.records || []).map(item => {
- item.isDiscount = item.isDiscount === 1 ? 1 : 0
- return item
- })
+ this.appliedFilters = { ...this.entity, startMonth, endMonth }
+ this.page.current = 1
+ this.clearSelection()
+ this.savedRows = {}
+ this.tableData = []
+ return this.loadTable()
+ },
+ async loadTable() {
+ const version = ++this.requestVersion
+ this.tableLoading = true
+ this.summary = null
+ try {
+ const [res, summary] = await Promise.all([
+ selectRatesPage({ current: this.page.current, size: this.page.size, ...this.appliedFilters }),
+ selectRatesSummary(this.appliedFilters),
+ ])
+ if (version !== this.requestVersion) return
+ this.tableData = (res.data.records || []).map(row => ({ ...row, isDiscount: Number(row.isDiscount || 0) }))
+ // 淇濈暀鏈嶅姟绔揩鐓э紝杈撳叆妗嗕腑灏氭湭淇濆瓨鐨勯噾棰濅笉杩涘叆鍚堣銆�
+ this.tableData.forEach(row => { this.savedRows[row.id] = { ...row } })
+ this.selectedRows = this.selectedRows.map(row => this.savedRows[row.id] || row)
this.page.total = res.data.total
- this.selectedRows = []
- }).catch(err => {
- this.tableLoading = false
- })
+ this.summary = summary.data
+ } catch (err) {
+ if (version !== this.requestVersion) return
+ this.tableData = []
+ this.page.total = 0
+ this.clearSelection()
+ } finally {
+ if (version === this.requestVersion) this.tableLoading = false
+ }
+ },
+ clearSelection() {
+ this.$refs.ratesTable?.clearSelection()
+ this.selectedRows = []
+ },
+ formatAmount(value) {
+ return new Big(value || 0).toFixed(2)
},
// 閲嶇疆
refresh() {
@@ -218,12 +253,13 @@
},
// 鍒嗛〉鍒囨崲
pagination(page) {
+ this.page.current = page.page
this.page.size = page.limit
- this.refreshTable()
+ return this.loadTable()
},
// 鍕鹃�夎鍙樺寲
handleSelectionChange(selection) {
- this.selectedRows = selection
+ this.selectedRows = selection.map(row => this.savedRows[row.id] || { ...row })
},
// 鍒囨崲鏄惁浼樻儬
handleDiscountChange(row) {
@@ -235,7 +271,7 @@
} else {
row.discountAmount = null
}
- this.saveFee(row)
+ return this.saveFee(row)
},
// 浼樻儬鍚庨噾棰濇敼瀹屼繚瀛�
handleAmountChange(row) {
@@ -247,26 +283,39 @@
ElMessage.warning('鏈変紭鎯犳椂璇峰~鍐欎紭鎯犲悗閲戦')
return
}
- this.saveFee(row)
+ return this.saveFee(row)
},
// 澶囨敞鏀瑰畬淇濆瓨
handleFeeRemarkChange(row) {
- this.saveFee(row)
+ return this.saveFee(row)
},
amountOf(value) {
const num = Number(value)
if (!isFinite(num)) return 0
return Math.round(num * 100) / 100
},
- saveFee(row) {
- updateOrderFee({
- id: row.id,
- isDiscount: row.isDiscount,
- discountAmount: row.isDiscount === 1 ? row.discountAmount : null,
- feeRemark: row.feeRemark || null
- }).catch(() => {
- this.refreshTable()
- })
+ async saveFee(row) {
+ if (this.feeSaving) return
+ if (row.isDiscount === 1 && (row.discountAmount == null || row.discountAmount === '')) {
+ ElMessage.warning('鏈変紭鎯犳椂璇峰~鍐欎紭鎯犲悗閲戦')
+ return
+ }
+ this.feeSaving = true
+ // 浣夸慨鏀瑰墠浠嶅湪閫旂殑鏌ヨ澶辨晥锛岄伩鍏嶆棫閲戦瑕嗙洊淇濆瓨鍚庣殑鐘舵�併��
+ ++this.requestVersion
+ try {
+ await updateOrderFee({
+ id: row.id,
+ isDiscount: row.isDiscount,
+ discountAmount: row.isDiscount === 1 ? row.discountAmount : null,
+ feeRemark: row.feeRemark || null
+ })
+ } catch (err) {
+ // 璇锋眰鎷︽埅鍣ㄦ彁绀哄け璐ュ師鍥狅紱涓嬮潰閲嶆柊璇诲彇瀹為檯淇濆瓨鐨勯噾棰濄��
+ } finally {
+ await this.loadTable()
+ this.feeSaving = false
+ }
},
// 鏌ョ湅璇︽儏
openDia (row) {
@@ -282,6 +331,8 @@
.search {
min-height: 46px;
display: flex;
+ align-items: center;
+ flex-wrap: wrap;
justify-content: space-between;
}
.sum-bar {
@@ -289,6 +340,8 @@
bottom: 0;
z-index: 10;
display: flex;
+ align-items: center;
+ flex-wrap: wrap;
justify-content: flex-end;
gap: 24px;
margin-top: 8px;
@@ -300,6 +353,8 @@
.sum-count {
color: var(--el-color-primary);
}
+.all-summary { margin-right: auto; }
+.all-summary small { color: var(--el-text-color-secondary); }
.sum-amount {
color: var(--el-color-danger);
font-size: 16px;
--
Gitblit v1.9.3