From f43ef0c77c6f437bd0f7459d75168e6f77e334bb Mon Sep 17 00:00:00 2001
From: feige <feige@qq.com>
Date: 星期一, 22 十二月 2025 11:18:11 +0800
Subject: [PATCH] 修改了代码
---
ruoyi-ui/src/views/bignote/familyeventInfo.vue | 184 +++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 180 insertions(+), 4 deletions(-)
diff --git a/ruoyi-ui/src/views/bignote/familyeventInfo.vue b/ruoyi-ui/src/views/bignote/familyeventInfo.vue
index 2a14ab1..57be3cc 100644
--- a/ruoyi-ui/src/views/bignote/familyeventInfo.vue
+++ b/ruoyi-ui/src/views/bignote/familyeventInfo.vue
@@ -18,10 +18,36 @@
<el-input v-model="formData.title" placeholder="璇疯緭鍏ユ爣棰�" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
</el-form-item>
- <el-form-item label="浜虹墿" prop="people">
+ <!-- <el-form-item label="浜虹墿" prop="people">
<el-input v-model="formData.people" placeholder="璇疯緭鍏ヤ汉鐗�" clearable :style="{width: '100%'}" :disabled="dsb">
- </el-input>
+ </el-input> -->
+
+ <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>
+ <!-- 瑙﹀彂寮圭獥鎸夐挳 -->
+ <div style="display: flex; align-items: center;" v-if="!dsb" >
+ <el-button
+ type="primary"
+ icon="el-icon-user-plus"
+ @click="openMemberDialog"
+ :disabled="loading"
+ >
+ 閫夋嫨瀹舵棌鎴愬憳
+ </el-button>
+ </div>
</el-form-item>
+
+
<el-form-item label="鍦扮偣" prop="address">
<el-input v-model="formData.address" placeholder="璇疯緭鍏ュ湴鐐�" clearable :style="{width: '100%'}" :disabled="dsb">
</el-input>
@@ -31,7 +57,14 @@
:editable="false" :clearable="false" :style="{width: '100%'}" :disabled="dsb" value-format="yyyy-MM-dd"
></el-date-picker>
</el-form-item>
+ <el-form-item label="鏄惁闅愯棌" prop="isHide">
+ <el-radio-group v-model="formData.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="formData.remark" placeholder="璇疯緭鍏ュ娉�" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
</el-form-item>
@@ -41,7 +74,7 @@
<!-- </el-form-item>-->
<!-- :http-request="requestUpload" -->
- <h4 class="form-header">鐩稿叧鍥剧墖 </h4>
+ <h4 class="form-header">鐩稿叧鍥剧墖</h4>
<el-upload
action="#"
list-type="picture-card"
@@ -199,6 +232,60 @@
<el-dialog :visible.sync="dialogVisible">
<img w-full :src="dialogImageUrl" style="width: 100%; height: 100%" alt="Preview Image" />
</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>
+ <!-- 澶氶�夊垪琛紙鏈夋暟鎹級 -->
+<!-- <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>
+
+
</div>
</template>
@@ -208,12 +295,21 @@
import errorCode from "@/utils/errorCode";
import {Message} from "element-ui";
import { getFamilyeventInfo, updateFamilyevent, uploadPic, download} from "@/api/bignote/index";
+import { getFamilyMembers } from '@/api/root'; // 鍋囪鑾峰彇瀹舵棌鎴愬憳鐨凙PI
export default {
components: {},
props: [],
data() {
return {
+
+ // 鎴愬憳澶氶�夌浉鍏�
+ memberDialogVisible: false, // 寮圭獥鍙鎬�
+ familyMembers: [], // 瀹舵棌鎴愬憳鍒楄〃锛堝師濮嬫暟鎹級
+ selectedMemberIds: [], // 寮圭獥涓复鏃堕�変腑鐨勬垚鍛業D锛堢敤浜庡閫変氦浜掞級
+ displayMemberNames: [], // 鏄剧ず鐢ㄧ殑鎴愬憳鍚嶇О鏁扮粍
+ memberSearch: '', // 鎴愬憳鎼滅储鍏抽敭璇�
+ loading: false, // 鍔犺浇鐘舵��
cdi:"瀹跺涵澶т簨璁颁俊鎭�",
udi:"瀹跺涵澶т簨璁颁慨鏀�",
@@ -273,11 +369,38 @@
typeOptions: [],
}
},
- computed: {},
+ computed: {
+ // 宸查�夋垚鍛樺鍚嶏紙鐢ㄤ簬鍥炴樉锛�
+ selectedMemberNames() {
+ // alert(this.familyMembers.length)
+ // 浼樺厛浣跨敤鐩存帴璁剧疆鐨勬樉绀哄悕绉�
+ if(this.displayMemberNames && this.displayMemberNames.length > 0) {
+ return this.displayMemberNames;
+ }
+ // 鍚﹀垯鏍规嵁閫変腑鐨処D璁＄畻
+ return this.familyMembers
+ .filter(member => this.selectedMemberIds.includes(member.userId))
+ .map(member => member.oldName);
+ },
+ // 杩囨护鍚庣殑鎴愬憳鍒楄〃锛堟悳绱㈠姛鑳斤級
+ 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)
+ // );
+ }
+ },
watch: {},
created() {
const id = this.$route.params && this.$route.params.id;
let jd;
+
if(this.$route.query.detail!=undefined)
{
jd = this.$route.query.detail
@@ -338,6 +461,7 @@
// _this.fileList1 = _this.fileList
}
this.loading = false;
+ this.splitPeopleToSelectedNames(this.formData.people); // 鍒濆鍖栨椂澶勭悊宸查�夋垚鍛�
});
}
console.log(this.fileList,'fileListfilelllllllllllll')
@@ -345,6 +469,58 @@
},
mounted() {},
methods: {
+ splitPeopleToSelectedNames(people) {
+ // 澶勭悊閫昏緫锛�
+ // 1. 鍒ゆ柇 people 鏄惁瀛樺湪涓斾负瀛楃涓诧紝閬垮厤鎶ラ敊
+ if (!people || typeof people !== "string") {
+ this.displayMemberNames = [];
+ return;
+ }
+ console.log(people.split(","))
+ // 2. 鎸夐�楀彿鍒嗗壊瀛楃涓诧紝鍘婚櫎姣忎釜鍏冪礌鐨勫墠鍚庣┖鏍硷紝杩囨护绌哄�硷紙濡傝繛缁�楀彿鐨勬儏鍐碉級
+ this.displayMemberNames = people.split(",")
+ // people
+ //.split(",") // 鎸夐�楀彿鍒嗗壊涓烘暟缁�
+ //.map((name) => name.trim()) // 鍘婚櫎姣忎釜鍏冪礌鐨勫墠鍚庣┖鏍�
+ // .filter((name) => name); // 杩囨护绌哄瓧绗︿覆锛堝鐞� "a,,b" 杩欑被鎯呭喌锛�
+ console.log(this.displayMemberNames)
+ },
+ // 鎵撳紑鎴愬憳澶氶�夊脊绐�
+ 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
+ try {
+ const res = await getFamilyMembers(clanId); // 鍋囪闇�瑕佸鏃廔D鍙傛暟
+
+
+ console.log(res)
+ console.log(res.data)
+ this.familyMembers = res.data;
+ console.log(this.familyMembers)
+ console.log(this.familyMembers.length)
+ // 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;
+ }
+ },
getData(){
const id = this.$route.params && this.$route.params.id;
let _this = this
--
Gitblit v1.9.1