From 2ce7c3cb9ee0f25fde733e892f218337d2ea2332 Mon Sep 17 00:00:00 2001
From: “wangming” <“wangming@antissoft.com”>
Date: Thu, 11 Sep 2025 17:56:32 +0800
Subject: [PATCH] 更新门店目标设定相关功能，新增字段以支持门店目标信息，删除不再使用的会员管理相关代码，优化项目结构和文件管理，确保代码整洁和功能完整性。

---
 .DS_Store                                                                                            | Bin 18436 -> 0 bytes
 README.md                                                                                            |   2 --
 antis-ncc-admin/.DS_Store                                                                            | Bin 10244 -> 0 bytes
 antis-ncc-admin/.env.development                                                                     |   2 +-
 antis-ncc-admin/src/api/extend/lqZjlMdsmxsz.js                                                       |  33 ++++++++++++++++++++++++++-------
 antis-ncc-admin/src/views/lqHygl/Form.vue                                                            | 208 ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 antis-ncc-admin/src/views/lqHygl/index.vue                                                           | 339 ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 antis-ncc-admin/src/views/lqKdKdjlb/index.vue                                                        | 730 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----------------------------------------
 antis-ncc-admin/src/views/lqYcsdMdmbsd/components/TargetSettingDialog.vue                            | 266 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 antis-ncc-admin/src/views/lqYcsdMdmbsd/index.vue                                                     | 424 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 antis-ncc-admin/src/views/lqZjlMdsmxsz/components/BatchCreateDialog.vue                              |  23 +++++++++++++----------
 antis-ncc-admin/src/views/lqZjlMdsmxsz/components/EditDialog.vue                                     | 480 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 antis-ncc-admin/src/views/lqZjlMdsmxsz/index.vue                                                     | 323 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------
 netcore/netcore/.DS_Store                                                                            | Bin 6148 -> 0 bytes
 netcore/src/.DS_Store                                                                                | Bin 10244 -> 0 bytes
 netcore/src/Application/NCC.API/.DS_Store                                                            | Bin 10244 -> 0 bytes
 netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqHygl/LqHyglCrInput.cs                         |  87 ---------------------------------------------------------------------------------------
 netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqHygl/LqHyglInfoOutput.cs                      |  87 ---------------------------------------------------------------------------------------
 netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqHygl/LqHyglListOutput.cs                      |  86 --------------------------------------------------------------------------------------
 netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqHygl/LqHyglListQueryInput.cs                  |  98 --------------------------------------------------------------------------------------------------
 netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqHygl/LqHyglUpInput.cs                         |  17 -----------------
 netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdJksyj/LqKdJksyjCrInput.cs                   |   5 +++++
 netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdPxmx/LqKdPxmxCrInput.cs                     |  19 +++++++++++++++++++
 netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdxx/LqMdxxCrInput.cs                         |  30 ++++++++++++++++++++++++++++++
 netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdxx/LqMdxxListOutput.cs                      |  30 ++++++++++++++++++++++++++++++
 netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdxx/LqMdxxTargetUpdateInput.cs               |  40 ++++++++++++++++++++++++++++++++++++++++
 netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXmzl/LqXmzlCrInput.cs                         |  14 ++++++++++++++
 netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXmzl/LqXmzlInfoOutput.cs                      |  15 +++++++++++++++
 netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXmzl/LqXmzlListOutput.cs                      |  14 ++++++++++++++
 netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXmzl/LqXmzlListQueryInput.cs                  |   5 +++++
 netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdMdmbsd/LqYcsdMdmbsdCrInput.cs             |  52 ----------------------------------------------------
 netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdMdmbsd/LqYcsdMdmbsdInfoOutput.cs          |  52 ----------------------------------------------------
 netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdMdmbsd/LqYcsdMdmbsdListOutput.cs          |  51 ---------------------------------------------------
 netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdMdmbsd/LqYcsdMdmbsdListQueryInput.cs      |  63 ---------------------------------------------------------------
 netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdMdmbsd/LqYcsdMdmbsdUpInput.cs             |  17 -----------------
 netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqZjlMdsmxsz/LqZjlMdsmxszListQueryInput.cs      |   4 ++--
 netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/README.md                                    |   1 -
 netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_hygl/LqHyglEntity.cs                      | 105 ---------------------------------------------------------------------------------------------------------
 netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_jinsanjiao_user/LqJinsanjiaoUserEntity.cs |   7 +++++++
 netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_kd_jksyj/LqKdJksyjEntity.cs               |   6 ++++++
 netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_kd_kdjlb/LqKdKdjlbEntity.cs               |   6 ++++++
 netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_kd_pxmx/LqKdPxmxEntity.cs                 |  24 ++++++++++++++++++++++++
 netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_mdxx/LqMdxxEntity.cs                      |  36 ++++++++++++++++++++++++++++++++++++
 netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_xmzl/LqXmzlEntity.cs                      |  17 +++++++++++++++++
 netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_ycsd_mdmbsd/LqYcsdMdmbsdEntity.cs         |  63 ---------------------------------------------------------------
 netcore/src/Modularity/Extend/NCC.Extend.Entitys/Mapper/LqHyglMapper.cs                              |  15 ---------------
 netcore/src/Modularity/Extend/NCC.Extend.Entitys/Mapper/LqYcsdMdmbsdMapper.cs                        |  14 --------------
 netcore/src/Modularity/Extend/NCC.Extend.Interfaces/ILqHyglService.cs                                |   6 ------
 netcore/src/Modularity/Extend/NCC.Extend.Interfaces/ILqYcsdMdmbsdService.cs                          |   6 ------
 netcore/src/Modularity/Extend/NCC.Extend.Interfaces/LqZjlMdsmxsz/ILqZjlMdsmxszService.cs             |   7 +++++++
 netcore/src/Modularity/Extend/NCC.Extend/LqHyglService.cs                                            | 289 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 netcore/src/Modularity/Extend/NCC.Extend/LqKdKdjlbService.cs                                         | 184 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------------------------------------
 netcore/src/Modularity/Extend/NCC.Extend/LqMdxxService.cs                                            |  32 +++++++++++++++++++++++++++++++-
 netcore/src/Modularity/Extend/NCC.Extend/LqXmzlService.cs                                            | 137 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------------------
 netcore/src/Modularity/Extend/NCC.Extend/LqYcsdJsjService.cs                                         | 140 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------
 netcore/src/Modularity/Extend/NCC.Extend/LqYcsdMdmbsdService.cs                                      | 245 -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 netcore/src/Modularity/Extend/NCC.Extend/LqZjlMdsmxszService.cs                                      |  94 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------
 netcore/src/Modularity/Extend/NCC.Extend/UserService.cs                                              |  29 +++++++++++++++++++++++++++++
 数据库说明.md                                                                                   |   8 ++++++++
 59 files changed, 2495 insertions(+), 2592 deletions(-)
 delete mode 100644 antis-ncc-admin/src/views/lqHygl/Form.vue
 delete mode 100644 antis-ncc-admin/src/views/lqHygl/index.vue
 create mode 100644 antis-ncc-admin/src/views/lqYcsdMdmbsd/components/TargetSettingDialog.vue
 delete mode 100644 netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqHygl/LqHyglCrInput.cs
 delete mode 100644 netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqHygl/LqHyglInfoOutput.cs
 delete mode 100644 netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqHygl/LqHyglListOutput.cs
 delete mode 100644 netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqHygl/LqHyglListQueryInput.cs
 delete mode 100644 netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqHygl/LqHyglUpInput.cs
 create mode 100644 netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdxx/LqMdxxTargetUpdateInput.cs
 delete mode 100644 netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdMdmbsd/LqYcsdMdmbsdCrInput.cs
 delete mode 100644 netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdMdmbsd/LqYcsdMdmbsdInfoOutput.cs
 delete mode 100644 netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdMdmbsd/LqYcsdMdmbsdListOutput.cs
 delete mode 100644 netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdMdmbsd/LqYcsdMdmbsdListQueryInput.cs
 delete mode 100644 netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdMdmbsd/LqYcsdMdmbsdUpInput.cs
 delete mode 100644 netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_hygl/LqHyglEntity.cs
 delete mode 100644 netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_ycsd_mdmbsd/LqYcsdMdmbsdEntity.cs
 delete mode 100644 netcore/src/Modularity/Extend/NCC.Extend.Entitys/Mapper/LqHyglMapper.cs
 delete mode 100644 netcore/src/Modularity/Extend/NCC.Extend.Entitys/Mapper/LqYcsdMdmbsdMapper.cs
 delete mode 100644 netcore/src/Modularity/Extend/NCC.Extend.Interfaces/ILqHyglService.cs
 delete mode 100644 netcore/src/Modularity/Extend/NCC.Extend.Interfaces/ILqYcsdMdmbsdService.cs
 delete mode 100644 netcore/src/Modularity/Extend/NCC.Extend/LqHyglService.cs
 delete mode 100644 netcore/src/Modularity/Extend/NCC.Extend/LqYcsdMdmbsdService.cs

diff --git a/.DS_Store b/.DS_Store
index adae645..dcd23dd 100644
Binary files a/.DS_Store and b/.DS_Store differ
diff --git a/README.md b/README.md
index a442983..bdf119f 100644
--- a/README.md
+++ b/README.md
@@ -67,7 +67,6 @@ lvqianmeiye_ERP/
 #### 📋 基础管理类
 - `LqBmzbService` - 部门管理服务
 - `LqCpxxService` - 产品信息管理服务
-- `LqHyglService` - 会员管理服务
 - `LqKhxxService` - 客户信息管理服务
 - `LqRyzlService` - 人员资料管理服务
 
@@ -176,7 +175,6 @@ npm run dev
 ### 📋 基础管理模块
 - **部门管理** (`LqBmzbService`) - 组织架构管理，部门分类维护
 - **产品信息** (`LqCpxxService`) - 产品档案管理，产品分类维护
-- **会员管理** (`LqHyglService`) - 客户信息管理，会员等级维护
 - **客户信息** (`LqKhxxService`) - 客户档案管理，客户关系维护
 - **人员资料** (`LqRyzlService`) - 员工信息管理，人员档案维护
 
diff --git a/antis-ncc-admin/.DS_Store b/antis-ncc-admin/.DS_Store
index d012c33..4fa1034 100644
Binary files a/antis-ncc-admin/.DS_Store and b/antis-ncc-admin/.DS_Store differ
diff --git a/antis-ncc-admin/.env.development b/antis-ncc-admin/.env.development
index 2994847..92ac187 100644
--- a/antis-ncc-admin/.env.development
+++ b/antis-ncc-admin/.env.development
@@ -2,4 +2,4 @@
 
 VUE_CLI_BABEL_TRANSPILE_MODULES = true
 VUE_APP_BASE_API = 'http://localhost:5000'
-VUE_APP_BASE_WSS = 'ws://localhost:2011/websocket'
+VUE_APP_BASE_WSS = 'ws://192.168.110.45:5000/websocket'
diff --git a/antis-ncc-admin/src/api/extend/lqZjlMdsmxsz.js b/antis-ncc-admin/src/api/extend/lqZjlMdsmxsz.js
index 81d7440..c8d9662 100644
--- a/antis-ncc-admin/src/api/extend/lqZjlMdsmxsz.js
+++ b/antis-ncc-admin/src/api/extend/lqZjlMdsmxsz.js
@@ -45,14 +45,33 @@ export const lqZjlMdsmxszApi = {
    */
   getZjlUserList(params) {
     return request({
-      url: '/api/Extend/User',
+      url: '/api/Extend/User/ManagerSelector',
+      method: 'GET'
+    })
+  },
+
+  /**
+   * 获取所有总经理门店生命线设置数据（分页查询）
+   * @param {Object} params 查询参数
+   */
+  getPageList(params) {
+    return request({
+      url: '/api/Extend/LqZjlMdsmxsz/GetPageList',
       method: 'GET',
-      data: {
-        gw: '总经理',
-        pageNum: 1,
-        pageSize: 1000,
-        ...params
-      }
+      params: params
+    })
+  },
+
+  /**
+   * 更新总经理门店生命线设置
+   * @param {string} id 记录ID
+   * @param {Object} data 更新数据
+   */
+  update(id, data) {
+    return request({
+      url: `/api/Extend/LqZjlMdsmxsz/${id}`,
+      method: 'PUT',
+      data
     })
   }
 }
diff --git a/antis-ncc-admin/src/views/lqHygl/Form.vue b/antis-ncc-admin/src/views/lqHygl/Form.vue
deleted file mode 100644
index b148221..0000000
--- a/antis-ncc-admin/src/views/lqHygl/Form.vue
+++ /dev/null
@@ -1,208 +0,0 @@
-<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="24">
-						<el-form-item label="姓名" prop="xm">
-							<el-input v-model="dataForm.xm" placeholder="请输入" clearable :style='{"width":"100%"}' >
-							</el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="24">
-						<el-form-item label="性别" prop="xb">
-							<el-select v-model="dataForm.xb" placeholder="请选择" clearable :style='{"width":"100%"}' >
-								<el-option v-for="(item, index) in xbOptions" :key="index" :label="item.fullName" :value="item.id" ></el-option>
-							</el-select>
-						</el-form-item>
-					</el-col>
-					<el-col :span="24">
-						<el-form-item label="手机号" prop="sjh">
-							<el-input v-model="dataForm.sjh" placeholder="请输入" clearable :style='{"width":"100%"}' >
-							</el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="24">
-						<el-form-item label="职业" prop="zy">
-							<el-input v-model="dataForm.zy" placeholder="请输入" clearable :style='{"width":"100%"}' >
-							</el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="24">
-						<el-form-item label="进店渠道" prop="jdqd">
-							<el-select v-model="dataForm.jdqd" placeholder="请选择" clearable :style='{"width":"100%"}' >
-								<el-option v-for="(item, index) in jdqdOptions" :key="index" :label="item.fullName" :value="item.id" ></el-option>
-							</el-select>
-						</el-form-item>
-					</el-col>
-					<el-col :span="24">
-						<el-form-item label="年龄" prop="nl">
-							<el-input v-model="dataForm.nl" placeholder="请输入" clearable :style='{"width":"100%"}' >
-							</el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="24">
-						<el-form-item label="阴历生日" prop="yin">
-							<el-date-picker v-model="dataForm.yin" placeholder="请选择" clearable :style='{"width":"100%"}' type='date' format="yyyy-MM-dd" value-format="timestamp" >
-							</el-date-picker>
-						</el-form-item>
-					</el-col>
-					<el-col :span="24">
-						<el-form-item label="阳历生日" prop="yang">
-							<el-date-picker v-model="dataForm.yang" placeholder="请选择" clearable :style='{"width":"100%"}' type='date' format="yyyy-MM-dd" value-format="timestamp" >
-							</el-date-picker>
-						</el-form-item>
-					</el-col>
-					<el-col :span="24">
-						<el-form-item label="推荐人" prop="tjr">
-							<el-input v-model="dataForm.tjr" placeholder="请输入" clearable :style='{"width":"100%"}' >
-							</el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="24">
-						<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="24">
-						<el-form-item label="会员顾问" prop="hygw">
-							<el-input v-model="dataForm.hygw" placeholder="请输入" clearable :style='{"width":"100%"}' >
-							</el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="24">
-						<el-form-item label="标签" prop="bq">
-							<el-input v-model="dataForm.bq" placeholder="请输入" clearable :style='{"width":"100%"}' >
-							</el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="24">
-						<el-form-item label="爱好" prop="ah">
-							<el-input v-model="dataForm.ah" placeholder="请输入" clearable :style='{"width":"100%"}' >
-							</el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="24">
-						<el-form-item label="其它" prop="qt">
-							<el-input v-model="dataForm.qt" placeholder="请输入" show-word-limit :style='{"width":"100%"}' type='textarea' :autosize='{"minRows":4,"maxRows":4}' >
-							</el-input>
-						</el-form-item>
-					</el-col>
-				</el-form>
-		</el-row>
-		<span slot="footer" class="dialog-footer">
-			<el-button @click="visible = false">取 消</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: [],
-		data() {
-			return {
-				loading: false,
-				visible: false,
-				isDetail: false,
-				dataForm: {
-					id:'',
-					id:undefined,
-					xm:undefined,
-					xb:undefined,
-					sjh:undefined,
-					zy:undefined,
-					jdqd:undefined,
-					nl:undefined,
-					yin:undefined,
-					yang:undefined,
-					tjr:undefined,
-					jks:undefined,
-					hygw:undefined,
-					bq:undefined,
-					ah:undefined,
-					qt:undefined,
-				},
-				rules: {
-				},
-				xbOptions:[{"fullName":"男","id":"男"},{"fullName":"女","id":"女"}],
-				jdqdOptions:[{"fullName":"进店渠道1","id":"进店渠道1"}],
-			}
-		},
-		computed: {},
-        watch: {},
-        created() {
-		},
-		mounted() {
-        },
-		methods: {
-			goBack() {
-                this.$emit('refresh')
-            },
-			init(id, isDetail) {
-				this.dataForm.id = id || 0;
-                this.visible = true;
-                this.isDetail = isDetail || false;
-				this.$nextTick(() => {
-					this.$refs['elForm'].resetFields();
-					if (this.dataForm.id) {
-						request({
-							url: '/api/Extend/LqHygl/' + this.dataForm.id,
-							method: 'get'
-						}).then(res =>{
-							this.dataForm = res.data;
-						})
-					}
-				})
-			},
-			dataFormSubmit() {
-				this.$refs['elForm'].validate((valid) => {
-                    if (valid) {
-                        if (!this.dataForm.id) {
-                            request({
-                                url: `/api/Extend/LqHygl`,
-                                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/LqHygl/' + 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)
-                                    }
-                                })
-                            })
-                        }
-                    }
-                })
-			},
-		}
-	}
-</script>
diff --git a/antis-ncc-admin/src/views/lqHygl/index.vue b/antis-ncc-admin/src/views/lqHygl/index.vue
deleted file mode 100644
index ebb8e78..0000000
--- a/antis-ncc-admin/src/views/lqHygl/index.vue
+++ /dev/null
@@ -1,339 +0,0 @@
-<template>
-	<div class="NCC-common-layout">
-		<div class="NCC-common-layout-center">
-			<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.xm" placeholder="姓名" clearable />	
-						</el-form-item>
-					</el-col>
-					<el-col :span="6">
-						<el-form-item label="性别">
-							<el-select v-model="query.xb" placeholder="性别" clearable >
-								<el-option v-for="(item, index) in xbOptions" :key="index" :label="item.fullName" :value="item.id"  />
-							</el-select>
-						</el-form-item>
-					</el-col>
-					<template v-if="showAll">
-					<el-col :span="6">
-						<el-form-item label="手机号">
-							<el-input v-model="query.sjh" placeholder="手机号" clearable />	
-						</el-form-item>
-					</el-col>
-					<el-col :span="6">
-						<el-form-item label="职业">
-							<el-input v-model="query.zy" placeholder="职业" clearable />	
-						</el-form-item>
-					</el-col>
-					<el-col :span="6">
-						<el-form-item label="进店渠道">
-							<el-select v-model="query.jdqd" placeholder="进店渠道" clearable >
-								<el-option v-for="(item, index) in jdqdOptions" :key="index" :label="item.fullName" :value="item.id"  />
-							</el-select>
-						</el-form-item>
-					</el-col>
-					<el-col :span="6">
-						<el-form-item label="年龄">
-							<el-input v-model="query.nl" placeholder="年龄" clearable />	
-						</el-form-item>
-					</el-col>
-					<el-col :span="6">
-						<el-form-item label="阴历生日">
-							<el-date-picker v-model="query.yin" type="daterange" value-format="timestamp" format="yyyy-MM-dd" start-placeholder="开始日期" end-placeholder="结束日期">
-							</el-date-picker>
-						</el-form-item>
-					</el-col>
-					<el-col :span="6">
-						<el-form-item label="阳历生日">
-							<el-date-picker v-model="query.yang" type="daterange" value-format="timestamp" format="yyyy-MM-dd" start-placeholder="开始日期" end-placeholder="结束日期">
-							</el-date-picker>
-						</el-form-item>
-					</el-col>
-					<el-col :span="6">
-						<el-form-item label="推荐人">
-							<el-input v-model="query.tjr" 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.hygw" placeholder="会员顾问" clearable />	
-						</el-form-item>
-					</el-col>
-					<el-col :span="6">
-						<el-form-item label="标签">
-							<el-input v-model="query.bq" placeholder="标签" clearable />	
-						</el-form-item>
-					</el-col>
-					<el-col :span="6">
-						<el-form-item label="爱好">
-							<el-input v-model="query.ah" placeholder="爱好" clearable />	
-						</el-form-item>
-					</el-col>
-					<el-col :span="6">
-						<el-form-item label="其它">
-							<el-input v-model="query.qt" placeholder="其它" />	
-						</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>
-					</el-col>
-				</el-form>
-			</el-row>
-			<div class="NCC-common-layout-main NCC-flex-main">
-				<div class="NCC-common-head">
-					<div>
-						<el-button type="primary" icon="el-icon-plus" @click="addOrUpdateHandle()">新增</el-button>
-						<el-button type="text" icon="el-icon-download" @click="exportData()">导出</el-button>
-						<el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除</el-button>
-					</div>
-					<div class="NCC-common-head-right">
-						<el-tooltip effect="dark" content="刷新" placement="top">
-							<el-link icon="icon-ym icon-ym-Refresh NCC-common-head-icon" :underline="false" @click="reset()" />
-						</el-tooltip>
-						<screenfull isContainer />
-					</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="xm" label="姓名" align="left" />
-					<el-table-column label="性别" prop="xb" align="left">
-							<template slot-scope="scope">{{ scope.row.xb | dynamicText(xbOptions) }}</template>
-					</el-table-column>
-					<el-table-column prop="sjh" label="手机号" align="left" />
-					<el-table-column prop="zy" label="职业" align="left" />
-					<el-table-column label="进店渠道" prop="jdqd" align="left">
-							<template slot-scope="scope">{{ scope.row.jdqd | dynamicText(jdqdOptions) }}</template>
-					</el-table-column>
-					<el-table-column prop="nl" label="年龄" align="left" />
-					<el-table-column prop="yin" label="阴历生日" align="left" />
-					<el-table-column prop="yang" label="阳历生日" align="left" />
-					<el-table-column prop="tjr" label="推荐人" align="left" />
-					<el-table-column prop="jks" label="健康师" align="left" />
-					<el-table-column prop="hygw" label="会员顾问" align="left" />
-					<el-table-column prop="bq" label="标签" align="left" />
-					<el-table-column prop="ah" label="爱好" align="left" />
-					<el-table-column prop="qt" 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>
-						</template>
-					</el-table-column>
-				</NCC-table>
-                <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize" @pagination="initData" />
-            </div>
-        </div>
-		<NCC-Form v-if="formVisible" ref="NCCForm" @refresh="refresh" />
-		<ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
-	</div>
-</template>
-<script>
-    import request from '@/utils/request'
-    import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
-    import NCCForm from './Form'
-    import ExportBox from './ExportBox'
-    import { previewDataInterface } from '@/api/systemData/dataInterface'
-	export default {
-        components: { NCCForm, ExportBox },
-        data() {
-            return {
-                showAll: false,
-				query: {
-                    id:undefined,
-                    xm:undefined,
-                    xb:undefined,
-                    sjh:undefined,
-                    zy:undefined,
-                    jdqd:undefined,
-                    nl:undefined,
-                    yin:undefined,
-                    yang:undefined,
-                    tjr:undefined,
-                    jks:undefined,
-                    hygw:undefined,
-                    bq:undefined,
-                    ah:undefined,
-                    qt:undefined,
-				},
-                list: [],
-                listLoading: true,
-                multipleSelection: [], total: 0,
-                listQuery: {
-                    currentPage: 1,
-                    pageSize: 20,
-					sort: "desc",
-                    sidx: "",
-                },
-                formVisible: false,
-                exportBoxVisible: false,
-                columnList: [
-                    { prop: 'id', label: '会员编号' },
-                    { prop: 'xm', label: '姓名' },
-                    { prop: 'xb', label: '性别' },
-                    { prop: 'sjh', label: '手机号' },
-                    { prop: 'zy', label: '职业' },
-                    { prop: 'jdqd', label: '进店渠道' },
-                    { prop: 'nl', label: '年龄' },
-                    { prop: 'yin', label: '阴历生日' },
-                    { prop: 'yang', label: '阳历生日' },
-                    { prop: 'tjr', label: '推荐人' },
-                    { prop: 'jks', label: '健康师' },
-                    { prop: 'hygw', label: '会员顾问' },
-                    { prop: 'bq', label: '标签' },
-                    { prop: 'ah', label: '爱好' },
-                    { prop: 'qt', label: '其它' },
-				],
-				xbOptions:[{"fullName":"男","id":"男"},{"fullName":"女","id":"女"}],
-				jdqdOptions:[{"fullName":"进店渠道1","id":"进店渠道1"}],
-			}
-        },
-		computed: {},
-		created() {
-			this.initData()
-		},
-		methods: {
-			initData() {
-                this.listLoading = true;
-                let _query = {
-                    ...this.listQuery,
-                    ...this.query
-                };
-                let query = {}
-                for (let key in _query) {
-                    if (Array.isArray(_query[key])) {
-                        query[key] = _query[key].join()
-                    } else {
-                        query[key] = _query[key]
-                    }
-                }
-                request({
-                    url: `/api/Extend/LqHygl`,
-                    method: 'GET',
-                    data: query
-                }).then(res => {
-                    this.list = res.data.list
-                    this.total = res.data.pagination.total
-                    this.listLoading = false
-                })
-            },
-			handleDel(id) {
-                this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
-                    type: 'warning'
-                }).then(() => {
-                    request({
-                        url: `/api/Extend/LqHygl/${id}`,
-                        method: 'DELETE'
-                    }).then(res => {
-                        this.$message({
-                            type: 'success',
-                            message: res.msg,
-                            onClose: () => {
-                                this.initData()
-                            }
-                        });
-                    })
-                }).catch(() => {
-                });
-            },
-			handleSelectionChange(val) {
-                const res = val.map(item => item.id)
-                this.multipleSelection = res
-            },
-            handleBatchRemoveDel() {
-                if (!this.multipleSelection.length) {
-                    this.$message({
-                        type: 'error',
-                        message: '请选择一条数据',
-                        duration: 1500,
-                    })
-                    return
-                }
-                const ids = this.multipleSelection
-                this.$confirm('您确定要删除这些数据吗, 是否继续？', '提示', {
-                    type: 'warning'
-                }).then(() => {
-                    request({
-                        url: `/api/Extend/LqHygl/batchRemove`,
-                        method: 'POST',
-                        data: ids ,
-                    }).then(res => {
-                        this.$message({
-                            type: 'success',
-                            message: res.msg,
-                            onClose: () => {
-                                this.initData()
-                            }
-                        });
-                    })
-                }).catch(() => { })
-            },
-			addOrUpdateHandle(id, isDetail) {
-                this.formVisible = true
-                this.$nextTick(() => {
-                    this.$refs.NCCForm.init(id, isDetail)
-                })
-            },
-			exportData() {
-                this.exportBoxVisible = true
-                this.$nextTick(() => {
-                    this.$refs.ExportBox.init(this.columnList)
-                })
-            },
-            download(data) {
-                let query = { ...data, ...this.listQuery, ...this.query }
-                request({
-                    url: `/api/Extend/LqHygl/Actions/Export`,
-                    method: 'GET',
-                    data: query
-                }).then(res => {
-                    if (!res.data.url) return
-                    window.location.href = this.define.comUrl + res.data.url
-                    this.$refs.ExportBox.visible = false
-                    this.exportBoxVisible = false
-                })
-            },
-			search() {
-                this.listQuery = {
-                    currentPage: 1,
-                    pageSize: 20,
-                    sort: "desc",
-                    sidx: "",
-                }
-                this.initData()
-            },
-            refresh(isrRefresh) {
-                this.formVisible = false
-                if (isrRefresh) this.reset()
-            },
-            reset() {
-                for (let key in this.query) {
-                    this.query[key] = undefined
-                }
-                this.listQuery = {
-                    currentPage: 1,
-                    pageSize: 20,
-                    sort: "desc",
-                    sidx: "",
-                }
-                this.initData()
-            }
-		}
-    }
-</script>
\ No newline at end of file
diff --git a/antis-ncc-admin/src/views/lqKdKdjlb/index.vue b/antis-ncc-admin/src/views/lqKdKdjlb/index.vue
index e7be4cd..57f42ba 100644
--- a/antis-ncc-admin/src/views/lqKdKdjlb/index.vue
+++ b/antis-ncc-admin/src/views/lqKdKdjlb/index.vue
@@ -175,56 +175,284 @@
 						<screenfull isContainer />
 					</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 label="开单会员" prop="kdhy" align="left">
