From 5762c633a1e7de32ec5739bce54dc66553ed4731 Mon Sep 17 00:00:00 2001
From: liyu1201 <1492230202@qq.com>
Date: Mon, 10 Nov 2025 11:07:43 +0800
Subject: [PATCH] feat(lqYcsdJsj): 新增成员管理弹窗并优化相关功能

---
 antis-ncc-admin/src/views/lqYcsdJsj/components/member-edit-dialog.vue | 335 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 antis-ncc-admin/src/views/lqYcsdJsj/index.vue                         |  38 +++++++++++++++++++++++++++++---------
 antis-ncc-admin/src/views/lqYcsdMdmbsd/index.vue                      |   4 ++--
 3 files changed, 366 insertions(+), 11 deletions(-)
 create mode 100644 antis-ncc-admin/src/views/lqYcsdJsj/components/member-edit-dialog.vue

diff --git a/antis-ncc-admin/src/views/lqYcsdJsj/components/member-edit-dialog.vue b/antis-ncc-admin/src/views/lqYcsdJsj/components/member-edit-dialog.vue
new file mode 100644
index 0000000..7f5edef
--- /dev/null
+++ b/antis-ncc-admin/src/views/lqYcsdJsj/components/member-edit-dialog.vue
@@ -0,0 +1,335 @@
+<template>
+	<el-dialog 
+		title="成员管理" 
+		:visible.sync="visible" 
+		width="900px" 
+		:close-on-click-modal="false"
+		@close="handleClose">
+		
+		<div class="member-dialog">
+			<!-- 操作栏 -->
+			<div class="member-toolbar">
+				<el-button type="primary" icon="el-icon-plus" @click="showAddDialog" size="small">添加成员</el-button>
+				<el-button type="warning" icon="el-icon-refresh" @click="loadMembers" size="small">刷新</el-button>
+				<span class="member-count">共 {{ members.length }} 人</span>
+			</div>
+			
+			<!-- 成员列表 -->
+			<el-table :data="members" border style="width: 100%; margin-top: 10px;" v-loading="loading">
+				<el-table-column type="index" label="序号" width="60" align="center" />
+				<el-table-column prop="userName" label="姓名" min-width="120">
+					<template slot-scope="scope">
+						<div class="user-name">
+							<i class="el-icon-user"></i>
+							<span>{{ scope.row.userName || '无' }}</span>
+						</div>
+					</template>
+				</el-table-column>
+				<el-table-column prop="userId" label="用户ID" min-width="150">
+					<template slot-scope="scope">
+						<span>{{ scope.row.userId || '无' }}</span>
+					</template>
+				</el-table-column>
+				<el-table-column label="是否顾问" width="120" align="center">
+					<template slot-scope="scope">
+						<el-tag :type="scope.row.isLeader === 1 ? 'success' : 'info'" size="small" effect="dark">
+							<i class="el-icon-star-on" v-if="scope.row.isLeader === 1"></i>
+							<i class="el-icon-star-off" v-else></i>
+							{{ scope.row.isLeader === 1 ? '是' : '否' }}
+						</el-tag>
+					</template>
+				</el-table-column>
+				<el-table-column prop="status" label="状态" width="100" align="center">
+					<template slot-scope="scope">
+						<el-tag :type="scope.row.status === 'ACTIVE' ? 'success' : 'info'" size="small" effect="dark">
+							{{ scope.row.status === 'ACTIVE' ? '活跃' : '非活跃' }}
+						</el-tag>
+					</template>
+				</el-table-column>
+				<el-table-column label="排序" width="100" align="center">
+					<template slot-scope="scope">
+						<span>{{ scope.row.sortOrder || 0 }}</span>
+					</template>
+				</el-table-column>
+				<el-table-column label="操作" width="100" align="center" fixed="right">
+					<template slot-scope="scope">
+						<el-button type="danger" icon="el-icon-delete" @click="handleDelete(scope.row)" size="mini" plain>删除</el-button>
+					</template>
+				</el-table-column>
+			</el-table>
+		</div>
+		
+		<!-- 添加成员对话框 -->
+		<el-dialog
+			title="添加成员"
+			:visible.sync="addDialogVisible"
+			width="600px"
+			append-to-body
+			:close-on-click-modal="false">
+			<el-form ref="addForm" :model="addForm" label-width="100px" label-position="right" :rules="addFormRules">
+				<el-form-item label="用户" prop="userId">
+					<el-select 
+						v-model="addForm.userId" 
+						placeholder="请选择用户" 
+						filterable
+						style="width: 100%;"
+						@change="onUserSelectChange">
+						<el-option
+							v-for="user in availableUsers"
+							:key="user.id"
+							:label="user.name"
+							:value="user.id">
+						</el-option>
+					</el-select>
+				</el-form-item>
+				<el-form-item label="姓名" prop="userName">
+					<el-input v-model="addForm.userName" placeholder="请输入姓名" />
+				</el-form-item>
+				<el-form-item label="是否顾问" prop="isLeader">
+					<el-radio-group v-model="addForm.isLeader">
+						<el-radio :label="1">是</el-radio>
+						<el-radio :label="0">否</el-radio>
+					</el-radio-group>
+				</el-form-item>
+				<!-- <el-form-item label="状态" prop="status">
+					<el-select v-model="addForm.status" placeholder="请选择状态" style="width: 100%;">
+						<el-option label="活跃" value="ACTIVE"></el-option>
+						<el-option label="非活跃" value="INACTIVE"></el-option>
+					</el-select>
+				</el-form-item> -->
+				<el-form-item label="排序" prop="sortOrder">
+					<el-input-number 
+						v-model="addForm.sortOrder" 
+						:min="1" 
+						:max="999" 
+						style="width: 100%;" />
+				</el-form-item>
+			</el-form>
+			<span slot="footer" class="dialog-footer">
+				<el-button @click="addDialogVisible = false">取 消</el-button>
+				<el-button type="primary" @click="handleAddMember">确 定</el-button>
+			</span>
+		</el-dialog>
+		
+		<span slot="footer" class="dialog-footer">
+			<el-button @click="handleClose">关 闭</el-button>
+		</span>
+	</el-dialog>
+</template>
+
+<script>
+import request from '@/utils/request'
+
+export default {
+	name: 'MemberEditDialog',
+	data() {
+		return {
+			visible: false,
+			loading: false,
+			jsjId: '',
+			members: [],
+			availableUsers: [],
+			addDialogVisible: false,
+			addForm: {
+				userId: '',
+				userName: '',
+				isLeader: 0,
+				status: 'ACTIVE',
+				sortOrder: 1
+			},
+			addFormRules: {
+				userId: [
+					{ required: true, message: '请选择用户', trigger: 'change' }
+				],
+				userName: [
+					{ required: true, message: '请输入姓名', trigger: 'blur' }
+				],
+				isLeader: [
+					{ required: true, message: '请选择是否顾问', trigger: 'change' }
+				],
+				status: [
+					{ required: true, message: '请选择状态', trigger: 'change' }
+				],
+				sortOrder: [
+					{ required: true, message: '请输入排序', trigger: 'blur' }
+				]
+			}
+		}
+	},
+	methods: {
+		init(jsjId) {
+			this.jsjId = jsjId
+			this.visible = true
+			this.loadMembers()
+			this.loadAvailableUsers()
+		},
+		loadMembers() {
+			if (!this.jsjId) return
+			
+			this.loading = true
+			request({
+				url: `/api/Extend/LqYcsdJsj/${this.jsjId}/detail`,
+				method: 'GET'
+			}).then(res => {
+				this.members = res.data.members || []
+				this.loading = false
+			}).catch(() => {
+				this.members = []
+				this.loading = false
+			})
+		},
+		loadAvailableUsers() {
+			// 加载可用用户列表
+			request({
+				url: '/api/Extend/User/Selector',
+				method: 'GET'
+			}).then(res => {
+				this.availableUsers = res.data.map(item => ({
+					id: item.id,
+					name: item.realName || item.account
+				}))
+			}).catch(() => {
+				this.availableUsers = []
+			})
+		},
+		showAddDialog() {
+			this.addForm = {
+				userId: '',
+				userName: '',
+				isLeader: 0,
+				status: 'ACTIVE',
+				sortOrder: this.members.length + 1
+			}
+			this.addDialogVisible = true
+			this.$nextTick(() => {
+				this.$refs.addForm && this.$refs.addForm.clearValidate()
+			})
+		},
+		onUserSelectChange(userId) {
+			// 用户选择变化时自动填充姓名
+			const selectedUser = this.availableUsers.find(user => user.id === userId)
+			if (selectedUser) {
+				this.addForm.userName = selectedUser.name
+			}
+		},
+		handleAddMember() {
+			this.$refs.addForm.validate((valid) => {
+				if (valid) {
+					// 调用新增接口
+					request({
+						url: '/api/Extend/lqycsdjsj/Actions/AddUserToJsj',
+						method: 'POST',
+						data: {
+							jsjId: this.jsjId,
+							userId: this.addForm.userId,
+							userName: this.addForm.userName,
+							isLeader: this.addForm.isLeader,
+							status: this.addForm.status,
+							sortOrder: this.addForm.sortOrder
+						}
+					}).then(res => {
+						this.$message({
+							type: 'success',
+							message: res.msg || '添加成功',
+							duration: 1500,
+							onClose: () => {
+								this.addDialogVisible = false
+								this.loadMembers()
+							}
+						})
+					}).catch(err => {
+						this.$message({
+							type: 'error',
+							message: err.msg || '添加失败',
+							duration: 1500
+						})
+					})
+				}
+			})
+		},
+		handleDelete(row) {
+			if (!row.id) {
+				this.$message.error('该成员记录缺少ID，无法删除')
+				return
+			}
+			
+			this.$confirm('确定要删除这个成员吗？', '提示', {
+				type: 'warning'
+			}).then(() => {
+				// 调用删除接口
+				request({
+					url: '/api/Extend/lqycsdjsj/Actions/DeleteJsjUserRelation',
+					method: 'POST',
+					data: {
+						id: row.id
+					}
+				}).then(res => {
+					this.$message({
+						type: 'success',
+						message: res.msg || '删除成功',
+						duration: 1500,
+						onClose: () => {
+							this.loadMembers()
+						}
+					})
+				}).catch(err => {
+					this.$message({
+						type: 'error',
+						message: err.msg || '删除失败',
+						duration: 1500
+					})
+				})
+			}).catch(() => {})
+		},
+		handleClose() {
+			this.visible = false
+			this.members = []
+			this.$emit('close')
+		}
+	}
+}
+</script>
+
+<style scoped>
+.member-dialog {
+	padding: 10px 0;
+}
+
+.member-toolbar {
+	display: flex;
+	align-items: center;
+	gap: 10px;
+	margin-bottom: 10px;
+}
+
+.member-count {
+	color: #606266;
+	font-size: 14px;
+	margin-left: auto;
+}
+
+.user-name {
+	display: flex;
+	align-items: center;
+	gap: 8px;
+}
+
+.user-name i {
+	color: #409EFF;
+	font-size: 16px;
+}
+
+.el-table {
+	margin-top: 10px;
+}
+
+.action-buttons {
+	display: flex;
+	gap: 8px;
+}
+
+.action-buttons .el-button {
+	margin: 0;
+}
+</style>
+
diff --git a/antis-ncc-admin/src/views/lqYcsdJsj/index.vue b/antis-ncc-admin/src/views/lqYcsdJsj/index.vue
index 38b74dd..8dbd8bc 100644
--- a/antis-ncc-admin/src/views/lqYcsdJsj/index.vue
+++ b/antis-ncc-admin/src/views/lqYcsdJsj/index.vue
@@ -83,7 +83,7 @@
 							</div>
 						</template>
 					</el-table-column>
