From 00b0499599549280d631b3d5a645bb9ba8f88f8c Mon Sep 17 00:00:00 2001
From: feige <feige@qq.com>
Date: 星期二, 23 十二月 2025 07:57:17 +0800
Subject: [PATCH] 修改
---
ruoyi-ui/vue.config.js | 2
ruoyi-ui/src/views/bignote/familyeventInfo.vue | 47 ++++++++++++++++++++++-
ruoyi-ui/src/views/peopleSearch/index.vue | 19 +++++++--
3 files changed, 60 insertions(+), 8 deletions(-)
diff --git a/ruoyi-ui/src/views/bignote/familyeventInfo.vue b/ruoyi-ui/src/views/bignote/familyeventInfo.vue
index 57be3cc..7544778 100644
--- a/ruoyi-ui/src/views/bignote/familyeventInfo.vue
+++ b/ruoyi-ui/src/views/bignote/familyeventInfo.vue
@@ -335,6 +335,7 @@
people: undefined,
address: undefined,
remark: undefined,
+
url: "",
},
ID: undefined,
@@ -374,13 +375,26 @@
selectedMemberNames() {
// alert(this.familyMembers.length)
// 浼樺厛浣跨敤鐩存帴璁剧疆鐨勬樉绀哄悕绉�
- if(this.displayMemberNames && this.displayMemberNames.length > 0) {
+ if(this.displayMemberNames && this.displayMemberNames.length > 0 && this.selectedMemberIds.length==0) {
return this.displayMemberNames;
}
+
// 鍚﹀垯鏍规嵁閫変腑鐨処D璁＄畻
- return this.familyMembers
+ // 鍚堝苟杩囨护鍚庣殑鎴愬憳鍚嶇О鍜宒isplayMemberNames鍐呭
+ const filteredNames = this.familyMembers
.filter(member => this.selectedMemberIds.includes(member.userId))
.map(member => member.oldName);
+
+ // 鍒涘缓涓�涓猄et鏉ュ瓨鍌ㄥ敮涓�鍚嶇О锛岄伩鍏嶉噸澶�
+ const uniqueNames = new Set([...filteredNames]);
+
+ // 濡傛灉displayMemberNames鏈夊唴瀹癸紝涔熷姞鍏et涓�
+ if(this.displayMemberNames && this.displayMemberNames.length > 0) {
+ this.displayMemberNames.forEach(name => uniqueNames.add(name));
+ }
+
+ // 杞洖鏁扮粍骞惰繑鍥�
+ return Array.from(uniqueNames);
},
// 杩囨护鍚庣殑鎴愬憳鍒楄〃锛堟悳绱㈠姛鑳斤級
filteredMembers() {
@@ -469,6 +483,31 @@
},
mounted() {},
methods: {
+ 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 // 杩囨护鎺変笌鍏抽棴鍚嶇О鐩稿悓鐨勫厓绱�
+ )
+ console.log(this.selectedMemberNames)
+
+ },
+ // 纭閫夋嫨鎴愬憳锛堜繚瀛樺埌琛ㄥ崟锛�
+ confirmMemberSelection() {
+ console.log(this.selectedMemberIds)
+ this.formData.selectedMemberIds = [...this.selectedMemberIds];
+ console.log(this.formData.selectedMemberIds)
+ // 灏嗗脊绐楅�変腑鐨処D鍚屾鍒拌〃鍗�
+ this.memberDialogVisible = false;
+ this.$message.info(`宸查�夋嫨 ${this.selectedMemberNames.length} 鍚嶅鏃忔垚鍛榒);
+ },
splitPeopleToSelectedNames(people) {
// 澶勭悊閫昏緫锛�
// 1. 鍒ゆ柇 people 鏄惁瀛樺湪涓斾负瀛楃涓诧紝閬垮厤鎶ラ敊
@@ -566,7 +605,9 @@
// return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
// }).join(",")
// this.formData.url = ul+","+uls
-
+ var pel = ""
+ pel = pel + this.selectedMemberNames.join(",")
+ this.formData.people = pel;
this.$refs['elForm'].validate(valid => {
if (valid) {
if (this.formData.id != undefined) {
diff --git a/ruoyi-ui/src/views/peopleSearch/index.vue b/ruoyi-ui/src/views/peopleSearch/index.vue
index f845890..9eddba8 100644
--- a/ruoyi-ui/src/views/peopleSearch/index.vue
+++ b/ruoyi-ui/src/views/peopleSearch/index.vue
@@ -57,16 +57,25 @@
</el-button>
</el-form-item>
<!-- 鏃堕棿鑼冨洿閫夋嫨 -->
- <el-form-item label="鏃堕棿鑼冨洿" prop="dateRange">
+ <el-form-item label="鏃堕棿鑼冨洿" prop="dateRange" style="">
<el-date-picker
v-model="searchForm.dateRange"
type="daterange"
+ style="width: 210px;"
range-separator="鑷�"
start-placeholder="寮�濮嬫棩鏈�"
end-placeholder="缁撴潫鏃ユ湡"
value-format="yyyy-MM-dd"
:disabled-date="disabledDate"
></el-date-picker>
+ </el-form-item>
+ <!-- 鏄惁鏈夐檮浠堕�夐」 -->
+ <el-form-item label="鏄惁鏈夐檮浠�" prop="hasAttachment">
+ <el-radio-group v-model="searchForm.hasAttachment" size="small">
+
+ <el-radio label="鏄�">鏈夐檮浠�</el-radio>
+ <el-radio label="鍚�">鏃犻檮浠�</el-radio>
+ </el-radio-group>
</el-form-item>
<!-- 楂樼骇鎼滅储閫夐」 (鏍规嵁閫夋嫨鐨勬ā鍧楀姩鎬佹樉绀�) -->
@@ -84,9 +93,9 @@
<el-form-item class="form-actions">
<el-button type="primary" @click="handleSearch">鎼滅储</el-button>
<el-button @click="handleReset">閲嶇疆</el-button>
- <el-button type="text" @click="toggleAdvancedOptions">
+ <!-- <el-button type="text" @click="toggleAdvancedOptions">
{{ showAdvancedOptions ? '鏀惰捣楂樼骇閫夐」' : '灞曞紑楂樼骇閫夐」' }}
- </el-button>
+ </el-button> -->
</el-form-item>
</el-form>
</el-card>
@@ -236,7 +245,8 @@
searchForm: {
modules: [],
dateRange: [],
- peoples: ''
+ peoples: '',
+ hasAttachment: ''
},
// 琛ㄥ崟楠岃瘉瑙勫垯
searchRules: {
@@ -344,6 +354,7 @@
startTime: this.searchForm.dateRange[0] || '',
endTime: this.searchForm.dateRange[1] || '',
peoples: this.searchForm.peoples,
+ hasAttachment: this.searchForm.hasAttachment,
// status: this.searchForm.status,
pageNum: this.pagination.currentPage,
pageSize: this.pagination.pageSize
diff --git a/ruoyi-ui/vue.config.js b/ruoyi-ui/vue.config.js
index 97fca17..e8589b0 100644
--- a/ruoyi-ui/vue.config.js
+++ b/ruoyi-ui/vue.config.js
@@ -37,7 +37,7 @@
// detail: https://cli.vuewww.bendudu.comjs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: {
// target: `https://10.39.2.234:8080/`,
- // target: `https://10.39.18.174:8080/`,
+ //target: `https://10.39.18.174:8080/`,
target: 'https://www.bendudu.com:8080/',
changeOrigin: true,
pathRewrite: {
--
Gitblit v1.9.1