From 02ff4d3b3c4829e6f97a704c60fe76433e65c4e6 Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期四, 07 九月 2023 18:03:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/components/view/raw-ins.vue | 22 ++++++++++++++++------
1 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/src/components/view/raw-ins.vue b/src/components/view/raw-ins.vue
index 5f3117b..b2dfefe 100644
--- a/src/components/view/raw-ins.vue
+++ b/src/components/view/raw-ins.vue
@@ -1,5 +1,7 @@
<style scoped>
- .raw_ins {}
+ .raw_ins {
+ height: 100%;
+ }
.raw_ins .title .el-button {
height: 32px;
@@ -80,7 +82,7 @@
<el-row>
<el-col :span="12" style="line-height: 32px;">鍘熸潗鏂欐楠�</el-col>
<el-col :span="12" style="text-align: right;">
- <el-button type="primary" icon="el-icon-plus" style="background: #004EA2;">鏂板</el-button>
+ <el-button type="primary" icon="el-icon-plus" style="background: #004EA2;" @click="goDetail(null)">鏂板</el-button>
<el-button icon="el-icon-download">鍒犻櫎</el-button>
</el-col>
</el-row>
@@ -110,7 +112,7 @@
</div>
<div class="thing">
<el-table :data="tableData" border style="width: 100%;overflow-y: auto;min-height: calc(100% - 50px)"
- max-height="calc(100% - 50px)" @selection-change="handleSelectionChange" border default-expand-all
+ max-height="calc(100% - 50px)" @selection-change="handleSelectionChange" default-expand-all
:tree-props="{children: 'children', hasChildren: 'hasChildren'}" row-key="id">
<el-table-column type="selection" width="50">
</el-table-column>
@@ -146,7 +148,7 @@
</el-table-column>
<el-table-column label="鎿嶄綔" width="100">
<template slot-scope="scope">
- <span class="table_do">鏌ョ湅</span>
+ <span class="table_do" @click="changeShowDetail(scope.row)">鏌ョ湅</span>
<span class="table_do">鎵撳嵃</span>
</template>
</el-table-column>
@@ -169,15 +171,16 @@
formTime: null,
createTime: null,
insState: 2,
- judgeState: 2
+ judgeState: 10
},
tableData: [],
selects: [],
currentPage: 1,
countSize: 0,
- pageSize: 10
+ pageSize: 2
}
},
+ props:['goDetail'],
mounted() {
this.selectRawInspectsList()
},
@@ -218,6 +221,13 @@
judgeState: 2
},
this.selectRawInspectsList()
+ },
+ changeShowDetail({id}){
+ this.goDetail(id)
+ // console.log(id)
+ // const res = await this.$axios.post(this.$api.url.selectRawInspectsListById,{params:{id}})
+ // console.log(res)
+
}
}
}
--
Gitblit v1.9.3