-					<el-table-column label="成员数量" align="center" min-width="120">
+					<!-- <el-table-column label="成员数量" align="center" min-width="120">
 						<template slot-scope="scope">
 							<el-tag v-if="scope.row.memberCount > 0" type="success" size="small" effect="dark">
 								<i class="el-icon-user"></i>
@@ -94,11 +94,11 @@
 								0人
 							</el-tag>
 						</template>
-					</el-table-column>
+					</el-table-column> -->
 					<el-table-column label="操作" fixed="right" min-width="200">
 						<template slot-scope="scope">
 							<div class="action-buttons">
-								<el-button type="primary" icon="el-icon-edit" @click="addOrUpdateHandle(scope.row.id)" size="mini" plain>编辑</el-button>
+								<el-button type="primary" icon="el-icon-edit" @click="editMembers(scope.row.id)" size="mini" plain>编辑</el-button>
 								<el-button type="info" icon="el-icon-view" @click="viewDetail(scope.row.id)" size="mini" plain>详情</el-button>
 								<el-button type="danger" icon="el-icon-delete" @click="handleDel(scope.row.id)" size="mini" plain>删除</el-button>
 							</div>
@@ -110,6 +110,7 @@
         </div>
 		<NCC-Form v-if="formVisible" ref="NCCForm" @refresh="refresh" />
 		<ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
