From e5454b769d44a34af423bf87ac8a740bf8c20341 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期二, 29 四月 2025 13:25:29 +0800
Subject: [PATCH] Merge branch 'dev' into dev_tides
---
src/views/CNAS/process/uncertainty/index.vue | 63 +++++++++----------------------
1 files changed, 19 insertions(+), 44 deletions(-)
diff --git a/src/views/CNAS/process/uncertainty/index.vue b/src/views/CNAS/process/uncertainty/index.vue
index 1ec4859..f09d6ac 100644
--- a/src/views/CNAS/process/uncertainty/index.vue
+++ b/src/views/CNAS/process/uncertainty/index.vue
@@ -1,21 +1,22 @@
<template>
- <div class="uncertainty-evaluation">
- <div class="search">
- <div class="search_thing">
- <div class="search_label">鎶ュ憡鍚嶇О锛�</div>
- <div class="search_input"><el-input v-model="queryParams.reportName" clearable placeholder="璇疯緭鍏�" size="small"
- @keyup.enter.native="refreshTable()"></el-input></div>
+ <div class="capacity-scope">
+ <div style="display: flex;justify-content: space-between">
+ <div style="display: flex;">
+ <div style="margin-bottom: 18px;margin-right: 10px;display: flex;align-items: center;line-height: 32px;">
+ <span style="width: 88px;font-size: 14px;font-weight: 700;color: #606266;">鎶ュ憡鍚嶇О</span>
+ <el-input v-model="queryParams.reportName" clearable placeholder="璇疯緭鍏�" size="small"
+ @keyup.enter.native="refreshTable()"></el-input>
+ </div>
+ <div style="line-height: 30px;">
+ <el-button type="primary" size="mini" @click="refreshTable">鏌ヨ</el-button>
+ <el-button size="mini" @click="refresh">閲嶇疆</el-button>
+ </div>
</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 :loading="outLoading" size="small" style="margin-right: 16px;margin-top: 3px;" type="primary"
- @click="handleDown0">瀵煎嚭</el-button>
+ <div style="line-height: 30px;">
+ <el-button :loading="outLoading" size="small" type="primary" style="margin-right: 10px" @click="handleDown0">瀵煎嚭</el-button>
<el-upload ref='upload' :action="action" :headers="uploadHeader" :on-change="beforeUpload" :on-error="onError"
- :on-success="handleSuccessUp" :show-file-list="false"
- accept='.jpg,.jpeg,.png,.gif,.doc,.docx,.xls,.xlsx,.ppt,.pptx,.pdf,.zip,.rar'>
+ :on-success="handleSuccessUp" :show-file-list="false" style="display: inline-block;"
+ 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>
</div>
</div>
@@ -66,6 +67,7 @@
} from '@/api/cnas/process/uncertainty.js'
import { mapGetters } from "vuex";
export default {
+ name: 'Uncertainty',
components: {
limsTable,
filePreview
@@ -148,7 +150,6 @@
this.outLoading = true
exportProcessEvaluate(this.queryParams).then(res => {
this.outLoading = false
- if (res.code === 201) return
const blob = new Blob([res], { type: 'application/octet-stream' });
this.$download.saveAs(blob, '娴嬮噺涓嶇‘瀹氬害鐨勮瘎瀹�.xlsx');
})
@@ -194,10 +195,6 @@
evaluateUser: this.userId
}).then((res) => {
this.addLoading = false;
- if (res.code == 201) {
- this.$message.error('璇勪环澶辫触');
- return;
- }
this.$message.success('璇勪环鎴愬姛');
this.addDialogVisible = false;
this.refreshTable()
@@ -245,7 +242,6 @@
})
.then(() => {
delProcessEvaluate({ id: row.id }).then((res) => {
- if (res.code == 201) return;
this.$message.success("鍒犻櫎鎴愬姛");
this.refresh();
});
@@ -257,17 +253,10 @@
</script>
<style scoped>
-.title {
- height: 60px;
- line-height: 60px;
-}
-
.search {
- background-color: #fff;
- height: 80px;
+ height: 46px;
display: flex;
- align-items: center;
- position: relative;
+ justify-content: space-between;
}
.search_thing {
@@ -284,19 +273,5 @@
.search_input {
width: calc(100% - 80px);
-}
-
-.table {
- background-color: #fff;
- height: calc(100% - 60px - 80px - 10px - 40px);
- padding: 20px;
-}
-
-.btn {
- position: absolute;
- top: 16px;
- right: 20px;
- display: flex;
- align-items: center;
}
</style>
--
Gitblit v1.9.3