-							<template slot-scope="scope">{{ scope.row.kdhy | dynamicText(kdhyOptions) }}</template>
+                <NCC-table 
+					v-loading="listLoading" 
+					:data="list" 
+					has-c 
+					@selection-change="handleSelectionChange"
+					:header-cell-style="{ background: '#f5f7fa', color: '#606266' }"
+				>
+					<!-- 开单编号 -->
+					<el-table-column label="开单编号" width="180" align="center">
+						<template slot-scope="scope">
+							<div class="order-info">
+								<i class="el-icon-document order-icon"></i>
+								<span class="text-nowrap">{{ scope.row.id || '无' }}</span>
+							</div>
+						</template>
+					</el-table-column>
+					
+					<!-- 开单会员 -->
+					<el-table-column label="开单会员" width="100" align="center">
+						<template slot-scope="scope">
+							<div class="member-info">
+								<i class="el-icon-user member-icon"></i>
+								<span class="text-nowrap">{{ scope.row.kdhy | dynamicText(kdhyOptions) || '无' }}</span>
+							</div>
+						</template>
+					</el-table-column>
+					
+					<!-- 开单会员名称 -->
+					<el-table-column label="开单会员名称" width="100" align="center">
+						<template slot-scope="scope">
+							<div class="member-name">
+								<i class="el-icon-user-solid member-name-icon"></i>
+								<span class="text-nowrap">{{ scope.row.kdhyc || '无' }}</span>
+							</div>
+						</template>
+					</el-table-column>
+					
+					<!-- 会员手机号 -->
+					<el-table-column label="会员手机号" width="120" align="center">
+						<template slot-scope="scope">
+							<div class="phone-info">
+								<i class="el-icon-phone phone-icon"></i>
+								<span class="text-nowrap">{{ scope.row.kdhysjh || '无' }}</span>
+							</div>
+						</template>
+					</el-table-column>
+					
+					<!-- 单据门店 -->
+					<el-table-column label="单据门店" width="120" align="center">
+						<template slot-scope="scope">
+							<div class="store-info">
+								<i class="el-icon-office-building store-icon"></i>
+								<span class="text-nowrap">{{ scope.row.djmd | dynamicText(djmdOptions) || '无' }}</span>
+							</div>
+						</template>
+					</el-table-column>
+					
+					<!-- 金三角 -->
+					<el-table-column label="金三角" width="120" align="center">
+						<template slot-scope="scope">
+							<div class="jsj-info">
+								<i class="el-icon-star-on jsj-icon"></i>
+								<span class="text-nowrap">{{ scope.row.jsj | dynamicText(jsjOptions) || '无' }}</span>
+							</div>
+						</template>
+					</el-table-column>
+					
+					<!-- 开单日期 -->
+					<el-table-column label="开单日期" width="120" align="center">
+						<template slot-scope="scope">
+							<div class="date-info">
+								<i class="el-icon-date date-icon"></i>
+								<span class="text-nowrap">{{ formatDate(scope.row.kdrq) }}</span>
+							</div>
+						</template>
+					</el-table-column>
+					
+					<!-- 顾客类型 -->
+					<el-table-column label="顾客类型" width="120" align="center">
+						<template slot-scope="scope">
+							<div class="customer-type-info">
+								<i class="el-icon-user customer-type-icon"></i>
+								<span class="text-nowrap">{{ scope.row.gjlx | dynamicText(gjlxOptions) || '无' }}</span>
+							</div>
+						</template>
+					</el-table-column>
+					
+					<!-- 合作机构 -->
+					<el-table-column label="合作机构" width="120" align="center">
+						<template slot-scope="scope">
+							<div class="cooperation-info">
+								<i class="el-icon-office-building cooperation-icon"></i>
+								<span class="text-nowrap">{{ scope.row.hgjg | dynamicText(hgjgOptions) || '无' }}</span>
+							</div>
+						</template>
+					</el-table-column>
+					
+					<!-- 整单业绩 -->
+					<el-table-column label="整单业绩" width="120" align="center">
+						<template slot-scope="scope">
+							<div class="amount-info">
+								<i class="el-icon-money amount-icon"></i>
+								<span class="text-nowrap">{{ scope.row.zdyj || '无' }}</span>
+							</div>
+						</template>
+					</el-table-column>
+					
+					<!-- 实付业绩 -->
+					<el-table-column label="实付业绩" width="120" align="center">
+						<template slot-scope="scope">
+							<div class="paid-amount-info">
+								<i class="el-icon-coin paid-amount-icon"></i>
+								<span class="text-nowrap">{{ scope.row.sfyj || '无' }}</span>
+							</div>
+						</template>
+					</el-table-column>
+					
+					<!-- 欠款 -->
+					<el-table-column label="欠款" width="100" align="center">
+						<template slot-scope="scope">
+							<div class="debt-info">
+								<i class="el-icon-warning debt-icon"></i>
+								<span class="text-nowrap">{{ scope.row.qk || '无' }}</span>
+							</div>
+						</template>
+					</el-table-column>
+					
+					<!-- 储扣方式 -->
+					<el-table-column label="储扣方式" width="120" align="center">
+						<template slot-scope="scope">
+							<div class="storage-info">
+								<i class="el-icon-coin storage-icon"></i>
+								<span class="text-nowrap">{{ scope.row.ckfs | dynamicText(ckfsOptions) || '无' }}</span>
+							</div>
+						</template>
 					</el-table-column>
-					<el-table-column prop="kdhyc" label="开单会员名称" align="left" />
-					<el-table-column prop="kdhysjh" label="会员手机号" align="left" />
-					<el-table-column label="单据门店" prop="djmd" align="left">
-							<template slot-scope="scope">{{ scope.row.djmd | dynamicText(djmdOptions) }}</template>
+					
+					<!-- 储扣明细 -->
+					<el-table-column label="储扣明细" width="120" align="center">
+						<template slot-scope="scope">
+							<div class="storage-detail-info">
+								<i class="el-icon-document storage-detail-icon"></i>
+								<span class="text-nowrap">{{ scope.row.ckmx || '无' }}</span>
+							</div>
+						</template>
+					</el-table-column>
+					
+					<!-- 付款方式 -->
+					<el-table-column label="付款方式" width="120" align="center">
+						<template slot-scope="scope">
+							<div class="payment-info">
+								<i class="el-icon-credit-card payment-icon"></i>
+								<span class="text-nowrap">{{ scope.row.fkfs | dynamicText(fkfsOptions) || '无' }}</span>
+							</div>
+						</template>
 					</el-table-column>
-					<el-table-column label="金三角" prop="jsj" align="left">
-							<template slot-scope="scope">{{ scope.row.jsj | dynamicText(jsjOptions) }}</template>
+					
+					<!-- 付款医院 -->
+					<el-table-column label="付款医院" width="120" align="center">
+						<template slot-scope="scope">
+							<div class="hospital-info">
+								<i class="el-icon-office-building hospital-icon"></i>
+								<span class="text-nowrap">{{ scope.row.fkyy | dynamicText(fkyyOptions) || '无' }}</span>
+							</div>
+						</template>
+					</el-table-column>
+					
+					<!-- 付款判断 -->
+					<el-table-column label="付款判断" width="120" align="center">
+						<template slot-scope="scope">
+							<div class="payment-judge-info">
+								<i class="el-icon-check payment-judge-icon"></i>
+								<span class="text-nowrap">{{ scope.row.fkpd || '无' }}</span>
+							</div>
+						</template>
+					</el-table-column>
+					
+					<!-- 客户来源 -->
+					<el-table-column label="客户来源" width="120" align="center">
+						<template slot-scope="scope">
+							<div class="source-info">
+								<i class="el-icon-connection source-icon"></i>
+								<span class="text-nowrap">{{ scope.row.khly | dynamicText(khlyOptions) || '无' }}</span>
+							</div>
+						</template>
 					</el-table-column>
-					<el-table-column prop="kdrq" label="开单日期" align="left" />
-					<el-table-column label="顾客类型" prop="gjlx" align="left">
-							<template slot-scope="scope">{{ scope.row.gjlx | dynamicText(gjlxOptions) }}</template>
+					
+					<!-- 推荐人 -->
+					<el-table-column label="推荐人" width="100" align="center">
+						<template slot-scope="scope">
+							<div class="referrer-info">
+								<i class="el-icon-user referrer-icon"></i>
+								<span class="text-nowrap">{{ scope.row.tjr || '无' }}</span>
+							</div>
+						</template>
 					</el-table-column>
-					<el-table-column label="合作机构" prop="hgjg" align="left">
-							<template slot-scope="scope">{{ scope.row.hgjg | dynamicText(hgjgOptions) }}</template>
+					
+					<!-- 是否首开订单 -->
+					<el-table-column label="是否首开订单" width="140" align="center">
+						<template slot-scope="scope">
+							<div class="first-order-info">
+								<i class="el-icon-star-on first-order-icon"></i>
+								<span class="text-nowrap">{{ scope.row.sfskdd | dynamicText(sfskddOptions) || '无' }}</span>
+							</div>
+						</template>
 					</el-table-column>
-					<el-table-column prop="zdyj" label="整单业绩" align="left" />
-					<el-table-column prop="sfyj" label="实付业绩" align="left" />
-					<el-table-column prop="qk" label="欠款" align="left" />
-					<el-table-column label="储扣方式" prop="ckfs" align="left">
-							<template slot-scope="scope">{{ scope.row.ckfs | dynamicText(ckfsOptions) }}</template>
+					
+					<!-- 简介 -->
+					<el-table-column label="简介" width="120" align="center">
+						<template slot-scope="scope">
+							<div class="intro-info">
+								<i class="el-icon-document intro-icon"></i>
+								<span class="text-nowrap">{{ scope.row.jj || '无' }}</span>
+							</div>
+						</template>
 					</el-table-column>
-					<el-table-column prop="ckmx" label="储扣明细" align="left" />
-					<el-table-column label="付款方式" prop="fkfs" align="left">
-							<template slot-scope="scope">{{ scope.row.fkfs | dynamicText(fkfsOptions) }}</template>
+					
+					<!-- 备注 -->
+					<el-table-column label="备注" min-width="150" show-overflow-tooltip>
+						<template slot-scope="scope">
+							<div class="remark-info">
+								<i class="el-icon-document remark-icon"></i>
+								<span class="text-nowrap">{{ scope.row.bz || '无' }}</span>
+							</div>
+						</template>
 					</el-table-column>
-					<el-table-column label="付款医院" prop="fkyy" align="left">
-							<template slot-scope="scope">{{ scope.row.fkyy | dynamicText(fkyyOptions) }}</template>
+					
+					<!-- 健康师业绩 -->
+					<el-table-column label="健康师业绩" width="130" align="center">
+						<template slot-scope="scope">
+							<div class="jks-amount-info">
+								<i class="el-icon-medicine-box jks-amount-icon"></i>
+								<span class="text-nowrap">{{ scope.row.jksyj || '无' }}</span>
+							</div>
+						</template>
 					</el-table-column>
-					<el-table-column prop="fkpd" label="付款判断" align="left" />
-					<el-table-column label="客户来源" prop="khly" align="left">
-							<template slot-scope="scope">{{ scope.row.khly | dynamicText(khlyOptions) }}</template>
+					
+					<!-- 科技部老师业绩 -->
+					<el-table-column label="科技部老师业绩" width="150" align="center">
+						<template slot-scope="scope">
+							<div class="kjb-amount-info">
+								<i class="el-icon-cpu kjb-amount-icon"></i>
+								<span class="text-nowrap">{{ scope.row.kjblsyj || '无' }}</span>
+							</div>
+						</template>
 					</el-table-column>
-					<el-table-column prop="tjr" label="推荐人" align="left" />
-					<el-table-column label="是否首开订单" prop="sfskdd" align="left">
-							<template slot-scope="scope">{{ scope.row.sfskdd | dynamicText(sfskddOptions) }}</template>
+					
+					<!-- 品项信息 -->
+					<el-table-column label="品项信息" width="120" align="center">
+						<template slot-scope="scope">
+							<div class="product-info">
+								<i class="el-icon-goods product-icon"></i>
+								<span class="text-nowrap">{{ scope.row.pxxx || '无' }}</span>
+							</div>
+						</template>
 					</el-table-column>
-					<el-table-column prop="jj" label="简介" align="left" />
-					<el-table-column prop="bz" label="备注" align="left" />
-					<el-table-column prop="jksyj" label="健康师业绩" align="left" />
-					<el-table-column prop="kjblsyj" label="科技部老师业绩" align="left" />
-					<el-table-column prop="pxxx" 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 label="操作" width="160" align="left" fixed="right">
+						<template slot-scope="scope">
+							<div class="action-buttons">
+								<el-button 
+									type="text" 
+									icon="el-icon-edit" 
+									@click="addOrUpdateHandle(scope.row.id)"
+									class="edit-btn"
+								>
+									编辑
+								</el-button>
+								<el-button 
+									type="text" 
+									icon="el-icon-delete" 
+									@click="handleDel(scope.row.id)"
+									class="delete-btn"
+								>
+									删除
+								</el-button>
+							</div>
 						</template>
 					</el-table-column>
 				</NCC-table>
@@ -482,7 +710,427 @@
                     sidx: "",
                 }
                 this.initData()
+            },
+            // 格式化日期
+            formatDate(date) {
+                if (!date) return '无'
+                const d = new Date(date)
+                if (isNaN(d.getTime())) return '无'
+                return d.toLocaleDateString('zh-CN', {
+                    year: 'numeric',
+                    month: '2-digit',
+                    day: '2-digit'
+                })
             }
 		}
     }
