From 5ca571fe768261f84aeaa0925cffe3201074b0bd Mon Sep 17 00:00:00 2001
From: “wangming” <“wangming@antissoft.com”>
Date: Wed, 10 Sep 2025 13:17:32 +0800
Subject: [PATCH] 更新LqYcsdJsj相关文件，移除不再使用的字段，添加金三角成员管理功能，优化查询和创建接口，同时更新前端表单以支持新功能，确保代码整洁和功能完整性。

---
 .DS_Store                                                                                               | Bin 14340 -> 0 bytes
 antis-ncc-admin/.env.development                                                                        |   2 +-
 antis-ncc-admin/src/views/lqYcsdJsj/Form.vue                                                            | 837 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 antis-ncc-admin/src/views/lqYcsdJsj/MemberDialog.vue                                                    | 197 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 antis-ncc-admin/src/views/lqYcsdJsj/index.vue                                                           | 485 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqJinsanjiaoUser/LqJinsanjiaoUserCrInput.cs        |  38 ++++++++++++++++++++++++++++++++++++++
 netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqJinsanjiaoUser/LqJinsanjiaoUserInfoOutput.cs     |  80 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqJinsanjiaoUser/LqJinsanjiaoUserListOutput.cs     |  65 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqJinsanjiaoUser/LqJinsanjiaoUserListQueryInput.cs |  41 +++++++++++++++++++++++++++++++++++++++++
 netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqJinsanjiaoUser/LqJinsanjiaoUserUpInput.cs        |  38 ++++++++++++++++++++++++++++++++++++++
 netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdJsj/LqYcsdJsjCrInput.cs                      | 147 +++++++++++++++++++++------------------------------------------------------------------------------------------------------------------------------
 netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdJsj/LqYcsdJsjInfoOutput.cs                   | 135 ---------------------------------------------------------------------------------------------------------------------------------------
 netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdJsj/LqYcsdJsjListOutput.cs                   | 135 ---------------------------------------------------------------------------------------------------------------------------------------
 netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdJsj/LqYcsdJsjListQueryInput.cs               | 135 ---------------------------------------------------------------------------------------------------------------------------------------
 netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_jinsanjiao_user/LqJinsanjiaoUserEntity.cs    |  86 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_ycsd_jsj/LqYcsdJsjEntity.cs                  | 169 +++----------------------------------------------------------------------------------------------------------------------------------------------------------------------
 netcore/src/Modularity/Extend/NCC.Extend/LqYcsdJsjService.cs                                            | 356 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------------------------------------------------------------------
 参考资料/.DS_Store                                                                                  | Bin 10244 -> 0 bytes
 参考资料/工资核算 -7月/.DS_Store                                                               | Bin 8196 -> 0 bytes
 数据库说明.md                                                                                      |  92 ++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------
 20 files changed, 1657 insertions(+), 1381 deletions(-)
 create mode 100644 antis-ncc-admin/src/views/lqYcsdJsj/MemberDialog.vue
 create mode 100644 netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqJinsanjiaoUser/LqJinsanjiaoUserCrInput.cs
 create mode 100644 netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqJinsanjiaoUser/LqJinsanjiaoUserInfoOutput.cs
 create mode 100644 netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqJinsanjiaoUser/LqJinsanjiaoUserListOutput.cs
 create mode 100644 netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqJinsanjiaoUser/LqJinsanjiaoUserListQueryInput.cs
 create mode 100644 netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqJinsanjiaoUser/LqJinsanjiaoUserUpInput.cs
 create mode 100644 netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_jinsanjiao_user/LqJinsanjiaoUserEntity.cs

diff --git a/.DS_Store b/.DS_Store
index f527377..966a8b6 100644
Binary files a/.DS_Store and b/.DS_Store differ
diff --git a/antis-ncc-admin/.env.development b/antis-ncc-admin/.env.development
index 2513186..bfa2e32 100644
--- a/antis-ncc-admin/.env.development
+++ b/antis-ncc-admin/.env.development
@@ -1,5 +1,5 @@
 # 开发
 
 VUE_CLI_BABEL_TRANSPILE_MODULES = true
-VUE_APP_BASE_API = 'http://localhost:2011'
+VUE_APP_BASE_API = 'http://192.168.110.45:5000'
 VUE_APP_BASE_WSS = 'ws://localhost:2011/websocket'
diff --git a/antis-ncc-admin/src/views/lqYcsdJsj/Form.vue b/antis-ncc-admin/src/views/lqYcsdJsj/Form.vue
index 90cce88..8ab1f9d 100644
--- a/antis-ncc-admin/src/views/lqYcsdJsj/Form.vue
+++ b/antis-ncc-admin/src/views/lqYcsdJsj/Form.vue
@@ -1,205 +1,161 @@
 <template>
-	<el-dialog :title="!dataForm.id ? '新建' :  isDetail ? '详情':'编辑'" :close-on-click-modal="false" :visible.sync="visible" class="NCC-dialog NCC-dialog_center" lock-scroll width="600px">
-		<el-row :gutter="15" class="" >
-				<el-form ref="elForm" :model="dataForm" size="small" label-width="100px" label-position="right" :disabled="!!isDetail" :rules="rules">
-					<el-col :span="24" v-if="false" >
-						<el-form-item label="主键" prop="id">
-							<el-input v-model="dataForm.id" placeholder="请输入" clearable :style='{"width":"100%"}' >
-							</el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="12">
-						<el-form-item label="月份" prop="yf">
-							<el-input v-model="dataForm.yf" placeholder="请输入" clearable :style='{"width":"100%"}' >
-							</el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="12">
-						<el-form-item label="门店" prop="md">
-							<el-input v-model="dataForm.md" placeholder="请输入" clearable :style='{"width":"100%"}' >
-							</el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="12">
-						<el-form-item label="金三角" prop="jsj">
-							<el-input v-model="dataForm.jsj" placeholder="请输入" clearable :style='{"width":"100%"}' >
-							</el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="12">
-						<el-form-item label="岗位" prop="gw">
-							<el-input v-model="dataForm.gw" placeholder="请输入" clearable :style='{"width":"100%"}' >
-							</el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="12">
-						<el-form-item label="健康师" prop="jks">
-							<el-input v-model="dataForm.jks" placeholder="请输入" clearable :style='{"width":"100%"}' >
-							</el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="12">
-						<el-form-item label="成交率" prop="cjl">
-							<el-input v-model="dataForm.cjl" placeholder="请输入" clearable :style='{"width":"100%"}' >
-							</el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="12">
-						<el-form-item label="成交业绩" prop="cjyj">
-							<el-input v-model="dataForm.cjyj" placeholder="请输入" clearable :style='{"width":"100%"}' >
-							</el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="12">
-						<el-form-item label="成交提点" prop="cjtd">
-							<el-input v-model="dataForm.cjtd" placeholder="请输入" clearable :style='{"width":"100%"}' >
-							</el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="12">
-						<el-form-item label="剩余业绩" prop="syyj">
-							<el-input v-model="dataForm.syyj" placeholder="请输入" clearable :style='{"width":"100%"}' >
-							</el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="12">
-						<el-form-item label="出勤天数" prop="cqts">
-							<el-input v-model="dataForm.cqts" placeholder="请输入" clearable :style='{"width":"100%"}' >
-							</el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="12">
-						<el-form-item label="系统业绩" prop="xtyj">
-							<el-input v-model="dataForm.xtyj" placeholder="请输入" clearable :style='{"width":"100%"}' >
-							</el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="12">
-						<el-form-item label="总业绩" prop="zyj">
-							<el-input v-model="dataForm.zyj" placeholder="请输入" clearable :style='{"width":"100%"}' >
-							</el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="12">
-						<el-form-item label="基础业绩" prop="jcyj">
-							<el-input v-model="dataForm.jcyj" placeholder="请输入" clearable :style='{"width":"100%"}' >
-							</el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="12">
-						<el-form-item label="合作业绩" prop="hzyj">
-							<el-input v-model="dataForm.hzyj" placeholder="请输入" clearable :style='{"width":"100%"}' >
-							</el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="12">
-						<el-form-item label="奖励业绩" prop="jlyj">
-							<el-input v-model="dataForm.jlyj" placeholder="请输入" clearable :style='{"width":"100%"}' >
-							</el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="12">
-						<el-form-item label="项目数" prop="xms">
-							<el-input v-model="dataForm.xms" placeholder="请输入" clearable :style='{"width":"100%"}' >
-							</el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="12">
-						<el-form-item label="手工" prop="sg">
-							<el-input v-model="dataForm.sg" placeholder="请输入" clearable :style='{"width":"100%"}' >
-							</el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="12">
-						<el-form-item label="是否属于战队" prop="sfsyzd">
-							<el-input v-model="dataForm.sfsyzd" placeholder="请输入" clearable :style='{"width":"100%"}' >
-							</el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="12">
-						<el-form-item label="是否满足考勤" prop="fsmzkq">
-							<el-input v-model="dataForm.fsmzkq" placeholder="请输入" clearable :style='{"width":"100%"}' >
-							</el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="12">
-						<el-form-item label="战队最终人数" prop="zdzzrs">
-							<el-input v-model="dataForm.zdzzrs" placeholder="请输入" clearable :style='{"width":"100%"}' >
-							</el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="12">
-						<el-form-item label="视为单人" prop="kqhbsyzd">
-							<el-input v-model="dataForm.kqhbsyzd" placeholder="考勤后不属于战队的" clearable :style='{"width":"100%"}' >
-							</el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="12">
-						<el-form-item label="战队提成" prop="zdtc">
-							<el-input v-model="dataForm.zdtc" placeholder="请输入" clearable :style='{"width":"100%"}' >
-							</el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="12">
-						<el-form-item label="按1人提成" prop="ayrtc">
-							<el-input v-model="dataForm.ayrtc" placeholder="请输入" clearable :style='{"width":"100%"}' >
-							</el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="12">
-						<el-form-item label="最终提成点" prop="zztcd">
-							<el-input v-model="dataForm.zztcd" placeholder="请输入" clearable :style='{"width":"100%"}' >
-							</el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="12">
-						<el-form-item label="基础业绩提成" prop="jcyjtc">
-							<el-input v-model="dataForm.jcyjtc" placeholder="请输入" clearable :style='{"width":"100%"}' >
-							</el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="12">
-						<el-form-item label="合作业绩提成" prop="hzyjtc">
-							<el-input v-model="dataForm.hzyjtc" placeholder="请输入" clearable :style='{"width":"100%"}' >
-							</el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="12">
-						<el-form-item label="提成合计" prop="tchj">
-							<el-input v-model="dataForm.tchj" placeholder="请输入" clearable :style='{"width":"100%"}' >
-							</el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="12">
-						<el-form-item label="个人占比" prop="grzb">
-							<el-input v-model="dataForm.grzb" placeholder="请输入" clearable :style='{"width":"100%"}' >
-							</el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="12">
-						<el-form-item label="组员合计" prop="zyhj">
-							<el-input v-model="dataForm.zyhj" placeholder="请输入" clearable :style='{"width":"100%"}' >
-							</el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="12">
-						<el-form-item label="顾问提成" prop="gwtc">
-							<el-input v-model="dataForm.gwtc" placeholder="请输入" clearable :style='{"width":"100%"}' >
-							</el-input>
-						</el-form-item>
-					</el-col>
-				</el-form>
-		</el-row>
+	<el-dialog 
+		:title="dialogTitle" 
+		:close-on-click-modal="false" 
+		:visible.sync="visible" 
+		class="NCC-dialog NCC-dialog_center" 
+		lock-scroll 
+		width="900px"
+		:before-close="handleClose">
+		
+		<!-- 基本信息 -->
+		<el-form ref="basicForm" :model="dataForm" size="small" label-width="100px" label-position="right" :disabled="!!isDetail" :rules="rules">
+			<el-row :gutter="15">
+				<el-col :span="12">
+					<el-form-item label="月份" prop="yf">
+						<el-date-picker
+							v-model="monthValue"
+							type="month"
+							placeholder="请选择月份"
+							format="yyyyMM"
+							value-format="yyyyMM"
+							:style='{"width":"100%"}'
+							@change="onMonthChange">
+						</el-date-picker>
+					</el-form-item>
+				</el-col>
+				<el-col :span="12">
+					<el-form-item label="门店" prop="md">
+						<el-select 
+							v-model="dataForm.md" 
+							placeholder="请选择门店" 
+							clearable 
+							:style='{"width":"100%"}' 
+							@change="onStoreChange"
+							filterable>
+							<el-option
+								v-for="store in storeList"
+								:key="store.id"
+								:label="store.name"
+								:value="store.id">
+							</el-option>
+						</el-select>
+					</el-form-item>
+				</el-col>
+				<el-col :span="24">
+					<el-form-item label="金三角" prop="jsj">
+						<el-input 
+							v-model="dataForm.jsj" 
+							placeholder="请输入金三角名称" 
+							clearable 
+							:style='{"width":"100%"}' 
+							maxlength="50">
+						</el-input>
+					</el-form-item>
+				</el-col>
+			</el-row>
+		</el-form>
+		
+		<!-- 成员管理 -->
+		<div class="member-section">
+			<div class="section-title">
+				<span>{{ isDetail ? '成员信息' : '成员管理' }}</span>
+				<div class="member-actions" v-if="!isDetail">
+					<el-button type="primary" icon="el-icon-plus" @click="addMember" size="small">添加成员</el-button>
+					<el-button type="warning" icon="el-icon-refresh" @click="refreshMembers" size="small">刷新</el-button>
+					<span class="member-count">共 {{ members.length }} 人</span>
+				</div>
+				<span class="member-count" v-if="isDetail">共 {{ members.length }} 人</span>
+			</div>
+			
+			<el-table :data="members" border style="width: 100%; margin-top: 10px;" :header-cell-style="{ background: '#f5f7fa', color: '#606266', fontWeight: 'bold' }">
+				<el-table-column type="index" label="序号" min-width="80" align="center" />
+				<el-table-column prop="userName" label="姓名" min-width="120">
+					<template slot-scope="scope">
+						<el-input v-if="!isDetail" v-model="scope.row.userName" size="small" placeholder="请输入姓名" />
+						<div v-else class="member-name">
+							<i class="el-icon-user"></i>
+							<span>{{ scope.row.userName }}</span>
+						</div>
+					</template>
+				</el-table-column>
+				<el-table-column prop="userId" label="用户" min-width="180">
+					<template slot-scope="scope">
+						<el-select 
+							v-if="!isDetail"
+							v-model="scope.row.userId" 
+							placeholder="选择用户" 
+							size="small" 
+							@change="onUserChange(scope.$index, $event)"
+							filterable
+							style="width: 100%;">
+							<el-option
+								v-for="user in availableUsers"
+								:key="user.id"
+								:label="user.name"
+								:value="user.id">
+							</el-option>
+						</el-select>
+						<div v-else class="user-info">
+							<i class="el-icon-user-solid"></i>
+							<span>{{ scope.row.userId }}</span>
+						</div>
+					</template>
+				</el-table-column>
+				<el-table-column label="是否顾问" min-width="120" align="center">
+					<template slot-scope="scope">
+						<el-radio-group v-if="!isDetail" v-model="scope.row.isLeader" size="small">
+							<el-radio :label="1">是</el-radio>
+							<el-radio :label="0">否</el-radio>
+						</el-radio-group>
+						<el-tag v-else :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 label="排序" min-width="100" align="center">
+					<template slot-scope="scope">
+						<el-input-number 
+							v-if="!isDetail"
+							v-model="scope.row.sortOrder" 
+							:min="1" 
+							:max="999" 
+							size="small"
+							style="width: 100%;" />
+						<el-tag v-else type="info" size="small">{{ scope.row.sortOrder }}</el-tag>
+					</template>
+				</el-table-column>
+				<el-table-column prop="status" label="状态" min-width="100" align="center" v-if="isDetail">
+					<template slot-scope="scope">
+						<el-tag :type="scope.row.status === 'ACTIVE' ? 'success' : 'info'" size="small" effect="dark">
+							<i class="el-icon-check" v-if="scope.row.status === 'ACTIVE'"></i>
+							<i class="el-icon-close" v-else></i>
+							{{ scope.row.status === 'ACTIVE' ? '活跃' : '非活跃' }}
+						</el-tag>
+					</template>
+				</el-table-column>
+				<el-table-column label="操作" min-width="120" align="center" v-if="!isDetail">
+					<template slot-scope="scope">
+						<el-button type="danger" icon="el-icon-delete" @click="removeMember(scope.$index)" size="small" plain>删除</el-button>
+					</template>
+				</el-table-column>
+			</el-table>
+		</div>
+		
 		<span slot="footer" class="dialog-footer">
