From 71e8709a556ec8782e4da4bcae52fa050ef2066f Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期二, 26 三月 2024 15:34:55 +0800
Subject: [PATCH] Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_web
---
ruoyi-ui/src/views/meeting/approve.vue | 40 ++++++++++++++++++++++++++++++----------
1 files changed, 30 insertions(+), 10 deletions(-)
diff --git a/ruoyi-ui/src/views/meeting/approve.vue b/ruoyi-ui/src/views/meeting/approve.vue
index 01ffa4c..c67d6c1 100644
--- a/ruoyi-ui/src/views/meeting/approve.vue
+++ b/ruoyi-ui/src/views/meeting/approve.vue
@@ -10,12 +10,6 @@
<span>浼氳瀹℃壒</span>
<div class="button-container"></div>
<div style="display: flex; align-items: center;">
-<!-- <el-button size="mini" type="text" v-hasPermi="['person:information:memo']" style="margin-left: 200px">
- <div class="form"><el-icon style="padding-right:100px;"></el-icon>
- <span class="text" style="width: 69px;height: 26px;font-size: 16px;
- font-family: Microsoft YaHei-Regular, Microsoft YaHei; color: #EBA4AA;">鏂扮敵璇�</span>
- </div>
- </el-button> -->
</div>
</h1>
@@ -100,9 +94,10 @@
<el-table-column label="鎿嶄綔" align="center" width="250" class-name="small-padding fixed-width">
<template slot-scope="scope" v-if="scope.row.roleId !== 1">
<div class="button-container">
- <el-button size="mini" type="text">鍚屾剰</el-button>
- <el-button size="mini" type="text" icon="el-icon-delete">鎷掔粷</el-button>
- <el-button size="mini" type="text" icon="el-icon-d-arrow-right">鏌ョ湅璇︽儏</el-button>
+ <el-button v-show="agree" size="mini" type="text" @click="agree(scope.row)">鍚屾剰</el-button>
+ <el-button v-show="agree" size="mini" type="text" icon="el-icon-delete">鎷掔粷</el-button>
+ <el-button v-show="agree1" size="mini" type="text" icon="el-icon-delete">閲嶆柊瀹℃壒</el-button>
+ <el-button size="mini" type="text" icon="el-icon-d-arrow-right" @click="handleCheck(scope.row)">鏌ョ湅璇︽儏</el-button>
</div>
</template>
</el-table-column>
@@ -131,13 +126,17 @@
people: undefined,
address: undefined,
title: undefined,
- remark: undefined
+ remark: undefined,
+ status: undefined,
+ agree1: false,
+ agree: true,
}
}
},
methods: {
tableRowClassName({ row, rowIndex }) {
+
if (rowIndex % 2 == 0) {
return "statistics-warning-row1";
} else {
@@ -148,6 +147,27 @@
return row.id
},
+ agree(row){
+ this.agree1 = true
+ this.agree = false
+ row.status = '鍚屾剰'
+
+
+ alert(row.status)
+ },
+ // 鏌ョ湅璇︾粏淇℃伅
+ handleCheck(row){
+ const id = row.id;
+ let jd = true
+
+ this.$router.push({
+ path:"/meeting/approve/approveInfo/" + id,
+ query:{
+ detail:jd
+ }
+ });
+ },
+
}
}
</script>
--
Gitblit v1.9.1