-</script>
\ No newline at end of file
+</script>
+
+<style lang="scss" scoped>
+// 通用文本不换行样式
+.text-nowrap {
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  max-width: 100%;
+}
+
+// 开单编号样式
+.order-info {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  gap: 6px;
+  
+  .order-icon {
+    color: #409EFF;
+    font-size: 16px;
+  }
+  
+  span {
+    font-weight: 500;
+    color: #303133;
+  }
+}
+
+// 会员信息样式
+.member-info, .member-name {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  gap: 6px;
+  
+  .member-icon, .member-name-icon {
+    color: #67C23A;
+    font-size: 16px;
+  }
+  
+  span {
+    font-weight: 500;
+    color: #303133;
+  }
+}
+
+// 手机号样式
+.phone-info {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  gap: 6px;
+  
+  .phone-icon {
+    color: #409EFF;
+    font-size: 16px;
+  }
+  
+  span {
+    font-weight: 500;
+    color: #303133;
+  }
+}
+
+// 门店信息样式
+.store-info {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  gap: 6px;
+  
+  .store-icon {
+    color: #67C23A;
+    font-size: 16px;
+  }
+  
+  span {
+    font-weight: 500;
+    color: #303133;
+  }
+}
+
+// 金三角样式
+.jsj-info {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  gap: 6px;
+  
+  .jsj-icon {
+    color: #E6A23C;
+    font-size: 16px;
+  }
+  
+  span {
+    font-weight: 500;
+    color: #303133;
+  }
+}
+
+// 日期样式
+.date-info {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  gap: 6px;
+  
+  .date-icon {
+    color: #909399;
+    font-size: 16px;
+  }
+  
+  span {
+    font-weight: 500;
+    color: #303133;
+  }
+}
+
+// 金额相关样式
+.amount-info, .paid-amount-info, .jks-amount-info, .kjb-amount-info {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  gap: 6px;
+  
+  .amount-icon, .paid-amount-icon, .jks-amount-icon, .kjb-amount-icon {
+    color: #409EFF;
+    font-size: 16px;
+  }
+  
+  span {
+    font-weight: 600;
+    color: #409EFF;
+  }
+}
+
+// 欠款样式
+.debt-info {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  gap: 6px;
+  
+  .debt-icon {
+    color: #F56C6C;
+    font-size: 16px;
+  }
+  
+  span {
+    font-weight: 500;
+    color: #F56C6C;
+  }
+}
+
+// 付款方式样式
+.payment-info {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  gap: 6px;
+  
+  .payment-icon {
+    color: #67C23A;
+    font-size: 16px;
+  }
+  
+  span {
+    font-weight: 500;
+    color: #303133;
+  }
+}
+
+// 客户来源样式
+.source-info {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  gap: 6px;
+  
+  .source-icon {
+    color: #909399;
+    font-size: 16px;
+  }
+  
+  span {
+    font-weight: 500;
+    color: #303133;
+  }
+}
+
+// 推荐人样式
+.referrer-info {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  gap: 6px;
+  
+  .referrer-icon {
+    color: #67C23A;
+    font-size: 16px;
+  }
+  
+  span {
+    font-weight: 500;
+    color: #303133;
+  }
+}
+
+// 备注样式
+.remark-info {
+  display: flex;
+  align-items: center;
+  gap: 6px;
+  
+  .remark-icon {
+    color: #909399;
+    font-size: 14px;
+  }
+  
+  span {
+    color: #606266;
+  }
+}
+
+// 顾客类型样式
+.customer-type-info {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  gap: 6px;
+  
+  .customer-type-icon {
+    color: #67C23A;
+    font-size: 16px;
+  }
+  
+  span {
+    font-weight: 500;
+    color: #303133;
+  }
+}
+
+// 合作机构样式
+.cooperation-info {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  gap: 6px;
+  
+  .cooperation-icon {
+    color: #909399;
+    font-size: 16px;
+  }
+  
+  span {
+    font-weight: 500;
+    color: #303133;
+  }
+}
+
+// 储扣方式样式
+.storage-info {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  gap: 6px;
+  
+  .storage-icon {
+    color: #E6A23C;
+    font-size: 16px;
+  }
+  
+  span {
+    font-weight: 500;
+    color: #303133;
+  }
+}
+
+// 储扣明细样式
+.storage-detail-info {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  gap: 6px;
+  
+  .storage-detail-icon {
+    color: #909399;
+    font-size: 16px;
+  }
+  
+  span {
+    font-weight: 500;
+    color: #303133;
+  }
+}
+
+// 付款医院样式
+.hospital-info {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  gap: 6px;
+  
+  .hospital-icon {
+    color: #67C23A;
+    font-size: 16px;
+  }
+  
+  span {
+    font-weight: 500;
+    color: #303133;
+  }
+}
+
+// 付款判断样式
+.payment-judge-info {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  gap: 6px;
+  
+  .payment-judge-icon {
+    color: #409EFF;
+    font-size: 16px;
+  }
+  
+  span {
+    font-weight: 500;
+    color: #303133;
+  }
+}
+
+// 是否首开订单样式
+.first-order-info {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  gap: 6px;
+  
+  .first-order-icon {
+    color: #E6A23C;
+    font-size: 16px;
+  }
+  
+  span {
+    font-weight: 500;
+    color: #303133;
+  }
+}
+
+// 简介样式
+.intro-info {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  gap: 6px;
+  
+  .intro-icon {
+    color: #909399;
+    font-size: 16px;
+  }
+  
+  span {
+    font-weight: 500;
+    color: #303133;
+  }
+}
+
+// 品项信息样式
+.product-info {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  gap: 6px;
+  
+  .product-icon {
+    color: #67C23A;
+    font-size: 16px;
+  }
+  
+  span {
+    font-weight: 500;
+    color: #303133;
+  }
+}
+
+// 操作按钮样式
+.action-buttons {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  
+  .edit-btn {
+    color: #409EFF;
+    
+    &:hover {
+      color: #66b1ff;
+    }
+  }
+  
+  .delete-btn {
+    color: #F56C6C;
+    
+    &:hover {
+      color: #f78989;
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/antis-ncc-admin/src/views/lqYcsdMdmbsd/components/TargetSettingDialog.vue b/antis-ncc-admin/src/views/lqYcsdMdmbsd/components/TargetSettingDialog.vue
new file mode 100644
index 0000000..0cb9943
--- /dev/null
+++ b/antis-ncc-admin/src/views/lqYcsdMdmbsd/components/TargetSettingDialog.vue
@@ -0,0 +1,266 @@
+<template>
+	<el-dialog 
+		:title="dialogTitle" 
+		:visible.sync="dialogVisible" 
+		width="800px" 
+		:close-on-click-modal="false"
+		:before-close="handleClose"
+		class="target-dialog"
+	>
+		<div class="dialog-header">
+			<div class="store-info">
+				<i class="el-icon-office-building"></i>
+				<span class="store-name">{{ formData.dm }}</span>
+				<el-tag size="small" type="primary">{{ formData.mdbm }}</el-tag>
+			</div>
+		</div>
+		<el-form :model="formData" :rules="formRules" ref="form" label-width="120px" class="edit-form">
+			<el-row :gutter="20">
+				<el-col :span="12">
+					<el-form-item label="固定-生命线" prop="xsyj">
+						<el-input 
+							v-model="formData.xsyj" 
+							placeholder="请输入固定-生命线目标"
+							type="number"
+							step="0.01"
+						>
+							<template slot="append">元</template>
+						</el-input>
+					</el-form-item>
+				</el-col>
+				<el-col :span="12">
+					<el-form-item label="固定-消耗业绩" prop="xhyj">
+						<el-input 
+							v-model="formData.xhyj" 
+							placeholder="请输入固定-消耗业绩目标"
+							type="number"
+							step="0.01"
+						>
+							<template slot="append">元</template>
+						</el-input>
+					</el-form-item>
+				</el-col>
+			</el-row>
+			<el-row :gutter="20">
+				<el-col :span="12">
+					<el-form-item label="固定-项目数" prop="xms">
+						<el-input 
+							v-model="formData.xms" 
+							placeholder="请输入固定-项目数目标"
+							type="number"
+						>
+							<template slot="append">个</template>
+						</el-input>
+					</el-form-item>
+				</el-col>
+				<el-col :span="12">
+					<el-form-item label="固定-人头" prop="rc">
+						<el-input 
+							v-model="formData.rc" 
+							placeholder="请输入固定-人头目标"
+							type="number"
+						>
+							<template slot="append">次</template>
+						</el-input>
+					</el-form-item>
+				</el-col>
+			</el-row>
+			<el-row :gutter="20">
+				<el-col :span="12">
+					<el-form-item label="阶段一人头" prop="rt1">
+						<el-input 
+							v-model="formData.rt1" 
+							placeholder="请输入阶段一人头目标"
+							type="number"
+						>
+							<template slot="append">人</template>
+						</el-input>
+					</el-form-item>
+				</el-col>
+				<el-col :span="12">
+					<el-form-item label="阶段二人头" prop="rt2">
+						<el-input 
+							v-model="formData.rt2" 
+							placeholder="请输入阶段二人头目标"
+							type="number"
+						>
+							<template slot="append">人</template>
+						</el-input>
+					</el-form-item>
+				</el-col>
+			</el-row>
+		</el-form>
+		<div slot="footer" class="dialog-footer">
+			<el-button @click="handleClose" :disabled="saveLoading">取消</el-button>
+			<el-button type="primary" @click="saveData" :loading="saveLoading">
+				<i class="el-icon-check"></i> 保存
+			</el-button>
+		</div>
+	</el-dialog>
+</template>
+
+<script>
+import request from '@/utils/request'
+
+export default {
+	name: 'TargetSettingDialog',
+	props: {
+		visible: {
+			type: Boolean,
+			default: false
+		},
+		storeData: {
+			type: Object,
+			default: () => ({})
+		}
+	},
+	data() {
+		return {
+			dialogVisible: false,
+			saveLoading: false,
+			formData: {
+				id: '',
+				mdbm: '',
+				dm: '',
+				xsyj: '',
+				xhyj: '',
+				xms: '',
+				rc: '',
+				rt1: '',
+				rt2: ''
+			},
+			formRules: {
+				xsyj: [{ required: false, message: '请输入固定-生命线目标', trigger: 'blur' }],
+				xhyj: [{ required: false, message: '请输入固定-消耗业绩目标', trigger: 'blur' }],
+				xms: [{ required: false, message: '请输入固定-项目数目标', trigger: 'blur' }],
+				rc: [{ required: false, message: '请输入固定-人头目标', trigger: 'blur' }],
+				rt1: [{ required: false, message: '请输入阶段一人头目标', trigger: 'blur' }],
+				rt2: [{ required: false, message: '请输入阶段二人头目标', trigger: 'blur' }]
+			}
+		}
+	},
+	computed: {
+		dialogTitle() {
+			return '设置门店目标'
+		}
+	},
+	watch: {
+		visible: {
+			handler(newVal) {
+				this.dialogVisible = newVal
+				if (newVal && this.storeData.id) {
+					this.initForm()
+				}
+			},
+			immediate: true
+		},
+		dialogVisible(newVal) {
+			this.$emit('update:visible', newVal)
+		}
+	},
+	methods: {
+		// 初始化表单数据
+		initForm() {
+			this.formData = {
+				id: this.storeData.id || '',
+				mdbm: this.storeData.mdbm || '',
+				dm: this.storeData.dm || '',
+				xsyj: this.storeData.xsyj || '',
+				xhyj: this.storeData.xhyj || '',
+				xms: this.storeData.xms || '',
+				rc: this.storeData.rc || '',
+				rt1: this.storeData.rt1 || '',
+				rt2: this.storeData.rt2 || ''
+			}
+		},
+
+		// 保存数据
+		saveData() {
+			this.$refs.form.validate((valid) => {
+				if (valid) {
+					this.saveLoading = true
+					
+					// 准备目标字段更新数据
+					const updateData = {
+						xsyj: this.formData.xsyj ? parseFloat(this.formData.xsyj) : null,
+						xhyj: this.formData.xhyj ? parseFloat(this.formData.xhyj) : null,
+						xms: this.formData.xms ? parseInt(this.formData.xms) : null,
+						rc: this.formData.rc ? parseInt(this.formData.rc) : null,
+						rt1: this.formData.rt1 ? parseInt(this.formData.rt1) : null,
+						rt2: this.formData.rt2 ? parseInt(this.formData.rt2) : null
+					}
+					
+					// 调用专门的目标更新接口
+					request({
+						url: `/api/Extend/LqMdxx/${this.formData.id}/targets`,
+						method: 'PUT',
+						data: updateData
+					}).then(res => {
+						this.$message.success('保存成功')
+						this.handleClose()
+						this.$emit('refresh')
+					}).catch(() => {
+						this.$message.error('保存失败')
+					}).finally(() => {
+						this.saveLoading = false
+					})
+				}
+			})
+		},
+
+		// 关闭弹窗
+		handleClose() {
+			if (this.saveLoading) {
+				this.$message.warning('正在保存中，请稍候...')
+				return
+			}
+			this.dialogVisible = false
+			this.$refs.form && this.$refs.form.resetFields()
+		}
+	}
+}
+</script>
+
+<style lang="scss" scoped>
+// 弹窗样式
+.target-dialog {
+	.dialog-header {
+		padding: 16px 0;
+		border-bottom: 1px solid #EBEEF5;
+		margin-bottom: 20px;
+
+		.store-info {
+			display: flex;
+			align-items: center;
+			gap: 12px;
+
+			i {
+				font-size: 20px;
+				color: #409EFF;
+			}
+
+			.store-name {
+				font-size: 16px;
+				font-weight: 600;
+				color: #303133;
+			}
+		}
+	}
+
+	.edit-form {
+		.el-form-item {
+			margin-bottom: 20px;
+		}
+	}
+}
+
+// 响应式设计
+@media (max-width: 768px) {
+	.target-dialog {
+		.el-dialog {
+			width: 95% !important;
+			margin: 0 auto;
+		}
+	}
+}
+</style>
diff --git a/antis-ncc-admin/src/views/lqYcsdMdmbsd/index.vue b/antis-ncc-admin/src/views/lqYcsdMdmbsd/index.vue
index a50ec28..e3e4db1 100644
--- a/antis-ncc-admin/src/views/lqYcsdMdmbsd/index.vue
+++ b/antis-ncc-admin/src/views/lqYcsdMdmbsd/index.vue
@@ -1,66 +1,70 @@
 <template>
 	<div class="NCC-common-layout">
 		<div class="NCC-common-layout-center">
+			<!-- 搜索区域 -->
 			<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-col :span="5">
+						<el-form-item label="门店编码">
+							<el-input 
+								v-model="query.mdbm" 
+								placeholder="请输入门店编码" 
+								clearable 
+								prefix-icon="el-icon-search"
+								style="border-radius: 6px;" 
+							/>	
 						</el-form-item>
 					</el-col>
-					<el-col :span="6">
-						<el-form-item label="销售业绩">
-							<el-input v-model="query.xsyj" placeholder="销售业绩" clearable />	
+					<el-col :span="5">
+						<el-form-item label="门店名称">
+							<el-input 
+								v-model="query.dm" 
+								placeholder="请输入门店名称" 
+								clearable 
+								prefix-icon="el-icon-search"
+								style="border-radius: 6px;" 
+							/>	
 						</el-form-item>
 					</el-col>
-					<el-col :span="6">
-						<el-form-item label="消耗业绩">
-							<el-input v-model="query.xhyj" placeholder="消耗业绩" clearable />	
+					<el-col :span="5">
+						<el-form-item label="单据门店">
+							<el-input 
+								v-model="query.djmd" 
+								placeholder="请输入单据门店" 
+								clearable 
+								prefix-icon="el-icon-search"
+								style="border-radius: 6px;" 
+							/>	
 						</el-form-item>
 					</el-col>
-					<template v-if="showAll">
-					<el-col :span="6">
-						<el-form-item label="项目数">
-							<el-input v-model="query.xms" placeholder="项目数" clearable />	
+					<el-col :span="5">
+						<el-form-item label="城市">
+							<el-input 
+								v-model="query.cs" 
+								placeholder="请输入城市" 
+								clearable 
+								prefix-icon="el-icon-search"
+								style="border-radius: 6px;" 
+							/>	
 						</el-form-item>
 					</el-col>
-					<el-col :span="6">
-						<el-form-item label="人头">
-							<el-input v-model="query.rt" placeholder="人头" clearable />	
-						</el-form-item>
-					</el-col>
-					<el-col :span="6">
-						<el-form-item label="人次">
-							<el-input v-model="query.rc" placeholder="人次" clearable />	
-						</el-form-item>
-					</el-col>
-					<el-col :span="6">
-						<el-form-item label="目标分类">
-							<el-input v-model="query.mbfl" placeholder="目标分类" clearable />	
-						</el-form-item>
-					</el-col>
-					<el-col :span="6">
-						<el-form-item label="具体对应">
-							<el-input v-model="query.jtdy" placeholder="具体对应" clearable />	
-						</el-form-item>
-					</el-col>
-					</template>
-					<el-col :span="6">
+					<el-col :span="4">
 						<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>
+							<div class="search-buttons" style="height: 32px;">
+								<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>
 			</el-row>
 			<div class="NCC-common-layout-main NCC-flex-main">
 				<div class="NCC-common-head">
-					<div>
-						<el-button type="primary" icon="el-icon-plus" @click="addOrUpdateHandle()">新增</el-button>
-						<el-button type="text" icon="el-icon-download" @click="exportData()">导出</el-button>
-						<el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除</el-button>
+					<div class="NCC-common-head-left">
+						<h3 class="NCC-common-head-title">
+							<i class="el-icon-target"></i>
+							门店目标设置
+						</h3>
 					</div>
 					<div class="NCC-common-head-right">
 						<el-tooltip effect="dark" content="刷新" placement="top">
@@ -69,71 +73,120 @@
 						<screenfull isContainer />
 					</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="xsyj" label="销售业绩" align="left" />
-					<el-table-column prop="xhyj" label="消耗业绩" align="left" />
-					<el-table-column prop="xms" label="项目数" align="left" />
-					<el-table-column prop="rt" label="人头" align="left" />
-					<el-table-column prop="rc" label="人次" align="left" />
-					<el-table-column prop="mbfl" label="目标分类" align="left" />
-					<el-table-column prop="jtdy" 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>
+                <NCC-table 
+					v-loading="listLoading" 
+					:data="list"
+				>
+					<el-table-column prop="mdbm" label="门店编码" align="left" width="120" show-overflow-tooltip>
+						<template slot-scope="scope">
+							<el-tag size="small" type="primary">{{ scope.row.mdbm }}</el-tag>
+						</template>
+					</el-table-column>
+					<el-table-column prop="dm" label="门店名称" align="left" min-width="150" show-overflow-tooltip>
+						<template slot-scope="scope">
+							<span class="store-name">{{ scope.row.dm }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column prop="djmd" label="单据门店" align="left" width="150" show-overflow-tooltip />
+					<el-table-column prop="cs" label="城市" align="left" width="100" show-overflow-tooltip />
+					
+					<!-- 目标字段列 -->
+					<el-table-column label="固定-生命线" align="center" width="120">
+						<template slot-scope="scope">
+							<span v-if="scope.row.xsyj" class="target-value">{{ formatMoney(scope.row.xsyj) }}元</span>
+							<span v-else class="no-data">未设置</span>
+						</template>
+					</el-table-column>
+					
+					<el-table-column label="固定-消耗业绩" align="center" width="120">
+						<template slot-scope="scope">
+							<span v-if="scope.row.xhyj" class="target-value">{{ formatMoney(scope.row.xhyj) }}元</span>
+							<span v-else class="no-data">未设置</span>
+						</template>
+					</el-table-column>
+					
+					<el-table-column label="固定-项目数" align="center" width="100">
+						<template slot-scope="scope">
+							<span v-if="scope.row.xms" class="target-value">{{ scope.row.xms }}个</span>
+							<span v-else class="no-data">-</span>
+						</template>
+					</el-table-column>
+
+                    <el-table-column label="固定-人头" align="center" width="100">
+						<template slot-scope="scope">
+							<span v-if="scope.row.rc" class="target-value">{{ scope.row.rc }}次</span>
+							<span v-else class="no-data">-</span>
+						</template>
+					</el-table-column>
+					
+					<el-table-column label="阶段一人头" align="center" width="100">
+						<template slot-scope="scope">
+							<span v-if="scope.row.rt1" class="target-value">{{ scope.row.rt1 }}人</span>
+							<span v-else class="no-data">-</span>
+						</template>
+					</el-table-column>
+					
+					<el-table-column label="阶段二人头" align="center" width="100">
+						<template slot-scope="scope">
+							<span v-if="scope.row.rt2" class="target-value">{{ scope.row.rt2 }}人</span>
+							<span v-else class="no-data">-</span>
+						</template>
+					</el-table-column>
+					
+
+					
+					<el-table-column label="操作" fixed="right" width="120" align="center">
+						<template slot-scope="scope">
+							<el-button 
+								type="text" 
+								icon="el-icon-edit" 
+								@click="editHandle(scope.row)"
+								class="action-btn"
+							>
+								设置目标
+							</el-button>
 						</template>
 					</el-table-column>
 				</NCC-table>
                 <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize" @pagination="initData" />
             </div>
         </div>
-		<NCC-Form v-if="formVisible" ref="NCCForm" @refresh="refresh" />
-		<ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
+		<!-- 目标设置弹窗 -->
+		<TargetSettingDialog 
+			:visible.sync="dialogVisible" 
+			:store-data="currentStoreData"
+			@refresh="initData"
+		/>
+
 	</div>
 </template>
 <script>
     import request from '@/utils/request'
-    import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
-    import NCCForm from './Form'
-    import ExportBox from './ExportBox'
-    import { previewDataInterface } from '@/api/systemData/dataInterface'
+    import TargetSettingDialog from './components/TargetSettingDialog.vue'
+    
 	export default {
-        components: { NCCForm, ExportBox },
+        components: {
+            TargetSettingDialog
+        },
         data() {
             return {
-                showAll: false,
 				query: {
-                    id:undefined,
-                    xsyj:undefined,
-                    xhyj:undefined,
-                    xms:undefined,
-                    rt:undefined,
-                    rc:undefined,
-                    mbfl:undefined,
-                    jtdy:undefined,
+                    mdbm: undefined,
+                    dm: undefined,
+                    djmd: undefined,
+                    cs: undefined
 				},
                 list: [],
                 listLoading: true,
-                multipleSelection: [], total: 0,
+                total: 0,
                 listQuery: {
                     currentPage: 1,
                     pageSize: 20,
 					sort: "desc",
                     sidx: "",
                 },
-                formVisible: false,
-                exportBoxVisible: false,
-                columnList: [
-                    { prop: 'id', label: '目标编号' },
-                    { prop: 'xsyj', label: '销售业绩' },
-                    { prop: 'xhyj', label: '消耗业绩' },
-                    { prop: 'xms', label: '项目数' },
-                    { prop: 'rt', label: '人头' },
-                    { prop: 'rc', label: '人次' },
-                    { prop: 'mbfl', label: '目标分类' },
-                    { prop: 'jtdy', label: '具体对应' },
-				],
+                dialogVisible: false,
+                currentStoreData: {}
 			}
         },
 		computed: {},
@@ -141,7 +194,19 @@
 			this.initData()
 		},
 		methods: {
-			initData() {
+			// 格式化金额显示
+			formatMoney(value) {
+				if (!value) return '0.00'
+				return parseFloat(value).toFixed(2)
+			},
+
+			// 编辑处理
+			editHandle(row) {
+				this.currentStoreData = { ...row }
+				this.dialogVisible = true
+			},
+
+			async initData() {
                 this.listLoading = true;
                 let _query = {
                     ...this.listQuery,
@@ -155,92 +220,24 @@
                         query[key] = _query[key]
                     }
                 }
-                request({
-                    url: `/api/Extend/LqYcsdMdmbsd`,
-                    method: 'GET',
-                    data: query
-                }).then(res => {
+                
+                try {
+                    const res = await request({
+                        url: `/api/Extend/LqMdxx`,
+                        method: 'GET',
+                        data: query
+                    })
+                    
                     this.list = res.data.list
                     this.total = res.data.pagination.total
+                    
+                } catch (error) {
+                    console.error('加载门店数据失败:', error)
+                } finally {
                     this.listLoading = false
-                })
-            },
-			handleDel(id) {
-                this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
-                    type: 'warning'
-                }).then(() => {
-                    request({
-                        url: `/api/Extend/LqYcsdMdmbsd/${id}`,
-                        method: 'DELETE'
-                    }).then(res => {
-                        this.$message({
-                            type: 'success',
-                            message: res.msg,
-                            onClose: () => {
-                                this.initData()
-                            }
-                        });
-                    })
-                }).catch(() => {
-                });
-            },
-			handleSelectionChange(val) {
-                const res = val.map(item => item.id)
-                this.multipleSelection = res
-            },
-            handleBatchRemoveDel() {
-                if (!this.multipleSelection.length) {
-                    this.$message({
-                        type: 'error',
-                        message: '请选择一条数据',
-                        duration: 1500,
-                    })
-                    return
                 }
-                const ids = this.multipleSelection
-                this.$confirm('您确定要删除这些数据吗, 是否继续？', '提示', {
-                    type: 'warning'
-                }).then(() => {
-                    request({
-                        url: `/api/Extend/LqYcsdMdmbsd/batchRemove`,
-                        method: 'POST',
-                        data: ids ,
-                    }).then(res => {
-                        this.$message({
-                            type: 'success',
-                            message: res.msg,
-                            onClose: () => {
-                                this.initData()
-                            }
-                        });
-                    })
-                }).catch(() => { })
-            },
-			addOrUpdateHandle(id, isDetail) {
-                this.formVisible = true
-                this.$nextTick(() => {
-                    this.$refs.NCCForm.init(id, isDetail)
-                })
-            },
-			exportData() {
-                this.exportBoxVisible = true
-                this.$nextTick(() => {
-                    this.$refs.ExportBox.init(this.columnList)
-                })
-            },
-            download(data) {
-                let query = { ...data, ...this.listQuery, ...this.query }
-                request({
-                    url: `/api/Extend/LqYcsdMdmbsd/Actions/Export`,
-                    method: 'GET',
-                    data: query
-                }).then(res => {
-                    if (!res.data.url) return
-                    window.location.href = this.define.comUrl + res.data.url
-                    this.$refs.ExportBox.visible = false
-                    this.exportBoxVisible = false
-                })
             },
+
 			search() {
                 this.listQuery = {
                     currentPage: 1,
@@ -250,10 +247,6 @@
                 }
                 this.initData()
             },
-            refresh(isrRefresh) {
-                this.formVisible = false
-                if (isrRefresh) this.reset()
-            },
             reset() {
                 for (let key in this.query) {
                     this.query[key] = undefined
@@ -267,5 +260,90 @@
                 this.initData()
             }
 		}
-    }
-</script>
\ No newline at end of file
+	}
+</script>
+
+<style lang="scss" scoped>
+	// 页面头部样式
+	.NCC-common-head-left {
+		display: flex;
+		align-items: center;
+		gap: 12px;
+	}
+
+	.NCC-common-head-title {
+		margin: 0;
+		font-size: 18px;
+		font-weight: 600;
+		color: #303133;
+		display: flex;
+		align-items: center;
+		gap: 8px;
+
+		i {
+			color: #409EFF;
+			font-size: 20px;
+		}
+	}
+
+	// 表格样式
+	.store-name {
+		font-weight: 500;
+		color: #303133;
+	}
+
+	.target-value {
+		font-weight: 500;
+		color: #67C23A;
+	}
+
+	.no-data {
+		color: #C0C4CC;
+		font-style: italic;
+	}
+
+	.action-btn {
+		padding: 4px 8px;
+		margin: 0 2px;
+		
+		&:hover {
+			background-color: #f5f7fa;
+		}
+	}
+
+
+	// 搜索区域样式
+	.search-buttons {
+		display: flex;
+		align-items: center;
+		gap: 8px;
+	}
+
+	// 响应式设计
+	@media (max-width: 768px) {
+		.NCC-common-head {
+			flex-direction: column;
+			align-items: flex-start;
+			gap: 12px;
+
+			.NCC-common-head-right {
+				width: 100%;
+				justify-content: flex-start;
+			}
+		}
+
+		.el-col {
+			margin-bottom: 16px;
+		}
+
+	}
+
+	// 表格响应式
+	@media (max-width: 1200px) {
+		.NCC-table {
+			.el-table {
+				font-size: 12px;
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/antis-ncc-admin/src/views/lqZjlMdsmxsz/components/BatchCreateDialog.vue b/antis-ncc-admin/src/views/lqZjlMdsmxsz/components/BatchCreateDialog.vue
index 957d4d4..c0c006a 100644
--- a/antis-ncc-admin/src/views/lqZjlMdsmxsz/components/BatchCreateDialog.vue
+++ b/antis-ncc-admin/src/views/lqZjlMdsmxsz/components/BatchCreateDialog.vue
@@ -19,12 +19,15 @@
               style="width: 300px"
               @change="handleUserChange"
             >
-              <el-option
-                v-for="user in userList"
-                :key="user.id"
-                :label="user.realName"
-                :value="user.id"
-              />
+            <el-option
+              v-for="user in userList"
+              :key="user.id"
+              :label="`${user.realName} (${user.gw || '无岗位'})`"
+              :value="user.id"
+            >
+              <span style="float: left">{{ user.realName }}</span>
+              <span style="float: right; color: #8492a6; font-size: 13px">{{ user.gw || '无岗位' }}</span>
+            </el-option>
             </el-select>
           </el-form-item>
         </el-form>
@@ -53,7 +56,7 @@
                   min="0.01"
                   size="small"
                 >
-                  <template slot="prepend">¥</template>
+                <template slot="append">元</template>
                 </el-input>
                 <el-input 
                   v-model="scope.row.tcbl1" 
@@ -82,7 +85,7 @@
                   min="0.01"
                   size="small"
                 >
-                  <template slot="prepend">¥</template>
+                  <template slot="append">元</template>
                 </el-input>
                 <el-input 
                   v-model="scope.row.tcbl2" 
@@ -111,7 +114,7 @@
                   min="0.01"
                   size="small"
                 >
-                  <template slot="prepend">¥</template>
+                <template slot="append">元</template>
                 </el-input>
                 <el-input 
                   v-model="scope.row.tcbl3" 
@@ -143,7 +146,7 @@
 
       <!-- 无门店提示 -->
       <div class="form-section" v-if="formData.zjlUserid && managedStores.length === 0">
-        <el-empty description="该总经理暂无管理的门店" />
+        <el-empty description="该经理暂无管理的门店" />
       </div>
     </div>
 
diff --git a/antis-ncc-admin/src/views/lqZjlMdsmxsz/components/EditDialog.vue b/antis-ncc-admin/src/views/lqZjlMdsmxsz/components/EditDialog.vue
index 2d5b3ab..d491ab3 100644
--- a/antis-ncc-admin/src/views/lqZjlMdsmxsz/components/EditDialog.vue
+++ b/antis-ncc-admin/src/views/lqZjlMdsmxsz/components/EditDialog.vue
@@ -2,169 +2,157 @@
   <el-dialog
     title="编辑生命线设置"
     :visible.sync="dialogVisible"
-    width="800px"
+    width="1200px"
     :close-on-click-modal="false"
     @close="handleClose"
   >
-    <el-form 
-      ref="form" 
-      :model="formData" 
-      :rules="rules" 
-      label-width="120px"
-      class="edit-form"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="总经理" prop="zjlUserid">
+    <div class="dialog-content">
+      <!-- 总经理选择 -->
+      <div class="form-section">
+        <h3>选择总经理</h3>
+        <el-form :model="formData" label-width="100px">
+          <el-form-item label="总经理" required>
             <el-select 
               v-model="formData.zjlUserid" 
               placeholder="请选择总经理"
               filterable
-              style="width: 100%"
+              style="width: 300px"
               disabled
             >
-              <el-option
-                v-for="user in userList"
-                :key="user.id"
-                :label="user.realName"
-                :value="user.id"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        
-        <el-col :span="12">
-          <el-form-item label="门店" prop="mdId">
-            <el-select 
-              v-model="formData.mdId" 
-              placeholder="请选择门店"
-              filterable
-              style="width: 100%"
-              disabled
+            <el-option
+              v-for="user in userList"
+              :key="user.id"
+              :label="`${user.realName} (${user.gw || '无岗位'})`"
+              :value="user.id"
             >
-              <el-option
-                v-for="store in storeList"
-                :key="store.Id"
-                :label="store.Dm"
-                :value="store.Id"
-              />
+              <span style="float: left">{{ user.realName }}</span>
+              <span style="float: right; color: #8492a6; font-size: 13px">{{ user.gw || '无岗位' }}</span>
+            </el-option>
             </el-select>
           </el-form-item>
-        </el-col>
-      </el-row>
+        </el-form>
+      </div>
 
-      <!-- 生命线设置 -->
-      <div class="life-lines-section">
-        <h4>生命线设置</h4>
-        
-        <el-row :gutter="20">
+      <!-- 门店生命线设置表格 -->
+      <div class="form-section" v-if="formData.zjlUserid && managedStores.length > 0">
+        <h3>门店生命线设置</h3>
+        <el-table 
+          :data="managedStores" 
+          border 
+          stripe
+          style="width: 100%"
+        >
+          <el-table-column label="门店名称" width="200" align="center">
+            <template slot-scope="scope">
+              {{ getStoreName(scope.row.Id) }}
+            </template>
+          </el-table-column>
+          
           <!-- 生命线1 -->
-          <el-col :span="8">
-            <div class="life-line-group">
-              <label class="life-line-label">生命线1 <span class="required">*</span></label>
+          <el-table-column label="生命线1" align="center" width="200">
+            <template slot-scope="scope">
               <div class="life-line-inputs">
-                <el-form-item prop="smx1">
-                  <el-input 
-                    v-model="formData.smx1" 
-                    placeholder="金额"
-                    type="number"
-                    step="0.01"
-                    min="0.01"
-                  >
-                    <template slot="prepend">¥</template>
-                  </el-input>
-                </el-form-item>
-                <el-form-item prop="tcbl1">
-                  <el-input 
-                    v-model="formData.tcbl1" 
-                    placeholder="提成比例"
-                    type="number"
-                    step="0.01"
-                    min="0"
-                    max="100"
-                  >
-                    <template slot="append">%</template>
-                  </el-input>
-                </el-form-item>
+                <el-input 
+                  v-model="scope.row.smx1" 
+                  placeholder="金额"
+                  type="number"
+                  step="0.01"
+                  min="0.01"
+                  size="small"
+                >
+                <template slot="append">元</template>
+                </el-input>
+                <el-input 
+                  v-model="scope.row.tcbl1" 
+                  placeholder="提成比例"
+                  type="number"
+                  step="0.01"
+                  min="0"
+                  max="100"
+                  size="small"
+                >
+                  <template slot="append">%</template>
+                </el-input>
               </div>
-            </div>
-          </el-col>
+            </template>
+          </el-table-column>
 
           <!-- 生命线2 -->
-          <el-col :span="8">
-            <div class="life-line-group">
-              <label class="life-line-label">生命线2</label>
+          <el-table-column label="生命线2" align="center" width="200">
+            <template slot-scope="scope">
               <div class="life-line-inputs">
-                <el-form-item prop="smx2">
-                  <el-input 
-                    v-model="formData.smx2" 
-                    placeholder="金额"
-                    type="number"
-                    step="0.01"
-                    min="0.01"
-                  >
-                    <template slot="prepend">¥</template>
-                  </el-input>
-                </el-form-item>
-                <el-form-item prop="tcbl2">
-                  <el-input 
-                    v-model="formData.tcbl2" 
-                    placeholder="提成比例"
-                    type="number"
-                    step="0.01"
-                    min="0"
-                    max="100"
-                  >
-                    <template slot="append">%</template>
-                  </el-input>
-                </el-form-item>
+                <el-input 
+                  v-model="scope.row.smx2" 
+                  placeholder="金额"
+                  type="number"
+                  step="0.01"
+                  min="0.01"
+                  size="small"
+                >
+                  <template slot="append">元</template>
+                </el-input>
+                <el-input 
+                  v-model="scope.row.tcbl2" 
+                  placeholder="提成比例"
+                  type="number"
+                  step="0.01"
+                  min="0"
+                  max="100"
+                  size="small"
+                >
+                  <template slot="append">%</template>
+                </el-input>
               </div>
-            </div>
-          </el-col>
+            </template>
+          </el-table-column>
 
           <!-- 生命线3 -->
-          <el-col :span="8">
-            <div class="life-line-group">
-              <label class="life-line-label">生命线3</label>
+          <el-table-column label="生命线3" align="center" width="200">
+            <template slot-scope="scope">
               <div class="life-line-inputs">
-                <el-form-item prop="smx3">
-                  <el-input 
-                    v-model="formData.smx3" 
-                    placeholder="金额"
-                    type="number"
-                    step="0.01"
-                    min="0.01"
-                  >
-                    <template slot="prepend">¥</template>
-                  </el-input>
-                </el-form-item>
-                <el-form-item prop="tcbl3">
-                  <el-input 
-                    v-model="formData.tcbl3" 
-                    placeholder="提成比例"
-                    type="number"
-                    step="0.01"
-                    min="0"
-                    max="100"
-                  >
-                    <template slot="append">%</template>
-                  </el-input>
-                </el-form-item>
+                <el-input 
+                  v-model="scope.row.smx3" 
+                  placeholder="金额"
+                  type="number"
+                  step="0.01"
+                  min="0.01"
+                  size="small"
+                >
+                <template slot="append">元</template>
+                </el-input>
+                <el-input 
+                  v-model="scope.row.tcbl3" 
+                  placeholder="提成比例"
+                  type="number"
+                  step="0.01"
+                  min="0"
+                  max="100"
+                  size="small"
+                >
+                  <template slot="append">%</template>
+                </el-input>
               </div>
-            </div>
-          </el-col>
-        </el-row>
+            </template>
+          </el-table-column>
+
+          <!-- 备注 -->
+          <el-table-column label="备注" align="center" min-width="150">
+            <template slot-scope="scope">
+              <el-input 
+                v-model="scope.row.bz" 
+                placeholder="请输入备注"
+                size="small"
+              />
+            </template>
+          </el-table-column>
+        </el-table>
       </div>
 
-      <el-form-item label="备注" prop="bz">
-        <el-input 
-          v-model="formData.bz" 
-          type="textarea"
-          :rows="3"
-          placeholder="请输入备注信息"
-        />
-      </el-form-item>
-    </el-form>
+      <!-- 无门店提示 -->
+      <div class="form-section" v-if="formData.zjlUserid && managedStores.length === 0">
+        <el-empty description="该经理暂无管理的门店" />
+      </div>
+    </div>
 
     <div slot="footer" class="dialog-footer">
       <el-button @click="handleClose">取消</el-button>
@@ -172,6 +160,7 @@
         type="primary" 
         @click="handleSubmit"
         :loading="loading"
+        :disabled="!canSubmit"
       >
         确定
       </el-button>
@@ -206,83 +195,136 @@ export default {
     return {
       loading: false,
       dialogVisible: false,
-      rules: {
-        smx1: [
-          { required: true, message: '请输入生命线1金额', trigger: 'blur' },
-          { type: 'number', min: 0.01, message: '生命线1金额必须大于0', trigger: 'blur' }
-        ],
-        tcbl1: [
-          { required: true, message: '请输入生命线1提成比例', trigger: 'blur' },
-          { type: 'number', min: 0, max: 100, message: '提成比例必须在0-100之间', trigger: 'blur' }
-        ],
-        smx2: [
-          { type: 'number', min: 0.01, message: '生命线2金额必须大于0', trigger: 'blur' }
-        ],
-        tcbl2: [
-          { type: 'number', min: 0, max: 100, message: '提成比例必须在0-100之间', trigger: 'blur' }
-        ],
-        smx3: [
-          { type: 'number', min: 0.01, message: '生命线3金额必须大于0', trigger: 'blur' }
-        ],
-        tcbl3: [
-          { type: 'number', min: 0, max: 100, message: '提成比例必须在0-100之间', trigger: 'blur' }
-        ]
-      }
+      localFormData: {
+        zjlUserid: '',
+        mdId: ''
+      },
+      managedStores: []
+    }
+  },
+  computed: {
+    formData() {
+      return this.localFormData
+    },
+    canSubmit() {
+      return this.formData.zjlUserid && 
+             this.managedStores.length > 0 &&
+             this.managedStores.every(store => this.validateStore(store))
     }
   },
   watch: {
     visible(val) {
       this.dialogVisible = val
-      if (val && this.formData) {
-        this.initFormData()
+      if (val && this.$props.formData) {
+        this.$nextTick(() => {
+          this.initFormData()
+        })
       }
+    },
+    storeList: {
+      handler() {
+        // 当门店列表更新时，强制重新渲染
+        this.$forceUpdate()
+      },
+      deep: true
     }
   },
   methods: {
     // 初始化表单数据
     initFormData() {
-      this.formData = {
-        id: this.formData.id || '',
-        zjlUserid: this.formData.zjlUserid || '',
-        mdId: this.formData.mdId || '',
-        smx1: this.formData.smx1 || '',
-        tcbl1: this.formData.tcbl1 || '',
-        smx2: this.formData.smx2 || '',
-        tcbl2: this.formData.tcbl2 || '',
-        smx3: this.formData.smx3 || '',
-        tcbl3: this.formData.tcbl3 || '',
-        bz: this.formData.bz || ''
+      const propsData = this.$props.formData || {}
+      console.log('原始数据:', propsData)
+      
+      this.localFormData = {
+        zjlUserid: propsData.ZjlUserid || propsData.zjlUserid || '',
+        mdId: propsData.MdId || propsData.mdId || ''
+      }
+      
+      // 构建门店数据
+      this.managedStores = [{
+        Id: propsData.MdId || propsData.mdId || '',
+        smx1: propsData.Smx1 || propsData.smx1 || '',
+        tcbl1: propsData.Tcbl1 || propsData.tcbl1 || '',
+        smx2: propsData.Smx2 || propsData.smx2 || '',
+        tcbl2: propsData.Tcbl2 || propsData.tcbl2 || '',
+        smx3: propsData.Smx3 || propsData.smx3 || '',
+        tcbl3: propsData.Tcbl3 || propsData.tcbl3 || '',
+        bz: propsData.Bz || propsData.bz || ''
+      }]
+      
+      console.log('初始化表单数据:', this.localFormData)
+      console.log('门店数据:', this.managedStores)
+    },
+
+    // 获取门店名称
+    getStoreName(mdId) {
+      console.log('查找门店ID:', mdId)
+      console.log('门店列表长度:', this.storeList.length)
+      console.log('门店列表前3条:', this.storeList.slice(0, 3))
+      
+      const store = this.storeList.find(s => s.id === mdId)
+      console.log('找到的门店:', store)
+      
+      if (store) {
+        console.log('门店名称字段:', store.dm)
+        return store.dm || mdId
+      }
+      
+      return mdId
+    },
+
+    // 验证单个门店
+    validateStore(store) {
+      // 生命线1是必填的
+      if (store.smx1 && store.tcbl1) {
+        return Number(store.smx1) > 0 && 
+               Number(store.tcbl1) >= 0 && 
+               Number(store.tcbl1) <= 100
       }
+      // 如果生命线1为空，则其他生命线也必须为空
+      return !store.smx2 && !store.tcbl2 && !store.smx3 && !store.tcbl3
     },
 
     // 提交
     async handleSubmit() {
+      if (!this.canSubmit) {
+        this.$message.warning('请完善必填信息')
+        return
+      }
+
+      // 验证数据
+      for (let i = 0; i < this.managedStores.length; i++) {
+        const store = this.managedStores[i]
+        if (!this.validateStore(store)) {
+          this.$message.warning(`门店 ${store.Dm} 设置信息不完整`)
+          return
+        }
+      }
+
+      this.loading = true
       try {
-        await this.$refs.form.validate()
-        
-        this.loading = true
-        
-        // 准备提交数据
         const submitData = {
-          id: this.formData.id,
-          smx1: Number(this.formData.smx1),
-          tcbl1: Number(this.formData.tcbl1),
-          smx2: this.formData.smx2 ? Number(this.formData.smx2) : null,
-          tcbl2: this.formData.tcbl2 ? Number(this.formData.tcbl2) : null,
-          smx3: this.formData.smx3 ? Number(this.formData.smx3) : null,
-          tcbl3: this.formData.tcbl3 ? Number(this.formData.tcbl3) : null,
-          bz: this.formData.bz || ''
+          Smx1: this.managedStores[0].smx1 ? Number(this.managedStores[0].smx1) : 0,
+          Tcbl1: this.managedStores[0].tcbl1 ? Number(this.managedStores[0].tcbl1) : 0,
+          Smx2: this.managedStores[0].smx2 ? Number(this.managedStores[0].smx2) : null,
+          Tcbl2: this.managedStores[0].tcbl2 ? Number(this.managedStores[0].tcbl2) : null,
+          Smx3: this.managedStores[0].smx3 ? Number(this.managedStores[0].smx3) : null,
+          Tcbl3: this.managedStores[0].tcbl3 ? Number(this.managedStores[0].tcbl3) : null,
+          Bz: this.managedStores[0].bz || ''
         }
 
-        // TODO: 调用更新接口
-        // await lqZjlMdsmxszApi.update(submitData)
+        // 调用更新接口
+        const recordId = this.$props.formData.Id || this.$props.formData.id
+        console.log('更新记录ID:', recordId)
+        console.log('更新数据:', submitData)
+        await lqZjlMdsmxszApi.update(recordId, submitData)
         
         this.$message.success('编辑成功')
         this.$emit('success')
         this.handleClose()
       } catch (error) {
         console.error('编辑失败:', error)
-        this.$message.error('编辑失败')
+        this.$message.error(error.message || '编辑失败')
       } finally {
         this.loading = false
       }
@@ -292,48 +334,44 @@ export default {
     handleClose() {
       this.dialogVisible = false
       this.$emit('close')
-      this.$refs.form && this.$refs.form.resetFields()
     }
   }
 }
 </script>
 
 <style lang="scss" scoped>
-.edit-form {
-  .life-lines-section {
-    margin: 20px 0;
-    padding: 20px;
-    background: #FAFAFA;
-    border-radius: 8px;
+.dialog-content {
+  max-height: 70vh;
+  overflow-y: auto;
+}
 
-    h4 {
-      margin: 0 0 20px 0;
-      color: #303133;
-      font-size: 16px;
-      font-weight: 600;
-      border-bottom: 2px solid #409EFF;
-      padding-bottom: 8px;
-    }
+.form-section {
+  margin-bottom: 30px;
 
-    .life-line-group {
-      .life-line-label {
-        display: block;
-        margin-bottom: 8px;
-        color: #606266;
-        font-size: 14px;
-        font-weight: 500;
+  h3 {
+    margin: 0 0 20px 0;
+    color: #303133;
+    font-size: 16px;
+    font-weight: 600;
+    border-bottom: 2px solid #409EFF;
+    padding-bottom: 8px;
+  }
+}
 
-        .required {
-          color: #F56C6C;
-        }
-      }
+.section-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  margin-bottom: 20px;
+}
 
-      .life-line-inputs {
-        .el-form-item {
-          margin-bottom: 12px;
-        }
-      }
-    }
+.life-line-inputs {
+  display: flex;
+  flex-direction: column;
+  gap: 8px;
+
+  .el-input {
+    width: 100%;
   }
 }
 
@@ -342,4 +380,4 @@ export default {
   padding-top: 20px;
   border-top: 1px solid #E4E7ED;
 }
-</style>
+</style>
\ No newline at end of file
diff --git a/antis-ncc-admin/src/views/lqZjlMdsmxsz/index.vue b/antis-ncc-admin/src/views/lqZjlMdsmxsz/index.vue
index baf7f74..1f60e06 100644
--- a/antis-ncc-admin/src/views/lqZjlMdsmxsz/index.vue
+++ b/antis-ncc-admin/src/views/lqZjlMdsmxsz/index.vue
@@ -40,9 +40,12 @@
             <el-option
               v-for="user in userList"
               :key="user.id"
-              :label="user.realName"
+              :label="`${user.realName} (${user.gw || '无岗位'})`"
               :value="user.id"
-            />
+            >
+              <span style="float: left">{{ user.realName }}</span>
+              <span style="float: right; color: #8492a6; font-size: 13px">{{ user.gw || '无岗位' }}</span>
+            </el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="门店" prop="mdId">
@@ -77,69 +80,147 @@
         border 
         stripe
         height="calc(100vh - 300px)"
+        :header-cell-style="{ background: '#f5f7fa', color: '#606266' }"
       >
-        <el-table-column prop="zjlName" label="总经理" width="120" align="center" />
-        <el-table-column prop="mdbm" label="门店编码" width="120" align="center" />
-        <el-table-column prop="dm" label="门店名称" width="150" align="center" />
+        <!-- 总经理 -->
+        <el-table-column label="总经理" width="140" align="center">
+          <template slot-scope="scope">
+            <div class="user-info">
+              <i class="el-icon-user-solid user-icon"></i>
+              <span>{{ scope.row.ZjlName || '无' }}</span>
+            </div>
+          </template>
+        </el-table-column>
+        
+        <!-- 门店编码 -->
+        <el-table-column label="门店编码" width="120" align="center">
+          <template slot-scope="scope">
+            <div class="store-code">
+              <i class="el-icon-office-building store-icon"></i>
+              <span>{{ scope.row.Mdbm || '无' }}</span>
+            </div>
+          </template>
+        </el-table-column>
+        
+        <!-- 门店名称 -->
+        <el-table-column label="门店名称" width="160" align="center">
+          <template slot-scope="scope">
+            <div class="store-name">
+              <i class="el-icon-shop store-icon"></i>
+              <span>{{ scope.row.Dm || '无' }}</span>
+            </div>
+          </template>
+        </el-table-column>
         
         <!-- 生命线1 -->
-        <el-table-column label="生命线1" align="center" width="200">
+        <el-table-column label="生命线1" align="center" width="140">
           <template slot-scope="scope">
             <div class="life-line-item">
-              <span class="amount">¥{{ formatMoney(scope.row.smx1) }}</span>
-              <span class="ratio">{{ scope.row.tcbl1 }}%</span>
+              <i class="el-icon-money life-line-icon"></i>
+              <span v-if="scope.row.Smx1" class="amount">{{ formatMoney(scope.row.Smx1) }}元</span>
+              <span v-else class="no-data">无</span>
+            </div>
+          </template>
+        </el-table-column>
+        
+        <!-- 提成比例1 -->
+        <el-table-column label="提成比例1" align="center" width="120">
+          <template slot-scope="scope">
+            <div class="ratio-item">
+              <i class="el-icon-percent ratio-icon"></i>
+              <span v-if="scope.row.Tcbl1" class="ratio">{{ scope.row.Tcbl1 }}%</span>
+              <span v-else class="no-data">无</span>
             </div>
           </template>
         </el-table-column>
         
         <!-- 生命线2 -->
-        <el-table-column label="生命线2" align="center" width="200">
+        <el-table-column label="生命线2" align="center" width="140">
+          <template slot-scope="scope">
+            <div class="life-line-item">
+              <i class="el-icon-money life-line-icon"></i>
+              <span v-if="scope.row.Smx2" class="amount">{{ formatMoney(scope.row.Smx2) }}元</span>
+              <span v-else class="no-data">无</span>
+            </div>
+          </template>
+        </el-table-column>
+        
+        <!-- 提成比例2 -->
+        <el-table-column label="提成比例2" align="center" width="120">
           <template slot-scope="scope">
-            <div class="life-line-item" v-if="scope.row.smx2">
-              <span class="amount">¥{{ formatMoney(scope.row.smx2) }}</span>
-              <span class="ratio">{{ scope.row.tcbl2 }}%</span>
+            <div class="ratio-item">
+              <i class="el-icon-percent ratio-icon"></i>
+              <span v-if="scope.row.Tcbl2" class="ratio">{{ scope.row.Tcbl2 }}%</span>
+              <span v-else class="no-data">无</span>
             </div>
-            <span v-else class="no-data">未设置</span>
           </template>
         </el-table-column>
         
         <!-- 生命线3 -->
-        <el-table-column label="生命线3" align="center" width="200">
+        <el-table-column label="生命线3" align="center" width="140">
           <template slot-scope="scope">
-            <div class="life-line-item" v-if="scope.row.smx3">
-              <span class="amount">¥{{ formatMoney(scope.row.smx3) }}</span>
-              <span class="ratio">{{ scope.row.tcbl3 }}%</span>
+            <div class="life-line-item">
+              <i class="el-icon-money life-line-icon"></i>
+              <span v-if="scope.row.Smx3" class="amount">{{ formatMoney(scope.row.Smx3) }}元</span>
+              <span v-else class="no-data">无</span>
             </div>
-            <span v-else class="no-data">未设置</span>
           </template>
         </el-table-column>
         
-        <el-table-column prop="bz" label="备注" min-width="150" show-overflow-tooltip />
-        <el-table-column prop="cjsj" label="创建时间" width="160" align="center">
+        <!-- 提成比例3 -->
+        <el-table-column label="提成比例3" align="center" width="120">
           <template slot-scope="scope">
-            {{ formatDate(scope.row.cjsj) }}
+            <div class="ratio-item">
+              <i class="el-icon-percent ratio-icon"></i>
+              <span v-if="scope.row.Tcbl3" class="ratio">{{ scope.row.Tcbl3 }}%</span>
+              <span v-else class="no-data">无</span>
+            </div>
           </template>
         </el-table-column>
         
-        <el-table-column label="操作" width="120" align="center" fixed="right">
+        <!-- 备注 -->
+        <el-table-column label="备注" min-width="160" show-overflow-tooltip>
           <template slot-scope="scope">
-            <el-button 
-              type="text" 
-              icon="el-icon-edit" 
-              @click="handleEdit(scope.row)"
-              size="small"
-            >
-              编辑
-            </el-button>
-            <el-button 
-              type="text" 
-              icon="el-icon-delete" 
-              @click="handleDelete(scope.row)"
-              size="small"
-              style="color: #f56c6c"
-            >
-              删除
-            </el-button>
+            <div class="remark-item">
+              <i class="el-icon-document remark-icon"></i>
+              <span>{{ scope.row.Bz || '无' }}</span>
+            </div>
+          </template>
+        </el-table-column>
+        
+        <!-- 创建时间 -->
+        <el-table-column label="创建时间" width="160" align="center">
+          <template slot-scope="scope">
+            <div class="time-item">
+              <i class="el-icon-time time-icon"></i>
+              <span>{{ formatDate(scope.row.Cjsj) }}</span>
+            </div>
+          </template>
+        </el-table-column>
+        
+        <!-- 操作 -->
+        <el-table-column label="操作" width="180" align="left" fixed="right">
+          <template slot-scope="scope">
+            <div class="action-buttons">
+              <el-button 
+                type="text" 
+                icon="el-icon-edit" 
+                @click="handleEdit(scope.row)"
+                size="small"
+                class="edit-btn"
+              >
+                编辑
+              </el-button>
+              <el-button 
+                type="text" 
+                icon="el-icon-delete" 
+                @click="handleDelete(scope.row)"
+                size="small"
+                class="delete-btn"
+              >
+                删除
+              </el-button>
+            </div>
           </template>
         </el-table-column>
       </el-table>
@@ -181,6 +262,7 @@
 
 <script>
 import { lqZjlMdsmxszApi } from '@/api/extend/lqZjlMdsmxsz'
+import request from '@/utils/request'
 import BatchCreateDialog from './components/BatchCreateDialog.vue'
 import EditDialog from './components/EditDialog.vue'
 
@@ -218,7 +300,7 @@ export default {
     async getUserList() {
       try {
         const response = await lqZjlMdsmxszApi.getZjlUserList()
-        this.userList = response.data.list || []
+        this.userList = response.data || []
         console.log('获取总经理用户列表成功:', this.userList)
       } catch (error) {
         console.error('获取总经理用户列表失败:', error)
@@ -230,10 +312,17 @@ export default {
     // 获取门店列表
     async getStoreList() {
       try {
-        const response = await lqZjlMdsmxszApi.getManagedStores(this.$store.getters.userInfo.id)
+        // 获取所有门店列表，用于编辑时显示门店名称
+        const response = await request({
+          url: '/api/Extend/LqMdxx',
+          method: 'GET',
+          params: { pageSize: 1000 } // 获取所有门店
+        })
         this.storeList = response.data.list || []
+        console.log('门店列表:', this.storeList)
       } catch (error) {
         console.error('获取门店列表失败:', error)
+        this.storeList = []
       }
     },
 
@@ -241,17 +330,17 @@ export default {
     async getList() {
       this.loading = true
       try {
-        if (this.queryParams.zjlUserid) {
-          // 如果选择了总经理，查询该总经理的数据
-          const response = await lqZjlMdsmxszApi.getByZjlUserid(this.queryParams.zjlUserid)
-          this.list = response.data.list || []
-          this.total = this.list.length
-        } else {
-          // 如果没有选择总经理，查询所有数据
-          // TODO: 这里需要实现一个查询所有数据的接口
-          this.list = []
-          this.total = 0
-        }
+        // 使用分页查询接口
+        const response = await lqZjlMdsmxszApi.getPageList({
+          currentPage: this.queryParams.pageNum,
+          pageSize: this.queryParams.pageSize,
+          zjlUserid: this.queryParams.zjlUserid || '',
+          mdId: this.queryParams.mdId || ''
+        })
+        
+        // 适配新的数据结构
+        this.list = response.data.list || []
+        this.total = (response.data.pagination && response.data.pagination.total) || 0
       } catch (error) {
         console.error('获取列表失败:', error)
         this.$message.error('获取列表失败')
@@ -285,7 +374,15 @@ export default {
 
     // 编辑
     handleEdit(row) {
+      console.log('编辑行数据:', row)
       this.currentRow = { ...row }
+      console.log('当前行数据:', this.currentRow)
+      
+      // 确保门店列表已加载
+      if (this.storeList.length === 0) {
+        this.getStoreList()
+      }
+      
       this.editVisible = true
     },
 
@@ -402,17 +499,76 @@ export default {
   margin-bottom: 20px;
 }
 
+// 用户信息样式
+.user-info {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  gap: 6px;
+  
+  .user-icon {
+    color: #409EFF;
+    font-size: 16px;
+  }
+  
+  span {
+    font-weight: 500;
+    color: #303133;
+  }
+}
+
+// 门店信息样式
+.store-code, .store-name {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  gap: 6px;
+  
+  .store-icon {
+    color: #67C23A;
+    font-size: 16px;
+  }
+  
+  span {
+    font-weight: 500;
+    color: #303133;
+  }
+}
+
+// 生命线项目样式
 .life-line-item {
   display: flex;
-  flex-direction: column;
+  flex-direction: row;
   align-items: center;
-  gap: 4px;
+  justify-content: center;
+  gap: 6px;
+  min-height: 40px;
+
+  .life-line-icon {
+    color: #409EFF;
+    font-size: 16px;
+  }
 
   .amount {
     font-weight: 600;
     color: #409EFF;
     font-size: 14px;
   }
+}
+
+// 提成比例样式
+.ratio-item {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  justify-content: center;
+  gap: 6px;
+  min-height: 40px;
+
+  .ratio-icon {
+    color: #67C23A;
+    font-size: 16px;
+  }
 
   .ratio {
     color: #67C23A;
@@ -420,12 +576,71 @@ export default {
     background: #f0f9ff;
     padding: 2px 6px;
     border-radius: 4px;
+    font-weight: 500;
+  }
+}
+
+// 备注样式
+.remark-item {
+  display: flex;
+  align-items: center;
+  gap: 6px;
+  
+  .remark-icon {
+    color: #909399;
+    font-size: 14px;
+  }
+  
+  span {
+    color: #606266;
+  }
+}
+
+// 时间样式
+.time-item {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  gap: 6px;
+  
+  .time-icon {
+    color: #909399;
+    font-size: 14px;
+  }
+  
+  span {
+    color: #606266;
+    font-size: 13px;
+  }
+}
+
+// 操作按钮样式
+.action-buttons {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  
+  .edit-btn {
+    color: #409EFF;
+    
+    &:hover {
+      color: #66b1ff;
+    }
+  }
+  
+  .delete-btn {
+    color: #F56C6C;
+    
+    &:hover {
+      color: #f78989;
+    }
   }
 }
 
 .no-data {
   color: #C0C4CC;
   font-size: 12px;
+  font-style: italic;
 }
 
 .pagination-container {
diff --git a/netcore/netcore/.DS_Store b/netcore/netcore/.DS_Store
index 879eac4..95a02e7 100644
Binary files a/netcore/netcore/.DS_Store and b/netcore/netcore/.DS_Store differ
diff --git a/netcore/src/.DS_Store b/netcore/src/.DS_Store
index b356918..804c075 100644
Binary files a/netcore/src/.DS_Store and b/netcore/src/.DS_Store differ
diff --git a/netcore/src/Application/NCC.API/.DS_Store b/netcore/src/Application/NCC.API/.DS_Store
index 83511e8..78e10f5 100644
Binary files a/netcore/src/Application/NCC.API/.DS_Store and b/netcore/src/Application/NCC.API/.DS_Store differ
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqHygl/LqHyglCrInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqHygl/LqHyglCrInput.cs
deleted file mode 100644
index 637c6e5..0000000
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqHygl/LqHyglCrInput.cs
+++ /dev/null
@@ -1,87 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace NCC.Extend.Entitys.Dto.LqHygl
-{
-    /// <summary>
-    /// 会员管理修改输入参数
-    /// </summary>
-    public class LqHyglCrInput
-    {
-        /// <summary>
-        /// 会员编号
-        /// </summary>
-        public string id { get; set; }
-        
-        /// <summary>
-        /// 姓名
-        /// </summary>
-        public string xm { get; set; }
-        
-        /// <summary>
-        /// 性别
-        /// </summary>
-        public string xb { get; set; }
-        
-        /// <summary>
-        /// 手机号
-        /// </summary>
-        public string sjh { get; set; }
-        
-        /// <summary>
-        /// 职业
-        /// </summary>
-        public string zy { get; set; }
-        
-        /// <summary>
-        /// 进店渠道
-        /// </summary>
-        public string jdqd { get; set; }
-        
-        /// <summary>
-        /// 年龄
-        /// </summary>
-        public string nl { get; set; }
-        
-        /// <summary>
-        /// 推荐人
-        /// </summary>
-        public string tjr { get; set; }
-        
-        /// <summary>
-        /// 阴历生日
-        /// </summary>
-        public DateTime? yin { get; set; }
-        
-        /// <summary>
-        /// 阳历生日
-        /// </summary>
-        public DateTime? yang { get; set; }
-        
-        /// <summary>
-        /// 健康师
-        /// </summary>
-        public string jks { get; set; }
-        
-        /// <summary>
-        /// 会员顾问
-        /// </summary>
-        public string hygw { get; set; }
-        
-        /// <summary>
-        /// 标签
-        /// </summary>
-        public string bq { get; set; }
-        
-        /// <summary>
-        /// 爱好
-        /// </summary>
-        public string ah { get; set; }
-        
-        /// <summary>
-        /// 其它
-        /// </summary>
-        public string qt { get; set; }
-        
-    }
-}
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqHygl/LqHyglInfoOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqHygl/LqHyglInfoOutput.cs
deleted file mode 100644
index 88d80b7..0000000
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqHygl/LqHyglInfoOutput.cs
+++ /dev/null
@@ -1,87 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace NCC.Extend.Entitys.Dto.LqHygl
-{
-    /// <summary>
-    /// 会员管理输出参数
-    /// </summary>
-    public class LqHyglInfoOutput
-    {
-        /// <summary>
-        /// 会员编号
-        /// </summary>
-        public string id { get; set; }
-        
-        /// <summary>
-        /// 姓名
-        /// </summary>
-        public string xm { get; set; }
-        
-        /// <summary>
-        /// 性别
-        /// </summary>
-        public string xb { get; set; }
-        
-        /// <summary>
-        /// 手机号
-        /// </summary>
-        public string sjh { get; set; }
-        
-        /// <summary>
-        /// 职业
-        /// </summary>
-        public string zy { get; set; }
-        
-        /// <summary>
-        /// 进店渠道
-        /// </summary>
-        public string jdqd { get; set; }
-        
-        /// <summary>
-        /// 年龄
-        /// </summary>
-        public string nl { get; set; }
-        
-        /// <summary>
-        /// 推荐人
-        /// </summary>
-        public string tjr { get; set; }
-        
-        /// <summary>
-        /// 阴历生日
-        /// </summary>
-        public DateTime? yin { get; set; }
-        
-        /// <summary>
-        /// 阳历生日
-        /// </summary>
-        public DateTime? yang { get; set; }
-        
-        /// <summary>
-        /// 健康师
-        /// </summary>
-        public string jks { get; set; }
-        
-        /// <summary>
-        /// 会员顾问
-        /// </summary>
-        public string hygw { get; set; }
-        
-        /// <summary>
-        /// 标签
-        /// </summary>
-        public string bq { get; set; }
-        
-        /// <summary>
-        /// 爱好
-        /// </summary>
-        public string ah { get; set; }
-        
-        /// <summary>
-        /// 其它
-        /// </summary>
-        public string qt { get; set; }
-        
-    }
-}
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqHygl/LqHyglListOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqHygl/LqHyglListOutput.cs
deleted file mode 100644
index d504a9d..0000000
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqHygl/LqHyglListOutput.cs
+++ /dev/null
@@ -1,86 +0,0 @@
-using System;
-
-namespace NCC.Extend.Entitys.Dto.LqHygl
-{
-    /// <summary>
-    /// 会员管理输入参数
-    /// </summary>
-    public class LqHyglListOutput
-    {
-        /// <summary>
-        /// 会员编号
-        /// </summary>
-        public string id { get; set; }
-        
-        /// <summary>
-        /// 姓名
-        /// </summary>
-        public string xm { get; set; }
-        
-        /// <summary>
-        /// 性别
-        /// </summary>
-        public string xb { get; set; }
-        
-        /// <summary>
-        /// 手机号
-        /// </summary>
-        public string sjh { get; set; }
-        
-        /// <summary>
-        /// 职业
-        /// </summary>
-        public string zy { get; set; }
-        
-        /// <summary>
-        /// 进店渠道
-        /// </summary>
-        public string jdqd { get; set; }
-        
-        /// <summary>
-        /// 年龄
-        /// </summary>
-        public string nl { get; set; }
-        
-        /// <summary>
-        /// 推荐人
-        /// </summary>
-        public string tjr { get; set; }
-        
-        /// <summary>
-        /// 阴历生日
-        /// </summary>
-        public DateTime? yin { get; set; }
-        
-        /// <summary>
-        /// 阳历生日
-        /// </summary>
-        public DateTime? yang { get; set; }
-        
-        /// <summary>
-        /// 健康师
-        /// </summary>
-        public string jks { get; set; }
-        
-        /// <summary>
-        /// 会员顾问
-        /// </summary>
-        public string hygw { get; set; }
-        
-        /// <summary>
-        /// 标签
-        /// </summary>
-        public string bq { get; set; }
-        
-        /// <summary>
-        /// 爱好
-        /// </summary>
-        public string ah { get; set; }
-        
-        /// <summary>
-        /// 其它
-        /// </summary>
-        public string qt { get; set; }
-        
-    }
-}
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqHygl/LqHyglListQueryInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqHygl/LqHyglListQueryInput.cs
deleted file mode 100644
index 0d21ea3..0000000
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqHygl/LqHyglListQueryInput.cs
+++ /dev/null
@@ -1,98 +0,0 @@
-using NCC.Common.Filter;
-using System.Collections.Generic;
-
-namespace NCC.Extend.Entitys.Dto.LqHygl
-{
-    /// <summary>
-    /// 会员管理列表查询输入
-    /// </summary>
-    public class LqHyglListQueryInput : PageInputBase
-    {
-        /// <summary>
-        /// 选择导出数据key
-        /// </summary>
-        public string selectKey { get; set; }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        public int dataType { get; set; }
-
-
-        /// <summary>
-        /// 会员编号
-        /// </summary>
-        public string id { get; set; }
-        
-        /// <summary>
-        /// 姓名
-        /// </summary>
-        public string xm { get; set; }
-        
-        /// <summary>
-        /// 性别
-        /// </summary>
-        public string xb { get; set; }
-        
-        /// <summary>
-        /// 手机号
-        /// </summary>
-        public string sjh { get; set; }
-        
-        /// <summary>
-        /// 职业
-        /// </summary>
-        public string zy { get; set; }
-        
-        /// <summary>
-        /// 进店渠道
-        /// </summary>
-        public string jdqd { get; set; }
-        
-        /// <summary>
-        /// 年龄
-        /// </summary>
-        public string nl { get; set; }
-        
-        /// <summary>
-        /// 推荐人
-        /// </summary>
-        public string tjr { get; set; }
-        
-        /// <summary>
-        /// 阴历生日
-        /// </summary>
-        public string yin { get; set; }
-        
-        /// <summary>
-        /// 阳历生日
-        /// </summary>
-        public string yang { get; set; }
-        
-        /// <summary>
-        /// 健康师
-        /// </summary>
-        public string jks { get; set; }
-        
-        /// <summary>
-        /// 会员顾问
-        /// </summary>
-        public string hygw { get; set; }
-        
-        /// <summary>
-        /// 标签
-        /// </summary>
-        public string bq { get; set; }
-        
-        /// <summary>
-        /// 爱好
-        /// </summary>
-        public string ah { get; set; }
-        
-        /// <summary>
-        /// 其它
-        /// </summary>
-        public string qt { get; set; }
-        
-    }
-}
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqHygl/LqHyglUpInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqHygl/LqHyglUpInput.cs
deleted file mode 100644
index 124a8fa..0000000
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqHygl/LqHyglUpInput.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace NCC.Extend.Entitys.Dto.LqHygl
-{
-    /// <summary>
-    /// 会员管理更新输入参数
-    /// </summary>
-    public class LqHyglUpInput : LqHyglCrInput
-    {
-        /// <summary>
-        /// 会员编号
-        /// </summary>
-        public string id { get; set; }
-        
-    }
-}
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdJksyj/LqKdJksyjCrInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdJksyj/LqKdJksyjCrInput.cs
index c7b6198..3c1e2ed 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdJksyj/LqKdJksyjCrInput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdJksyj/LqKdJksyjCrInput.cs
@@ -38,6 +38,11 @@ namespace NCC.Extend.Entitys.Dto.LqKdKdjlb
         /// 健康师业绩
         /// </summary>
         public string jksyj { get; set; }
+
+        /// <summary>
+        /// 金三角id
+        /// </summary>
+        public string jsj_id { get; set; }
         
         /// <summary>
         /// 业绩时间
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdPxmx/LqKdPxmxCrInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdPxmx/LqKdPxmxCrInput.cs
index ac2b421..fc1dd6f 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdPxmx/LqKdPxmxCrInput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdPxmx/LqKdPxmxCrInput.cs
@@ -34,6 +34,25 @@ namespace NCC.Extend.Entitys.Dto.LqKdKdjlb
         /// 品项价格
         /// </summary>
         public decimal pxjg { get; set; }
+
+        /// <summary>
+        /// 会员id
+        /// </summary>
+        public string memberId { get; set; }
         
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime? createTime { get; set; }
+
+        /// <summary>
+        /// 项目次数
+        /// </summary>
+        public int? projectNumber { get; set; }
+        
+        /// <summary>
+        /// 是否有效
+        /// </summary>
+        public int? isEnabled { get; set; }
     }
 }
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdxx/LqMdxxCrInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdxx/LqMdxxCrInput.cs
index 5cbfb07..f3e2481 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdxx/LqMdxxCrInput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdxx/LqMdxxCrInput.cs
@@ -118,5 +118,35 @@ namespace NCC.Extend.Entitys.Dto.LqMdxx
         /// </summary>
         public int? status { get; set; }
         
+        /// <summary>
+        /// 目标-门店生命线
+        /// </summary>
+        public decimal? xsyj { get; set; }
+        
+        /// <summary>
+        /// 目标-消耗业绩
+        /// </summary>
+        public decimal? xhyj { get; set; }
+        
+        /// <summary>
+        /// 目标-项目数
+        /// </summary>
+        public int? xms { get; set; }
+        
+        /// <summary>
+        /// 目标-人头1
+        /// </summary>
+        public int? rt1 { get; set; }
+        
+        /// <summary>
+        /// 目标-人头2
+        /// </summary>
+        public int? rt2 { get; set; }
+        
+        /// <summary>
+        /// 目标-人次
+        /// </summary>
+        public int? rc { get; set; }
+        
     }
 }
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdxx/LqMdxxListOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdxx/LqMdxxListOutput.cs
index d747328..cfe4bdd 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdxx/LqMdxxListOutput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdxx/LqMdxxListOutput.cs
@@ -116,6 +116,36 @@ namespace NCC.Extend.Entitys.Dto.LqMdxx
         /// 状态
         /// </summary>
         public int? status { get; set; }
+
+        /// <summary>
+        /// 目标-门店生命线
+        /// </summary>
+        public decimal? xsyj { get; set; }
+        
+        /// <summary>
+        /// 目标-消耗业绩
+        /// </summary>
+        public decimal? xhyj { get; set; }
+        
+        /// <summary>
+        /// 目标-项目数
+        /// </summary>
+        public int? xms { get; set; }
+        
+        /// <summary>
+        /// 目标-人头1
+        /// </summary>
+        public int? rt1 { get; set; }
+        
+        /// <summary>
+        /// 目标-人头2
+        /// </summary>
+        public int? rt2 { get; set; }
+        
+        /// <summary>
+        /// 目标-人次
+        /// </summary>
+        public int? rc { get; set; }
         
     }
 }
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdxx/LqMdxxTargetUpdateInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdxx/LqMdxxTargetUpdateInput.cs
new file mode 100644
index 0000000..99452a8
--- /dev/null
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdxx/LqMdxxTargetUpdateInput.cs
@@ -0,0 +1,40 @@
+using System;
+
+namespace NCC.Extend.Entitys.Dto.LqMdxx
+{
+    /// <summary>
+    /// 门店目标字段更新输入参数
+    /// </summary>
+    public class LqMdxxTargetUpdateInput
+    {
+        /// <summary>
+        /// 目标-门店生命线
+        /// </summary>
+        public decimal? xsyj { get; set; }
+        
+        /// <summary>
+        /// 目标-消耗业绩
+        /// </summary>
+        public decimal? xhyj { get; set; }
+        
+        /// <summary>
+        /// 目标-项目数
+        /// </summary>
+        public int? xms { get; set; }
+        
+        /// <summary>
+        /// 目标-人头1
+        /// </summary>
+        public int? rt1 { get; set; }
+        
+        /// <summary>
+        /// 目标-人头2
+        /// </summary>
+        public int? rt2 { get; set; }
+        
+        /// <summary>
+        /// 目标-人次
+        /// </summary>
+        public int? rc { get; set; }
+    }
+}
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXmzl/LqXmzlCrInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXmzl/LqXmzlCrInput.cs
index 0eb04e9..81fb550 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXmzl/LqXmzlCrInput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXmzl/LqXmzlCrInput.cs
@@ -93,5 +93,19 @@ namespace NCC.Extend.Entitys.Dto.LqXmzl
         /// </summary>
         public decimal? cellje { get; set; }
         
+        /// <summary>
+        /// 手工费
+        /// </summary>
+        public decimal? sgf { get; set; }
+        
+        /// <summary>
+        /// 项目次数
+        /// </summary>
+        public int? projectNumber { get; set; }
+        
+        /// <summary>
+        /// 来源类型
+        /// </summary>
+        public string sourceType { get; set; }
     }
 }
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXmzl/LqXmzlInfoOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXmzl/LqXmzlInfoOutput.cs
index bae6929..21612ed 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXmzl/LqXmzlInfoOutput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXmzl/LqXmzlInfoOutput.cs
@@ -93,5 +93,20 @@ namespace NCC.Extend.Entitys.Dto.LqXmzl
         /// </summary>
         public decimal? cellje { get; set; }
         
+        /// <summary>
+        /// 手工费
+        /// </summary>
+        public decimal? sgf { get; set; }
+
+        /// <summary>
+        /// 项目次数
+        /// </summary>
+        public int? projectNumber { get; set; }
+        
+        /// <summary>
+        /// 来源类型
+        /// </summary>
+        public string sourceType { get; set; }
+        
     }
 }
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXmzl/LqXmzlListOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXmzl/LqXmzlListOutput.cs
index 01f0d43..d9c2290 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXmzl/LqXmzlListOutput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXmzl/LqXmzlListOutput.cs
@@ -92,5 +92,19 @@ namespace NCC.Extend.Entitys.Dto.LqXmzl
         /// </summary>
         public decimal? cellje { get; set; }
         
+        /// <summary>
+        /// 手工费
+        /// </summary>
+        public decimal? sgf { get; set; }
+        
+        /// <summary>
+        /// 项目次数
+        /// </summary>
+        public int? projectNumber { get; set; }
+        
+        /// <summary>
+        /// 来源类型
+        /// </summary>
+        public string sourceType { get; set; }
     }
 }
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXmzl/LqXmzlListQueryInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXmzl/LqXmzlListQueryInput.cs
index 1b06cde..10e434d 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXmzl/LqXmzlListQueryInput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXmzl/LqXmzlListQueryInput.cs
@@ -104,5 +104,10 @@ namespace NCC.Extend.Entitys.Dto.LqXmzl
         /// </summary>
         public string cellje { get; set; }
         
+        /// <summary>
+        /// 手工费
+        /// </summary>
+        public string sgf { get; set; }
+        
     }
 }
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdMdmbsd/LqYcsdMdmbsdCrInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdMdmbsd/LqYcsdMdmbsdCrInput.cs
deleted file mode 100644
index 8120ae2..0000000
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdMdmbsd/LqYcsdMdmbsdCrInput.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace NCC.Extend.Entitys.Dto.LqYcsdMdmbsd
-{
-    /// <summary>
-    /// 门店目标设定修改输入参数
-    /// </summary>
-    public class LqYcsdMdmbsdCrInput
-    {
-        /// <summary>
-        /// 目标编号
-        /// </summary>
-        public string id { get; set; }
-        
-        /// <summary>
-        /// 目标-销售业绩
-        /// </summary>
-        public string xsyj { get; set; }
-        
-        /// <summary>
-        /// 目标-消耗业绩
-        /// </summary>
-        public string xhyj { get; set; }
-        
-        /// <summary>
-        /// 目标-项目数
-        /// </summary>
-        public string xms { get; set; }
-        
-        /// <summary>
-        /// 目标-人头
-        /// </summary>
-        public string rt { get; set; }
-        
-        /// <summary>
-        /// 目标-人次
-        /// </summary>
-        public string rc { get; set; }
-        
-        /// <summary>
-        /// 目标分类（个人门店天王）
-        /// </summary>
-        public string mbfl { get; set; }
-        
-        /// <summary>
-        /// 具体对应
-        /// </summary>
-        public string jtdy { get; set; }
-        
-    }
-}
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdMdmbsd/LqYcsdMdmbsdInfoOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdMdmbsd/LqYcsdMdmbsdInfoOutput.cs
deleted file mode 100644
index 2767a03..0000000
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdMdmbsd/LqYcsdMdmbsdInfoOutput.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace NCC.Extend.Entitys.Dto.LqYcsdMdmbsd
-{
-    /// <summary>
-    /// 门店目标设定输出参数
-    /// </summary>
-    public class LqYcsdMdmbsdInfoOutput
-    {
-        /// <summary>
-        /// 目标编号
-        /// </summary>
-        public string id { get; set; }
-        
-        /// <summary>
-        /// 目标-销售业绩
-        /// </summary>
-        public string xsyj { get; set; }
-        
-        /// <summary>
-        /// 目标-消耗业绩
-        /// </summary>
-        public string xhyj { get; set; }
-        
-        /// <summary>
-        /// 目标-项目数
-        /// </summary>
-        public string xms { get; set; }
-        
-        /// <summary>
-        /// 目标-人头
-        /// </summary>
-        public string rt { get; set; }
-        
-        /// <summary>
-        /// 目标-人次
-        /// </summary>
-        public string rc { get; set; }
-        
-        /// <summary>
-        /// 目标分类（个人门店天王）
-        /// </summary>
-        public string mbfl { get; set; }
-        
-        /// <summary>
-        /// 具体对应
-        /// </summary>
-        public string jtdy { get; set; }
-        
-    }
-}
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdMdmbsd/LqYcsdMdmbsdListOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdMdmbsd/LqYcsdMdmbsdListOutput.cs
deleted file mode 100644
index e6d3972..0000000
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdMdmbsd/LqYcsdMdmbsdListOutput.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-using System;
-
-namespace NCC.Extend.Entitys.Dto.LqYcsdMdmbsd
-{
-    /// <summary>
-    /// 门店目标设定输入参数
-    /// </summary>
-    public class LqYcsdMdmbsdListOutput
-    {
-        /// <summary>
-        /// 目标编号
-        /// </summary>
-        public string id { get; set; }
-        
-        /// <summary>
-        /// 目标-销售业绩
-        /// </summary>
-        public string xsyj { get; set; }
-        
-        /// <summary>
-        /// 目标-消耗业绩
-        /// </summary>
-        public string xhyj { get; set; }
-        
-        /// <summary>
-        /// 目标-项目数
-        /// </summary>
-        public string xms { get; set; }
-        
-        /// <summary>
-        /// 目标-人头
-        /// </summary>
-        public string rt { get; set; }
-        
-        /// <summary>
-        /// 目标-人次
-        /// </summary>
-        public string rc { get; set; }
-        
-        /// <summary>
-        /// 目标分类（个人门店天王）
-        /// </summary>
-        public string mbfl { get; set; }
-        
-        /// <summary>
-        /// 具体对应
-        /// </summary>
-        public string jtdy { get; set; }
-        
-    }
-}
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdMdmbsd/LqYcsdMdmbsdListQueryInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdMdmbsd/LqYcsdMdmbsdListQueryInput.cs
deleted file mode 100644
index 2b8199c..0000000
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdMdmbsd/LqYcsdMdmbsdListQueryInput.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-using NCC.Common.Filter;
-using System.Collections.Generic;
-
-namespace NCC.Extend.Entitys.Dto.LqYcsdMdmbsd
-{
-    /// <summary>
-    /// 门店目标设定列表查询输入
-    /// </summary>
-    public class LqYcsdMdmbsdListQueryInput : PageInputBase
-    {
-        /// <summary>
-        /// 选择导出数据key
-        /// </summary>
-        public string selectKey { get; set; }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        public int dataType { get; set; }
-
-
-        /// <summary>
-        /// 目标编号
-        /// </summary>
-        public string id { get; set; }
-        
-        /// <summary>
-        /// 目标-销售业绩
-        /// </summary>
-        public string xsyj { get; set; }
-        
-        /// <summary>
-        /// 目标-消耗业绩
-        /// </summary>
-        public string xhyj { get; set; }
-        
-        /// <summary>
-        /// 目标-项目数
-        /// </summary>
-        public string xms { get; set; }
-        
-        /// <summary>
-        /// 目标-人头
-        /// </summary>
-        public string rt { get; set; }
-        
-        /// <summary>
-        /// 目标-人次
-        /// </summary>
-        public string rc { get; set; }
-        
-        /// <summary>
-        /// 目标分类（个人门店天王）
-        /// </summary>
-        public string mbfl { get; set; }
-        
-        /// <summary>
-        /// 具体对应
-        /// </summary>
-        public string jtdy { get; set; }
-        
-    }
-}
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdMdmbsd/LqYcsdMdmbsdUpInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdMdmbsd/LqYcsdMdmbsdUpInput.cs
deleted file mode 100644
index 5e4ee13..0000000
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdMdmbsd/LqYcsdMdmbsdUpInput.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace NCC.Extend.Entitys.Dto.LqYcsdMdmbsd
-{
-    /// <summary>
-    /// 门店目标设定更新输入参数
-    /// </summary>
-    public class LqYcsdMdmbsdUpInput : LqYcsdMdmbsdCrInput
-    {
-        /// <summary>
-        /// 目标编号
-        /// </summary>
-        public string id { get; set; }
-        
-    }
-}
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqZjlMdsmxsz/LqZjlMdsmxszListQueryInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqZjlMdsmxsz/LqZjlMdsmxszListQueryInput.cs
index 8ed7511..5f9d72d 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqZjlMdsmxsz/LqZjlMdsmxszListQueryInput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqZjlMdsmxsz/LqZjlMdsmxszListQueryInput.cs
@@ -1,11 +1,11 @@
-using NCC.Common.Model;
+using NCC.Common.Filter;
 
 namespace NCC.Extend.Entitys.Dto.LqZjlMdsmxsz
 {
     /// <summary>
     /// 总经理门店生命线设置列表查询输入DTO
     /// </summary>
-    public class LqZjlMdsmxszListQueryInput
+    public class LqZjlMdsmxszListQueryInput : PageInputBase
     {
         /// <summary>
         /// 总经理用户ID
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/README.md b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/README.md
index 56259e2..775e40b 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/README.md
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/README.md
@@ -51,7 +51,6 @@
 - `lq_ycsd_zjljlhsfa/` - 总经理经理核算方案
 
 #### 其他业务表
-- `lq_hygl/` - 会员管理
 - `lq_hytk_hytk/` - 会员退卡
 - `lq_hytk_mx/` - 会员退卡明细
 - `lq_hzf/` - 合作方
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_hygl/LqHyglEntity.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_hygl/LqHyglEntity.cs
deleted file mode 100644
index faa3bc9..0000000
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_hygl/LqHyglEntity.cs
+++ /dev/null
@@ -1,105 +0,0 @@
-using NCC.Common.Const;
-using SqlSugar;
-using System;
-
-namespace NCC.Extend.Entitys.lq_hygl
-{
-    /// <summary>
-    /// 会员管理
-    /// </summary>
-    [SugarTable("lq_hygl")]
-    [Tenant(ClaimConst.TENANT_ID)]
-    public class LqHyglEntity
-    {
-        /// <summary>
-        /// 会员编号
-        /// </summary>
-        [SugarColumn(ColumnName = "F_Id", IsPrimaryKey = true)]
-        public string Id { get; set; }
-        
-        /// <summary>
-        /// 姓名
-        /// </summary>
-        [SugarColumn(ColumnName = "xm")]        
-        public string Xm { get; set; }
-        
-        /// <summary>
-        /// 性别
-        /// </summary>
-        [SugarColumn(ColumnName = "xb")]        
-        public string Xb { get; set; }
-        
-        /// <summary>
-        /// 手机号
-        /// </summary>
-        [SugarColumn(ColumnName = "sjh")]        
-        public string Sjh { get; set; }
-        
-        /// <summary>
-        /// 职业
-        /// </summary>
-        [SugarColumn(ColumnName = "zy")]        
-        public string Zy { get; set; }
-        
-        /// <summary>
-        /// 进店渠道
-        /// </summary>
-        [SugarColumn(ColumnName = "jdqd")]        
-        public string Jdqd { get; set; }
-        
-        /// <summary>
-        /// 年龄
-        /// </summary>
-        [SugarColumn(ColumnName = "nl")]        
-        public string Nl { get; set; }
-        
-        /// <summary>
-        /// 推荐人
-        /// </summary>
-        [SugarColumn(ColumnName = "tjr")]        
-        public string Tjr { get; set; }
-        
-        /// <summary>
-        /// 阴历生日
-        /// </summary>
-        [SugarColumn(ColumnName = "yin")]        
-        public DateTime? Yin { get; set; }
-        
-        /// <summary>
-        /// 阳历生日
-        /// </summary>
-        [SugarColumn(ColumnName = "yang")]        
-        public DateTime? Yang { get; set; }
-        
-        /// <summary>
-        /// 健康师
-        /// </summary>
-        [SugarColumn(ColumnName = "jks")]        
-        public string Jks { get; set; }
-        
-        /// <summary>
-        /// 会员顾问
-        /// </summary>
-        [SugarColumn(ColumnName = "hygw")]        
-        public string Hygw { get; set; }
-        
-        /// <summary>
-        /// 标签
-        /// </summary>
-        [SugarColumn(ColumnName = "bq")]        
-        public string Bq { get; set; }
-        
-        /// <summary>
-        /// 爱好
-        /// </summary>
-        [SugarColumn(ColumnName = "ah")]        
-        public string Ah { get; set; }
-        
-        /// <summary>
-        /// 其它
-        /// </summary>
-        [SugarColumn(ColumnName = "qt")]        
-        public string Qt { get; set; }
-        
-    }
-}
\ No newline at end of file
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
index 60e98d2..5d95f91 100644
--- 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
@@ -82,5 +82,12 @@ namespace NCC.Extend.Entitys.lq_jinsanjiao_user
         /// </summary>
         [SugarColumn(ColumnName = "F_DeleteMark")]        
         public int DeleteMark { get; set; }
+
+
+        /// <summary>  
+        /// 月份
+        /// </summary>
+        [SugarColumn(ColumnName = "F_Month")]        
+        public string Month { get; set; }
     }
 }
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_kd_jksyj/LqKdJksyjEntity.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_kd_jksyj/LqKdJksyjEntity.cs
index 8c5656d..22f98ee 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_kd_jksyj/LqKdJksyjEntity.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_kd_jksyj/LqKdJksyjEntity.cs
@@ -52,6 +52,12 @@ namespace NCC.Extend.Entitys.lq_kd_jksyj
         /// </summary>
         [SugarColumn(ColumnName = "yjsj")]        
         public DateTime? Yjsj { get; set; }
+
+        /// <summary>
+        /// 金三角id
+        /// </summary>
+        [SugarColumn(ColumnName = "jsj_id")]        
+        public string Jsj_id { get; set; }
         
     }
 }
\ No newline at end of file
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_kd_kdjlb/LqKdKdjlbEntity.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_kd_kdjlb/LqKdKdjlbEntity.cs
index 8c7a179..3cb1c59 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_kd_kdjlb/LqKdKdjlbEntity.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_kd_kdjlb/LqKdKdjlbEntity.cs
@@ -172,6 +172,12 @@ namespace NCC.Extend.Entitys.lq_kd_kdjlb
         /// </summary>
         [SugarColumn(ColumnName = "pxxx")]        
         public string Pxxx { get; set; }
+
+        /// <summary>
+        /// 开单用户
+        /// </summary>
+        [SugarColumn(ColumnName = "F_CreateUser")]        
+        public string CreateUser { get; set; }
         
     }
 }
\ No newline at end of file
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_kd_pxmx/LqKdPxmxEntity.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_kd_pxmx/LqKdPxmxEntity.cs
index 43e15cd..921b1f6 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_kd_pxmx/LqKdPxmxEntity.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_kd_pxmx/LqKdPxmxEntity.cs
@@ -40,6 +40,30 @@ namespace NCC.Extend.Entitys.lq_kd_pxmx
         /// </summary>
         [SugarColumn(ColumnName = "pxjg")]        
         public decimal Pxjg { get; set; }
+
+        /// <summary>
+        /// 会员id
+        /// </summary>
+        [SugarColumn(ColumnName = "F_MemberId")]        
+        public string MemberId { get; set; }
+
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        [SugarColumn(ColumnName = "F_CreateTIme")]        
+        public DateTime? CreateTIme { get; set; }
+
+        /// <summary>
+        /// 项目次数
+        /// </summary>
+        [SugarColumn(ColumnName = "F_ProjectNumber")]        
+        public int? ProjectNumber { get; set; }
+
+        /// <summary>
+        /// 是否有效
+        /// </summary>
+        [SugarColumn(ColumnName = "F_IsEnabled")]        
+        public int? IsEnabled { get; set; }
         
     }
 }