+		<MemberEditDialog v-if="memberDialogVisible" ref="MemberEditDialog" @close="memberDialogVisible = false" />
 	</div>
 </template>
 
@@ -218,9 +219,10 @@
     import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
     import NCCForm from './Form'
     import ExportBox from './ExportBox'
+    import MemberEditDialog from './components/member-edit-dialog.vue'
     import { previewDataInterface } from '@/api/systemData/dataInterface'
 	export default {
-        components: { NCCForm, ExportBox },
+        components: { NCCForm, ExportBox, MemberEditDialog },
         data() {
             return {
                 showAll: false,
@@ -244,6 +246,7 @@
                 },
                 formVisible: false,
                 exportBoxVisible: false,
+                memberDialogVisible: false,
                 columnList: [
                     { prop: 'id', label: '主键' },
                     { prop: 'yf', label: '月份' },
@@ -254,10 +257,21 @@
         },
 		computed: {},
 		created() {
+			// 设置默认月份为本月
+			this.setDefaultMonth()
 			this.loadStoreList()
 			this.initData()
 		},
 		methods: {
+			setDefaultMonth() {
+				// 获取当前月份，格式：yyyyMM
+				const now = new Date()
+				const year = now.getFullYear()
+				const month = String(now.getMonth() + 1).padStart(2, '0')
+				const currentMonth = `${year}${month}`
+				this.monthQuery = currentMonth
+				this.query.yf = currentMonth
+			},
 			initData() {
                 this.listLoading = true;
                 let _query = {
@@ -284,7 +298,7 @@
                     // 加载门店映射
                     this.loadStoreMap()
                     // 为每个金三角加载成员数量
-                    this.loadMemberCounts()
+                    // this.loadMemberCounts()
                 })
             },
 			handleDel(id) {
@@ -306,6 +320,12 @@
                 }).catch(() => {
                 });
             },