-			<el-button @click="visible = false">取 消</el-button>
+			<el-button @click="handleClose">取 消</el-button>
 			<el-button type="primary" @click="dataFormSubmit()" v-if="!isDetail">确 定</el-button>
 		</span>
 	</el-dialog>
 </template>
+
 <script>
 	import request from '@/utils/request'
 	import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
 	import { previewDataInterface } from '@/api/systemData/dataInterface'
+	
 	export default {
 		components: {},
 		props: [],
@@ -208,109 +164,430 @@
 				loading: false,
 				visible: false,
 				isDetail: false,
+				isManageMembers: false,
 				dataForm: {
-					id:'',
-					id:undefined,
-					yf:undefined,
-					md:undefined,
-					jsj:undefined,
-					gw:undefined,
-					jks:undefined,
-					cjl:undefined,
-					cjyj:undefined,
-					cjtd:undefined,
-					syyj:undefined,
-					cqts:undefined,
-					xtyj:undefined,
-					zyj:undefined,
-					jcyj:undefined,
-					hzyj:undefined,
-					jlyj:undefined,
-					xms:undefined,
-					sg:undefined,
-					sfsyzd:undefined,
-					fsmzkq:undefined,
-					zdzzrs:undefined,
-					kqhbsyzd:undefined,
-					zdtc:undefined,
-					ayrtc:undefined,
-					zztcd:undefined,
-					jcyjtc:undefined,
-					hzyjtc:undefined,
-					tchj:undefined,
-					grzb:undefined,
-					zyhj:undefined,
-					gwtc:undefined,
+					id: '',
+					yf: '',
+					md: '',
+					jsj: ''
 				},
+				members: [],
+				storeList: [],
+				availableUsers: [],
+				monthValue: null, // 月份选择器的值
 				rules: {
-				},
+					yf: [
+						{ required: true, message: '月份不能为空', trigger: 'blur' },
+						{ pattern: /^\d{6}$/, message: '月份格式必须为yyyyMM', trigger: 'blur' }
+					],
+					md: [
+						{ required: true, message: '门店不能为空', trigger: 'change' }
+					],
+					jsj: [
+						{ required: true, message: '金三角名称不能为空', trigger: 'blur' }
+					]
+				}
 			}
 		},
-		computed: {},
-        watch: {},
-        created() {
+		computed: {
+			dialogTitle() {
+				if (this.isDetail) return '金三角详情'
+				if (this.isManageMembers) return '管理成员'
+				return this.dataForm.id ? '编辑金三角' : '新建金三角'
+			}
 		},
-		mounted() {
-        },
+		watch: {},
+		created() {},
+		mounted() {},
 		methods: {
 			goBack() {
-                this.$emit('refresh')
-            },
-			init(id, isDetail) {
-				this.dataForm.id = id || 0;
-                this.visible = true;
-                this.isDetail = isDetail || false;
+				this.$emit('refresh')
+			},
+			init(id, isDetail, isManageMembers) {
+				this.dataForm.id = id || 0
+				this.visible = true
+				this.isDetail = isDetail || false
+				this.isManageMembers = isManageMembers || false
+				this.members = []
+				
 				this.$nextTick(() => {
-					this.$refs['elForm'].resetFields();
+					this.$refs['basicForm'] && this.$refs['basicForm'].resetFields()
+					this.loadStoreList()
 					if (this.dataForm.id) {
-						request({
-							url: '/api/Extend/LqYcsdJsj/' + this.dataForm.id,
-							method: 'get'
-						}).then(res =>{
-							this.dataForm = res.data;
-						})
+						this.loadData()
+					}
+				})
+			},
+			loadData() {
+				// 加载基本信息
+				request({
+					url: '/api/Extend/LqYcsdJsj/' + this.dataForm.id,
+					method: 'get'
+				}).then(res => {
+					this.dataForm = res.data
+					// 同步月份选择器的值
+					this.monthValue = this.dataForm.yf
+					// 门店变化后更新可用用户（不清空成员）
+					if (this.dataForm.md) {
+						this.loadUsersByStore(this.dataForm.md)
+					}
+				})
+				
+				// 加载成员信息
+				request({
+					url: '/api/Extend/LqYcsdJsj/' + this.dataForm.id + '/detail',
+					method: 'get'
+				}).then(res => {
+					this.members = res.data.members || []
+				})
+			},
+			loadStoreList() {
+				// 加载门店列表
+				request({
+					url: '/api/Extend/LqMdxx/Selector',
+					method: 'GET'
+				}).then(res => {
+					this.storeList = res.data.list.map(item => ({
+						id: item.id,
+						name: item.fullName
+					}))
+				}).catch(() => {
+					this.storeList = []
+				})
+			},
+			onStoreChange() {
+				// 门店变化时更新可用用户
+				if (this.dataForm.md) {
+					this.loadUsersByStore(this.dataForm.md)
+				} else {
+					this.availableUsers = []
+				}
+				// 清空已选择的成员
+				this.members = []
+			},
+			loadUsersByStore(storeId) {
+				// 根据门店ID加载用户
+				request({
+					url: '/api/Extend/User/Selector',
+					method: 'GET',
+					params: {
+						mdid: storeId
 					}
+				}).then(res => {
+					this.availableUsers = res.data.map(item => ({
+						id: item.id,
+						name: item.realName,
+						storeId: item.mdid
+					}))
+				}).catch(() => {
+					this.availableUsers = []
 				})
 			},
+			onUserChange(index, userId) {
+				// 用户选择变化时自动填充姓名
+				const selectedUser = this.availableUsers.find(user => user.id === userId)
+				if (selectedUser) {
+					this.$set(this.members[index], 'userName', selectedUser.name)
+				}
+			},
+			onMonthChange(value) {
+				// 月份选择器变化时更新dataForm.yf
+				this.dataForm.yf = value
+			},
 			dataFormSubmit() {
-				this.$refs['elForm'].validate((valid) => {
-                    if (valid) {
-                        if (!this.dataForm.id) {
-                            request({
-                                url: `/api/Extend/LqYcsdJsj`,
-                                method: 'post',
-                                data: this.dataForm,
-                            }).then((res) => {
-                                this.$message({
-                                    message: res.msg,
-                                    type: 'success',
-                                    duration: 1000,
-                                    onClose: () => {
-                                        this.visible = false,
-                                            this.$emit('refresh', true)
-                                    }
-                                })
-                            })
-                        } else {
-                            request({
-                                url: '/api/Extend/LqYcsdJsj/' + this.dataForm.id,
-                                method: 'PUT',
-                                data: this.dataForm
-                            }).then((res) => {
-                                this.$message({
-                                    message: res.msg,
-                                    type: 'success',
-                                    duration: 1000,
-                                    onClose: () => {
-                                        this.visible = false
-                                        this.$emit('refresh', true)
-                                    }
-                                })
-                            })
-                        }
-                    }
-                })
+				this.$refs['basicForm'].validate((valid) => {
+					if (valid) {
+						// 验证多人战队必须有顾问
+						if (this.members.length >= 2) {
+							const hasLeader = this.members.some(m => m.isLeader === 1)
+							if (!hasLeader) {
+								this.$message.error('两人或两人以上的战队必须有一个顾问')
+								this.activeTab = 'members'
+								return
+							}
+						}
+						
+						const submitData = {
+							...this.dataForm,
+							members: this.members
+						}
+						
+						if (!this.dataForm.id) {
+							// 新建
+							request({
+								url: `/api/Extend/LqYcsdJsj`,
+								method: 'post',
+								data: submitData,
+							}).then((res) => {
+								this.$message({
+									message: res.msg,
+									type: 'success',
+									duration: 1000,
+									onClose: () => {
+										this.visible = false
+										this.$emit('refresh', true)
+									}
+								})
+							})
+						} else {
+							// 编辑
+							request({
+								url: '/api/Extend/LqYcsdJsj/' + this.dataForm.id,
+								method: 'PUT',
+								data: submitData
+							}).then((res) => {
+								this.$message({
+									message: res.msg,
+									type: 'success',
+									duration: 1000,
+									onClose: () => {
+										this.visible = false
+										this.$emit('refresh', true)
+									}
+								})
+							})
+						}
+					}
+				})
+			},
+			// 成员管理方法
+			addMember() {
+				if (!this.dataForm.md) {
+					this.$message.warning('请先选择门店')
+					return
+				}
+				this.members.push({
+					userId: '',
+					userName: '',
+					isLeader: 0,
+					sortOrder: this.members.length + 1
+				})
+			},
+			removeMember(index) {
+				this.$confirm('确定要删除这个成员吗？', '提示', {
+					type: 'warning'
+				}).then(() => {
+					this.members.splice(index, 1)
+					// 重新排序
+					this.members.forEach((member, index) => {
+						member.sortOrder = index + 1
+					})
+				})
 			},
+			refreshMembers() {
+				if (this.dataForm.id) {
+					this.loadData()
+				}
+			},
+			handleClose() {
+				this.visible = false
+			}
 		}
 	}
 </script>