\ No newline at end of file
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_mdxx/LqMdxxEntity.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_mdxx/LqMdxxEntity.cs
index a7166ff..e3f8beb 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_mdxx/LqMdxxEntity.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_mdxx/LqMdxxEntity.cs
@@ -143,5 +143,41 @@ namespace NCC.Extend.Entitys.lq_mdxx
         [SugarColumn(ColumnName = "status")]        
         public int? Status { get; set; }
         
+        /// <summary>
+        /// 目标-门店生命线
+        /// </summary>
+        [SugarColumn(ColumnName = "xsyj")]        
+        public decimal? Xsyj { get; set; }
+        
+        /// <summary>
+        /// 目标-消耗业绩
+        /// </summary>
+        [SugarColumn(ColumnName = "xhyj")]        
+        public decimal? Xhyj { get; set; }
+        
+        /// <summary>
+        /// 目标-项目数
+        /// </summary>
+        [SugarColumn(ColumnName = "xms")]        
+        public int? Xms { get; set; }
+        
+        /// <summary>
+        /// 目标-人头1
+        /// </summary>
+        [SugarColumn(ColumnName = "rt1")]        
+        public int? Rt1 { get; set; }
+        
+        /// <summary>
+        /// 目标-人头2
+        /// </summary>
+        [SugarColumn(ColumnName = "rt2")]        
+        public int? Rt2 { get; set; }
+        
+        /// <summary>
+        /// 目标-人次
+        /// </summary>
+        [SugarColumn(ColumnName = "rc")]        
+        public int? Rc { get; set; }
+        
     }
 }
