From c4d4c5d25cd78fa302fe07a824c8d7b3412bd9f1 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期二, 06 五月 2025 16:42:15 +0800
Subject: [PATCH] 修改内容
---
ruoyi-ui/src/views/wish/index.vue | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/ruoyi-ui/src/views/wish/index.vue b/ruoyi-ui/src/views/wish/index.vue
index c0456f4..7316654 100644
--- a/ruoyi-ui/src/views/wish/index.vue
+++ b/ruoyi-ui/src/views/wish/index.vue
@@ -224,7 +224,7 @@
<el-table-column label="澶囨敞" prop="remark" sortable :show-overflow-tooltip="true" width="90" align="center">
<template slot-scope="scope">{{scope.row.remark? scope.row.remark: '鈥斺�斺�斺��'}}</template>
</el-table-column>
- <el-table-column label="鎿嶄綔" align="center" width="250" class-name="small-padding fixed-width" v-if="userId != 2">
+ <el-table-column fixed="right" label="鎿嶄綔" align="center" width="250" class-name="small-padding fixed-width" v-if="userId != 2">
<template slot-scope="scope" v-if="scope.row.roleId !== 1">
<div class="button-container">
<el-button
@@ -447,12 +447,12 @@
<el-table v-loading="loading1" :data="listRoot" :row-key="getRowId1" ref="table1" @selection-change="handleSelectionChange1" :row-class-name="tableRowClassName" style="background: #FFEFF2; border-radius: 14px 14px 14px 14px;">
<el-table-column type="selection" width="55" align="center" />
<el-table-column fixed label="搴忓彿" sortable type="index" :index="(queryParams1.pageNum-1)*queryParams1.pageSize+1" width="130"/>
- <el-table-column label="韬唤" prop="identity" sortable width="130" >
+ <!-- <el-table-column label="韬唤" prop="identity" sortable width="130" >
<template slot-scope="scope" >
<span v-if="scope.row.isMyFamily==1">绗瑊{scope.row.identity}}浠�</span>
<span v-else>鈥斺��</span>
</template>
- </el-table-column>
+ </el-table-column> -->
<el-table-column label="濮撳悕" prop="nickName" sortable :show-overflow-tooltip="true" width="145" align="center"/>
</el-table>
@@ -656,7 +656,7 @@
// 鏁版嵁鑼冨洿閫夐」
// 鏁版嵁鑼冨洿閫夐」
fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
- '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng','.m4a'],
+ '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng','.m4a','.M4A'],
fileList:[],
fileList1:[],
@@ -913,6 +913,7 @@
// // alert(this.$store.state.user.clanId)
// this.listRoot = []
let clanId = this.$store.state.user.clanId
+ if(clanId!=null){
getAllInfo(clanId).then(response => {
this.listRoot = response.data;
const kon = {}
@@ -930,6 +931,7 @@
this.loading1 = false;
}
);
+ }
},
// 纭鍒嗕韩
subShare(row) {
@@ -940,7 +942,7 @@
this.$modal.confirm('鏄惁纭鍒嗕韩锛�').then(function() {
return share(shareList);
}).then(() => {
-
+ this.userOptions = []
this.getList();
this.getList1();
this.$modal.msgSuccess("鍒嗕韩鎴愬姛");
--
Gitblit v1.9.1