+
+<style scoped>
+/* 基本信息区域 */
+.el-form {
+	background: #f8f9fa;
+	padding: 20px;
+	border-radius: 8px;
+	margin-bottom: 20px;
+	box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1);
+	border: 1px solid #e9ecef;
+}
+
+.el-form-item__label {
+	font-weight: 600;
+	color: #2c3e50;
+}
+
+/* 成员管理区域 */
+.member-section {
+	margin-top: 20px;
+	padding: 20px;
+	border: 1px solid #e1e8ed;
+	border-radius: 8px;
+	background: #fff;
+	box-shadow: 0 2px 8px rgba(0, 0, 0, 0.08);
+}
+
+.section-title {
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	margin-bottom: 16px;
+	font-size: 18px;
+	font-weight: 700;
+	color: #2c3e50;
+	border-bottom: 2px solid #3498db;
+	padding-bottom: 8px;
+}
+
+.member-actions {
+	display: flex;
+	align-items: center;
+	gap: 12px;
+}
+
+.member-count {
+	color: #7f8c8d;
+	font-size: 14px;
+	font-weight: 500;
+	background: #ecf0f1;
+	padding: 4px 12px;
+	border-radius: 20px;
+}
+
+/* 表格样式 */
+.el-table {
+	margin-top: 16px;
+	border-radius: 8px;
+	overflow: hidden;
+	box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1);
+}
+
+.el-table th {
+	background: #409EFF !important;
+	color: #fff !important;
+	font-weight: 600;
+}
+
+.el-table tbody tr:hover > td {
+	background-color: #f8f9fa !important;
+}
+
+/* 成员信息显示 */
+.member-name, .user-info {
+	display: flex;
+	align-items: center;
+	gap: 8px;
+	color: #2c3e50;
+	font-weight: 500;
+}
+
+.member-name i, .user-info i {
+	color: #3498db;
+	font-size: 16px;
+}
+
+/* 标签样式 */
+.el-tag {
+	border-radius: 16px;
+	font-weight: 500;
+	padding: 4px 12px;
+}
+
+.el-tag i {
+	margin-right: 4px;
+}
+
+/* 按钮样式 */
+.el-button {
+	border-radius: 6px;
+	font-weight: 500;
+	transition: all 0.3s ease;
+}
+
+.el-button:hover {
+	transform: translateY(-1px);
+	box-shadow: 0 4px 8px rgba(0, 0, 0, 0.15);
+}
+
+/* 输入框样式 */
+.el-input, .el-select, .el-input-number {
+	border-radius: 6px;
+}
+
+.el-input__inner, .el-textarea__inner {
+	border-radius: 6px;
+	transition: all 0.3s ease;
+}
+
+.el-input__inner:focus, .el-textarea__inner:focus {
+	border-color: #3498db;
+	box-shadow: 0 0 0 2px rgba(52, 152, 219, 0.2);
+}
+
+/* 对话框样式 */
+.NCC-dialog {
+	border-radius: 8px;
+	overflow: hidden;
+}
+
+.el-dialog__header {
+	background: #409EFF;
+	color: #fff;
+	padding: 20px;
+}
+
+.el-dialog__title {
+	font-weight: 600;
+	font-size: 18px;
+}
+
+.el-dialog__body {
+	padding: 30px;
+	background: #f8f9fa;
+}
+
+.el-dialog__footer {
+	background: #fff;
+	padding: 20px 30px;
+	border-top: 1px solid #e9ecef;
+}
+
+/* 响应式设计 */
+@media (max-width: 768px) {
+	.member-actions {
+		flex-direction: column;
+		align-items: flex-start;
+		gap: 8px;
+	}
+	
+	.action-buttons {
+		flex-direction: column;
+		width: 100%;
+	}
+	
+	.action-buttons .el-button {
+		width: 100%;
+	}
+}
+
+/* 动画效果 */
+.member-section {
+	animation: fadeInUp 0.5s ease-out;
+}
+
+@keyframes fadeInUp {
+	from {
+		opacity: 0;
+		transform: translateY(20px);
+	}
+	to {
+		opacity: 1;
+		transform: translateY(0);
+	}
+}
+
+/* 滚动条样式 */
+.el-table__body-wrapper::-webkit-scrollbar {
+	width: 6px;
+	height: 6px;
+}
+
+.el-table__body-wrapper::-webkit-scrollbar-track {
+	background: #f1f1f1;
+	border-radius: 3px;
+}
+
+.el-table__body-wrapper::-webkit-scrollbar-thumb {
+	background: #c1c1c1;
+	border-radius: 3px;
+}
+
+.el-table__body-wrapper::-webkit-scrollbar-thumb:hover {
+	background: #a8a8a8;
+}
+</style>
\ No newline at end of file
diff --git a/antis-ncc-admin/src/views/lqYcsdJsj/MemberDialog.vue b/antis-ncc-admin/src/views/lqYcsdJsj/MemberDialog.vue
new file mode 100644
index 0000000..cf858e5
--- /dev/null
+++ b/antis-ncc-admin/src/views/lqYcsdJsj/MemberDialog.vue
@@ -0,0 +1,197 @@
+<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="addMember" size="small">添加成员</el-button>
+				<el-button type="warning" icon="el-icon-refresh" @click="refreshMembers" size="small">刷新</el-button>
+				<el-button type="success" icon="el-icon-check" @click="saveAll" 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="姓名" width="120">
+					<template slot-scope="scope">
+						<el-input v-model="scope.row.userName" size="mini" />
+					</template>
+				</el-table-column>
+				<el-table-column prop="userId" label="用户ID" width="150">
+					<template slot-scope="scope">
+						<el-input v-model="scope.row.userId" size="mini" />
+					</template>
+				</el-table-column>
+				<el-table-column label="是否顾问" width="120" align="center">
+					<template slot-scope="scope">
+						<el-radio-group v-model="scope.row.isLeader" size="mini">
+							<el-radio :label="1">是</el-radio>
+							<el-radio :label="0">否</el-radio>
+						</el-radio-group>
+					</template>
+				</el-table-column>
+				<el-table-column label="排序" width="100" align="center">
+					<template slot-scope="scope">
+						<el-input-number 
+							v-model="scope.row.sortOrder" 
+							:min="1" 
+							:max="999" 
+							size="mini"
+							style="width: 80px;" />
+					</template>
+				</el-table-column>
+				<el-table-column label="操作" width="100" align="center">
+					<template slot-scope="scope">
+						<el-button type="text" @click="removeMember(scope.$index)" class="NCC-table-delBtn" size="mini">删除</el-button>
+					</template>
+				</el-table-column>
+			</el-table>
+			
+			<!-- 批量操作 -->
+			<div class="batch-operations" v-if="members.length > 0">
+				<el-button type="info" @click="sortMembers" size="small">重新排序</el-button>
+				<el-button type="warning" @click="clearAll" size="small">清空全部</el-button>
+			</div>
+		</div>
+		
+		<span slot="footer" class="dialog-footer">
+			<el-button @click="handleClose">取 消</el-button>
+			<el-button type="primary" @click="saveAll">确 定</el-button>
+		</span>
+	</el-dialog>
+</template>
+
+<script>
+	import request from '@/utils/request'
+	
+	export default {
+		name: 'MemberDialog',
+		props: {
+			jsjId: {
+				type: String,
+				default: ''
+			}
+		},
+		data() {
+			return {
+				visible: false,
+				loading: false,
+				members: []
+			}
+		},
+		methods: {
+			init(jsjId) {
+				this.jsjId = jsjId
+				this.visible = true
+				this.loadMembers()
+			},
+			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
+				})
+			},
+			addMember() {
+				this.members.push({
+					userId: '',
+					userName: '',
+					isLeader: 0,
+					sortOrder: this.members.length + 1
+				})
+			},
+			removeMember(index) {
+				this.$confirm('确定要删除这个成员吗？', '提示', {
+					type: 'warning'
+				}).then(() => {
+					this.members.splice(index, 1)
+					this.sortMembers()
+				})
+			},
+			sortMembers() {
+				this.members.forEach((member, index) => {
+					member.sortOrder = index + 1
+				})
+			},
+			clearAll() {
+				this.$confirm('确定要清空所有成员吗？', '提示', {
+					type: 'warning'
+				}).then(() => {
+					this.members = []
+				})
+			},
+			refreshMembers() {
+				this.loadMembers()
+			},
+			saveAll() {
+				// 验证数据
+				for (let i = 0; i < this.members.length; i++) {
+					const member = this.members[i]
+					if (!member.userId || !member.userName) {
+						this.$message.error(`第${i + 1}行成员信息不完整`)
+						return
+					}
+				}
+				
+				// 验证多人战队必须有顾问
+				if (this.members.length >= 2) {
+					const hasLeader = this.members.some(m => m.isLeader === 1)
+					if (!hasLeader) {
+						this.$message.error('两人或两人以上的战队必须有一个顾问')
+						return
+					}
+				}
+				
+				// 发送保存请求
+				this.$emit('save', this.members)
+				this.handleClose()
+			},
+			handleClose() {
+				this.visible = false
+				this.$emit('close')
+			}
+		}
+	}
+</script>
+
+<style scoped>
+.member-dialog {
+	padding: 10px 0;
+}
+
+.member-toolbar {
+	display: flex;
+	align-items: center;
+	gap: 10px;
+}
+
+.member-count {
+	color: #606266;
+	font-size: 14px;
+	margin-left: auto;
+}
+
+.batch-operations {
+	margin-top: 15px;
+	padding-top: 15px;
+	border-top: 1px solid #ebeef5;
+}
+
+.el-table {
+	margin-top: 10px;
+}
+</style>
diff --git a/antis-ncc-admin/src/views/lqYcsdJsj/index.vue b/antis-ncc-admin/src/views/lqYcsdJsj/index.vue
index 22afa1a..38b74dd 100644
--- a/antis-ncc-admin/src/views/lqYcsdJsj/index.vue
+++ b/antis-ncc-admin/src/views/lqYcsdJsj/index.vue
@@ -4,168 +4,45 @@
 			<el-row class="NCC-common-search-box" :gutter="16">
 				<el-form @submit.native.prevent>
 					<el-col :span="6">
-						<el-form-item label="主键">
-							<el-input v-model="query.id" placeholder="主键" clearable />	
-						</el-form-item>
-					</el-col>
-					<el-col :span="6">
 						<el-form-item label="月份">
-							<el-input v-model="query.yf" placeholder="月份" clearable />	
+							<el-date-picker
+								v-model="monthQuery"
+								type="month"
+								placeholder="请选择月份"
+								format="yyyyMM"
+								value-format="yyyyMM"
+								@change="onMonthQueryChange"
+								clearable>
+							</el-date-picker>
 						</el-form-item>
 					</el-col>
 					<el-col :span="6">
 						<el-form-item label="门店">
-							<el-input v-model="query.md" placeholder="门店" clearable />	
+							<el-select 
+								v-model="query.md" 
+								placeholder="请选择门店" 
+								clearable 
+								filterable>
+								<el-option
+									v-for="store in storeList"
+									:key="store.id"
+									:label="store.name"
+									:value="store.id">
+								</el-option>
+							</el-select>
 						</el-form-item>
 					</el-col>
-					<template v-if="showAll">
 					<el-col :span="6">
 						<el-form-item label="金三角">
-							<el-input v-model="query.jsj" placeholder="金三角" clearable />	
-						</el-form-item>
-					</el-col>
-					<el-col :span="6">
-						<el-form-item label="岗位">
-							<el-input v-model="query.gw" placeholder="岗位" clearable />	
-						</el-form-item>
-					</el-col>
-					<el-col :span="6">
-						<el-form-item label="健康师">
-							<el-input v-model="query.jks" placeholder="健康师" clearable />	
-						</el-form-item>
-					</el-col>
-					<el-col :span="6">
-						<el-form-item label="成交率">
-							<el-input v-model="query.cjl" placeholder="成交率" clearable />	
-						</el-form-item>
-					</el-col>
-					<el-col :span="6">
-						<el-form-item label="成交业绩">
-							<el-input v-model="query.cjyj" placeholder="成交业绩" clearable />	
-						</el-form-item>
-					</el-col>
-					<el-col :span="6">
-						<el-form-item label="成交提点">
-							<el-input v-model="query.cjtd" placeholder="成交提点" clearable />	
-						</el-form-item>
-					</el-col>
-					<el-col :span="6">
-						<el-form-item label="剩余业绩">
-							<el-input v-model="query.syyj" placeholder="剩余业绩" clearable />	
-						</el-form-item>
-					</el-col>
-					<el-col :span="6">
-						<el-form-item label="出勤天数">
-							<el-input v-model="query.cqts" placeholder="出勤天数" clearable />	
-						</el-form-item>
-					</el-col>
-					<el-col :span="6">
-						<el-form-item label="系统业绩">
-							<el-input v-model="query.xtyj" placeholder="系统业绩" clearable />	
-						</el-form-item>
-					</el-col>
-					<el-col :span="6">
-						<el-form-item label="总业绩">
-							<el-input v-model="query.zyj" placeholder="总业绩" clearable />	
-						</el-form-item>
-					</el-col>
-					<el-col :span="6">
-						<el-form-item label="基础业绩">
-							<el-input v-model="query.jcyj" placeholder="基础业绩" clearable />	
+							<el-input v-model="query.jsj" placeholder="金三角名称" clearable />	
 						</el-form-item>
 					</el-col>
 					<el-col :span="6">
-						<el-form-item label="合作业绩">
-							<el-input v-model="query.hzyj" placeholder="合作业绩" clearable />	
-						</el-form-item>
-					</el-col>
-					<el-col :span="6">
-						<el-form-item label="奖励业绩">
-							<el-input v-model="query.jlyj" placeholder="奖励业绩" clearable />	
-						</el-form-item>
-					</el-col>
-					<el-col :span="6">
-						<el-form-item label="项目数">
-							<el-input v-model="query.xms" placeholder="项目数" clearable />	
-						</el-form-item>
-					</el-col>
-					<el-col :span="6">
-						<el-form-item label="手工">
-							<el-input v-model="query.sg" placeholder="手工" clearable />	
-						</el-form-item>
-					</el-col>
-					<el-col :span="6">
-						<el-form-item label="是否属于战队">
-							<el-input v-model="query.sfsyzd" placeholder="是否属于战队" clearable />	
-						</el-form-item>
-					</el-col>
-					<el-col :span="6">
-						<el-form-item label="是否满足考勤">
-							<el-input v-model="query.fsmzkq" placeholder="是否满足考勤" clearable />	
-						</el-form-item>
-					</el-col>
-					<el-col :span="6">
-						<el-form-item label="战队最终人数">
-							<el-input v-model="query.zdzzrs" placeholder="战队最终人数" clearable />	
-						</el-form-item>
-					</el-col>
-					<el-col :span="6">
-						<el-form-item label="视为单人">
-							<el-input v-model="query.kqhbsyzd" placeholder="视为单人" clearable />	
-						</el-form-item>
-					</el-col>
-					<el-col :span="6">
-						<el-form-item label="战队提成">
-							<el-input v-model="query.zdtc" placeholder="战队提成" clearable />	
-						</el-form-item>
-					</el-col>
-					<el-col :span="6">
-						<el-form-item label="按1人提成">
-							<el-input v-model="query.ayrtc" placeholder="按1人提成" clearable />	
-						</el-form-item>
-					</el-col>
-					<el-col :span="6">
-						<el-form-item label="最终提成点">
-							<el-input v-model="query.zztcd" placeholder="最终提成点" clearable />	
-						</el-form-item>
-					</el-col>
-					<el-col :span="6">
-						<el-form-item label="基础业绩提成">
-							<el-input v-model="query.jcyjtc" placeholder="基础业绩提成" clearable />	
-						</el-form-item>
-					</el-col>
-					<el-col :span="6">
-						<el-form-item label="合作业绩提成">
-							<el-input v-model="query.hzyjtc" placeholder="合作业绩提成" clearable />	
-						</el-form-item>
-					</el-col>
-					<el-col :span="6">
-						<el-form-item label="提成合计">
-							<el-input v-model="query.tchj" placeholder="提成合计" clearable />	
-						</el-form-item>
-					</el-col>
-					<el-col :span="6">
-						<el-form-item label="个人占比">
-							<el-input v-model="query.grzb" placeholder="个人占比" clearable />	
-						</el-form-item>
-					</el-col>
-					<el-col :span="6">
-						<el-form-item label="组员合计">
-							<el-input v-model="query.zyhj" placeholder="组员合计" clearable />	
-						</el-form-item>
-					</el-col>
-					<el-col :span="6">
-						<el-form-item label="顾问提成">
-							<el-input v-model="query.gwtc" placeholder="顾问提成" clearable />	
-						</el-form-item>
-					</el-col>
-					</template>
-					<el-col :span="6">
-						<el-form-item>
-							<el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
-							<el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
-							<el-button type="text" icon="el-icon-arrow-down" @click="showAll=true" v-if="!showAll">展开</el-button>
-							<el-button type="text" icon="el-icon-arrow-up" @click="showAll=false" v-else>收起</el-button>
+						<el-form-item label=" ">
+							<div class="search-buttons">
+								<el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
+								<el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
+							</div>
 						</el-form-item>
 					</el-col>
 				</el-form>
@@ -185,41 +62,46 @@
 					</div>
 				</div>
                 <NCC-table v-loading="listLoading" :data="list" has-c @selection-change="handleSelectionChange">
-					<el-table-column prop="id" label="主键" align="left" />
-					<el-table-column prop="yf" label="月份" align="left" />
-					<el-table-column prop="md" label="门店" align="left" />
-					<el-table-column prop="jsj" label="金三角" align="left" />
-					<el-table-column prop="gw" label="岗位" align="left" />
-					<el-table-column prop="jks" label="健康师" align="left" />
-					<el-table-column prop="cjl" label="成交率" align="left" />
-					<el-table-column prop="cjyj" label="成交业绩" align="left" />
-					<el-table-column prop="cjtd" label="成交提点" align="left" />
-					<el-table-column prop="syyj" label="剩余业绩" align="left" />
-					<el-table-column prop="cqts" label="出勤天数" align="left" />
-					<el-table-column prop="xtyj" label="系统业绩" align="left" />
-					<el-table-column prop="zyj" label="总业绩" align="left" />
-					<el-table-column prop="jcyj" label="基础业绩" align="left" />
-					<el-table-column prop="hzyj" label="合作业绩" align="left" />
-					<el-table-column prop="jlyj" label="奖励业绩" align="left" />
-					<el-table-column prop="xms" label="项目数" align="left" />
-					<el-table-column prop="sg" label="手工" align="left" />
-					<el-table-column prop="sfsyzd" label="是否属于战队" align="left" />
-					<el-table-column prop="fsmzkq" label="是否满足考勤" align="left" />
-					<el-table-column prop="zdzzrs" label="战队最终人数" align="left" />
-					<el-table-column prop="kqhbsyzd" label="视为单人" align="left" />
-					<el-table-column prop="zdtc" label="战队提成" align="left" />
-					<el-table-column prop="ayrtc" label="按1人提成" align="left" />
-					<el-table-column prop="zztcd" label="最终提成点" align="left" />
-					<el-table-column prop="jcyjtc" label="基础业绩提成" align="left" />
-					<el-table-column prop="hzyjtc" label="合作业绩提成" align="left" />
-					<el-table-column prop="tchj" label="提成合计" align="left" />
-					<el-table-column prop="grzb" label="个人占比" align="left" />
-					<el-table-column prop="zyhj" label="组员合计" align="left" />
-					<el-table-column prop="gwtc" label="顾问提成" align="left" />
-					<el-table-column label="操作" fixed="right" width="100">
-							<template slot-scope="scope">
-							<el-button type="text" @click="addOrUpdateHandle(scope.row.id)" >编辑</el-button>
-							<el-button type="text" @click="handleDel(scope.row.id)" class="NCC-table-delBtn" >删除</el-button>
+					<el-table-column prop="yf" label="月份" align="center" min-width="120">
+						<template slot-scope="scope">
+							<el-tag type="primary" size="small">{{ formatMonth(scope.row.yf) }}</el-tag>
+						</template>
+					</el-table-column>
+					<el-table-column prop="md" label="门店" align="left" min-width="150">
+						<template slot-scope="scope">
+							<div class="store-info">
+								<i class="el-icon-shop"></i>
+								<span>{{ getStoreName(scope.row.md) }}</span>
+							</div>
+						</template>
+					</el-table-column>
+					<el-table-column prop="jsj" label="金三角" align="left" min-width="180">
+						<template slot-scope="scope">
+							<div class="team-info">
+								<i class="el-icon-user-solid"></i>
+								<span>{{ scope.row.jsj }}</span>
+							</div>
+						</template>
+					</el-table-column>
+					<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>
+								{{ scope.row.memberCount }}人
+							</el-tag>
+							<el-tag v-else type="info" size="small">
+								<i class="el-icon-user"></i>
+								0人
+							</el-tag>
+						</template>
+					</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="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>
 						</template>
 					</el-table-column>
 				</NCC-table>
