From 7c33a1164d3019feb3ad9e4844b3d364e5c6eb44 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期日, 17 十一月 2024 11:31:45 +0800
Subject: [PATCH] Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_web
---
ruoyi-ui/src/views/self/show.vue | 53 ++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 46 insertions(+), 7 deletions(-)
diff --git a/ruoyi-ui/src/views/self/show.vue b/ruoyi-ui/src/views/self/show.vue
index 5c64fff..db42d36 100644
--- a/ruoyi-ui/src/views/self/show.vue
+++ b/ruoyi-ui/src/views/self/show.vue
@@ -232,7 +232,7 @@
</el-table-column>
<!-- </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
@@ -442,12 +442,12 @@
<el-table v-loading="loading1" :data="listRoot" :row-key="getRowId2" 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>
@@ -534,7 +534,7 @@
size="mini"
type="text"
icon="el-icon-d-arrow-right"
- @click="handleCheck(scope.row)">
+ @click="handleCheck1(scope.row)">
<span style="font-size: 14px;">鏌ョ湅璇︽儏</span></el-button>
</div>
</template>
@@ -579,6 +579,8 @@
import {listNote,enload,getNote, addNote,updateNote, delNote,uploadPic,
share,shareToWho,getWhoShare,downShareData,deleteShareData,showShareData
} from "@/api/memo/index";
+import {showShareUser} from "@/api/bignote/index";
+import {getAllInfo} from "@/api/system/user"
import {getInfo} from "@/api/login";
import { Notification, MessageBox, Message, Loading } from 'element-ui'
//import { delFamilyevent, uploadPic } from '../../api/bignote'
@@ -974,7 +976,7 @@
created() {
this.getList();
-
+ this.getList1();
},
methods: {
// 鍒嗛〉
@@ -997,7 +999,42 @@
handleClose2(){
this.$refs.table1.clearSelection()
},
-
+ getList1() {
+ this.loading1 = true;
+ let userId = this.$store.state.user.userId
+ // alert(userId)
+
+ showShareUser(userId, 2062).then(response=>{
+ console.log("===========ddddddddddddd")
+ console.log(response.data)
+ console.log("--------------------")
+ response.data.forEach(element =>{
+ this.userOptions.push({label: element.oldName,value: element.userId})
+ })
+ })
+ // this.queryParams1.happenStartTime = this.dateRange1.length > 0 && this.dateRange1[0]
+ // this.queryParams1.happenEndTime = this.dateRange1.length > 0 && this.dateRange1[1]
+ // // alert(this.$store.state.user.clanId)
+ // this.listRoot = []
+ let clanId = this.$store.state.user.clanId
+ getAllInfo(clanId).then(response => {
+ this.listRoot = response.data;
+ const kon = {}
+ console.log(response.data,'userListuserListuserList99999999999999')
+ this.listRoot.forEach(element => {
+ kon[element['nickName']] = element['userId']
+ })
+ // for(let i in kon){
+ // this.userOptions.push({label: i,value: kon[i]})
+ // }
+ // for(let i in this.userOptions){
+ // this.userList.push(this.userOptions[i].value)
+ // }
+ // console.log(this.userList,'userListuserListuserList99999999999999')
+ this.loading1 = false;
+ }
+ );
+ },
// 涓嬭浇浠栦汉缁欐垜鍒嗕韩鐨勬暟鎹�
handleDown(row){
const a = {"downloadContent" : row.id}
@@ -1120,7 +1157,7 @@
this.$modal.confirm('鏄惁纭鍒嗕韩锛�').then(function() {
return share(shareList);
}).then(() => {
-
+this.getList1();
this.getList();
this.$modal.msgSuccess("鍒嗕韩鎴愬姛");
this.id1 = undefined
@@ -1357,6 +1394,7 @@
/** 鏌ョ湅璇︾粏淇℃伅 */
handleCheck1(row){
const id = row.id;
+ this.open2 = false;
this.$router.push("/self/self/memoInfo/" + id);
},
/** 淇敼鎸夐挳鎿嶄綔 */
@@ -1493,6 +1531,7 @@
/** 鏌ョ湅璇︾粏淇℃伅 */
handleCheck(row){
const id = row.id;
+
this.$router.push("/self/self/edit/" + id);
},
/** 淇敼鎸夐挳鎿嶄綔 */
--
Gitblit v1.9.1