From 16225c86f3bef25e88ecdb5fcc5469c2a7e446fb Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期五, 25 八月 2023 14:03:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/experiment/inspectionApplication/index.vue | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/views/experiment/inspectionApplication/index.vue b/src/views/experiment/inspectionApplication/index.vue
index 80346ca..b3fc4f1 100644
--- a/src/views/experiment/inspectionApplication/index.vue
+++ b/src/views/experiment/inspectionApplication/index.vue
@@ -82,7 +82,7 @@
label="妫�楠岀被鍨�"
min-width="80px">
<template slot-scope="scope">
- <div v-if="scope.row.type === 0" ><span>鍘熸潗鏂欐楠�</span></div>
+ <div v-if="scope.row.type === 0" ><span >鍘熸潗鏂欐楠�</span></div>
<div v-if="scope.row.type === 1" ><span>濮旀墭妫�楠�</span></div>
<div v-if="scope.row.type === 2" ><span>鎴愬搧妫�楠�</span></div>
</template>
@@ -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"
@@ -183,7 +183,7 @@
>
<div class="check-box">
<el-radio-group v-model="type" @change="handleRadioChange">
- <el-radio :label="0" border >鍘熸潗鏂欐楠�</el-radio>
+ <el-radio style="background-color: rgb(170, 236, 214);border-radius: 10px;" :label="0" border >鍘熸潗鏂欐楠�</el-radio>
<el-radio :label="1" border>濮旀墭妫�楠�</el-radio>
<el-radio :label="2" border>鎴愬搧妫�楠�</el-radio>
</el-radio-group>
@@ -662,14 +662,14 @@
// console.log(res);
this.inspectionTable = row;
- console.log(row.icode);
- this.icode = row.icode
- this.$router.push({name:'Viewdetails',query: {icode:row.icode}});
+ console.log(row.id);
+ this.id = row.id
+ this.$router.push({name:'Viewdetails',query: {id:row.id}});
this.selectInspectsList()
},
async selectInspectsList() {
// 鑾峰彇鍒嗛〉鍒楄〃
- const res = await selectInspectsList({ countSize: this.pageSize, pageSize: this.currentPage,message:this.icode})
+ const res = await selectInspectsList({ countSize: this.pageSize, pageSize: this.currentPage,message:this.id})
// this.inspectionTable = data
// console.log(res.data.row)
const data = res.data.row
@@ -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) {
--
Gitblit v1.9.3