@@ -230,6 +112,107 @@
 		<ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
 	</div>
 </template>
+
+<style scoped>
+.store-info {
+	display: flex;
+	align-items: center;
+	gap: 8px;
+	color: #606266;
+}
+
+.store-info i {
+	color: #409EFF;
+	font-size: 16px;
+}
+
+.team-info {
+	display: flex;
+	align-items: center;
+	gap: 8px;
+	color: #303133;
+	font-weight: 500;
+}
+
+.team-info i {
+	color: #67C23A;
+	font-size: 16px;
+}
+
+.action-buttons {
+	display: flex;
+	gap: 8px;
+	flex-wrap: wrap;
+}
+
+.action-buttons .el-button {
+	margin: 0;
+}
+
+/* 表格行悬停效果 */
+.el-table tbody tr:hover > td {
+	background-color: #f5f7fa !important;
+}
+
+/* 标签样式优化 */
+.el-tag {
+	border-radius: 12px;
+	font-weight: 500;
+}
+
+.el-tag i {
+	margin-right: 4px;
+}
+
+/* 搜索框样式优化 */
+.NCC-common-search-box .el-input__inner {
+	border-radius: 6px;
+}
+
+.NCC-common-search-box .el-button {
+	border-radius: 6px;
+}
+
+.search-buttons {
+	display: flex;
+	gap: 8px;
+	align-items: center;
+	height: 32px;
+}
+
+/* 表格容器样式 */
+.NCC-common-layout-main {
+	background: #fff;
+	border-radius: 8px;
+	box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1);
+	overflow: hidden;
+}
+
+/* 头部操作区域 */
+.NCC-common-head {
+	background: #f8f9fa;
+	padding: 16px 20px;
+	border-bottom: 1px solid #dee2e6;
+}
+
+/* 按钮组样式 */
+.NCC-common-head .el-button {
+	border-radius: 6px;
+	font-weight: 500;
+	transition: all 0.3s ease;
+}
+
+.NCC-common-head .el-button:hover {
+	transform: translateY(-1px);
+	box-shadow: 0 4px 8px rgba(0, 0, 0, 0.15);
+}
+
+/* 分页样式 */
+.pagination {
+	margin-top: 20px;
+	text-align: center;
+}
+</style>
 <script>
     import request from '@/utils/request'
     import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
@@ -242,41 +225,17 @@
             return {
                 showAll: false,
 				query: {
-                    id:undefined,
                     yf:undefined,
                     md:undefined,
                     jsj:undefined,
-                    gw:undefined,
-                    jks:undefined,
-                    cjl:undefined,
-                    cjyj:undefined,
-                    cjtd:undefined,
-                    syyj:undefined,
-                    cqts:undefined,
-                    xtyj:undefined,
-                    zyj:undefined,
-                    jcyj:undefined,
-                    hzyj:undefined,
-                    jlyj:undefined,
-                    xms:undefined,
-                    sg:undefined,
-                    sfsyzd:undefined,
-                    fsmzkq:undefined,
-                    zdzzrs:undefined,
-                    kqhbsyzd:undefined,
-                    zdtc:undefined,
-                    ayrtc:undefined,
-                    zztcd:undefined,
-                    jcyjtc:undefined,
-                    hzyjtc:undefined,
-                    tchj:undefined,
-                    grzb:undefined,
-                    zyhj:undefined,
-                    gwtc:undefined,
 				},
+				monthQuery: null, // 月份选择器的值
+				storeList: [], // 门店列表
                 list: [],
                 listLoading: true,
-                multipleSelection: [], total: 0,
+                multipleSelection: [], 
+                total: 0,
+                storeMap: {}, // 门店ID到名称的映射
                 listQuery: {
                     currentPage: 1,
                     pageSize: 20,
@@ -290,38 +249,12 @@
                     { prop: 'yf', label: '月份' },
                     { prop: 'md', label: '门店' },
                     { prop: 'jsj', label: '金三角' },
-                    { prop: 'gw', label: '岗位' },
-                    { prop: 'jks', label: '健康师' },
-                    { prop: 'cjl', label: '成交率' },
-                    { prop: 'cjyj', label: '成交业绩' },
-                    { prop: 'cjtd', label: '成交提点' },
-                    { prop: 'syyj', label: '剩余业绩' },
-                    { prop: 'cqts', label: '出勤天数' },
-                    { prop: 'xtyj', label: '系统业绩' },
-                    { prop: 'zyj', label: '总业绩' },
-                    { prop: 'jcyj', label: '基础业绩' },
-                    { prop: 'hzyj', label: '合作业绩' },
-                    { prop: 'jlyj', label: '奖励业绩' },
-                    { prop: 'xms', label: '项目数' },
-                    { prop: 'sg', label: '手工' },
-                    { prop: 'sfsyzd', label: '是否属于战队' },
-                    { prop: 'fsmzkq', label: '是否满足考勤' },
-                    { prop: 'zdzzrs', label: '战队最终人数' },
-                    { prop: 'kqhbsyzd', label: '视为单人' },
-                    { prop: 'zdtc', label: '战队提成' },
-                    { prop: 'ayrtc', label: '按1人提成' },
-                    { prop: 'zztcd', label: '最终提成点' },
-                    { prop: 'jcyjtc', label: '基础业绩提成' },
-                    { prop: 'hzyjtc', label: '合作业绩提成' },
-                    { prop: 'tchj', label: '提成合计' },
-                    { prop: 'grzb', label: '个人占比' },
-                    { prop: 'zyhj', label: '组员合计' },
-                    { prop: 'gwtc', label: '顾问提成' },
 				],
 			}
         },
 		computed: {},
 		created() {
+			this.loadStoreList()
 			this.initData()
 		},
 		methods: {
@@ -347,6 +280,11 @@
                     this.list = res.data.list
                     this.total = res.data.pagination.total
                     this.listLoading = false
+                    
+                    // 加载门店映射
+                    this.loadStoreMap()
+                    // 为每个金三角加载成员数量
+                    this.loadMemberCounts()
                 })
             },
 			handleDel(id) {
@@ -368,6 +306,70 @@
                 }).catch(() => {
                 });
             },
