From 2bd7979e7b7db44df83847f800695ee2188146a9 Mon Sep 17 00:00:00 2001 From: zouyu <2723363702@qq.com> Date: 星期五, 01 九月 2023 09:11:54 +0800 Subject: [PATCH] modified: .env.development modified: src/views/experiment/inspectionApplication/index.vue modified: src/views/experiment/reportAuditing/index.vue modified: src/views/inspectionManagement/commissionInspection/index.vue --- src/views/experiment/reportAuditing/index.vue | 117 ++++++++++++++++++++++++++++++++++++++++++++++------------ 1 files changed, 93 insertions(+), 24 deletions(-) diff --git a/src/views/experiment/reportAuditing/index.vue b/src/views/experiment/reportAuditing/index.vue index 0e8bf65..a24fe41 100644 --- a/src/views/experiment/reportAuditing/index.vue +++ b/src/views/experiment/reportAuditing/index.vue @@ -2,7 +2,7 @@ <div class="content-main"> <div class="top-bar"> <el-form ref="form" :inline="true"> - <el-form-item class="sermargin"> + <el-form-item> <el-input v-model="input" class="input-form" @@ -23,19 +23,14 @@ </el-dropdown-menu> </el-dropdown> </el-form> - <el-form> - <el-button class="rightBtn" type="primary" @click="exportData" - >瀹℃牳</el-button - > - </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="0">寰呴�氳繃</el-radio-button> + <el-radio-button label="2">閫氳繃</el-radio-button> </el-radio-group> <el-checkbox v-model="checked" style="margin-left: 20px" >浠呯湅鎴戠殑</el-checkbox @@ -57,23 +52,35 @@ :data="reportTable" style="width: 100%" > - <el-table-column type="selection" label="" min-width="5%" /> - <el-table-column - prop="materialCode" - label="鏍峰搧缂栧彿" - min-width="10%" - /> - <el-table-column prop="reportCode" label="鎶ュ憡鍗曞彿" min-width="10%" /> - <el-table-column + <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"> + {{ scope.row.materialCode }} + </span> + </template></el-table-column + > + <el-table-column prop="reportCode" label="鎶ュ憡鍗曞彿" min-width="10%"> + <template slot-scope="scope"> + <span style="color: #409eff"> + {{ scope.row.reportCode }} + </span> + </template></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 :color="scope.row.status == 0 ? '' : 'rgb(187, 237, 221)'" type="warning">{{ + scope.row.status == 0 ? "寰呴�氳繃" : "閫氳繃" }}</el-tag> </span> </template></el-table-column @@ -87,8 +94,28 @@ type="text" size="small" @click="handleClick(scope.row)" - >鏌ョ湅璇︾粏</el-button + >鏌ョ湅璇︾粏 + </el-button> + <el-button type="text" size="small" @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> @@ -110,23 +137,36 @@ </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, + pageSize: 8, + checkskipvisible: false, + form:{}, + // handleClose:{}, + formLabelWidth: '120px', + checked:{}, + usertt:[], + Auditconclusion:{}, + tableRow: {}, + + }; }, created() { this.getData(); }, methods: { + shenHE(s){ + this.tableRow=s + this.checkskipvisible=true + }, // 鐘舵�佹寜閽� handleRadioChange() { this.getData(); @@ -151,6 +191,35 @@ this.checkStatus = undefined; this.getData(); }, + //閫氳繃 + async checkskip(row) { + console.log(this.tableRow); + this.reportTable[this.tableRow.$index].status=1 + this.transmitData(this.tableRow.row.id) + 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) + this.checkskipvisible= false + this.$message({ + message: '寰呴�氳繃', + type: 'warning' + }); + + }, + //瀹℃牳 + async transmitData(id) { + let param={"id":id,"result":2} + let data = await checkApi(param) + }, // 鏌ヨ鍒楄〃 async getData() { const params = { -- Gitblit v1.9.3