From 34a7e21b3508ac0f5f011d958210fdb7176d726b Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期六, 09 九月 2023 11:54:05 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.22:9001/r/lims-before
---
src/views/experiment/checkTheReport/index.vue | 55 +++++++++++++++++++++++++++++--------------------------
1 files changed, 29 insertions(+), 26 deletions(-)
diff --git a/src/views/experiment/checkTheReport/index.vue b/src/views/experiment/checkTheReport/index.vue
index 1d97b93..b522540 100644
--- a/src/views/experiment/checkTheReport/index.vue
+++ b/src/views/experiment/checkTheReport/index.vue
@@ -1,24 +1,24 @@
<template>
<div class="content-main">
<div class="top-bar">
- <el-form ref="form" :inline="true" :model="searchData" label-position="left">
+ <el-form ref="form" :inline="true" :model="searchData" label-position="left" style="margin-top: 10px;">
<el-form-item label="鏍峰搧缂栧彿:">
- <el-input v-model="searchData.sample_code" class="input-form" placeholder="璇疯緭鍏ユ牱鍝佺紪鍙�"
+ <el-input size="small" v-model="searchData.sample_code" class="input-form" placeholder="璇疯緭鍏ユ牱鍝佺紪鍙�"
@keyup.enter.native="getData" />
</el-form-item>
<el-form-item label="鎶ュ憡鍗曞彿:">
- <el-input v-model="searchData.reportCode" class="input-form" placeholder="璇疯緭鍏ユ姤鍛婂崟鍙�" />
+ <el-input size="small" v-model="searchData.reportCode" class="input-form" placeholder="璇疯緭鍏ユ姤鍛婂崟鍙�" />
</el-form-item>
<el-form-item label="鐢宠鍗曞彿:">
- <el-input v-model="searchData.application_code" class="input-form" placeholder="璇疯緭鍏ョ敵璇峰崟鍙�" />
+ <el-input size="small" v-model="searchData.application_code" class="input-form" placeholder="璇疯緭鍏ョ敵璇峰崟鍙�" />
</el-form-item>
<el-form-item>
- <el-button type="primary" @click="getData()">鏌ヨ</el-button>
- <el-button type="primary" plain @click="resetData()">閲嶇疆</el-button>
+ <el-button size="small" type="primary" @click="getData()">鏌ヨ</el-button>
+ <el-button size="small" type="primary" plain @click="resetData()">閲嶇疆</el-button>
</el-form-item>
</el-form>
- <el-form>
- <el-button @click="exportToPDF" class="rightBtn" type="primary" icon="el-icon-document">瀵煎嚭鎶ュ憡</el-button>
+ <el-form style="margin-top: 10px;">
+ <el-button size="small" @click="exportToPDF" class="rightBtn" type="primary" icon="el-icon-document">瀵煎嚭鎶ュ憡</el-button>
</el-form>
</div>
<div class="library-table">
@@ -26,10 +26,9 @@
<div class="search-bar">
<el-radio-group v-model="checkStatus" @change="handleRadioChange">
<el-radio-button>鍏ㄩ儴</el-radio-button>
- <el-radio-button label="0">寰呮彁浜�</el-radio-button>
- <el-radio-button label="1">寰呭鏍�</el-radio-button>
- <el-radio-button label="2">寰呯瀛�</el-radio-button>
- <el-radio-button label="3">宸插畬鎴�</el-radio-button>
+ <el-radio-button label="0">寰呭鏍�</el-radio-button>
+ <el-radio-button label="1">寰呯瀛�</el-radio-button>
+ <el-radio-button label="2">宸插畬鎴�</el-radio-button>
</el-radio-group>
<el-checkbox v-model="checked" style="margin-left: 20px">浠呯湅鎴戠殑</el-checkbox>
</div>
@@ -44,12 +43,12 @@
</div>
</el-dialog>
<div class="table-box">
- <el-table ref="reportTable" :max-height="800" :cell-style="{ textAlign: 'center' }" :header-cell-style="{
+ <el-table ref="reportTable" height="200" :max-height="800" :cell-style="{ textAlign: 'left' }" :header-cell-style="{
border: '0px',
background: '#f5f7fa',
color: '#606266',
boxShadow: 'inset 0 1px 0 #ebeef5',
- textAlign: 'center',
+ textAlign: 'left',
}" :data="reportTable" @selection-change="handleSelectionChange" style="width: 100%">
<el-table-column type="selection" min-width="5%" />
<el-table-column prop="type" label="鎶ュ憡绫诲瀷" min-width="5%">
@@ -86,15 +85,14 @@
<el-table-column prop="status" label="瀹℃壒鐘舵��" min-width="8%">
<template slot-scope="scope">
<span>
- <el-tag type="info">{{
- scope.row.status == 0
- ? "寰呮彁浜�"
- : scope.row.status == 1
- ? "寰呭鏍�"
- : scope.row.status == 2
- ? "浠ｇ瀛�"
- : "宸插畬鎴�"
- }}</el-tag>
+ <el-tag type="info">
+ {{
+ scope.row.status == 0
+ ? "寰呭鏍�"
+ : scope.row.status == 1
+ ? "寰呯瀛�" : "宸插畬鎴�"
+ }}
+ </el-tag>
</span>
</template></el-table-column>
<el-table-column prop="conclusion" label="妫�楠岀粨璁�" min-width="8%">
@@ -177,18 +175,20 @@
TestReport
},
methods: {
- async queryReportByRCode(code) {
+ async queryReportByRCode(code,name) {
const resp = await getReportData({
code: code
});
this.reportData = resp.data;
+ this.reportData.preparerName = name;
this.dialogVisible = true;
console.log(this.reportData);
},
//鏌ョ湅鎶ュ憡鎸夐挳
previewFun(row) {
this.reportType = row.type;
- this.queryReportByRCode(row.reportCode);
+ this.queryReportByRCode(row.reportCode,row.name);
+
},
handleSelectionChange(selection) {
this.selectedRows = selection;
@@ -313,13 +313,16 @@
}
.table-box {
+ height: 60vh;
padding: 0px 20px;
margin-top: 0px;
flex: 1;
background: #fff;
display: flex;
flex-direction: column;
-
+ .el-table{
+ overflow: scroll;
+ }
>div:nth-child(2) {
display: flex;
justify-content: end;
--
Gitblit v1.9.3