+            viewDetail(id) {
+                this.formVisible = true
+                this.$nextTick(() => {
+                    this.$refs.NCCForm.init(id, true)
+                })
+            },
+            loadMemberCounts() {
+                // 批量加载成员数量
+                const promises = this.list.map(item => {
+                    return request({
+                        url: `/api/Extend/LqYcsdJsj/${item.id}/detail`,
+                        method: 'GET'
+                    }).then(res => {
+                        this.$set(item, 'memberCount', res.data.members ? res.data.members.length : 0)
+                    }).catch(() => {
+                        this.$set(item, 'memberCount', 0)
+                    })
+                })
+                
+                Promise.all(promises).then(() => {
+                    // 所有成员数量加载完成
+                })
+            },
+            loadStoreMap() {
+                // 加载门店映射
+                request({
+                    url: '/api/Extend/LqMdxx/Selector',
+                    method: 'GET'
+                }).then(res => {
+                    this.storeMap = {}
+                    res.data.list.forEach(store => {
+                        this.storeMap[store.id] = store.fullName
+                    })
+                }).catch(() => {
+                    this.storeMap = {}
+                })
+            },
+            getStoreName(storeId) {
+                return this.storeMap[storeId] || storeId || '未知门店'
+            },
+            formatMonth(monthStr) {
+                if (!monthStr || monthStr.length !== 6) return monthStr
+                const year = monthStr.substring(0, 4)
+                const month = monthStr.substring(4, 6)
+                return `${year}年${month}月`
+            },
+            onMonthQueryChange(value) {
+                // 月份选择器变化时更新query.yf
+                this.query.yf = value
+            },
+            loadStoreList() {
+                // 加载门店列表
+                request({
+                    url: '/api/Extend/LqMdxx/Selector',
+                    method: 'GET'
+                }).then(res => {
+                    this.storeList = res.data.list.map(item => ({
+                        id: item.id,
+                        name: item.fullName
+                    }))
+                }).catch(() => {
+                    this.storeList = []
+                })
+            },
 			handleSelectionChange(val) {
                 const res = val.map(item => item.id)
                 this.multipleSelection = res
@@ -442,6 +444,7 @@
                 for (let key in this.query) {
                     this.query[key] = undefined
                 }
+                this.monthQuery = null
                 this.listQuery = {
                     currentPage: 1,
                     pageSize: 20,
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqJinsanjiaoUser/LqJinsanjiaoUserCrInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqJinsanjiaoUser/LqJinsanjiaoUserCrInput.cs
new file mode 100644
index 0000000..7aaf4bb
--- /dev/null
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqJinsanjiaoUser/LqJinsanjiaoUserCrInput.cs
@@ -0,0 +1,38 @@
+namespace NCC.Extend.Entitys.Dto.LqJinsanjiaoUser
+{
+    /// <summary>
+    /// 金三角用户绑定关系创建输入参数
+    /// </summary>
+    public class LqJinsanjiaoUserCrInput
+    {
+        /// <summary>
+        /// 金三角ID
+        /// </summary>
+        public string jsjId { get; set; }
+        
+        /// <summary>
+        /// 用户ID
+        /// </summary>
+        public string userId { get; set; }
+        
+        /// <summary>
+        /// 用户姓名
+        /// </summary>
+        public string userName { get; set; }
+        
+        /// <summary>
+        /// 是否顾问
+        /// </summary>
+        public int isLeader { get; set; }
+        
+        /// <summary>
+        /// 状态
+        /// </summary>
+        public string status { get; set; }
+        
+        /// <summary>
+        /// 排序
+        /// </summary>
+        public int sortOrder { get; set; }
+    }
+}
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqJinsanjiaoUser/LqJinsanjiaoUserInfoOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqJinsanjiaoUser/LqJinsanjiaoUserInfoOutput.cs
new file mode 100644
index 0000000..958a571
--- /dev/null
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqJinsanjiaoUser/LqJinsanjiaoUserInfoOutput.cs
@@ -0,0 +1,80 @@
+using System;
+
+namespace NCC.Extend.Entitys.Dto.LqJinsanjiaoUser
+{
+    /// <summary>
+    /// 金三角用户绑定关系详情输出参数
+    /// </summary>
+    public class LqJinsanjiaoUserInfoOutput
+    {
+        /// <summary>
+        /// 主键
+        /// </summary>
+        public string id { get; set; }
+        
+        /// <summary>
+        /// 金三角ID
+        /// </summary>
+        public string jsjId { get; set; }
+        
+        /// <summary>
+        /// 金三角名称
+        /// </summary>
+        public string jsjName { get; set; }
+        
+        /// <summary>
+        /// 用户ID
+        /// </summary>
+        public string userId { get; set; }
+        
+        /// <summary>
+        /// 用户姓名
+        /// </summary>
+        public string userName { get; set; }
+        
+        /// <summary>
+        /// 用户手机号
+        /// </summary>
+        public string mobilePhone { get; set; }
+        
+        /// <summary>
+        /// 用户职位
+        /// </summary>
+        public string position { get; set; }
+        
+        /// <summary>
+        /// 是否顾问
+        /// </summary>
+        public int isLeader { get; set; }
+        
+        /// <summary>
+        /// 状态
+        /// </summary>
+        public string status { get; set; }
+        
+        /// <summary>
+        /// 排序
+        /// </summary>
+        public int sortOrder { get; set; }
+        
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime? creatorTime { get; set; }
+        
+        /// <summary>
+        /// 创建人ID
+        /// </summary>
+        public string creatorUserId { get; set; }
+        
+        /// <summary>
+        /// 最后修改时间
+        /// </summary>
+        public DateTime? lastModifyTime { get; set; }
+        
+        /// <summary>
+        /// 最后修改人ID
+        /// </summary>
+        public string lastModifyUserId { get; set; }
+    }
+}
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqJinsanjiaoUser/LqJinsanjiaoUserListOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqJinsanjiaoUser/LqJinsanjiaoUserListOutput.cs
new file mode 100644
index 0000000..faf066b
--- /dev/null
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqJinsanjiaoUser/LqJinsanjiaoUserListOutput.cs
@@ -0,0 +1,65 @@
+using System;
+
+namespace NCC.Extend.Entitys.Dto.LqJinsanjiaoUser
+{
+    /// <summary>
+    /// 金三角用户绑定关系列表输出参数
+    /// </summary>
+    public class LqJinsanjiaoUserListOutput
+    {
+        /// <summary>
+        /// 主键
+        /// </summary>
+        public string id { get; set; }
+        
+        /// <summary>
+        /// 金三角ID
+        /// </summary>
+        public string jsjId { get; set; }
+        
+        /// <summary>
+        /// 金三角名称
+        /// </summary>
+        public string jsjName { get; set; }
+        
+        /// <summary>
+        /// 用户ID
+        /// </summary>
+        public string userId { get; set; }
+        
+        /// <summary>
+        /// 用户姓名
+        /// </summary>
+        public string userName { get; set; }
+        
+        /// <summary>
+        /// 用户手机号
+        /// </summary>
+        public string mobilePhone { get; set; }
+        
+        /// <summary>
+        /// 用户职位
+        /// </summary>
+        public string position { get; set; }
+        
+        /// <summary>
+        /// 是否顾问
+        /// </summary>
+        public int isLeader { get; set; }
+        
+        /// <summary>
+        /// 状态
+        /// </summary>
+        public string status { get; set; }
+        
+        /// <summary>
+        /// 排序
+        /// </summary>
+        public int sortOrder { get; set; }
+        
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime? creatorTime { get; set; }
+    }
+}
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqJinsanjiaoUser/LqJinsanjiaoUserListQueryInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqJinsanjiaoUser/LqJinsanjiaoUserListQueryInput.cs
new file mode 100644
index 0000000..d7d07d8
--- /dev/null
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqJinsanjiaoUser/LqJinsanjiaoUserListQueryInput.cs
@@ -0,0 +1,41 @@
+using NCC.Common.Entity;
+using NCC.Common.Filter;
+
+namespace NCC.Extend.Entitys.Dto.LqJinsanjiaoUser
+{
+    /// <summary>
+    /// 金三角用户绑定关系列表查询输入参数
+    /// </summary>
+    public class LqJinsanjiaoUserListQueryInput : PageInputBase
+    {
+        /// <summary>
+        /// 主键
+        /// </summary>
+        public string id { get; set; }
+        
+        /// <summary>
+        /// 金三角ID
+        /// </summary>
+        public string jsjId { get; set; }
+        
+        /// <summary>
+        /// 用户ID
+        /// </summary>
+        public string userId { get; set; }
+        
+        /// <summary>
+        /// 用户姓名
+        /// </summary>
+        public string userName { get; set; }
+        
+        /// <summary>
+        /// 是否顾问
+        /// </summary>
+        public int? isLeader { get; set; }
+        
+        /// <summary>
+        /// 状态
+        /// </summary>
+        public string status { get; set; }
+    }
+}
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqJinsanjiaoUser/LqJinsanjiaoUserUpInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqJinsanjiaoUser/LqJinsanjiaoUserUpInput.cs
new file mode 100644
index 0000000..c65fb35
--- /dev/null
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqJinsanjiaoUser/LqJinsanjiaoUserUpInput.cs
@@ -0,0 +1,38 @@
+namespace NCC.Extend.Entitys.Dto.LqJinsanjiaoUser
+{
+    /// <summary>
+    /// 金三角用户绑定关系更新输入参数
+    /// </summary>
+    public class LqJinsanjiaoUserUpInput
+    {
+        /// <summary>
+        /// 金三角ID
+        /// </summary>
+        public string jsjId { get; set; }
+        
+        /// <summary>
+        /// 用户ID
+        /// </summary>
+        public string userId { get; set; }
+        
+        /// <summary>
+        /// 用户姓名
+        /// </summary>
+        public string userName { get; set; }
+        
+        /// <summary>
+        /// 是否顾问
+        /// </summary>
+        public int isLeader { get; set; }
+        
+        /// <summary>
+        /// 状态
+        /// </summary>
+        public string status { get; set; }
+        
+        /// <summary>
+        /// 排序
+        /// </summary>
+        public int sortOrder { get; set; }
+    }
+}
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdJsj/LqYcsdJsjCrInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdJsj/LqYcsdJsjCrInput.cs
index 9ab6e06..6f63c87 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdJsj/LqYcsdJsjCrInput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdJsj/LqYcsdJsjCrInput.cs
@@ -4,7 +4,7 @@ using System.Collections.Generic;
 namespace NCC.Extend.Entitys.Dto.LqYcsdJsj
 {
     /// <summary>
-    /// 金三角设定修改输入参数
+    /// 金三角设定创建输入参数
     /// </summary>
     public class LqYcsdJsjCrInput
     {
@@ -14,154 +14,49 @@ namespace NCC.Extend.Entitys.Dto.LqYcsdJsj
         public string id { get; set; }
         
         /// <summary>
-        /// 月份
+        /// 月份(yyyyMM格式)
         /// </summary>
         public string yf { get; set; }
         
         /// <summary>
-        /// 门店
+        /// 门店ID
         /// </summary>
         public string md { get; set; }
         
         /// <summary>
-        /// 金三角
+        /// 金三角名称
         /// </summary>
         public string jsj { get; set; }
         
         /// <summary>
-        /// 岗位
+        /// 金三角成员列表
         /// </summary>
-        public string gw { get; set; }
-        
-        /// <summary>
-        /// 健康师
-        /// </summary>
-        public string jks { get; set; }
-        
-        /// <summary>
-        /// 成交率
-        /// </summary>
-        public decimal cjl { get; set; }
-        
-        /// <summary>
-        /// 成交业绩
-        /// </summary>
-        public decimal cjyj { get; set; }
-        
-        /// <summary>
-        /// 成交提点
-        /// </summary>
-        public decimal cjtd { get; set; }
-        
-        /// <summary>
-        /// 剩余业绩
-        /// </summary>
-        public decimal syyj { get; set; }
-        
-        /// <summary>
-        /// 出勤天数
-        /// </summary>
-        public int? cqts { get; set; }
-        
-        /// <summary>
-        /// 系统业绩
-        /// </summary>
-        public decimal xtyj { get; set; }
-        
-        /// <summary>
-        /// 总业绩
-        /// </summary>
-        public decimal zyj { get; set; }
-        
-        /// <summary>
-        /// 基础业绩
-        /// </summary>
-        public decimal jcyj { get; set; }
-        
-        /// <summary>
-        /// 合作业绩
-        /// </summary>
-        public decimal hzyj { get; set; }
-        
-        /// <summary>
-        /// 奖励业绩
-        /// </summary>
-        public decimal jlyj { get; set; }
-        
-        /// <summary>
-        /// 项目数
-        /// </summary>
-        public int? xms { get; set; }
-        
-        /// <summary>
-        /// 手工
-        /// </summary>
-        public int? sg { get; set; }
-        
-        /// <summary>
-        /// ①是否属于战队
-        /// </summary>
-        public string sfsyzd { get; set; }
-        
-        /// <summary>
-        /// ②是否满足考勤
-        /// </summary>
-        public string fsmzkq { get; set; }
-        
-        /// <summary>
-        /// ③战队最终人数
-        /// </summary>
-        public int? zdzzrs { get; set; }
-        
-        /// <summary>
-        /// ④考勤后不属于战队视为单人
-        /// </summary>
-        public int? kqhbsyzd { get; set; }
-        
-        /// <summary>
-        /// ⑤战队提成
-        /// </summary>
-        public decimal zdtc { get; set; }
-        
-        /// <summary>
-        /// ⑥按1人提成
-        /// </summary>
-        public decimal ayrtc { get; set; }
-        
-        /// <summary>
-        /// 最终提成点
-        /// </summary>
-        public decimal zztcd { get; set; }
-        
-        /// <summary>
-        /// 基础业绩提成
-        /// </summary>
-        public decimal jcyjtc { get; set; }
-        
-        /// <summary>
-        /// 合作业绩提成
-        /// </summary>
-        public decimal hzyjtc { get; set; }
-        
+        public List<JsjMemberInput> members { get; set; }
+    }
+    
+    /// <summary>
+    /// 金三角成员输入参数
+    /// </summary>
+    public class JsjMemberInput
+    {
         /// <summary>
-        /// 提成合计
+        /// 用户ID
         /// </summary>
-        public decimal tchj { get; set; }
+        public string userId { get; set; }
         
         /// <summary>
-        /// 个人占比
+        /// 用户姓名
         /// </summary>
-        public decimal grzb { get; set; }
+        public string userName { get; set; }
         
         /// <summary>
-        /// 组员合计
+        /// 是否顾问(0-否,1-是)
         /// </summary>
-        public decimal zyhj { get; set; }
+        public int isLeader { get; set; }
         
         /// <summary>
-        /// 顾问提成
+        /// 排序
         /// </summary>
-        public decimal gwtc { get; set; }
-        
+        public int sortOrder { get; set; }
     }
 }
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdJsj/LqYcsdJsjInfoOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdJsj/LqYcsdJsjInfoOutput.cs
index 4064da6..21bef34 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdJsj/LqYcsdJsjInfoOutput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdJsj/LqYcsdJsjInfoOutput.cs
@@ -28,140 +28,5 @@ namespace NCC.Extend.Entitys.Dto.LqYcsdJsj
         /// </summary>
         public string jsj { get; set; }
         
-        /// <summary>
-        /// 岗位
-        /// </summary>
-        public string gw { get; set; }
-        
-        /// <summary>
-        /// 健康师
-        /// </summary>
-        public string jks { get; set; }
-        
-        /// <summary>
-        /// 成交率
-        /// </summary>
-        public decimal cjl { get; set; }
-        
-        /// <summary>
-        /// 成交业绩
-        /// </summary>
-        public decimal cjyj { get; set; }
-        
-        /// <summary>
-        /// 成交提点
-        /// </summary>
-        public decimal cjtd { get; set; }
-        
-        /// <summary>
-        /// 剩余业绩
-        /// </summary>
-        public decimal syyj { get; set; }
-        
-        /// <summary>
-        /// 出勤天数
-        /// </summary>
-        public int? cqts { get; set; }
-        
-        /// <summary>
-        /// 系统业绩
-        /// </summary>
-        public decimal xtyj { get; set; }
-        
-        /// <summary>
-        /// 总业绩
-        /// </summary>
-        public decimal zyj { get; set; }
-        
-        /// <summary>
-        /// 基础业绩
-        /// </summary>
-        public decimal jcyj { get; set; }
-        
-        /// <summary>
-        /// 合作业绩
-        /// </summary>
-        public decimal hzyj { get; set; }
-        
-        /// <summary>
-        /// 奖励业绩
-        /// </summary>
-        public decimal jlyj { get; set; }
-        
-        /// <summary>
-        /// 项目数
-        /// </summary>
-        public int? xms { get; set; }
-        
-        /// <summary>
-        /// 手工
-        /// </summary>
-        public int? sg { get; set; }
-        
-        /// <summary>
-        /// ①是否属于战队
-        /// </summary>
-        public string sfsyzd { get; set; }
-        
-        /// <summary>
-        /// ②是否满足考勤
-        /// </summary>
-        public string fsmzkq { get; set; }
-        
-        /// <summary>
-        /// ③战队最终人数
-        /// </summary>
-        public int? zdzzrs { get; set; }
-        
-        /// <summary>
-        /// ④考勤后不属于战队视为单人
-        /// </summary>
-        public int? kqhbsyzd { get; set; }
-        
-        /// <summary>
-        /// ⑤战队提成
-        /// </summary>
-        public decimal zdtc { get; set; }
-        
-        /// <summary>
-        /// ⑥按1人提成
-        /// </summary>
-        public decimal ayrtc { get; set; }
-        
-        /// <summary>
-        /// 最终提成点
-        /// </summary>
-        public decimal zztcd { get; set; }
-        
-        /// <summary>
-        /// 基础业绩提成
-        /// </summary>
-        public decimal jcyjtc { get; set; }
-        
-        /// <summary>
-        /// 合作业绩提成
-        /// </summary>
-        public decimal hzyjtc { get; set; }
-        
-        /// <summary>
-        /// 提成合计
-        /// </summary>
-        public decimal tchj { get; set; }
-        
-        /// <summary>
-        /// 个人占比
-        /// </summary>
-        public decimal grzb { get; set; }
-        
-        /// <summary>
-        /// 组员合计
-        /// </summary>
-        public decimal zyhj { get; set; }
-        
-        /// <summary>
-        /// 顾问提成
-        /// </summary>
-        public decimal gwtc { get; set; }
-        
     }
 }
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdJsj/LqYcsdJsjListOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdJsj/LqYcsdJsjListOutput.cs
index aa4adf0..3aa2dd7 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdJsj/LqYcsdJsjListOutput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdJsj/LqYcsdJsjListOutput.cs
@@ -27,140 +27,5 @@ namespace NCC.Extend.Entitys.Dto.LqYcsdJsj
         /// </summary>
         public string jsj { get; set; }
         
-        /// <summary>
-        /// 岗位
-        /// </summary>
-        public string gw { get; set; }
-        
-        /// <summary>
-        /// 健康师
-        /// </summary>
-        public string jks { get; set; }
-        
-        /// <summary>
-        /// 成交率
-        /// </summary>
-        public decimal cjl { get; set; }
-        
-        /// <summary>
-        /// 成交业绩
-        /// </summary>
-        public decimal cjyj { get; set; }
-        
-        /// <summary>
-        /// 成交提点
-        /// </summary>
-        public decimal cjtd { get; set; }
-        
-        /// <summary>
-        /// 剩余业绩
-        /// </summary>
-        public decimal syyj { get; set; }
-        
-        /// <summary>
-        /// 出勤天数
-        /// </summary>
-        public int? cqts { get; set; }
-        
-        /// <summary>
-        /// 系统业绩
-        /// </summary>
-        public decimal xtyj { get; set; }
-        
-        /// <summary>
-        /// 总业绩
-        /// </summary>
-        public decimal zyj { get; set; }
-        
-        /// <summary>
-        /// 基础业绩
-        /// </summary>
-        public decimal jcyj { get; set; }
-        
-        /// <summary>
-        /// 合作业绩
-        /// </summary>
-        public decimal hzyj { get; set; }
-        
-        /// <summary>
-        /// 奖励业绩
-        /// </summary>
-        public decimal jlyj { get; set; }
-        
-        /// <summary>
-        /// 项目数
-        /// </summary>
-        public int? xms { get; set; }
-        
-        /// <summary>
-        /// 手工
-        /// </summary>
-        public int? sg { get; set; }
-        
-        /// <summary>
-        /// ①是否属于战队
-        /// </summary>
-        public string sfsyzd { get; set; }
-        
-        /// <summary>
-        /// ②是否满足考勤
-        /// </summary>
-        public string fsmzkq { get; set; }
-        
-        /// <summary>
-        /// ③战队最终人数
-        /// </summary>
-        public int? zdzzrs { get; set; }
-        
-        /// <summary>
-        /// ④考勤后不属于战队视为单人
-        /// </summary>
-        public int? kqhbsyzd { get; set; }
-        
-        /// <summary>
-        /// ⑤战队提成
-        /// </summary>
-        public decimal zdtc { get; set; }
-        
-        /// <summary>
-        /// ⑥按1人提成
-        /// </summary>
-        public decimal ayrtc { get; set; }
-        
-        /// <summary>
-        /// 最终提成点
-        /// </summary>
-        public decimal zztcd { get; set; }
-        
-        /// <summary>
-        /// 基础业绩提成
-        /// </summary>
-        public decimal jcyjtc { get; set; }
-        
-        /// <summary>
-        /// 合作业绩提成
-        /// </summary>
-        public decimal hzyjtc { get; set; }
-        
-        /// <summary>
-        /// 提成合计
-        /// </summary>
-        public decimal tchj { get; set; }
-        
-        /// <summary>
-        /// 个人占比
-        /// </summary>
-        public decimal grzb { get; set; }
-        
-        /// <summary>
-        /// 组员合计
-        /// </summary>
-        public decimal zyhj { get; set; }
-        
-        /// <summary>
-        /// 顾问提成
-        /// </summary>
-        public decimal gwtc { get; set; }
-        
     }
 }
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdJsj/LqYcsdJsjListQueryInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdJsj/LqYcsdJsjListQueryInput.cs
index c89d978..d1ad519 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdJsj/LqYcsdJsjListQueryInput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdJsj/LqYcsdJsjListQueryInput.cs
@@ -39,140 +39,5 @@ namespace NCC.Extend.Entitys.Dto.LqYcsdJsj
         /// </summary>
         public string jsj { get; set; }
         
