From 34a7e21b3508ac0f5f011d958210fdb7176d726b Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期六, 09 九月 2023 11:54:05 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.22:9001/r/lims-before
---
src/views/experiment/reportAuditing/index.vue | 53 +++++++++++++++++++++++++----------------------------
1 files changed, 25 insertions(+), 28 deletions(-)
diff --git a/src/views/experiment/reportAuditing/index.vue b/src/views/experiment/reportAuditing/index.vue
index bfe06e0..b2bcebb 100644
--- a/src/views/experiment/reportAuditing/index.vue
+++ b/src/views/experiment/reportAuditing/index.vue
@@ -22,9 +22,9 @@
<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="1">閫氳繃</el-radio-button>
</el-radio-group>
- <el-checkbox v-model="checked" style="margin-left: 20px"
+ <el-checkbox @change="changeMy" v-model="checked" style="margin-left: 20px"
>浠呯湅鎴戠殑</el-checkbox
>
</div>
@@ -32,7 +32,7 @@
<div class="table-box">
<el-table
ref="reportTable"
- :max-height="800"
+ :max-height="600"
:cell-style="{ textAlign: 'left' }"
:header-cell-style="{
border: '0px',
@@ -63,7 +63,7 @@
</span>
</template></el-table-column
>
- <el-table-columne
+ <el-table-column
prop="materialName"
label="鏍峰搧鍚嶇О"
min-width="10%"
@@ -107,18 +107,18 @@
</template>
</el-table-column>
</el-table>
- <!-- 鍒嗛〉鍣� -->
- <div>
- <el-pagination
- :current-page="page"
- :page-sizes="[10, 20, 30, 40]"
- :page-size="pageSize"
- layout="total, sizes, prev, pager, next, jumper"
- :total="total"
- @size-change="handleSizeChange"
- @current-change="handleCurrentChange"
- />
- </div>
+ </div>
+ <!-- 鍒嗛〉鍣� -->
+ <div style="text-align: right;">
+ <el-pagination
+ :current-page="page"
+ :page-sizes="[10, 20, 30, 40]"
+ :page-size="pageSize"
+ layout="total, sizes, prev, pager, next, jumper"
+ :total="total"
+ @size-change="handleSizeChange"
+ @current-change="handleCurrentChange"
+ />
</div>
</div>
</div>
@@ -134,11 +134,11 @@
reportTable: [],
page: 1,
total: 0,
- pageSize: 8,
+ pageSize: 10,
checkskipvisible: false,
form:{},
formLabelWidth: '120px',
- checked:{},
+ checked: false,
usertt:[],
Auditconclusion:{},
tableRow: {},
@@ -151,6 +151,9 @@
shenHE(s){
this.tableRow=s
this.checkskipvisible=true
+ },
+ changeMy(){
+ this.getData()
},
// 鐘舵�佹寜閽�
handleRadioChange() {
@@ -182,11 +185,6 @@
this.reportTable[this.tableRow.$index].status=1
this.transmitData(this.tableRow.row.id,1)
this.checkskipvisible= false
- this.$message({
- message: '閫氳繃鎴愬姛',
- type: 'success'
- });
- this.getData();
},
//涓嶉�氳繃
nocheckskip(row) {
@@ -194,16 +192,12 @@
this.reportTable[this.tableRow.$index].status=0
this.transmitData(this.tableRow.row.id,2)
this.checkskipvisible= false
- this.$message({
- message: '寰呴�氳繃',
- type: 'warning'
- });
- this.getData();
},
//瀹℃牳
async transmitData(id, result) {
let param={"id":id,"result":result}
let data = await checkApi(param)
+ await this.getData();
},
// 鏌ヨ鍒楄〃
async getData() {
@@ -212,8 +206,10 @@
pageSize: this.pageSize,
name: this.input ? this.input : undefined,
status: this.checkStatus ? this.checkStatus : undefined,
+ checked: this.checked
};
const { data } = await selectAllReportCheck(params);
+ console.log(data);
this.reportTable = data.row;
this.total = data.total;
},
@@ -240,6 +236,7 @@
}
}
.library-table {
+ height:80vh;
background-color: #fff;
flex: 1;
margin: 0px -15px;
--
Gitblit v1.9.3