From ed96edec7c6dfd4944d0ee1c6d924c7cb808428c Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期五, 18 十月 2024 10:43:47 +0800
Subject: [PATCH] 修改了相应的bug
---
ruoyi-ui/src/views/meeting/approve.vue | 38 ++++++++++++++++++++------------------
1 files changed, 20 insertions(+), 18 deletions(-)
diff --git a/ruoyi-ui/src/views/meeting/approve.vue b/ruoyi-ui/src/views/meeting/approve.vue
index 0563977..28fcbbd 100644
--- a/ruoyi-ui/src/views/meeting/approve.vue
+++ b/ruoyi-ui/src/views/meeting/approve.vue
@@ -20,7 +20,7 @@
height: 35px;
border-radius: 16px 16px 16px 16px;
opacity: 0.5;"
- value-format="yyyy-MM-dd"
+ value-format="yyyy-MM-dd HH:mm:ss"
type="daterange"
range-separator="-"
start-placeholder="寮�濮嬫棩鏈�"
@@ -62,7 +62,7 @@
</el-form>
- <el-table v-loading="loading" :data="meetingList" :row-key="getRowId" ref="multipleTable"
+ <el-table v-loading="loading" border :data="meetingList" :row-key="getRowId" ref="multipleTable"
@selection-change="handleSelectionChange" :row-class-name="tableRowClassName">
<!-- <el-table-column type="selection" :reserve-selection="true" width="55" align="center" /> -->
@@ -122,7 +122,8 @@
</el-table-column>
<el-table-column label="鐘舵��" prop="statu" sortable align="center">
- <template slot-scope="scope">{{scope.row.statu===1? '鍚屾剰': '鎷掔粷'}}</template>
+ <!-- <template slot-scope="scope">{{scope.row.statu===1? '鍚屾剰': '鎷掔粷'}}</template> -->
+ <template slot-scope="scope">{{scope.row.statu ===3 ? '寰呭鎵�' : (scope.row.statu===1? '鍚屾剰': '鎷掔粷')}}</template>
</el-table-column>
<el-table-column label="鎿嶄綔" align="center" width="200" class-name="small-padding fixed-width">
@@ -175,21 +176,21 @@
meetingList: [],
formDat:{
id: undefined,
- title: undefined,
- place: undefined,
- conPeople: undefined,
- partPeople: undefined,
- applyPerson: undefined,
- applyApart: undefined,
- startTime: undefined,
- endTime: undefined,
- happenStartTime: undefined,
- happenEndTime: undefined,
- isPlacebrand: undefined,
- connPerson: undefined,
- connPhone: undefined,
+ // title: undefined,
+ // place: undefined,
+ // conPeople: undefined,
+ // partPeople: undefined,
+ // applyPerson: undefined,
+ // applyApart: undefined,
+ // startTime: undefined,
+ // endTime: undefined,
+ // happenStartTime: undefined,
+ // happenEndTime: undefined,
+ // isPlacebrand: undefined,
+ // connPerson: undefined,
+ // connPhone: undefined,
statu: undefined,
- createTime: undefined
+ // createTime: undefined
},
queryParams: {
pageNum: 1,
@@ -226,6 +227,7 @@
},
methods: {
agree(row){
+ // console.log(row,'rowrowrow')
this.formDat1.id = row.id
this.formDat1.statu = 1
// this.$refs['elForm'].validate(valid => {
@@ -270,7 +272,7 @@
this.queryParams.happenEndTime = this.dateRange.length > 0 && this.dateRange[1]
listMeeting2(this.queryParams).then(response => {
this.meetingList = response.data.data;
-
+ // console.log(this.meetingList,'meetingmeeting')
this.total = response.data.total;
this.loading = false;
}
--
Gitblit v1.9.1