From 2c0a14426d5fd2977995137a0f887947c5478055 Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期三, 23 八月 2023 11:00:57 +0800
Subject: [PATCH] 报告审核功能审核
---
src/views/experiment/reportAuditing/index.vue | 78 +++++++++++++++++++++++++--------------
src/api/experiment/reportAuditing.js | 11 +++++
src/views/experiment/inspectionApplication/index.vue | 10 ++--
3 files changed, 65 insertions(+), 34 deletions(-)
diff --git a/src/api/experiment/reportAuditing.js b/src/api/experiment/reportAuditing.js
index f6a7bae..4784701 100644
--- a/src/api/experiment/reportAuditing.js
+++ b/src/api/experiment/reportAuditing.js
@@ -2,8 +2,17 @@
export function selectAllReportCheck(params) {
return request({
- url: '/reportAuditing/selectAllReportAuditing',
+ // url: '/reportAuditing/selectAllReportAuditing',
+ url: '/report/selectAllReport',
method: 'get',
params
})
}
+// 瀹℃牳
+export function checkApi(params){
+ return request({
+ url: '/report/check',
+ method: 'post',
+ params
+ })
+}
\ No newline at end of file
diff --git a/src/views/experiment/inspectionApplication/index.vue b/src/views/experiment/inspectionApplication/index.vue
index 80346ca..a378d03 100644
--- a/src/views/experiment/inspectionApplication/index.vue
+++ b/src/views/experiment/inspectionApplication/index.vue
@@ -164,7 +164,7 @@
<el-pagination
class="pagination"
:current-page="currentPage"
- :page-sizes="[1, 10, 20, 30]"
+ :page-sizes="[ 10, 20, 30,40]"
:page-size="pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="total"
@@ -721,10 +721,10 @@
this.total = this.inspectionTable.length
},
reset(){
- this.countSize = 1
- this.searchData = { }
- // console.log('2222');
- this.selectInspectsList()
+ this.countSize = 1;
+ this.pageSize = 8;
+ this.searchData = { };
+ this.selectInspectsList();
},
//琚�変腑鐨勪俊鎭� 鍗曢��
handleSelectionChange(val) {
diff --git a/src/views/experiment/reportAuditing/index.vue b/src/views/experiment/reportAuditing/index.vue
index 0f4b6a3..6c699b2 100644
--- a/src/views/experiment/reportAuditing/index.vue
+++ b/src/views/experiment/reportAuditing/index.vue
@@ -59,7 +59,11 @@
: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">
@@ -79,7 +83,7 @@
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">{{
@@ -99,31 +103,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 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>
+
<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 +144,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,
- checkskip: false,
+ checkskipvisible: false,
form:{},
- handleClose:'',
- formLabelWidth: '120px'
+ // handleClose:{},
+ formLabelWidth: '120px',
+ checked:{},
+ usertt:[],
+ Auditconclusion:{},
+ tableRow: {},
+
+
};
},
created() {
this.getData();
},
methods: {
+ shenHE(s){
+ this.tableRow=s
+ this.checkskipvisible=true
+ },
// 鐘舵�佹寜閽�
handleRadioChange() {
this.getData();
@@ -193,10 +198,27 @@
this.checkStatus = undefined;
this.getData();
},
- //瀹℃牳璺宠浆
- // checkskip() {
+ //閫氳繃
+ async checkskip(row) {
+ console.log(this.tableRow);
+ this.reportTable[this.tableRow.$index].status=2
+ this.transmitData(this.tableRow.row.id)
+ this.checkskipvisible= false
- // },
+ },
+ //涓嶉�氳繃
+ async nocheckskip(row) {
+ console.log(this.tableRow);
+ this.reportTable[this.tableRow.$index].status=0
+ this.transmitData(this.tableRow.row.id)
+ this.checkskipvisible= false
+
+ },
+ //瀹℃牳
+ async transmitData(id) {
+ let param={"id":id,"result":1}
+ let data = await checkApi(param)
+ },
// 鏌ヨ鍒楄〃
async getData() {
const params = {
--
Gitblit v1.9.3