-        /// <summary>
-        /// 岗位
-        /// </summary>
-        public string gw { get; set; }
-        
-        /// <summary>
-        /// 健康师
-        /// </summary>
-        public string jks { get; set; }
-        
-        /// <summary>
-        /// 成交率
-        /// </summary>
-        public string cjl { get; set; }
-        
-        /// <summary>
-        /// 成交业绩
-        /// </summary>
-        public string cjyj { get; set; }
-        
-        /// <summary>
-        /// 成交提点
-        /// </summary>
-        public string cjtd { get; set; }
-        
-        /// <summary>
-        /// 剩余业绩
-        /// </summary>
-        public string syyj { get; set; }
-        
-        /// <summary>
-        /// 出勤天数
-        /// </summary>
-        public string cqts { get; set; }
-        
-        /// <summary>
-        /// 系统业绩
-        /// </summary>
-        public string xtyj { get; set; }
-        
-        /// <summary>
-        /// 总业绩
-        /// </summary>
-        public string zyj { get; set; }
-        
-        /// <summary>
-        /// 基础业绩
-        /// </summary>
-        public string jcyj { get; set; }
-        
-        /// <summary>
-        /// 合作业绩
-        /// </summary>
-        public string hzyj { get; set; }
-        
-        /// <summary>
-        /// 奖励业绩
-        /// </summary>
-        public string jlyj { get; set; }
-        
-        /// <summary>
-        /// 项目数
-        /// </summary>
-        public string xms { get; set; }
-        
-        /// <summary>
-        /// 手工
-        /// </summary>
-        public string sg { get; set; }
-        
-        /// <summary>
-        /// ①是否属于战队
-        /// </summary>
-        public string sfsyzd { get; set; }
-        
-        /// <summary>
-        /// ②是否满足考勤
-        /// </summary>
-        public string fsmzkq { get; set; }
-        
-        /// <summary>
-        /// ③战队最终人数
-        /// </summary>
-        public string zdzzrs { get; set; }
-        
-        /// <summary>
-        /// ④考勤后不属于战队视为单人
-        /// </summary>
-        public string kqhbsyzd { get; set; }
-        
-        /// <summary>
-        /// ⑤战队提成
-        /// </summary>
-        public string zdtc { get; set; }
-        
-        /// <summary>
-        /// ⑥按1人提成
-        /// </summary>
-        public string ayrtc { get; set; }
-        
-        /// <summary>
-        /// 最终提成点
-        /// </summary>
-        public string zztcd { get; set; }
-        
-        /// <summary>
-        /// 基础业绩提成
-        /// </summary>
-        public string jcyjtc { get; set; }
-        
-        /// <summary>
-        /// 合作业绩提成
-        /// </summary>
-        public string hzyjtc { get; set; }
-        
-        /// <summary>
-        /// 提成合计
-        /// </summary>
-        public string tchj { get; set; }
-        
-        /// <summary>
-        /// 个人占比
-        /// </summary>
-        public string grzb { get; set; }
-        
-        /// <summary>
-        /// 组员合计
-        /// </summary>
-        public string zyhj { get; set; }
-        
-        /// <summary>
-        /// 顾问提成
-        /// </summary>
-        public string gwtc { get; set; }
-        
     }
 }
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_jinsanjiao_user/LqJinsanjiaoUserEntity.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_jinsanjiao_user/LqJinsanjiaoUserEntity.cs
new file mode 100644
index 0000000..60e98d2
--- /dev/null
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_jinsanjiao_user/LqJinsanjiaoUserEntity.cs
@@ -0,0 +1,86 @@
+using NCC.Common.Const;
+using SqlSugar;
+using System;
+
+namespace NCC.Extend.Entitys.lq_jinsanjiao_user
+{
+    /// <summary>
+    /// 金三角用户绑定关系
+    /// </summary>
+    [SugarTable("lq_jinsanjiao_user")]
+    [Tenant(ClaimConst.TENANT_ID)]
+    public class LqJinsanjiaoUserEntity
+    {
+        /// <summary>
+        /// 主键
+        /// </summary>
+        [SugarColumn(ColumnName = "F_Id", IsPrimaryKey = true)]
+        public string Id { get; set; }
+        
+        /// <summary>
+        /// 金三角ID(关联lq_ycsd_jsj.F_Id)
+        /// </summary>
+        [SugarColumn(ColumnName = "jsj_id")]        
+        public string JsjId { get; set; }
+        
+        /// <summary>
+        /// 用户ID(关联BASE_USER.F_Id)
+        /// </summary>
+        [SugarColumn(ColumnName = "user_id")]        
+        public string UserId { get; set; }
+        
+        /// <summary>
+        /// 用户姓名
+        /// </summary>
+        [SugarColumn(ColumnName = "user_name")]        
+        public string UserName { get; set; }
+        
+        /// <summary>
+        /// 是否顾问
+        /// </summary>
+        [SugarColumn(ColumnName = "is_leader")]        
+        public int IsLeader { get; set; }
+        
+        /// <summary>
+        /// 状态(ACTIVE-活跃,INACTIVE-非活跃)
+        /// </summary>
+        [SugarColumn(ColumnName = "status")]        
+        public string Status { get; set; }
+        
+        /// <summary>
+        /// 排序
+        /// </summary>
+        [SugarColumn(ColumnName = "sort_order")]        
+        public int SortOrder { get; set; }
+        
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        [SugarColumn(ColumnName = "F_CreatorTime")]        
+        public DateTime? CreatorTime { get; set; }
+        
+        /// <summary>
+        /// 创建人ID
+        /// </summary>
+        [SugarColumn(ColumnName = "F_CreatorUserId")]        
+        public string CreatorUserId { get; set; }
+        
+        /// <summary>
+        /// 最后修改时间
+        /// </summary>
+        [SugarColumn(ColumnName = "F_LastModifyTime")]        
+        public DateTime? LastModifyTime { get; set; }
+        
+        /// <summary>
+        /// 最后修改人ID
+        /// </summary>
+        [SugarColumn(ColumnName = "F_LastModifyUserId")]        
+        public string LastModifyUserId { get; set; }
+        
+        /// <summary>
+        /// 删除标记
+        /// </summary>
+        [SugarColumn(ColumnName = "F_DeleteMark")]        
+        public int DeleteMark { get; set; }
+    }
+}
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_ycsd_jsj/LqYcsdJsjEntity.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_ycsd_jsj/LqYcsdJsjEntity.cs
index dde09de..db50d3f 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_ycsd_jsj/LqYcsdJsjEntity.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_ycsd_jsj/LqYcsdJsjEntity.cs
@@ -24,178 +24,15 @@ namespace NCC.Extend.Entitys.lq_ycsd_jsj
         public string Yf { get; set; }
         
         /// <summary>
-        /// 门店
-        /// </summary>
-        [SugarColumn(ColumnName = "md")]        
-        public string Md { get; set; }
-        
-        /// <summary>
         /// 金三角
         /// </summary>
         [SugarColumn(ColumnName = "jsj")]        
         public string Jsj { get; set; }
         
         /// <summary>
-        /// 岗位
-        /// </summary>
-        [SugarColumn(ColumnName = "gw")]        
-        public string Gw { get; set; }
-        
-        /// <summary>
-        /// 健康师
-        /// </summary>
-        [SugarColumn(ColumnName = "jks")]        
-        public string Jks { get; set; }
-        
-        /// <summary>
-        /// 成交率
-        /// </summary>
-        [SugarColumn(ColumnName = "cjl")]        
-        public decimal Cjl { get; set; }
-        
-        /// <summary>
-        /// 成交业绩
-        /// </summary>
-        [SugarColumn(ColumnName = "cjyj")]        
-        public decimal Cjyj { get; set; }
-        
-        /// <summary>
-        /// 成交提点
-        /// </summary>
-        [SugarColumn(ColumnName = "cjtd")]        
-        public decimal Cjtd { get; set; }
-        
-        /// <summary>
-        /// 剩余业绩
-        /// </summary>
-        [SugarColumn(ColumnName = "syyj")]        
-        public decimal Syyj { get; set; }
-        
-        /// <summary>
-        /// 出勤天数
-        /// </summary>
-        [SugarColumn(ColumnName = "cqts")]        
-        public int? Cqts { get; set; }
-        
-        /// <summary>
-        /// 系统业绩
-        /// </summary>
-        [SugarColumn(ColumnName = "xtyj")]        
-        public decimal Xtyj { get; set; }
-        
-        /// <summary>
-        /// 总业绩
-        /// </summary>
-        [SugarColumn(ColumnName = "zyj")]        
-        public decimal Zyj { get; set; }
-        
-        /// <summary>
-        /// 基础业绩
-        /// </summary>
-        [SugarColumn(ColumnName = "jcyj")]        
-        public decimal Jcyj { get; set; }
-        
-        /// <summary>
-        /// 合作业绩
-        /// </summary>
-        [SugarColumn(ColumnName = "hzyj")]        
-        public decimal Hzyj { get; set; }
-        
-        /// <summary>
-        /// 奖励业绩
-        /// </summary>
-        [SugarColumn(ColumnName = "jlyj")]        
-        public decimal Jlyj { get; set; }
-        
-        /// <summary>
-        /// 项目数
-        /// </summary>
-        [SugarColumn(ColumnName = "xms")]        
-        public int? Xms { get; set; }
-        
-        /// <summary>
-        /// 手工
-        /// </summary>
-        [SugarColumn(ColumnName = "sg")]        
-        public int? Sg { get; set; }
-        
-        /// <summary>
-        /// ①是否属于战队
-        /// </summary>
-        [SugarColumn(ColumnName = "sfsyzd")]        
-        public string Sfsyzd { get; set; }
-        
-        /// <summary>
-        /// ②是否满足考勤
-        /// </summary>
-        [SugarColumn(ColumnName = "fsmzkq")]        
-        public string Fsmzkq { get; set; }
-        
-        /// <summary>
-        /// ③战队最终人数
-        /// </summary>
-        [SugarColumn(ColumnName = "zdzzrs")]        
-        public int? Zdzzrs { get; set; }
-        
-        /// <summary>
-        /// ④考勤后不属于战队视为单人
-        /// </summary>
-        [SugarColumn(ColumnName = "kqhbsyzd")]        
-        public int? Kqhbsyzd { get; set; }
-        
-        /// <summary>
-        /// ⑤战队提成
-        /// </summary>
-        [SugarColumn(ColumnName = "zdtc")]        
-        public decimal Zdtc { get; set; }
-        
-        /// <summary>
-        /// ⑥按1人提成
-        /// </summary>
-        [SugarColumn(ColumnName = "ayrtc")]        
-        public decimal Ayrtc { get; set; }
-        
-        /// <summary>
-        /// 最终提成点
+        /// 门店ID
         /// </summary>
-        [SugarColumn(ColumnName = "zztcd")]        
-        public decimal Zztcd { get; set; }
-        
-        /// <summary>
-        /// 基础业绩提成
-        /// </summary>
-        [SugarColumn(ColumnName = "jcyjtc")]        
-        public decimal Jcyjtc { get; set; }
-        
-        /// <summary>
-        /// 合作业绩提成
-        /// </summary>
-        [SugarColumn(ColumnName = "hzyjtc")]        
-        public decimal Hzyjtc { get; set; }
-        
-        /// <summary>
-        /// 提成合计
-        /// </summary>
-        [SugarColumn(ColumnName = "tchj")]        
-        public decimal Tchj { get; set; }
-        
-        /// <summary>
-        /// 个人占比
-        /// </summary>
-        [SugarColumn(ColumnName = "grzb")]        
-        public decimal Grzb { get; set; }
-        
-        /// <summary>
-        /// 组员合计
-        /// </summary>
-        [SugarColumn(ColumnName = "zyhj")]        
-        public decimal Zyhj { get; set; }
-        
-        /// <summary>
-        /// 顾问提成
-        /// </summary>
-        [SugarColumn(ColumnName = "gwtc")]        
-        public decimal Gwtc { get; set; }
-        
+        [SugarColumn(ColumnName = "md")]        
+        public string Md { get; set; }
     }
 }
\ No newline at end of file
diff --git a/netcore/src/Modularity/Extend/NCC.Extend/LqYcsdJsjService.cs b/netcore/src/Modularity/Extend/NCC.Extend/LqYcsdJsjService.cs
index 229b3bb..0b19014 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend/LqYcsdJsjService.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend/LqYcsdJsjService.cs
@@ -11,9 +11,12 @@ using Microsoft.AspNetCore.Mvc;
 using SqlSugar;
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.Linq;
 using System.Threading.Tasks;
 using NCC.Extend.Entitys.lq_ycsd_jsj;
+using NCC.Extend.Entitys.lq_jinsanjiao_user;
+using NCC.Extend.Entitys.lq_mdxx;
 using NCC.Extend.Entitys.Dto.LqYcsdJsj;
 using Yitter.IdGenerator;
 using NCC.Common.Helper;
@@ -62,6 +65,41 @@ namespace NCC.Extend.LqYcsdJsj
         }
 
         /// <summary>
+        /// 获取金三角设定详情（包含成员信息）
+        /// </summary>
+        /// <param name="id">金三角ID</param>
+        /// <returns></returns>
+        [HttpGet("{id}/detail")]
+        public async Task<dynamic> GetDetail(string id)
+        {
+            var entity = await _db.Queryable<LqYcsdJsjEntity>().FirstAsync(p => p.Id == id);
+            if (entity == null) throw NCCException.Oh(ErrorCode.COM1005);
+            
+            var output = entity.Adapt<LqYcsdJsjInfoOutput>();
+            
+            // 获取成员信息
+            var members = await _db.Queryable<LqJinsanjiaoUserEntity>()
+                .Where(x => x.JsjId == id && x.Status == "ACTIVE")
+                .OrderBy(x => x.SortOrder)
+                .Select(x => new
+                {
+                    id = x.Id,
+                    userId = x.UserId,
+                    userName = x.UserName,
+                    isLeader = x.IsLeader,
+                    sortOrder = x.SortOrder,
+                    status = x.Status
+                })
+                .ToListAsync();
+            
+            return new
+            {
+                jsj = output,
+                members = members
+            };
+        }
+
+        /// <summary>
 		/// 获取金三角设定列表
 		/// </summary>
 		/// <param name="input">请求参数</param>
@@ -75,72 +113,18 @@ namespace NCC.Extend.LqYcsdJsj
                 .WhereIF(!string.IsNullOrEmpty(input.yf), p => p.Yf.Contains(input.yf))
                 .WhereIF(!string.IsNullOrEmpty(input.md), p => p.Md.Contains(input.md))
                 .WhereIF(!string.IsNullOrEmpty(input.jsj), p => p.Jsj.Contains(input.jsj))
