From 9b26870265cbbc75bcd32529e46b229a49ec30a0 Mon Sep 17 00:00:00 2001 From: value <z1292839451@163.com> Date: 星期二, 05 九月 2023 11:29:23 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- src/views/experiment/reportAuditing/index.vue | 26 +++++++++----------------- 1 files changed, 9 insertions(+), 17 deletions(-) diff --git a/src/views/experiment/reportAuditing/index.vue b/src/views/experiment/reportAuditing/index.vue index cfe3239..fab1979 100644 --- a/src/views/experiment/reportAuditing/index.vue +++ b/src/views/experiment/reportAuditing/index.vue @@ -14,14 +14,6 @@ <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> </div> <div class="library-table"> @@ -41,13 +33,13 @@ <el-table ref="reportTable" :max-height="800" - :cell-style="{ textAlign: 'center' }" + :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%" @@ -79,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 > @@ -192,7 +184,7 @@ async 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: '閫氳繃鎴愬姛', @@ -204,7 +196,7 @@ async 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: '寰呴�氳繃', @@ -213,8 +205,8 @@ }, //瀹℃牳 - async transmitData(id) { - let param={"id":id,"result":2} + async transmitData(id, result) { + let param={"id":id,"result":result} let data = await checkApi(param) }, // 鏌ヨ鍒楄〃 -- Gitblit v1.9.3