From 7264eb37b4332ae414ed1bb7a2bad22a5e27ddb2 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期六, 26 八月 2023 16:11:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/experiment/reportAuditing/index.vue | 26 +++++++++++++++++---------
1 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/src/views/experiment/reportAuditing/index.vue b/src/views/experiment/reportAuditing/index.vue
index 6c699b2..4386859 100644
--- a/src/views/experiment/reportAuditing/index.vue
+++ b/src/views/experiment/reportAuditing/index.vue
@@ -78,7 +78,7 @@
</span>
</template></el-table-column
>
- <el-table-column
+ <el-table-columne
prop="materialName"
label="鏍峰搧鍚嶇О"
min-width="10%"
@@ -86,7 +86,7 @@
<el-table-column prop="status" label="瀹℃壒鐘舵��" min-width="8%" v-model="Auditconclusion">
<template slot-scope="scope">
<span>
- <el-tag type="warning">{{
+ <el-tag :color="scope.row.status == 0 ? '' : 'rgb(187, 237, 221)'" type="warning">{{
scope.row.status == 0 ? "寰呴�氳繃" : "閫氳繃"
}}</el-tag>
</span>
@@ -109,7 +109,7 @@
title="鍘熷璁板綍瀹℃牳"
:visible.sync="checkskipvisible"
width="30%"
-
+
>
<el-form :model="form">
<el-form-item label="璇烽�夋嫨瀹℃牳缁撴灉:" :label-width="formLabelWidth">
@@ -153,7 +153,7 @@
reportTable: [],
page: 1,
total: 0,
- pageSize: 10,
+ pageSize: 8,
checkskipvisible: false,
form:{},
// handleClose:{},
@@ -163,7 +163,7 @@
Auditconclusion:{},
tableRow: {},
-
+
};
},
created() {
@@ -201,9 +201,13 @@
//閫氳繃
async checkskip(row) {
console.log(this.tableRow);
- this.reportTable[this.tableRow.$index].status=2
+ this.reportTable[this.tableRow.$index].status=1
this.transmitData(this.tableRow.row.id)
this.checkskipvisible= false
+ this.$message({
+ message: '閫氳繃鎴愬姛',
+ type: 'success'
+ });
},
//涓嶉�氳繃
@@ -212,12 +216,16 @@
this.reportTable[this.tableRow.$index].status=0
this.transmitData(this.tableRow.row.id)
this.checkskipvisible= false
+ this.$message({
+ message: '寰呴�氳繃',
+ type: 'warning'
+ });
},
//瀹℃牳
- async transmitData(id) {
- let param={"id":id,"result":1}
- let data = await checkApi(param)
+ async transmitData(id) {
+ let param={"id":id,"result":2}
+ let data = await checkApi(param)
},
// 鏌ヨ鍒楄〃
async getData() {
--
Gitblit v1.9.3