From c8ec099f3bf0d9cdc7e670ea2223c71e333d1e34 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期五, 08 九月 2023 17:31:44 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.22:9001/r/lims-before
---
src/views/experiment/reportAuditing/index.vue | 34 +++++++++++-----------------------
1 files changed, 11 insertions(+), 23 deletions(-)
diff --git a/src/views/experiment/reportAuditing/index.vue b/src/views/experiment/reportAuditing/index.vue
index fab1979..5fb6550 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,8 +11,8 @@
/>
</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>
</div>
@@ -22,7 +22,7 @@
<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
@@ -63,7 +63,7 @@
</span>
</template></el-table-column
>
- <el-table-columne
+ <el-table-column
prop="materialName"
label="鏍峰搧鍚嶇О"
min-width="10%"
@@ -88,26 +88,22 @@
@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>
@@ -138,7 +134,7 @@
reportTable: [],
page: 1,
total: 0,
- pageSize: 8,
+ pageSize: 10,
checkskipvisible: false,
form:{},
formLabelWidth: '120px',
@@ -181,33 +177,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,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,2)
this.checkskipvisible= false
- this.$message({
- message: '寰呴�氳繃',
- type: 'warning'
- });
-
},
//瀹℃牳
async transmitData(id, result) {
let param={"id":id,"result":result}
let data = await checkApi(param)
+ await this.getData();
},
// 鏌ヨ鍒楄〃
async getData() {
@@ -218,6 +205,7 @@
status: this.checkStatus ? this.checkStatus : undefined,
};
const { data } = await selectAllReportCheck(params);
+ console.log(data);
this.reportTable = data.row;
this.total = data.total;
},
--
Gitblit v1.9.3