From 3d8bff94da257d3f429373297975c33b1b7ce28c Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期三, 09 十月 2024 20:58:37 +0800
Subject: [PATCH] 修改了对应的代码
---
ruoyi-ui/src/views/clanManager/clan/index.vue | 4 +-
ruoyi-ui/src/views/travel/index.vue | 1
ruoyi-ui/src/views/bignote/index.vue | 1
ruoyi-ui/src/views/contacts/index.vue | 1
ruoyi-ui/src/views/economy/index.vue | 1
ruoyi-ui/src/views/pet/index.vue | 3 +
ruoyi-ui/src/views/secret/index.vue | 1
ruoyi-ui/src/views/wish/index.vue | 1
ruoyi-ui/src/views/collection/index.vue | 4 +
ruoyi-ui/src/views/doctor/index.vue | 1
ruoyi-ui/src/views/self/show.vue | 43 ++++++++++++++++++++-
ruoyi-ui/src/views/device/index.vue | 1
ruoyi-ui/src/views/clean/index.vue | 1
ruoyi-ui/src/views/selfeconomy/index.vue | 1
ruoyi-ui/src/views/note/index.vue | 1
15 files changed, 58 insertions(+), 7 deletions(-)
diff --git a/ruoyi-ui/src/views/bignote/index.vue b/ruoyi-ui/src/views/bignote/index.vue
index 4f5c460..e44df48 100644
--- a/ruoyi-ui/src/views/bignote/index.vue
+++ b/ruoyi-ui/src/views/bignote/index.vue
@@ -866,6 +866,7 @@
}).then(() => {
this.getList();
+ this.getList1();
this.$modal.msgSuccess("鍒嗕韩鎴愬姛");
this.id1 = undefined
this.open1 = false;
diff --git a/ruoyi-ui/src/views/clanManager/clan/index.vue b/ruoyi-ui/src/views/clanManager/clan/index.vue
index f9975e0..34d93a4 100644
--- a/ruoyi-ui/src/views/clanManager/clan/index.vue
+++ b/ruoyi-ui/src/views/clanManager/clan/index.vue
@@ -71,13 +71,13 @@
@click="handleUpdate(scope.row)"
v-hasPermi="['system:role:edit']"
>淇敼</el-button>
- <el-button
+ <!-- <el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['system:role:remove']"
- >鍒犻櫎</el-button>
+ >鍒犻櫎</el-button> -->
</template>
</el-table-column>
diff --git a/ruoyi-ui/src/views/clean/index.vue b/ruoyi-ui/src/views/clean/index.vue
index 46b74e8..99fa9cc 100644
--- a/ruoyi-ui/src/views/clean/index.vue
+++ b/ruoyi-ui/src/views/clean/index.vue
@@ -913,6 +913,7 @@
}).then(() => {
this.getList();
+ this.getList1();
this.$modal.msgSuccess("鍒嗕韩鎴愬姛");
this.id1 = undefined
this.open1 = false;
diff --git a/ruoyi-ui/src/views/collection/index.vue b/ruoyi-ui/src/views/collection/index.vue
index a7498fd..81732b1 100644
--- a/ruoyi-ui/src/views/collection/index.vue
+++ b/ruoyi-ui/src/views/collection/index.vue
@@ -841,7 +841,8 @@
const list = {"shareIds": [this.selectWho],"shareContents": [row.id]}
deleteShareData(list).then(()=>{
Message({ message: "鏀跺洖鎴愬姛", type: 'success' })
-
+ this.getList1();
+ alert(234)
const list2 = {"shareIds": [this.selectWho]}
shareToWho(list2,this.queryParams2).then(response => {
this.shareList1 = response.data.data
@@ -981,6 +982,7 @@
}).then(() => {
this.getList();
+ this.getList1();
this.$modal.msgSuccess("鍒嗕韩鎴愬姛");
this.id1 = undefined
this.open1 = false;
diff --git a/ruoyi-ui/src/views/contacts/index.vue b/ruoyi-ui/src/views/contacts/index.vue
index 442ab28..ef06290 100644
--- a/ruoyi-ui/src/views/contacts/index.vue
+++ b/ruoyi-ui/src/views/contacts/index.vue
@@ -995,6 +995,7 @@
}).then(() => {
this.getList();
+ this.getList1();
this.$modal.msgSuccess("鍒嗕韩鎴愬姛");
this.id1 = undefined
this.open1 = false;
diff --git a/ruoyi-ui/src/views/device/index.vue b/ruoyi-ui/src/views/device/index.vue
index 5ae2aa9..dd3fa62 100644
--- a/ruoyi-ui/src/views/device/index.vue
+++ b/ruoyi-ui/src/views/device/index.vue
@@ -903,6 +903,7 @@
}).then(() => {
this.getList();
+ this.getList1();
this.$modal.msgSuccess("鍒嗕韩鎴愬姛");
this.id1 = undefined
this.open1 = false;
diff --git a/ruoyi-ui/src/views/doctor/index.vue b/ruoyi-ui/src/views/doctor/index.vue
index 8e78bae..72eac13 100644
--- a/ruoyi-ui/src/views/doctor/index.vue
+++ b/ruoyi-ui/src/views/doctor/index.vue
@@ -925,6 +925,7 @@
}).then(() => {
this.getList();
+ this.getList1();
this.$modal.msgSuccess("鍒嗕韩鎴愬姛");
this.id1 = undefined
this.open1 = false;
diff --git a/ruoyi-ui/src/views/economy/index.vue b/ruoyi-ui/src/views/economy/index.vue
index 3a55ec7..f5d1815 100644
--- a/ruoyi-ui/src/views/economy/index.vue
+++ b/ruoyi-ui/src/views/economy/index.vue
@@ -881,6 +881,7 @@
}).then(() => {
this.getList();
+ this.getList1();
this.$modal.msgSuccess("鍒嗕韩鎴愬姛");
this.id1 = undefined
this.open1 = false;
diff --git a/ruoyi-ui/src/views/note/index.vue b/ruoyi-ui/src/views/note/index.vue
index 96d8b61..6ed927c 100644
--- a/ruoyi-ui/src/views/note/index.vue
+++ b/ruoyi-ui/src/views/note/index.vue
@@ -878,6 +878,7 @@
}).then(() => {
this.getList();
+ this.getList1();
this.$modal.msgSuccess("鍒嗕韩鎴愬姛");
this.id1 = undefined
this.open1 = false;
diff --git a/ruoyi-ui/src/views/pet/index.vue b/ruoyi-ui/src/views/pet/index.vue
index f509d1e..a0ae555 100644
--- a/ruoyi-ui/src/views/pet/index.vue
+++ b/ruoyi-ui/src/views/pet/index.vue
@@ -920,7 +920,8 @@
this.$modal.confirm('鏄惁纭鍒嗕韩锛�').then(function() {
return share(shareList);
}).then(() => {
- // this.getList();
+ this.getList();
+ this.getList1();
Message({ message: "鍒嗕韩鎴愬姛", type: 'success' });
this.open1 = false;
this.id1 = undefined;
diff --git a/ruoyi-ui/src/views/secret/index.vue b/ruoyi-ui/src/views/secret/index.vue
index 771b78a..1c7209f 100644
--- a/ruoyi-ui/src/views/secret/index.vue
+++ b/ruoyi-ui/src/views/secret/index.vue
@@ -936,6 +936,7 @@
}).then(() => {
this.getList();
+ this.getList1();
this.$modal.msgSuccess("鍒嗕韩鎴愬姛");
this.id1 = undefined
this.open1 = false;
diff --git a/ruoyi-ui/src/views/self/show.vue b/ruoyi-ui/src/views/self/show.vue
index 0b25d3a..1c33216 100644
--- a/ruoyi-ui/src/views/self/show.vue
+++ b/ruoyi-ui/src/views/self/show.vue
@@ -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
diff --git a/ruoyi-ui/src/views/selfeconomy/index.vue b/ruoyi-ui/src/views/selfeconomy/index.vue
index 9d9e5a1..a34f37b 100644
--- a/ruoyi-ui/src/views/selfeconomy/index.vue
+++ b/ruoyi-ui/src/views/selfeconomy/index.vue
@@ -982,6 +982,7 @@
}).then(() => {
this.getList();
+ this.getList1();
this.$modal.msgSuccess("鍒嗕韩鎴愬姛");
this.id1 = undefined
this.open1 = false;
diff --git a/ruoyi-ui/src/views/travel/index.vue b/ruoyi-ui/src/views/travel/index.vue
index bf88b5f..8951c0e 100644
--- a/ruoyi-ui/src/views/travel/index.vue
+++ b/ruoyi-ui/src/views/travel/index.vue
@@ -1203,6 +1203,7 @@
}).then(() => {
this.getList();
+ this.getList1();
this.$modal.msgSuccess("鍒嗕韩鎴愬姛");
this.id1 = undefined
this.open1 = false;
diff --git a/ruoyi-ui/src/views/wish/index.vue b/ruoyi-ui/src/views/wish/index.vue
index ef5cb8d..c0456f4 100644
--- a/ruoyi-ui/src/views/wish/index.vue
+++ b/ruoyi-ui/src/views/wish/index.vue
@@ -942,6 +942,7 @@
}).then(() => {
this.getList();
+ this.getList1();
this.$modal.msgSuccess("鍒嗕韩鎴愬姛");
this.id1 = undefined
this.open1 = false;
--
Gitblit v1.9.1