From 2d55ed180fddd028bf4f839345bf0ef4d2f032e7 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期五, 07 三月 2025 13:34:31 +0800
Subject: [PATCH] Merge branch 'dev' of http://114.132.189.42:9002/r/lims-ruoyi-before into dev
---
src/views/CNAS/systemManagement/documentRecords/outDocumenRecordt.vue | 29 ++++++++---------------------
1 files changed, 8 insertions(+), 21 deletions(-)
diff --git a/src/views/CNAS/systemManagement/documentRecords/outDocumenRecordt.vue b/src/views/CNAS/systemManagement/documentRecords/outDocumenRecordt.vue
index afb2003..cc13d08 100644
--- a/src/views/CNAS/systemManagement/documentRecords/outDocumenRecordt.vue
+++ b/src/views/CNAS/systemManagement/documentRecords/outDocumenRecordt.vue
@@ -5,9 +5,9 @@
<el-tab-pane label="濉啓" name="濉啓" style="height: 100%;">
<div style="display: flex;align-items: center;justify-content: flex-end;margin-right: 20px;">
<el-button size="small" type="primary" @click="openAdd('鏂板')" style="margin-left: 20px;">鏂板</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' :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'
+ :on-success="handleSuccessUp" style="display:inline-block;margin-left: 20px;">
<el-button size="small" type="primary" :loading="upLoading">瀵煎叆</el-button></el-upload>
</div>
<div class="table" style="height: calc(100% - 200px)">
@@ -34,8 +34,6 @@
</div>
</div>
<div class="table">
- <!-- <ValueTable ref="ValueTable" :url="$api.manageRecordTotal.pageManageRecordTotal"
- :componentData="componentData" :key="upIndex" /> -->
<lims-table :tableData="tableData" :column="column" :page="page" :tableLoading="tableLoading"
:height="'calc(100vh - 280px)'" @pagination="pagination"></lims-table>
</div>
@@ -95,8 +93,6 @@
<script>
import limsTable from "@/components/Table/lims-table.vue";
import filePreview from '@/components/Preview/filePreview.vue'
-import ValueTable from '@/components/Table/value-table.vue'
-import { getToken } from "@/utils/auth";
import {
addManageRecordVerify,
pageManageRecordVerify,
@@ -108,7 +104,6 @@
} from '@/api/cnas/systemManagement/documentRecords.js'
export default {
components: {
- ValueTable,
filePreview,
limsTable,
},
@@ -174,8 +169,8 @@
{
name: "鎵瑰噯",
type: "text",
- clickFun: (handleApproval) => {
- this.handleSubmit(row);
+ clickFun: (row) => {
+ this.handleApproval(row);
},
disabled: (row) => {
return !row.submitUserName || !!row.ratifyUserName
@@ -244,11 +239,6 @@
},
// 鐢ㄤ簬涓婁紶鏂囦欢鐨勪俊鎭�
computed: {
- headers() {
- return {
- 'Authorization': "Bearer " + getToken()
- }
- },
action() {
return this.javaApi + '/manageRecordVerify/exportManageRecordVerify'
}
@@ -403,8 +393,7 @@
}).catch(err => { });
},
handleDown0(row) {
- let url = this.javaApi + '/word/' + row.url
- this.$download.saveAs(url, '澶栨潵鏂囦欢纭璁板綍')
+ this.$download.downloadFileFromUrl(row.url, '澶栨潵鏂囦欢纭璁板綍')
},
// 鎻愪氦
handleSubmit(row) {
@@ -420,7 +409,7 @@
type: 'success',
message: '鎻愪氦鎴愬姛!'
});
- this.refreshTable()()
+ this.refreshTable()
}).catch(err => { });
})
},
@@ -442,12 +431,11 @@
}).then(res => {
this.checkLoading = false
this.noCheckLoading = false
- if (res.code === 201) return
this.$message({
type: 'success',
message: '鎿嶄綔鎴愬姛!'
});
- this.refreshTable()()
+ this.refreshTable()
this.lookDialogVisible = false
}).catch(err => { });
},
@@ -459,7 +447,6 @@
})
.then(() => {
delManageRecordVerify({ id: row.id }).then((res) => {
- if (res.code == 201) return;
this.$message.success("鍒犻櫎鎴愬姛");
this.getList0()
});
--
Gitblit v1.9.3