+            editMembers(id) {
+                this.memberDialogVisible = true
+                this.$nextTick(() => {
+                    this.$refs.MemberEditDialog.init(id)
+                })
+            },
             viewDetail(id) {
                 this.formVisible = true
                 this.$nextTick(() => {
@@ -441,10 +461,10 @@
                 if (isrRefresh) this.reset()
             },
             reset() {
-                for (let key in this.query) {
-                    this.query[key] = undefined
-                }
-                this.monthQuery = null
+                // 重置时恢复默认月份为本月
+                this.setDefaultMonth()
+                this.query.md = undefined
+                this.query.jsj = undefined
                 this.listQuery = {
                     currentPage: 1,
                     pageSize: 20,
diff --git a/antis-ncc-admin/src/views/lqYcsdMdmbsd/index.vue b/antis-ncc-admin/src/views/lqYcsdMdmbsd/index.vue
index 51c6e44..34d01a2 100644
--- a/antis-ncc-admin/src/views/lqYcsdMdmbsd/index.vue
+++ b/antis-ncc-admin/src/views/lqYcsdMdmbsd/index.vue
@@ -137,8 +137,8 @@
           </template>
         </el-table-column>
 
-        <!-- 重大项目部 -->
-        <el-table-column label="重大项目部" width="140" align="center">
+        <!-- 大项目部 -->
+        <el-table-column label="大项目部" width="140" align="center">
           <template slot-scope="scope">
             <div class="department-item">
               <i class="el-icon-office-building department-icon"></i>
--
libgit2 0.21.4