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/reportAuditing/index.vue | 105 ++++++++++++++++++++--------------------------------
1 files changed, 40 insertions(+), 65 deletions(-)
diff --git a/src/views/experiment/reportAuditing/index.vue b/src/views/experiment/reportAuditing/index.vue
index 4386859..b2bcebb 100644
--- a/src/views/experiment/reportAuditing/index.vue
+++ b/src/views/experiment/reportAuditing/index.vue
@@ -1,7 +1,7 @@
<template>
<div class="content-main">
<div class="top-bar">
- <el-form ref="form" :inline="true">
+ <el-form ref="form" :inline="true" style="margin-top: 10px;">
<el-form-item>
<el-input
v-model="input"
@@ -11,35 +11,20 @@
/>
</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-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>
</div>
-
-
-
-
-
-
-
<div class="library-table">
<div class="table-header">
<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="2">閫氳繃</el-radio-button>
+ <el-radio-button label="1">閫氳繃</el-radio-button>
</el-radio-group>
- <el-checkbox v-model="checked" style="margin-left: 20px"
+ <el-checkbox @change="changeMy" v-model="checked" style="margin-left: 20px"
>浠呯湅鎴戠殑</el-checkbox
>
</div>
@@ -47,14 +32,14 @@
<div class="table-box">
<el-table
ref="reportTable"
- :max-height="800"
- :cell-style="{ textAlign: 'center' }"
+ :max-height="600"
+ :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"
style="width: 100%"
@@ -78,7 +63,7 @@
</span>
</template></el-table-column
>
- <el-table-columne
+ <el-table-column
prop="materialName"
label="鏍峰搧鍚嶇О"
min-width="10%"
@@ -86,9 +71,9 @@
<el-table-column prop="status" label="瀹℃壒鐘舵��" min-width="8%" v-model="Auditconclusion">
<template slot-scope="scope">
<span>
- <el-tag :color="scope.row.status == 0 ? '' : 'rgb(187, 237, 221)'" type="warning">{{
- scope.row.status == 0 ? "寰呴�氳繃" : "閫氳繃"
- }}</el-tag>
+ <el-tag type="warning" v-if="scope.row.status === 0">寰呴�氳繃</el-tag>
+ <el-tag type="success" v-else-if="scope.row.status === 1">閫氳繃</el-tag>
+ <el-tag type="danger" v-else>涓嶉�氳繃</el-tag>
</span>
</template></el-table-column
>
@@ -103,41 +88,37 @@
@click="handleClick(scope.row)"
>鏌ョ湅璇︾粏
</el-button>
- <el-button type="text" size="small" @click="shenHE(scope)">瀹℃牳</el-button>
-
+ <el-button type="text" size="small" v-if="scope.row.status === 0" @click="shenHE(scope)">瀹℃牳</el-button>
<el-dialog
title="鍘熷璁板綍瀹℃牳"
:visible.sync="checkskipvisible"
width="30%"
-
>
<el-form :model="form">
<el-form-item label="璇烽�夋嫨瀹℃牳缁撴灉:" :label-width="formLabelWidth">
</el-form-item>
</el-form>
-
<div slot="footer" class="dialog-footer">
<el-button @click="checkskipvisible = false">鍙� 娑�</el-button>
<el-button style="background-color: rgb(206, 211, 216);" @click="nocheckskip(scope.row)" >涓嶉�氳繃</el-button>
<el-button type="primary" @click="checkskip(scope.row)">閫氳繃</el-button>
</div>
</el-dialog>
-
</template>
</el-table-column>
</el-table>
- <!-- 鍒嗛〉鍣� -->
- <div>
- <el-pagination
- :current-page="page"
- :page-sizes="[10, 20, 30, 40]"
- :page-size="pageSize"
- layout="total, sizes, prev, pager, next, jumper"
- :total="total"
- @size-change="handleSizeChange"
- @current-change="handleCurrentChange"
- />
- </div>
+ </div>
+ <!-- 鍒嗛〉鍣� -->
+ <div style="text-align: right;">
+ <el-pagination
+ :current-page="page"
+ :page-sizes="[10, 20, 30, 40]"
+ :page-size="pageSize"
+ layout="total, sizes, prev, pager, next, jumper"
+ :total="total"
+ @size-change="handleSizeChange"
+ @current-change="handleCurrentChange"
+ />
</div>
</div>
</div>
@@ -153,17 +134,14 @@
reportTable: [],
page: 1,
total: 0,
- pageSize: 8,
+ pageSize: 10,
checkskipvisible: false,
form:{},
- // handleClose:{},
formLabelWidth: '120px',
- checked:{},
+ checked: false,
usertt:[],
Auditconclusion:{},
tableRow: {},
-
-
};
},
created() {
@@ -173,6 +151,9 @@
shenHE(s){
this.tableRow=s
this.checkskipvisible=true
+ },
+ changeMy(){
+ this.getData()
},
// 鐘舵�佹寜閽�
handleRadioChange() {
@@ -199,33 +180,24 @@
this.getData();
},
//閫氳繃
- async checkskip(row) {
+ checkskip(row) {
console.log(this.tableRow);
this.reportTable[this.tableRow.$index].status=1
- this.transmitData(this.tableRow.row.id)
+ this.transmitData(this.tableRow.row.id,1)
this.checkskipvisible= false
- this.$message({
- message: '閫氳繃鎴愬姛',
- type: 'success'
- });
-
},
//涓嶉�氳繃
- async nocheckskip(row) {
+ nocheckskip(row) {
console.log(this.tableRow);
this.reportTable[this.tableRow.$index].status=0
- this.transmitData(this.tableRow.row.id)
+ this.transmitData(this.tableRow.row.id,2)
this.checkskipvisible= false
- this.$message({
- message: '寰呴�氳繃',
- type: 'warning'
- });
-
},
//瀹℃牳
- async transmitData(id) {
- let param={"id":id,"result":2}
+ async transmitData(id, result) {
+ let param={"id":id,"result":result}
let data = await checkApi(param)
+ await this.getData();
},
// 鏌ヨ鍒楄〃
async getData() {
@@ -234,8 +206,10 @@
pageSize: this.pageSize,
name: this.input ? this.input : undefined,
status: this.checkStatus ? this.checkStatus : undefined,
+ checked: this.checked
};
const { data } = await selectAllReportCheck(params);
+ console.log(data);
this.reportTable = data.row;
this.total = data.total;
},
@@ -262,6 +236,7 @@
}
}
.library-table {
+ height:80vh;
background-color: #fff;
flex: 1;
margin: 0px -15px;
--
Gitblit v1.9.3