From 368b525db5f3f4f82b13c074341708a46b9a4111 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期二, 11 三月 2025 09:11:29 +0800
Subject: [PATCH] Merge branch 'dev' of http://114.132.189.42:9002/r/lims-ruoyi-before into dev
---
src/views/CNAS/process/reportResults/index.vue | 42 +++---------------------------------------
1 files changed, 3 insertions(+), 39 deletions(-)
diff --git a/src/views/CNAS/process/reportResults/index.vue b/src/views/CNAS/process/reportResults/index.vue
index 695cdc1..fcc583a 100644
--- a/src/views/CNAS/process/reportResults/index.vue
+++ b/src/views/CNAS/process/reportResults/index.vue
@@ -11,8 +11,8 @@
<el-button size="small" type="primary" @click="refreshTable()">鏌� 璇�</el-button>
</div>
<div class="btn">
- <el-button size="medium" type="primary" @click="handleDown" :loading="outLoading" v-if="outPower">瀵煎嚭</el-button>
- <el-button size="medium" type="primary" @click="openAdd" v-if="addPower">鏂板</el-button>
+ <el-button size="small" type="primary" @click="handleDown" :loading="outLoading" v-if="outPower">瀵煎嚭</el-button>
+ <el-button size="small" type="primary" @click="openAdd" v-if="addPower">鏂板</el-button>
</div>
</div>
<div class="table">
@@ -185,35 +185,6 @@
this.getAuthorizedPerson()
},
methods: {
- getPower() {
- let power = JSON.parse(sessionStorage.getItem('power'))
- let up = false
- let del = false
- let add = false
- let out = false
- for (var i = 0; i < power.length; i++) {
- if (power[i].menuMethod == 'doProcessReport') {
- up = true
- }
- if (power[i].menuMethod == 'addProcessReport') {
- add = true
- }
- if (power[i].menuMethod == 'delProcessReport') {
- del = true
- }
- if (power[i].menuMethod == 'exportProcessReport') {
- out = true
- }
- }
- if (!up) {
- this.componentData.do.splice(1, 1)
- }
- if (!del) {
- this.componentData.do.splice(0, 1)
- }
- this.outPower = out
- this.addPower = add
- },
handleDown() {
if (this.mutilSelect.length == 0) {
this.$message.warning('璇烽�夋嫨瑕佸鍑虹殑鏁版嵁')
@@ -222,7 +193,7 @@
this.outLoading = true
exportProcessReport({ ids: this.mutilSelect.map(m => m.id) }).then(res => {
this.outLoading = false
- this.$download.downloadFileFromUrl(res.data, "鎶ュ憡缁撴灉");
+ this.$download.saveAs(res.data, "鎶ュ憡缁撴灉");
})
},
openAdd() {
@@ -290,9 +261,6 @@
if (this.title == '鏂板') {
addProcessReport(addInfo).then(res => {
this.addLoading = false
- if (res.code == 201) {
- return
- }
this.addDialogVisible = false
this.$message({
type: 'success',
@@ -303,9 +271,6 @@
} else {
doProcessReport(addInfo).then(res => {
this.addLoading = false
- if (res.code == 201) {
- return
- }
this.addDialogVisible = false
this.$message({
type: 'success',
@@ -333,7 +298,6 @@
})
.then(() => {
delProcessReport({ id: row.id }).then((res) => {
- if (res.code == 201) return;
this.$message.success("鍒犻櫎鎴愬姛");
this.refresh();
});
--
Gitblit v1.9.3