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/nonConformingFeedback/index.vue | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/views/experiment/nonConformingFeedback/index.vue b/src/views/experiment/nonConformingFeedback/index.vue
index bccfa6a..26e65b9 100644
--- a/src/views/experiment/nonConformingFeedback/index.vue
+++ b/src/views/experiment/nonConformingFeedback/index.vue
@@ -1,7 +1,7 @@
<template>
<div class="content-main">
<div class="top-bar">
- <el-form ref="form" style="width: 1000px;margin-top: 10px;" :inline="true">
+ <el-form ref="form" style="width: 100%;margin-top: 10px;" :inline="true">
<el-form-item label="鏍峰紡缂栧彿锛�">
<el-input size="small" v-model="materialCode" placeholder="璇疯緭鍏ユ牱寮忕紪鍙�"></el-input>
</el-form-item>
@@ -14,7 +14,7 @@
<el-form-item>
<el-button type="primary" size="small" @click="getData()">鏌ヨ</el-button>
<el-button type="primary" size="small" plain @click="resetData()">閲嶇疆</el-button>
- <el-dropdown style="margin-left: 7px;">
+ <!-- <el-dropdown style="margin-left: 7px;">
<span class="el-dropdown-link">
楂樼骇鎼滅储<i class="el-icon-arrow-down el-icon--right"></i>
</span>
@@ -25,7 +25,7 @@
<el-dropdown-item disabled>鍙岀毊濂�</el-dropdown-item>
<el-dropdown-item divided>铓典粩鐓�</el-dropdown-item>
</el-dropdown-menu>
- </el-dropdown>
+ </el-dropdown> -->
</el-form-item>
</el-form>
<el-form style="margin-top: 10px;">
@@ -34,7 +34,7 @@
</div>
<div class="library-table">
<div class="table-box">
- <el-table ref="tableData" :max-height="800" :cell-style="{ textAlign: 'left' }"
+ <el-table ref="tableData" :max-height="700" :cell-style="{ textAlign: 'left' }"
:header-cell-style="{ border: '0px', background: '#f5f7fa', color: '#606266', boxShadow: 'inset 0 1px 0 #ebeef5', textAlign: 'left' }"
:data="tableData" style="width: 100%">
<el-table-column type="selection" label="" min-width="5%" />
@@ -59,7 +59,7 @@
</el-table-column>
<el-table-column label="鎿嶄綔" min-width="8%">
<template slot-scope="scope">
- <el-button type="text" size="small">鎿嶄綔</el-button>
+ <el-button type="text" size="small">鎺ㄩ��</el-button>
<el-button type="text" size="small">浣滃簾</el-button>
</template>
</el-table-column>
@@ -155,6 +155,7 @@
}
}
.library-table {
+ height:80vh;
background-color: #fff;
flex: 1;
margin: 0px -15px;
--
Gitblit v1.9.3