-                .WhereIF(!string.IsNullOrEmpty(input.gw), p => p.Gw.Contains(input.gw))
-                .WhereIF(!string.IsNullOrEmpty(input.jks), p => p.Jks.Contains(input.jks))
-                .WhereIF(!string.IsNullOrEmpty(input.cjl), p => p.Cjl.Equals(input.cjl))
-                .WhereIF(!string.IsNullOrEmpty(input.cjyj), p => p.Cjyj.Equals(input.cjyj))
-                .WhereIF(!string.IsNullOrEmpty(input.cjtd), p => p.Cjtd.Equals(input.cjtd))
-                .WhereIF(!string.IsNullOrEmpty(input.syyj), p => p.Syyj.Equals(input.syyj))
-                .WhereIF(!string.IsNullOrEmpty(input.cqts), p => p.Cqts.Equals(input.cqts))
-                .WhereIF(!string.IsNullOrEmpty(input.xtyj), p => p.Xtyj.Equals(input.xtyj))
-                .WhereIF(!string.IsNullOrEmpty(input.zyj), p => p.Zyj.Equals(input.zyj))
-                .WhereIF(!string.IsNullOrEmpty(input.jcyj), p => p.Jcyj.Equals(input.jcyj))
-                .WhereIF(!string.IsNullOrEmpty(input.hzyj), p => p.Hzyj.Equals(input.hzyj))
-                .WhereIF(!string.IsNullOrEmpty(input.jlyj), p => p.Jlyj.Equals(input.jlyj))
-                .WhereIF(!string.IsNullOrEmpty(input.xms), p => p.Xms.Equals(input.xms))
-                .WhereIF(!string.IsNullOrEmpty(input.sg), p => p.Sg.Equals(input.sg))
-                .WhereIF(!string.IsNullOrEmpty(input.sfsyzd), p => p.Sfsyzd.Contains(input.sfsyzd))
-                .WhereIF(!string.IsNullOrEmpty(input.fsmzkq), p => p.Fsmzkq.Contains(input.fsmzkq))
-                .WhereIF(!string.IsNullOrEmpty(input.zdzzrs), p => p.Zdzzrs.Equals(input.zdzzrs))
-                .WhereIF(!string.IsNullOrEmpty(input.kqhbsyzd), p => p.Kqhbsyzd.Equals(input.kqhbsyzd))
-                .WhereIF(!string.IsNullOrEmpty(input.zdtc), p => p.Zdtc.Equals(input.zdtc))
-                .WhereIF(!string.IsNullOrEmpty(input.ayrtc), p => p.Ayrtc.Equals(input.ayrtc))
-                .WhereIF(!string.IsNullOrEmpty(input.zztcd), p => p.Zztcd.Equals(input.zztcd))
-                .WhereIF(!string.IsNullOrEmpty(input.jcyjtc), p => p.Jcyjtc.Equals(input.jcyjtc))
-                .WhereIF(!string.IsNullOrEmpty(input.hzyjtc), p => p.Hzyjtc.Equals(input.hzyjtc))
-                .WhereIF(!string.IsNullOrEmpty(input.tchj), p => p.Tchj.Equals(input.tchj))
-                .WhereIF(!string.IsNullOrEmpty(input.grzb), p => p.Grzb.Equals(input.grzb))
-                .WhereIF(!string.IsNullOrEmpty(input.zyhj), p => p.Zyhj.Equals(input.zyhj))
-                .WhereIF(!string.IsNullOrEmpty(input.gwtc), p => p.Gwtc.Equals(input.gwtc))
                 .Select(it=> new LqYcsdJsjListOutput
                 {
                     id = it.Id,
-                    yf=it.Yf,
-                    md=it.Md,
-                    jsj=it.Jsj,
-                    gw=it.Gw,
-                    jks=it.Jks,
-                    cjl=it.Cjl,
-                    cjyj=it.Cjyj,
-                    cjtd=it.Cjtd,
-                    syyj=it.Syyj,
-                    cqts=it.Cqts,
-                    xtyj=it.Xtyj,
-                    zyj=it.Zyj,
-                    jcyj=it.Jcyj,
-                    hzyj=it.Hzyj,
-                    jlyj=it.Jlyj,
-                    xms=it.Xms,
-                    sg=it.Sg,
-                    sfsyzd=it.Sfsyzd,
-                    fsmzkq=it.Fsmzkq,
-                    zdzzrs=it.Zdzzrs,
-                    kqhbsyzd=it.Kqhbsyzd,
-                    zdtc=it.Zdtc,
-                    ayrtc=it.Ayrtc,
-                    zztcd=it.Zztcd,
-                    jcyjtc=it.Jcyjtc,
-                    hzyjtc=it.Hzyjtc,
-                    tchj=it.Tchj,
-                    grzb=it.Grzb,
-                    zyhj=it.Zyhj,
-                    gwtc=it.Gwtc,
+                    yf = it.Yf,
+                    md = it.Md,
+                    jsj = it.Jsj
                 }).MergeTable().OrderBy(sidx+" "+input.sort).ToPagedListAsync(input.currentPage, input.pageSize);
                 return PageResult<LqYcsdJsjListOutput>.SqlSugarPageResult(data);
         }
 
         /// <summary>
-        /// 新建金三角设定
+        /// 新建金三角
         /// </summary>
         /// <param name="input">参数</param>
         /// <returns></returns>
@@ -148,10 +132,69 @@ namespace NCC.Extend.LqYcsdJsj
         public async Task Create([FromBody] LqYcsdJsjCrInput input)
         {
             var userInfo = await _userManager.GetUserInfo();
-            var entity = input.Adapt<LqYcsdJsjEntity>();
-            entity.Id = YitIdHelper.NextId().ToString();
-            var isOk = await _db.Insertable(entity).IgnoreColumns(ignoreNullColumn: true).ExecuteCommandAsync();
-            if (!(isOk > 0)) throw NCCException.Oh(ErrorCode.COM1000);
+            
+            // 参数验证
+            if (string.IsNullOrEmpty(input.yf))
+                throw NCCException.Oh(ErrorCode.COM1000, "月份不能为空");
+            if (string.IsNullOrEmpty(input.md))
+                throw NCCException.Oh(ErrorCode.COM1000, "门店不能为空");
+            if (string.IsNullOrEmpty(input.jsj))
+                throw NCCException.Oh(ErrorCode.COM1000, "金三角名称不能为空");
+            
+            // 验证月份格式
+            if (!DateTime.TryParseExact(input.yf, "yyyyMM", null, DateTimeStyles.None, out _))
+            {
+                throw NCCException.Oh(ErrorCode.COM1000, "月份格式必须为yyyyMM");
+            }
+            
+            // 验证多人战队必须有顾问
+            if (input.members != null && input.members.Count >= 2)
+            {
+                var hasLeader = input.members.Any(m => m.isLeader == 1);
+                if (!hasLeader)
+                {
+                    throw NCCException.Oh(ErrorCode.COM1000, "两人或两人以上的战队必须有一个顾问");
+                }
+            }
+            
+            // 验证金三角名称是否已存在
+            var existingJsj = await _db.Queryable<LqYcsdJsjEntity>()
+                .Where(x => x.Yf == input.yf && x.Md == input.md && x.Jsj == input.jsj)
+                .FirstAsync();
+            if (existingJsj != null)
+            {
+                throw NCCException.Oh(ErrorCode.COM1000, "该门店该月份已存在同名金三角");
+            }
+            try
+            {
+                // 开启事务
+                _db.BeginTran();
+                // 1. 创建门店T区（如果不存在）
+                await CreateOrUpdateStoreTArea(input.yf, input.md, userInfo.userId);
+                // 2. 创建金三角基础信息
+                var entity = input.Adapt<LqYcsdJsjEntity>();
+                entity.Id = YitIdHelper.NextId().ToString();
+                var isOk = await _db.Insertable(entity).IgnoreColumns(ignoreNullColumn: true).ExecuteCommandAsync();
+                if (!(isOk > 0)) throw NCCException.Oh(ErrorCode.COM1000);
+                // 3. 创建金三角成员绑定关系
+                if (input.members != null && input.members.Count > 0)
+                {
+                    await CreateJsjMembers(entity.Id, input.members, userInfo.userId);
+                }
+                // 4. 创建站点战队T区（如果金三角不是T区）
+                if (!input.jsj.EndsWith("T区"))
+                {
+                    await CreateOrUpdateTeamTArea(input.yf, input.jsj, input.md, userInfo.userId);
+                }
+                // 提交事务
+                _db.CommitTran();
+            }
+            catch (Exception ex)
+            {
+                // 回滚事务
+                _db.RollbackTran();
+                throw NCCException.Oh(ErrorCode.COM1000, ex.Message);
+            }
         }
 
         /// <summary>
@@ -168,66 +211,12 @@ namespace NCC.Extend.LqYcsdJsj
                 .WhereIF(!string.IsNullOrEmpty(input.yf), p => p.Yf.Contains(input.yf))
                 .WhereIF(!string.IsNullOrEmpty(input.md), p => p.Md.Contains(input.md))
                 .WhereIF(!string.IsNullOrEmpty(input.jsj), p => p.Jsj.Contains(input.jsj))
-                .WhereIF(!string.IsNullOrEmpty(input.gw), p => p.Gw.Contains(input.gw))
-                .WhereIF(!string.IsNullOrEmpty(input.jks), p => p.Jks.Contains(input.jks))
-                .WhereIF(!string.IsNullOrEmpty(input.cjl), p => p.Cjl.Equals(input.cjl))
-                .WhereIF(!string.IsNullOrEmpty(input.cjyj), p => p.Cjyj.Equals(input.cjyj))
-                .WhereIF(!string.IsNullOrEmpty(input.cjtd), p => p.Cjtd.Equals(input.cjtd))
-                .WhereIF(!string.IsNullOrEmpty(input.syyj), p => p.Syyj.Equals(input.syyj))
-                .WhereIF(!string.IsNullOrEmpty(input.cqts), p => p.Cqts.Equals(input.cqts))
-                .WhereIF(!string.IsNullOrEmpty(input.xtyj), p => p.Xtyj.Equals(input.xtyj))
-                .WhereIF(!string.IsNullOrEmpty(input.zyj), p => p.Zyj.Equals(input.zyj))
-                .WhereIF(!string.IsNullOrEmpty(input.jcyj), p => p.Jcyj.Equals(input.jcyj))
-                .WhereIF(!string.IsNullOrEmpty(input.hzyj), p => p.Hzyj.Equals(input.hzyj))
-                .WhereIF(!string.IsNullOrEmpty(input.jlyj), p => p.Jlyj.Equals(input.jlyj))
-                .WhereIF(!string.IsNullOrEmpty(input.xms), p => p.Xms.Equals(input.xms))
-                .WhereIF(!string.IsNullOrEmpty(input.sg), p => p.Sg.Equals(input.sg))
-                .WhereIF(!string.IsNullOrEmpty(input.sfsyzd), p => p.Sfsyzd.Contains(input.sfsyzd))
-                .WhereIF(!string.IsNullOrEmpty(input.fsmzkq), p => p.Fsmzkq.Contains(input.fsmzkq))
-                .WhereIF(!string.IsNullOrEmpty(input.zdzzrs), p => p.Zdzzrs.Equals(input.zdzzrs))
-                .WhereIF(!string.IsNullOrEmpty(input.kqhbsyzd), p => p.Kqhbsyzd.Equals(input.kqhbsyzd))
-                .WhereIF(!string.IsNullOrEmpty(input.zdtc), p => p.Zdtc.Equals(input.zdtc))
-                .WhereIF(!string.IsNullOrEmpty(input.ayrtc), p => p.Ayrtc.Equals(input.ayrtc))
-                .WhereIF(!string.IsNullOrEmpty(input.zztcd), p => p.Zztcd.Equals(input.zztcd))
-                .WhereIF(!string.IsNullOrEmpty(input.jcyjtc), p => p.Jcyjtc.Equals(input.jcyjtc))
-                .WhereIF(!string.IsNullOrEmpty(input.hzyjtc), p => p.Hzyjtc.Equals(input.hzyjtc))
-                .WhereIF(!string.IsNullOrEmpty(input.tchj), p => p.Tchj.Equals(input.tchj))
-                .WhereIF(!string.IsNullOrEmpty(input.grzb), p => p.Grzb.Equals(input.grzb))
-                .WhereIF(!string.IsNullOrEmpty(input.zyhj), p => p.Zyhj.Equals(input.zyhj))
-                .WhereIF(!string.IsNullOrEmpty(input.gwtc), p => p.Gwtc.Equals(input.gwtc))
                 .Select(it=> new LqYcsdJsjListOutput
                 {
                     id = it.Id,
-                    yf=it.Yf,
-                    md=it.Md,
-                    jsj=it.Jsj,
-                    gw=it.Gw,
-                    jks=it.Jks,
-                    cjl=it.Cjl,
-                    cjyj=it.Cjyj,
-                    cjtd=it.Cjtd,
-                    syyj=it.Syyj,
-                    cqts=it.Cqts,
-                    xtyj=it.Xtyj,
-                    zyj=it.Zyj,
-                    jcyj=it.Jcyj,
-                    hzyj=it.Hzyj,
-                    jlyj=it.Jlyj,
-                    xms=it.Xms,
-                    sg=it.Sg,
-                    sfsyzd=it.Sfsyzd,
-                    fsmzkq=it.Fsmzkq,
-                    zdzzrs=it.Zdzzrs,
-                    kqhbsyzd=it.Kqhbsyzd,
-                    zdtc=it.Zdtc,
-                    ayrtc=it.Ayrtc,
-                    zztcd=it.Zztcd,
-                    jcyjtc=it.Jcyjtc,
-                    hzyjtc=it.Hzyjtc,
-                    tchj=it.Tchj,
-                    grzb=it.Grzb,
-                    zyhj=it.Zyhj,
-                    gwtc=it.Gwtc,
+                    yf = it.Yf,
+                    md = it.Md,
+                    jsj = it.Jsj
                 }).MergeTable().OrderBy(sidx+" "+input.sort).ToListAsync();
                 return data;
         }
@@ -251,7 +240,7 @@ namespace NCC.Extend.LqYcsdJsj
             {
                 exportData = await this.GetNoPagingList(input);
             }
-            List<ParamsModel> paramList = "[{\"value\":\"主键\",\"field\":\"id\"},{\"value\":\"月份\",\"field\":\"yf\"},{\"value\":\"门店\",\"field\":\"md\"},{\"value\":\"金三角\",\"field\":\"jsj\"},{\"value\":\"岗位\",\"field\":\"gw\"},{\"value\":\"健康师\",\"field\":\"jks\"},{\"value\":\"成交率\",\"field\":\"cjl\"},{\"value\":\"成交业绩\",\"field\":\"cjyj\"},{\"value\":\"成交提点\",\"field\":\"cjtd\"},{\"value\":\"剩余业绩\",\"field\":\"syyj\"},{\"value\":\"出勤天数\",\"field\":\"cqts\"},{\"value\":\"系统业绩\",\"field\":\"xtyj\"},{\"value\":\"总业绩\",\"field\":\"zyj\"},{\"value\":\"基础业绩\",\"field\":\"jcyj\"},{\"value\":\"合作业绩\",\"field\":\"hzyj\"},{\"value\":\"奖励业绩\",\"field\":\"jlyj\"},{\"value\":\"项目数\",\"field\":\"xms\"},{\"value\":\"手工\",\"field\":\"sg\"},{\"value\":\"是否属于战队\",\"field\":\"sfsyzd\"},{\"value\":\"是否满足考勤\",\"field\":\"fsmzkq\"},{\"value\":\"战队最终人数\",\"field\":\"zdzzrs\"},{\"value\":\"视为单人\",\"field\":\"kqhbsyzd\"},{\"value\":\"战队提成\",\"field\":\"zdtc\"},{\"value\":\"按1人提成\",\"field\":\"ayrtc\"},{\"value\":\"最终提成点\",\"field\":\"zztcd\"},{\"value\":\"基础业绩提成\",\"field\":\"jcyjtc\"},{\"value\":\"合作业绩提成\",\"field\":\"hzyjtc\"},{\"value\":\"提成合计\",\"field\":\"tchj\"},{\"value\":\"个人占比\",\"field\":\"grzb\"},{\"value\":\"组员合计\",\"field\":\"zyhj\"},{\"value\":\"顾问提成\",\"field\":\"gwtc\"},]".ToList<ParamsModel>();           
+            List<ParamsModel> paramList = "[{\"value\":\"主键\",\"field\":\"id\"},{\"value\":\"月份\",\"field\":\"yf\"},{\"value\":\"门店\",\"field\":\"md\"},{\"value\":\"金三角\",\"field\":\"jsj\"}]".ToList<ParamsModel>();           
             ExcelConfig excelconfig = new ExcelConfig();
             excelconfig.FileName = "金三角设定.xls";
             excelconfig.HeadFont = "微软雅黑";
