From 6dd2ed2eb744d085130554abed50ca1a98c8c508 Mon Sep 17 00:00:00 2001
From: 李林 <z1292839451@163.com>
Date: 星期一, 21 八月 2023 09:16:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/experiment/checkTheReport/index.vue | 249 ++++++++++++++++++++++++++++++-------------------
1 files changed, 150 insertions(+), 99 deletions(-)
diff --git a/src/views/experiment/checkTheReport/index.vue b/src/views/experiment/checkTheReport/index.vue
index e14b79e..a5057c4 100644
--- a/src/views/experiment/checkTheReport/index.vue
+++ b/src/views/experiment/checkTheReport/index.vue
@@ -14,9 +14,19 @@
<el-button type="primary" @click="getData()">鏌ヨ</el-button>
<el-button type="primary" plain @click="resetData()">閲嶇疆</el-button>
</el-form-item>
+ <el-dropdown>
+ <span class="el-dropdown-link">
+ 楂樼骇鎼滅储<i class="el-icon-arrow-down el-icon--right"></i>
+ </span>
+ <el-dropdown-menu slot="dropdown">
+ <el-dropdown-item>楂樼骇鎼滅储</el-dropdown-item>
+ </el-dropdown-menu>
+ </el-dropdown>
</el-form>
<el-form>
- <el-button class="rightBtn" type="primary" icon="el-icon-document" @click="exportData">瀵煎嚭鎶ュ憡</el-button>
+ <el-button class="rightBtn" type="primary" icon="el-icon-document"
+ >瀵煎嚭鎶ュ憡</el-button
+ >
</el-form>
</div>
<div class="library-table">
@@ -28,74 +38,107 @@
<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>
</div>
<div class="table-box">
<el-table
ref="reportTable"
:max-height="800"
- :cell-style="{textAlign: 'center'}"
- :header-cell-style="{border:'0px',background:'#f5f7fa',color:'#606266',boxShadow: 'inset 0 1px 0 #ebeef5',textAlign: 'center'}"
+ :cell-style="{ textAlign: 'center' }"
+ :header-cell-style="{
+ border: '0px',
+ background: '#f5f7fa',
+ color: '#606266',
+ boxShadow: 'inset 0 1px 0 #ebeef5',
+ textAlign: 'center',
+ }"
:data="reportTable"
style="width: 100%"
>
- <el-table-column
- type="selection"
- label=""
- min-width="5%"
- />
+ <el-table-column type="selection" label="" min-width="5%" />
<el-table-column
prop="materialCode"
label="鏍峰搧缂栧彿"
sortable
min-width="10%"
- />
+ >
+ <template slot-scope="scope">
+ <span style="color: #409eff;">
+ {{ scope.row.materialCode }}
+ </span>
+ </template></el-table-column
+ >
<el-table-column
- prop="reportCode"
+ prop="materialCode"
label="鎶ュ憡鍗曞彿"
sortable
min-width="10%"
- />
+ >
+ <template slot-scope="scope">
+ <span style="color: #409eff;">
+ {{ scope.row.materialCode }}
+ </span>
+ </template></el-table-column
+ >
<el-table-column
prop="inspectionCode"
label="鐢宠鍗曞彿"
sortable
min-width="10%"
- />
- <el-table-column
- prop="approver"
- label="瀹℃壒浜�"
- min-width="5%"
- />
- <el-table-column
- prop="status"
- label="瀹℃壒鐘舵��"
- min-width="8%"
>
+ <template slot-scope="scope">
+ <span style="color: #409eff;">
+ {{ scope.row.inspectionCode }}
+ </span>
+ </template></el-table-column
+ >
+ <el-table-column prop="approver" 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" icon="el-icon-user">
+ <i class="el-icon-user">{{ scope.row.approver }}</i>
+ </el-tag>
</span>
- </template></el-table-column>
- <el-table-column
- prop="conclusion"
- label="妫�楠岀粨璁�"
- min-width="10%"
- />
- <el-table-column
- prop="name"
- label="缂栧埗浜�"
- min-width="8%"
- />
- <el-table-column
- label="鎿嶄綔"
- min-width="8%"
- >
+ </template>
+ </el-table-column>
+ <el-table-column prop="status" label="瀹℃壒鐘舵��" min-width="8%">
<template slot-scope="scope">
- <el-button type="text" size="small" @click="handleClick(scope.row)">棰勮</el-button>
+ <span>
+ <el-tag type="info">{{
+ scope.row.status == 0
+ ? "寰呮彁浜�"
+ : scope.row.status == 1
+ ? "寰呭鏍�"
+ : scope.row.status == 2
+ ? "浠ｇ瀛�"
+ : "宸插畬鎴�"
+ }}</el-tag>
+ </span>
+ </template></el-table-column
+ >
+ <el-table-column prop="conclusion" label="妫�楠岀粨璁�" min-width="8%" />
+ <el-table-column prop="name" label="缂栧埗浜�" min-width="8%">
+ <template slot-scope="scope">
+ <span>
+ <el-tag type="info" icon="el-icon-user">
+ <i class="el-icon-user">{{ scope.row.name }}</i>
+ </el-tag>
+ </span>
+ </template>
+ </el-table-column>
+ <el-table-column label="鎿嶄綔" min-width="8%">
+ <template slot-scope="scope">
+ <el-button
+ type="text"
+ size="small"
+ @click="handleClick(scope.row)"
+ >棰勮</el-button
+ >
<el-button type="text" size="small">鎵撳嵃</el-button>
</template>
</el-table-column>
@@ -118,45 +161,46 @@
</template>
<script>
-import { selectAllReport } from '@/api/experiment/checkTheReport'
+import { selectAllReport } from "@/api/experiment/checkTheReport";
export default {
data() {
return {
- input: '',
+ input: "",
checkStatus: undefined,
reportTable: [],
page: 1,
total: 0,
- pageSize: 10
- }
+ pageSize: 10,
+ checked: true,
+ };
},
created() {
- this.getData()
+ this.getData();
},
methods: {
// 鐘舵�佹寜閽�
handleRadioChange() {
- this.getData()
+ this.getData();
},
// 姣忛〉鏉℃暟鏀瑰彉鏃惰Е鍙� 閫夋嫨涓�椤垫樉绀哄灏戣
handleSizeChange(val) {
- console.log(`姣忛〉 ${val} 鏉)
- this.pageSize = val
- this.getData()
+ console.log(`姣忛〉 ${val} 鏉);
+ this.pageSize = val;
+ this.getData();
},
// 褰撳墠椤垫敼鍙樻椂瑙﹀彂 璺宠浆鍏朵粬椤�
handleCurrentChange(val) {
- console.log(`褰撳墠椤�: ${val}`)
- this.page = val
- this.getData()
+ console.log(`褰撳墠椤�: ${val}`);
+ this.page = val;
+ this.getData();
},
// 閲嶇疆鎸夐挳
resetData() {
- this.input = undefined
- this.page = 1
- this.pageSize = 10
- this.checkStatus = undefined
- this.getData()
+ this.input = undefined;
+ this.page = 1;
+ this.pageSize = 10;
+ this.checkStatus = undefined;
+ this.getData();
},
// 鏌ヨ鍒楄〃
async getData() {
@@ -164,54 +208,61 @@
page: this.page,
pageSize: this.pageSize,
name: this.input ? this.input : undefined,
- status: this.checkStatus ? this.checkStatus : undefined
- }
- const { data } = await selectAllReport(params)
- this.reportTable = data.row
- this.total = data.total
- }
- }
-}
+ status: this.checkStatus ? this.checkStatus : undefined,
+ };
+ const { data } = await selectAllReport(params);
+ this.reportTable = data.row;
+ this.total = data.total;
+ },
+ },
+};
</script>
<style lang="scss" scoped>
-.top-bar{
- margin: -25px -15px;
- background: #fff;
+.top-bar {
+ margin: -25px -15px;
+ background: #fff;
+ display: flex;
+ justify-content: space-between;
+ padding: 5px 24px 0px 24px;
+ .input-form {
+ width: 700px;
+ }
+ .el-dropdown-link {
+ cursor: pointer;
+ color: #409eff;
+ }
+ .el-icon-arrow-down {
+ font-size: 12px;
+ }
+}
+.library-table {
+ background-color: #fff;
+ flex: 1;
+ margin: 0px -15px;
+ margin-top: 40px;
+ display: flex;
+ flex-direction: column;
+ .table-header {
+ padding: 20px;
display: flex;
justify-content: space-between;
- padding: 5px 24px 0px 24px;
- .input-form {
- width: 800px;
+ .el-form-item {
+ margin-bottom: 30px !important;
}
-}
-.library-table{
- background-color: #fff;
- flex: 1;
- margin: 0px -15px;
- margin-top: 40px;
+ }
+ .table-box {
+ padding: 0px 20px;
+ margin-top: 0px;
+ flex: 1;
+ background: #fff;
+ display: flex;
+ flex-direction: column;
+ > div:nth-child(2) {
display: flex;
- flex-direction: column;
- .table-header{
- padding: 20px;
- display: flex;
- justify-content: space-between;
- .el-form-item{
- margin-bottom: 30px !important;
- }
- }
- .table-box{
- padding: 0px 20px;
- margin-top: 0px;
- flex: 1;
- background: #fff;
- display: flex;
- flex-direction: column;
- >div:nth-child(2){
- display: flex;
- justify-content: end;
- margin: 10px 0;
- }
- }
+ justify-content: end;
+ margin: 10px 0;
}
+ }
+}
</style>
--
Gitblit v1.9.3