From 9a9be2ddb3edf4b45d8874901b42004256b8be85 Mon Sep 17 00:00:00 2001 From: Tcsm <1377977403@qq.com> Date: 星期一, 25 九月 2023 13:51:58 +0800 Subject: [PATCH] 9.25提交 --- ruoyi-ui/src/views/note/index.vue | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/ruoyi-ui/src/views/note/index.vue b/ruoyi-ui/src/views/note/index.vue index 27a6e85..f4fefc4 100644 --- a/ruoyi-ui/src/views/note/index.vue +++ b/ruoyi-ui/src/views/note/index.vue @@ -141,6 +141,9 @@ <el-table-column label="澶囨敞" prop="remark" sortable width="130" > <template slot-scope="scope">{{scope.row.remark? scope.row.remark: '鈥斺�斺�斺��'}}</template> </el-table-column> + <el-table-column label="鏄惁鏄湰瀹跺涵璁板綍" prop="ownData" sortable width="150px" > + <template slot-scope="scope">{{scope.row.ownData === 0 ? '鍚�': '鏄�'}}</template> + </el-table-column> <!-- <el-table-column label="瀹跺涵鍙�" prop="familyId" sortable width="100" /> --> <el-table-column label="鍙戠敓鏃堕棿" prop="happenTime" sortable width="150" align="center"> <template slot-scope="scope">{{scope.row.happenTime? scope.row.happenTime: '鈥斺�斺�斺��'}}</template> @@ -661,7 +664,7 @@ }, `property_${new Date().getTime()}.xlsx`) } else{ - this.download('/zfEquipment/export1/'+Ids, { + this.download('family/property/export1/'+Ids, { }, `property_${new Date().getTime()}.xlsx`) } }, -- Gitblit v1.9.1