From 6508e19c8d2e266c7405439ac32c06df6f602439 Mon Sep 17 00:00:00 2001
From: feige <feige@qq.com>
Date: 星期二, 06 一月 2026 16:14:50 +0800
Subject: [PATCH] 修改代码
---
ruoyi-ui/src/views/bignote/index.vue | 917 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 873 insertions(+), 44 deletions(-)
diff --git a/ruoyi-ui/src/views/bignote/index.vue b/ruoyi-ui/src/views/bignote/index.vue
index ecda823..966c01e 100644
--- a/ruoyi-ui/src/views/bignote/index.vue
+++ b/ruoyi-ui/src/views/bignote/index.vue
@@ -1,5 +1,5 @@
<template>
- <div class="app-container" style="opacity: 1;">
+ <div class="app-container" style="opacity: 1;" >
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" >
<el-form-item label="澶т簨鏍囬" prop="title">
@@ -80,7 +80,7 @@
<!--color: #000000;-->
<!--line-height: 21px;-->
<!--">瀹跺ぇ浜嬭</div>-->
- <el-row :gutter="10" class="mb8">
+ <el-row :gutter="10" class="mb8" v-if="userId != 2">
<el-col :span="1.5">
<el-button
type="primary"
@@ -139,12 +139,27 @@
</el-upload>
</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>
- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+ <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>
<!-- 搴忓彿銆佹椂闂淬�佷汉鐗┿�佸湴鐐广�佸ぇ浜嬫爣棰樸�佺數瀛愭枃浠躲�佸娉� -->
<!-- 杩欓噷鏈変釜familyList鏁扮粍 鏄湪data()涓畾涔夌殑 -->
- <el-table v-loading="loading" :data="familyList" :row-key="getRowId" ref="multipleTable" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName">
+ <el-table v-loading="loading" border :data="familyList" :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="80px"/>
@@ -153,6 +168,8 @@
</el-table-column>
<el-table-column label="浜虹墿" prop="people" sortable width="150px" />
<el-table-column label="鍦扮偣" prop="address" sortable width="150px" />
+ <el-table-column label="鏄惁闅愯棌" prop="isHide" sortable :show-overflow-tooltip="true" width="150px" />
+
<el-table-column label="澶т簨鏍囬" prop="title" sortable :show-overflow-tooltip="true" width="150px" />
<el-table-column label="鏄惁鏄湰瀹跺涵璁板綍" prop="ownData" sortable width="150px" >
<template slot-scope="scope">{{scope.row.ownData === 0 ? '鍚�': '鏄�'}}</template>
@@ -185,7 +202,7 @@
></div>
</template>
</el-table-column>
- <el-table-column label="鎿嶄綔" align="center" width="250" class-name="small-padding fixed-width">
+ <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
@@ -208,6 +225,12 @@
<el-button size="mini" type="text" icon="el-icon-d-arrow-right" @click="handleCheck(scope.row)">鏌ョ湅璇︽儏</el-button>
</el-dropdown>
+ <el-button
+ size="mini"
+ type="text"
+ icon="el-icon-d-arrow-right"
+ @click="handleShare(scope.row)">
+ <span style="font-size: 14px;">鍒嗕韩</span></el-button>
</div>
</template>
</el-table-column>
@@ -223,28 +246,84 @@
/>
<!-- 娣诲姞鎴栦慨鏀硅祫浜т俊鎭厤缃璇濇 -->
- <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
+ <el-dialog :title="title" @click.native="handleDialogClick" :visible.sync="open" width="800px" :append-to-body="true">
<el-form ref="elForm" :model="formDat" :rules="rules" size="medium" label-width="100px">
<el-form-item label="澶т簨鏍囬" prop="title">
<el-input v-model="formDat.title" placeholder="璇疯緭鍏ュぇ浜嬫爣棰�" clearable :style="{width: '100%'}" ></el-input>
</el-form-item>
+ <!-- 瀹舵棌鎴愬憳閫夋嫨瀛楁 -->
+ <el-form-item label="瀹舵棌鎴愬憳" prop="selectedMemberIds">
+ <!-- 宸查�夋垚鍛樺洖鏄惧尯鍩� -->
+ <div v-if="selectedMemberNames.length > 0" class="selected-members">
+ <el-tag
+ v-for="(name, index) in selectedMemberNames"
+ :key="index"
+ closable
+ @close="handleTagClose(index)"
+ >
+ {{ name }}
+ </el-tag>
+ </div>
+ <!-- 瑙﹀彂寮圭獥鎸夐挳 -->
+ <el-button
+ type="primary"
+ icon="el-icon-user-plus"
+ @click="openMemberDialog"
+ :disabled="loading"
+ >
+ 閫夋嫨瀹舵棌鎴愬憳
+ </el-button>
+ </el-form-item>
- <el-form-item label="浜虹墿" prop="people">
- <el-input v-model="formDat.people" placeholder="璇疯緭鍏ヤ汉鐗�" clearable :style="{width: '100%'}" >
- </el-input>
- </el-form-item>
+ <!-- 鍏跺畠浜洪�夋嫨瀛楁 -->
+ <el-form-item label="鍏跺畠浜�" prop="otherPeople">
+ <!-- 宸查�夊叾瀹冧汉鍥炴樉鍖哄煙 -->
+ <div v-if="formDat.otherPeople && formDat.otherPeople.length > 0" class="selected-members">
+ <el-tag
+ v-for="(name, index) in formDat.otherPeople"
+ :key="index"
+ closable
+ @close="handleOtherPeopleTagClose(index)"
+ >
+ {{ name }}
+ </el-tag>
+ </div>
+ <!-- 瑙﹀彂寮圭獥鎸夐挳 -->
+ <el-button
+ type="primary"
+ icon="el-icon-user"
+ @click="openOtherPeopleDialog"
+ :disabled="loading"
+ >
+ 娣诲姞鍏跺畠浜�
+ </el-button>
+ </el-form-item>
<el-form-item label="鍦扮偣" prop="address">
<el-input v-model="formDat.address" placeholder="璇疯緭鍏ュ湴鐐�" clearable :style="{width: '100%'}" >
</el-input>
</el-form-item>
<el-form-item label="鍙戠敓鏃堕棿" prop="happenTime">
- <el-date-picker v-model="formDat.happenTime" type="date" placeholder="璇烽�夋嫨鏃ユ湡"
- :editable="false" :clearable="false" :style="{width: '100%'}" value-format="yyyy-MM-dd"
+ <el-date-picker v-model="formDat.happenTime" type="date" placeholder="璇烽�夋嫨鏃ユ湡"
+ @click.native.stop
+ ref="datePicker"
+
+
+ :editable="false" :clearable="false" :style="{width: '100%'}" value-format="yyyy-MM-dd"
></el-date-picker>
</el-form-item>
+
+ <el-form-item label="鏄惁闅愯棌" prop="isHide">
+
+ <el-radio-group v-model="formDat.isHide" :style="{width: '100%'}">
+ <el-radio label="鏄�">鏄�</el-radio>
+ <el-radio label="鍚�">鍚�</el-radio>
+ </el-radio-group>
+
+ </el-form-item>
+
<el-form-item label="澶囨敞" prop="remark">
<el-input v-model="formDat.remark" placeholder="璇疯緭鍏ュ娉�" clearable :style="{width: '100%'}" ></el-input>
</el-form-item>
@@ -369,26 +448,293 @@
</el-dialog>
+ <el-dialog
+ :visible.sync="memberDialogVisible"
+ title="閫夋嫨瀹舵棌鎴愬憳"
+ width="50%"
+ :close-on-click-modal="false"
+ >
+ <!-- 寮圭獥鍐呭鍖� -->
+ <div class="member-dialog-content">
+ <!-- 鎼滅储妗� -->
+ <el-input
+ v-model="memberSearch"
+ placeholder="鎼滅储鎴愬憳濮撳悕..."
+ prefix-icon="el-icon-search"
+ style="margin-bottom: 20px;"
+ ></el-input>
+
+
+
+ <!-- 鍔犺浇鐘舵�� -->
+ <div v-if="loading" class="loading-container">
+ <el-loading-spinner></el-loading-spinner>
+ <p>鍔犺浇瀹舵棌鎴愬憳涓�...</p>
+ </div>
+
+ <div v-else-if="familyMembers.length === 0" class="no-data">
+ <el-empty description="鏆傛棤瀹舵棌鎴愬憳鏁版嵁"></el-empty>
+ </div>
+<label v-for="item in familyMembers" :key="item.userId" class="signature-checkbox">
+ <input type="checkbox" v-model="selectedMemberIds" :value="item.userId">
+ <span>{{ item.oldName }}</span>
+ </label>
+
+ <hr class="divider-line">
+
+ <label v-for="item in anotherFamilyMembers" :key="item.userId" class="signature-checkbox">
+ <input type="checkbox" v-model="selectedMemberIds" :value="item.userId">
+ <span> {{ item.oldName }} </span>
+ </label>
+
+ <!-- 澶氶�夊垪琛紙鏈夋暟鎹級 -->
+<!-- <el-checkbox-group>
+ <el-checkbox
+
+
+ >
+ 4545
+
+ </el-checkbox>
+ </el-checkbox-group> -->
+
+</div>
+ <!-- 寮圭獥搴曢儴鎸夐挳 -->
+ <div slot="footer" class="dialog-footer">
+ <el-button @click="memberDialogVisible = false">鍙栨秷</el-button>
+ <el-button type="primary" @click="confirmMemberSelection">纭閫夋嫨</el-button>
+ </div>
+ </el-dialog>
+
+ <!-- 鍏跺畠浜哄脊绐� -->
+ <el-dialog
+ :visible.sync="otherPeopleDialogVisible"
+ title="娣诲姞鍏跺畠浜�"
+ width="400px"
+ :close-on-click-modal="false"
+ @close="handleOtherPeopleDialogClose"
+ >
+ <div class="other-people-dialog">
+ <el-input
+ v-model="otherPeopleInput"
+ placeholder="璇疯緭鍏ュ鍚嶏紝鎸夊洖杞︽垨鐐瑰嚮娣诲姞鎸夐挳娣诲姞"
+ @keyup.enter.native="addOtherPeople"
+ style="margin-bottom: 20px;"
+ >
+ <el-button slot="append" icon="el-icon-plus" @click="addOtherPeople">娣诲姞</el-button>
+ </el-input>
+
+ <!-- 宸叉坊鍔犵殑鍏跺畠浜哄垪琛� -->
+ <div v-if="formDat.otherPeople && formDat.otherPeople.length > 0" class="added-people-list">
+ <el-divider content-position="left">宸叉坊鍔� ({{ formDat.otherPeople.length }}浜�)</el-divider>
+ <el-tag
+ v-for="(name, index) in formDat.otherPeople"
+ :key="index"
+ closable
+ @close="handleOtherPeopleTagClose(index)"
+ style="margin-right: 8px; margin-bottom: 8px;"
+ >
+ {{ name }}
+ </el-tag>
+ </div>
+
+ <div v-else class="no-people" style="padding: 20px 0;">
+ <el-empty description="鏆傛湭娣诲姞浠讳綍浜�" :image-size="60"></el-empty>
+ </div>
+ </div>
+
+ <div slot="footer" class="dialog-footer">
+ <el-button type="primary" @click="confirmOtherPeople">瀹屾垚</el-button>
+ </div>
+ </el-dialog>
+
+ <!-- 鍒嗕韩瀵硅瘽妗�1 -->
+ <el-dialog :title="title1" :visible.sync="open1" width="500px" append-to-body @close="handleClose2">
+
+ <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" >
+ <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 label="濮撳悕" prop="nickName" sortable :show-overflow-tooltip="true" width="145" align="center"/>
+ </el-table>
+
+ <div slot="footer" class="dialog-footer">
+ <el-button type="primary" @click="subShare">鍒� 浜�</el-button>
+ </div>
+
+ </el-dialog>
+
+ <!-- 鍒嗕韩瀵硅瘽妗�2 -->
+ <el-dialog :title="title2" :visible.sync="open2" width="85%" append-to-body @close="handleClose">
+ <div>
+ <el-select v-if="ifNum == 1"
+ v-model="user" id="userSelect"
+ placeholder="璇烽�夋嫨鍒嗕韩鐨勫璞�" clearable
+ style="width: 240px;
+ height: 35px;
+ border-radius: 16px 16px 16px 16px;
+ margin-bottom: 5px;
+ opacity: 0.5;" filterable allow-create
+ @change="selectValue">
+ <el-option v-for="item in userOptions"
+ :key="item.value" :label="item.label" :value="item.value"/>
+ </el-select>
+ </div>
+
+ <el-table v-loading="loading2" :data="shareList1" :row-key="getRowId2" ref="multipleTable" @selection-change="handleSelectionChange2" :row-class-name="tableRowClassName" style="background: #FFEFF2; border-radius: 14px 14px 14px 14px;">
+ <!-- <el-table-column type="selection" :reserve-selection="true" width="55" align="center" /> -->
+ <!-- <el-table-column fixed label="搴忓彿" sortable type="index" align="center" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="60"/> -->
+ <el-table-column label="鍙戠敓鏃堕棿" prop="happenTime" sortable width="200px" align="center">
+ <template slot-scope="scope">{{scope.row.happenTime? scope.row.happenTime: '鈥斺�斺�斺��'}}</template>
+ </el-table-column>
+ <el-table-column label="浜虹墿" prop="people" sortable width="150px" />
+ <el-table-column label="鍦扮偣" prop="address" sortable width="150px" />
+ <el-table-column label="澶т簨鏍囬" prop="title" sortable :show-overflow-tooltip="true" width="150px" />
+ <el-table-column label="鏄惁鏄湰瀹跺涵璁板綍" prop="ownData" sortable width="150px" >
+ <template slot-scope="scope">{{scope.row.ownData === 0 ? '鍚�': '鏄�'}}</template>
+ </el-table-column>
+ <el-table-column label="澶囨敞" prop="remark" sortable width="150px" >
+ <template slot-scope="scope">{{scope.row.remark? scope.row.remark: '鈥斺�斺�斺��'}}</template>
+ </el-table-column>
+ <el-table-column label="鐢靛瓙鏂囦欢" prop="url" width="160" align="center">
+ <template slot-scope="scope" >
+ <div>
+ <img
+ class="el-upload-list__item-thumbnail"
+ src="../../assets/images/deviceLis.png"
+ alt=""
+ style="width: 35px; height: 35px;"
+ fit="cover"
+ v-if="!(scope.row.url === '' || scope.row.url === ',' || scope.row.url === null)"
+ >
+ <img
+ v-else
+ class="el-upload-list__item-thumbnail"
+ src="../../assets/images/deviceA.png"
+ alt=""
+ style="width: 35px; height: 35px;"
+ fit="cover"
+
+ ></div>
+ </template>
+ </el-table-column>
+
+ <el-table-column 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
+ v-if="ifNum == 2"
+ size="mini"
+ type="text"
+ icon="el-icon-d-arrow-right"
+ @click="handleDown(scope.row)">
+ <span style="font-size: 14px;">涓嬭浇</span></el-button>
+ <el-button
+ v-if="ifNum == 1"
+ size="mini"
+ type="text"
+ icon="el-icon-d-arrow-right"
+ @click="handleBack(scope.row)">
+ <span style="font-size: 14px;">鏀跺洖</span></el-button>
+ <el-button
+ size="mini"
+ type="text"
+ icon="el-icon-d-arrow-right"
+ @click="handleCheck(scope.row)">
+ <span style="font-size: 14px;">鏌ョ湅璇︽儏</span></el-button>
+ </div>
+ </template>
+ </el-table-column>
+ </el-table>
+
+ <pagination
+ v-show="total1>0"
+ :total="total1"
+ :page.sync="queryParams2.pageNo"
+ :limit.sync="queryParams2.pageSize"
+ @pagination='fenYe'
+ style="background: #FEF7FC;"
+ />
+
+ </el-dialog>
+
</div>
</template>
<script>
-import { listRole, getRole, delRole, addRole, updateRole, dataScope, changeRoleStatus, deptTreeSelect } from "@/api/system/role";
+import { listRole, getRole, delRole, addRole,
+updateRole, dataScope, changeRoleStatus, deptTreeSelect } from "@/api/system/role";
import { treeselect as menuTreeselect, roleMenuTreeselect } from "@/api/system/menu";
import { Notification, MessageBox, Message, Loading } from 'element-ui'
+import {getAllInfo} from "@/api/system/user"
+import { getFamilyMembers,listAnotherFamilyInfo } from '@/api/root'; // 鍋囪鑾峰彇瀹舵棌鎴愬憳鐨凙PI
//鍦╯ystem/note/index.js涓鍏ユ帴鍙ｅ嚱鏁� --鎺ュソ浜�
-import {listFamilyevent,enload, delFamilyevent , addFamilyevent , uploadPic} from "@/api/bignote/index";
+import {listFamilyevent, enload, delFamilyevent , addFamilyevent , uploadPic,
+ share,shareToWho,getWhoShare,downShareData,deleteShareData,showShareData,showShareUser
+ } from "@/api/bignote/index";
+import {listUserAll} from "@/api/root/index";
import {getInfo} from "@/api/login";
export default {
- name: "Role",
+ name: "ZfEvent",
dicts: ['sys_normal_disable'],
data() {
return {
+
+
+
+
+
+ // 鎴愬憳澶氶�夌浉鍏�
+ memberDialogVisible: false, // 寮圭獥鍙鎬�
+ familyMembers: [], // 瀹舵棌鎴愬憳鍒楄〃锛堝師濮嬫暟鎹級
+ anotherFamilyMembers: [], //鍙﹀瀹舵棌鎴愬憳淇℃伅
+ selectedMemberIds: [], // 寮圭獥涓复鏃堕�変腑鐨勬垚鍛業D锛堢敤浜庡閫変氦浜掞級
+ memberSearch: '', // 鎴愬憳鎼滅储鍏抽敭璇�
+ loading: false, // 鍔犺浇鐘舵��
+ total1: 0,
+ // 鍒嗕韩缁欒皝鐨刲ist
+ listRoot: [],
+ open1:false,
+ open2:false,
+ id1: undefined,
+ shareList1: [],
+ // shareList2: [],
+ userOptions:[],
+ user:undefined,
+ userList:[],
+ ifNum:undefined,
+ selectWho:undefined,
+ title1: "",
+ title2: "",
+ loading1: false,
+ loading2: false,
+ // 鏌ヨ鍙傛暟1
+ queryParams1: {
+ pageNum: 1,
+ pageSize: 10,
+ },
+ queryParams2: {
+ pageNo: 1,
+ pageSize: 10,
+ },
+ ids1: [],
+ single1: true,
+ multiple1: true,
+ dateRange1: [],
+
+
+valueFromParent: "瀹跺ぇ浜嬭",
+ userId: undefined,
// 閬僵灞�
disabled: false,
@@ -406,7 +752,8 @@
total: 0,
// 瀹跺ぇ浜嬭琛ㄦ牸鏁版嵁
familyList: [],
-
+ selectedMemberIds:[],
+ displayMemberNames: [], // 鏄剧ず鐢ㄧ殑鎴愬憳鍚嶇О鏁扮粍
// 寮瑰嚭灞傛爣棰�
title: "",
@@ -422,7 +769,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','.M4A'],
fileList:[],
fileList1:[],
uploadFileList: [],
@@ -431,8 +778,13 @@
dsb:true,
btn:false,
uploading: false,
+ // 鍏跺畠浜哄脊绐楃浉鍏�
+ otherPeopleDialogVisible: false,
+ otherPeopleInput: '',
formDat: {
// type: undefined,
+ selectedMemberIds: [],
+ otherPeople: [], // 瀛樺偍鍏跺畠浜哄悕瀛�
title: undefined,
location: undefined,
holder: undefined,
@@ -464,6 +816,9 @@
},
// 琛ㄥ崟鏍￠獙
rules: {
+ selectedMemberIds: [
+ { type: 'array', required: true, message: '璇疯嚦灏戦�夋嫨涓�鍚嶅鏃忔垚鍛�', trigger: 'change' }
+ ],
title: [{
required: true,
message: '璇疯緭鍏ュぇ浜嬫爣棰�',
@@ -494,17 +849,275 @@
typeOptions: [],
};
},
+
created() {
this.getList();
// this.getCateInfor()
this.getInfo()
+ this.getList1();
+
+
+ },
+ computed: {
+ // 宸查�夋垚鍛樺鍚嶏紙鐢ㄤ簬鍥炴樉锛�
+ selectedMemberNames() {
+
+
+ // 浼樺厛浣跨敤鐩存帴璁剧疆鐨勬樉绀哄悕绉�
+ if(this.displayMemberNames && this.displayMemberNames.length > 0 && this.selectedMemberIds.length==0) {
+ return this.displayMemberNames;
+ }
+
+
+ // 鍚﹀垯鏍规嵁閫変腑鐨処D璁＄畻
+ // 鍚堝苟杩囨护鍚庣殑鎴愬憳鍚嶇О鍜宒isplayMemberNames鍐呭
+ console.log(this.selectedMemberIds)
+ const filteredNames = this.familyMembers
+ .filter(member => this.selectedMemberIds.includes(member.userId))
+ .map(member => member.oldName);
+
+ const filterAnotherNames = this.anotherFamilyMembers
+ .filter(member => this.selectedMemberIds.includes(member.userId))
+ .map(member => member.oldName);
+
+ // 鍒涘缓涓�涓猄et鏉ュ瓨鍌ㄥ敮涓�鍚嶇О锛岄伩鍏嶉噸澶�
+ const uniqueNames = new Set([...filteredNames]);
+filterAnotherNames.forEach(item => uniqueNames.add(item));
+console.log(uniqueNames)
+ // 濡傛灉displayMemberNames鏈夊唴瀹癸紝涔熷姞鍏et涓�
+ if(this.displayMemberNames && this.displayMemberNames.length > 0) {
+ this.displayMemberNames.forEach(name => uniqueNames.add(name));
+ }
+ else
+ this.displayMemberNames = Array.from(uniqueNames)
+ // this.selectedMemberIds = []
+ // 杞洖鏁扮粍骞惰繑鍥�
+ return Array.from(uniqueNames);
+ },
+ // 杩囨护鍚庣殑鎴愬憳鍒楄〃锛堟悳绱㈠姛鑳斤級
+ filteredMembers() {
+ if (!this.memberSearch) return this.familyMembers;
+ console.log(this.familyMembers)
+ console.log("-sdf")
+ const keyword = this.memberSearch.toLowerCase();
+ return this.familyMembers;
+ //.filter(member =>
+ // member.filteredMembers.toLowerCase().includes(keyword)
+ //||
+ // member.role.toLowerCase().includes(keyword)
+ // );
+ }
},
methods: {
+ handleDialogClick()
+ {
+ // 鍏抽棴鏃ユ湡閫夋嫨鍣�
+ this.$refs.datePicker.handleClose();
+ },
+ // 鍒嗛〉
+ fenYe(){
+ // @pagination='ifNum === 1 ? selectValue : (ifNum === 2 ? whoShare : showData)'
+ if(this.ifNum === 1){
+ this.selectValue(this.selectWho)
+ }else if(this.ifNum === 2){
+ this.whoShare()
+ }else{
+ this.showData()
+ }
+ },
+ // 鍏抽棴寮圭獥鍚�
+ handleClose(){
+ this.user = ''
+ this.queryParams2.pageNo = 1
+ this.total1 = 0
+ },
+ handleClose2(){
+ this.$refs.table1.clearSelection()
+ },
+
+ // 涓嬭浇浠栦汉缁欐垜鍒嗕韩鐨勬暟鎹�
+ handleDown(row){
+ const a = {"downloadContent" : row.id}
+ downShareData(a).then(() => {
+ Message({ message: "涓嬭浇鎴愬姛", type: 'success' })
+ })
+ },
+
+ // 鏀跺洖鍒嗕韩缁欏埆浜虹殑鏁版嵁
+ handleBack(row){
+ // 鍒嗕韩缁欒皝鐨勶細this.selectWho
+ const list = {"shareIds": [this.selectWho],"shareContents": [row.id]}
+ deleteShareData(list).then(()=>{
+ Message({ message: "鏀跺洖鎴愬姛", type: 'success' })
+
+ const list2 = {"shareIds": [this.selectWho]}
+ shareToWho(list2,this.queryParams2).then(response => {
+ this.shareList1 = response.data.data
+ this.total1 = response.data.total;
+ })
+ })
+ },
+ // 灞曠ず涓嬭浇鐨勫垎浜暟鎹�
+ showData(){
+ this.shareList1 = []
+ this.ifNum = 3
+ this.open2 = true
+ this.title2 = "涓嬭浇鐨勫垎浜暟鎹�";
+ showShareData(this.queryParams2).then(response => {
+ this.shareList1 = response.data.data
+ this.total1 = response.data.total;
+ // console.log(response,'灞曠ず涓嬭浇鐨勫垎浜暟鎹睍绀轰笅杞界殑鍒嗕韩鏁版嵁')
+ })
+ },
+ // 灞曠ず鍒嗕韩缁欐垜鐨勬暟鎹�
+ whoShare(){
+ this.shareList1 = []
+ this.ifNum = 2
+ this.open2 = true
+ this.title2 = "鍒嗕韩缁欐垜鐨勬暟鎹�";
+ // const list = {"shareId": this.userList}
+ // const list = {"shareId": 111}
+ getWhoShare(this.queryParams2).then(response => {
+ const data = response.data.data
+ this.total1 = response.data.total
+ console.log(response,'灞曠ず鍒嗕韩缁欐垜鐨勬暟鎹睍绀哄垎浜粰鎴戠殑鏁版嵁s')
+ for(let i in data){
+ console.log(i,'灞曠ず鍒嗕韩缁欐垜鐨勬暟鎹睍绀哄垎浜粰鎴戠殑鏁版嵁')
+ this.shareList1.push(data[i])
+ }
+ })
+ },
+
+ // 鍒嗕韩缁欒皝浜嗕粈涔堟暟鎹�
+ selectValue(value){
+ this.selectWho = value
+ this.shareList1 = []
+ const list = {"shareIds": [this.selectWho]}
+ shareToWho(list,this.queryParams2).then(response => {
+ // this.loading2 = true;
+ response.data.data.forEach(res=>{
+ if(res){
+ this.shareList1.push(res)
+ }
+ })
+ // this.shareList1 = response.data.data
+ this.total1 = response.data.total;
+ // this.loading2 = false;
+ console.log(response.data,'鍒嗕韩缁欒皝浜嗕粈涔堟暟鎹垎浜粰璋佷簡浠�涔堟暟鎹�')
+ })
+ },
+ handleWho(){
+ this.ifNum = 1
+ this.open2 = true
+ this.title2 = "鍒嗕韩缁欒皝浜嗕粈涔堟暟鎹�";
+ this.shareList1 = []
+ },
+
+ /** 鍒嗕韩鎿嶄綔 */
+ handleShare(row) {
+ if(row.id){
+ this.id1 = [row.id]
+ }
+ this.open1 = true;
+ this.title1 = "鍒嗕韩";
+ },
+ // 澶氶�夋閫変腑鏁版嵁
+ handleSelectionChange1(selection) {
+ this.ids1 = selection.map(item => item.userId)
+ this.single1 = selection.length!=1
+ this.multiple1 = !selection.length
+ },
+ // 澶氶�夋閫変腑鏁版嵁
+ handleSelectionChange2(selection) {
+ // this.ids1 = selection.map(item => item.userId)
+ // // console.log(selection)
+ // console.log(this.ids1,'ids1ids1ids1ids1')
+ // this.single1 = selection.length!=1
+ // this.multiple1 = !selection.length
+ },
+ getRowId1(row)
+ {
+ return row.id
+ },
+ getRowId2(row)
+ {
+ return row.id
+ },
+ getList1() {
+ this.loading1 = true;
+ let userId = this.$store.state.user.userId
+ // alert(userId)
+ this.userOptions = []
+ showShareUser(userId, 2013).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;
+ }
+ );
+ },
+ // 纭鍒嗕韩
+ 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;
+ }).catch(() => {});
+ },
+
+ // ------------------------------------------------------------------
+
+
+
getInfo(){
console.log('-----------------')
getInfo().then(response=>{
- console.log(response)
+ console.log(response.user)
+ // alert(123)
+ console.log(response.user.roles[0].roleId,'roleID')
+ this.userId = response.user.roles[0].roleId
})
},
@@ -514,8 +1127,16 @@
isInFot(fileName) {
return this.fot.includes(fileName);
},
+
+ close(){
+ //alert(234)
+
+
+ this.open = false
+ },
// 鍙栨秷鎸夐挳
cancelData() {
+
this.open = false;
this.reset();
},
@@ -552,13 +1173,57 @@
_this.loading = false;
}else{
_this.familyList = response.data.data;
-
+ console.log(_this.familyList,'familyListfamilyListfamilyList')
_this.total = response.data.total;
_this.loading = false;
}
}
);
},
+openOtherPeopleDialog(){
+ this.otherPeopleDialogVisible = true;
+ this.otherPeopleInput = ''; // 娓呯┖杈撳叆妗�
+ },
+
+ // 娣诲姞鍏跺畠浜猴紙鏀寔鍥炶溅鍜岀偣鍑绘坊鍔犳寜閽級
+ addOtherPeople() {
+ const name = this.otherPeopleInput.trim();
+ if (!name) {
+ this.$message.warning('璇疯緭鍏ュ鍚�');
+ return;
+ }
+ if (this.formDat.otherPeople.includes(name)) {
+ this.$message.warning('璇ュ鍚嶅凡娣诲姞');
+ return;
+ }
+ this.formDat.otherPeople.push(name);
+ this.otherPeopleInput = ''; // 娓呯┖杈撳叆妗嗭紝鍑嗗杈撳叆涓嬩竴涓�
+ this.$message.success(`宸叉坊鍔�: ${name}`);
+ },
+
+ // 纭瀹屾垚锛堝叧闂脊绐楋級
+ confirmOtherPeople() {
+ if (this.formDat.otherPeople.length > 0) {
+ this.$message.success(`宸叉坊鍔� ${this.formDat.otherPeople.length} 鍚嶅叾瀹冧汉`);
+ } else {
+ this.$message.info('鏈坊鍔犱换浣曞叾瀹冧汉');
+ }
+ this.otherPeopleDialogVisible = false;
+ },
+
+ // 鍏抽棴鍏跺畠浜烘爣绛�
+ handleOtherPeopleTagClose(index) {
+ const removedName = this.formDat.otherPeople[index];
+ this.formDat.otherPeople.splice(index, 1);
+ this.$message.info(`宸茬Щ闄�: ${removedName}`);
+ },
+
+ // 鍏跺畠浜哄脊绐楀叧闂鐞�
+ handleOtherPeopleDialogClose() {
+ this.otherPeopleInput = '';
+ },
+
+ // ------------------- 鎭㈠琚垹闄ょ殑鏂规硶 -------------------
// 鍙栨秷鎸夐挳
cancel() {
@@ -591,7 +1256,7 @@
deptCheckStrictly: true,
remark: undefined
};
- this.resetForm("form");
+ this.resetForm("elForm");
},
/** 鎼滅储鎸夐挳鎿嶄綔 */
handleQuery() {
@@ -607,7 +1272,6 @@
// 澶氶�夋閫変腑鏁版嵁
handleSelectionChange(selection) {
this.ids = selection.map(item => item.id)
- // alert(this.ids)
this.single = selection.length!=1
this.multiple = !selection.length
},
@@ -619,10 +1283,10 @@
this.title = "娣诲姞瀹跺涵澶т簨璁颁俊鎭�";
},
-
/** 鏌ョ湅璇︾粏淇℃伅 */
handleCheck(row){
const id = row.id;
+ this.open2 = false;
this.$router.push("/familymodel/bignote/familyeventInfo/" + id);
},
/** 淇敼鎸夐挳鎿嶄綔 */
@@ -639,39 +1303,48 @@
},
handleRemove(file) {
- //alert(98)
- //alert(this.fileList.length)
- for(let i = 0; i < this.fileList.length; i++)
- {
- if(this.fileList[i].url==file.url)
- {
- this.$delete(this.fileList,i);
- this.$delete(this.uploadFileList,i);
- }
- }
- // let ul = this.fileList.map(function (elem){
- // return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
- // }).join(",")
- // alert(this.fileListOther.length)
- // let uls = this.fileListOther.map(function (elem){
- // return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
- // }).join(",")
- // this.formDat.url = ul+","+uls;
+ for(let i = 0; i < this.fileList.length; i++)
+ {
+ if(this.fileList[i].url==file.url)
+ {
+ this.$delete(this.fileList,i);
+ this.$delete(this.uploadFileList,i);
+ }
+ }
},
handleRemoveFile(file) {
for(let i = 0; i < this.fileListOther.length; i++)
{
if(this.fileListOther[i].url==file.url)
- {
+ {
this.$delete(this.fileListOther,i);
- this.$delete(this.uploadFileList1,i);
- }
+ this.$delete(this.uploadFileList1,i);
+ }
}
},
handlePictureCardPreview(file) {
this.dialogImageUrl = file.url;
this.dialogVisible = true;
+ },
+
+ //
+ handleTagClose(index, name) {
+ // 浠� selectedMemberNames 鏁扮粍涓Щ闄ゅ綋鍓嶅叧闂殑鏍囩鍚嶇О
+ // const index = this.selectedMemberNames.findIndex(item=== name);
+ selectedMemberIds: this.selectedMemberIds.filter(
+ item => item!== index // 杩囨护鎺変笌鍏抽棴鍚嶇О鐩稿悓鐨勫厓绱�
+ )
+ this.$forceUpdate();
+ console.log(this.selectedMemberIds)
+ this.selectedMemberNames.splice(index, 1);
+ this.$forceUpdate();
+ selectedMemberNames: this.selectedMemberNames.filter(
+ item => item !== name // 杩囨护鎺変笌鍏抽棴鍚嶇О鐩稿悓鐨勫厓绱�
+ )
+ this.displayMemberNames = this.selectedMemberNames
+ console.log(this.selectedMemberNames)
+
},
/** 鎻愪氦鎸夐挳锛堟暟鎹潈闄愶級 */
submitDataScope: function() {
@@ -684,6 +1357,15 @@
// }).join(",")
// this.formDat.url = ul+","+uls
// alert(this.formDat.url)
+ //鎶婂悕瀛楄繛鍦ㄤ竴璧�
+ var pel = ""
+ pel = pel + this.selectedMemberNames.join(",")
+ if(this.formDat.otherPeople.length != 0)
+ {
+ pel = pel +";"+ this.formDat.otherPeople.join(",")
+ }
+ // alert(pel)
+ this.formDat.people = pel;
this.$refs["elForm"].validate(valid => {
if (valid) {
@@ -702,6 +1384,8 @@
this.handleRemoveFile(this.fileListOther[0]);
}
this.getList();
+ this.selectedMemberNames = [];
+ this.displayMemberNames = []
});
}
});
@@ -842,7 +1526,75 @@
Message({ message: "瀵煎叆澶辫触", type: 'error' })
}
- }
+ },
+ // 鎵撳紑鎴愬憳澶氶�夊脊绐�
+ async openMemberDialog() {
+ this.memberDialogVisible = true;
+ this.memberSearch = ''; // 閲嶇疆鎼滅储
+ // 鍒濆鍖栧脊绐楅�変腑鐘舵�侊紙鍥炴樉宸查�夋垚鍛橈級
+ // this.selectedMemberIds = [...this.familyForm.selectedMemberIds];
+ // 鍔犺浇瀹舵棌鎴愬憳鍒楄〃
+ await this.loadFamilyMembers();
+ },
+
+ // 鍔犺浇瀹舵棌鎴愬憳鍒楄〃
+ async loadFamilyMembers() {
+ this.loading = true;
+
+ let clanId = this.$store.state.user.clanId
+ let userId = this.$store.state.user.userId
+ // alert(userId)
+ try {
+ const res = await getFamilyMembers(clanId); // 鍋囪闇�瑕佸鏃廔D鍙傛暟
+ const ano = await listAnotherFamilyInfo(userId)
+
+ console.log(res)
+ console.log(res.data)
+ this.anotherFamilyMembers = ano.data;
+ this.familyMembers = res.data;
+ // console.log(this.familyMembers.length)
+ // console.log(this.familyMembers.length)
+ // console.log(this.familyMembers[0])
+ // for(let i=0; i < this.familyMembers.length; i++)
+ // console.log(this.familyMembers[i])
+ // console.log("---999")
+ // 鏍煎紡锛歔{ id: 1, name: '寮犱笁', role: '瀹堕暱', relation: '鐖跺瓙', avatar: 'xxx' }, ...]
+ } catch (err) {
+ this.$message.error('鍔犺浇瀹舵棌鎴愬憳澶辫触锛岃閲嶈瘯');
+ } finally {
+ this.loading = false;
+ }
+ },
+
+ // 纭閫夋嫨鎴愬憳锛堜繚瀛樺埌琛ㄥ崟锛�
+ confirmMemberSelection() {
+ console.log()
+ this.formDat.selectedMemberIds = [...this.selectedMemberIds]; // 灏嗗脊绐楅�変腑鐨処D鍚屾鍒拌〃鍗�
+ this.memberDialogVisible = false;
+ this.$message.info(`宸查�夋嫨 ${this.selectedMemberNames.length} 鍚嶅鏃忔垚鍛榒);
+ // 娓呯┖瀵硅瘽妗嗛噷闈㈤�夋嫨鐨勫唴瀹�
+ // if(this.displayMemberNames.length==0)
+ this.displayMemberNames = this.selectedMemberNames
+ this.selectedMemberIds = [];
+ },
+ handleTagClose(index, name) {
+ // 浠� selectedMemberNames 鏁扮粍涓Щ闄ゅ綋鍓嶅叧闂殑鏍囩鍚嶇О
+ // const index = this.selectedMemberNames.findIndex(item=== name);
+ selectedMemberIds: this.selectedMemberIds.filter(
+ item => item!== index // 杩囨护鎺変笌鍏抽棴鍚嶇О鐩稿悓鐨勫厓绱�
+ )
+ this.$forceUpdate();
+ console.log(this.selectedMemberIds)
+ this.selectedMemberNames.splice(index, 1);
+ this.$forceUpdate();
+ selectedMemberNames: this.selectedMemberNames.filter(
+ item => item !== name // 杩囨护鎺変笌鍏抽棴鍚嶇О鐩稿悓鐨勫厓绱�
+ )
+ this.displayMemberNames = this.selectedMemberNames
+ console.log(this.selectedMemberNames)
+
+ },
+ //
}
};
@@ -862,4 +1614,81 @@
.button-container {
display: inline-flex; /* 璁剧疆鎸夐挳瀹瑰櫒涓鸿鍐呭厓绱� */
}
+
+
+/* 宸查�夋垚鍛樻爣绛炬牱寮� */
+.selected-members {
+ margin-bottom: 12px;
+ .el-tag {
+ margin-right: 8px;
+ margin-bottom: 8px;
+ }
+}
+
+/* 澶氶�夊脊绐楁牱寮� */
+.member-dialog-content {
+ max-height: 400px;
+ overflow-y: auto;
+ padding: 0 10px;
+}
+
+/* 鎴愬憳鍒楄〃鏍峰紡 */
+.member-checkbox-group {
+ .el-checkbox {
+ display: block;
+ padding: 12px;
+ border-bottom: 1px solid #f5f5f5;
+ &:last-child {
+ border-bottom: none;
+ }
+ }
+}
+
+/* 鎴愬憳椤规牱寮� */
+.member-item {
+ display: flex;
+ align-items: center;
+ .member-avatar {
+ width: 40px;
+ height: 40px;
+ border-radius: 50%;
+ margin-right: 12px;
+ }
+ .member-info {
+ .member-name {
+ font-weight: 500;
+ margin-bottom: 4px;
+ }
+ .member-role {
+ font-size: 12px;
+ color: #606266;
+ }
+ }
+}
+
+/* 鍔犺浇鐘舵�佹牱寮� */
+.loading-container {
+ text-align: center;
+ padding: 40px 0;
+ .el-loading-spinner {
+ margin-bottom: 16px;
+ }
+}.signature-checkbox
+{
+ margin-right: 15px;
+ display: inline-block;
+ margin-bottom: 8px;
+ cursor: pointer;
+}
+.signature-checkbox input[type="checkbox"] {
+ margin-right: 6px;
+}
+
+.signature-checkbox span {
+ cursor: pointer;
+}
+/* 鏃犳暟鎹牱寮� */
+.no-data {
+ padding: 60px 0;
+}
</style>
--
Gitblit v1.9.1