\ No newline at end of file
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_xmzl/LqXmzlEntity.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_xmzl/LqXmzlEntity.cs
index 8873cb5..378d958 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_xmzl/LqXmzlEntity.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_xmzl/LqXmzlEntity.cs
@@ -113,5 +113,22 @@ namespace NCC.Extend.Entitys.lq_xmzl
         [SugarColumn(ColumnName = "cellje")]        
         public decimal? Cellje { get; set; }
         
+        /// <summary>
+        /// 手工费
+        /// </summary>
+        [SugarColumn(ColumnName = "sgf")]        
+        public decimal? Sgf { get; set; }
+
+        /// <summary>
+        /// 项目次数
+        /// </summary>
+        [SugarColumn(ColumnName = "F_ProjectNumber")]        
+        public int? ProjectNumber { get; set; }
+
+        /// <summary>
+        /// 来源类型
+        /// </summary>
+        [SugarColumn(ColumnName = "F_SourceType")]        
+        public string SourceType { get; set; }
     }
 }
\ No newline at end of file
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_ycsd_mdmbsd/LqYcsdMdmbsdEntity.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_ycsd_mdmbsd/LqYcsdMdmbsdEntity.cs
deleted file mode 100644
index e337970..0000000
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_ycsd_mdmbsd/LqYcsdMdmbsdEntity.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-using NCC.Common.Const;
-using SqlSugar;
-using System;
-
-namespace NCC.Extend.Entitys.lq_ycsd_mdmbsd
-{
-    /// <summary>
-    /// 门店目标设定
-    /// </summary>
-    [SugarTable("lq_ycsd_mdmbsd")]
-    [Tenant(ClaimConst.TENANT_ID)]
-    public class LqYcsdMdmbsdEntity
-    {
-        /// <summary>
-        /// 目标编号
-        /// </summary>
-        [SugarColumn(ColumnName = "F_Id", IsPrimaryKey = true)]
-        public string Id { get; set; }
-        
-        /// <summary>
-        /// 目标-销售业绩
-        /// </summary>
-        [SugarColumn(ColumnName = "xsyj")]        
-        public string Xsyj { get; set; }
-        
-        /// <summary>
-        /// 目标-消耗业绩
-        /// </summary>
-        [SugarColumn(ColumnName = "xhyj")]        
-        public string Xhyj { get; set; }
-        
-        /// <summary>
-        /// 目标-项目数
-        /// </summary>
-        [SugarColumn(ColumnName = "xms")]        
-        public string Xms { get; set; }
-        
-        /// <summary>
-        /// 目标-人头
-        /// </summary>
-        [SugarColumn(ColumnName = "rt")]        
-        public string Rt { get; set; }
-        
-        /// <summary>
-        /// 目标-人次
-        /// </summary>
-        [SugarColumn(ColumnName = "rc")]        
-        public string Rc { get; set; }
-        
-        /// <summary>
-        /// 目标分类（个人门店天王）
-        /// </summary>
-        [SugarColumn(ColumnName = "mbfl")]        
-        public string Mbfl { get; set; }
-        
-        /// <summary>
-        /// 具体对应
-        /// </summary>
-        [SugarColumn(ColumnName = "jtdy")]        
-        public string Jtdy { get; set; }
-        
-    }
-}
\ No newline at end of file
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Mapper/LqHyglMapper.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Mapper/LqHyglMapper.cs
deleted file mode 100644
index 8d895b1..0000000
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Mapper/LqHyglMapper.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using NCC.Common.Helper;
-using NCC.Extend.Entitys.Dto.LqHygl;
-using Mapster;
-using System.Collections.Generic;
-
-namespace NCC.Extend.Entitys.Mapper.LqHygl
-{
-	public class Mapper : IRegister
-	{
-		public void Register(TypeAdapterConfig config)
-		{
-			
-		}
-	}
-}
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Mapper/LqYcsdMdmbsdMapper.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Mapper/LqYcsdMdmbsdMapper.cs
deleted file mode 100644
index 2edfd76..0000000
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Mapper/LqYcsdMdmbsdMapper.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using NCC.Common.Helper;
-using NCC.Extend.Entitys.Dto.LqYcsdMdmbsd;
-using Mapster;
-using System.Collections.Generic;
-
-namespace NCC.Extend.Entitys.Mapper.LqYcsdMdmbsd
-{
-	public class Mapper : IRegister
-	{
-		public void Register(TypeAdapterConfig config)
-		{
-		}
-	}
-}
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Interfaces/ILqHyglService.cs b/netcore/src/Modularity/Extend/NCC.Extend.Interfaces/ILqHyglService.cs
deleted file mode 100644
index 539dde5..0000000
--- a/netcore/src/Modularity/Extend/NCC.Extend.Interfaces/ILqHyglService.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace NCC.Extend.Interfaces.LqHygl
-{
-    public interface ILqHyglService
-    {
-    }
-}
\ No newline at end of file
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Interfaces/ILqYcsdMdmbsdService.cs b/netcore/src/Modularity/Extend/NCC.Extend.Interfaces/ILqYcsdMdmbsdService.cs
deleted file mode 100644
index a8827cc..0000000
--- a/netcore/src/Modularity/Extend/NCC.Extend.Interfaces/ILqYcsdMdmbsdService.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace NCC.Extend.Interfaces.LqYcsdMdmbsd
-{
-    public interface ILqYcsdMdmbsdService
-    {
-    }
-}
\ No newline at end of file
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Interfaces/LqZjlMdsmxsz/ILqZjlMdsmxszService.cs b/netcore/src/Modularity/Extend/NCC.Extend.Interfaces/LqZjlMdsmxsz/ILqZjlMdsmxszService.cs
index 73c494f..6ec520f 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Interfaces/LqZjlMdsmxsz/ILqZjlMdsmxszService.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Interfaces/LqZjlMdsmxsz/ILqZjlMdsmxszService.cs
@@ -21,5 +21,12 @@ namespace NCC.Extend.Interfaces.LqZjlMdsmxsz
         /// <param name="input">批量创建输入参数</param>
         /// <returns>创建结果</returns>
         Task<dynamic> BatchCreate(LqZjlMdsmxszBatchCreateInput input);
+
+        /// <summary>
+        /// 获取所有总经理门店生命线设置数据（分页查询）
+        /// </summary>
+        /// <param name="input">查询输入参数</param>
+        /// <returns>分页数据</returns>
+        Task<dynamic> GetPageList(LqZjlMdsmxszListQueryInput input);
     }
 }
