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/collection/index.vue | 84 +++++++++++++++++++++++++++--------------
1 files changed, 55 insertions(+), 29 deletions(-)
diff --git a/ruoyi-ui/src/views/collection/index.vue b/ruoyi-ui/src/views/collection/index.vue
index 666a3aa..4c6a2d8 100644
--- a/ruoyi-ui/src/views/collection/index.vue
+++ b/ruoyi-ui/src/views/collection/index.vue
@@ -191,18 +191,18 @@
<template #dropdown>
<el-dropdown-menu>
<el-dropdown-item :disabled="multiple" icon="el-icon-top" style="height: 32px;width:240px;color: #0099ff;" @click.native="handleShare">鍒嗕韩</el-dropdown-item>
-
+
<el-dropdown-item icon="el-icon-top" @click.native="whoShare">鍒嗕韩缁欐垜鐨勬暟鎹�</el-dropdown-item>
<el-dropdown-item icon="el-icon-top" @click.native="handleWho">鍒嗕韩缁欒皝浜嗕粈涔堟暟鎹�</el-dropdown-item>
<el-dropdown-item icon="el-icon-top" @click.native="showData">灞曠ず涓嬭浇鐨勫垎浜暟鎹�</el-dropdown-item>
</el-dropdown-menu>
</template>
</el-dropdown>
-
-
-
+
+
+
<right-toolbar :parentValue.sync="valueFromParent" :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-
+
</el-row>
</div>
<el-table v-loading="loading" border :data="collectionList" :row-key="getRowId" ref="multipleTable" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" >
@@ -261,7 +261,7 @@
></div>
</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
@@ -626,10 +626,11 @@
} from "@/api/collection/index";
import {listUserAll} from "@/api/root/index";
import {Message} from "element-ui";
-
+import {showShareUser} from "@/api/bignote/index";
+import {getAllInfo} from "@/api/system/user"
export default {
- name: "index",
+ name: "ZfCollection",
dicts: ['sys_normal_disable'],
data() {
return {
@@ -840,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
@@ -935,37 +937,57 @@
return row.id
},
getList1() {
- this.loading1 = true;
- this.queryParams1.happenStartTime = this.dateRange1.length > 0 && this.dateRange1[0]
- this.queryParams1.happenEndTime = this.dateRange1.length > 0 && this.dateRange1[1]
- listUserAll(this.queryParams1).then(response => {
- this.listRoot = response.data.data;
- const kon = {}
- 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,'userListuserListuserList')
- this.loading1 = false;
- }
- );
+ let userId = this.$store.state.user.userId
+
+ this.userOptions = []
+ showShareUser(userId, 2018).then(response=>{
+ console.log("===========ddddddddddddd")
+ console.log(response.data)
+ console.log("--------------------")
+ response.data.forEach(element =>{
+ this.userOptions.push({label: element.oldName,value: element.userId})
+ })
+ })
+
+
+
+ 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;
+ }
+ );
},
// 纭鍒嗕韩
subShare(row) {
const shareList = {}
shareList.shareContents = this.id1 || this.ids;
shareList.shareIds = this.ids1
+ if(shareList.shareIds.length==0)
+ {
+ this.$modal.msgSuccess("璇烽�夋嫨鍒嗕韩瀵硅薄");
+ return;
+ }
console.log(shareList,'sharelistsharelist')
this.$modal.confirm('鏄惁纭鍒嗕韩锛�').then(function() {
return share(shareList);
}).then(() => {
this.getList();
+ this.getList1();
this.$modal.msgSuccess("鍒嗕韩鎴愬姛");
this.id1 = undefined
this.open1 = false;
@@ -1167,6 +1189,7 @@
/** 鏌ョ湅璇︾粏淇℃伅 */
handleCheck(row){
const id = row.id;
+ this.open2 = false;
this.$router.push("/familymodel/collection/collectionInfo/" + id);
},
@@ -1352,7 +1375,10 @@
_this.getList();
Message({ message: "瀵煎叆鎴愬姛", type: 'warning' })
- }).catch(() => { Message({ message: "瀵煎叆澶辫触", type: 'error' })});
+ }).catch(() => {
+
+ Message({ message: "瀵煎叆澶辫触", type: 'error' })
+ })
}
}
--
Gitblit v1.9.1