From 261bb58ad91f703c397c32a089d367ac4170db8c Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期二, 06 五月 2025 22:30:50 +0800
Subject: [PATCH] 修改了状态
---
ruoyi-ui/src/views/contacts/index.vue | 143 +++++++++++++++++++++++------------------------
1 files changed, 71 insertions(+), 72 deletions(-)
diff --git a/ruoyi-ui/src/views/contacts/index.vue b/ruoyi-ui/src/views/contacts/index.vue
index 49f06e4..e73bf67 100644
--- a/ruoyi-ui/src/views/contacts/index.vue
+++ b/ruoyi-ui/src/views/contacts/index.vue
@@ -139,55 +139,30 @@
>瀵煎叆</el-button>
</el-upload>
- </el-col>
-
- <el-col :span="1.5">
- <el-button
- type="primary"
- plain
- icon="el-icon-top"
- size="mini"
- :disabled="multiple"
- @click="handleShare"
-
- >鍒嗕韩</el-button>
- </el-col>
-
- <el-col :span="1.5">
- <el-button
- type="primary"
- plain
- icon="el-icon-top"
- size="mini"
- @click="handleWho"
- >鍒嗕韩缁欒皝浜嗕粈涔堟暟鎹�</el-button>
- </el-col>
-
- <el-col :span="1.5">
- <el-button
- type="primary"
- plain
- icon="el-icon-top"
- size="mini"
- @click="whoShare"
- >鍒嗕韩缁欐垜鐨勬暟鎹�</el-button>
- </el-col>
-
- <el-col :span="1.5">
- <el-button
- type="primary"
- plain
- icon="el-icon-top"
- size="mini"
- @click="showData"
- >灞曠ず涓嬭浇鐨勫垎浜暟鎹�</el-button>
- </el-col>
-
- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+ </el-col>
+ <el-dropdown placement="鍒嗕韩鐩稿叧">
+ <el-button size="mini" type="primary"
+ plain
+ icon="el-icon-top">鍒嗕韩鐩稿叧</el-button>
+ <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" :data="contactList" :row-key="getRowId" ref="multipleTable" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" >
+ <el-table v-loading="loading" border :data="contactList" :row-key="getRowId" ref="multipleTable" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" >
<el-table-column type="selection" :reserve-selection="true" width="55" align="center" />
<el-table-column fixed label="搴忓彿" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="100px"/>
@@ -255,7 +230,7 @@
</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
@@ -486,12 +461,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>
@@ -631,14 +606,15 @@
import { treeselect as menuTreeselect, roleMenuTreeselect } from "@/api/system/menu";
import {getInfo} from "@/api/login";
import { Notification, MessageBox, Message, Loading } from 'element-ui'
-
+import {getAllInfo} from "@/api/system/user"
+import {showShareUser} from "@/api/bignote/index";
//瀵煎叆鎺ュ彛鍑芥暟
import {getContactList,enload, addContact, delContact,uploadPic,
share,shareToWho,getWhoShare,downShareData,deleteShareData,showShareData
} from "@/api/contacts/index";
import {listUserAll} from "@/api/root/index";
export default {
- name: "index",
+ name: "ZfContact",
dicts: ['sys_normal_disable'],
data() {
return {
@@ -658,6 +634,7 @@
title2: "",
loading1: false,
loading2: false,
+ valueFromParent: "閫氳褰�",
// 鏌ヨ鍙傛暟1
queryParams1: {
pageNum: 1,
@@ -705,7 +682,7 @@
dateRange: [],
// 鏁版嵁鑼冨洿閫夐」
fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
- '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
+ '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng','.M4A'],
fileList:[
],
@@ -973,37 +950,58 @@
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, 2021).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']
+ })
+ console.log(this.listRoot)
+ // 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.userOptions = []
this.getList();
+ this.getList1();
this.$modal.msgSuccess("鍒嗕韩鎴愬姛");
this.id1 = undefined
this.open1 = false;
@@ -1150,6 +1148,7 @@
/** 鏌ョ湅璇︾粏淇℃伅 */
handleCheck(row){
const id = row.id;
+ this.open2 = false;
this.$router.push("/familymodel/Contact/contactsInfo/" + id);
},
/** 淇敼鎸夐挳鎿嶄綔 */
--
Gitblit v1.9.1