diff --git a/netcore/src/Modularity/Extend/NCC.Extend/LqHyglService.cs b/netcore/src/Modularity/Extend/NCC.Extend/LqHyglService.cs
deleted file mode 100644
index b553e1e..0000000
--- a/netcore/src/Modularity/Extend/NCC.Extend/LqHyglService.cs
+++ /dev/null
@@ -1,289 +0,0 @@
-using NCC.Common.Core.Manager;
-using NCC.Common.Enum;
-using NCC.Common.Extension;
-using NCC.Common.Filter;
-using NCC.Dependency;
-using NCC.DynamicApiController;
-using NCC.FriendlyException;
-using NCC.Extend.Interfaces.LqHygl;
-using Mapster;
-using Microsoft.AspNetCore.Mvc;
-using SqlSugar;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using NCC.Extend.Entitys.lq_hygl;
-using NCC.Extend.Entitys.Dto.LqHygl;
-using Yitter.IdGenerator;
-using NCC.Common.Helper;
-using NCC.JsonSerialization;
-using NCC.Common.Model.NPOI;
-using NCC.Common.Configuration;
-using NCC.DataEncryption;
-using NCC.ClayObject;
-
-namespace NCC.Extend.LqHygl
-{
-    /// <summary>
-    /// 会员管理服务
-    /// </summary>
-    [ApiDescriptionSettings(Tag = "Extend",Name = "LqHygl", Order = 200)]
-    [Route("api/Extend/[controller]")]
-    public class LqHyglService : ILqHyglService, IDynamicApiController, ITransient
-    {
-        private readonly ISqlSugarRepository<LqHyglEntity> _lqHyglRepository;
-        private readonly SqlSugarScope _db;
-        private readonly IUserManager _userManager;
-
-        /// <summary>
-        /// 初始化一个<see cref="LqHyglService"/>类型的新实例
-        /// </summary>
-        public LqHyglService(
-            ISqlSugarRepository<LqHyglEntity> lqHyglRepository,
-            IUserManager userManager)
-        {
-            _lqHyglRepository = lqHyglRepository;            
-            _db = _lqHyglRepository.Context;
-            _userManager = userManager;
-        }
-
-        /// <summary>
-        /// 获取会员管理
-        /// </summary>
-        /// <param name="id">参数</param>
-        /// <returns></returns>
-        [HttpGet("{id}")]
-        public async Task<dynamic> GetInfo(string id)
-        {
-            var entity = await _db.Queryable<LqHyglEntity>().FirstAsync(p => p.Id == id);
-            var output = entity.Adapt<LqHyglInfoOutput>();
-            return output;
-        }
-
-        /// <summary>
-		/// 获取会员管理列表
-		/// </summary>
-		/// <param name="input">请求参数</param>
-		/// <returns></returns>
-        [HttpGet("")]
-        public async Task<dynamic> GetList([FromQuery] LqHyglListQueryInput input)
-        {
-            var sidx = input.sidx == null ? "id" : input.sidx;
-            List<string> queryYin = input.yin != null ? input.yin.Split(',').ToObeject<List<string>>() : null;
-            DateTime? startYin = queryYin != null ? Ext.GetDateTime(queryYin.First()) : null;
-            DateTime? endYin = queryYin != null ? Ext.GetDateTime(queryYin.Last()) : null;
-            List<string> queryYang = input.yang != null ? input.yang.Split(',').ToObeject<List<string>>() : null;
-            DateTime? startYang = queryYang != null ? Ext.GetDateTime(queryYang.First()) : null;
-            DateTime? endYang = queryYang != null ? Ext.GetDateTime(queryYang.Last()) : null;
-            var data = await _db.Queryable<LqHyglEntity>()
-                .WhereIF(!string.IsNullOrEmpty(input.id), p => p.Id.Contains(input.id))
-                .WhereIF(!string.IsNullOrEmpty(input.xm), p => p.Xm.Contains(input.xm))
-                .WhereIF(!string.IsNullOrEmpty(input.xb), p => p.Xb.Equals(input.xb))
-                .WhereIF(!string.IsNullOrEmpty(input.sjh), p => p.Sjh.Contains(input.sjh))
-                .WhereIF(!string.IsNullOrEmpty(input.zy), p => p.Zy.Contains(input.zy))
-                .WhereIF(!string.IsNullOrEmpty(input.jdqd), p => p.Jdqd.Equals(input.jdqd))
-                .WhereIF(!string.IsNullOrEmpty(input.nl), p => p.Nl.Contains(input.nl))
-                .WhereIF(!string.IsNullOrEmpty(input.tjr), p => p.Tjr.Contains(input.tjr))
-                .WhereIF(queryYin != null, p => p.Yin >= new DateTime(startYin.ToDate().Year, startYin.ToDate().Month, startYin.ToDate().Day, 0, 0, 0))
-                .WhereIF(queryYin != null, p => p.Yin <= new DateTime(endYin.ToDate().Year, endYin.ToDate().Month, endYin.ToDate().Day, 23, 59, 59))
-                .WhereIF(queryYang != null, p => p.Yang >= new DateTime(startYang.ToDate().Year, startYang.ToDate().Month, startYang.ToDate().Day, 0, 0, 0))
-                .WhereIF(queryYang != null, p => p.Yang <= new DateTime(endYang.ToDate().Year, endYang.ToDate().Month, endYang.ToDate().Day, 23, 59, 59))
-                .WhereIF(!string.IsNullOrEmpty(input.jks), p => p.Jks.Contains(input.jks))
-                .WhereIF(!string.IsNullOrEmpty(input.hygw), p => p.Hygw.Contains(input.hygw))
-                .WhereIF(!string.IsNullOrEmpty(input.bq), p => p.Bq.Contains(input.bq))
-                .WhereIF(!string.IsNullOrEmpty(input.ah), p => p.Ah.Contains(input.ah))
-                .WhereIF(!string.IsNullOrEmpty(input.qt), p => p.Qt.Contains(input.qt))
-                .Select(it=> new LqHyglListOutput
-                {
-                    id = it.Id,
-                    xm=it.Xm,
-                    xb=it.Xb,
-                    sjh=it.Sjh,
-                    zy=it.Zy,
-                    jdqd=it.Jdqd,
-                    nl=it.Nl,
-                    tjr=it.Tjr,
-                    yin=it.Yin,
-                    yang=it.Yang,
-                    jks=it.Jks,
-                    hygw=it.Hygw,
-                    bq=it.Bq,
-                    ah=it.Ah,
-                    qt=it.Qt,
-                }).MergeTable().OrderBy(sidx+" "+input.sort).ToPagedListAsync(input.currentPage, input.pageSize);
-                return PageResult<LqHyglListOutput>.SqlSugarPageResult(data);
-        }
-
-        /// <summary>
-        /// 新建会员管理
-        /// </summary>
-        /// <param name="input">参数</param>
-        /// <returns></returns>
-        [HttpPost("")]
-        public async Task Create([FromBody] LqHyglCrInput input)
-        {
-            var userInfo = await _userManager.GetUserInfo();
-            var entity = input.Adapt<LqHyglEntity>();
-            entity.Id = YitIdHelper.NextId().ToString();
-            var isOk = await _db.Insertable(entity).IgnoreColumns(ignoreNullColumn: true).ExecuteCommandAsync();
-            if (!(isOk > 0)) throw NCCException.Oh(ErrorCode.COM1000);
-        }
-
-        /// <summary>
-		/// 获取会员管理无分页列表
-		/// </summary>
-		/// <param name="input">请求参数</param>
-		/// <returns></returns>
-        [NonAction]
-        public async Task<dynamic> GetNoPagingList([FromQuery] LqHyglListQueryInput input)
-        {
-            var sidx = input.sidx == null ? "id" : input.sidx;
-            List<string> queryYin = input.yin != null ? input.yin.Split(',').ToObeject<List<string>>() : null;
-            DateTime? startYin = queryYin != null ? Ext.GetDateTime(queryYin.First()) : null;
-            DateTime? endYin = queryYin != null ? Ext.GetDateTime(queryYin.Last()) : null;
-            List<string> queryYang = input.yang != null ? input.yang.Split(',').ToObeject<List<string>>() : null;
-            DateTime? startYang = queryYang != null ? Ext.GetDateTime(queryYang.First()) : null;
-            DateTime? endYang = queryYang != null ? Ext.GetDateTime(queryYang.Last()) : null;
-            var data = await _db.Queryable<LqHyglEntity>()
-                .WhereIF(!string.IsNullOrEmpty(input.id), p => p.Id.Contains(input.id))
-                .WhereIF(!string.IsNullOrEmpty(input.xm), p => p.Xm.Contains(input.xm))
-                .WhereIF(!string.IsNullOrEmpty(input.xb), p => p.Xb.Equals(input.xb))
-                .WhereIF(!string.IsNullOrEmpty(input.sjh), p => p.Sjh.Contains(input.sjh))
-                .WhereIF(!string.IsNullOrEmpty(input.zy), p => p.Zy.Contains(input.zy))
-                .WhereIF(!string.IsNullOrEmpty(input.jdqd), p => p.Jdqd.Equals(input.jdqd))
-                .WhereIF(!string.IsNullOrEmpty(input.nl), p => p.Nl.Contains(input.nl))
-                .WhereIF(!string.IsNullOrEmpty(input.tjr), p => p.Tjr.Contains(input.tjr))
-                .WhereIF(queryYin != null, p => p.Yin >= new DateTime(startYin.ToDate().Year, startYin.ToDate().Month, startYin.ToDate().Day, 0, 0, 0))
-                .WhereIF(queryYin != null, p => p.Yin <= new DateTime(endYin.ToDate().Year, endYin.ToDate().Month, endYin.ToDate().Day, 23, 59, 59))
-                .WhereIF(queryYang != null, p => p.Yang >= new DateTime(startYang.ToDate().Year, startYang.ToDate().Month, startYang.ToDate().Day, 0, 0, 0))
-                .WhereIF(queryYang != null, p => p.Yang <= new DateTime(endYang.ToDate().Year, endYang.ToDate().Month, endYang.ToDate().Day, 23, 59, 59))
-                .WhereIF(!string.IsNullOrEmpty(input.jks), p => p.Jks.Contains(input.jks))
-                .WhereIF(!string.IsNullOrEmpty(input.hygw), p => p.Hygw.Contains(input.hygw))
-                .WhereIF(!string.IsNullOrEmpty(input.bq), p => p.Bq.Contains(input.bq))
-                .WhereIF(!string.IsNullOrEmpty(input.ah), p => p.Ah.Contains(input.ah))
-                .WhereIF(!string.IsNullOrEmpty(input.qt), p => p.Qt.Contains(input.qt))
-                .Select(it=> new LqHyglListOutput
-                {
-                    id = it.Id,
-                    xm=it.Xm,
-                    xb=it.Xb,
-                    sjh=it.Sjh,
-                    zy=it.Zy,
-                    jdqd=it.Jdqd,
-                    nl=it.Nl,
-                    tjr=it.Tjr,
-                    yin=it.Yin,
-                    yang=it.Yang,
-                    jks=it.Jks,
-                    hygw=it.Hygw,
-                    bq=it.Bq,
-                    ah=it.Ah,
-                    qt=it.Qt,
-                }).MergeTable().OrderBy(sidx+" "+input.sort).ToListAsync();
-                return data;
-        }
-
-        /// <summary>
-		/// 导出会员管理
-		/// </summary>
-		/// <param name="input">请求参数</param>
-		/// <returns></returns>
-        [HttpGet("Actions/Export")]
-        public async Task<dynamic> Export([FromQuery] LqHyglListQueryInput input)
-        {
-            var userInfo = await _userManager.GetUserInfo();
-            var exportData = new List<LqHyglListOutput>();
-            if (input.dataType == 0)
-            {
-                var data = Clay.Object(await this.GetList(input));
-                exportData = data.Solidify<PageResult<LqHyglListOutput>>().list;
-            }
-            else
-            {
-                exportData = await this.GetNoPagingList(input);
-            }
-            List<ParamsModel> paramList = "[{\"value\":\"会员编号\",\"field\":\"id\"},{\"value\":\"姓名\",\"field\":\"xm\"},{\"value\":\"性别\",\"field\":\"xb\"},{\"value\":\"手机号\",\"field\":\"sjh\"},{\"value\":\"职业\",\"field\":\"zy\"},{\"value\":\"进店渠道\",\"field\":\"jdqd\"},{\"value\":\"年龄\",\"field\":\"nl\"},{\"value\":\"阴历生日\",\"field\":\"yin\"},{\"value\":\"阳历生日\",\"field\":\"yang\"},{\"value\":\"推荐人\",\"field\":\"tjr\"},{\"value\":\"健康师\",\"field\":\"jks\"},{\"value\":\"会员顾问\",\"field\":\"hygw\"},{\"value\":\"标签\",\"field\":\"bq\"},{\"value\":\"爱好\",\"field\":\"ah\"},{\"value\":\"其它\",\"field\":\"qt\"},]".ToList<ParamsModel>();           
-            ExcelConfig excelconfig = new ExcelConfig();
-            excelconfig.FileName = "会员管理.xls";
-            excelconfig.HeadFont = "微软雅黑";
-            excelconfig.HeadPoint = 10;
-            excelconfig.IsAllSizeColumn = true;
-            excelconfig.ColumnModel = new List<ExcelColumnModel>();
-            List<string> selectKeyList = input.selectKey.Split(',').ToList();
-            foreach (var item in selectKeyList)
-            {
-                var isExist = paramList.Find(p => p.field == item);
-                if (isExist != null)
-                {
-                    excelconfig.ColumnModel.Add(new ExcelColumnModel() { Column = isExist.field, ExcelColumn = isExist.value });
-                }
-            }
-            var addPath = FileVariable.TemporaryFilePath + excelconfig.FileName;
-            ExcelExportHelper<LqHyglListOutput>.Export(exportData, excelconfig, addPath);
-            var fileName = _userManager.UserId + "|" + addPath + "|xls";
-            var output = new
-            {
-                name = excelconfig.FileName,
-                url = "/api/File/Download?encryption=" + DESCEncryption.Encrypt(fileName, "NCC")
-            };
-            return output;
-        }
-
-        /// <summary>
-        /// 批量删除会员管理
-        /// </summary>
-        /// <param name="ids">主键数组</param>
-        /// <returns></returns>
-        [HttpPost("batchRemove")]
-        public async Task BatchRemove([FromBody] List<string> ids)
-        {
-            var entitys = await _db.Queryable<LqHyglEntity>().In(it => it.Id, ids).ToListAsync();
-            if (entitys.Count > 0)
-            {
-                try
-                {
-                    //开启事务
-                    _db.BeginTran();
-                    //批量删除会员管理
-                    await _db.Deleteable<LqHyglEntity>().In(d => d.Id,ids).ExecuteCommandAsync();
-                    //关闭事务
-                    _db.CommitTran();
-                }
-                catch (Exception)
-                {
-                    //回滚事务
-                    _db.RollbackTran();
-                    throw NCCException.Oh(ErrorCode.COM1002);
-                }
-            }
-        }
-
-        /// <summary>
-        /// 更新会员管理
-        /// </summary>
-        /// <param name="id">主键</param>
-        /// <param name="input">参数</param>
-        /// <returns></returns>
-        [HttpPut("{id}")]
-        public async Task Update(string id, [FromBody] LqHyglUpInput input)
-        {
-            var entity = input.Adapt<LqHyglEntity>();
-            var isOk = await _db.Updateable(entity).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync();
-            if (!(isOk > 0)) throw NCCException.Oh(ErrorCode.COM1001);
-        }
-
-        /// <summary>
-        /// 删除会员管理
-        /// </summary>
-        /// <returns></returns>
-        [HttpDelete("{id}")]
-        public async Task Delete(string id)
-        {
-            var entity = await _db.Queryable<LqHyglEntity>().FirstAsync(p => p.Id == id);
-            _ = entity ?? throw NCCException.Oh(ErrorCode.COM1005);
-            var isOk = await _db.Deleteable<LqHyglEntity>().Where(d => d.Id == id).ExecuteCommandAsync();
-            if (!(isOk > 0)) throw NCCException.Oh(ErrorCode.COM1002);
-        }
-    }
-}
diff --git a/netcore/src/Modularity/Extend/NCC.Extend/LqKdKdjlbService.cs b/netcore/src/Modularity/Extend/NCC.Extend/LqKdKdjlbService.cs
index 308b86c..818f22d 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend/LqKdKdjlbService.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend/LqKdKdjlbService.cs
@@ -27,13 +27,15 @@ using NCC.DataEncryption;
 using NCC.ClayObject;
 using NCC.Extend.Utils;
 using System.Net.Http;
+using NCC.Extend.Entitys.lq_jinsanjiao_user;
+using NCC.Extend.Entitys.lq_xmzl;
 
 namespace NCC.Extend.LqKdKdjlb
 {
     /// <summary>
     /// 开单记录表服务
     /// </summary>
-    [ApiDescriptionSettings(Tag = "Extend",Name = "LqKdKdjlb", Order = 200)]
+    [ApiDescriptionSettings(Tag = "绿纤开单记录表服务", Name = "LqKdKdjlb", Order = 200)]
     [Route("api/Extend/[controller]")]
     public class LqKdKdjlbService : ILqKdKdjlbService, IDynamicApiController, ITransient
     {
@@ -58,7 +60,7 @@ namespace NCC.Extend.LqKdKdjlb
             WeChatBotService weChatBotService,
             LqKdKdjlbStringGenerator stringGenerator)
         {
-            _lqKdKdjlbRepository = lqKdKdjlbRepository;            
+            _lqKdKdjlbRepository = lqKdKdjlbRepository;
             _db = _lqKdKdjlbRepository.Context;
             _lqKdJksyjRepository = lqKdJksyjRepository;
             _lqKdKjbsyjRepository = lqKdKjbsyjRepository;
@@ -67,7 +69,7 @@ namespace NCC.Extend.LqKdKdjlb
             _weChatBotService = weChatBotService;
             _stringGenerator = stringGenerator;
         }
-
+        #region 获取开单记录表
         /// <summary>
         /// 获取开单记录表
         /// </summary>
@@ -78,18 +80,20 @@ namespace NCC.Extend.LqKdKdjlb
         {
             var entity = await _db.Queryable<LqKdKdjlbEntity>().FirstAsync(p => p.Id == id);
             var output = entity.Adapt<LqKdKdjlbInfoOutput>();
-            
+
             var lqKdJksyjList = await _db.Queryable<LqKdJksyjEntity>().Where(w => w.Glkdbh == entity.Id).ToListAsync();
             output.lqKdJksyjList = lqKdJksyjList.Adapt<List<LqKdJksyjInfoOutput>>();
-            
+
             var lqKdKjbsyjList = await _db.Queryable<LqKdKjbsyjEntity>().Where(w => w.Glkdbh == entity.Id).ToListAsync();
             output.lqKdKjbsyjList = lqKdKjbsyjList.Adapt<List<LqKdKjbsyjInfoOutput>>();
-            
+
             var lqKdPxmxList = await _db.Queryable<LqKdPxmxEntity>().Where(w => w.Glkdbh == entity.Id).ToListAsync();
             output.lqKdPxmxList = lqKdPxmxList.Adapt<List<LqKdPxmxInfoOutput>>();
             return output;
         }
+        #endregion
 
+        #region 获取开单记录表列表
         /// <summary>
 		/// 获取开单记录表列表
 		/// </summary>
@@ -129,37 +133,39 @@ namespace NCC.Extend.LqKdKdjlb
                 .WhereIF(!string.IsNullOrEmpty(input.jksyj), p => p.Jksyj.Contains(input.jksyj))
                 .WhereIF(!string.IsNullOrEmpty(input.kjblsyj), p => p.Kjblsyj.Contains(input.kjblsyj))
                 .WhereIF(!string.IsNullOrEmpty(input.pxxx), p => p.Pxxx.Contains(input.pxxx))
-                .Select(it=> new LqKdKdjlbListOutput
+                .Select(it => new LqKdKdjlbListOutput
                 {
                     id = it.Id,
-                    djmd=it.Djmd,
-                    jsj=it.Jsj,
-                    kdrq=it.Kdrq,
-                    gjlx=it.Gjlx,
-                    hgjg=it.Hgjg,
-                    zdyj=it.Zdyj,
-                    sfyj=it.Sfyj,
-                    qk=it.Qk,
-                    ckfs=it.Ckfs,
-                    ckmx=it.Ckmx,
-                    fkfs=it.Fkfs,
-                    fkyy=it.Fkyy,
-                    fkpd=it.Fkpd,
-                    khly=it.Khly,
-                    tjr=it.Tjr,
-                    sfskdd=it.Sfskdd,
-                    jj=it.Jj,
-                    bz=it.Bz,
-                    kdhy=it.Kdhy,
-                    kdhyc=it.Kdhyc,
-                    kdhysjh=it.Kdhysjh,
-                    jksyj=it.Jksyj,
-                    kjblsyj=it.Kjblsyj,
-                    pxxx=it.Pxxx,
-                }).MergeTable().OrderBy(sidx+" "+input.sort).ToPagedListAsync(input.currentPage, input.pageSize);
-                return PageResult<LqKdKdjlbListOutput>.SqlSugarPageResult(data);
+                    djmd = it.Djmd,
+                    jsj = it.Jsj,
+                    kdrq = it.Kdrq,
+                    gjlx = it.Gjlx,
+                    hgjg = it.Hgjg,
+                    zdyj = it.Zdyj,
+                    sfyj = it.Sfyj,
+                    qk = it.Qk,
+                    ckfs = it.Ckfs,
+                    ckmx = it.Ckmx,
+                    fkfs = it.Fkfs,
+                    fkyy = it.Fkyy,
+                    fkpd = it.Fkpd,
+                    khly = it.Khly,
+                    tjr = it.Tjr,
+                    sfskdd = it.Sfskdd,
+                    jj = it.Jj,
+                    bz = it.Bz,
+                    kdhy = it.Kdhy,
+                    kdhyc = it.Kdhyc,
+                    kdhysjh = it.Kdhysjh,
+                    jksyj = it.Jksyj,
+                    kjblsyj = it.Kjblsyj,
+                    pxxx = it.Pxxx,
+                }).MergeTable().OrderBy(sidx + " " + input.sort).ToPagedListAsync(input.currentPage, input.pageSize);
+            return PageResult<LqKdKdjlbListOutput>.SqlSugarPageResult(data);
         }
+        #endregion
 
+        #region 新建开单记录表
         /// <summary>
         /// 新建开单记录表
         /// </summary>
@@ -175,23 +181,25 @@ namespace NCC.Extend.LqKdKdjlb
             {
                 //开启事务
                 _db.BeginTran();
-                
                 //新增开单记录表记录
+                entity.CreateUser = userInfo.userId;
                 var newEntity = await _db.Insertable(entity).IgnoreColumns(ignoreNullColumn: true).ExecuteReturnEntityAsync();
-
                 var lqKdJksyjEntityList = input.lqKdJksyjList.Adapt<List<LqKdJksyjEntity>>();
-                if(lqKdJksyjEntityList != null)
+                //保存健康师业绩
+                if (lqKdJksyjEntityList != null)
                 {
                     foreach (var item in lqKdJksyjEntityList)
                     {
                         item.Id = YitIdHelper.NextId().ToString();
                         item.Glkdbh = newEntity.Id;
+                        item.Yjsj = DateTime.Now;
+                        item.Jsj_id = _db.Queryable<LqJinsanjiaoUserEntity>().Where(w => w.UserId == item.Jks && w.Month == DateTime.Now.ToString("yyyyMM")).FirstAsync().Result.JsjId;
                     }
                     await _db.Insertable(lqKdJksyjEntityList).ExecuteCommandAsync();
                 }
-
+                //保存科技部老师业绩
                 var lqKdKjbsyjEntityList = input.lqKdKjbsyjList.Adapt<List<LqKdKjbsyjEntity>>();
-                if(lqKdKjbsyjEntityList != null)
+                if (lqKdKjbsyjEntityList != null)
                 {
                     foreach (var item in lqKdKjbsyjEntityList)
                     {
@@ -202,19 +210,23 @@ namespace NCC.Extend.LqKdKdjlb
                 }
 
                 var lqKdPxmxEntityList = input.lqKdPxmxList.Adapt<List<LqKdPxmxEntity>>();
-                if(lqKdPxmxEntityList != null)
+                if (lqKdPxmxEntityList != null)
                 {
                     foreach (var item in lqKdPxmxEntityList)
                     {
                         item.Id = YitIdHelper.NextId().ToString();
                         item.Glkdbh = newEntity.Id;
+                        item.CreateTIme = DateTime.Now;
+                        item.MemberId = entity.Kdhy;
+                        item.ProjectNumber = _db.Queryable<LqXmzlEntity>().Where(w => w.Id == item.Px).FirstAsync().Result.ProjectNumber;
+                        item.IsEnabled = 0;
                     }
                     await _db.Insertable(lqKdPxmxEntityList).ExecuteCommandAsync();
                 }
 
                 //关闭事务
                 _db.CommitTran();
-                
+
                 // 生成开单记录字符串并发送到企业微信
                 try
                 {
@@ -224,7 +236,7 @@ namespace NCC.Extend.LqKdKdjlb
                         var orderRecordString = _stringGenerator.GenerateOrderRecordString(entityInfo);
                         Console.WriteLine("开单记录字符串生成成功:");
                         Console.WriteLine(orderRecordString);
-                        
+
                         // 发送到企业微信群
                         try
                         {
@@ -257,7 +269,9 @@ namespace NCC.Extend.LqKdKdjlb
                 throw NCCException.Oh(ErrorCode.COM1000);
             }
         }
+        #endregion
 
+        #region 获取开单记录表无分页列表
         /// <summary>
 		/// 获取开单记录表无分页列表
 		/// </summary>
@@ -297,37 +311,39 @@ namespace NCC.Extend.LqKdKdjlb
                 .WhereIF(!string.IsNullOrEmpty(input.jksyj), p => p.Jksyj.Contains(input.jksyj))
                 .WhereIF(!string.IsNullOrEmpty(input.kjblsyj), p => p.Kjblsyj.Contains(input.kjblsyj))
                 .WhereIF(!string.IsNullOrEmpty(input.pxxx), p => p.Pxxx.Contains(input.pxxx))
-                .Select(it=> new LqKdKdjlbListOutput
+                .Select(it => new LqKdKdjlbListOutput
                 {
                     id = it.Id,
-                    djmd=it.Djmd,
-                    jsj=it.Jsj,
-                    kdrq=it.Kdrq,
-                    gjlx=it.Gjlx,
-                    hgjg=it.Hgjg,
-                    zdyj=it.Zdyj,
-                    sfyj=it.Sfyj,
-                    qk=it.Qk,
-                    ckfs=it.Ckfs,
-                    ckmx=it.Ckmx,
-                    fkfs=it.Fkfs,
-                    fkyy=it.Fkyy,
-                    fkpd=it.Fkpd,
-                    khly=it.Khly,
-                    tjr=it.Tjr,
-                    sfskdd=it.Sfskdd,
-                    jj=it.Jj,
-                    bz=it.Bz,
-                    kdhy=it.Kdhy,
-                    kdhyc=it.Kdhyc,
-                    kdhysjh=it.Kdhysjh,
-                    jksyj=it.Jksyj,
-                    kjblsyj=it.Kjblsyj,
-                    pxxx=it.Pxxx,
-                }).MergeTable().OrderBy(sidx+" "+input.sort).ToListAsync();
-                return data;
+                    djmd = it.Djmd,
+                    jsj = it.Jsj,
+                    kdrq = it.Kdrq,
+                    gjlx = it.Gjlx,
+                    hgjg = it.Hgjg,
+                    zdyj = it.Zdyj,
+                    sfyj = it.Sfyj,
+                    qk = it.Qk,
+                    ckfs = it.Ckfs,
+                    ckmx = it.Ckmx,
+                    fkfs = it.Fkfs,
+                    fkyy = it.Fkyy,
+                    fkpd = it.Fkpd,
+                    khly = it.Khly,
+                    tjr = it.Tjr,
+                    sfskdd = it.Sfskdd,
+                    jj = it.Jj,
+                    bz = it.Bz,
+                    kdhy = it.Kdhy,
+                    kdhyc = it.Kdhyc,
+                    kdhysjh = it.Kdhysjh,
+                    jksyj = it.Jksyj,
+                    kjblsyj = it.Kjblsyj,
+                    pxxx = it.Pxxx,
+                }).MergeTable().OrderBy(sidx + " " + input.sort).ToListAsync();
+            return data;
         }
