From 4fabfe4dbd2eb28d07a4350597d314958cc1c281 Mon Sep 17 00:00:00 2001 From: MrShi <1878285526@qq.com> Date: 星期四, 09 十月 2025 11:16:43 +0800 Subject: [PATCH] 优化 --- admin/src/views/business/actionLog.vue | 40 ++++++++++++++++++++++++++-------------- 1 files changed, 26 insertions(+), 14 deletions(-) diff --git a/admin/src/views/business/actionLog.vue b/admin/src/views/business/actionLog.vue index 5eded99..4a8222c 100644 --- a/admin/src/views/business/actionLog.vue +++ b/admin/src/views/business/actionLog.vue @@ -9,13 +9,8 @@ <el-form-item label="杞﹁締缂栫爜" prop="bikeCode"> <el-input v-model="searchForm.bikeCode" placeholder="璇疯緭鍏ヨ溅杈嗙紪鐮�" @keypress.enter.native="search"></el-input> </el-form-item> - <el-form-item label="鎿嶄綔浜�" prop="creator"> - <el-select v-model="searchForm.userId" placeholder="璇烽�夋嫨"> - <el-option label="鏈綊杩�" :value="1"> - </el-option> - <el-option label="宸插綊杩�" :value="1"> - </el-option> - </el-select> + <el-form-item label="鎿嶄綔浜�" prop="creatorName"> + <el-input v-model="searchForm.creatorName" placeholder="璇疯緭鍏ユ搷浣滀汉" @keypress.enter.native="search"></el-input> </el-form-item> <section> <el-button type="primary" @click="search">鎼滅储</el-button> @@ -31,19 +26,35 @@ </li> </ul> <el-table v-loading="isWorking.search" :data="tableData.list" stripe border> - <el-table-column prop="openid" label="鐢ㄦ埛" min-width="180px" align="center"></el-table-column> - <el-table-column prop="bikeCode" label="杞﹁締缂栫爜" min-width="100px" align="center"></el-table-column> - <el-table-column prop="rentSiteId" label="鍊熷嚭绔欑偣" min-width="100px" align="center"></el-table-column> - <el-table-column prop="rentDate" label="鍊熷嚭鏃堕棿" min-width="140px" align="center"></el-table-column> + <el-table-column prop="ridesObj.memberId" label="鐢ㄦ埛" min-width="180px" align="center"> + <template slot-scope="{row}"> + {{ row.ridesObj ? row.ridesObj.memberOpenid : '' }} + </template> + </el-table-column> + <el-table-column prop="bikeCode" label="杞﹁締缂栫爜" min-width="100px" align="center"> + <template slot-scope="{row}"> + {{ row.ridesObj ? row.ridesObj.bikeCode : '' }} + </template> + </el-table-column> + <el-table-column prop="rentSiteId" label="鍊熷嚭绔欑偣" min-width="100px" align="center"> + <template slot-scope="{row}"> + {{ row.ridesObj ? row.ridesObj.rentSiteId : '' }} + </template> + </el-table-column> + <el-table-column prop="rentDate" label="鍊熷嚭鏃堕棿" min-width="140px" align="center"> + <template slot-scope="{row}"> + {{ row.ridesObj ? row.ridesObj.rentDate : '' }} + </template> + </el-table-column> <el-table-column prop="type" label="璋冩暣绫诲瀷" min-width="100px" align="center"> <template slot-scope="{row}"> <div>{{ row.type == 0 ? '寮哄埗杩樿溅' : '楠戣鏃堕暱淇敼' }}</div> </template> </el-table-column> <el-table-column prop="createDate" label="鎿嶄綔鏃堕棿" min-width="140px" align="center"></el-table-column> - <el-table-column prop="creator" label="鎿嶄綔浜�" min-width="100px" align="center"></el-table-column> + <el-table-column prop="creatorName" label="鎿嶄綔浜�" min-width="100px" align="center"></el-table-column> <el-table-column prop="actReason" label="鍘熷洜" min-width="100px" align="center"></el-table-column> - <el-table-column prop="paactInforamId" label="澶囨敞" min-width="100px" align="center"></el-table-column> + <el-table-column prop="actInfo" label="澶囨敞" min-width="100px" align="center"></el-table-column> </el-table> <pagination @size-change="handleSizeChange" @current-change="handlePageChange" :pagination="tableData.pagination"> </pagination> @@ -66,12 +77,13 @@ openid: '', creator: '', bikeCode: '', + typeList: [0, 1] }, } }, created() { this.config({ - module: '鐢ㄦ埛楠戣璁板綍琛�', + module: '绠$悊鍛樻搷浣滄棩蹇�', api: '/business/actionLog', 'field.id': 'id', 'field.main': 'id' -- Gitblit v1.9.3