From 8696b4d4c235a73f2bc5c030e20f1ad7c0a7166e Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期二, 25 二月 2025 14:25:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/views/CNAS/systemManagement/customerSatisfaction/index.vue | 11 +++--------
1 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/src/views/CNAS/systemManagement/customerSatisfaction/index.vue b/src/views/CNAS/systemManagement/customerSatisfaction/index.vue
index 3a898cd..414a023 100644
--- a/src/views/CNAS/systemManagement/customerSatisfaction/index.vue
+++ b/src/views/CNAS/systemManagement/customerSatisfaction/index.vue
@@ -17,7 +17,7 @@
<div class="btn">
<el-button v-if="tabIndex === '0'" size="small" type="primary" @click="openFormDia('add')">鏂� 澧�</el-button>
<el-upload v-if="tabIndex === '1'" ref='upload' :action="action" :before-upload="beforeUpload"
- :headers="headers" :on-error="onError" :on-success="handleSuccessUp" :show-file-list="false"
+ :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>
@@ -34,7 +34,8 @@
<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">
+ :table-loading="tableLoading" style="padding: 0 15px;margin-bottom: 16px" @pagination="pagination"
+ :page="page">
</limsTable>
</template>
</TableCard>
@@ -69,7 +70,6 @@
delClientSatisfaction,
delAnalyseFile,
} from '@/api/cnas/systemManagement/customerSatisfaction.js'
-import { getToken } from "@/utils/auth";
export default {
name: 'a8-customer-satisfaction',
@@ -358,11 +358,6 @@
},
// 鐢ㄤ簬涓婁紶鏂囦欢鐨勪俊鎭�
computed: {
- headers() {
- return {
- 'Authorization': "Bearer " + getToken()
- }
- },
action() {
return this.javaApi + '/clientSatisfaction/uploadAnalyseFile'
}
--
Gitblit v1.9.3