From 4d85b8e43490a4c502f5095642c458ed999c6513 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期一, 03 三月 2025 15:33:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/views/CNAS/systemManagement/documentRecords/regularReviewsRecord.vue | 17 +++--------------
1 files changed, 3 insertions(+), 14 deletions(-)
diff --git a/src/views/CNAS/systemManagement/documentRecords/regularReviewsRecord.vue b/src/views/CNAS/systemManagement/documentRecords/regularReviewsRecord.vue
index f0ec6cd..79763f5 100644
--- a/src/views/CNAS/systemManagement/documentRecords/regularReviewsRecord.vue
+++ b/src/views/CNAS/systemManagement/documentRecords/regularReviewsRecord.vue
@@ -22,18 +22,15 @@
</div>
<div class="btns">
<el-button size="small" type="primary" @click="openAdd" v-if="addPower">鏂板</el-button>
- <el-upload :action="action" :multiple="false" :show-file-list="false" accept='.doc,.docx' :headers="headers"
- :on-change="beforeUpload" :on-error="onError" ref='upload' v-if="upPower" :on-success="handleSuccessUp"
- style="display:inline-block;margin-left: 20px;">
+ <el-upload :action="action" :multiple="false" :show-file-list="false" accept='.doc,.docx'
+ :headers="uploadHeader" :on-change="beforeUpload" :on-error="onError" ref='upload' v-if="upPower"
+ :on-success="handleSuccessUp" style="display:inline-block;margin-left: 20px;">
<el-button type="primary" size="small">瀵煎叆</el-button></el-upload>
</div>
</div>
<div class="table">
<lims-table :tableData="tableData" :column="column" :page="page" :tableLoading="tableLoading"
:height="'calc(100vh - 290px)'" @pagination="pagination"></lims-table>
- <!-- <ValueTable ref="ValueTable" :url="$api.manageRecordIntervals.pageManageRecordIntervals"
- :delUrl="$api.manageRecordIntervals.delManageRecordIntervals" :componentData="componentData"
- :upUrl="$api.manageRecordIssueRecycle.doManageRecordIssueRecycle" :key="upIndex" /> -->
</div>
</el-tab-pane>
<el-tab-pane label="鍘嗗彶璁板綍" name="鍘嗗彶璁板綍" style="height: 100%;">
@@ -54,8 +51,6 @@
<div class="table">
<lims-table :tableData="tableData0" :column="column0" :page="page0" :tableLoading="tableLoading"
:height="'calc(100vh - 290px)'" @pagination="pagination0"></lims-table>
- <!-- <ValueTable ref="ValueTable0" :url="$api.manageRecordIntervals.pageManageRecordIntervalsTotal"
- :componentData="componentData0" :key="upIndex" /> -->
</div>
</el-tab-pane>
</el-tabs>
@@ -134,7 +129,6 @@
<script>
import limsTable from "@/components/Table/lims-table.vue";
import filePreview from '@/components/Preview/filePreview.vue'
-import { getToken } from "@/utils/auth";
import {
exportOutManageRecordIntervals,
addManageRecordIntervals,
@@ -386,11 +380,6 @@
},
// 鐢ㄤ簬涓婁紶鏂囦欢鐨勪俊鎭�
computed: {
- headers() {
- return {
- 'Authorization': "Bearer " + getToken()
- }
- },
action() {
return this.javaApi + '/manageRecordIntervals/exportInManageRecordIntervals'
}
--
Gitblit v1.9.3