+        #endregion
 
+        #region 导出开单记录表
         /// <summary>
 		/// 导出开单记录表
 		/// </summary>
@@ -347,7 +363,7 @@ namespace NCC.Extend.LqKdKdjlb
             {
                 exportData = await this.GetNoPagingList(input);
             }
-            List<ParamsModel> paramList = "[{\"value\":\"开单编号\",\"field\":\"id\"},{\"value\":\"开单会员\",\"field\":\"kdhy\"},{\"value\":\"开单会员名称\",\"field\":\"kdhyc\"},{\"value\":\"会员手机号\",\"field\":\"kdhysjh\"},{\"value\":\"单据门店\",\"field\":\"djmd\"},{\"value\":\"金三角\",\"field\":\"jsj\"},{\"value\":\"开单日期\",\"field\":\"kdrq\"},{\"value\":\"顾客类型\",\"field\":\"gjlx\"},{\"value\":\"合作机构\",\"field\":\"hgjg\"},{\"value\":\"整单业绩\",\"field\":\"zdyj\"},{\"value\":\"实付业绩\",\"field\":\"sfyj\"},{\"value\":\"欠款\",\"field\":\"qk\"},{\"value\":\"储扣方式\",\"field\":\"ckfs\"},{\"value\":\"储扣明细\",\"field\":\"ckmx\"},{\"value\":\"付款方式\",\"field\":\"fkfs\"},{\"value\":\"付款医院\",\"field\":\"fkyy\"},{\"value\":\"付款判断\",\"field\":\"fkpd\"},{\"value\":\"客户来源\",\"field\":\"khly\"},{\"value\":\"推荐人\",\"field\":\"tjr\"},{\"value\":\"是否首开订单\",\"field\":\"sfskdd\"},{\"value\":\"简介\",\"field\":\"jj\"},{\"value\":\"备注\",\"field\":\"bz\"},{\"value\":\"健康师业绩\",\"field\":\"jksyj\"},{\"value\":\"科技部老师业绩\",\"field\":\"kjblsyj\"},{\"value\":\"品项信息\",\"field\":\"pxxx\"},]".ToList<ParamsModel>();           
+            List<ParamsModel> paramList = "[{\"value\":\"开单编号\",\"field\":\"id\"},{\"value\":\"开单会员\",\"field\":\"kdhy\"},{\"value\":\"开单会员名称\",\"field\":\"kdhyc\"},{\"value\":\"会员手机号\",\"field\":\"kdhysjh\"},{\"value\":\"单据门店\",\"field\":\"djmd\"},{\"value\":\"金三角\",\"field\":\"jsj\"},{\"value\":\"开单日期\",\"field\":\"kdrq\"},{\"value\":\"顾客类型\",\"field\":\"gjlx\"},{\"value\":\"合作机构\",\"field\":\"hgjg\"},{\"value\":\"整单业绩\",\"field\":\"zdyj\"},{\"value\":\"实付业绩\",\"field\":\"sfyj\"},{\"value\":\"欠款\",\"field\":\"qk\"},{\"value\":\"储扣方式\",\"field\":\"ckfs\"},{\"value\":\"储扣明细\",\"field\":\"ckmx\"},{\"value\":\"付款方式\",\"field\":\"fkfs\"},{\"value\":\"付款医院\",\"field\":\"fkyy\"},{\"value\":\"付款判断\",\"field\":\"fkpd\"},{\"value\":\"客户来源\",\"field\":\"khly\"},{\"value\":\"推荐人\",\"field\":\"tjr\"},{\"value\":\"是否首开订单\",\"field\":\"sfskdd\"},{\"value\":\"简介\",\"field\":\"jj\"},{\"value\":\"备注\",\"field\":\"bz\"},{\"value\":\"健康师业绩\",\"field\":\"jksyj\"},{\"value\":\"科技部老师业绩\",\"field\":\"kjblsyj\"},{\"value\":\"品项信息\",\"field\":\"pxxx\"},]".ToList<ParamsModel>();
             ExcelConfig excelconfig = new ExcelConfig();
             excelconfig.FileName = "开单记录表.xls";
             excelconfig.HeadFont = "微软雅黑";
@@ -373,7 +389,9 @@ namespace NCC.Extend.LqKdKdjlb
             };
             return output;
         }
+        #endregion
 
+        #region 批量删除开单记录表
         /// <summary>
         /// 批量删除开单记录表
         /// </summary>
@@ -390,16 +408,16 @@ namespace NCC.Extend.LqKdKdjlb
                     //开启事务
                     _db.BeginTran();
                     //批量删除开单记录表
-                    await _db.Deleteable<LqKdKdjlbEntity>().In(d => d.Id,ids).ExecuteCommandAsync();
+                    await _db.Deleteable<LqKdKdjlbEntity>().In(d => d.Id, ids).ExecuteCommandAsync();
 
                     //清空子表数据
-                    await _db.Deleteable<LqKdJksyjEntity>().In(u => u.Glkdbh,ids).ExecuteCommandAsync();
+                    await _db.Deleteable<LqKdJksyjEntity>().In(u => u.Glkdbh, ids).ExecuteCommandAsync();
 
                     //清空子表数据
-                    await _db.Deleteable<LqKdKjbsyjEntity>().In(u => u.Glkdbh,ids).ExecuteCommandAsync();
+                    await _db.Deleteable<LqKdKjbsyjEntity>().In(u => u.Glkdbh, ids).ExecuteCommandAsync();
 
                     //清空子表数据
-                    await _db.Deleteable<LqKdPxmxEntity>().In(u => u.Glkdbh,ids).ExecuteCommandAsync();
+                    await _db.Deleteable<LqKdPxmxEntity>().In(u => u.Glkdbh, ids).ExecuteCommandAsync();
                     //关闭事务
                     _db.CommitTran();
                 }
@@ -411,7 +429,9 @@ namespace NCC.Extend.LqKdKdjlb
                 }
             }
         }
+        #endregion
 
+        #region 更新开单记录表
         /// <summary>
         /// 更新开单记录表
         /// </summary>
@@ -426,7 +446,7 @@ namespace NCC.Extend.LqKdKdjlb
             {
                 //开启事务
                 _db.BeginTran();
-                
+
                 //更新开单记录表记录
                 await _db.Updateable(entity).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync();
 
@@ -434,7 +454,7 @@ namespace NCC.Extend.LqKdKdjlb
                 await _db.Deleteable<LqKdJksyjEntity>().Where(u => u.Glkdbh == id).ExecuteCommandAsync();
                 //新增新数据
                 var lqKdJksyjEntityList = input.lqKdJksyjList.Adapt<List<LqKdJksyjEntity>>();
-                if(lqKdJksyjEntityList != null)
+                if (lqKdJksyjEntityList != null)
                 {
                     foreach (var item in lqKdJksyjEntityList)
                     {
@@ -448,7 +468,7 @@ namespace NCC.Extend.LqKdKdjlb
                 await _db.Deleteable<LqKdKjbsyjEntity>().Where(u => u.Glkdbh == id).ExecuteCommandAsync();
                 //新增新数据
                 var lqKdKjbsyjEntityList = input.lqKdKjbsyjList.Adapt<List<LqKdKjbsyjEntity>>();
-                if(lqKdKjbsyjEntityList != null)
+                if (lqKdKjbsyjEntityList != null)
                 {
                     foreach (var item in lqKdKjbsyjEntityList)
                     {
@@ -462,7 +482,7 @@ namespace NCC.Extend.LqKdKdjlb
                 await _db.Deleteable<LqKdPxmxEntity>().Where(u => u.Glkdbh == id).ExecuteCommandAsync();
                 //新增新数据
                 var lqKdPxmxEntityList = input.lqKdPxmxList.Adapt<List<LqKdPxmxEntity>>();
-                if(lqKdPxmxEntityList != null)
+                if (lqKdPxmxEntityList != null)
                 {
                     foreach (var item in lqKdPxmxEntityList)
                     {
@@ -471,7 +491,7 @@ namespace NCC.Extend.LqKdKdjlb
                     }
                     await _db.Insertable(lqKdPxmxEntityList).ExecuteCommandAsync();
                 }
-                
+
                 //关闭事务
                 _db.CommitTran();
             }
@@ -482,7 +502,9 @@ namespace NCC.Extend.LqKdKdjlb
                 throw NCCException.Oh(ErrorCode.COM1001);
             }
         }
+        #endregion
 
+        #region 删除开单记录表
         /// <summary>
         /// 删除开单记录表
         /// </summary>
@@ -496,7 +518,7 @@ namespace NCC.Extend.LqKdKdjlb
             {
                 //开启事务
                 _db.BeginTran();
-                
+
                 //删除开单记录表记录
                 await _db.Deleteable<LqKdKdjlbEntity>().Where(d => d.Id == id).ExecuteCommandAsync();
 
@@ -508,7 +530,7 @@ namespace NCC.Extend.LqKdKdjlb
 
                 //清空子表数据
                 await _db.Deleteable<LqKdPxmxEntity>().Where(u => u.Glkdbh == id).ExecuteCommandAsync();
-                
+
                 //关闭事务
                 _db.CommitTran();
             }
@@ -519,6 +541,6 @@ namespace NCC.Extend.LqKdKdjlb
                 throw NCCException.Oh(ErrorCode.COM1002);
             }
         }
-
+        #endregion
     }
 }
diff --git a/netcore/src/Modularity/Extend/NCC.Extend/LqMdxxService.cs b/netcore/src/Modularity/Extend/NCC.Extend/LqMdxxService.cs
index 808858b..ef5118c 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend/LqMdxxService.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend/LqMdxxService.cs
@@ -28,7 +28,7 @@ namespace NCC.Extend.LqMdxx
     /// <summary>
     /// 门店信息服务
     /// </summary>
-    [ApiDescriptionSettings(Tag = "Extend",Name = "LqMdxx", Order = 200)]
+    [ApiDescriptionSettings(Tag = "绿纤门店信息服务",Name = "LqMdxx", Order = 200)]
     [Route("api/Extend/[controller]")]
     public class LqMdxxService : ILqMdxxService, IDynamicApiController, ITransient
     {
@@ -111,6 +111,12 @@ namespace NCC.Extend.LqMdxx
                     kjb=it.Kjb,
                     dxmb=it.Dxmb,
                     syb=it.Syb,
+                    xsyj=it.Xsyj,
+                    xhyj=it.Xhyj,
+                    xms=it.Xms,
+                    rt1=it.Rt1,
+                    rt2=it.Rt2,
+                    rc=it.Rc,
                 }).MergeTable().OrderBy(sidx+" "+input.sort).ToPagedListAsync(input.currentPage, input.pageSize);
                 return PageResult<LqMdxxListOutput>.SqlSugarPageResult(data);
         }
@@ -271,6 +277,30 @@ namespace NCC.Extend.LqMdxx
         }
 
         /// <summary>
+        /// 更新门店目标字段
+        /// </summary>
+        /// <param name="id">主键</param>
+        /// <param name="input">目标字段参数</param>
+        /// <returns></returns>
+        [HttpPut("{id}/targets")]
+        public async Task UpdateTargets(string id, [FromBody] LqMdxxTargetUpdateInput input)
+        {
+            var isOk = await _db.Updateable<LqMdxxEntity>()
+                .SetColumns(it => new LqMdxxEntity 
+                { 
+                    Xsyj = input.xsyj,
+                    Xhyj = input.xhyj,
+                    Xms = input.xms,
+                    Rt1 = input.rt1,
+                    Rt2 = input.rt2,
+                    Rc = input.rc
+                })
+                .Where(x => x.Id == id)
+                .ExecuteCommandAsync();
+            if (!(isOk > 0)) throw NCCException.Oh(ErrorCode.COM1001);
+        }
+
+        /// <summary>
         /// 删除门店信息
         /// </summary>
         /// <returns></returns>
diff --git a/netcore/src/Modularity/Extend/NCC.Extend/LqXmzlService.cs b/netcore/src/Modularity/Extend/NCC.Extend/LqXmzlService.cs
index f31e495..322d823 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend/LqXmzlService.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend/LqXmzlService.cs
@@ -28,7 +28,7 @@ namespace NCC.Extend.LqXmzl
     /// <summary>
     /// 项目资料服务
     /// </summary>
-    [ApiDescriptionSettings(Tag = "Extend",Name = "LqXmzl", Order = 200)]
+    [ApiDescriptionSettings(Tag = "绿纤项目资料服务", Name = "LqXmzl", Order = 200)]
     [Route("api/Extend/[controller]")]
     public class LqXmzlService : ILqXmzlService, IDynamicApiController, ITransient
     {
@@ -39,15 +39,15 @@ namespace NCC.Extend.LqXmzl
         /// <summary>
         /// 初始化一个<see cref="LqXmzlService"/>类型的新实例
         /// </summary>
-        public LqXmzlService(
-            ISqlSugarRepository<LqXmzlEntity> lqXmzlRepository,
-            IUserManager userManager)
+        public LqXmzlService(ISqlSugarRepository<LqXmzlEntity> lqXmzlRepository, IUserManager userManager)
         {
-            _lqXmzlRepository = lqXmzlRepository;            
+            _lqXmzlRepository = lqXmzlRepository;
             _db = _lqXmzlRepository.Context;
             _userManager = userManager;
         }
 
+        #region 获取项目资料
+
         /// <summary>
         /// 获取项目资料
         /// </summary>
@@ -60,12 +60,14 @@ namespace NCC.Extend.LqXmzl
             var output = entity.Adapt<LqXmzlInfoOutput>();
             return output;
         }
-
+        #endregion
+      
+       #region 获取项目资料列表
         /// <summary>
-		/// 获取项目资料列表
-		/// </summary>
-		/// <param name="input">请求参数</param>
-		/// <returns></returns>
+        /// 获取项目资料列表
+        /// </summary>
+        /// <param name="input">请求参数</param>
+        /// <returns></returns>
         [HttpGet("")]
         public async Task<dynamic> GetList([FromQuery] LqXmzlListQueryInput input)
         {
@@ -88,29 +90,35 @@ namespace NCC.Extend.LqXmzl
                 .WhereIF(!string.IsNullOrEmpty(input.qt2), p => p.Qt2.Contains(input.qt2))
                 .WhereIF(!string.IsNullOrEmpty(input.syje), p => p.Syje.Equals(input.syje))
                 .WhereIF(!string.IsNullOrEmpty(input.cellje), p => p.Cellje.Equals(input.cellje))
-                .Select(it=> new LqXmzlListOutput
+                .WhereIF(!string.IsNullOrEmpty(input.sgf), p => p.Sgf.Equals(input.sgf))
+                .Select(it => new LqXmzlListOutput
                 {
                     id = it.Id,
-                    xmbh=it.Xmbh,
-                    xmmc=it.Xmmc,
-                    bzjg=it.Bzjg,
-                    xmsc=it.Xmsc,
-                    jcfwtc=it.Jcfwtc,
-                    fl1=it.Fl1,
-                    fl2=it.Fl2,
-                    fl3=it.Fl3,
-                    fl4=it.Fl4,
-                    tjlb=it.Tjlb,
-                    zklb=it.Zklb,
-                    fl=it.Fl,
-                    qt1=it.Qt1,
-                    qt2=it.Qt2,
-                    syje=it.Syje,
-                    cellje=it.Cellje,
-                }).MergeTable().OrderBy(sidx+" "+input.sort).ToPagedListAsync(input.currentPage, input.pageSize);
-                return PageResult<LqXmzlListOutput>.SqlSugarPageResult(data);
+                    xmbh = it.Xmbh,
+                    xmmc = it.Xmmc,
+                    bzjg = it.Bzjg,
+                    xmsc = it.Xmsc,
+                    jcfwtc = it.Jcfwtc,
+                    fl1 = it.Fl1,
+                    fl2 = it.Fl2,
+                    fl3 = it.Fl3,
+                    fl4 = it.Fl4,
+                    tjlb = it.Tjlb,
+                    zklb = it.Zklb,
+                    fl = it.Fl,
+                    qt1 = it.Qt1,
+                    qt2 = it.Qt2,
+                    syje = it.Syje,
+                    cellje = it.Cellje,
+                    sgf = it.Sgf,
+                    projectNumber = it.ProjectNumber,
+                    sourceType = it.SourceType,
+                }).MergeTable().OrderBy(sidx + " " + input.sort).ToPagedListAsync(input.currentPage, input.pageSize);
+            return PageResult<LqXmzlListOutput>.SqlSugarPageResult(data);
         }
+        #endregion
 
+        #region 新建项目资料
         /// <summary>
         /// 新建项目资料
         /// </summary>
@@ -125,12 +133,14 @@ namespace NCC.Extend.LqXmzl
             var isOk = await _db.Insertable(entity).IgnoreColumns(ignoreNullColumn: true).ExecuteCommandAsync();
             if (!(isOk > 0)) throw NCCException.Oh(ErrorCode.COM1000);
         }
+        #endregion
 
+        #region 获取项目资料无分页列表
         /// <summary>
-		/// 获取项目资料无分页列表
-		/// </summary>
-		/// <param name="input">请求参数</param>
-		/// <returns></returns>
+        /// 获取项目资料无分页列表
+        /// </summary>
+        /// <param name="input">请求参数</param>
+        /// <returns></returns>
         [NonAction]
         public async Task<dynamic> GetNoPagingList([FromQuery] LqXmzlListQueryInput input)
         {
@@ -153,34 +163,38 @@ namespace NCC.Extend.LqXmzl
                 .WhereIF(!string.IsNullOrEmpty(input.qt2), p => p.Qt2.Contains(input.qt2))
                 .WhereIF(!string.IsNullOrEmpty(input.syje), p => p.Syje.Equals(input.syje))
                 .WhereIF(!string.IsNullOrEmpty(input.cellje), p => p.Cellje.Equals(input.cellje))
-                .Select(it=> new LqXmzlListOutput
+                .WhereIF(!string.IsNullOrEmpty(input.sgf), p => p.Sgf.Equals(input.sgf))
+                .Select(it => new LqXmzlListOutput
                 {
                     id = it.Id,
-                    xmbh=it.Xmbh,
-                    xmmc=it.Xmmc,
-                    bzjg=it.Bzjg,
-                    xmsc=it.Xmsc,
-                    jcfwtc=it.Jcfwtc,
-                    fl1=it.Fl1,
-                    fl2=it.Fl2,
-                    fl3=it.Fl3,
-                    fl4=it.Fl4,
-                    tjlb=it.Tjlb,
-                    zklb=it.Zklb,
-                    fl=it.Fl,
-                    qt1=it.Qt1,
-                    qt2=it.Qt2,
-                    syje=it.Syje,
-                    cellje=it.Cellje,
-                }).MergeTable().OrderBy(sidx+" "+input.sort).ToListAsync();
-                return data;
+                    xmbh = it.Xmbh,
+                    xmmc = it.Xmmc,
+                    bzjg = it.Bzjg,
+                    xmsc = it.Xmsc,
+                    jcfwtc = it.Jcfwtc,
+                    fl1 = it.Fl1,
+                    fl2 = it.Fl2,
+                    fl3 = it.Fl3,
+                    fl4 = it.Fl4,
+                    tjlb = it.Tjlb,
+                    zklb = it.Zklb,
+                    fl = it.Fl,
+                    qt1 = it.Qt1,
+                    qt2 = it.Qt2,
+                    syje = it.Syje,
+                    cellje = it.Cellje,
+                    sgf = it.Sgf,
+                }).MergeTable().OrderBy(sidx + " " + input.sort).ToListAsync();
+            return data;
         }
+        #endregion
 
+        #region 导出项目资料
         /// <summary>
-		/// 导出项目资料
-		/// </summary>
-		/// <param name="input">请求参数</param>
-		/// <returns></returns>
+        /// 导出项目资料
+        /// </summary>
+        /// <param name="input">请求参数</param>
+        /// <returns></returns>
         [HttpGet("Actions/Export")]
         public async Task<dynamic> Export([FromQuery] LqXmzlListQueryInput input)
         {
@@ -195,7 +209,7 @@ namespace NCC.Extend.LqXmzl
             {
                 exportData = await this.GetNoPagingList(input);
             }
-            List<ParamsModel> paramList = "[{\"value\":\"主键\",\"field\":\"id\"},{\"value\":\"项目编号\",\"field\":\"xmbh\"},{\"value\":\"项目名称\",\"field\":\"xmmc\"},{\"value\":\"标准价格\",\"field\":\"bzjg\"},{\"value\":\"时长（分）\",\"field\":\"xmsc\"},{\"value\":\"基础服务提成\",\"field\":\"jcfwtc\"},{\"value\":\"分类1汇总表\",\"field\":\"fl1\"},{\"value\":\"分类2汇总表\",\"field\":\"fl2\"},{\"value\":\"分类3工资用\",\"field\":\"fl3\"},{\"value\":\"分类4品项用\",\"field\":\"fl4\"},{\"value\":\"统计类别\",\"field\":\"tjlb\"},{\"value\":\"折扣类别\",\"field\":\"zklb\"},{\"value\":\"分类\",\"field\":\"fl\"},{\"value\":\"其它1\",\"field\":\"qt1\"},{\"value\":\"其它2\",\"field\":\"qt2\"},{\"value\":\"溯源金额\",\"field\":\"syje\"},{\"value\":\"Cell金额\",\"field\":\"cellje\"},]".ToList<ParamsModel>();           
+            List<ParamsModel> paramList = "[{\"value\":\"主键\",\"field\":\"id\"},{\"value\":\"项目编号\",\"field\":\"xmbh\"},{\"value\":\"项目名称\",\"field\":\"xmmc\"},{\"value\":\"标准价格\",\"field\":\"bzjg\"},{\"value\":\"时长（分）\",\"field\":\"xmsc\"},{\"value\":\"基础服务提成\",\"field\":\"jcfwtc\"},{\"value\":\"分类1汇总表\",\"field\":\"fl1\"},{\"value\":\"分类2汇总表\",\"field\":\"fl2\"},{\"value\":\"分类3工资用\",\"field\":\"fl3\"},{\"value\":\"分类4品项用\",\"field\":\"fl4\"},{\"value\":\"统计类别\",\"field\":\"tjlb\"},{\"value\":\"折扣类别\",\"field\":\"zklb\"},{\"value\":\"分类\",\"field\":\"fl\"},{\"value\":\"其它1\",\"field\":\"qt1\"},{\"value\":\"其它2\",\"field\":\"qt2\"},{\"value\":\"溯源金额\",\"field\":\"syje\"},{\"value\":\"Cell金额\",\"field\":\"cellje\"},{\"value\":\"手工费\",\"field\":\"sgf\"},]".ToList<ParamsModel>();
             ExcelConfig excelconfig = new ExcelConfig();
             excelconfig.FileName = "项目资料.xls";
             excelconfig.HeadFont = "微软雅黑";
@@ -221,7 +235,9 @@ namespace NCC.Extend.LqXmzl
             };
             return output;
         }
+        #endregion
 
+        #region 批量删除项目资料
         /// <summary>
         /// 批量删除项目资料
         /// </summary>
@@ -238,7 +254,7 @@ namespace NCC.Extend.LqXmzl
                     //开启事务
                     _db.BeginTran();
                     //批量删除项目资料
-                    await _db.Deleteable<LqXmzlEntity>().In(d => d.Id,ids).ExecuteCommandAsync();
+                    await _db.Deleteable<LqXmzlEntity>().In(d => d.Id, ids).ExecuteCommandAsync();
                     //关闭事务
                     _db.CommitTran();
                 }
@@ -250,7 +266,9 @@ namespace NCC.Extend.LqXmzl
                 }
             }
         }
+        #endregion
 
+        #region 更新项目资料
         /// <summary>
         /// 更新项目资料
         /// </summary>
@@ -264,7 +282,9 @@ namespace NCC.Extend.LqXmzl
             var isOk = await _db.Updateable(entity).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync();
             if (!(isOk > 0)) throw NCCException.Oh(ErrorCode.COM1001);
         }
+        #endregion
 
+        #region 删除项目资料    
         /// <summary>
         /// 删除项目资料
         /// </summary>
@@ -277,5 +297,6 @@ namespace NCC.Extend.LqXmzl
             var isOk = await _db.Deleteable<LqXmzlEntity>().Where(d => d.Id == id).ExecuteCommandAsync();
             if (!(isOk > 0)) throw NCCException.Oh(ErrorCode.COM1002);
         }
+        #endregion
     }
 }
diff --git a/netcore/src/Modularity/Extend/NCC.Extend/LqYcsdJsjService.cs b/netcore/src/Modularity/Extend/NCC.Extend/LqYcsdJsjService.cs
index 0b19014..4954eff 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend/LqYcsdJsjService.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend/LqYcsdJsjService.cs
@@ -31,7 +31,7 @@ namespace NCC.Extend.LqYcsdJsj
     /// <summary>
     /// 金三角设定服务
     /// </summary>
-    [ApiDescriptionSettings(Tag = "Extend",Name = "LqYcsdJsj", Order = 200)]
+    [ApiDescriptionSettings(Tag = "Extend", Name = "LqYcsdJsj", Order = 200)]
     [Route("api/Extend/[controller]")]
     public class LqYcsdJsjService : ILqYcsdJsjService, IDynamicApiController, ITransient
     {
@@ -42,15 +42,14 @@ namespace NCC.Extend.LqYcsdJsj
         /// <summary>
         /// 初始化一个<see cref="LqYcsdJsjService"/>类型的新实例
         /// </summary>
-        public LqYcsdJsjService(
-            ISqlSugarRepository<LqYcsdJsjEntity> lqYcsdJsjRepository,
-            IUserManager userManager)
+        public LqYcsdJsjService(ISqlSugarRepository<LqYcsdJsjEntity> lqYcsdJsjRepository,IUserManager userManager)
         {
-            _lqYcsdJsjRepository = lqYcsdJsjRepository;            
+            _lqYcsdJsjRepository = lqYcsdJsjRepository;
             _db = _lqYcsdJsjRepository.Context;
             _userManager = userManager;
         }
 
+        #region 获取金三角设定
         /// <summary>
         /// 获取金三角设定
         /// </summary>
@@ -63,7 +62,9 @@ namespace NCC.Extend.LqYcsdJsj
             var output = entity.Adapt<LqYcsdJsjInfoOutput>();
             return output;
         }
+        #endregion
 
+        #region 获取金三角设定详情
         /// <summary>
         /// 获取金三角设定详情（包含成员信息）
         /// </summary>
@@ -74,9 +75,9 @@ namespace NCC.Extend.LqYcsdJsj
         {
             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")
@@ -91,14 +92,16 @@ namespace NCC.Extend.LqYcsdJsj
                     status = x.Status
                 })
                 .ToListAsync();
-            
+
             return new
             {
                 jsj = output,
                 members = members
             };
         }
+        #endregion
 
+        #region 获取金三角设定列表
         /// <summary>
 		/// 获取金三角设定列表
 		/// </summary>
