From 2eec82ffc96ae02a75b18ee2c426f7a162950b95 Mon Sep 17 00:00:00 2001 From: linwenling <3256558519@qq.com> Date: 星期二, 12 九月 2023 09:51:32 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ruoyi-ui/src/views/economy/index.vue | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/ruoyi-ui/src/views/economy/index.vue b/ruoyi-ui/src/views/economy/index.vue index f8e384c..d1fed0e 100644 --- a/ruoyi-ui/src/views/economy/index.vue +++ b/ruoyi-ui/src/views/economy/index.vue @@ -117,7 +117,9 @@ <el-table-column label="鐜伴噾/鑷姩鎵e垝" prop="kind" sortable width="130" > <template slot-scope="scope">{{scope.row.kind? scope.row.kind: '鈥斺�斺�斺��'}}</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="url" align="center" sortable width="110" > <template slot-scope="scope" > <div @click="handleCheck(scope.row)"> @@ -227,8 +229,7 @@ :http-request="requestUpload" :file-list="fileList" > - <div v-if="uploading" class="upload-status">姝e湪涓婁紶...</div> - <i v-if="!uploading" slot="default" class="el-icon-plus"></i> + <i slot="default" class="el-icon-plus"></i> <div slot="file" slot-scope="{file}"> <img class="el-upload-list__item-thumbnail" @@ -269,7 +270,8 @@ :http-request="requestUpload" :show-file-list="true" > - <el-button type="primary">涓婁紶</el-button> + <el-button type="primary">鐐瑰嚮涓婁紶</el-button> + <div v-if="uploading" class="upload-status">姝e湪涓婁紶...</div> <template #tip> <div class="el-upload__tip"> </div> -- Gitblit v1.9.1