@@ -333,5 +322,132 @@ namespace NCC.Extend.LqYcsdJsj
             var isOk = await _db.Deleteable<LqYcsdJsjEntity>().Where(d => d.Id == id).ExecuteCommandAsync();
             if (!(isOk > 0)) throw NCCException.Oh(ErrorCode.COM1002);
         }
+
+        #region 私有辅助方法
+
+        /// <summary>
+        /// 创建或更新门店T区
+        /// </summary>
+        /// <param name="yf">月份</param>
+        /// <param name="mdId">门店ID</param>
+        /// <param name="creatorUserId">创建人ID</param>
+        /// <returns></returns>
+        private async Task CreateOrUpdateStoreTArea(string yf, string mdId, string creatorUserId)
+        {
+            // 获取门店名称
+            var storeName = await GetStoreNameById(mdId);
+            var tAreaName = $"{storeName}T区";
+            
+            // 检查该门店该月份是否已有T区
+            var existingTArea = await _db.Queryable<LqYcsdJsjEntity>()
+                .Where(x => x.Yf == yf && x.Md == mdId && x.Jsj == tAreaName)
+                .FirstAsync();
+            
+            if (existingTArea == null)
+            {
+                // 创建门店T区
+                var tAreaEntity = new LqYcsdJsjEntity
+                {
+                    Id = YitIdHelper.NextId().ToString(),
+                    Yf = yf,
+                    Md = mdId,
+                    Jsj = tAreaName
+                };
+                
+                await _db.Insertable(tAreaEntity).ExecuteCommandAsync();
+            }
+        }
+
+        /// <summary>
+        /// 创建或更新战队T区
+        /// </summary>
+        /// <param name="yf">月份</param>
+        /// <param name="teamName">战队名称</param>
+        /// <param name="mdId">门店ID</param>
+        /// <param name="creatorUserId">创建人ID</param>
+        /// <returns></returns>
+        private async Task CreateOrUpdateTeamTArea(string yf, string teamName, string mdId, string creatorUserId)
+        {
+            var tAreaName = $"{teamName}T区";
+            
+            // 检查该战队该月份是否已有T区
+            var existingTArea = await _db.Queryable<LqYcsdJsjEntity>()
+                .Where(x => x.Yf == yf && x.Md == mdId && x.Jsj == tAreaName)
+                .FirstAsync();
+            
+            if (existingTArea == null)
+            {
+                // 创建战队T区
+                var tAreaEntity = new LqYcsdJsjEntity
+                {
+                    Id = YitIdHelper.NextId().ToString(),
+                    Yf = yf,
+                    Md = mdId,
+                    Jsj = tAreaName
+                };
+                
+                await _db.Insertable(tAreaEntity).ExecuteCommandAsync();
+            }
+        }
+
+        /// <summary>
+        /// 创建金三角成员绑定关系
+        /// </summary>
+        /// <param name="jsjId">金三角ID</param>
+        /// <param name="members">成员列表</param>
+        /// <param name="creatorUserId">创建人ID</param>
+        /// <returns></returns>
+        private async Task CreateJsjMembers(string jsjId, List<JsjMemberInput> members, string creatorUserId)
+        {
+            var memberEntities = new List<LqJinsanjiaoUserEntity>();
+            
+            for (int i = 0; i < members.Count; i++)
+            {
+                var member = members[i];
+                var memberEntity = new LqJinsanjiaoUserEntity
+                {
+                    Id = YitIdHelper.NextId().ToString(),
+                    JsjId = jsjId,
+                    UserId = member.userId,
+                    UserName = member.userName,
+                    IsLeader = member.isLeader,
+                    Status = "ACTIVE",
+                    SortOrder = member.sortOrder > 0 ? member.sortOrder : i + 1,
+                    CreatorTime = DateTime.Now,
+                    CreatorUserId = creatorUserId,
+                    DeleteMark = 0
+                };
+                
+                memberEntities.Add(memberEntity);
+            }
+            
+            if (memberEntities.Count > 0)
+            {
+                await _db.Insertable(memberEntities).ExecuteCommandAsync();
+            }
+        }
+
+        /// <summary>
+        /// 根据门店ID获取门店名称
+        /// </summary>
+        /// <param name="mdId">门店ID</param>
+        /// <returns></returns>
+        private async Task<string> GetStoreNameById(string mdId)
+        {
+            try
+            {
+                var storeName = await _db.Queryable<LqMdxxEntity>()
+                    .Where(x => x.Id == mdId)
+                    .Select(x => x.Dm)
+                    .FirstAsync();
+                return string.IsNullOrEmpty(storeName) ? "未知门店" : storeName;
+            }
+            catch
+            {
+                return "未知门店";
+            }
+        }
+
+        #endregion
     }
 }
diff --git a/参考资料/.DS_Store b/参考资料/.DS_Store
index b290785..a52bd24 100644
Binary files a/参考资料/.DS_Store and b/参考资料/.DS_Store differ
diff --git a/参考资料/工资核算 -7月/.DS_Store b/参考资料/工资核算 -7月/.DS_Store
index 079b3da..f0a394a 100644
Binary files a/参考资料/工资核算 -7月/.DS_Store and b/参考资料/工资核算 -7月/.DS_Store differ
diff --git a/数据库说明.md b/数据库说明.md
index bb0affb..2e955bb 100644
--- a/数据库说明.md
+++ b/数据库说明.md
@@ -27,6 +27,9 @@
 - **时间字段**：统一使用 `datetime` 类型
 - **金额字段**：统一使用 `decimal` 类型
 
+### 已弃用表
+- **lq_ryzl (人员资料表)** - 已弃用，人员信息现在使用系统用户表 `BASE_USER` 管理
+
 ---
 
 ## 核心业务表
@@ -80,7 +83,9 @@
 
 ### 2. 人员相关表
 
-#### lq_ryzl (人员资料)
+#### lq_ryzl (人员资料) - ⚠️ 已弃用
+> **注意**：此表已弃用，人员信息现在使用系统用户表 `BASE_USER` 管理
+
 | 字段名 | 数据类型 | 是否可空 | 字段说明 | 主键 |
 |--------|----------|----------|----------|------|
 | F_Id | varchar | NO | 序号 | PRI |
@@ -150,37 +155,37 @@
 #### lq_ycsd_jsj (金三角设定)
 | 字段名 | 数据类型 | 是否可空 | 字段说明 | 主键 |
 |--------|----------|----------|----------|------|
-| F_Id | varchar | NO | 主键 | PRI |
-| yf | varchar | YES | 月份 | |
-| md | varchar | YES | 门店 | |
-| jsj | varchar | YES | 金三角 | |
-| gw | varchar | YES | 岗位 | |
-| jks | varchar | YES | 健康师 | |
-| cjl | decimal | YES | 成交率 | |
-| cjyj | decimal | YES | 成交业绩 | |
-| cjtd | decimal | YES | 成交提点 | |
-| syyj | decimal | YES | 剩余业绩 | |
-| cqts | int | YES | 出勤天数 | |
-| xtyj | decimal | YES | 系统业绩 | |
-| zyj | decimal | YES | 总业绩 | |
-| jcyj | decimal | YES | 基础业绩 | |
-| hzyj | decimal | YES | 合作业绩 | |
-| jlyj | decimal | YES | 奖励业绩 | |
-| xms | int | YES | 项目数 | |
-| sg | int | YES | 手工 | |
-| sfsyzd | varchar | YES | ①是否属于战队 | |
-| fsmzkq | varchar | YES | ②是否满足考勤 | |
-| zdzzrs | int | YES | ③战队最终人数 | |
-| kqhbsyzd | int | YES | ④考勤后不属于战队视为单人 | |
-| zdtc | decimal | YES | ⑤战队提成 | |
-| ayrtc | decimal | YES | ⑥按1人提成 | |
-| zztcd | decimal | YES | 最终提成点 | |
-| jcyjtc | decimal | YES | 基础业绩提成 | |
-| hzyjtc | decimal | YES | 合作业绩提成 | |
-| tchj | decimal | YES | 提成合计 | |
-| grzb | decimal | YES | 个人占比 | |
-| zyhj | decimal | YES | 组员合计 | |
-| gwtc | decimal | YES | 顾问提成 | |
+| F_Id | varchar(50) | NO | 主键 | PRI |
+| yf | varchar(50) | YES | 月份 | |
+| jsj | varchar(50) | YES | 金三角 | |
+| md | varchar(255) | YES | 门店ID | |
+
+**业务说明**：
+- 这是金三角基础信息表，只记录金三角的基本信息
+- 金三角与用户的绑定关系通过 `lq_jinsanjiao_user` 表管理
+- 金三角的业绩统计等数据通过业务逻辑计算，不存储在此表中
+
+#### lq_jinsanjiao_user (金三角用户绑定关系)
+| 字段名 | 数据类型 | 是否可空 | 字段说明 | 主键 |
+|--------|----------|----------|----------|------|
+| F_Id | varchar(50) | NO | 主键 | PRI |
+| jsj_id | varchar(50) | NO | 金三角ID(关联lq_ycsd_jsj.F_Id) | |
+| user_id | varchar(50) | NO | 用户ID(关联BASE_USER.F_Id) | |
+| user_name | varchar(50) | NO | 用户姓名 | |
+| is_leader | int(11) | YES | 是否顾问(0-否,1-是) | |
+| status | varchar(20) | YES | 状态(ACTIVE-活跃,INACTIVE-非活跃) | |
+| sort_order | int(11) | YES | 排序 | |
+| F_CreatorTime | datetime | YES | 创建时间 | |
+| F_CreatorUserId | varchar(50) | YES | 创建人ID | |
+| F_LastModifyTime | datetime | YES | 最后修改时间 | |
+| F_LastModifyUserId | varchar(50) | YES | 最后修改人ID | |
+| F_DeleteMark | int(11) | YES | 删除标记 | |
+
+**业务说明**：
+- 这是金三角与用户的绑定关系表，管理金三角成员信息
+- 支持多人或单人金三角，通过 `is_leader` 字段标识队长
+- 支持用户在不同金三角间流动，通过 `status` 字段管理状态
+- 通过 `sort_order` 字段控制成员排序
 
 ### 6. 开单相关表
 
@@ -246,20 +251,21 @@
 ## 表关联关系
 
 ### 主要关联关系
-1. **门店与人员**：`lq_mdxx.dm` ↔ `lq_ryzl.dm`
-2. **人员与业绩**：`lq_ryzl.xm` ↔ `lq_yjmxb.jks`
+1. **门店与人员**：`lq_mdxx.dm` ↔ `BASE_USER.F_MDID` (人员信息已迁移到系统用户表)
+2. **人员与业绩**：`BASE_USER.F_REALNAME` ↔ `lq_yjmxb.jks` (通过姓名关联)
 3. **项目与业绩**：`lq_xmzl.xmbh` ↔ `lq_yjmxb.xmbh`
 4. **门店与业绩**：`lq_mdxx.mdbm` ↔ `lq_yjmxb.mdbh`
-5. **金三角设定与人员**：`lq_ycsd_jsj.jks` ↔ `lq_ryzl.xm`
-6. **开单记录与门店**：`lq_kd_kdjlb.djmd` ↔ `lq_mdxx.dm`
-7. **开单记录与金三角**：`lq_kd_kdjlb.jsj` ↔ `lq_ycsd_jsj.jsj`
-8. **开单记录与业绩**：`lq_kd_kdjlb.F_Id` ↔ `lq_yjmxb.F_Id` (通过开单编号关联)
-9. **门店与新店保护时间**：`lq_mdxx.F_Id` ↔ `lq_md_xdbhsj.mdid`
+5. **金三角设定与用户绑定**：`lq_ycsd_jsj.F_Id` ↔ `lq_jinsanjiao_user.jsj_id`
+6. **金三角用户绑定与用户**：`lq_jinsanjiao_user.user_id` ↔ `BASE_USER.F_Id`
+7. **开单记录与门店**：`lq_kd_kdjlb.djmd` ↔ `lq_mdxx.dm`
+8. **开单记录与金三角**：`lq_kd_kdjlb.jsj` ↔ `lq_ycsd_jsj.jsj`
+9. **开单记录与业绩**：`lq_kd_kdjlb.F_Id` ↔ `lq_yjmxb.F_Id` (通过开单编号关联)
+10. **门店与新店保护时间**：`lq_mdxx.F_Id` ↔ `lq_md_xdbhsj.mdid`
 
 ### 业务逻辑关联
 - **开单记录表是核心业务表**：所有业务操作都围绕开单进行，是系统的业务中心
 - 门店信息是基础数据，人员、业绩、金三角设定都依赖门店
-- 人员资料包含战队信息，与金三角设定表关联
+- **人员信息已迁移**：人员资料现在使用系统用户表 `BASE_USER` 管理，包含门店ID、职位等扩展字段
 - 业绩明细表从开单记录表衍生，用于业绩统计和薪酬计算
 - 金三角设定表用于薪酬计算，关联人员业绩数据
 - 开单记录表包含完整的业务信息：客户、业绩、付款、品项等
@@ -271,10 +277,12 @@
 ### 门店状态 (lq_mdxx.zxzt)
 - 待补充具体枚举值
 
-### 在职情况 (lq_ryzl.zzqk)
+### 在职情况 (BASE_USER.F_ENABLEDMARK) - ⚠️ 已迁移
+- 人员在职状态现在使用系统用户表的 `F_ENABLEDMARK` 字段管理
 - 待补充具体枚举值
 
-### 岗位分类 (lq_ryzl.gwfl1, gwfl2)
+### 岗位分类 (BASE_USER.F_GWFL, F_GW) - ⚠️ 已迁移
+- 岗位信息现在使用系统用户表的 `F_GWFL` 和 `F_GW` 字段管理
 - 待补充具体枚举值
 
 ### 项目分类 (lq_xmzl.fl1, fl2, fl3, fl4)
--
libgit2 0.21.4