@@ -113,16 +116,79 @@ 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))
-                .Select(it=> new LqYcsdJsjListOutput
+                .Select(it => new LqYcsdJsjListOutput
                 {
                     id = it.Id,
                     yf = it.Yf,
                     md = it.Md,
                     jsj = it.Jsj
-                }).MergeTable().OrderBy(sidx+" "+input.sort).ToPagedListAsync(input.currentPage, input.pageSize);
-                return PageResult<LqYcsdJsjListOutput>.SqlSugarPageResult(data);
+                }).MergeTable().OrderBy(sidx + " " + input.sort).ToPagedListAsync(input.currentPage, input.pageSize);
+            return PageResult<LqYcsdJsjListOutput>.SqlSugarPageResult(data);
+        }
+        #endregion
+
+        #region 获取本月金三角列表
+        /// <summary>
+        /// 获取本月金三角列表
+        /// </summary>
+        /// <returns>本月金三角列表</returns>
+        [HttpGet("Actions/GetThisMonthList")]
+        public async Task<dynamic> GetThisMonthList()
+        {
+            var data = await _db.Queryable<LqYcsdJsjEntity>()
+                .Where(x => x.Yf == DateTime.Now.ToString("yyyyMM"))
+                .Select(it => new LqYcsdJsjListOutput
+                {
+                    id = it.Id,
+                    yf = it.Yf,
+                    md = it.Md,
+                    jsj = it.Jsj
+                }).MergeTable().ToListAsync();
+            return data;
+        }
+        #endregion
+
+        #region 获取用户本月金三角信息
+        /// <summary>
+        /// 获取某个用户本月所在的金三角信息
+        /// </summary>
+        /// <param name="userId">用户ID</param>
+        /// <returns>用户本月所在的金三角信息</returns>
+        [HttpGet("Actions/GetThisMonthJsjInfo")]
+        public async Task<dynamic> GetThisMonthJsjInfo([FromQuery] string userId)
+        {
+            if (string.IsNullOrEmpty(userId))
+            {
+                throw NCCException.Oh(ErrorCode.COM1001, "用户ID不能为空");
+            }
+            var currentMonth = DateTime.Now.ToString("yyyyMM");
+            // 通过用户ID查找本月所在的金三角信息
+            var data = await _db.Queryable<LqJinsanjiaoUserEntity>()
+                .LeftJoin<LqYcsdJsjEntity>((jsjUser, jsj) => jsjUser.JsjId == jsj.Id)
+                .LeftJoin<LqMdxxEntity>((jsjUser, jsj, md) => jsj.Md == md.Id)
+                .Where((jsjUser, jsj, md) => jsjUser.UserId == userId)
+                .Where((jsjUser, jsj, md) => jsj.Yf == currentMonth)
+                .Where((jsjUser, jsj, md) => jsjUser.DeleteMark == 0)
+                .Where((jsjUser, jsj, md) => jsjUser.Status == "ACTIVE")
+                .Select((jsjUser, jsj, md) => new
+                {
+                    jsjId = jsj.Id,
+                    jsjName = jsj.Jsj,
+                    month = jsj.Yf,
+                    storeId = jsj.Md,
+                    storeName = md.Dm,
+                    userName = jsjUser.UserName,
+                    isLeader = jsjUser.IsLeader,
+                    status = jsjUser.Status,
+                    sortOrder = jsjUser.SortOrder
+                })
+                .FirstAsync();
+
+            return data;
         }
+        #endregion
 
+        #region 新建金三角
         /// <summary>
         /// 新建金三角
         /// </summary>
@@ -132,7 +198,7 @@ namespace NCC.Extend.LqYcsdJsj
         public async Task Create([FromBody] LqYcsdJsjCrInput input)
         {
             var userInfo = await _userManager.GetUserInfo();
-            
+
             // 参数验证
             if (string.IsNullOrEmpty(input.yf))
                 throw NCCException.Oh(ErrorCode.COM1000, "月份不能为空");
@@ -140,13 +206,13 @@ namespace NCC.Extend.LqYcsdJsj
                 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)
             {
@@ -156,7 +222,7 @@ namespace NCC.Extend.LqYcsdJsj
                     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)
@@ -196,7 +262,9 @@ namespace NCC.Extend.LqYcsdJsj
                 throw NCCException.Oh(ErrorCode.COM1000, ex.Message);
             }
         }
+        #endregion
 
+        #region 获取金三角设定无分页列表
         /// <summary>
 		/// 获取金三角设定无分页列表
 		/// </summary>
@@ -211,16 +279,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))
-                .Select(it=> new LqYcsdJsjListOutput
+                .Select(it => new LqYcsdJsjListOutput
                 {
                     id = it.Id,
                     yf = it.Yf,
                     md = it.Md,
                     jsj = it.Jsj
-                }).MergeTable().OrderBy(sidx+" "+input.sort).ToListAsync();
-                return data;
+                }).MergeTable().OrderBy(sidx + " " + input.sort).ToListAsync();
+            return data;
         }
+        #endregion
 
+        #region 导出金三角设定
         /// <summary>
 		/// 导出金三角设定
 		/// </summary>
@@ -240,7 +310,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\"}]".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 = "微软雅黑";
@@ -266,7 +336,9 @@ namespace NCC.Extend.LqYcsdJsj
             };
             return output;
         }
+        #endregion
 
+        #region 批量删除金三角设定
         /// <summary>
         /// 批量删除金三角设定
         /// </summary>
@@ -283,7 +355,7 @@ namespace NCC.Extend.LqYcsdJsj
                     //开启事务
                     _db.BeginTran();
                     //批量删除金三角设定
-                    await _db.Deleteable<LqYcsdJsjEntity>().In(d => d.Id,ids).ExecuteCommandAsync();
+                    await _db.Deleteable<LqYcsdJsjEntity>().In(d => d.Id, ids).ExecuteCommandAsync();
                     //关闭事务
                     _db.CommitTran();
                 }
@@ -295,7 +367,9 @@ namespace NCC.Extend.LqYcsdJsj
                 }
             }
         }
+        #endregion
 
+        #region 更新金三角设定
         /// <summary>
         /// 更新金三角设定
         /// </summary>
@@ -309,7 +383,9 @@ namespace NCC.Extend.LqYcsdJsj
             var isOk = await _db.Updateable(entity).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync();
             if (!(isOk > 0)) throw NCCException.Oh(ErrorCode.COM1001);
         }
-
+        #endregion
+    
+        #region 删除金三角设定
         /// <summary>
         /// 删除金三角设定
         /// </summary>
@@ -322,6 +398,7 @@ namespace NCC.Extend.LqYcsdJsj
             var isOk = await _db.Deleteable<LqYcsdJsjEntity>().Where(d => d.Id == id).ExecuteCommandAsync();
             if (!(isOk > 0)) throw NCCException.Oh(ErrorCode.COM1002);
         }
+        #endregion
 
         #region 私有辅助方法
 
@@ -337,12 +414,12 @@ namespace NCC.Extend.LqYcsdJsj
             // 获取门店名称
             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区
@@ -353,7 +430,7 @@ namespace NCC.Extend.LqYcsdJsj
                     Md = mdId,
                     Jsj = tAreaName
                 };
-                
+
                 await _db.Insertable(tAreaEntity).ExecuteCommandAsync();
             }
         }
@@ -369,12 +446,12 @@ namespace NCC.Extend.LqYcsdJsj
         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区
@@ -385,7 +462,7 @@ namespace NCC.Extend.LqYcsdJsj
                     Md = mdId,
                     Jsj = tAreaName
                 };
-                
+
                 await _db.Insertable(tAreaEntity).ExecuteCommandAsync();
             }
         }
@@ -400,7 +477,7 @@ namespace NCC.Extend.LqYcsdJsj
         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];
@@ -415,12 +492,13 @@ namespace NCC.Extend.LqYcsdJsj
                     SortOrder = member.sortOrder > 0 ? member.sortOrder : i + 1,
                     CreatorTime = DateTime.Now,
                     CreatorUserId = creatorUserId,
-                    DeleteMark = 0
+                    DeleteMark = 0,
+                    Month = DateTime.Now.ToString("yyyyMM")
                 };
-                
+
                 memberEntities.Add(memberEntity);
             }
-            
+
             if (memberEntities.Count > 0)
             {
                 await _db.Insertable(memberEntities).ExecuteCommandAsync();
diff --git a/netcore/src/Modularity/Extend/NCC.Extend/LqYcsdMdmbsdService.cs b/netcore/src/Modularity/Extend/NCC.Extend/LqYcsdMdmbsdService.cs
deleted file mode 100644
index 6b3fd70..0000000
--- a/netcore/src/Modularity/Extend/NCC.Extend/LqYcsdMdmbsdService.cs
+++ /dev/null
@@ -1,245 +0,0 @@
-using NCC.Common.Core.Manager;
-using NCC.Common.Enum;
-using NCC.Common.Extension;
-using NCC.Common.Filter;
-using NCC.Dependency;
-using NCC.DynamicApiController;
-using NCC.FriendlyException;
-using NCC.Extend.Interfaces.LqYcsdMdmbsd;
-using Mapster;
-using Microsoft.AspNetCore.Mvc;
-using SqlSugar;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using NCC.Extend.Entitys.lq_ycsd_mdmbsd;
-using NCC.Extend.Entitys.Dto.LqYcsdMdmbsd;
-using Yitter.IdGenerator;
-using NCC.Common.Helper;
-using NCC.JsonSerialization;
-using NCC.Common.Model.NPOI;
-using NCC.Common.Configuration;
-using NCC.DataEncryption;
-using NCC.ClayObject;
-
-namespace NCC.Extend.LqYcsdMdmbsd
-{
-    /// <summary>
-    /// 门店目标设定服务
-    /// </summary>
-    [ApiDescriptionSettings(Tag = "Extend",Name = "LqYcsdMdmbsd", Order = 200)]
-    [Route("api/Extend/[controller]")]
-    public class LqYcsdMdmbsdService : ILqYcsdMdmbsdService, IDynamicApiController, ITransient
-    {
-        private readonly ISqlSugarRepository<LqYcsdMdmbsdEntity> _lqYcsdMdmbsdRepository;
-        private readonly SqlSugarScope _db;
-        private readonly IUserManager _userManager;
-
-        /// <summary>
-        /// 初始化一个<see cref="LqYcsdMdmbsdService"/>类型的新实例
-        /// </summary>
-        public LqYcsdMdmbsdService(
-            ISqlSugarRepository<LqYcsdMdmbsdEntity> lqYcsdMdmbsdRepository,
-            IUserManager userManager)
-        {
-            _lqYcsdMdmbsdRepository = lqYcsdMdmbsdRepository;            
-            _db = _lqYcsdMdmbsdRepository.Context;
-            _userManager = userManager;
-        }
-
-        /// <summary>
-        /// 获取门店目标设定
-        /// </summary>
-        /// <param name="id">参数</param>
-        /// <returns></returns>
-        [HttpGet("{id}")]
-        public async Task<dynamic> GetInfo(string id)
-        {
-            var entity = await _db.Queryable<LqYcsdMdmbsdEntity>().FirstAsync(p => p.Id == id);
-            var output = entity.Adapt<LqYcsdMdmbsdInfoOutput>();
-            return output;
-        }
-
-        /// <summary>
-		/// 获取门店目标设定列表
-		/// </summary>
-		/// <param name="input">请求参数</param>
-		/// <returns></returns>
-        [HttpGet("")]
-        public async Task<dynamic> GetList([FromQuery] LqYcsdMdmbsdListQueryInput input)
-        {
-            var sidx = input.sidx == null ? "id" : input.sidx;
-            var data = await _db.Queryable<LqYcsdMdmbsdEntity>()
-                .WhereIF(!string.IsNullOrEmpty(input.id), p => p.Id.Contains(input.id))
-                .WhereIF(!string.IsNullOrEmpty(input.xsyj), p => p.Xsyj.Contains(input.xsyj))
-                .WhereIF(!string.IsNullOrEmpty(input.xhyj), p => p.Xhyj.Contains(input.xhyj))
-                .WhereIF(!string.IsNullOrEmpty(input.xms), p => p.Xms.Contains(input.xms))
-                .WhereIF(!string.IsNullOrEmpty(input.rt), p => p.Rt.Contains(input.rt))
-                .WhereIF(!string.IsNullOrEmpty(input.rc), p => p.Rc.Contains(input.rc))
-                .WhereIF(!string.IsNullOrEmpty(input.mbfl), p => p.Mbfl.Contains(input.mbfl))
-                .WhereIF(!string.IsNullOrEmpty(input.jtdy), p => p.Jtdy.Contains(input.jtdy))
-                .Select(it=> new LqYcsdMdmbsdListOutput
-                {
-                    id = it.Id,
-                    xsyj=it.Xsyj,
-                    xhyj=it.Xhyj,
-                    xms=it.Xms,
-                    rt=it.Rt,
-                    rc=it.Rc,
-                    mbfl=it.Mbfl,
-                    jtdy=it.Jtdy,
-                }).MergeTable().OrderBy(sidx+" "+input.sort).ToPagedListAsync(input.currentPage, input.pageSize);
-                return PageResult<LqYcsdMdmbsdListOutput>.SqlSugarPageResult(data);
-        }
-
-        /// <summary>
-        /// 新建门店目标设定
-        /// </summary>
-        /// <param name="input">参数</param>
-        /// <returns></returns>
-        [HttpPost("")]
-        public async Task Create([FromBody] LqYcsdMdmbsdCrInput input)
-        {
-            var userInfo = await _userManager.GetUserInfo();
-            var entity = input.Adapt<LqYcsdMdmbsdEntity>();
-            entity.Id = YitIdHelper.NextId().ToString();
-            var isOk = await _db.Insertable(entity).IgnoreColumns(ignoreNullColumn: true).ExecuteCommandAsync();
-            if (!(isOk > 0)) throw NCCException.Oh(ErrorCode.COM1000);
-        }
-
-        /// <summary>
-		/// 获取门店目标设定无分页列表
-		/// </summary>
-		/// <param name="input">请求参数</param>
-		/// <returns></returns>
-        [NonAction]
-        public async Task<dynamic> GetNoPagingList([FromQuery] LqYcsdMdmbsdListQueryInput input)
-        {
-            var sidx = input.sidx == null ? "id" : input.sidx;
-            var data = await _db.Queryable<LqYcsdMdmbsdEntity>()
-                .WhereIF(!string.IsNullOrEmpty(input.id), p => p.Id.Contains(input.id))
-                .WhereIF(!string.IsNullOrEmpty(input.xsyj), p => p.Xsyj.Contains(input.xsyj))
-                .WhereIF(!string.IsNullOrEmpty(input.xhyj), p => p.Xhyj.Contains(input.xhyj))
-                .WhereIF(!string.IsNullOrEmpty(input.xms), p => p.Xms.Contains(input.xms))
-                .WhereIF(!string.IsNullOrEmpty(input.rt), p => p.Rt.Contains(input.rt))
-                .WhereIF(!string.IsNullOrEmpty(input.rc), p => p.Rc.Contains(input.rc))
-                .WhereIF(!string.IsNullOrEmpty(input.mbfl), p => p.Mbfl.Contains(input.mbfl))
-                .WhereIF(!string.IsNullOrEmpty(input.jtdy), p => p.Jtdy.Contains(input.jtdy))
-                .Select(it=> new LqYcsdMdmbsdListOutput
-                {
-                    id = it.Id,
-                    xsyj=it.Xsyj,
-                    xhyj=it.Xhyj,
-                    xms=it.Xms,
-                    rt=it.Rt,
-                    rc=it.Rc,
-                    mbfl=it.Mbfl,
-                    jtdy=it.Jtdy,
-                }).MergeTable().OrderBy(sidx+" "+input.sort).ToListAsync();
-                return data;
-        }
-
-        /// <summary>
-		/// 导出门店目标设定
-		/// </summary>
-		/// <param name="input">请求参数</param>
-		/// <returns></returns>
-        [HttpGet("Actions/Export")]
-        public async Task<dynamic> Export([FromQuery] LqYcsdMdmbsdListQueryInput input)
-        {
-            var userInfo = await _userManager.GetUserInfo();
-            var exportData = new List<LqYcsdMdmbsdListOutput>();
-            if (input.dataType == 0)
-            {
-                var data = Clay.Object(await this.GetList(input));
-                exportData = data.Solidify<PageResult<LqYcsdMdmbsdListOutput>>().list;
-            }
-            else
-            {
-                exportData = await this.GetNoPagingList(input);
-            }
-            List<ParamsModel> paramList = "[{\"value\":\"目标编号\",\"field\":\"id\"},{\"value\":\"销售业绩\",\"field\":\"xsyj\"},{\"value\":\"消耗业绩\",\"field\":\"xhyj\"},{\"value\":\"项目数\",\"field\":\"xms\"},{\"value\":\"人头\",\"field\":\"rt\"},{\"value\":\"人次\",\"field\":\"rc\"},{\"value\":\"目标分类\",\"field\":\"mbfl\"},{\"value\":\"具体对应\",\"field\":\"jtdy\"},]".ToList<ParamsModel>();           
-            ExcelConfig excelconfig = new ExcelConfig();
-            excelconfig.FileName = "门店目标设定.xls";
-            excelconfig.HeadFont = "微软雅黑";
-            excelconfig.HeadPoint = 10;
-            excelconfig.IsAllSizeColumn = true;
-            excelconfig.ColumnModel = new List<ExcelColumnModel>();
-            List<string> selectKeyList = input.selectKey.Split(',').ToList();
-            foreach (var item in selectKeyList)
-            {
-                var isExist = paramList.Find(p => p.field == item);
-                if (isExist != null)
-                {
-                    excelconfig.ColumnModel.Add(new ExcelColumnModel() { Column = isExist.field, ExcelColumn = isExist.value });
-                }
-            }
-            var addPath = FileVariable.TemporaryFilePath + excelconfig.FileName;
-            ExcelExportHelper<LqYcsdMdmbsdListOutput>.Export(exportData, excelconfig, addPath);
-            var fileName = _userManager.UserId + "|" + addPath + "|xls";
-            var output = new
-            {
-                name = excelconfig.FileName,
-                url = "/api/File/Download?encryption=" + DESCEncryption.Encrypt(fileName, "NCC")
-            };
-            return output;
-        }
-
-        /// <summary>
-        /// 批量删除门店目标设定
-        /// </summary>
-        /// <param name="ids">主键数组</param>
-        /// <returns></returns>
-        [HttpPost("batchRemove")]
-        public async Task BatchRemove([FromBody] List<string> ids)
-        {
-            var entitys = await _db.Queryable<LqYcsdMdmbsdEntity>().In(it => it.Id, ids).ToListAsync();
-            if (entitys.Count > 0)
-            {
-                try
-                {
-                    //开启事务
-                    _db.BeginTran();
-                    //批量删除门店目标设定
-                    await _db.Deleteable<LqYcsdMdmbsdEntity>().In(d => d.Id,ids).ExecuteCommandAsync();
-                    //关闭事务
-                    _db.CommitTran();
-                }
-                catch (Exception)
-                {
-                    //回滚事务
-                    _db.RollbackTran();
-                    throw NCCException.Oh(ErrorCode.COM1002);
-                }
-            }
-        }
-
-        /// <summary>
-        /// 更新门店目标设定
-        /// </summary>
-        /// <param name="id">主键</param>
-        /// <param name="input">参数</param>
-        /// <returns></returns>
-        [HttpPut("{id}")]
-        public async Task Update(string id, [FromBody] LqYcsdMdmbsdUpInput input)
-        {
-            var entity = input.Adapt<LqYcsdMdmbsdEntity>();
-            var isOk = await _db.Updateable(entity).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync();
-            if (!(isOk > 0)) throw NCCException.Oh(ErrorCode.COM1001);
-        }
-
-        /// <summary>
-        /// 删除门店目标设定
-        /// </summary>
-        /// <returns></returns>
-        [HttpDelete("{id}")]
-        public async Task Delete(string id)
-        {
-            var entity = await _db.Queryable<LqYcsdMdmbsdEntity>().FirstAsync(p => p.Id == id);
-            _ = entity ?? throw NCCException.Oh(ErrorCode.COM1005);
-            var isOk = await _db.Deleteable<LqYcsdMdmbsdEntity>().Where(d => d.Id == id).ExecuteCommandAsync();
-            if (!(isOk > 0)) throw NCCException.Oh(ErrorCode.COM1002);
-        }
-    }
-}
diff --git a/netcore/src/Modularity/Extend/NCC.Extend/LqZjlMdsmxszService.cs b/netcore/src/Modularity/Extend/NCC.Extend/LqZjlMdsmxszService.cs
index 9123ed0..8ae9b4a 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend/LqZjlMdsmxszService.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend/LqZjlMdsmxszService.cs
@@ -14,6 +14,10 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using Yitter.IdGenerator;
+using NCC.Common.Filter;
+using NCC.Common.Enum;
+using NCC.FriendlyException;
 
 namespace NCC.Extend
 {
@@ -43,6 +47,7 @@ namespace NCC.Extend
             _userManager = userManager;
             _httpContextAccessor = httpContextAccessor;
         }
+
         #region 根据总经理用户ID查询相关设置信息
         /// <summary>
         /// 根据总经理用户ID查询相关设置信息
@@ -151,7 +156,7 @@ namespace NCC.Extend
             var userExists = await _db.Queryable<UserEntity>()
                 .Where(x => x.Id == input.ZjlUserid && x.DeleteMark == null)
                 .AnyAsync();
-            
+
             if (!userExists)
             {
                 return new { success = false, message = "总经理用户不存在" };
@@ -163,7 +168,7 @@ namespace NCC.Extend
                 .Where(x => mdIds.Contains(x.Id))
                 .Select(x => x.Id)
                 .ToListAsync();
-            
+
             var invalidMdIds = mdIds.Except(validMdIds).ToList();
             if (invalidMdIds.Any())
             {
@@ -204,7 +209,7 @@ namespace NCC.Extend
                     // 新增记录
                     var entity = new LqZjlMdsmxszEntity
                     {
-                        Id = Guid.NewGuid().ToString(),
+                        Id = YitIdHelper.NextId().ToString(),
                         ZjlUserid = input.ZjlUserid,
                         MdId = item.MdId,
                         Smx1 = item.Smx1,
@@ -223,10 +228,11 @@ namespace NCC.Extend
                     addCount++;
                 }
             }
-            
-            return new { 
-                success = true, 
-                message = "设置成功", 
+
+            return new
+            {
+                success = true,
+                message = "设置成功",
                 addCount = addCount,
                 updateCount = updateCount,
                 totalCount = addCount + updateCount
@@ -235,7 +241,7 @@ namespace NCC.Extend
         #endregion
 
         #region 获取总经理所在组织能管理的门店
-         /// <summary>
+        /// <summary>
         /// 获取总经理所在组织能管理的门店
         /// </summary>
         /// <remarks>
@@ -259,10 +265,80 @@ namespace NCC.Extend
             var userOrganizeId = await _db.Queryable<UserEntity>().Where(x => x.Id == userid && x.DeleteMark == null).Select(x => x.OrganizeId).FirstAsync();
             // 根据组织权限获取门店
             var stores = await _db.Queryable<LqMdxxEntity>()
-                .Where(s =>s.Syb == userOrganizeId || s.Jyb == userOrganizeId || s.Kjb == userOrganizeId || s.Dxmb == userOrganizeId)
+                .Where(s => s.Syb == userOrganizeId || s.Jyb == userOrganizeId || s.Kjb == userOrganizeId || s.Dxmb == userOrganizeId)
                 .ToListAsync();
             return new { list = stores };
         }
         #endregion
+
+        #region 分页查询
+        /// <summary>
+        /// 获取所有总经理门店生命线设置数据（分页查询）
+        /// </summary>
+        /// <param name="input">查询输入参数</param>
+        /// <returns>分页数据</returns>
+        [HttpGet("GetPageList")]
+        public async Task<dynamic> GetPageList([FromQuery] LqZjlMdsmxszListQueryInput input)
+        {
+            var sidx = input.sidx == null ? "id" : input.sidx;
+            var data = await _db.Queryable<LqZjlMdsmxszEntity>()
+            .WhereIF(!string.IsNullOrEmpty(input.ZjlUserid), p => p.ZjlUserid.Contains(input.ZjlUserid))
+            .WhereIF(!string.IsNullOrEmpty(input.MdId), p => p.MdId.Contains(input.MdId))
+              .Select(it => new LqZjlMdsmxszListOutput
+              {
+                  Id = it.Id,
+                  ZjlUserid = it.ZjlUserid,
+                  ZjlName = SqlFunc.Subqueryable<UserEntity>().Where(x => x.Id == it.ZjlUserid).Select(x => x.RealName),
+                  MdId = it.MdId,
+                  Mdbm = SqlFunc.Subqueryable<LqMdxxEntity>().Where(x => x.Id == it.MdId).Select(x => x.Mdbm),
+                  Dm = SqlFunc.Subqueryable<LqMdxxEntity>().Where(x => x.Id == it.MdId).Select(x => x.Dm),
+                  Smx1 = it.Smx1,
+                  Tcbl1 = it.Tcbl1,
+                  Smx2 = it.Smx2,
+                  Tcbl2 = it.Tcbl2,
+                  Smx3 = it.Smx3,
+                  Tcbl3 = it.Tcbl3,
+                  Bz = it.Bz,
+                  Cjsj = it.Cjsj,
+                  Cjry = it.Cjry,
+                  Xgsj = it.Xgsj,
+                  Xgly = it.Xgly
+              }).MergeTable().OrderBy(sidx + " " + input.sort).ToPagedListAsync(input.currentPage, input.pageSize);
+            return PageResult<LqZjlMdsmxszListOutput>.SqlSugarPageResult(data);
+        }
+        #endregion
+
+        #region 更新总经理门店生命线设置
+        /// <summary>
+        /// 更新总经理门店生命线设置
+        /// </summary>
+        [HttpPut("{id}")]
+        public async Task Update(string id, [FromBody] LqZjlMdsmxszUpInput input)
+        {
+            var entity = await _db.Queryable<LqZjlMdsmxszEntity>()
+                .Where(x => x.Id == id && x.Deletemark == 0)
+                .FirstAsync();
+
+            if (entity == null)
+            {
+                throw NCCException.Oh(ErrorCode.COM1001);
+            }
+
+            // 更新字段
+            entity.Smx1 = input.Smx1;
+            entity.Tcbl1 = input.Tcbl1;
+            entity.Smx2 = input.Smx2;
+            entity.Tcbl2 = input.Tcbl2;
+            entity.Smx3 = input.Smx3;
+            entity.Tcbl3 = input.Tcbl3;
+            entity.Bz = input.Bz;
+            entity.Xgsj = DateTime.Now;
+            entity.Xgly = _userManager.User?.Id ?? "admin";
+
+            var isOk = await _db.Updateable(entity).ExecuteCommandAsync();
+            if (!(isOk > 0)) throw NCCException.Oh(ErrorCode.COM1001);
+        }
+        #endregion
+
     }
 }
diff --git a/netcore/src/Modularity/Extend/NCC.Extend/UserService.cs b/netcore/src/Modularity/Extend/NCC.Extend/UserService.cs
index d3e52be..54d86a0 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend/UserService.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend/UserService.cs
@@ -202,5 +202,34 @@ namespace NCC.Extend.User
         }
 
         #endregion
+  
+      #region 获取总经理、经理下拉选择数据
+
+        /// <summary>
+        /// 获取用户下拉选择数据
+        /// </summary>
+        [HttpGet("ManagerSelector")]
+        public async Task<dynamic> GetManagerSelector()
+        {
+            var data = await _db.Queryable<UserEntity>()
+                .Where(u => u.Gw == "总经理" || u.Gw == "经理")
+                .Where(u => u.EnabledMark == 1 && u.DeleteMark == null)
+                .Select(u => new
+                {
+                    id = u.Id,
+                    account = u.Account,
+                    realName = u.RealName,
+                    mobilePhone = u.MobilePhone,
+                    mdid = u.Mdid,
+                    zw = u.Zw,
+                    gw = u.Gw
+                })
+                .OrderBy(u => u.realName)
+                .ToListAsync();
+            return data;
+        }
+
+        #endregion
+   
     }
 }
diff --git a/数据库说明.md b/数据库说明.md
index 567bf2a..49226e1 100644
--- a/数据库说明.md
+++ b/数据库说明.md
@@ -34,6 +34,7 @@
 ### 已弃用表
 - **lq_ryzl (人员资料表)** - 已弃用，人员信息现在使用系统用户表 `BASE_USER` 管理
 - **lq_mdxx_mdgs (门店归属表)** - 已弃用，门店归属信息已整合到 `lq_mdxx` 表中
+- **lq_ycsd_mdmbsd (门店目标设定表)** - 已弃用，门店目标信息已整合到 `lq_mdxx` 表中
 
 ### 新增表
 
@@ -132,6 +133,12 @@
 | gsqssj | datetime | YES | 归属起始时间 | |
 | gszzsj | datetime | YES | 归属终止时间 | |
 | status | int(11) | YES | 状态 | |
+| xsyj | decimal(18,2) | YES | 目标-门店生命线 | |
+| xhyj | decimal(18,2) | YES | 目标-消耗业绩 | |
+| xms | int(11) | YES | 目标-项目数 | |
+| rt1 | int(11) | YES | 目标-人头1 | |
+| rt2 | int(11) | YES | 目标-人头2 | |
+| rc | int(11) | YES | 目标-人次 | |
 
 #### lq_md_mdlbjhsxx (门店类别及核算信息)
 - 用于存储门店的分类信息和核算相关配置
@@ -204,6 +211,7 @@
 | qt2 | varchar | YES | 其它2 | |
 | syje | decimal | YES | 溯源金额 | |
 | cellje | decimal | YES | Cell金额 | |
+| sgf | decimal | YES | 手工费 | |
 
 ### 4. 业绩相关表
 
--
libgit2 0.21.4