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 | 114 +++++++++++++++++++++++++++++++-------------------------
1 files changed, 63 insertions(+), 51 deletions(-)
diff --git a/src/views/experiment/reportAuditing/index.vue b/src/views/experiment/reportAuditing/index.vue
index 0f4b6a3..fab1979 100644
--- a/src/views/experiment/reportAuditing/index.vue
+++ b/src/views/experiment/reportAuditing/index.vue
@@ -14,23 +14,8 @@
<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">
<div class="table-header">
<div class="search-bar">
@@ -48,18 +33,22 @@
<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%"
>
- <el-table-column type="selection" label="" min-width="5%" />
+ <el-table-column
+ type="index"
+ width="50">
+ </el-table-column>
+ <!-- <el-table-column label="" min-width="5%" /> -->
<el-table-column prop="materialCode" label="鏍峰搧缂栧彿" min-width="10%">
<template slot-scope="scope">
<span style="color: #409eff">
@@ -74,17 +63,17 @@
</span>
</template></el-table-column
>
- <el-table-column
+ <el-table-columne
prop="materialName"
label="鏍峰搧鍚嶇О"
min-width="10%"
/>
- <el-table-column prop="status" label="瀹℃壒鐘舵��" min-width="8%">
+ <el-table-column prop="status" label="瀹℃壒鐘舵��" min-width="8%" v-model="Auditconclusion">
<template slot-scope="scope">
<span>
- <el-tag 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
>
@@ -99,31 +88,23 @@
@click="handleClick(scope.row)"
>鏌ョ湅璇︾粏
</el-button>
- <el-button type="text" size="small" @click="checkskip = true">瀹℃牳</el-button>
+ <el-button type="text" size="small" @click="shenHE(scope)">瀹℃牳</el-button>
<el-dialog
title="鍘熷璁板綍瀹℃牳"
- :visible.sync="checkskip"
+ :visible.sync="checkskipvisible"
width="30%"
- :before-close="handleClose">
- <el-form :model="form">
- <el-form-item label="璇烽�夋嫨瀹℃牳缁撴灉" :label-width="formLabelWidth">
- </el-form-item>
- <el-row :gutter="20">
- <el-col :span="6" :offset="5">
- <!-- <el-button type="primary" style="background-color: rgb(208, 201, 192);">閫�鍥�</el-button> -->
- <el-button style="background-color: rgb(206, 211, 216);">閫�鍥�</el-button>
- </el-col>
- <el-col :span="6" :offset="3">
- <!-- <el-button type="primary" style="background-color: rgb(181, 237, 125);">閫氳繃</el-button> -->
- <el-button style="background-color: rgb(192, 236, 148);">閫氳繃</el-button>
- </el-col>
- </el-row>
+ >
+ <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="checkskip = false">鍙� 娑�</el-button>
- <el-button type="primary" @click="checkskip= false">纭� 瀹�</el-button>
+ <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>
@@ -148,27 +129,33 @@
</template>
<script>
-import { selectAllReportCheck } from "@/api/experiment/reportAuditing";
+import { selectAllReportCheck,checkApi } from "@/api/experiment/reportAuditing";
export default {
data() {
return {
- input: "",
+ input: '',
checkStatus: undefined,
reportTable: [],
page: 1,
total: 0,
- pageSize: 10,
- checked: true,
- checkskip: false,
+ pageSize: 8,
+ checkskipvisible: false,
form:{},
- handleClose:'',
- formLabelWidth: '120px'
+ formLabelWidth: '120px',
+ checked:{},
+ usertt:[],
+ Auditconclusion:{},
+ tableRow: {},
};
},
created() {
this.getData();
},
methods: {
+ shenHE(s){
+ this.tableRow=s
+ this.checkskipvisible=true
+ },
// 鐘舵�佹寜閽�
handleRadioChange() {
this.getData();
@@ -193,10 +180,35 @@
this.checkStatus = undefined;
this.getData();
},
- //瀹℃牳璺宠浆
- // checkskip() {
+ //閫氳繃
+ async 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) {
+ 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)
+ },
// 鏌ヨ鍒楄〃
async getData() {
const params = {
--
Gitblit v1.9.3