From 0a26d58a3906b9e13946c7cb46fae51a0de98920 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期一, 17 三月 2025 15:49:08 +0800
Subject: [PATCH] Merge branch 'dev' into dev_tides
---
src/views/CNAS/process/reportResults/index.vue | 108 +++++++++--------------------------------------------
1 files changed, 19 insertions(+), 89 deletions(-)
diff --git a/src/views/CNAS/process/reportResults/index.vue b/src/views/CNAS/process/reportResults/index.vue
index 695cdc1..a3415d1 100644
--- a/src/views/CNAS/process/reportResults/index.vue
+++ b/src/views/CNAS/process/reportResults/index.vue
@@ -1,18 +1,21 @@
<template>
- <div class="report-results">
+ <div class="capacity-scope">
<div class="search">
- <div class="search_thing">
- <div class="search_label">妫�楠屾姤鍛婄紪鍙凤細</div>
- <div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="queryParams.insReportCode"
- @keyup.enter.native="refreshTable()"></el-input></div>
+ <div>
+ <el-form :model="queryParams" ref="queryForm" size="small" :inline="true">
+ <el-form-item label="妫�楠屾姤鍛婄紪鍙�" prop="insReportCode">
+ <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="queryParams.insReportCode"
+ @keyup.enter.native="refreshTable()"></el-input>
+ </el-form-item>
+ <el-form-item>
+ <el-button type="primary" icon="el-icon-search" size="mini" @click="refreshTable">鏌� 璇�</el-button>
+ <el-button icon="el-icon-refresh" size="mini" @click="refresh">閲� 缃�</el-button>
+ </el-form-item>
+ </el-form>
</div>
- <div class="search_thing" style="padding-left: 30px;">
- <el-button size="small" @click="refresh()">閲� 缃�</el-button>
- <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>
+ <div>
+ <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">
@@ -118,6 +121,7 @@
selectUserCondition,
} from "@/api/business/inspectionTask.js";
export default {
+ name: 'ReportResults',
components: {
limsTable
},
@@ -185,35 +189,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 +197,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 +265,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 +275,6 @@
} else {
doProcessReport(addInfo).then(res => {
this.addLoading = false
- if (res.code == 201) {
- return
- }
this.addDialogVisible = false
this.$message({
type: 'success',
@@ -333,7 +302,6 @@
})
.then(() => {
delProcessReport({ id: row.id }).then((res) => {
- if (res.code == 201) return;
this.$message.success("鍒犻櫎鎴愬姛");
this.refresh();
});
@@ -346,11 +314,9 @@
<style scoped>
.search {
- background-color: #fff;
- height: 80px;
+ height: 46px;
display: flex;
- align-items: center;
- position: relative;
+ justify-content: space-between;
}
.search_thing {
@@ -367,41 +333,5 @@
.search_input {
width: calc(100% - 110px);
-}
-
-.table {
- background-color: #fff;
- height: calc(100% - 60px - 80px - 10px - 40px);
- padding: 20px;
-}
-
-.tables {
- table-layout: fixed;
- width: 100%;
-}
-
-.tables td {
- height: 40px;
- width: 100px;
- text-align: center;
- font-size: 14px;
- word-wrap: break-word;
- white-space: normal;
-}
-
-.en {
- font-size: 12px;
- word-break: break-word;
- /* 鑷姩鏂 */
- overflow-wrap: break-word;
- /* 闃叉婧㈠嚭 */
- white-space: normal;
- /* 榛樿鎹㈣ */
-}
-
-.btn {
- position: absolute;
- top: 16px;
- right: 20px;
}
</style>
--
Gitblit v1.9.3