From 9003bd663cfeea9225a37e653afca4e8c698c990 Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期六, 15 三月 2025 13:58:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/views/CNAS/systemManagement/customerSatisfaction/index.vue | 50 ++++++++++++++------------------------------------
1 files changed, 14 insertions(+), 36 deletions(-)
diff --git a/src/views/CNAS/systemManagement/customerSatisfaction/index.vue b/src/views/CNAS/systemManagement/customerSatisfaction/index.vue
index 7b76b7c..3368ce3 100644
--- a/src/views/CNAS/systemManagement/customerSatisfaction/index.vue
+++ b/src/views/CNAS/systemManagement/customerSatisfaction/index.vue
@@ -31,22 +31,15 @@
</el-radio-group>
</div>
<div v-if="tabIndex === '0'">
- <TableCard :showForm="false" :showTitle="false">
- <template v-slot:table>
- <limsTable :column="tableColumn" :height="'calc(100vh - 22em)'" :table-data="tableData"
- :table-loading="tableLoading" style="padding: 0 15px;margin-bottom: 16px" @pagination="pagination">
- </limsTable>
- </template>
- </TableCard>
+ <limsTable :column="tableColumn" :height="'calc(100vh - 22em)'" :table-data="tableData"
+ :table-loading="tableLoading" style="padding: 0 15px;margin-bottom: 16px" @pagination="pagination"
+ :page="page">
+ </limsTable>
</div>
<div v-if="tabIndex === '1'">
- <TableCard :showForm="false" :showTitle="false">
- <template v-slot:table>
- <limsTable :column="tableColumn1" :height="'calc(100vh - 22em)'" :table-data="tableData1"
- :table-loading="tableLoading1" style="padding: 0 15px;margin-bottom: 16px" @pagination="pagination0">
- </limsTable>
- </template>
- </TableCard>
+ <limsTable :column="tableColumn1" :height="'calc(100vh - 22em)'" :table-data="tableData1"
+ :table-loading="tableLoading1" style="padding: 0 15px;margin-bottom: 16px" @pagination="pagination0">
+ </limsTable>
</div>
</div>
</div>
@@ -59,7 +52,6 @@
</template>
<script>
-import TableCard from '@/components/TableCard/index.vue';
import limsTable from "@/components/Table/lims-table.vue";
import FormDialog from './components/formDialog.vue';
import filePreview from '@/components/Preview/filePreview.vue'
@@ -71,9 +63,9 @@
} from '@/api/cnas/systemManagement/customerSatisfaction.js'
export default {
- name: 'a8-customer-satisfaction',
+ name: 'CustomerSatisfaction',
// import 寮曞叆鐨勭粍浠堕渶瑕佹敞鍏ュ埌瀵硅薄涓墠鑳戒娇鐢�
- components: { filePreview, FormDialog, limsTable, TableCard },
+ components: { filePreview, FormDialog, limsTable },
data() {
// 杩欓噷瀛樻斁鏁版嵁
return {
@@ -143,8 +135,8 @@
page: {
size: 20,
current: 1,
+ total: 0,
},
- total: 0,
tableColumn1: [
{
label: '闄勪欢鍚嶇О',
@@ -196,8 +188,8 @@
page1: {
size: 20,
current: 1,
+ total: 0,
},
- total1: 0,
formDialog: false,
upLoading: false,
currentInfo: {},
@@ -217,9 +209,8 @@
this.tableLoading = true
pageClientSatisfaction({ ...entity, ...page }).then(res => {
this.tableLoading = false
- if (res.code === 201) return
this.tableData = res.data.records
- this.total = res.data.total
+ this.page.total = res.data.total
}).catch(err => {
console.log('err---', err);
this.tableLoading = false
@@ -228,9 +219,8 @@
this.tableLoading1 = true
pageAnalyseFile({ ...entity, ...page }).then(res => {
this.tableLoading1 = false
- if (res.code === 201) return
this.tableData1 = res.data.records
- this.total1 = res.data.total
+ this.page1.total = res.data.total
}).catch(err => {
console.log('err---', err);
this.tableLoading1 = false
@@ -285,7 +275,6 @@
this.tableLoading = true
delClientSatisfaction({ clientSatisfactionId: row.clientSatisfactionId }).then(res => {
this.tableLoading = false
- if (res.code === 201) return
this.$message.success('鍒犻櫎鎴愬姛')
this.searchList()
}).catch(err => {
@@ -306,17 +295,7 @@
},
// 涓嬭浇瀹㈡埛绂忓缓
upload(row) {
- let url = '';
- if (row.type == 1) {
- url = this.javaApi + '/img/' + row.fileUrl
- file.downloadIamge(url, row.fileName)
- } else {
- url = this.javaApi + '/word/' + row.fileUrl
- const link = document.createElement('a');
- link.href = url;
- link.download = row.fileName;
- link.click();
- }
+ this.$download.saveAs(row.fileUrl, row.fileName);
},
// 鍒犻櫎瀹㈡埛鍒嗘瀽闄勪欢
delFile(row) {
@@ -328,7 +307,6 @@
this.tableLoading = true
delAnalyseFile({ analyseFileId: row.analyseFileId }).then(res => {
this.tableLoading = false
- if (res.code === 201) return
this.$message.success('鍒犻櫎鎴愬姛')
this.searchList()
}).catch(err => {
--
Gitblit v1.9.3