diff --git a/analyze_excel.py b/analyze_excel.py
deleted file mode 100644
index 2a03a64..0000000
--- a/analyze_excel.py
+++ /dev/null
@@ -1,207 +0,0 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-"""
-Excel工资核算文件分析工具
-分析工资核算相关的Excel文件，提取字段信息和引用关系
-"""
-
-import pandas as pd
-import os
-import re
-from pathlib import Path
-
-def analyze_excel_file(file_path, sheet_name=None):
-    """分析单个Excel文件"""
-    try:
-        # 获取所有工作表名称
-        excel_file = pd.ExcelFile(file_path)
-        sheets = excel_file.sheet_names
-        
-        print(f"\n=== 分析文件: {os.path.basename(file_path)} ===")
-        print(f"工作表数量: {len(sheets)}")
-        print(f"工作表名称: {sheets}")
-        
-        analysis_result = {
-            'file_name': os.path.basename(file_path),
-            'sheets': {},
-            'all_columns': set(),
-            'formulas': [],
-            'references': []
-        }
-        
-        # 分析每个工作表
-        for sheet in sheets:
-            if sheet_name and sheet != sheet_name:
-                continue
-                
-            try:
-                df = pd.read_excel(file_path, sheet_name=sheet, header=0)
-                print(f"\n--- 工作表: {sheet} ---")
-                print(f"行数: {len(df)}")
-                print(f"列数: {len(df.columns)}")
-                print(f"列名: {list(df.columns)}")
-                
-                # 收集列名
-                analysis_result['all_columns'].update(df.columns)
-                analysis_result['sheets'][sheet] = {
-                    'rows': len(df),
-                    'columns': len(df.columns),
-                    'column_names': list(df.columns),
-                    'sample_data': df.head(3).to_dict('records') if len(df) > 0 else []
-                }
-                
-                # 查找公式和引用
-                for col in df.columns:
-                    for idx, value in df[col].items():
-                        if pd.notna(value) and isinstance(value, str):
-                            # 查找Excel公式模式
-                            formula_patterns = [
-                                r'=([A-Z]+[0-9]+)',  # 单元格引用
-                                r'=([A-Z]+[0-9]+:[A-Z]+[0-9]+)',  # 范围引用
-                                r'=([A-Z]+[0-9]+\[[^\]]+\])',  # 数组引用
-                                r'=([A-Z]+[0-9]+\$[0-9]+)',  # 绝对引用
-                                r'=([A-Z]+[0-9]+:[A-Z]+[0-9]+\$[0-9]+)',  # 绝对范围引用
-                            ]
-                            
-                            for pattern in formula_patterns:
-                                matches = re.findall(pattern, str(value))
-                                if matches:
-                                    analysis_result['formulas'].append({
-                                        'sheet': sheet,
-                                        'cell': f"{col}{idx+1}",
-                                        'formula': str(value),
-                                        'references': matches
-                                    })
-                                    analysis_result['references'].extend(matches)
-                
-            except Exception as e:
-                print(f"分析工作表 {sheet} 时出错: {e}")
-                analysis_result['sheets'][sheet] = {'error': str(e)}
-        
-        return analysis_result
-        
-    except Exception as e:
-        print(f"分析文件 {file_path} 时出错: {e}")
-        return None
-
-def main():
-    """主函数"""
-    base_path = "/Users/mr.wang/代码库/绿纤/lvqianmeiye_ERP/参考资料/工资核算 -7月"
-    
-    # 要分析的文件列表
-    files_to_analyze = [
-        "工资(全字段).xlsx",
-        "①B-a-26考勤汇总表.xlsx",
-        "②B-a-17每日早报.xlsx", 
-        "③B-a-③呈现-消耗明细表.xlsx",
-        "④B-a-25社保统计表.xlsx",
-        "⑤B-a-12奖励统计表.xlsx",
-        "B-b-③健康师底薪.xlsx",
-        "B-b-④健康师提成-金三角顾问.xlsx",
-        "B-b-⑤其他岗位工资.xlsx",
-        "B-b-⑤当月数据及门店毛利.xlsx"
-    ]
-    
-    all_results = {}
-    
-    print("开始分析工资核算Excel文件...")
-    print("=" * 60)
-    
-    for filename in files_to_analyze:
-        file_path = os.path.join(base_path, filename)
-        if os.path.exists(file_path):
-            result = analyze_excel_file(file_path)
-            if result:
-                all_results[filename] = result
-        else:
-            print(f"文件不存在: {filename}")
-    
-    # 生成分析报告
-    generate_report(all_results)
-
-def generate_report(all_results):
-    """生成分析报告"""
-    report_path = "/Users/mr.wang/代码库/绿纤/lvqianmeiye_ERP/工资核算Excel分析报告.md"
-    
-    with open(report_path, 'w', encoding='utf-8') as f:
-        f.write("# 工资核算Excel文件分析报告\n\n")
-        f.write("## 概述\n\n")
-        f.write("本报告分析了工资核算相关的Excel文件，提取了字段信息、公式引用关系等关键数据。\n\n")
-        
-        # 文件概览
-        f.write("## 文件概览\n\n")
-        f.write("| 文件名 | 工作表数量 | 总列数 | 状态 |\n")
-        f.write("|--------|------------|--------|------|\n")
-        
-        for filename, result in all_results.items():
-            if result:
-                sheet_count = len(result['sheets'])
-                total_columns = len(result['all_columns'])
-                f.write(f"| {filename} | {sheet_count} | {total_columns} | ✅ |\n")
-            else:
-                f.write(f"| {filename} | - | - | ❌ |\n")
-        
-        # 详细分析
-        f.write("\n## 详细分析\n\n")
-        
-        for filename, result in all_results.items():
-            if not result:
-                continue
-                
-            f.write(f"### {filename}\n\n")
-            
-            # 工作表信息
-            f.write("#### 工作表信息\n\n")
-            for sheet_name, sheet_info in result['sheets'].items():
-                if 'error' in sheet_info:
-                    f.write(f"- **{sheet_name}**: 分析出错 - {sheet_info['error']}\n")
-                else:
-                    f.write(f"- **{sheet_name}**: {sheet_info['rows']}行 x {sheet_info['columns']}列\n")
-                    f.write(f"  - 列名: {', '.join([str(col) for col in sheet_info['column_names']])}\n")
-            
-            # 字段统计
-            f.write(f"\n#### 字段统计\n\n")
-            f.write(f"总字段数: {len(result['all_columns'])}\n\n")
-            f.write("所有字段列表:\n")
-        for col in sorted(result['all_columns'], key=str):
-            f.write(f"- {col}\n")
-            
-            # 公式引用
-            if result['formulas']:
-                f.write(f"\n#### 公式引用\n\n")
-                f.write(f"发现 {len(result['formulas'])} 个公式引用:\n\n")
-                for formula in result['formulas'][:10]:  # 只显示前10个
-                    f.write(f"- **{formula['cell']}** ({formula['sheet']}): {formula['formula']}\n")
-                    f.write(f"  - 引用: {', '.join(formula['references'])}\n")
-                
-                if len(result['formulas']) > 10:
-                    f.write(f"\n... 还有 {len(result['formulas']) - 10} 个公式\n")
-            
-            f.write("\n---\n\n")
-        
-        # 字段汇总
-        f.write("## 字段汇总\n\n")
-        all_columns = set()
-        for result in all_results.values():
-            if result:
-                all_columns.update(result['all_columns'])
-        
-        f.write(f"所有文件共发现 {len(all_columns)} 个唯一字段:\n\n")
-        for col in sorted(all_columns, key=str):
-            f.write(f"- {col}\n")
-        
-        # 引用关系汇总
-        f.write("\n## 引用关系汇总\n\n")
-        all_references = set()
-        for result in all_results.values():
-            if result:
-                all_references.update(result['references'])
-        
-        f.write(f"发现 {len(all_references)} 个唯一引用:\n\n")
-        for ref in sorted(all_references, key=str):
-            f.write(f"- {ref}\n")
-    
-    print(f"\n分析报告已生成: {report_path}")
-
-if __name__ == "__main__":
-    main()
diff --git a/analyze_formulas.py b/analyze_formulas.py
deleted file mode 100644
index 08a3824..0000000
--- a/analyze_formulas.py
+++ /dev/null
@@ -1,307 +0,0 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-"""
-Excel公式分析工具
-分析工资核算Excel文件中的公式和引用关系
-"""
-
-import pandas as pd
-import openpyxl
-import os
-import re
-from pathlib import Path
-
-def extract_formulas_from_excel(file_path):
-    """从Excel文件中提取所有公式"""
-    try:
-        # 使用openpyxl读取Excel文件以获取公式
-        workbook = openpyxl.load_workbook(file_path, data_only=False)
-        
-        formulas = []
-        references = []
-        
-        for sheet_name in workbook.sheetnames:
-            worksheet = workbook[sheet_name]
-            
-            for row in worksheet.iter_rows():
-                for cell in row:
-                    if cell.data_type == 'f':  # 公式类型
-                        formula = str(cell.value)
-                        cell_ref = f"{sheet_name}!{cell.coordinate}"
-                        
-                        # 提取公式中的引用
-                        refs = extract_references_from_formula(formula)
-                        
-                        formulas.append({
-                            'file': os.path.basename(file_path),
-                            'sheet': sheet_name,
-                            'cell': cell.coordinate,
-                            'formula': formula,
-                            'references': refs
-                        })
-                        
-                        references.extend(refs)
-        
-        return formulas, references
-        
-    except Exception as e:
-        print(f"分析文件 {file_path} 时出错: {e}")
-        return [], []
-
-def extract_references_from_formula(formula):
-    """从公式中提取引用关系"""
-    references = []
-    
-    # 匹配各种引用模式
-    patterns = [
-        # XLOOKUP引用模式
-        r"XLOOKUP\([^,]+,\s*'([^']+)'!([^,]+),\s*'([^']+)'!([^,]+)",
-        # VLOOKUP引用模式
-        r"VLOOKUP\([^,]+,\s*'([^']+)'!([^,]+)",
-        # 直接工作表引用
-        r"'([^']+)'!([A-Z]+\d+)",
-        # 工作表范围引用
-        r"'([^']+)'!([A-Z]+\d+:[A-Z]+\d+)",
-        # 简单单元格引用
-        r"([A-Z]+\d+)",
-        # 范围引用
-        r"([A-Z]+\d+:[A-Z]+\d+)",
-    ]
-    
-    for pattern in patterns:
-        matches = re.findall(pattern, formula)
-        for match in matches:
-            if isinstance(match, tuple):
-                if len(match) == 2:
-                    references.append({
-                        'type': 'worksheet_reference',
-                        'file': match[0] if match[0] else None,
-                        'range': match[1]
-                    })
-                elif len(match) == 4:
-                    references.append({
-                        'type': 'xlookup_reference',
-                        'file': match[0],
-                        'lookup_range': match[1],
-                        'file2': match[2],
-                        'return_range': match[3]
-                    })
-            else:
-                references.append({
-                    'type': 'cell_reference',
-                    'range': match
-                })
-    
-    return references
-
-def analyze_formula_dependencies(formulas):
-    """分析公式依赖关系"""
-    dependencies = {}
-    
-    for formula in formulas:
-        cell_key = f"{formula['file']}!{formula['sheet']}!{formula['cell']}"
-        dependencies[cell_key] = {
-            'formula': formula['formula'],
-            'dependencies': formula['references']
-        }
-    
-    return dependencies
-
-def generate_formula_report(formulas, references, dependencies):
-    """生成公式分析报告"""
-    report_path = "/Users/mr.wang/代码库/绿纤/lvqianmeiye_ERP/Excel公式分析报告.md"
-    
-    with open(report_path, 'w', encoding='utf-8') as f:
-        f.write("# Excel公式分析报告\n\n")
-        f.write("## 概述\n\n")
-        f.write("本报告分析了工资核算Excel文件中的公式和引用关系，帮助理解数据计算逻辑。\n\n")
-        
-        # 统计信息
-        f.write("## 统计信息\n\n")
-        f.write(f"- 总公式数量: {len(formulas)}\n")
-        f.write(f"- 总引用数量: {len(references)}\n")
-        f.write(f"- 涉及文件数量: {len(set(f['file'] for f in formulas))}\n\n")
-        
-        # 按文件分组分析
-        files = {}
-        for formula in formulas:
-            file_name = formula['file']
-            if file_name not in files:
-                files[file_name] = []
-            files[file_name].append(formula)
-        
-        f.write("## 文件公式分析\n\n")
-        
-        for file_name, file_formulas in files.items():
-            f.write(f"### {file_name}\n\n")
-            f.write(f"公式数量: {len(file_formulas)}\n\n")
-            
-            # 按工作表分组
-            sheets = {}
-            for formula in file_formulas:
-                sheet_name = formula['sheet']
-                if sheet_name not in sheets:
-                    sheets[sheet_name] = []
-                sheets[sheet_name].append(formula)
-            
-            for sheet_name, sheet_formulas in sheets.items():
-                f.write(f"#### 工作表: {sheet_name}\n\n")
-                f.write(f"公式数量: {len(sheet_formulas)}\n\n")
-                
-                # 显示前10个公式
-                for i, formula in enumerate(sheet_formulas[:10]):
-                    f.write(f"**{formula['cell']}**:\n")
-                    f.write(f"```\n{formula['formula']}\n```\n")
-                    
-                    if formula['references']:
-                        f.write("引用关系:\n")
-                        for ref in formula['references']:
-                            if ref['type'] == 'xlookup_reference':
-                                f.write(f"- XLOOKUP: {ref['file']}!{ref['lookup_range']} -> {ref['file2']}!{ref['return_range']}\n")
-                            elif ref['type'] == 'worksheet_reference':
-                                f.write(f"- 工作表引用: {ref['file']}!{ref['range']}\n")
-                            elif ref['type'] == 'cell_reference':
-                                f.write(f"- 单元格引用: {ref['range']}\n")
-                        f.write("\n")
-                    else:
-                        f.write("无外部引用\n\n")
-                
-                if len(sheet_formulas) > 10:
-                    f.write(f"... 还有 {len(sheet_formulas) - 10} 个公式\n\n")
-            
-            f.write("---\n\n")
-        
-        # 引用关系汇总
-        f.write("## 引用关系汇总\n\n")
-        
-        # 统计引用类型
-        ref_types = {}
-        for ref in references:
-            ref_type = ref['type']
-            if ref_type not in ref_types:
-                ref_types[ref_type] = 0
-            ref_types[ref_type] += 1
-        
-        f.write("### 引用类型统计\n\n")
-        for ref_type, count in ref_types.items():
-            f.write(f"- {ref_type}: {count} 个\n")
-        f.write("\n")
-        
-        # 外部文件引用
-        external_refs = {}
-        for ref in references:
-            if ref['type'] == 'xlookup_reference' and ref['file']:
-                file_name = ref['file']
-                if file_name not in external_refs:
-                    external_refs[file_name] = []
-                external_refs[file_name].append(ref)
-        
-        if external_refs:
-            f.write("### 外部文件引用\n\n")
-            for file_name, refs in external_refs.items():
-                f.write(f"**{file_name}**: {len(refs)} 个引用\n")
-                for ref in refs[:5]:  # 只显示前5个
-                    f.write(f"- {ref['file']}!{ref['lookup_range']} -> {ref['file2']}!{ref['return_range']}\n")
-                if len(refs) > 5:
-                    f.write(f"... 还有 {len(refs) - 5} 个引用\n")
-                f.write("\n")
-        
-        # 公式依赖关系图
-        f.write("## 公式依赖关系\n\n")
-        f.write("### 关键公式分析\n\n")
-        
-        # 找出包含XLOOKUP的公式
-        xlookup_formulas = [f for f in formulas if 'XLOOKUP' in f['formula']]
-        
-        if xlookup_formulas:
-            f.write("#### XLOOKUP公式分析\n\n")
-            for formula in xlookup_formulas[:10]:
-                f.write(f"**{formula['file']}!{formula['sheet']}!{formula['cell']}**:\n")
-                f.write(f"```\n{formula['formula']}\n```\n")
-                
-                # 解析XLOOKUP参数
-                xlookup_match = re.search(r"XLOOKUP\(([^,]+),\s*'([^']+)'!([^,]+),\s*'([^']+)'!([^,]+)", formula['formula'])
-                if xlookup_match:
-                    lookup_value = xlookup_match.group(1).strip()
-                    lookup_file = xlookup_match.group(2)
-                    lookup_range = xlookup_match.group(3)
-                    return_file = xlookup_match.group(4)
-                    return_range = xlookup_match.group(5)
-                    
-                    f.write("参数解析:\n")
-                    f.write(f"- 查找值: {lookup_value}\n")
-                    f.write(f"- 查找范围: {lookup_file}!{lookup_range}\n")
-                    f.write(f"- 返回范围: {return_file}!{return_range}\n")
-                f.write("\n")
-        
-        # 数据流分析
-        f.write("### 数据流向分析\n\n")
-        f.write("基于公式分析，数据流向如下:\n\n")
-        
-        # 分析数据源文件
-        data_sources = set()
-        for ref in references:
-            if ref['type'] == 'xlookup_reference' and ref['file']:
-                data_sources.add(ref['file'])
-        
-        f.write("**数据源文件**:\n")
-        for source in sorted(data_sources):
-            f.write(f"- {source}\n")
-        f.write("\n")
-        
-        f.write("**数据流向**:\n")
-        f.write("1. 基础数据从各数据源文件获取\n")
-        f.write("2. 通过XLOOKUP/VLOOKUP函数进行数据匹配\n")
-        f.write("3. 在工资核算表中进行汇总计算\n")
-        f.write("4. 生成最终的工资计算结果\n\n")
-    
-    return report_path
-
-def main():
-    """主函数"""
-    base_path = "/Users/mr.wang/代码库/绿纤/lvqianmeiye_ERP/参考资料/工资核算 -7月"
-    
-    # 要分析的文件列表
-    files_to_analyze = [
-        "工资(全字段).xlsx",
-        "①B-a-26考勤汇总表.xlsx",
-        "②B-a-17每日早报.xlsx", 
-        "③B-a-③呈现-消耗明细表.xlsx",
-        "④B-a-25社保统计表.xlsx",
-        "⑤B-a-12奖励统计表.xlsx",
-        "B-b-③健康师底薪.xlsx",
-        "B-b-④健康师提成-金三角顾问.xlsx",
-        "B-b-⑤其他岗位工资.xlsx",
-        "B-b-⑤当月数据及门店毛利.xlsx"
-    ]
-    
-    all_formulas = []
-    all_references = []
-    
-    print("开始分析Excel公式...")
-    print("=" * 60)
-    
-    for filename in files_to_analyze:
-        file_path = os.path.join(base_path, filename)
-        if os.path.exists(file_path):
-            print(f"正在分析: {filename}")
-            formulas, references = extract_formulas_from_excel(file_path)
-            all_formulas.extend(formulas)
-            all_references.extend(references)
-            print(f"  发现 {len(formulas)} 个公式")
-        else:
-            print(f"文件不存在: {filename}")
-    
-    # 分析依赖关系
-    dependencies = analyze_formula_dependencies(all_formulas)
-    
-    # 生成报告
-    report_path = generate_formula_report(all_formulas, all_references, dependencies)
-    
-    print(f"\n公式分析完成!")
-    print(f"总公式数量: {len(all_formulas)}")
-    print(f"总引用数量: {len(all_references)}")
-    print(f"分析报告: {report_path}")
-
-if __name__ == "__main__":
-    main()
diff --git a/antis-ncc-admin/src/views/lqKhxx/Form.vue b/antis-ncc-admin/src/views/lqKhxx/Form.vue
index c6b674c..75bbd02 100644
--- a/antis-ncc-admin/src/views/lqKhxx/Form.vue
+++ b/antis-ncc-admin/src/views/lqKhxx/Form.vue
@@ -1,7 +1,9 @@
 <template>
-	<el-dialog :title="!dataForm.id ? '新建客户信息' : isDetail ? '客户信息详情' : '编辑客户信息'" :close-on-click-modal="false" :visible.sync="visible" class="NCC-dialog NCC-dialog_center" lock-scroll width="1200px">
+	<el-dialog :title="!dataForm.id ? '新建客户信息' : isDetail ? '客户信息详情' : '编辑客户信息'" :close-on-click-modal="false"
+		:visible.sync="visible" class="NCC-dialog NCC-dialog_center" lock-scroll width="1200px">
 		<el-row :gutter="10" class="compact-form">
-			<el-form ref="elForm" :model="dataForm" size="mini" label-width="100px" label-position="right" :disabled="!!isDetail" :rules="rules">
+			<el-form ref="elForm" :model="dataForm" size="mini" label-width="100px" label-position="right"
+				:disabled="!!isDetail" :rules="rules">
 				<!-- 基本信息 -->
 				<el-col :span="24">
 					<div class="form-section-title">
@@ -11,57 +13,62 @@
 				</el-col>
 				<el-col :span="6" v-if="false">
 					<el-form-item label="客户编码" prop="id">
-						<el-input v-model="dataForm.id" placeholder="系统自动生成" clearable readonly :style='{"width":"100%"}' >
+						<el-input v-model="dataForm.id" placeholder="系统自动生成" clearable readonly
+							:style='{ "width": "100%" }'>
 						</el-input>
 					</el-form-item>
 				</el-col>
 				<el-col :span="6">
 					<el-form-item label="客户名称" prop="khmc" required>
-						<el-input v-model="dataForm.khmc" placeholder="请输入客户姓名" clearable :style='{"width":"100%"}' >
+						<el-input v-model="dataForm.khmc" placeholder="请输入客户姓名" clearable :style='{ "width": "100%" }'>
 						</el-input>
 					</el-form-item>
 				</el-col>
 				<el-col :span="6">
 					<el-form-item label="手机号" prop="sjh" required>
-						<el-input v-model="dataForm.sjh" placeholder="请输入手机号" clearable :style='{"width":"100%"}' >
+						<el-input v-model="dataForm.sjh" placeholder="请输入手机号" clearable :style='{ "width": "100%" }'>
 						</el-input>
 					</el-form-item>
 				</el-col>
 				<el-col :span="6">
 					<el-form-item label="档案号" prop="dah">
-						<el-input v-model="dataForm.dah" placeholder="请输入档案号" clearable :style='{"width":"100%"}' >
+						<el-input v-model="dataForm.dah" placeholder="请输入档案号" clearable :style='{ "width": "100%" }'>
 						</el-input>
 					</el-form-item>
 				</el-col>
 				<el-col :span="6">
 					<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 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="6">
 					<el-form-item label="年龄" prop="ml">
-						<el-input v-model="dataForm.ml" placeholder="请输入年龄" clearable :style='{"width":"100%"}' >
+						<el-input v-model="dataForm.ml" placeholder="请输入年龄" clearable :style='{ "width": "100%" }'>
 							<template slot="append">岁</template>
 						</el-input>
 					</el-form-item>
 				</el-col>
 				<el-col :span="6">
 					<el-form-item label="阳历生日" prop="yanglsr">
-						<el-date-picker v-model="dataForm.yanglsr" placeholder="请选择阳历生日" clearable :style='{"width":"100%"}' type='date' format="yyyy-MM-dd" value-format="timestamp" >
+						<el-date-picker v-model="dataForm.yanglsr" 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="6">
 					<el-form-item label="阴历生日" prop="yinlsr">
-						<el-date-picker v-model="dataForm.yinlsr" placeholder="请选择阴历生日" clearable :style='{"width":"100%"}' type='date' format="yyyy-MM-dd" value-format="timestamp" >
+						<el-date-picker v-model="dataForm.yinlsr" 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="12">
 					<el-form-item label="联系地址" prop="lxdz">
-						<el-input v-model="dataForm.lxdz" placeholder="请输入详细联系地址" clearable :style='{"width":"100%"}' >
+						<el-input v-model="dataForm.lxdz" placeholder="请输入详细联系地址" clearable
+							:style='{ "width": "100%" }'>
 						</el-input>
 					</el-form-item>
 				</el-col>
@@ -75,27 +82,32 @@
 				</el-col>
 				<el-col :span="6">
 					<el-form-item label="微信昵称" prop="wxnc">
-						<el-input v-model="dataForm.wxnc" placeholder="请输入微信昵称" clearable :style='{"width":"100%"}' >
+						<el-input v-model="dataForm.wxnc" placeholder="请输入微信昵称" clearable :style='{ "width": "100%" }'>
 						</el-input>
 					</el-form-item>
 				</el-col>
 				<el-col :span="6">
 					<el-form-item label="公众号状态" prop="gzhzt">
-						<el-select v-model="dataForm.gzhzt" placeholder="请选择公众号状态" clearable :style='{"width":"100%"}' >
-							<el-option v-for="(item, index) in gzhztOptions" :key="index" :label="item.fullName" :value="item.id" ></el-option>
+						<el-select v-model="dataForm.gzhzt" placeholder="请选择公众号状态" clearable
+							:style='{ "width": "100%" }'>
+							<el-option v-for="(item, index) in gzhztOptions" :key="index" :label="item.fullName"
+								:value="item.id"></el-option>
 						</el-select>
 					</el-form-item>
 				</el-col>
 				<el-col :span="6">
 					<el-form-item label="小程序状态" prop="wxxcxzt">
-						<el-select v-model="dataForm.wxxcxzt" placeholder="请选择小程序状态" clearable :style='{"width":"100%"}' >
-							<el-option v-for="(item, index) in wxxcxztOptions" :key="index" :label="item.fullName" :value="item.id" ></el-option>
+						<el-select v-model="dataForm.wxxcxzt" placeholder="请选择小程序状态" clearable
+							:style='{ "width": "100%" }'>
+							<el-option v-for="(item, index) in wxxcxztOptions" :key="index" :label="item.fullName"
+								:value="item.id"></el-option>
 						</el-select>
 					</el-form-item>
 				</el-col>
 				<el-col :span="6">
 					<el-form-item label="最近登录时间" prop="zjdlsj">
-						<el-date-picker v-model="dataForm.zjdlsj" placeholder="请选择登录时间" clearable :style='{"width":"100%"}' type='date' format="yyyy-MM-dd" value-format="timestamp" >
+						<el-date-picker v-model="dataForm.zjdlsj" placeholder="请选择登录时间" clearable
+							:style='{ "width": "100%" }' type='date' format="yyyy-MM-dd" value-format="timestamp">
 						</el-date-picker>
 					</el-form-item>
 				</el-col>
@@ -109,48 +121,56 @@
 				</el-col>
 				<el-col :span="6">
 					<el-form-item label="客户目前归属" prop="khmqgs">
-						<el-select v-model="dataForm.khmqgs" placeholder="请选择客户归属" clearable :style='{"width":"100%"}' >
-							<el-option v-for="(item, index) in khmqgsOptions" :key="index" :label="item.fullName" :value="item.id" ></el-option>
+						<el-select v-model="dataForm.khmqgs" placeholder="请选择客户归属" clearable
+							:style='{ "width": "100%" }'>
+							<el-option v-for="(item, index) in khmqgsOptions" :key="index" :label="item.fullName"
+								:value="item.id"></el-option>
 						</el-select>
 					</el-form-item>
 				</el-col>
 				<el-col :span="6">
 					<el-form-item label="归属门店" prop="gsmd">
-						<el-input v-model="dataForm.gsmd" placeholder="请输入归属门店" clearable :style='{"width":"100%"}' >
+						<el-input v-model="dataForm.gsmd" placeholder="请输入归属门店" clearable :style='{ "width": "100%" }'>
 						</el-input>
 					</el-form-item>
 				</el-col>
 				<el-col :span="6">
 					<el-form-item label="客户类型" prop="khlx">
-						<el-select v-model="dataForm.khlx" placeholder="请选择客户类型" clearable :style='{"width":"100%"}' >
-							<el-option v-for="(item, index) in khlxOptions" :key="index" :label="item.fullName" :value="item.id" ></el-option>
+						<el-select v-model="dataForm.khlx" placeholder="请选择客户类型" clearable :style='{ "width": "100%" }'>
+							<el-option v-for="(item, index) in khlxOptions" :key="index" :label="item.fullName"
+								:value="item.id"></el-option>
 						</el-select>
 					</el-form-item>
 				</el-col>
 				<el-col :span="6">
 					<el-form-item label="客户阶段" prop="khjd">
-						<el-select v-model="dataForm.khjd" placeholder="请选择客户阶段" clearable :style='{"width":"100%"}' >
-							<el-option v-for="(item, index) in khjdOptions" :key="index" :label="item.fullName" :value="item.id" ></el-option>
+						<el-select v-model="dataForm.khjd" placeholder="请选择客户阶段" clearable :style='{ "width": "100%" }'>
+							<el-option v-for="(item, index) in khjdOptions" :key="index" :label="item.fullName"
+								:value="item.id"></el-option>
 						</el-select>
 					</el-form-item>
 				</el-col>
 				<el-col :span="6">
 					<el-form-item label="客户消费" prop="khxf">
-						<el-checkbox-group v-model="dataForm.khxf" :style='{}' >
-							<el-checkbox v-for="(item, index) in khxfOptions" :key="index" :label="item.id" >{{item.fullName}}</el-checkbox>
+						<el-checkbox-group v-model="dataForm.khxf" :style='{}'>
+							<el-checkbox v-for="(item, index) in khxfOptions" :key="index" :label="item.id">{{
+								item.fullName
+							}}</el-checkbox>
 						</el-checkbox-group>
 					</el-form-item>
 				</el-col>
 				<el-col :span="6">
 					<el-form-item label="消费频次" prop="xfpc">
-						<el-select v-model="dataForm.xfpc" placeholder="请选择消费频次" clearable :style='{"width":"100%"}' >
-							<el-option v-for="(item, index) in xfpcOptions" :key="index" :label="item.fullName" :value="item.id" ></el-option>
+						<el-select v-model="dataForm.xfpc" placeholder="请选择消费频次" clearable :style='{ "width": "100%" }'>
+							<el-option v-for="(item, index) in xfpcOptions" :key="index" :label="item.fullName"
+								:value="item.id"></el-option>
 						</el-select>
 					</el-form-item>
 				</el-col>
 				<el-col :span="6">
 					<el-form-item label="注册时间" prop="zcsj">
-						<el-date-picker v-model="dataForm.zcsj" placeholder="请选择注册时间" clearable :style='{"width":"100%"}' type='date' format="yyyy-MM-dd" value-format="timestamp" >
+						<el-date-picker v-model="dataForm.zcsj" placeholder="请选择注册时间" clearable
+							:style='{ "width": "100%" }' type='date' format="yyyy-MM-dd" value-format="timestamp">
 						</el-date-picker>
 					</el-form-item>
 				</el-col>
@@ -164,31 +184,25 @@
 				</el-col>
 				<el-col :span="6">
 					<el-form-item label="推荐人" prop="tjr">
-						<el-input v-model="dataForm.tjr" placeholder="请输入推荐人" clearable :style='{"width":"100%"}' >
+						<el-input v-model="dataForm.tjr" placeholder="请输入推荐人" clearable :style='{ "width": "100%" }'>
 						</el-input>
 					</el-form-item>
 				</el-col>
 				<el-col :span="6">
 					<el-form-item label="负责顾问" prop="fzgw">
-						<el-input v-model="dataForm.fzgw" placeholder="请输入负责顾问" clearable :style='{"width":"100%"}' >
+						<el-input v-model="dataForm.fzgw" placeholder="请输入负责顾问" clearable :style='{ "width": "100%" }'>
 						</el-input>
 					</el-form-item>
 				</el-col>
 				<el-col :span="6">
 					<el-form-item label="美容师" prop="mrs">
-						<el-input v-model="dataForm.mrs" placeholder="请输入美容师" clearable :style='{"width":"100%"}' >
+						<el-input v-model="dataForm.mrs" placeholder="请输入美容师" clearable :style='{ "width": "100%" }'>
 						</el-input>
 					</el-form-item>
 				</el-col>
 				<el-col :span="6">
 					<el-form-item label="进店渠道" prop="jdqd">
-						<el-input v-model="dataForm.jdqd" placeholder="请输入进店渠道" clearable :style='{"width":"100%"}' >
-						</el-input>
-					</el-form-item>
-				</el-col>
-				<el-col :span="12">
-					<el-form-item label="最近服务人员" prop="zjycfwry">
-						<el-input v-model="dataForm.zjycfwry" placeholder="请输入最近服务人员" clearable :style='{"width":"100%"}' >
+						<el-input v-model="dataForm.jdqd" placeholder="请输入进店渠道" clearable :style='{ "width": "100%" }'>
 						</el-input>
 					</el-form-item>
 				</el-col>
@@ -200,53 +214,6 @@
 						<span>到店记录</span>
 					</div>
 				</el-col>
-				<el-col :span="6">
-					<el-form-item label="首次到店" prop="scdd">
-						<el-date-picker v-model="dataForm.scdd" 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="6">
-					<el-form-item label="最近到店" prop="zjdd">
-						<el-date-picker v-model="dataForm.zjdd" 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="6">
-					<el-form-item label="未到店天数" prop="wddts">
-						<el-input v-model="dataForm.wddts" placeholder="请输入未到店天数" clearable :style='{"width":"100%"}' >
-							<template slot="append">天</template>
-						</el-input>
-					</el-form-item>
-				</el-col>
-				<el-col :span="6">
-					<el-form-item label="期间到店频次" prop="qjddpc">
-						<el-input v-model="dataForm.qjddpc" placeholder="请输入到店频次" clearable :style='{"width":"100%"}' >
-							<template slot="append">次</template>
-						</el-input>
-					</el-form-item>
-				</el-col>
-				<el-col :span="6">
-					<el-form-item label="期间服务单次" prop="qjfwdc">
-						<el-input v-model="dataForm.qjfwdc" placeholder="请输入服务次数" clearable :style='{"width":"100%"}' >
-							<template slot="append">次</template>
-						</el-input>
-					</el-form-item>
-				</el-col>
-				<el-col :span="6">
-					<el-form-item label="累计消费次数" prop="ljxfcs">
-						<el-input v-model="dataForm.ljxfcs" placeholder="请输入累计消费次数" clearable :style='{"width":"100%"}' >
-							<template slot="append">次</template>
-						</el-input>
-					</el-form-item>
-				</el-col>
-				<el-col :span="6">
-					<el-form-item label="累计服务次数" prop="ljfwcs">
-						<el-input v-model="dataForm.ljfwcs" placeholder="请输入累计服务次数" clearable :style='{"width":"100%"}' >
-							<template slot="append">次</template>
-						</el-input>
-					</el-form-item>
-				</el-col>
 
 				<!-- 消费信息 -->
 				<el-col :span="24">
@@ -255,34 +222,6 @@
 						<span>消费信息</span>
 					</div>
 				</el-col>
-				<el-col :span="6">
-					<el-form-item label="期间现金消费" prop="qjxjxf">
-						<el-input v-model="dataForm.qjxjxf" placeholder="请输入现金消费金额" clearable :style='{"width":"100%"}' @input="formatNumber('qjxjxf')">
-							<template slot="append">元</template>
-						</el-input>
-					</el-form-item>
-				</el-col>
-				<el-col :span="6">
-					<el-form-item label="期间项目耗卡" prop="qjxmhk">
-						<el-input v-model="dataForm.qjxmhk" placeholder="请输入项目耗卡金额" clearable :style='{"width":"100%"}' @input="formatNumber('qjxmhk')">
-							<template slot="append">元</template>
-						</el-input>
-					</el-form-item>
-				</el-col>
-				<el-col :span="6">
-					<el-form-item label="期间储值消耗" prop="qjczxh">
-						<el-input v-model="dataForm.qjczxh" placeholder="请输入储值消耗金额" clearable :style='{"width":"100%"}' @input="formatNumber('qjczxh')">
-							<template slot="append">元</template>
-						</el-input>
-					</el-form-item>
-				</el-col>
-				<el-col :span="6">
-					<el-form-item label="现金消费金额" prop="ljxjxfje">
-						<el-input v-model="dataForm.ljxjxfje" placeholder="请输入现金消费总额" clearable :style='{"width":"100%"}' @input="formatNumber('ljxjxfje')">
-							<template slot="append">元</template>
-						</el-input>
-					</el-form-item>
-				</el-col>
 
 				<!-- 余额信息 -->
 				<el-col :span="24">
@@ -291,48 +230,6 @@
 						<span>余额信息</span>
 					</div>
 				</el-col>
-				<el-col :span="6">
-					<el-form-item label="剩余储值" prop="sycz">
-						<el-input v-model="dataForm.sycz" placeholder="请输入剩余储值" clearable :style='{"width":"100%"}' @input="formatNumber('sycz')">
-							<template slot="append">元</template>
-						</el-input>
-					</el-form-item>
-				</el-col>
-				<el-col :span="6">
-					<el-form-item label="剩余积分" prop="syjf">
-						<el-input v-model="dataForm.syjf" placeholder="请输入剩余积分" clearable :style='{"width":"100%"}' >
-							<template slot="append">分</template>
-						</el-input>
-					</el-form-item>
-				</el-col>
-				<el-col :span="6">
-					<el-form-item label="剩余品项金额" prop="sypxje">
-						<el-input v-model="dataForm.sypxje" placeholder="请输入剩余品项金额" clearable :style='{"width":"100%"}' @input="formatNumber('sypxje')">
-							<template slot="append">元</template>
-						</el-input>
-					</el-form-item>
-				</el-col>
-				<el-col :span="6">
-					<el-form-item label="剩余套餐金额" prop="sytcje">
-						<el-input v-model="dataForm.sytcje" placeholder="请输入剩余套餐金额" clearable :style='{"width":"100%"}' @input="formatNumber('sytcje')">
-							<template slot="append">元</template>
-						</el-input>
-					</el-form-item>
-				</el-col>
-				<el-col :span="6">
-					<el-form-item label="项目耗卡金额" prop="ljxmhkje">
-						<el-input v-model="dataForm.ljxmhkje" placeholder="请输入项目耗卡金额" clearable :style='{"width":"100%"}' @input="formatNumber('ljxmhkje')">
-							<template slot="append">元</template>
-						</el-input>
-					</el-form-item>
-				</el-col>
-				<el-col :span="6">
-					<el-form-item label="累计储值消耗" prop="ljczxh">
-						<el-input v-model="dataForm.ljczxh" placeholder="请输入累计储值消耗" clearable :style='{"width":"100%"}' @input="formatNumber('ljczxh')">
-							<template slot="append">元</template>
-						</el-input>
-					</el-form-item>
-				</el-col>
 
 				<!-- 备注信息 -->
 				<el-col :span="24">
@@ -343,12 +240,13 @@
 				</el-col>
 				<el-col :span="24">
 					<el-form-item label="备注" prop="bz">
-						<el-input v-model="dataForm.bz" placeholder="请输入备注信息" show-word-limit :style='{"width":"100%"}' type='textarea' :autosize='{"minRows":3,"maxRows":6}' >
+						<el-input v-model="dataForm.bz" placeholder="请输入备注信息" show-word-limit
+							:style='{ "width": "100%" }' type='textarea' :autosize='{ "minRows": 3, "maxRows": 6 }'>
 						</el-input>
 					</el-form-item>
 				</el-col>
 
-				</el-form>
+			</el-form>
 		</el-row>
 		<span slot="footer" class="dialog-footer">
 			<el-button @click="visible = false">取 消</el-button>
@@ -358,172 +256,154 @@
 	</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,
-					khmc:undefined,
-					sjh:undefined,
-					dah:undefined,
-					xb:undefined,
-					gzhzt:undefined,
-					wxnc:undefined,
-					wxxcxzt:undefined,
-					zjdlsj:undefined,
-					khmqgs:undefined,
-					gsmd:undefined,
-					zcsj:undefined,
-					khlx:undefined,
-					khjd:undefined,
-					khxf:[],
-					xfpc:undefined,
-					tjr:undefined,
-					fzgw:undefined,
-					mrs:undefined,
-					jdqd:undefined,
-					lxdz:undefined,
-					bz:undefined,
-					scdd:undefined,
-					zjdd:undefined,
-					wddts:undefined,
-					yanglsr:undefined,
-					yinlsr:undefined,
-					ml:undefined,
-					zjycfwry:undefined,
-					qjddpc:undefined,
-					qjfwdc:undefined,
-					qjxjxf:undefined,
-					qjxmhk:undefined,
-					qjczxh:undefined,
-					sycz:undefined,
-					syjf:undefined,
-					sypxje:undefined,
-					sytcje:undefined,
-					ljxmhkje:undefined,
-					ljczxh:undefined,
-					ljxfcs:undefined,
-					ljfwcs:undefined,
-					ljxjxfje:undefined,
-				},
-				rules: {
-					khmc: [
-						{ required: true, message: '请输入客户名称', trigger: 'blur' }
-					],
-					sjh: [
-						{ required: true, message: '请输入手机号', trigger: 'blur' },
-						{ pattern: /^1[3-9]\d{9}$/, message: '请输入正确的手机号格式', trigger: 'blur' }
-					]
-				},
-				xbOptions:[{"fullName":"男","id":"男"},{"fullName":"女","id":"女"}],
-				gzhztOptions:[{"fullName":"已绑定","id":"已绑定"},{"fullName":"未绑定","id":"未绑定"}],
-				wxxcxztOptions:[{"fullName":"已绑定","id":"已绑定"},{"fullName":"未绑定","id":"未绑定"}],
-				khmqgsOptions:[{"fullName":"会员","id":"会员"},{"fullName":"线索池","id":"线索池"},{"fullName":"会员-归档","id":"会员-归档"}],
-				khlxOptions:[{"fullName":"新客","id":"新客"},{"fullName":"老客","id":"老客"},{"fullName":"潜客","id":"潜客"},{"fullName":"线索","id":"线索"}],
-				khjdOptions:[{"fullName":"体验","id":"体验"},{"fullName":"有效","id":"有效"},{"fullName":"沉睡","id":"沉睡"},{"fullName":"流失","id":"流失"}],
-				khxfOptions:[{"fullName":"D客","id":"D客"},{"fullName":"有效","id":"有效"}],
-				xfpcOptions:[{"fullName":"高频","id":"高频"},{"fullName":"低频","id":"低频"}],
-			}
+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,
+				khmc: undefined,
+				sjh: undefined,
+				dah: undefined,
+				xb: undefined,
+				gzhzt: undefined,
+				wxnc: undefined,
+				wxxcxzt: undefined,
+				zjdlsj: undefined,
+				khmqgs: undefined,
+				gsmd: undefined,
+				zcsj: undefined,
+				khlx: undefined,
+				khjd: undefined,
+				khxf: [],
+				xfpc: undefined,
+				tjr: undefined,
+				fzgw: undefined,
+				mrs: undefined,
+				jdqd: undefined,
+				lxdz: undefined,
+				bz: undefined,
+				yanglsr: undefined,
+				yinlsr: undefined,
+				ml: undefined,
+			},
+			rules: {
+				khmc: [
+					{ required: true, message: '请输入客户名称', trigger: 'blur' }
+				],
+				sjh: [
+					{ required: true, message: '请输入手机号', trigger: 'blur' },
+					{ pattern: /^1[3-9]\d{9}$/, message: '请输入正确的手机号格式', trigger: 'blur' }
+				]
+			},
+			xbOptions: [{ "fullName": "男", "id": "男" }, { "fullName": "女", "id": "女" }],
+			gzhztOptions: [{ "fullName": "已绑定", "id": "已绑定" }, { "fullName": "未绑定", "id": "未绑定" }],
+			wxxcxztOptions: [{ "fullName": "已绑定", "id": "已绑定" }, { "fullName": "未绑定", "id": "未绑定" }],
+			khmqgsOptions: [{ "fullName": "会员", "id": "会员" }, { "fullName": "线索池", "id": "线索池" }, { "fullName": "会员-归档", "id": "会员-归档" }],
+			khlxOptions: [{ "fullName": "新客", "id": "新客" }, { "fullName": "老客", "id": "老客" }, { "fullName": "潜客", "id": "潜客" }, { "fullName": "线索", "id": "线索" }],
+			khjdOptions: [{ "fullName": "体验", "id": "体验" }, { "fullName": "有效", "id": "有效" }, { "fullName": "沉睡", "id": "沉睡" }, { "fullName": "流失", "id": "流失" }],
+			khxfOptions: [{ "fullName": "D客", "id": "D客" }, { "fullName": "有效", "id": "有效" }],
+			xfpcOptions: [{ "fullName": "高频", "id": "高频" }, { "fullName": "低频", "id": "低频" }],
+		}
+	},
+	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/LqKhxx/' + this.dataForm.id,
+						method: 'get'
+					}).then(res => {
+						this.dataForm = res.data;
+						if (!this.dataForm.khxf) this.dataForm.khxf = [];
+					})
+				}
+			})
 		},
-		computed: {},
-        watch: {},
-        created() {
+		resetForm() {
+			this.$confirm('确定要重置表单吗？', '提示', {
+				confirmButtonText: '确定',
+				cancelButtonText: '取消',
+				type: 'warning'
+			}).then(() => {
+				this.$refs['elForm'].resetFields();
+				this.$message.success('表单已重置');
+			}).catch(() => {
+				// 用户取消
+			});
 		},
-		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) {
+		formatNumber(field) {
+			// 移除千分位分隔符，只保留数字和小数点
+			let value = this.dataForm[field].toString().replace(/,/g, '');
+			// 确保是有效的数字格式
+			if (!/^\d*\.?\d*$/.test(value)) {
+				value = value.replace(/[^\d.]/g, '');
+			}
+			// 更新原始值
+			this.dataForm[field] = value;
+		},
+		dataFormSubmit() {
+			this.$refs['elForm'].validate((valid) => {
+				if (valid) {
+					if (!this.dataForm.id) {
+						request({
+							url: `/api/Extend/LqKhxx`,
+							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/LqKhxx/' + this.dataForm.id,
-							method: 'get'
-						}).then(res =>{
-							this.dataForm = res.data;
-							if(!this.dataForm.khxf)this.dataForm.khxf=[];
+							method: 'PUT',
+							data: this.dataForm
+						}).then((res) => {
+							this.$message({
+								message: res.msg,
+								type: 'success',
+								duration: 1000,
+								onClose: () => {
+									this.visible = false
+									this.$emit('refresh', true)
+								}
+							})
 						})
 					}
-				})
-			},
-			resetForm() {
-				this.$confirm('确定要重置表单吗？', '提示', {
-					confirmButtonText: '确定',
-					cancelButtonText: '取消',
-					type: 'warning'
-				}).then(() => {
-					this.$refs['elForm'].resetFields();
-					this.$message.success('表单已重置');
-				}).catch(() => {
-					// 用户取消
-				});
-			},
-			formatNumber(field) {
-				// 移除千分位分隔符，只保留数字和小数点
-				let value = this.dataForm[field].toString().replace(/,/g, '');
-				// 确保是有效的数字格式
-				if (!/^\d*\.?\d*$/.test(value)) {
-					value = value.replace(/[^\d.]/g, '');
 				}
-				// 更新原始值
-				this.dataForm[field] = value;
-			},
-			dataFormSubmit() {
-				this.$refs['elForm'].validate((valid) => {
-                    if (valid) {
-                        if (!this.dataForm.id) {
-                            request({
-                                url: `/api/Extend/LqKhxx`,
-                                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/LqKhxx/' + 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>
 
 <style scoped>
diff --git a/antis-ncc-admin/src/views/lqKhxx/index.vue b/antis-ncc-admin/src/views/lqKhxx/index.vue
index 847baeb..bded0a9 100644
--- a/antis-ncc-admin/src/views/lqKhxx/index.vue
+++ b/antis-ncc-admin/src/views/lqKhxx/index.vue
@@ -5,249 +5,171 @@
 				<el-form @submit.native.prevent>
 					<el-col :span="6">
 						<el-form-item label="客户编码">
-							<el-input v-model="query.id" placeholder="客户编码" clearable />	
+							<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.khmc" placeholder="客户名称" clearable />	
+							<el-input v-model="query.khmc" placeholder="客户名称" clearable />
 						</el-form-item>
 					</el-col>
 					<el-col :span="6">
 						<el-form-item label="手机号">
-							<el-input v-model="query.sjh" placeholder="手机号" clearable />	
+							<el-input v-model="query.sjh" placeholder="手机号" clearable />
 						</el-form-item>
 					</el-col>
 					<template v-if="showAll">
-					<el-col :span="6">
-						<el-form-item label="档案号">
-							<el-input v-model="query.dah" 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>
-					<el-col :span="6">
-						<el-form-item label="公众号状态">
-							<el-select v-model="query.gzhzt" placeholder="公众号状态" clearable >
-								<el-option v-for="(item, index) in gzhztOptions" :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.wxnc" placeholder="微信昵称" clearable />	
-						</el-form-item>
-					</el-col>
-					<el-col :span="6">
-						<el-form-item label="小程序状态">
-							<el-select v-model="query.wxxcxzt" placeholder="小程序状态" clearable >
-								<el-option v-for="(item, index) in wxxcxztOptions" :key="index" :label="item.fullName" :value="item.id"  />
-							</el-select>
-						</el-form-item>
-					</el-col>
-					<el-col :span="6">
-						<el-form-item label="最近登录时间">
-							<el-date-picker v-model="query.zjdlsj" 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-select v-model="query.khmqgs" placeholder="客户目前归属" clearable >
-								<el-option v-for="(item, index) in khmqgsOptions" :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.gsmd" placeholder="归属门店" clearable />	
-						</el-form-item>
-					</el-col>
-					<el-col :span="6">
-						<el-form-item label="注册时间">
-							<el-date-picker v-model="query.zcsj" 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-select v-model="query.khlx" placeholder="客户类型" clearable >
-								<el-option v-for="(item, index) in khlxOptions" :key="index" :label="item.fullName" :value="item.id"  />
-							</el-select>
-						</el-form-item>
-					</el-col>
-					<el-col :span="6">
-						<el-form-item label="客户阶段">
-							<el-select v-model="query.khjd" placeholder="客户阶段" clearable >
-								<el-option v-for="(item, index) in khjdOptions" :key="index" :label="item.fullName" :value="item.id"  />
-							</el-select>
-						</el-form-item>
-					</el-col>
-					<el-col :span="6">
-						<el-form-item label="客户消费">
-							<el-select v-model="query.khxf" placeholder="客户消费" >
-								<el-option v-for="(item, index) in khxfOptions" :key="index" :label="item.fullName" :value="item.id"  />
-							</el-select>
-						</el-form-item>
-					</el-col>
-					<el-col :span="6">
-						<el-form-item label="消费频次">
-							<el-select v-model="query.xfpc" placeholder="消费频次" clearable >
-								<el-option v-for="(item, index) in xfpcOptions" :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.tjr" placeholder="推荐人" clearable />	
-						</el-form-item>
-					</el-col>
-					<el-col :span="6">
-						<el-form-item label="负责顾问">
-							<el-input v-model="query.fzgw" placeholder="负责顾问" clearable />	
-						</el-form-item>
-					</el-col>
-					<el-col :span="6">
-						<el-form-item label="美容师">
-							<el-input v-model="query.mrs" placeholder="美容师" clearable />	
-						</el-form-item>
-					</el-col>
-					<el-col :span="6">
-						<el-form-item label="进店渠道">
-							<el-input v-model="query.jdqd" placeholder="进店渠道" clearable />	
-						</el-form-item>
-					</el-col>
-					<el-col :span="6">
-						<el-form-item label="联系地址">
-							<el-input v-model="query.lxdz" placeholder="联系地址" clearable />	
-						</el-form-item>
-					</el-col>
-					<el-col :span="6">
-						<el-form-item label="备注">
-							<el-input v-model="query.bz" placeholder="备注" />	
-						</el-form-item>
-					</el-col>
-					<el-col :span="6">
-						<el-form-item label="首次到店">
-							<el-date-picker v-model="query.scdd" 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.zjdd" 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.wddts" placeholder="未到店天数" clearable />	
-						</el-form-item>
-					</el-col>
-					<el-col :span="6">
-						<el-form-item label="阳历生日">
-							<el-date-picker v-model="query.yanglsr" 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.yinlsr" 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.ml" placeholder="年龄" clearable />	
-						</el-form-item>
-					</el-col>
-					<el-col :span="6">
-						<el-form-item label="最近服务人员">
-							<el-input v-model="query.zjycfwry" placeholder="最近服务人员" clearable />	
-						</el-form-item>
-					</el-col>
-					<el-col :span="6">
-						<el-form-item label="期间到店频次">
-							<el-input v-model="query.qjddpc" placeholder="期间到店频次" clearable />	
-						</el-form-item>
-					</el-col>
-					<el-col :span="6">
-						<el-form-item label="期间服务单次">
-							<el-input v-model="query.qjfwdc" placeholder="期间服务单次" clearable />	
-						</el-form-item>
-					</el-col>
-					<el-col :span="6">
-						<el-form-item label="期间现金消费">
-							<el-input v-model="query.qjxjxf" placeholder="期间现金消费" clearable />	
-						</el-form-item>
-					</el-col>
-					<el-col :span="6">
-						<el-form-item label="期间项目耗卡">
-							<el-input v-model="query.qjxmhk" placeholder="期间项目耗卡" clearable />	
-						</el-form-item>
-					</el-col>
-					<el-col :span="6">
-						<el-form-item label="期间储值消耗">
-							<el-input v-model="query.qjczxh" placeholder="期间储值消耗" clearable />	
-						</el-form-item>
-					</el-col>
-					<el-col :span="6">
-						<el-form-item label="剩余储值">
-							<el-input v-model="query.sycz" placeholder="剩余储值" clearable />	
-						</el-form-item>
-					</el-col>
-					<el-col :span="6">
-						<el-form-item label="剩余积分">
-							<el-input v-model="query.syjf" placeholder="剩余积分" clearable />	
-						</el-form-item>
-					</el-col>
-					<el-col :span="6">
-						<el-form-item label="剩余品项金额">
-							<el-input v-model="query.sypxje" placeholder="剩余品项金额" clearable />	
-						</el-form-item>
-					</el-col>
-					<el-col :span="6">
-						<el-form-item label="剩余套餐金额">
-							<el-input v-model="query.sytcje" placeholder="剩余套餐金额" clearable />	
-						</el-form-item>
-					</el-col>
-					<el-col :span="6">
-						<el-form-item label="项目耗卡金额">
-							<el-input v-model="query.ljxmhkje" placeholder="项目耗卡金额" clearable />	
-						</el-form-item>
-					</el-col>
-					<el-col :span="6">
-						<el-form-item label="累计储值消耗">
-							<el-input v-model="query.ljczxh" placeholder="累计储值消耗" clearable />	
-						</el-form-item>
-					</el-col>
-					<el-col :span="6">
-						<el-form-item label="累计消费次数">
-							<el-input v-model="query.ljxfcs" placeholder="累计消费次数" clearable />	
-						</el-form-item>
-					</el-col>
-					<el-col :span="6">
-						<el-form-item label="累计服务次数">
-							<el-input v-model="query.ljfwcs" placeholder="累计服务次数" clearable />	
-						</el-form-item>
-					</el-col>
-					<el-col :span="6">
-						<el-form-item label="现金消费金额">
-							<el-input v-model="query.ljxjxfje" placeholder="现金消费金额" clearable />	
-						</el-form-item>
-					</el-col>
+						<el-col :span="6">
+							<el-form-item label="档案号">
+								<el-input v-model="query.dah" 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>
+						<el-col :span="6">
+							<el-form-item label="公众号状态">
+								<el-select v-model="query.gzhzt" placeholder="公众号状态" clearable>
+									<el-option v-for="(item, index) in gzhztOptions" :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.wxnc" placeholder="微信昵称" clearable />
+							</el-form-item>
+						</el-col>
+						<el-col :span="6">
+							<el-form-item label="小程序状态">
+								<el-select v-model="query.wxxcxzt" placeholder="小程序状态" clearable>
+									<el-option v-for="(item, index) in wxxcxztOptions" :key="index"
+										:label="item.fullName" :value="item.id" />
+								</el-select>
+							</el-form-item>
+						</el-col>
+						<el-col :span="6">
+							<el-form-item label="最近登录时间">
+								<el-date-picker v-model="query.zjdlsj" 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-select v-model="query.khmqgs" placeholder="客户目前归属" clearable>
+									<el-option v-for="(item, index) in khmqgsOptions" :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.gsmd" placeholder="归属门店" clearable />
+							</el-form-item>
+						</el-col>
+						<el-col :span="6">
+							<el-form-item label="注册时间">
+								<el-date-picker v-model="query.zcsj" 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-select v-model="query.khlx" placeholder="客户类型" clearable>
+									<el-option v-for="(item, index) in khlxOptions" :key="index" :label="item.fullName"
+										:value="item.id" />
+								</el-select>
+							</el-form-item>
+						</el-col>
+						<el-col :span="6">
+							<el-form-item label="客户阶段">
+								<el-select v-model="query.khjd" placeholder="客户阶段" clearable>
+									<el-option v-for="(item, index) in khjdOptions" :key="index" :label="item.fullName"
+										:value="item.id" />
+								</el-select>
+							</el-form-item>
+						</el-col>
+						<el-col :span="6">
+							<el-form-item label="客户消费">
+								<el-select v-model="query.khxf" placeholder="客户消费">
+									<el-option v-for="(item, index) in khxfOptions" :key="index" :label="item.fullName"
+										:value="item.id" />
+								</el-select>
+							</el-form-item>
+						</el-col>
+						<el-col :span="6">
+							<el-form-item label="消费频次">
+								<el-select v-model="query.xfpc" placeholder="消费频次" clearable>
+									<el-option v-for="(item, index) in xfpcOptions" :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.tjr" placeholder="推荐人" clearable />
+							</el-form-item>
+						</el-col>
+						<el-col :span="6">
+							<el-form-item label="负责顾问">
+								<el-input v-model="query.fzgw" placeholder="负责顾问" clearable />
+							</el-form-item>
+						</el-col>
+						<el-col :span="6">
+							<el-form-item label="美容师">
+								<el-input v-model="query.mrs" placeholder="美容师" clearable />
+							</el-form-item>
+						</el-col>
+						<el-col :span="6">
+							<el-form-item label="进店渠道">
+								<el-input v-model="query.jdqd" placeholder="进店渠道" clearable />
+							</el-form-item>
+						</el-col>
+						<el-col :span="6">
+							<el-form-item label="联系地址">
+								<el-input v-model="query.lxdz" placeholder="联系地址" clearable />
+							</el-form-item>
+						</el-col>
+						<el-col :span="6">
+							<el-form-item label="备注">
+								<el-input v-model="query.bz" placeholder="备注" />
+							</el-form-item>
+						</el-col>
+						<el-col :span="6">
+							<el-form-item label="阳历生日">
+								<el-date-picker v-model="query.yanglsr" 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.yinlsr" 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.ml" placeholder="年龄" clearable />
+							</el-form-item>
+						</el-col>
 					</template>
 					<el-col :span="6">
 						<el-form-item>
 							<el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
 							<el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
-							<el-button type="text" icon="el-icon-arrow-down" @click="showAll=true" v-if="!showAll">展开</el-button>
-							<el-button type="text" icon="el-icon-arrow-up" @click="showAll=false" v-else>收起</el-button>
+							<el-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>
@@ -261,18 +183,14 @@
 					</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-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"
-					:header-cell-style="{ background: '#f5f7fa', color: '#606266' }"
-				>
+				<NCC-table v-loading="listLoading" :data="list" has-c @selection-change="handleSelectionChange"
+					:header-cell-style="{ background: '#f5f7fa', color: '#606266' }">
 					<!-- 客户编码 -->
 					<el-table-column label="客户编码" width="140" align="center">
 						<template slot-scope="scope">
@@ -282,7 +200,7 @@
 							</div>
 						</template>
 					</el-table-column>
-					
+
 					<!-- 客户名称 -->
 					<el-table-column label="客户名称" width="120" align="center">
 						<template slot-scope="scope">
@@ -292,7 +210,7 @@
 							</div>
 						</template>
 					</el-table-column>
-					
+
 					<!-- 手机号 -->
 					<el-table-column label="手机号" width="130" align="center">
 						<template slot-scope="scope">
@@ -302,7 +220,7 @@
 							</div>
 						</template>
 					</el-table-column>
-					
+
 					<!-- 档案号 -->
 					<el-table-column label="档案号" width="120" align="center">
 						<template slot-scope="scope">
@@ -312,7 +230,7 @@
 							</div>
 						</template>
 					</el-table-column>
-					
+
 					<!-- 性别 -->
 					<el-table-column label="性别" width="80" align="center">
 						<template slot-scope="scope">
@@ -322,17 +240,19 @@
 							</div>
 						</template>
 					</el-table-column>
-					
+
 					<!-- 公众号状态 -->
 					<el-table-column label="公众号状态" width="120" align="center">
 						<template slot-scope="scope">
 							<div class="wechat-status-info">
-								<i class="el-icon-chat-dot-round wechat-status-icon" :class="getStatusClass(scope.row.gzhzt)"></i>
-								<span class="text-nowrap">{{ scope.row.gzhzt | dynamicText(gzhztOptions) || '无' }}</span>
+								<i class="el-icon-chat-dot-round wechat-status-icon"
+									:class="getStatusClass(scope.row.gzhzt)"></i>
+								<span class="text-nowrap">{{ scope.row.gzhzt | dynamicText(gzhztOptions) || '无'
+								}}</span>
 							</div>
 						</template>
 					</el-table-column>
-					
+
 					<!-- 微信昵称 -->
 					<el-table-column label="微信昵称" width="120" align="center">
 						<template slot-scope="scope">
@@ -342,17 +262,19 @@
 							</div>
 						</template>
 					</el-table-column>
-					
+
 					<!-- 小程序状态 -->
 					<el-table-column label="小程序状态" width="120" align="center">
 						<template slot-scope="scope">
 							<div class="miniprogram-status-info">
-								<i class="el-icon-mobile-phone miniprogram-status-icon" :class="getStatusClass(scope.row.wxxcxzt)"></i>
-								<span class="text-nowrap">{{ scope.row.wxxcxzt | dynamicText(wxxcxztOptions) || '无' }}</span>
+								<i class="el-icon-mobile-phone miniprogram-status-icon"
+									:class="getStatusClass(scope.row.wxxcxzt)"></i>
+								<span class="text-nowrap">{{ scope.row.wxxcxzt | dynamicText(wxxcxztOptions) || '无'
+								}}</span>
 							</div>
 						</template>
 					</el-table-column>
-					
+
 					<!-- 最近登录时间 -->
 					<el-table-column label="最近登录时间" width="140" align="center">
 						<template slot-scope="scope">
@@ -362,17 +284,18 @@
 							</div>
 						</template>
 					</el-table-column>
-					
+
 					<!-- 客户目前归属 -->
 					<el-table-column label="客户目前归属" width="120" align="center">
 						<template slot-scope="scope">
 							<div class="customer-belong-info">
 								<i class="el-icon-collection-tag customer-belong-icon"></i>
-								<span class="text-nowrap">{{ scope.row.khmqgs | dynamicText(khmqgsOptions) || '无' }}</span>
+								<span class="text-nowrap">{{ scope.row.khmqgs | dynamicText(khmqgsOptions) || '无'
+								}}</span>
 							</div>
 						</template>
 					</el-table-column>
-					
+
 					<!-- 归属门店 -->
 					<el-table-column label="归属门店" width="120" align="center">
 						<template slot-scope="scope">
@@ -382,7 +305,7 @@
 							</div>
 						</template>
 					</el-table-column>
-					
+
 					<!-- 注册时间 -->
 					<el-table-column label="注册时间" width="120" align="center">
 						<template slot-scope="scope">
@@ -392,7 +315,7 @@
 							</div>
 						</template>
 					</el-table-column>
-					
+
 					<!-- 客户类型 -->
 					<el-table-column label="客户类型" width="100" align="center">
 						<template slot-scope="scope">
@@ -402,7 +325,7 @@
 							</div>
 						</template>
 					</el-table-column>
-					
+
 					<!-- 客户阶段 -->
 					<el-table-column label="客户阶段" width="100" align="center">
 						<template slot-scope="scope">
@@ -412,7 +335,7 @@
 							</div>
 						</template>
 					</el-table-column>
-					
+
 					<!-- 客户消费 -->
 					<el-table-column label="客户消费" width="100" align="center">
 						<template slot-scope="scope">
@@ -422,7 +345,7 @@
 							</div>
 						</template>
 					</el-table-column>
-					
+
 					<!-- 消费频次 -->
 					<el-table-column label="消费频次" width="100" align="center">
 						<template slot-scope="scope">
@@ -432,7 +355,7 @@
 							</div>
 						</template>
 					</el-table-column>
-					
+
 					<!-- 推荐人 -->
 					<el-table-column label="推荐人" width="100" align="center">
 						<template slot-scope="scope">
@@ -442,7 +365,7 @@
 							</div>
 						</template>
 					</el-table-column>
-					
+
 					<!-- 负责顾问 -->
 					<el-table-column label="负责顾问" width="100" align="center">
 						<template slot-scope="scope">
@@ -452,7 +375,7 @@
 							</div>
 						</template>
 					</el-table-column>
-					
+
 					<!-- 美容师 -->
 					<el-table-column label="美容师" width="100" align="center">
 						<template slot-scope="scope">
@@ -462,7 +385,7 @@
 							</div>
 						</template>
 					</el-table-column>
-					
+
 					<!-- 进店渠道 -->
 					<el-table-column label="进店渠道" width="120" align="center">
 						<template slot-scope="scope">
@@ -472,7 +395,7 @@
 							</div>
 						</template>
 					</el-table-column>
-					
+
 					<!-- 联系地址 -->
 					<el-table-column label="联系地址" min-width="150" show-overflow-tooltip>
 						<template slot-scope="scope">
@@ -482,7 +405,7 @@
 							</div>
 						</template>
 					</el-table-column>
-					
+
 					<!-- 备注 -->
 					<el-table-column label="备注" min-width="150" show-overflow-tooltip>
 						<template slot-scope="scope">
@@ -492,37 +415,10 @@
 							</div>
 						</template>
 					</el-table-column>
-					
-					<!-- 首次到店 -->
-					<el-table-column label="首次到店" width="120" align="center">
-						<template slot-scope="scope">
-							<div class="first-visit-info">
-								<i class="el-icon-date first-visit-icon"></i>
-								<span class="text-nowrap">{{ formatDate(scope.row.scdd) }}</span>
-							</div>
-						</template>
-					</el-table-column>
-					
-					<!-- 最近到店 -->
-					<el-table-column label="最近到店" width="120" align="center">
-						<template slot-scope="scope">
-							<div class="last-visit-info">
-								<i class="el-icon-date last-visit-icon"></i>
-								<span class="text-nowrap">{{ formatDate(scope.row.zjdd) }}</span>
-							</div>
-						</template>
-					</el-table-column>
-					
-					<!-- 未到店天数 -->
-					<el-table-column label="未到店天数" width="120" align="center">
-						<template slot-scope="scope">
-							<div class="no-visit-days-info">
-								<i class="el-icon-warning no-visit-days-icon"></i>
-								<span class="text-nowrap">{{ scope.row.wddts || '0' }}天</span>
-							</div>
-						</template>
-					</el-table-column>
-					
+
+
+
+
 					<!-- 阳历生日 -->
 					<el-table-column label="阳历生日" width="120" align="center">
 						<template slot-scope="scope">
@@ -532,7 +428,7 @@
 							</div>
 						</template>
 					</el-table-column>
-					
+
 					<!-- 阴历生日 -->
 					<el-table-column label="阴历生日" width="120" align="center">
 						<template slot-scope="scope">
@@ -542,7 +438,7 @@
 							</div>
 						</template>
 					</el-table-column>
-					
+
 					<!-- 年龄 -->
 					<el-table-column label="年龄" width="80" align="center">
 						<template slot-scope="scope">
@@ -552,902 +448,770 @@
 							</div>
 						</template>
 					</el-table-column>
-					
-					<!-- 最近服务人员 -->
-					<el-table-column label="最近服务人员" width="130" align="center">
-						<template slot-scope="scope">
-							<div class="recent-service-info">
-								<i class="el-icon-service recent-service-icon"></i>
-								<span class="text-nowrap">{{ scope.row.zjycfwry || '无' }}</span>
-							</div>
-						</template>
-					</el-table-column>
-					
-					<!-- 期间到店频次 -->
-					<el-table-column label="期间到店频次" width="130" align="center">
-						<template slot-scope="scope">
-							<div class="visit-frequency-info">
-								<i class="el-icon-data-line visit-frequency-icon"></i>
-								<span class="text-nowrap">{{ scope.row.qjddpc || '0' }}次</span>
-							</div>
-						</template>
-					</el-table-column>
-					
-					<!-- 期间服务单次 -->
-					<el-table-column label="期间服务单次" width="130" align="center">
-						<template slot-scope="scope">
-							<div class="service-times-info">
-								<i class="el-icon-data-line service-times-icon"></i>
-								<span class="text-nowrap">{{ scope.row.qjfwdc || '0' }}次</span>
-							</div>
-						</template>
-					</el-table-column>
-					
-					<!-- 期间现金消费 -->
-					<el-table-column label="期间现金消费" width="130" align="center">
-						<template slot-scope="scope">
-							<div class="cash-consume-info">
-								<i class="el-icon-money cash-consume-icon"></i>
-								<span class="text-nowrap">{{ formatMoney(scope.row.qjxjxf) }}</span>
-							</div>
-						</template>
-					</el-table-column>
-					
-					<!-- 期间项目耗卡 -->
-					<el-table-column label="期间项目耗卡" width="130" align="center">
-						<template slot-scope="scope">
-							<div class="card-consume-info">
-								<i class="el-icon-bank-card card-consume-icon"></i>
-								<span class="text-nowrap">{{ formatMoney(scope.row.qjxmhk) }}</span>
-							</div>
-						</template>
-					</el-table-column>
-					
-					<!-- 期间储值消耗 -->
-					<el-table-column label="期间储值消耗" width="130" align="center">
-						<template slot-scope="scope">
-							<div class="stored-consume-info">
-								<i class="el-icon-coin stored-consume-icon"></i>
-								<span class="text-nowrap">{{ formatMoney(scope.row.qjczxh) }}</span>
-							</div>
-						</template>
-					</el-table-column>
-					
-					<!-- 剩余储值 -->
-					<el-table-column label="剩余储值" width="120" align="center">
-						<template slot-scope="scope">
-							<div class="remaining-stored-info">
-								<i class="el-icon-coin remaining-stored-icon"></i>
-								<span class="text-nowrap">{{ formatMoney(scope.row.sycz) }}</span>
-							</div>
-						</template>
-					</el-table-column>
-					
-					<!-- 剩余积分 -->
-					<el-table-column label="剩余积分" width="120" align="center">
-						<template slot-scope="scope">
-							<div class="remaining-points-info">
-								<i class="el-icon-star-on remaining-points-icon"></i>
-								<span class="text-nowrap">{{ scope.row.syjf || '0' }}分</span>
-							</div>
-						</template>
-					</el-table-column>
-					
-					<!-- 剩余品项金额 -->
-					<el-table-column label="剩余品项金额" width="130" align="center">
-						<template slot-scope="scope">
-							<div class="remaining-product-info">
-								<i class="el-icon-goods remaining-product-icon"></i>
-								<span class="text-nowrap">{{ formatMoney(scope.row.sypxje) }}</span>
-							</div>
-						</template>
-					</el-table-column>
-					
-					<!-- 剩余套餐金额 -->
-					<el-table-column label="剩余套餐金额" width="130" align="center">
-						<template slot-scope="scope">
-							<div class="remaining-package-info">
-								<i class="el-icon-box remaining-package-icon"></i>
-								<span class="text-nowrap">{{ formatMoney(scope.row.sytcje) }}</span>
-							</div>
-						</template>
-					</el-table-column>
-					
-					<!-- 项目耗卡金额 -->
-					<el-table-column label="项目耗卡金额" width="130" align="center">
-						<template slot-scope="scope">
-							<div class="project-card-info">
-								<i class="el-icon-bank-card project-card-icon"></i>
-								<span class="text-nowrap">{{ formatMoney(scope.row.ljxmhkje) }}</span>
-							</div>
-						</template>
-					</el-table-column>
-					
-					<!-- 累计储值消耗 -->
-					<el-table-column label="累计储值消耗" width="130" align="center">
-						<template slot-scope="scope">
-							<div class="total-stored-consume-info">
-								<i class="el-icon-coin total-stored-consume-icon"></i>
-								<span class="text-nowrap">{{ formatMoney(scope.row.ljczxh) }}</span>
-							</div>
-						</template>
-					</el-table-column>
-					
-					<!-- 累计消费次数 -->
-					<el-table-column label="累计消费次数" width="130" align="center">
-						<template slot-scope="scope">
-							<div class="total-consume-times-info">
-								<i class="el-icon-data-line total-consume-times-icon"></i>
-								<span class="text-nowrap">{{ scope.row.ljxfcs || '0' }}次</span>
-							</div>
-						</template>
-					</el-table-column>
-					
-					<!-- 累计服务次数 -->
-					<el-table-column label="累计服务次数" width="130" align="center">
-						<template slot-scope="scope">
-							<div class="total-service-times-info">
-								<i class="el-icon-data-line total-service-times-icon"></i>
-								<span class="text-nowrap">{{ scope.row.ljfwcs || '0' }}次</span>
-							</div>
-						</template>
-					</el-table-column>
-					
-					<!-- 现金消费金额 -->
-					<el-table-column label="现金消费金额" width="130" align="center">
-						<template slot-scope="scope">
-							<div class="cash-total-info">
-								<i class="el-icon-money cash-total-icon"></i>
-								<span class="text-nowrap">{{ formatMoney(scope.row.ljxjxfje) }}</span>
-							</div>
-						</template>
-					</el-table-column>
-					
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 					<!-- 操作 -->
 					<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 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 type="text" icon="el-icon-delete" @click="handleDel(scope.row.id)"
+									class="delete-btn">
 									删除
 								</el-button>
 							</div>
 						</template>
 					</el-table-column>
 				</NCC-table>
-                <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize" @pagination="initData" />
-            </div>
-        </div>
+				<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,
-                    khmc:undefined,
-                    sjh:undefined,
-                    dah:undefined,
-                    xb:undefined,
-                    gzhzt:undefined,
-                    wxnc:undefined,
-                    wxxcxzt:undefined,
-                    zjdlsj:undefined,
-                    khmqgs:undefined,
-                    gsmd:undefined,
-                    zcsj:undefined,
-                    khlx:undefined,
-                    khjd:undefined,
-                    khxf:undefined,
-                    xfpc:undefined,
-                    tjr:undefined,
-                    fzgw:undefined,
-                    mrs:undefined,
-                    jdqd:undefined,
-                    lxdz:undefined,
-                    bz:undefined,
-                    scdd:undefined,
-                    zjdd:undefined,
-                    wddts:undefined,
-                    yanglsr:undefined,
-                    yinlsr:undefined,
-                    ml:undefined,
-                    zjycfwry:undefined,
-                    qjddpc:undefined,
-                    qjfwdc:undefined,
-                    qjxjxf:undefined,
-                    qjxmhk:undefined,
-                    qjczxh:undefined,
-                    sycz:undefined,
-                    syjf:undefined,
-                    sypxje:undefined,
-                    sytcje:undefined,
-                    ljxmhkje:undefined,
-                    ljczxh:undefined,
-                    ljxfcs:undefined,
-                    ljfwcs:undefined,
-                    ljxjxfje:undefined,
-				},
-                list: [],
-                listLoading: true,
-                multipleSelection: [], total: 0,
-                listQuery: {
-                    currentPage: 1,
-                    pageSize: 20,
-					sort: "desc",
-                    sidx: "",
-                },
-                formVisible: false,
-                exportBoxVisible: false,
-                columnList: [
-                    { prop: 'id', label: '客户编码' },
-                    { prop: 'khmc', label: '客户名称' },
-                    { prop: 'sjh', label: '手机号' },
-                    { prop: 'dah', label: '档案号' },
-                    { prop: 'xb', label: '性别' },
-                    { prop: 'gzhzt', label: '公众号状态' },
-                    { prop: 'wxnc', label: '微信昵称' },
-                    { prop: 'wxxcxzt', label: '小程序状态' },
-                    { prop: 'zjdlsj', label: '最近登录时间' },
-                    { prop: 'khmqgs', label: '客户目前归属' },
-                    { prop: 'gsmd', label: '归属门店' },
-                    { prop: 'zcsj', label: '注册时间' },
-                    { prop: 'khlx', label: '客户类型' },
-                    { prop: 'khjd', label: '客户阶段' },
-                    { prop: 'khxf', label: '客户消费' },
-                    { prop: 'xfpc', label: '消费频次' },
-                    { prop: 'tjr', label: '推荐人' },
-                    { prop: 'fzgw', label: '负责顾问' },
-                    { prop: 'mrs', label: '美容师' },
-                    { prop: 'jdqd', label: '进店渠道' },
-                    { prop: 'lxdz', label: '联系地址' },
-                    { prop: 'bz', label: '备注' },
-                    { prop: 'scdd', label: '首次到店' },
-                    { prop: 'zjdd', label: '最近到店' },
-                    { prop: 'wddts', label: '未到店天数' },
-                    { prop: 'yanglsr', label: '阳历生日' },
-                    { prop: 'yinlsr', label: '阴历生日' },
-                    { prop: 'ml', label: '年龄' },
-                    { prop: 'zjycfwry', label: '最近服务人员' },
-                    { prop: 'qjddpc', label: '期间到店频次' },
-                    { prop: 'qjfwdc', label: '期间服务单次' },
-                    { prop: 'qjxjxf', label: '期间现金消费' },
-                    { prop: 'qjxmhk', label: '期间项目耗卡' },
-                    { prop: 'qjczxh', label: '期间储值消耗' },
-                    { prop: 'sycz', label: '剩余储值' },
-                    { prop: 'syjf', label: '剩余积分' },
-                    { prop: 'sypxje', label: '剩余品项金额' },
-                    { prop: 'sytcje', label: '剩余套餐金额' },
-                    { prop: 'ljxmhkje', label: '项目耗卡金额' },
-                    { prop: 'ljczxh', label: '累计储值消耗' },
-                    { prop: 'ljxfcs', label: '累计消费次数' },
-                    { prop: 'ljfwcs', label: '累计服务次数' },
-                    { prop: 'ljxjxfje', label: '现金消费金额' },
-				],
-				xbOptions:[{"fullName":"男","id":"男"},{"fullName":"女","id":"女"}],
-				gzhztOptions:[{"fullName":"已绑定","id":"已绑定"},{"fullName":"未绑定","id":"未绑定"}],
-				wxxcxztOptions:[{"fullName":"已绑定","id":"已绑定"},{"fullName":"未绑定","id":"未绑定"}],
-				khmqgsOptions:[{"fullName":"会员","id":"会员"},{"fullName":"线索池","id":"线索池"},{"fullName":"会员-归档","id":"会员-归档"}],
-				khlxOptions:[{"fullName":"新客","id":"新客"},{"fullName":"老客","id":"老客"},{"fullName":"潜客","id":"潜客"}],
-				khjdOptions:[{"fullName":"体验","id":"体验"},{"fullName":"有效","id":"有效"},{"fullName":"沉睡","id":"沉睡"},{"fullName":"流失","id":"流失"}],
-				khxfOptions:[{"fullName":"D客","id":"D客"},{"fullName":"有效","id":"有效"}],
-				xfpcOptions:[{"fullName":"高频","id":"高频"},{"fullName":"低频","id":"低频"}],
+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,
+				khmc: undefined,
+				sjh: undefined,
+				dah: undefined,
+				xb: undefined,
+				gzhzt: undefined,
+				wxnc: undefined,
+				wxxcxzt: undefined,
+				zjdlsj: undefined,
+				khmqgs: undefined,
+				gsmd: undefined,
+				zcsj: undefined,
+				khlx: undefined,
+				khjd: undefined,
+				khxf: undefined,
+				xfpc: undefined,
+				tjr: undefined,
+				fzgw: undefined,
+				mrs: undefined,
+				jdqd: undefined,
+				lxdz: undefined,
+				bz: undefined,
+				yanglsr: undefined,
+				yinlsr: undefined,
+				ml: undefined,
+			},
+			list: [],
+			listLoading: true,
+			multipleSelection: [], total: 0,
+			listQuery: {
+				currentPage: 1,
+				pageSize: 20,
+				sort: "desc",
+				sidx: "",
+			},
+			formVisible: false,
+			exportBoxVisible: false,
+			columnList: [
+				{ prop: 'id', label: '客户编码' },
+				{ prop: 'khmc', label: '客户名称' },
+				{ prop: 'sjh', label: '手机号' },
+				{ prop: 'dah', label: '档案号' },
+				{ prop: 'xb', label: '性别' },
+				{ prop: 'gzhzt', label: '公众号状态' },
+				{ prop: 'wxnc', label: '微信昵称' },
+				{ prop: 'wxxcxzt', label: '小程序状态' },
+				{ prop: 'zjdlsj', label: '最近登录时间' },
+				{ prop: 'khmqgs', label: '客户目前归属' },
+				{ prop: 'gsmd', label: '归属门店' },
+				{ prop: 'zcsj', label: '注册时间' },
+				{ prop: 'khlx', label: '客户类型' },
+				{ prop: 'khjd', label: '客户阶段' },
+				{ prop: 'khxf', label: '客户消费' },
+				{ prop: 'xfpc', label: '消费频次' },
+				{ prop: 'tjr', label: '推荐人' },
+				{ prop: 'fzgw', label: '负责顾问' },
+				{ prop: 'mrs', label: '美容师' },
+				{ prop: 'jdqd', label: '进店渠道' },
+				{ prop: 'lxdz', label: '联系地址' },
+				{ prop: 'bz', label: '备注' },
+				{ prop: 'yanglsr', label: '阳历生日' },
+				{ prop: 'yinlsr', label: '阴历生日' },
+				{ prop: 'ml', label: '年龄' },
+			],
+			xbOptions: [{ "fullName": "男", "id": "男" }, { "fullName": "女", "id": "女" }],
+			gzhztOptions: [{ "fullName": "已绑定", "id": "已绑定" }, { "fullName": "未绑定", "id": "未绑定" }],
+			wxxcxztOptions: [{ "fullName": "已绑定", "id": "已绑定" }, { "fullName": "未绑定", "id": "未绑定" }],
+			khmqgsOptions: [{ "fullName": "会员", "id": "会员" }, { "fullName": "线索池", "id": "线索池" }, { "fullName": "会员-归档", "id": "会员-归档" }],
+			khlxOptions: [{ "fullName": "新客", "id": "新客" }, { "fullName": "老客", "id": "老客" }, { "fullName": "潜客", "id": "潜客" }],
+			khjdOptions: [{ "fullName": "体验", "id": "体验" }, { "fullName": "有效", "id": "有效" }, { "fullName": "沉睡", "id": "沉睡" }, { "fullName": "流失", "id": "流失" }],
+			khxfOptions: [{ "fullName": "D客", "id": "D客" }, { "fullName": "有效", "id": "有效" }],
+			xfpcOptions: [{ "fullName": "高频", "id": "高频" }, { "fullName": "低频", "id": "低频" }],
+		}
+	},
+	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/LqKhxx`,
+				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/LqKhxx/${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/LqKhxx/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/LqKhxx/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: "",
 			}
-        },
-		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/LqKhxx`,
-                    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/LqKhxx/${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/LqKhxx/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/LqKhxx/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()
-            },
-            // 格式化日期
-            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'
-                })
-            },
-            // 格式化金额
-            formatMoney(amount) {
-                if (!amount || amount === 0) return '¥0.00'
-                const num = parseFloat(amount)
-                if (isNaN(num)) return '¥0.00'
-                return '¥' + num.toLocaleString('zh-CN', {
-                    minimumFractionDigits: 2,
-                    maximumFractionDigits: 2
-                })
-            },
-            // 获取性别样式类
-            getGenderClass(gender) {
-                if (gender === '男') return 'gender-male'
-                if (gender === '女') return 'gender-female'
-                return 'gender-unknown'
-            },
-            // 获取状态样式类
-            getStatusClass(status) {
-                if (status === '已绑定') return 'status-bound'
-                if (status === '未绑定') return 'status-unbound'
-                return 'status-unknown'
-            }
+		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()
+		},
+		// 格式化日期
+		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'
+			})
+		},
+		// 格式化金额
+		formatMoney(amount) {
+			if (!amount || amount === 0) return '¥0.00'
+			const num = parseFloat(amount)
+			if (isNaN(num)) return '¥0.00'
+			return '¥' + num.toLocaleString('zh-CN', {
+				minimumFractionDigits: 2,
+				maximumFractionDigits: 2
+			})
+		},
+		// 获取性别样式类
+		getGenderClass(gender) {
+			if (gender === '男') return 'gender-male'
+			if (gender === '女') return 'gender-female'
+			return 'gender-unknown'
+		},
+		// 获取状态样式类
+		getStatusClass(status) {
+			if (status === '已绑定') return 'status-bound'
+			if (status === '未绑定') return 'status-unbound'
+			return 'status-unknown'
 		}
-    }
+	}
+}
 </script>
 
 <style lang="scss" scoped>
 // 通用文本不换行样式
 .text-nowrap {
-  white-space: nowrap;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  max-width: 100%;
+	white-space: nowrap;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	max-width: 100%;
 }
 
 // 客户编码样式
 .customer-code-info {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  gap: 6px;
-  
-  .customer-code-icon {
-    color: #409EFF;
-    font-size: 16px;
-  }
-  
-  span {
-    font-weight: 500;
-    color: #303133;
-  }
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	gap: 6px;
+
+	.customer-code-icon {
+		color: #409EFF;
+		font-size: 16px;
+	}
+
+	span {
+		font-weight: 500;
+		color: #303133;
+	}
 }
 
 // 客户名称样式
 .customer-name-info {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  gap: 6px;
-  
-  .customer-name-icon {
-    color: #67C23A;
-    font-size: 16px;
-  }
-  
-  span {
-    font-weight: 600;
-    color: #303133;
-  }
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	gap: 6px;
+
+	.customer-name-icon {
+		color: #67C23A;
+		font-size: 16px;
+	}
+
+	span {
+		font-weight: 600;
+		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;
-  }
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	gap: 6px;
+
+	.phone-icon {
+		color: #409EFF;
+		font-size: 16px;
+	}
+
+	span {
+		font-weight: 500;
+		color: #303133;
+	}
 }
 
 // 档案号样式
 .archive-info {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  gap: 6px;
-  
-  .archive-icon {
-    color: #909399;
-    font-size: 16px;
-  }
-  
-  span {
-    font-weight: 500;
-    color: #303133;
-  }
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	gap: 6px;
+
+	.archive-icon {
+		color: #909399;
+		font-size: 16px;
+	}
+
+	span {
+		font-weight: 500;
+		color: #303133;
+	}
 }
 
 // 性别样式
 .gender-info {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  gap: 6px;
-  
-  .gender-icon {
-    font-size: 16px;
-    
-    &.gender-male {
-      color: #409EFF;
-    }
-    
-    &.gender-female {
-      color: #F56C6C;
-    }
-    
-    &.gender-unknown {
-      color: #909399;
-    }
-  }
-  
-  span {
-    font-weight: 500;
-    color: #303133;
-  }
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	gap: 6px;
+
+	.gender-icon {
+		font-size: 16px;
+
+		&.gender-male {
+			color: #409EFF;
+		}
+
+		&.gender-female {
+			color: #F56C6C;
+		}
+
+		&.gender-unknown {
+			color: #909399;
+		}
+	}
+
+	span {
+		font-weight: 500;
+		color: #303133;
+	}
 }
 
 // 微信状态样式
-.wechat-status-info, .miniprogram-status-info {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  gap: 6px;
-  
-  .wechat-status-icon, .miniprogram-status-icon {
-    font-size: 16px;
-    
-    &.status-bound {
-      color: #67C23A;
-    }
-    
-    &.status-unbound {
-      color: #F56C6C;
-    }
-    
-    &.status-unknown {
-      color: #909399;
-    }
-  }
-  
-  span {
-    font-weight: 500;
-    color: #303133;
-  }
+.wechat-status-info,
+.miniprogram-status-info {
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	gap: 6px;
+
+	.wechat-status-icon,
+	.miniprogram-status-icon {
+		font-size: 16px;
+
+		&.status-bound {
+			color: #67C23A;
+		}
+
+		&.status-unbound {
+			color: #F56C6C;
+		}
+
+		&.status-unknown {
+			color: #909399;
+		}
+	}
+
+	span {
+		font-weight: 500;
+		color: #303133;
+	}
 }
 
 // 微信昵称样式
 .wechat-name-info {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  gap: 6px;
-  
-  .wechat-name-icon {
-    color: #67C23A;
-    font-size: 16px;
-  }
-  
-  span {
-    font-weight: 500;
-    color: #303133;
-  }
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	gap: 6px;
+
+	.wechat-name-icon {
+		color: #67C23A;
+		font-size: 16px;
+	}
+
+	span {
+		font-weight: 500;
+		color: #303133;
+	}
 }
 
 // 时间相关样式
-.login-time-info, .register-time-info, .first-visit-info, .last-visit-info, .solar-birthday-info, .lunar-birthday-info {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  gap: 6px;
-  
-  .login-time-icon, .register-time-icon, .first-visit-icon, .last-visit-icon, .solar-birthday-icon, .lunar-birthday-icon {
-    color: #909399;
-    font-size: 16px;
-  }
-  
-  span {
-    font-weight: 500;
-    color: #303133;
-  }
+.login-time-info,
+.register-time-info,
+.first-visit-info,
+.last-visit-info,
+.solar-birthday-info,
+.lunar-birthday-info {
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	gap: 6px;
+
+	.login-time-icon,
+	.register-time-icon,
+	.first-visit-icon,
+	.last-visit-icon,
+	.solar-birthday-icon,
+	.lunar-birthday-icon {
+		color: #909399;
+		font-size: 16px;
+	}
+
+	span {
+		font-weight: 500;
+		color: #303133;
+	}
 }
 
 // 客户归属样式
 .customer-belong-info {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  gap: 6px;
-  
-  .customer-belong-icon {
-    color: #E6A23C;
-    font-size: 16px;
-  }
-  
-  span {
-    font-weight: 500;
-    color: #303133;
-  }
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	gap: 6px;
+
+	.customer-belong-icon {
+		color: #E6A23C;
+		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;
-  }
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	gap: 6px;
+
+	.store-icon {
+		color: #67C23A;
+		font-size: 16px;
+	}
+
+	span {
+		font-weight: 500;
+		color: #303133;
+	}
 }
 
 // 客户类型和阶段样式
-.customer-type-info, .customer-stage-info {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  gap: 6px;
-  
-  .customer-type-icon, .customer-stage-icon {
-    color: #67C23A;
-    font-size: 16px;
-  }
-  
-  span {
-    font-weight: 500;
-    color: #303133;
-  }
+.customer-type-info,
+.customer-stage-info {
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	gap: 6px;
+
+	.customer-type-icon,
+	.customer-stage-icon {
+		color: #67C23A;
+		font-size: 16px;
+	}
+
+	span {
+		font-weight: 500;
+		color: #303133;
+	}
 }
 
 // 消费相关样式
-.customer-consume-info, .consume-frequency-info {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  gap: 6px;
-  
-  .customer-consume-icon, .consume-frequency-icon {
-    color: #409EFF;
-    font-size: 16px;
-  }
-  
-  span {
-    font-weight: 500;
-    color: #303133;
-  }
+.customer-consume-info,
+.consume-frequency-info {
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	gap: 6px;
+
+	.customer-consume-icon,
+	.consume-frequency-icon {
+		color: #409EFF;
+		font-size: 16px;
+	}
+
+	span {
+		font-weight: 500;
+		color: #303133;
+	}
 }
 
 // 人员信息样式
-.referrer-info, .advisor-info, .beautician-info, .recent-service-info {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  gap: 6px;
-  
-  .referrer-icon, .advisor-icon, .beautician-icon, .recent-service-icon {
-    color: #67C23A;
-    font-size: 16px;
-  }
-  
-  span {
-    font-weight: 500;
-    color: #303133;
-  }
+.referrer-info,
+.advisor-info,
+.beautician-info,
+.recent-service-info {
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	gap: 6px;
+
+	.referrer-icon,
+	.advisor-icon,
+	.beautician-icon,
+	.recent-service-icon {
+		color: #67C23A;
+		font-size: 16px;
+	}
+
+	span {
+		font-weight: 500;
+		color: #303133;
+	}
 }
 
 // 渠道信息样式
 .channel-info {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  gap: 6px;
-  
-  .channel-icon {
-    color: #909399;
-    font-size: 16px;
-  }
-  
-  span {
-    font-weight: 500;
-    color: #303133;
-  }
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	gap: 6px;
+
+	.channel-icon {
+		color: #909399;
+		font-size: 16px;
+	}
+
+	span {
+		font-weight: 500;
+		color: #303133;
+	}
 }
 
 // 地址和备注样式
-.address-info, .remark-info {
-  display: flex;
-  align-items: center;
-  gap: 6px;
-  
-  .address-icon, .remark-icon {
-    color: #909399;
-    font-size: 14px;
-  }
-  
-  span {
-    color: #606266;
-  }
+.address-info,
+.remark-info {
+	display: flex;
+	align-items: center;
+	gap: 6px;
+
+	.address-icon,
+	.remark-icon {
+		color: #909399;
+		font-size: 14px;
+	}
+
+	span {
+		color: #606266;
+	}
 }
 
 // 未到店天数样式
 .no-visit-days-info {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  gap: 6px;
-  
-  .no-visit-days-icon {
-    color: #F56C6C;
-    font-size: 16px;
-  }
-  
-  span {
-    font-weight: 500;
-    color: #F56C6C;
-  }
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	gap: 6px;
+
+	.no-visit-days-icon {
+		color: #F56C6C;
+		font-size: 16px;
+	}
+
+	span {
+		font-weight: 500;
+		color: #F56C6C;
+	}
 }
 
 // 年龄样式
 .age-info {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  gap: 6px;
-  
-  .age-icon {
-    color: #909399;
-    font-size: 16px;
-  }
-  
-  span {
-    font-weight: 500;
-    color: #303133;
-  }
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	gap: 6px;
+
+	.age-icon {
+		color: #909399;
+		font-size: 16px;
+	}
+
+	span {
+		font-weight: 500;
+		color: #303133;
+	}
 }
 
 // 频次相关样式
-.visit-frequency-info, .service-times-info, .total-consume-times-info, .total-service-times-info {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  gap: 6px;
-  
-  .visit-frequency-icon, .service-times-icon, .total-consume-times-icon, .total-service-times-icon {
-    color: #409EFF;
-    font-size: 16px;
-  }
-  
-  span {
-    font-weight: 500;
-    color: #303133;
-  }
+.visit-frequency-info,
+.service-times-info,
+.total-consume-times-info,
+.total-service-times-info {
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	gap: 6px;
+
+	.visit-frequency-icon,
+	.service-times-icon,
+	.total-consume-times-icon,
+	.total-service-times-icon {
+		color: #409EFF;
+		font-size: 16px;
+	}
+
+	span {
+		font-weight: 500;
+		color: #303133;
+	}
 }
 
 // 金额相关样式
-.cash-consume-info, .card-consume-info, .stored-consume-info, .remaining-stored-info, .remaining-product-info, .remaining-package-info, .project-card-info, .total-stored-consume-info, .cash-total-info {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  gap: 6px;
-  
-  .cash-consume-icon, .card-consume-icon, .stored-consume-icon, .remaining-stored-icon, .remaining-product-icon, .remaining-package-icon, .project-card-icon, .total-stored-consume-icon, .cash-total-icon {
-    color: #409EFF;
-    font-size: 16px;
-  }
-  
-  span {
-    font-weight: 600;
-    color: #409EFF;
-  }
+.cash-consume-info,
+.card-consume-info,
+.stored-consume-info,
+.remaining-stored-info,
+.remaining-product-info,
+.remaining-package-info,
+.project-card-info,
+.total-stored-consume-info,
+.cash-total-info {
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	gap: 6px;
+
+	.cash-consume-icon,
+	.card-consume-icon,
+	.stored-consume-icon,
+	.remaining-stored-icon,
+	.remaining-product-icon,
+	.remaining-package-icon,
+	.project-card-icon,
+	.total-stored-consume-icon,
+	.cash-total-icon {
+		color: #409EFF;
+		font-size: 16px;
+	}
+
+	span {
+		font-weight: 600;
+		color: #409EFF;
+	}
 }
 
 // 积分样式
 .remaining-points-info {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  gap: 6px;
-  
-  .remaining-points-icon {
-    color: #E6A23C;
-    font-size: 16px;
-  }
-  
-  span {
-    font-weight: 500;
-    color: #E6A23C;
-  }
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	gap: 6px;
+
+	.remaining-points-icon {
+		color: #E6A23C;
+		font-size: 16px;
+	}
+
+	span {
+		font-weight: 500;
+		color: #E6A23C;
+	}
 }
 
 // 操作按钮样式
 .action-buttons {
-  display: flex;
-  align-items: center;
-  gap: 8px;
-  
-  .edit-btn {
-    color: #409EFF;
-    
-    &:hover {
-      color: #66b1ff;
-    }
-  }
-  
-  .delete-btn {
-    color: #F56C6C;
-    
-    &:hover {
-      color: #f78989;
-    }
-  }
+	display: flex;
+	align-items: center;
+	gap: 8px;
+
+	.edit-btn {
+		color: #409EFF;
+
+		&:hover {
+			color: #66b1ff;
+		}
+	}
+
+	.delete-btn {
+		color: #F56C6C;
+
+		&:hover {
+			color: #f78989;
+		}
+	}
 }
 
 // 表格行悬停效果
 ::v-deep .el-table__row:hover {
-  background-color: #f5f7fa;
+	background-color: #f5f7fa;
 }
 
 // 表格头部样式
 ::v-deep .el-table__header-wrapper {
-  .el-table__header {
-    th {
-      background-color: #f5f7fa;
-      color: #606266;
-      font-weight: 600;
-    }
-  }
+	.el-table__header {
+		th {
+			background-color: #f5f7fa;
+			color: #606266;
+			font-weight: 600;
+		}
+	}
 }
 </style>
\ No newline at end of file
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKhxx/LqKhxxCrInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKhxx/LqKhxxCrInput.cs
index ade2334..bd0f156 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKhxx/LqKhxxCrInput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKhxx/LqKhxxCrInput.cs
@@ -12,216 +12,125 @@ namespace NCC.Extend.Entitys.Dto.LqKhxx
         /// 客户编码
         /// </summary>
         public string id { get; set; }
-        
+
         /// <summary>
         /// 客户名称
         /// </summary>
         public string khmc { get; set; }
-        
+
         /// <summary>
         /// 手机号
         /// </summary>
         public string sjh { get; set; }
-        
+
         /// <summary>
         /// 档案号
         /// </summary>
         public string dah { get; set; }
-        
+
         /// <summary>
         /// 性别
         /// </summary>
         public string xb { get; set; }
-        
+
         /// <summary>
         /// 公众号状态
         /// </summary>
         public string gzhzt { get; set; }
-        
+
         /// <summary>
         /// 微信昵称
         /// </summary>
         public string wxnc { get; set; }
-        
+
         /// <summary>
         /// 微信小程序状态
         /// </summary>
         public string wxxcxzt { get; set; }
-        
+
         /// <summary>
         /// 最近登录时间
         /// </summary>
         public string zjdlsj { get; set; }
-        
+
         /// <summary>
         /// 客户目前归属
         /// </summary>
         public string khmqgs { get; set; }
-        
+
         /// <summary>
         /// 归属门店
         /// </summary>
         public string gsmd { get; set; }
-        
+
         /// <summary>
         /// 注册时间
         /// </summary>
         public DateTime? zcsj { get; set; }
-        
+
         /// <summary>
         /// 客户类型
         /// </summary>
         public string khlx { get; set; }
-        
+
         /// <summary>
         /// 客户阶段
         /// </summary>
         public string khjd { get; set; }
-        
+
         /// <summary>
         /// 客户消费
         /// </summary>
-        public List<string> khxf { get; set; }
-        
+        public string khxf { get; set; }
+
         /// <summary>
         /// 消费频次
         /// </summary>
         public string xfpc { get; set; }
-        
+
         /// <summary>
         /// 推荐人
         /// </summary>
         public string tjr { get; set; }
-        
+
         /// <summary>
         /// 负责顾问
         /// </summary>
         public string fzgw { get; set; }
-        
+
         /// <summary>
         /// 美容师
         /// </summary>
         public string mrs { get; set; }
-        
+
         /// <summary>
         /// 进店渠道
         /// </summary>
         public string jdqd { get; set; }
-        
+
         /// <summary>
         /// 联系地址
         /// </summary>
         public string lxdz { get; set; }
-        
+
         /// <summary>
         /// 备注
         /// </summary>
         public string bz { get; set; }
-        
-        /// <summary>
-        /// 首次到店
-        /// </summary>
-        public DateTime? scdd { get; set; }
-        
-        /// <summary>
-        /// 最近到店
-        /// </summary>
-        public string zjdd { get; set; }
-        
-        /// <summary>
-        /// 未到店天数
-        /// </summary>
-        public string wddts { get; set; }
-        
+
         /// <summary>
         /// 阳历生日
         /// </summary>
         public DateTime? yanglsr { get; set; }
-        
+
         /// <summary>
         /// 阴历生日
         /// </summary>
         public DateTime? yinlsr { get; set; }
-        
+
         /// <summary>
         /// 年龄
         /// </summary>
         public string ml { get; set; }
-        
-        /// <summary>
-        /// 最近一次服务人员
-        /// </summary>
-        public string zjycfwry { get; set; }
-        
-        /// <summary>
-        /// 期间到店频次
-        /// </summary>
-        public string qjddpc { get; set; }
-        
-        /// <summary>
-        /// 期间服务单次
-        /// </summary>
-        public string qjfwdc { get; set; }
-        
-        /// <summary>
-        /// 期间现金消费
-        /// </summary>
-        public string qjxjxf { get; set; }
-        
-        /// <summary>
-        /// 期间项目耗卡
-        /// </summary>
-        public string qjxmhk { get; set; }
-        
-        /// <summary>
-        /// 期间储值消耗
-        /// </summary>
-        public string qjczxh { get; set; }
-        
-        /// <summary>
-        /// 剩余储值
-        /// </summary>
-        public decimal sycz { get; set; }
-        
-        /// <summary>
-        /// 剩余积分
-        /// </summary>
-        public decimal syjf { get; set; }
-        
-        /// <summary>
-        /// 剩余品项金额
-        /// </summary>
-        public decimal sypxje { get; set; }
-        
-        /// <summary>
-        /// 剩余套餐金额
-        /// </summary>
-        public decimal sytcje { get; set; }
-        
-        /// <summary>
-        /// 累计项目耗卡金额
-        /// </summary>
-        public decimal ljxmhkje { get; set; }
-        
-        /// <summary>
-        /// 累计储值消耗
-        /// </summary>
-        public decimal ljczxh { get; set; }
-        
-        /// <summary>
-        /// 累计消费次数
-        /// </summary>
-        public int? ljxfcs { get; set; }
-        
-        /// <summary>
-        /// 累计服务次数
-        /// </summary>
-        public int? ljfwcs { get; set; }
-        
-        /// <summary>
-        /// 累计现金消费金额
-        /// </summary>
-        public decimal ljxjxfje { get; set; }
-        
     }
 }
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKhxx/LqKhxxInfoOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKhxx/LqKhxxInfoOutput.cs
index 167adcb..f1c79d9 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKhxx/LqKhxxInfoOutput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKhxx/LqKhxxInfoOutput.cs
@@ -12,216 +12,125 @@ namespace NCC.Extend.Entitys.Dto.LqKhxx
         /// 客户编码
         /// </summary>
         public string id { get; set; }
-        
+
         /// <summary>
         /// 客户名称
         /// </summary>
         public string khmc { get; set; }
-        
+
         /// <summary>
         /// 手机号
         /// </summary>
         public string sjh { get; set; }
-        
+
         /// <summary>
         /// 档案号
         /// </summary>
         public string dah { get; set; }
-        
+
         /// <summary>
         /// 性别
         /// </summary>
         public string xb { get; set; }
-        
+
         /// <summary>
         /// 公众号状态
         /// </summary>
         public string gzhzt { get; set; }
-        
+
         /// <summary>
         /// 微信昵称
         /// </summary>
         public string wxnc { get; set; }
-        
+
         /// <summary>
         /// 微信小程序状态
         /// </summary>
         public string wxxcxzt { get; set; }
-        
+
         /// <summary>
         /// 最近登录时间
         /// </summary>
         public string zjdlsj { get; set; }
-        
+
         /// <summary>
         /// 客户目前归属
         /// </summary>
         public string khmqgs { get; set; }
-        
+
         /// <summary>
         /// 归属门店
         /// </summary>
         public string gsmd { get; set; }
-        
+
         /// <summary>
         /// 注册时间
         /// </summary>
         public DateTime? zcsj { get; set; }
-        
+
         /// <summary>
         /// 客户类型
         /// </summary>
         public string khlx { get; set; }
-        
+
         /// <summary>
         /// 客户阶段
         /// </summary>
         public string khjd { get; set; }
-        
+
         /// <summary>
         /// 客户消费
         /// </summary>
-        public List<string> khxf { get; set; }
-        
+        public string khxf { get; set; }
+
         /// <summary>
         /// 消费频次
         /// </summary>
         public string xfpc { get; set; }
-        
+
         /// <summary>
         /// 推荐人
         /// </summary>
         public string tjr { get; set; }
-        
+
         /// <summary>
         /// 负责顾问
         /// </summary>
         public string fzgw { get; set; }
-        
+
         /// <summary>
         /// 美容师
         /// </summary>
         public string mrs { get; set; }
-        
+
         /// <summary>
         /// 进店渠道
         /// </summary>
         public string jdqd { get; set; }
-        
+
         /// <summary>
         /// 联系地址
         /// </summary>
         public string lxdz { get; set; }
-        
+
         /// <summary>
         /// 备注
         /// </summary>
         public string bz { get; set; }
-        
-        /// <summary>
-        /// 首次到店
-        /// </summary>
-        public DateTime? scdd { get; set; }
-        
-        /// <summary>
-        /// 最近到店
-        /// </summary>
-        public string zjdd { get; set; }
-        
-        /// <summary>
-        /// 未到店天数
-        /// </summary>
-        public string wddts { get; set; }
-        
+
         /// <summary>
         /// 阳历生日
         /// </summary>
         public DateTime? yanglsr { get; set; }
-        
+
         /// <summary>
         /// 阴历生日
         /// </summary>
         public DateTime? yinlsr { get; set; }
-        
+
         /// <summary>
         /// 年龄
         /// </summary>
         public string ml { get; set; }
-        
-        /// <summary>
-        /// 最近一次服务人员
-        /// </summary>
-        public string zjycfwry { get; set; }
-        
-        /// <summary>
-        /// 期间到店频次
-        /// </summary>
-        public string qjddpc { get; set; }
-        
-        /// <summary>
-        /// 期间服务单次
-        /// </summary>
-        public string qjfwdc { get; set; }
-        
-        /// <summary>
-        /// 期间现金消费
-        /// </summary>
-        public string qjxjxf { get; set; }
-        
-        /// <summary>
-        /// 期间项目耗卡
-        /// </summary>
-        public string qjxmhk { get; set; }
-        
-        /// <summary>
-        /// 期间储值消耗
-        /// </summary>
-        public string qjczxh { get; set; }
-        
-        /// <summary>
-        /// 剩余储值
-        /// </summary>
-        public decimal sycz { get; set; }
-        
-        /// <summary>
-        /// 剩余积分
-        /// </summary>
-        public decimal syjf { get; set; }
-        
-        /// <summary>
-        /// 剩余品项金额
-        /// </summary>
-        public decimal sypxje { get; set; }
-        
-        /// <summary>
-        /// 剩余套餐金额
-        /// </summary>
-        public decimal sytcje { get; set; }
-        
-        /// <summary>
-        /// 累计项目耗卡金额
-        /// </summary>
-        public decimal ljxmhkje { get; set; }
-        
-        /// <summary>
-        /// 累计储值消耗
-        /// </summary>
-        public decimal ljczxh { get; set; }
-        
-        /// <summary>
-        /// 累计消费次数
-        /// </summary>
-        public int? ljxfcs { get; set; }
-        
-        /// <summary>
-        /// 累计服务次数
-        /// </summary>
-        public int? ljfwcs { get; set; }
-        
-        /// <summary>
-        /// 累计现金消费金额
-        /// </summary>
-        public decimal ljxjxfje { get; set; }
-        
     }
 }
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKhxx/LqKhxxListOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKhxx/LqKhxxListOutput.cs
index 055429f..1bb0768 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKhxx/LqKhxxListOutput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKhxx/LqKhxxListOutput.cs
@@ -11,216 +11,125 @@ namespace NCC.Extend.Entitys.Dto.LqKhxx
         /// 客户编码
         /// </summary>
         public string id { get; set; }
-        
+
         /// <summary>
         /// 客户名称
         /// </summary>
         public string khmc { get; set; }
-        
+
         /// <summary>
         /// 手机号
         /// </summary>
         public string sjh { get; set; }
-        
+
         /// <summary>
         /// 档案号
         /// </summary>
         public string dah { get; set; }
-        
+
         /// <summary>
         /// 性别
         /// </summary>
         public string xb { get; set; }
-        
+
         /// <summary>
         /// 公众号状态
         /// </summary>
         public string gzhzt { get; set; }
-        
+
         /// <summary>
         /// 微信昵称
         /// </summary>
         public string wxnc { get; set; }
-        
+
         /// <summary>
         /// 微信小程序状态
         /// </summary>
         public string wxxcxzt { get; set; }
-        
+
         /// <summary>
         /// 最近登录时间
         /// </summary>
         public string zjdlsj { get; set; }
-        
+
         /// <summary>
         /// 客户目前归属
         /// </summary>
         public string khmqgs { get; set; }
-        
+
         /// <summary>
         /// 归属门店
         /// </summary>
         public string gsmd { get; set; }
-        
+
         /// <summary>
         /// 注册时间
         /// </summary>
         public DateTime? zcsj { get; set; }
-        
+
         /// <summary>
         /// 客户类型
         /// </summary>
         public string khlx { get; set; }
-        
+
         /// <summary>
         /// 客户阶段
         /// </summary>
         public string khjd { get; set; }
-        
+
         /// <summary>
         /// 客户消费
         /// </summary>
         public string khxf { get; set; }
-        
+
         /// <summary>
         /// 消费频次
         /// </summary>
         public string xfpc { get; set; }
-        
+
         /// <summary>
         /// 推荐人
         /// </summary>
         public string tjr { get; set; }
-        
+
         /// <summary>
         /// 负责顾问
         /// </summary>
         public string fzgw { get; set; }
-        
+
         /// <summary>
         /// 美容师
         /// </summary>
         public string mrs { get; set; }
-        
+
         /// <summary>
         /// 进店渠道
         /// </summary>
         public string jdqd { get; set; }
-        
+
         /// <summary>
         /// 联系地址
         /// </summary>
         public string lxdz { get; set; }
-        
+
         /// <summary>
         /// 备注
         /// </summary>
         public string bz { get; set; }
-        
-        /// <summary>
-        /// 首次到店
-        /// </summary>
-        public DateTime? scdd { get; set; }
-        
-        /// <summary>
-        /// 最近到店
-        /// </summary>
-        public string zjdd { get; set; }
-        
-        /// <summary>
-        /// 未到店天数
-        /// </summary>
-        public string wddts { get; set; }
-        
+
         /// <summary>
         /// 阳历生日
         /// </summary>
         public DateTime? yanglsr { get; set; }
-        
+
         /// <summary>
         /// 阴历生日
         /// </summary>
         public DateTime? yinlsr { get; set; }
-        
+
         /// <summary>
         /// 年龄
         /// </summary>
         public string ml { get; set; }
-        
-        /// <summary>
-        /// 最近一次服务人员
-        /// </summary>
-        public string zjycfwry { get; set; }
-        
-        /// <summary>
-        /// 期间到店频次
-        /// </summary>
-        public string qjddpc { get; set; }
-        
-        /// <summary>
-        /// 期间服务单次
-        /// </summary>
-        public string qjfwdc { get; set; }
-        
-        /// <summary>
-        /// 期间现金消费
-        /// </summary>
-        public string qjxjxf { get; set; }
-        
-        /// <summary>
-        /// 期间项目耗卡
-        /// </summary>
-        public string qjxmhk { get; set; }
-        
-        /// <summary>
-        /// 期间储值消耗
-        /// </summary>
-        public string qjczxh { get; set; }
-        
-        /// <summary>
-        /// 剩余储值
-        /// </summary>
-        public decimal sycz { get; set; }
-        
-        /// <summary>
-        /// 剩余积分
-        /// </summary>
-        public decimal syjf { get; set; }
-        
-        /// <summary>
-        /// 剩余品项金额
-        /// </summary>
-        public decimal sypxje { get; set; }
-        
-        /// <summary>
-        /// 剩余套餐金额
-        /// </summary>
-        public decimal sytcje { get; set; }
-        
-        /// <summary>
-        /// 累计项目耗卡金额
-        /// </summary>
-        public decimal ljxmhkje { get; set; }
-        
-        /// <summary>
-        /// 累计储值消耗
-        /// </summary>
-        public decimal ljczxh { get; set; }
-        
-        /// <summary>
-        /// 累计消费次数
-        /// </summary>
-        public int? ljxfcs { get; set; }
-        
-        /// <summary>
-        /// 累计服务次数
-        /// </summary>
-        public int? ljfwcs { get; set; }
-        
-        /// <summary>
-        /// 累计现金消费金额
-        /// </summary>
-        public decimal ljxjxfje { get; set; }
-        
     }
 }
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKhxx/LqKhxxListQueryInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKhxx/LqKhxxListQueryInput.cs
index 0abd43b..66b02bb 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKhxx/LqKhxxListQueryInput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKhxx/LqKhxxListQueryInput.cs
@@ -1,5 +1,5 @@
-using NCC.Common.Filter;
-using System.Collections.Generic;
+using System.Collections.Generic;
+using NCC.Common.Filter;
 
 namespace NCC.Extend.Entitys.Dto.LqKhxx
 {
@@ -14,225 +14,133 @@ namespace NCC.Extend.Entitys.Dto.LqKhxx
         public string selectKey { get; set; }
 
         /// <summary>
-        /// 
+        ///
         /// </summary>
         public int dataType { get; set; }
 
-
         /// <summary>
         /// 客户编码
         /// </summary>
         public string id { get; set; }
-        
+
         /// <summary>
         /// 客户名称
         /// </summary>
         public string khmc { get; set; }
-        
+
         /// <summary>
         /// 手机号
         /// </summary>
         public string sjh { get; set; }
-        
+
         /// <summary>
         /// 档案号
         /// </summary>
         public string dah { get; set; }
-        
+
         /// <summary>
         /// 性别
         /// </summary>
         public string xb { get; set; }
-        
+
         /// <summary>
         /// 公众号状态
         /// </summary>
         public string gzhzt { get; set; }
-        
+
         /// <summary>
         /// 微信昵称
         /// </summary>
         public string wxnc { get; set; }
-        
+
         /// <summary>
         /// 微信小程序状态
         /// </summary>
         public string wxxcxzt { get; set; }
-        
+
         /// <summary>
         /// 最近登录时间
         /// </summary>
         public string zjdlsj { get; set; }
-        
+
         /// <summary>
         /// 客户目前归属
         /// </summary>
         public string khmqgs { get; set; }
-        
+
         /// <summary>
         /// 归属门店
         /// </summary>
         public string gsmd { get; set; }
-        
+
         /// <summary>
         /// 注册时间
         /// </summary>
         public string zcsj { get; set; }
-        
+
         /// <summary>
         /// 客户类型
         /// </summary>
         public string khlx { get; set; }
-        
+
         /// <summary>
         /// 客户阶段
         /// </summary>
         public string khjd { get; set; }
-        
+
         /// <summary>
         /// 客户消费
         /// </summary>
         public string khxf { get; set; }
-        
+
         /// <summary>
         /// 消费频次
         /// </summary>
         public string xfpc { get; set; }
-        
+
         /// <summary>
         /// 推荐人
         /// </summary>
         public string tjr { get; set; }
-        
+
         /// <summary>
         /// 负责顾问
         /// </summary>
         public string fzgw { get; set; }
-        
+
         /// <summary>
         /// 美容师
         /// </summary>
         public string mrs { get; set; }
-        
+
         /// <summary>
         /// 进店渠道
         /// </summary>
         public string jdqd { get; set; }
-        
+
         /// <summary>
         /// 联系地址
         /// </summary>
         public string lxdz { get; set; }
-        
+
         /// <summary>
         /// 备注
         /// </summary>
         public string bz { get; set; }
-        
-        /// <summary>
-        /// 首次到店
-        /// </summary>
-        public string scdd { get; set; }
-        
-        /// <summary>
-        /// 最近到店
-        /// </summary>
-        public string zjdd { get; set; }
-        
-        /// <summary>
-        /// 未到店天数
-        /// </summary>
-        public string wddts { get; set; }
-        
+
         /// <summary>
         /// 阳历生日
         /// </summary>
         public string yanglsr { get; set; }
-        
+
         /// <summary>
         /// 阴历生日
         /// </summary>
         public string yinlsr { get; set; }
-        
+
         /// <summary>
         /// 年龄
         /// </summary>
         public string ml { get; set; }
-        
-        /// <summary>
-        /// 最近一次服务人员
-        /// </summary>
-        public string zjycfwry { get; set; }
-        
-        /// <summary>
-        /// 期间到店频次
-        /// </summary>
-        public string qjddpc { get; set; }
-        
-        /// <summary>
-        /// 期间服务单次
-        /// </summary>
-        public string qjfwdc { get; set; }
-        
-        /// <summary>
-        /// 期间现金消费
-        /// </summary>
-        public string qjxjxf { get; set; }
-        
-        /// <summary>
-        /// 期间项目耗卡
-        /// </summary>
-        public string qjxmhk { get; set; }
-        
-        /// <summary>
-        /// 期间储值消耗
-        /// </summary>
-        public string qjczxh { get; set; }
-        
-        /// <summary>
-        /// 剩余储值
-        /// </summary>
-        public string sycz { get; set; }
-        
-        /// <summary>
-        /// 剩余积分
-        /// </summary>
-        public string syjf { get; set; }
-        
-        /// <summary>
-        /// 剩余品项金额
-        /// </summary>
-        public string sypxje { get; set; }
-        
-        /// <summary>
-        /// 剩余套餐金额
-        /// </summary>
-        public string sytcje { get; set; }
-        
-        /// <summary>
-        /// 累计项目耗卡金额
-        /// </summary>
-        public string ljxmhkje { get; set; }
-        
-        /// <summary>
-        /// 累计储值消耗
-        /// </summary>
-        public string ljczxh { get; set; }
-        
-        /// <summary>
-        /// 累计消费次数
-        /// </summary>
-        public string ljxfcs { get; set; }
-        
-        /// <summary>
-        /// 累计服务次数
-        /// </summary>
-        public string ljfwcs { get; set; }
-        
-        /// <summary>
-        /// 累计现金消费金额
-        /// </summary>
-        public string ljxjxfje { get; set; }
-        
     }
 }
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_khxx/LqKhxxEntity.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_khxx/LqKhxxEntity.cs
index 378985a..c0f68f9 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_khxx/LqKhxxEntity.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_khxx/LqKhxxEntity.cs
@@ -1,6 +1,6 @@
-using NCC.Common.Const;
+using System;
+using NCC.Common.Const;
 using SqlSugar;
-using System;
 
 namespace NCC.Extend.Entitys.lq_khxx
 {
@@ -16,258 +16,149 @@ namespace NCC.Extend.Entitys.lq_khxx
         /// </summary>
         [SugarColumn(ColumnName = "F_Id", IsPrimaryKey = true)]
         public string Id { get; set; }
-        
+
         /// <summary>
         /// 客户名称
         /// </summary>
-        [SugarColumn(ColumnName = "khmc")]        
+        [SugarColumn(ColumnName = "khmc")]
         public string Khmc { get; set; }
-        
+
         /// <summary>
         /// 手机号
         /// </summary>
-        [SugarColumn(ColumnName = "sjh")]        
+        [SugarColumn(ColumnName = "sjh")]
         public string Sjh { get; set; }
-        
+
         /// <summary>
         /// 档案号
         /// </summary>
-        [SugarColumn(ColumnName = "dah")]        
+        [SugarColumn(ColumnName = "dah")]
         public string Dah { get; set; }
-        
+
         /// <summary>
         /// 性别
         /// </summary>
-        [SugarColumn(ColumnName = "xb")]        
+        [SugarColumn(ColumnName = "xb")]
         public string Xb { get; set; }
-        
+
         /// <summary>
         /// 公众号状态
         /// </summary>
-        [SugarColumn(ColumnName = "gzhzt")]        
+        [SugarColumn(ColumnName = "gzhzt")]
         public string Gzhzt { get; set; }
-        
+
         /// <summary>
         /// 微信昵称
         /// </summary>
-        [SugarColumn(ColumnName = "wxnc")]        
+        [SugarColumn(ColumnName = "wxnc")]
         public string Wxnc { get; set; }
-        
+
         /// <summary>
         /// 微信小程序状态
         /// </summary>
-        [SugarColumn(ColumnName = "wxxcxzt")]        
+        [SugarColumn(ColumnName = "wxxcxzt")]
         public string Wxxcxzt { get; set; }
-        
+
         /// <summary>
         /// 最近登录时间
         /// </summary>
-        [SugarColumn(ColumnName = "zjdlsj")]        
+        [SugarColumn(ColumnName = "zjdlsj")]
         public string Zjdlsj { get; set; }
-        
+
         /// <summary>
         /// 客户目前归属
         /// </summary>
-        [SugarColumn(ColumnName = "khmqgs")]        
+        [SugarColumn(ColumnName = "khmqgs")]
         public string Khmqgs { get; set; }
-        
+
         /// <summary>
         /// 归属门店
         /// </summary>
-        [SugarColumn(ColumnName = "gsmd")]        
+        [SugarColumn(ColumnName = "gsmd")]
         public string Gsmd { get; set; }
-        
+
         /// <summary>
         /// 注册时间
         /// </summary>
-        [SugarColumn(ColumnName = "zcsj")]        
+        [SugarColumn(ColumnName = "zcsj")]
         public DateTime? Zcsj { get; set; }
-        
+
         /// <summary>
         /// 客户类型
         /// </summary>
-        [SugarColumn(ColumnName = "khlx")]        
+        [SugarColumn(ColumnName = "khlx")]
         public string Khlx { get; set; }
-        
+
         /// <summary>
         /// 客户阶段
         /// </summary>
-        [SugarColumn(ColumnName = "khjd")]        
+        [SugarColumn(ColumnName = "khjd")]
         public string Khjd { get; set; }
-        
+
         /// <summary>
         /// 客户消费
         /// </summary>
-        [SugarColumn(ColumnName = "khxf")]        
+        [SugarColumn(ColumnName = "khxf")]
         public string Khxf { get; set; }
-        
+
         /// <summary>
         /// 消费频次
         /// </summary>
-        [SugarColumn(ColumnName = "xfpc")]        
+        [SugarColumn(ColumnName = "xfpc")]
         public string Xfpc { get; set; }
-        
+
         /// <summary>
         /// 推荐人
         /// </summary>
-        [SugarColumn(ColumnName = "tjr")]        
+        [SugarColumn(ColumnName = "tjr")]
         public string Tjr { get; set; }
-        
+
         /// <summary>
         /// 负责顾问
         /// </summary>
-        [SugarColumn(ColumnName = "fzgw")]        
+        [SugarColumn(ColumnName = "fzgw")]
         public string Fzgw { get; set; }
-        
+
         /// <summary>
         /// 美容师
         /// </summary>
-        [SugarColumn(ColumnName = "mrs")]        
+        [SugarColumn(ColumnName = "mrs")]
         public string Mrs { get; set; }
-        
+
         /// <summary>
         /// 进店渠道
         /// </summary>
-        [SugarColumn(ColumnName = "jdqd")]        
+        [SugarColumn(ColumnName = "jdqd")]
         public string Jdqd { get; set; }
-        
+
         /// <summary>
         /// 联系地址
         /// </summary>
-        [SugarColumn(ColumnName = "lxdz")]        
+        [SugarColumn(ColumnName = "lxdz")]
         public string Lxdz { get; set; }
-        
+
         /// <summary>
         /// 备注
         /// </summary>
-        [SugarColumn(ColumnName = "bz")]        
+        [SugarColumn(ColumnName = "bz")]
         public string Bz { get; set; }
-        
-        /// <summary>
-        /// 首次到店
-        /// </summary>
-        [SugarColumn(ColumnName = "scdd")]        
-        public DateTime? Scdd { get; set; }
-        
-        /// <summary>
-        /// 最近到店
-        /// </summary>
-        [SugarColumn(ColumnName = "zjdd")]        
-        public string Zjdd { get; set; }
-        
-        /// <summary>
-        /// 未到店天数
-        /// </summary>
-        [SugarColumn(ColumnName = "wddts")]        
-        public string Wddts { get; set; }
-        
+
         /// <summary>
         /// 阳历生日
         /// </summary>
-        [SugarColumn(ColumnName = "yanglsr")]        
+        [SugarColumn(ColumnName = "yanglsr")]
         public DateTime? Yanglsr { get; set; }
-        
+
         /// <summary>
         /// 阴历生日
         /// </summary>
-        [SugarColumn(ColumnName = "yinlsr")]        
+        [SugarColumn(ColumnName = "yinlsr")]
         public DateTime? Yinlsr { get; set; }
-        
+
         /// <summary>
         /// 年龄
         /// </summary>
-        [SugarColumn(ColumnName = "ml")]        
+        [SugarColumn(ColumnName = "ml")]
         public string Ml { get; set; }
-        
-        /// <summary>
-        /// 最近一次服务人员
-        /// </summary>
-        [SugarColumn(ColumnName = "zjycfwry")]        
-        public string Zjycfwry { get; set; }
-        
-        /// <summary>
-        /// 期间到店频次
-        /// </summary>
-        [SugarColumn(ColumnName = "qjddpc")]        
-        public string Qjddpc { get; set; }
-        
-        /// <summary>
-        /// 期间服务单次
-        /// </summary>
-        [SugarColumn(ColumnName = "qjfwdc")]        
-        public string Qjfwdc { get; set; }
-        
-        /// <summary>
-        /// 期间现金消费
-        /// </summary>
-        [SugarColumn(ColumnName = "qjxjxf")]        
-        public string Qjxjxf { get; set; }
-        
-        /// <summary>
-        /// 期间项目耗卡
-        /// </summary>
-        [SugarColumn(ColumnName = "qjxmhk")]        
-        public string Qjxmhk { get; set; }
-        
-        /// <summary>
-        /// 期间储值消耗
-        /// </summary>
-        [SugarColumn(ColumnName = "qjczxh")]        
-        public string Qjczxh { get; set; }
-        
-        /// <summary>
-        /// 剩余储值
-        /// </summary>
-        [SugarColumn(ColumnName = "sycz")]        
-        public decimal Sycz { get; set; }
-        
-        /// <summary>
-        /// 剩余积分
-        /// </summary>
-        [SugarColumn(ColumnName = "syjf")]        
-        public decimal Syjf { get; set; }
-        
-        /// <summary>
-        /// 剩余品项金额
-        /// </summary>
-        [SugarColumn(ColumnName = "sypxje")]        
-        public decimal Sypxje { get; set; }
-        
-        /// <summary>
-        /// 剩余套餐金额
-        /// </summary>
-        [SugarColumn(ColumnName = "sytcje")]        
-        public decimal Sytcje { get; set; }
-        
-        /// <summary>
-        /// 累计项目耗卡金额
-        /// </summary>
-        [SugarColumn(ColumnName = "ljxmhkje")]        
-        public decimal Ljxmhkje { get; set; }
-        
-        /// <summary>
-        /// 累计储值消耗
-        /// </summary>
-        [SugarColumn(ColumnName = "ljczxh")]        
-        public decimal Ljczxh { get; set; }
-        
-        /// <summary>
-        /// 累计消费次数
-        /// </summary>
-        [SugarColumn(ColumnName = "ljxfcs")]        
-        public int? Ljxfcs { get; set; }
-        
-        /// <summary>
-        /// 累计服务次数
-        /// </summary>
-        [SugarColumn(ColumnName = "ljfwcs")]        
-        public int? Ljfwcs { get; set; }
-        
-        /// <summary>
-        /// 累计现金消费金额
-        /// </summary>
-        [SugarColumn(ColumnName = "ljxjxfje")]        
-        public decimal Ljxjxfje { get; set; }
-        
     }
-}
\ No newline at end of file
+}
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Mapper/LqKhxxMapper.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Mapper/LqKhxxMapper.cs
index 58ca854..e068112 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Mapper/LqKhxxMapper.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Mapper/LqKhxxMapper.cs
@@ -1,21 +1,17 @@
-using NCC.Common.Helper;
+using System.Collections.Generic;
+using Mapster;
+using NCC.Common.Helper;
 using NCC.Extend.Entitys.Dto.LqKhxx;
 using NCC.Extend.Entitys.lq_khxx;
-using Mapster;
-using System.Collections.Generic;
 
 namespace NCC.Extend.Entitys.Mapper.LqKhxx
 {
-	public class Mapper : IRegister
-	{
-		public void Register(TypeAdapterConfig config)
-		{
-			config.ForType<LqKhxxCrInput, LqKhxxEntity>()
-				.Map(dest => dest.Khxf, src => src.khxf.ToJson())
-			;
-			config.ForType<LqKhxxEntity, LqKhxxInfoOutput>()
-				.Map(dest => dest.khxf, src => src.Khxf.ToObject<List<string>>())
-			;
-		}
-	}
+    public class Mapper : IRegister
+    {
+        public void Register(TypeAdapterConfig config)
+        {
+            // 由于khxf字段现在是string类型，不需要特殊的映射处理
+            // 使用默认的映射即可
+        }
+    }
 }
diff --git a/netcore/src/Modularity/Extend/NCC.Extend/LqKdKdjlbService.cs b/netcore/src/Modularity/Extend/NCC.Extend/LqKdKdjlbService.cs
index d541651..bceffd5 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend/LqKdKdjlbService.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend/LqKdKdjlbService.cs
@@ -106,19 +106,13 @@ namespace NCC.Extend.LqKdKdjlb
                 var output = entity.Adapt<LqKdKdjlbInfoOutput>();
 
                 // 2. 查询品项明细列表
-                var lqKdPxmxList = await _db.Queryable<LqKdPxmxEntity>()
-                    .Where(w => w.Glkdbh == entity.Id)
-                    .ToListAsync();
+                var lqKdPxmxList = await _db.Queryable<LqKdPxmxEntity>().Where(w => w.Glkdbh == entity.Id).ToListAsync();
 
                 // 3. 查询健康师业绩列表
-                var lqKdJksyjList = await _db.Queryable<LqKdJksyjEntity>()
-                    .Where(w => w.Glkdbh == entity.Id)
-                    .ToListAsync();
+                var lqKdJksyjList = await _db.Queryable<LqKdJksyjEntity>().Where(w => w.Glkdbh == entity.Id).ToListAsync();
 
                 // 4. 查询科技部老师业绩列表
-                var lqKdKjbsyjList = await _db.Queryable<LqKdKjbsyjEntity>()
-                    .Where(w => w.Glkdbh == entity.Id)
-                    .ToListAsync();
+                var lqKdKjbsyjList = await _db.Queryable<LqKdKjbsyjEntity>().Where(w => w.Glkdbh == entity.Id).ToListAsync();
 
                 // 5. 构建品项明细输出，每个品项关联对应的业绩信息
                 var pxmxOutputList = new List<LqKdPxmxInfoOutput>();
@@ -178,40 +172,15 @@ namespace NCC.Extend.LqKdKdjlb
         public async Task<dynamic> GetList([FromQuery] LqKdKdjlbListQueryInput input)
         {
             var sidx = input.sidx == null ? "id" : input.sidx;
-            List<string> queryKdrq =
-                input.kdrq != null ? input.kdrq.Split(',').ToObeject<List<string>>() : null;
+            List<string> queryKdrq = input.kdrq != null ? input.kdrq.Split(',').ToObeject<List<string>>() : null;
             DateTime? startKdrq = queryKdrq != null ? Ext.GetDateTime(queryKdrq.First()) : null;
             DateTime? endKdrq = queryKdrq != null ? Ext.GetDateTime(queryKdrq.Last()) : null;
             var data = await _db.Queryable<LqKdKdjlbEntity>()
                 .WhereIF(!string.IsNullOrEmpty(input.id), p => p.Id.Contains(input.id))
                 .WhereIF(!string.IsNullOrEmpty(input.djmd), p => p.Djmd.Equals(input.djmd))
                 .WhereIF(!string.IsNullOrEmpty(input.jsj), p => p.Jsj.Equals(input.jsj))
-                .WhereIF(
-                    queryKdrq != null,
-                    p =>
-                        p.Kdrq
-                        >= new DateTime(
-                            startKdrq.ToDate().Year,
-                            startKdrq.ToDate().Month,
-                            startKdrq.ToDate().Day,
-                            0,
-                            0,
-                            0
-                        )
-                )
-                .WhereIF(
-                    queryKdrq != null,
-                    p =>
-                        p.Kdrq
-                        <= new DateTime(
-                            endKdrq.ToDate().Year,
-                            endKdrq.ToDate().Month,
-                            endKdrq.ToDate().Day,
-                            23,
-                            59,
-                            59
-                        )
-                )
+                .WhereIF(queryKdrq != null, p => p.Kdrq >= new DateTime(startKdrq.ToDate().Year, startKdrq.ToDate().Month, startKdrq.ToDate().Day, 0, 0, 0))
+                .WhereIF(queryKdrq != null, p => p.Kdrq <= new DateTime(endKdrq.ToDate().Year, endKdrq.ToDate().Month, endKdrq.ToDate().Day, 23, 59, 59))
                 .WhereIF(!string.IsNullOrEmpty(input.gjlx), p => p.Gjlx.Equals(input.gjlx))
                 .WhereIF(!string.IsNullOrEmpty(input.hgjg), p => p.Hgjg.Equals(input.hgjg))
                 .WhereIF(!string.IsNullOrEmpty(input.zdyj), p => p.Zdyj.Equals(input.zdyj))
@@ -229,20 +198,11 @@ namespace NCC.Extend.LqKdKdjlb
                 .WhereIF(!string.IsNullOrEmpty(input.bz), p => p.Bz.Contains(input.bz))
                 .WhereIF(!string.IsNullOrEmpty(input.kdhy), p => p.Kdhy.Equals(input.kdhy))
                 .WhereIF(!string.IsNullOrEmpty(input.kdhyc), p => p.Kdhyc.Contains(input.kdhyc))
-                .WhereIF(
-                    !string.IsNullOrEmpty(input.kdhysjh),
-                    p => p.Kdhysjh.Contains(input.kdhysjh)
-                )
+                .WhereIF(!string.IsNullOrEmpty(input.kdhysjh), p => p.Kdhysjh.Contains(input.kdhysjh))
                 .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.kjblsyj), p => p.Kjblsyj.Contains(input.kjblsyj))
                 .WhereIF(!string.IsNullOrEmpty(input.pxxx), p => p.Pxxx.Contains(input.pxxx))
-                .WhereIF(
-                    !string.IsNullOrEmpty(input.F_FIleUrl),
-                    p => p.F_FIleUrl.Contains(input.F_FIleUrl)
-                )
+                .WhereIF(!string.IsNullOrEmpty(input.F_FIleUrl), p => p.F_FIleUrl.Contains(input.F_FIleUrl))
                 .Select(it => new LqKdKdjlbListOutput
                 {
                     id = it.Id,
@@ -297,9 +257,7 @@ namespace NCC.Extend.LqKdKdjlb
                 _db.BeginTran();
                 //新增开单记录表记录
                 entity.CreateUser = userInfo.userId;
-                var newEntity = await _db.Insertable(entity)
-                    .IgnoreColumns(ignoreNullColumn: true)
-                    .ExecuteReturnEntityAsync();
+                var newEntity = await _db.Insertable(entity).IgnoreColumns(ignoreNullColumn: true).ExecuteReturnEntityAsync();
                 //循环品相信息
                 // 收集所有需要插入的实体，然后批量插入
                 var allPxmxEntities = new List<LqKdPxmxEntity>();
@@ -394,18 +352,14 @@ namespace NCC.Extend.LqKdKdjlb
                     var entityInfo = await GetInfo(newEntity.Id);
                     if (entityInfo != null)
                     {
-                        var orderRecordString = _stringGenerator.GenerateOrderRecordString(
-                            entityInfo
-                        );
+                        var orderRecordString = _stringGenerator.GenerateOrderRecordString(entityInfo);
                         Console.WriteLine("开单记录字符串生成成功:");
                         Console.WriteLine(orderRecordString);
 
                         // 发送到企业微信群
                         try
                         {
-                            var sendResult = await _weChatBotService.SendOrderRecordMessage(
-                                orderRecordString
-                            );
+                            var sendResult = await _weChatBotService.SendOrderRecordMessage(orderRecordString);
                             if (sendResult)
                             {
                                 Console.WriteLine("开单记录已成功发送到企业微信群");
@@ -448,40 +402,15 @@ namespace NCC.Extend.LqKdKdjlb
         public async Task<dynamic> GetNoPagingList([FromQuery] LqKdKdjlbListQueryInput input)
         {
             var sidx = input.sidx == null ? "id" : input.sidx;
-            List<string> queryKdrq =
-                input.kdrq != null ? input.kdrq.Split(',').ToObeject<List<string>>() : null;
+            List<string> queryKdrq = input.kdrq != null ? input.kdrq.Split(',').ToObeject<List<string>>() : null;
             DateTime? startKdrq = queryKdrq != null ? Ext.GetDateTime(queryKdrq.First()) : null;
             DateTime? endKdrq = queryKdrq != null ? Ext.GetDateTime(queryKdrq.Last()) : null;
             var data = await _db.Queryable<LqKdKdjlbEntity>()
                 .WhereIF(!string.IsNullOrEmpty(input.id), p => p.Id.Contains(input.id))
                 .WhereIF(!string.IsNullOrEmpty(input.djmd), p => p.Djmd.Equals(input.djmd))
                 .WhereIF(!string.IsNullOrEmpty(input.jsj), p => p.Jsj.Equals(input.jsj))
-                .WhereIF(
-                    queryKdrq != null,
-                    p =>
-                        p.Kdrq
-                        >= new DateTime(
-                            startKdrq.ToDate().Year,
-                            startKdrq.ToDate().Month,
-                            startKdrq.ToDate().Day,
-                            0,
-                            0,
-                            0
-                        )
-                )
-                .WhereIF(
-                    queryKdrq != null,
-                    p =>
-                        p.Kdrq
-                        <= new DateTime(
-                            endKdrq.ToDate().Year,
-                            endKdrq.ToDate().Month,
-                            endKdrq.ToDate().Day,
-                            23,
-                            59,
-                            59
-                        )
-                )
+                .WhereIF(queryKdrq != null, p => p.Kdrq >= new DateTime(startKdrq.ToDate().Year, startKdrq.ToDate().Month, startKdrq.ToDate().Day, 0, 0, 0))
+                .WhereIF(queryKdrq != null, p => p.Kdrq <= new DateTime(endKdrq.ToDate().Year, endKdrq.ToDate().Month, endKdrq.ToDate().Day, 23, 59, 59))
                 .WhereIF(!string.IsNullOrEmpty(input.gjlx), p => p.Gjlx.Equals(input.gjlx))
                 .WhereIF(!string.IsNullOrEmpty(input.hgjg), p => p.Hgjg.Equals(input.hgjg))
                 .WhereIF(!string.IsNullOrEmpty(input.zdyj), p => p.Zdyj.Equals(input.zdyj))
@@ -499,20 +428,11 @@ namespace NCC.Extend.LqKdKdjlb
                 .WhereIF(!string.IsNullOrEmpty(input.bz), p => p.Bz.Contains(input.bz))
                 .WhereIF(!string.IsNullOrEmpty(input.kdhy), p => p.Kdhy.Equals(input.kdhy))
                 .WhereIF(!string.IsNullOrEmpty(input.kdhyc), p => p.Kdhyc.Contains(input.kdhyc))
-                .WhereIF(
-                    !string.IsNullOrEmpty(input.kdhysjh),
-                    p => p.Kdhysjh.Contains(input.kdhysjh)
-                )
+                .WhereIF(!string.IsNullOrEmpty(input.kdhysjh), p => p.Kdhysjh.Contains(input.kdhysjh))
                 .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.kjblsyj), p => p.Kjblsyj.Contains(input.kjblsyj))
                 .WhereIF(!string.IsNullOrEmpty(input.pxxx), p => p.Pxxx.Contains(input.pxxx))
-                .WhereIF(
-                    !string.IsNullOrEmpty(input.F_FIleUrl),
-                    p => p.F_FIleUrl.Contains(input.F_FIleUrl)
-                )
+                .WhereIF(!string.IsNullOrEmpty(input.F_FIleUrl), p => p.F_FIleUrl.Contains(input.F_FIleUrl))
                 .Select(it => new LqKdKdjlbListOutput
                 {
                     id = it.Id,
@@ -583,23 +503,13 @@ namespace NCC.Extend.LqKdKdjlb
                 var isExist = paramList.Find(p => p.field == item);
                 if (isExist != null)
                 {
-                    excelconfig.ColumnModel.Add(
-                        new ExcelColumnModel()
-                        {
-                            Column = isExist.field,
-                            ExcelColumn = isExist.value,
-                        }
-                    );
+                    excelconfig.ColumnModel.Add(new ExcelColumnModel() { Column = isExist.field, ExcelColumn = isExist.value });
                 }
             }
             var addPath = FileVariable.TemporaryFilePath + excelconfig.FileName;
             ExcelExportHelper<LqKdKdjlbListOutput>.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"),
-            };
+            var output = new { name = excelconfig.FileName, url = "/api/File/Download?encryption=" + DESCEncryption.Encrypt(fileName, "NCC") };
             return output;
         }
         #endregion
@@ -621,24 +531,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();
                 }
@@ -705,20 +607,12 @@ namespace NCC.Extend.LqKdKdjlb
                 _db.BeginTran();
 
                 //更新开单记录表记录
-                await _db.Updateable(entity)
-                    .IgnoreColumns(ignoreAllNullColumns: true)
-                    .ExecuteCommandAsync();
+                await _db.Updateable(entity).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync();
 
                 //清空原有数据
-                await _db.Deleteable<LqKdJksyjEntity>()
-                    .Where(u => u.Glkdbh == id)
-                    .ExecuteCommandAsync();
-                await _db.Deleteable<LqKdKjbsyjEntity>()
-                    .Where(u => u.Glkdbh == id)
-                    .ExecuteCommandAsync();
-                await _db.Deleteable<LqKdPxmxEntity>()
-                    .Where(u => u.Glkdbh == id)
-                    .ExecuteCommandAsync();
+                await _db.Deleteable<LqKdJksyjEntity>().Where(u => u.Glkdbh == id).ExecuteCommandAsync();
+                await _db.Deleteable<LqKdKjbsyjEntity>().Where(u => u.Glkdbh == id).ExecuteCommandAsync();
+                await _db.Deleteable<LqKdPxmxEntity>().Where(u => u.Glkdbh == id).ExecuteCommandAsync();
 
                 // 收集所有需要插入的实体，然后批量插入
                 var allPxmxEntities = new List<LqKdPxmxEntity>();
@@ -835,24 +729,16 @@ namespace NCC.Extend.LqKdKdjlb
                 _db.BeginTran();
 
                 //删除开单记录表记录
-                await _db.Deleteable<LqKdKdjlbEntity>()
-                    .Where(d => d.Id == id)
-                    .ExecuteCommandAsync();
+                await _db.Deleteable<LqKdKdjlbEntity>().Where(d => d.Id == id).ExecuteCommandAsync();
 
                 //清空子表数据
-                await _db.Deleteable<LqKdJksyjEntity>()
-                    .Where(u => u.Glkdbh == id)
-                    .ExecuteCommandAsync();
+                await _db.Deleteable<LqKdJksyjEntity>().Where(u => u.Glkdbh == id).ExecuteCommandAsync();
 
                 //清空子表数据
-                await _db.Deleteable<LqKdKjbsyjEntity>()
-                    .Where(u => u.Glkdbh == id)
-                    .ExecuteCommandAsync();
+                await _db.Deleteable<LqKdKjbsyjEntity>().Where(u => u.Glkdbh == id).ExecuteCommandAsync();
 
                 //清空子表数据
-                await _db.Deleteable<LqKdPxmxEntity>()
-                    .Where(u => u.Glkdbh == id)
-                    .ExecuteCommandAsync();
+                await _db.Deleteable<LqKdPxmxEntity>().Where(u => u.Glkdbh == id).ExecuteCommandAsync();
 
                 //关闭事务
                 _db.CommitTran();
diff --git a/netcore/src/Modularity/Extend/NCC.Extend/LqKhxxService.cs b/netcore/src/Modularity/Extend/NCC.Extend/LqKhxxService.cs
index 0a05c9b..6c40d4f 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend/LqKhxxService.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend/LqKhxxService.cs
@@ -1,35 +1,35 @@
-using NCC.Common.Core.Manager;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Mapster;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Logging;
+using NCC.ClayObject;
+using NCC.Common.Configuration;
+using NCC.Common.Core.Manager;
 using NCC.Common.Enum;
 using NCC.Common.Extension;
 using NCC.Common.Filter;
+using NCC.Common.Helper;
+using NCC.Common.Model.NPOI;
+using NCC.DataEncryption;
 using NCC.Dependency;
 using NCC.DynamicApiController;
-using NCC.FriendlyException;
-using NCC.Extend.Interfaces.LqKhxx;
-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_khxx;
 using NCC.Extend.Entitys.Dto.LqKhxx;
+using NCC.Extend.Entitys.Dto.LqXhHyhk;
+using NCC.Extend.Entitys.lq_hytk_hytk;
+using NCC.Extend.Entitys.lq_hytk_mx;
 using NCC.Extend.Entitys.lq_kd_kdjlb;
 using NCC.Extend.Entitys.lq_kd_pxmx;
+using NCC.Extend.Entitys.lq_khxx;
 using NCC.Extend.Entitys.lq_xh_hyhk;
 using NCC.Extend.Entitys.lq_xh_pxmx;
-using NCC.Extend.Entitys.lq_hytk_hytk;
-using NCC.Extend.Entitys.lq_hytk_mx;
-using Yitter.IdGenerator;
-using NCC.Common.Helper;
+using NCC.Extend.Interfaces.LqKhxx;
+using NCC.FriendlyException;
 using NCC.JsonSerialization;
-using NCC.Common.Model.NPOI;
-using NCC.Common.Configuration;
-using NCC.DataEncryption;
-using NCC.ClayObject;
-using Microsoft.Extensions.Logging;
-using NCC.Extend.Entitys.Dto.LqXhHyhk;
+using SqlSugar;
+using Yitter.IdGenerator;
 
 namespace NCC.Extend.LqKhxx
 {
@@ -55,7 +55,7 @@ namespace NCC.Extend.LqKhxx
             _userManager = userManager;
             _logger = logger;
         }
-     
+
         #region 客户资料
         /// <summary>
         /// 获取客户资料
@@ -70,7 +70,7 @@ namespace NCC.Extend.LqKhxx
             return output;
         }
         #endregion
-       
+
         #region 客户资料列表
         /// <summary>
         /// 获取客户资料列表
@@ -81,24 +81,6 @@ namespace NCC.Extend.LqKhxx
         public async Task<dynamic> GetList([FromQuery] LqKhxxListQueryInput input)
         {
             var sidx = input.sidx == null ? "id" : input.sidx;
-            List<string> queryZjdlsj = input.zjdlsj != null ? input.zjdlsj.Split(',').ToObeject<List<string>>() : null;
-            DateTime? startZjdlsj = queryZjdlsj != null ? Ext.GetDateTime(queryZjdlsj.First()) : null;
-            DateTime? endZjdlsj = queryZjdlsj != null ? Ext.GetDateTime(queryZjdlsj.Last()) : null;
-            List<string> queryZcsj = input.zcsj != null ? input.zcsj.Split(',').ToObeject<List<string>>() : null;
-            DateTime? startZcsj = queryZcsj != null ? Ext.GetDateTime(queryZcsj.First()) : null;
-            DateTime? endZcsj = queryZcsj != null ? Ext.GetDateTime(queryZcsj.Last()) : null;
-            List<string> queryScdd = input.scdd != null ? input.scdd.Split(',').ToObeject<List<string>>() : null;
-            DateTime? startScdd = queryScdd != null ? Ext.GetDateTime(queryScdd.First()) : null;
-            DateTime? endScdd = queryScdd != null ? Ext.GetDateTime(queryScdd.Last()) : null;
-            List<string> queryZjdd = input.zjdd != null ? input.zjdd.Split(',').ToObeject<List<string>>() : null;
-            DateTime? startZjdd = queryZjdd != null ? Ext.GetDateTime(queryZjdd.First()) : null;
-            DateTime? endZjdd = queryZjdd != null ? Ext.GetDateTime(queryZjdd.Last()) : null;
-            List<string> queryYanglsr = input.yanglsr != null ? input.yanglsr.Split(',').ToObeject<List<string>>() : null;
-            DateTime? startYanglsr = queryYanglsr != null ? Ext.GetDateTime(queryYanglsr.First()) : null;
-            DateTime? endYanglsr = queryYanglsr != null ? Ext.GetDateTime(queryYanglsr.Last()) : null;
-            List<string> queryYinlsr = input.yinlsr != null ? input.yinlsr.Split(',').ToObeject<List<string>>() : null;
-            DateTime? startYinlsr = queryYinlsr != null ? Ext.GetDateTime(queryYinlsr.First()) : null;
-            DateTime? endYinlsr = queryYinlsr != null ? Ext.GetDateTime(queryYinlsr.Last()) : null;
             var data = await _db.Queryable<LqKhxxEntity>()
                 .WhereIF(!string.IsNullOrEmpty(input.id), p => p.Id.Contains(input.id))
                 .WhereIF(!string.IsNullOrEmpty(input.khmc), p => p.Khmc.Contains(input.khmc))
@@ -108,12 +90,8 @@ namespace NCC.Extend.LqKhxx
                 .WhereIF(!string.IsNullOrEmpty(input.gzhzt), p => p.Gzhzt.Equals(input.gzhzt))
                 .WhereIF(!string.IsNullOrEmpty(input.wxnc), p => p.Wxnc.Contains(input.wxnc))
                 .WhereIF(!string.IsNullOrEmpty(input.wxxcxzt), p => p.Wxxcxzt.Equals(input.wxxcxzt))
-                //   .WhereIF(queryZjdlsj != null, p => p.Zjdlsj >= new DateTime(startZjdlsj.ToDate().Year, startZjdlsj.ToDate().Month, startZjdlsj.ToDate().Day, 0, 0, 0))
-                //  .WhereIF(queryZjdlsj != null, p => p.Zjdlsj <= new DateTime(endZjdlsj.ToDate().Year, endZjdlsj.ToDate().Month, endZjdlsj.ToDate().Day, 23, 59, 59))
                 .WhereIF(!string.IsNullOrEmpty(input.khmqgs), p => p.Khmqgs.Equals(input.khmqgs))
                 .WhereIF(!string.IsNullOrEmpty(input.gsmd), p => p.Gsmd.Contains(input.gsmd))
-                .WhereIF(queryZcsj != null, p => p.Zcsj >= new DateTime(startZcsj.ToDate().Year, startZcsj.ToDate().Month, startZcsj.ToDate().Day, 0, 0, 0))
-                .WhereIF(queryZcsj != null, p => p.Zcsj <= new DateTime(endZcsj.ToDate().Year, endZcsj.ToDate().Month, endZcsj.ToDate().Day, 23, 59, 59))
                 .WhereIF(!string.IsNullOrEmpty(input.khlx), p => p.Khlx.Equals(input.khlx))
                 .WhereIF(!string.IsNullOrEmpty(input.khjd), p => p.Khjd.Equals(input.khjd))
                 .WhereIF(!string.IsNullOrEmpty(input.khxf), p => p.Khxf.Contains(input.khxf))
@@ -124,31 +102,7 @@ namespace NCC.Extend.LqKhxx
                 .WhereIF(!string.IsNullOrEmpty(input.jdqd), p => p.Jdqd.Contains(input.jdqd))
                 .WhereIF(!string.IsNullOrEmpty(input.lxdz), p => p.Lxdz.Contains(input.lxdz))
                 .WhereIF(!string.IsNullOrEmpty(input.bz), p => p.Bz.Contains(input.bz))
-                .WhereIF(queryScdd != null, p => p.Scdd >= new DateTime(startScdd.ToDate().Year, startScdd.ToDate().Month, startScdd.ToDate().Day, 0, 0, 0))
-                .WhereIF(queryScdd != null, p => p.Scdd <= new DateTime(endScdd.ToDate().Year, endScdd.ToDate().Month, endScdd.ToDate().Day, 23, 59, 59))
-                //   .WhereIF(queryZjdd != null, p => p.Zjdd >= new DateTime(startZjdd.ToDate().Year, startZjdd.ToDate().Month, startZjdd.ToDate().Day, 0, 0, 0))
-                //     .WhereIF(queryZjdd != null, p => p.Zjdd <= new DateTime(endZjdd.ToDate().Year, endZjdd.ToDate().Month, endZjdd.ToDate().Day, 23, 59, 59))
-                .WhereIF(!string.IsNullOrEmpty(input.wddts), p => p.Wddts.Contains(input.wddts))
-                .WhereIF(queryYanglsr != null, p => p.Yanglsr >= new DateTime(startYanglsr.ToDate().Year, startYanglsr.ToDate().Month, startYanglsr.ToDate().Day, 0, 0, 0))
-                .WhereIF(queryYanglsr != null, p => p.Yanglsr <= new DateTime(endYanglsr.ToDate().Year, endYanglsr.ToDate().Month, endYanglsr.ToDate().Day, 23, 59, 59))
-                .WhereIF(queryYinlsr != null, p => p.Yinlsr >= new DateTime(startYinlsr.ToDate().Year, startYinlsr.ToDate().Month, startYinlsr.ToDate().Day, 0, 0, 0))
-                .WhereIF(queryYinlsr != null, p => p.Yinlsr <= new DateTime(endYinlsr.ToDate().Year, endYinlsr.ToDate().Month, endYinlsr.ToDate().Day, 23, 59, 59))
                 .WhereIF(!string.IsNullOrEmpty(input.ml), p => p.Ml.Contains(input.ml))
-                .WhereIF(!string.IsNullOrEmpty(input.zjycfwry), p => p.Zjycfwry.Contains(input.zjycfwry))
-                .WhereIF(!string.IsNullOrEmpty(input.qjddpc), p => p.Qjddpc.Contains(input.qjddpc))
-                .WhereIF(!string.IsNullOrEmpty(input.qjfwdc), p => p.Qjfwdc.Contains(input.qjfwdc))
-                .WhereIF(!string.IsNullOrEmpty(input.qjxjxf), p => p.Qjxjxf.Contains(input.qjxjxf))
-                .WhereIF(!string.IsNullOrEmpty(input.qjxmhk), p => p.Qjxmhk.Contains(input.qjxmhk))
-                .WhereIF(!string.IsNullOrEmpty(input.qjczxh), p => p.Qjczxh.Contains(input.qjczxh))
-                .WhereIF(!string.IsNullOrEmpty(input.sycz), p => p.Sycz.Equals(input.sycz))
-                .WhereIF(!string.IsNullOrEmpty(input.syjf), p => p.Syjf.Equals(input.syjf))
-                .WhereIF(!string.IsNullOrEmpty(input.sypxje), p => p.Sypxje.Equals(input.sypxje))
-                .WhereIF(!string.IsNullOrEmpty(input.sytcje), p => p.Sytcje.Equals(input.sytcje))
-                .WhereIF(!string.IsNullOrEmpty(input.ljxmhkje), p => p.Ljxmhkje.Equals(input.ljxmhkje))
-                .WhereIF(!string.IsNullOrEmpty(input.ljczxh), p => p.Ljczxh.Equals(input.ljczxh))
-                .WhereIF(!string.IsNullOrEmpty(input.ljxfcs), p => p.Ljxfcs.Equals(input.ljxfcs))
-                .WhereIF(!string.IsNullOrEmpty(input.ljfwcs), p => p.Ljfwcs.Equals(input.ljfwcs))
-                .WhereIF(!string.IsNullOrEmpty(input.ljxjxfje), p => p.Ljxjxfje.Equals(input.ljxjxfje))
                 .Select(it => new LqKhxxListOutput
                 {
                     id = it.Id,
@@ -173,32 +127,17 @@ namespace NCC.Extend.LqKhxx
                     jdqd = it.Jdqd,
                     lxdz = it.Lxdz,
                     bz = it.Bz,
-                    scdd = it.Scdd,
-                    zjdd = it.Zjdd,
-                    wddts = it.Wddts,
                     yanglsr = it.Yanglsr,
                     yinlsr = it.Yinlsr,
                     ml = it.Ml,
-                    zjycfwry = it.Zjycfwry,
-                    qjddpc = it.Qjddpc,
-                    qjfwdc = it.Qjfwdc,
-                    qjxjxf = it.Qjxjxf,
-                    qjxmhk = it.Qjxmhk,
-                    qjczxh = it.Qjczxh,
-                    sycz = it.Sycz,
-                    syjf = it.Syjf,
-                    sypxje = it.Sypxje,
-                    sytcje = it.Sytcje,
-                    ljxmhkje = it.Ljxmhkje,
-                    ljczxh = it.Ljczxh,
-                    ljxfcs = it.Ljxfcs,
-                    ljfwcs = it.Ljfwcs,
-                    ljxjxfje = it.Ljxjxfje,
-                }).MergeTable().OrderBy(sidx + " " + input.sort).ToPagedListAsync(input.currentPage, input.pageSize);
+                })
+                .MergeTable()
+                .OrderBy(sidx + " " + input.sort)
+                .ToPagedListAsync(input.currentPage, input.pageSize);
             return PageResult<LqKhxxListOutput>.SqlSugarPageResult(data);
         }
         #endregion
-       
+
         #region 新建客户资料
         /// <summary>
         /// 新建客户资料
@@ -212,10 +151,11 @@ namespace NCC.Extend.LqKhxx
             var entity = input.Adapt<LqKhxxEntity>();
             entity.Id = YitIdHelper.NextId().ToString();
             var isOk = await _db.Insertable(entity).IgnoreColumns(ignoreNullColumn: true).ExecuteCommandAsync();
-            if (!(isOk > 0)) throw NCCException.Oh(ErrorCode.COM1000);
+            if (!(isOk > 0))
+                throw NCCException.Oh(ErrorCode.COM1000);
         }
         #endregion
-       
+
         #region 获取客户资料无分页列表
         /// <summary>
         /// 获取客户资料无分页列表
@@ -232,12 +172,6 @@ namespace NCC.Extend.LqKhxx
             List<string> queryZcsj = input.zcsj != null ? input.zcsj.Split(',').ToObeject<List<string>>() : null;
             DateTime? startZcsj = queryZcsj != null ? Ext.GetDateTime(queryZcsj.First()) : null;
             DateTime? endZcsj = queryZcsj != null ? Ext.GetDateTime(queryZcsj.Last()) : null;
-            List<string> queryScdd = input.scdd != null ? input.scdd.Split(',').ToObeject<List<string>>() : null;
-            DateTime? startScdd = queryScdd != null ? Ext.GetDateTime(queryScdd.First()) : null;
-            DateTime? endScdd = queryScdd != null ? Ext.GetDateTime(queryScdd.Last()) : null;
-            List<string> queryZjdd = input.zjdd != null ? input.zjdd.Split(',').ToObeject<List<string>>() : null;
-            DateTime? startZjdd = queryZjdd != null ? Ext.GetDateTime(queryZjdd.First()) : null;
-            DateTime? endZjdd = queryZjdd != null ? Ext.GetDateTime(queryZjdd.Last()) : null;
             List<string> queryYanglsr = input.yanglsr != null ? input.yanglsr.Split(',').ToObeject<List<string>>() : null;
             DateTime? startYanglsr = queryYanglsr != null ? Ext.GetDateTime(queryYanglsr.First()) : null;
             DateTime? endYanglsr = queryYanglsr != null ? Ext.GetDateTime(queryYanglsr.Last()) : null;
@@ -269,31 +203,11 @@ namespace NCC.Extend.LqKhxx
                 .WhereIF(!string.IsNullOrEmpty(input.jdqd), p => p.Jdqd.Contains(input.jdqd))
                 .WhereIF(!string.IsNullOrEmpty(input.lxdz), p => p.Lxdz.Contains(input.lxdz))
                 .WhereIF(!string.IsNullOrEmpty(input.bz), p => p.Bz.Contains(input.bz))
-                .WhereIF(queryScdd != null, p => p.Scdd >= new DateTime(startScdd.ToDate().Year, startScdd.ToDate().Month, startScdd.ToDate().Day, 0, 0, 0))
-                //   .WhereIF(queryScdd != null, p => p.Scdd <= new DateTime(endScdd.ToDate().Year, endScdd.ToDate().Month, endScdd.ToDate().Day, 23, 59, 59))
-                //    .WhereIF(queryZjdd != null, p => p.Zjdd >= new DateTime(startZjdd.ToDate().Year, startZjdd.ToDate().Month, startZjdd.ToDate().Day, 0, 0, 0))
-                //    .WhereIF(queryZjdd != null, p => p.Zjdd <= new DateTime(endZjdd.ToDate().Year, endZjdd.ToDate().Month, endZjdd.ToDate().Day, 23, 59, 59))
-                .WhereIF(!string.IsNullOrEmpty(input.wddts), p => p.Wddts.Contains(input.wddts))
                 .WhereIF(queryYanglsr != null, p => p.Yanglsr >= new DateTime(startYanglsr.ToDate().Year, startYanglsr.ToDate().Month, startYanglsr.ToDate().Day, 0, 0, 0))
                 .WhereIF(queryYanglsr != null, p => p.Yanglsr <= new DateTime(endYanglsr.ToDate().Year, endYanglsr.ToDate().Month, endYanglsr.ToDate().Day, 23, 59, 59))
                 .WhereIF(queryYinlsr != null, p => p.Yinlsr >= new DateTime(startYinlsr.ToDate().Year, startYinlsr.ToDate().Month, startYinlsr.ToDate().Day, 0, 0, 0))
                 .WhereIF(queryYinlsr != null, p => p.Yinlsr <= new DateTime(endYinlsr.ToDate().Year, endYinlsr.ToDate().Month, endYinlsr.ToDate().Day, 23, 59, 59))
                 .WhereIF(!string.IsNullOrEmpty(input.ml), p => p.Ml.Contains(input.ml))
-                .WhereIF(!string.IsNullOrEmpty(input.zjycfwry), p => p.Zjycfwry.Contains(input.zjycfwry))
-                .WhereIF(!string.IsNullOrEmpty(input.qjddpc), p => p.Qjddpc.Contains(input.qjddpc))
-                .WhereIF(!string.IsNullOrEmpty(input.qjfwdc), p => p.Qjfwdc.Contains(input.qjfwdc))
-                .WhereIF(!string.IsNullOrEmpty(input.qjxjxf), p => p.Qjxjxf.Contains(input.qjxjxf))
-                .WhereIF(!string.IsNullOrEmpty(input.qjxmhk), p => p.Qjxmhk.Contains(input.qjxmhk))
-                .WhereIF(!string.IsNullOrEmpty(input.qjczxh), p => p.Qjczxh.Contains(input.qjczxh))
-                .WhereIF(!string.IsNullOrEmpty(input.sycz), p => p.Sycz.Equals(input.sycz))
-                .WhereIF(!string.IsNullOrEmpty(input.syjf), p => p.Syjf.Equals(input.syjf))
-                .WhereIF(!string.IsNullOrEmpty(input.sypxje), p => p.Sypxje.Equals(input.sypxje))
-                .WhereIF(!string.IsNullOrEmpty(input.sytcje), p => p.Sytcje.Equals(input.sytcje))
-                .WhereIF(!string.IsNullOrEmpty(input.ljxmhkje), p => p.Ljxmhkje.Equals(input.ljxmhkje))
-                .WhereIF(!string.IsNullOrEmpty(input.ljczxh), p => p.Ljczxh.Equals(input.ljczxh))
-                .WhereIF(!string.IsNullOrEmpty(input.ljxfcs), p => p.Ljxfcs.Equals(input.ljxfcs))
-                .WhereIF(!string.IsNullOrEmpty(input.ljfwcs), p => p.Ljfwcs.Equals(input.ljfwcs))
-                .WhereIF(!string.IsNullOrEmpty(input.ljxjxfje), p => p.Ljxjxfje.Equals(input.ljxjxfje))
                 .Select(it => new LqKhxxListOutput
                 {
                     id = it.Id,
@@ -318,33 +232,18 @@ namespace NCC.Extend.LqKhxx
                     jdqd = it.Jdqd,
                     lxdz = it.Lxdz,
                     bz = it.Bz,
-                    scdd = it.Scdd,
-                    zjdd = it.Zjdd,
-                    wddts = it.Wddts,
                     yanglsr = it.Yanglsr,
                     yinlsr = it.Yinlsr,
                     ml = it.Ml,
-                    zjycfwry = it.Zjycfwry,
-                    qjddpc = it.Qjddpc,
-                    qjfwdc = it.Qjfwdc,
-                    qjxjxf = it.Qjxjxf,
-                    qjxmhk = it.Qjxmhk,
-                    qjczxh = it.Qjczxh,
-                    sycz = it.Sycz,
-                    syjf = it.Syjf,
-                    sypxje = it.Sypxje,
-                    sytcje = it.Sytcje,
-                    ljxmhkje = it.Ljxmhkje,
-                    ljczxh = it.Ljczxh,
-                    ljxfcs = it.Ljxfcs,
-                    ljfwcs = it.Ljfwcs,
-                    ljxjxfje = it.Ljxjxfje,
-                }).MergeTable().OrderBy(sidx + " " + input.sort).ToListAsync();
+                })
+                .MergeTable()
+                .OrderBy(sidx + " " + input.sort)
+                .ToListAsync();
             return data;
         }
         #endregion
-       
-        #region 导出客户资料            
+
+        #region 导出客户资料
         /// <summary>
         /// 导出客户资料
         /// </summary>
@@ -364,7 +263,8 @@ namespace NCC.Extend.LqKhxx
             {
                 exportData = await this.GetNoPagingList(input);
             }
-            List<ParamsModel> paramList = "[{\"value\":\"客户编码\",\"field\":\"id\"},{\"value\":\"客户名称\",\"field\":\"khmc\"},{\"value\":\"手机号\",\"field\":\"sjh\"},{\"value\":\"档案号\",\"field\":\"dah\"},{\"value\":\"性别\",\"field\":\"xb\"},{\"value\":\"公众号状态\",\"field\":\"gzhzt\"},{\"value\":\"微信昵称\",\"field\":\"wxnc\"},{\"value\":\"小程序状态\",\"field\":\"wxxcxzt\"},{\"value\":\"最近登录时间\",\"field\":\"zjdlsj\"},{\"value\":\"客户目前归属\",\"field\":\"khmqgs\"},{\"value\":\"归属门店\",\"field\":\"gsmd\"},{\"value\":\"注册时间\",\"field\":\"zcsj\"},{\"value\":\"客户类型\",\"field\":\"khlx\"},{\"value\":\"客户阶段\",\"field\":\"khjd\"},{\"value\":\"客户消费\",\"field\":\"khxf\"},{\"value\":\"消费频次\",\"field\":\"xfpc\"},{\"value\":\"推荐人\",\"field\":\"tjr\"},{\"value\":\"负责顾问\",\"field\":\"fzgw\"},{\"value\":\"美容师\",\"field\":\"mrs\"},{\"value\":\"进店渠道\",\"field\":\"jdqd\"},{\"value\":\"联系地址\",\"field\":\"lxdz\"},{\"value\":\"备注\",\"field\":\"bz\"},{\"value\":\"首次到店\",\"field\":\"scdd\"},{\"value\":\"最近到店\",\"field\":\"zjdd\"},{\"value\":\"未到店天数\",\"field\":\"wddts\"},{\"value\":\"阳历生日\",\"field\":\"yanglsr\"},{\"value\":\"阴历生日\",\"field\":\"yinlsr\"},{\"value\":\"年龄\",\"field\":\"ml\"},{\"value\":\"最近服务人员\",\"field\":\"zjycfwry\"},{\"value\":\"期间到店频次\",\"field\":\"qjddpc\"},{\"value\":\"期间服务单次\",\"field\":\"qjfwdc\"},{\"value\":\"期间现金消费\",\"field\":\"qjxjxf\"},{\"value\":\"期间项目耗卡\",\"field\":\"qjxmhk\"},{\"value\":\"期间储值消耗\",\"field\":\"qjczxh\"},{\"value\":\"剩余储值\",\"field\":\"sycz\"},{\"value\":\"剩余积分\",\"field\":\"syjf\"},{\"value\":\"剩余品项金额\",\"field\":\"sypxje\"},{\"value\":\"剩余套餐金额\",\"field\":\"sytcje\"},{\"value\":\"项目耗卡金额\",\"field\":\"ljxmhkje\"},{\"value\":\"累计储值消耗\",\"field\":\"ljczxh\"},{\"value\":\"累计消费次数\",\"field\":\"ljxfcs\"},{\"value\":\"累计服务次数\",\"field\":\"ljfwcs\"},{\"value\":\"现金消费金额\",\"field\":\"ljxjxfje\"},]".ToList<ParamsModel>();
+            List<ParamsModel> paramList =
+                "[{\"value\":\"客户编码\",\"field\":\"id\"},{\"value\":\"客户名称\",\"field\":\"khmc\"},{\"value\":\"手机号\",\"field\":\"sjh\"},{\"value\":\"档案号\",\"field\":\"dah\"},{\"value\":\"性别\",\"field\":\"xb\"},{\"value\":\"公众号状态\",\"field\":\"gzhzt\"},{\"value\":\"微信昵称\",\"field\":\"wxnc\"},{\"value\":\"小程序状态\",\"field\":\"wxxcxzt\"},{\"value\":\"最近登录时间\",\"field\":\"zjdlsj\"},{\"value\":\"客户目前归属\",\"field\":\"khmqgs\"},{\"value\":\"归属门店\",\"field\":\"gsmd\"},{\"value\":\"注册时间\",\"field\":\"zcsj\"},{\"value\":\"客户类型\",\"field\":\"khlx\"},{\"value\":\"客户阶段\",\"field\":\"khjd\"},{\"value\":\"客户消费\",\"field\":\"khxf\"},{\"value\":\"消费频次\",\"field\":\"xfpc\"},{\"value\":\"推荐人\",\"field\":\"tjr\"},{\"value\":\"负责顾问\",\"field\":\"fzgw\"},{\"value\":\"美容师\",\"field\":\"mrs\"},{\"value\":\"进店渠道\",\"field\":\"jdqd\"},{\"value\":\"联系地址\",\"field\":\"lxdz\"},{\"value\":\"备注\",\"field\":\"bz\"},{\"value\":\"阳历生日\",\"field\":\"yanglsr\"},{\"value\":\"阴历生日\",\"field\":\"yinlsr\"},{\"value\":\"年龄\",\"field\":\"ml\"},]".ToList<ParamsModel>();
             ExcelConfig excelconfig = new ExcelConfig();
             excelconfig.FileName = "客户资料.xls";
             excelconfig.HeadFont = "微软雅黑";
@@ -383,15 +283,11 @@ namespace NCC.Extend.LqKhxx
             var addPath = FileVariable.TemporaryFilePath + excelconfig.FileName;
             ExcelExportHelper<LqKhxxListOutput>.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")
-            };
+            var output = new { name = excelconfig.FileName, url = "/api/File/Download?encryption=" + DESCEncryption.Encrypt(fileName, "NCC") };
             return output;
         }
         #endregion
-        
+
         #region 批量删除客户资料
         /// <summary>
         /// 批量删除客户资料
@@ -422,7 +318,7 @@ namespace NCC.Extend.LqKhxx
             }
         }
         #endregion
-      
+
         #region 更新客户资料
         /// <summary>
         /// 更新客户资料
@@ -435,10 +331,11 @@ namespace NCC.Extend.LqKhxx
         {
             var entity = input.Adapt<LqKhxxEntity>();
             var isOk = await _db.Updateable(entity).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync();
-            if (!(isOk > 0)) throw NCCException.Oh(ErrorCode.COM1001);
+            if (!(isOk > 0))
+                throw NCCException.Oh(ErrorCode.COM1001);
         }
         #endregion
-      
+
         #region 删除客户资料
         /// <summary>
         /// 删除客户资料
@@ -450,7 +347,8 @@ namespace NCC.Extend.LqKhxx
             var entity = await _db.Queryable<LqKhxxEntity>().FirstAsync(p => p.Id == id);
             _ = entity ?? throw NCCException.Oh(ErrorCode.COM1005);
             var isOk = await _db.Deleteable<LqKhxxEntity>().Where(d => d.Id == id).ExecuteCommandAsync();
-            if (!(isOk > 0)) throw NCCException.Oh(ErrorCode.COM1002);
+            if (!(isOk > 0))
+                throw NCCException.Oh(ErrorCode.COM1002);
         }
         #endregion
 
@@ -462,15 +360,15 @@ namespace NCC.Extend.LqKhxx
         /// 根据会员ID查询该会员的剩余品项信息，包括已购买但未消费完的品项详情
         /// 支持按来源类型(F_SourceType)区分相同品项的不同来源，确保数据准确分组
         /// 计算逻辑：剩余数量 = 购买数量 - 消费数量 - 退卡数量
-        /// 
+        ///
         /// 示例请求：
         /// ```json
         /// GET /api/Extend/LqKhxx/GetMemberRemainingItems?memberId=GK2025022100004
         /// ```
-        /// 
+        ///
         /// 参数说明：
         /// - memberId: 会员ID，必填参数
-        /// 
+        ///
         /// 返回数据结构：
         /// - MemberId: 会员ID
         /// - MemberName: 会员姓名
@@ -483,7 +381,7 @@ namespace NCC.Extend.LqKhxx
         ///   - ConsumedCount: 已消费数量
         ///   - RefundedCount: 已退卡数量
         ///   - RemainingCount: 剩余数量
-        /// 
+        ///
         /// 特殊说明：
         /// - 相同品项但不同SourceType的记录会分开显示
         /// - 耗卡和退卡统计会按品项ID和SourceType精确匹配
@@ -508,9 +406,7 @@ namespace NCC.Extend.LqKhxx
                 _logger.LogInformation("开始查询会员剩余品项，会员ID：{MemberId}", memberId);
 
                 // 1. 查询会员基本信息
-                var memberInfo = await _db.Queryable<LqKhxxEntity>()
-                    .Where(x => x.Id == memberId)
-                    .FirstAsync();
+                var memberInfo = await _db.Queryable<LqKhxxEntity>().Where(x => x.Id == memberId).FirstAsync();
 
                 if (memberInfo == null)
                 {
@@ -522,10 +418,7 @@ namespace NCC.Extend.LqKhxx
 
                 // 2. 查询开单记录ID列表
                 _logger.LogInformation("开始查询开单记录ID列表");
-                var orderIds = await _db.Queryable<LqKdKdjlbEntity>()
-                    .Where(kd => kd.Kdhy == memberId)
-                    .Select(kd => kd.Id)
-                    .ToListAsync();
+                var orderIds = await _db.Queryable<LqKdKdjlbEntity>().Where(kd => kd.Kdhy == memberId).Select(kd => kd.Id).ToListAsync();
 
                 _logger.LogInformation("开单记录ID列表查询成功，数量：{Count}", orderIds.Count);
 
@@ -536,20 +429,26 @@ namespace NCC.Extend.LqKhxx
                 {
                     var tempPurchasedItems = await _db.Queryable<LqKdPxmxEntity>()
                         .Where(px => orderIds.Contains(px.Glkdbh))
-                        .GroupBy(px => new { px.Px, px.Pxmc, px.Pxjg, px.SourceType })
+                        .GroupBy(px => new
+                        {
+                            px.Px,
+                            px.Pxmc,
+                            px.Pxjg,
+                            px.SourceType,
+                        })
                         .Select(px => new
                         {
                             ItemId = px.Px,
                             ItemName = px.Pxmc,
                             ItemPrice = px.Pxjg,
                             SourceType = SqlFunc.IsNull(px.SourceType, "未知"),
-                            TotalPurchased = SqlFunc.AggregateSum(SqlFunc.ToDecimal(px.ProjectNumber))
+                            TotalPurchased = SqlFunc.AggregateSum(SqlFunc.ToDecimal(px.ProjectNumber)),
                         })
                         .ToListAsync();
 
                     purchasedItems = tempPurchasedItems.Cast<dynamic>().ToList();
                     _logger.LogInformation("开单品项统计查询成功，数量：{Count}", purchasedItems.Count);
-                    
+
                     // 调试：输出前几条记录查看SourceType字段
                     foreach (var item in purchasedItems.Take(3))
                     {
@@ -559,10 +458,7 @@ namespace NCC.Extend.LqKhxx
 
                 // 4. 查询耗卡记录ID列表
                 _logger.LogInformation("开始查询耗卡记录ID列表");
-                var consumeIds = await _db.Queryable<LqXhHyhkEntity>()
-                    .Where(hk => hk.Hy == memberId)
-                    .Select(hk => hk.Id)
-                    .ToListAsync();
+                var consumeIds = await _db.Queryable<LqXhHyhkEntity>().Where(hk => hk.Hy == memberId).Select(hk => hk.Id).ToListAsync();
 
                 _logger.LogInformation("耗卡记录ID列表查询成功，数量：{Count}", consumeIds.Count);
 
@@ -578,7 +474,7 @@ namespace NCC.Extend.LqKhxx
                         {
                             ItemId = px.Px,
                             SourceType = SqlFunc.IsNull(px.SourceType, "未知"),
-                            ConsumedCount = SqlFunc.AggregateSum(SqlFunc.ToDecimal(px.ProjectNumber))
+                            ConsumedCount = SqlFunc.AggregateSum(SqlFunc.ToDecimal(px.ProjectNumber)),
                         })
                         .ToListAsync();
 
@@ -588,10 +484,7 @@ namespace NCC.Extend.LqKhxx
 
                 // 6. 查询退卡记录ID列表
                 _logger.LogInformation("开始查询退卡记录ID列表");
-                var refundIds = await _db.Queryable<LqHytkHytkEntity>()
-                    .Where(tk => tk.Hy == memberId && tk.F_DeleteMark != 1)
-                    .Select(tk => tk.Id)
-                    .ToListAsync();
+                var refundIds = await _db.Queryable<LqHytkHytkEntity>().Where(tk => tk.Hy == memberId && tk.F_DeleteMark != 1).Select(tk => tk.Id).ToListAsync();
 
                 _logger.LogInformation("退卡记录ID列表查询成功，数量：{Count}", refundIds.Count);
 
@@ -607,7 +500,7 @@ namespace NCC.Extend.LqKhxx
                         {
                             ItemId = px.Px,
                             SourceType = SqlFunc.IsNull(px.F_SourceType, "未知"),
-                            RefundedCount = SqlFunc.AggregateSum(SqlFunc.ToDecimal(px.F_ProjectNumber))
+                            RefundedCount = SqlFunc.AggregateSum(SqlFunc.ToDecimal(px.F_ProjectNumber)),
                         })
                         .ToListAsync();
 
@@ -623,15 +516,11 @@ namespace NCC.Extend.LqKhxx
                 foreach (var purchased in purchasedItems)
                 {
                     // 按品项ID和来源类型匹配耗卡记录
-                    var consumed = consumedItems.FirstOrDefault(x => 
-                        x.ItemId == purchased.ItemId && 
-                        x.SourceType == purchased.SourceType);
+                    var consumed = consumedItems.FirstOrDefault(x => x.ItemId == purchased.ItemId && x.SourceType == purchased.SourceType);
                     var consumedCount = consumed?.ConsumedCount ?? 0;
 
                     // 按品项ID和来源类型匹配退卡记录
-                    var refunded = refundedItems.FirstOrDefault(x => 
-                        x.ItemId == purchased.ItemId && 
-                        x.SourceType == purchased.SourceType);
+                    var refunded = refundedItems.FirstOrDefault(x => x.ItemId == purchased.ItemId && x.SourceType == purchased.SourceType);
                     var refundedCount = refunded?.RefundedCount ?? 0;
 
                     // 计算剩余数量：购买数量 - 消费数量 - 退卡数量
@@ -639,17 +528,19 @@ namespace NCC.Extend.LqKhxx
 
                     if (remainingCount > 0)
                     {
-                        remainingItems.Add(new RemainingItemInfo
-                        {
-                            ItemId = purchased.ItemId,
-                            ItemName = purchased.ItemName,
-                            ItemPrice = purchased.ItemPrice,
-                            SourceType = purchased.SourceType?.ToString() ?? "未知",
-                            TotalPurchased = purchased.TotalPurchased,
-                            ConsumedCount = consumedCount,
-                            RefundedCount = refundedCount,
-                            RemainingCount = remainingCount
-                        });
+                        remainingItems.Add(
+                            new RemainingItemInfo
+                            {
+                                ItemId = purchased.ItemId,
+                                ItemName = purchased.ItemName,
+                                ItemPrice = purchased.ItemPrice,
+                                SourceType = purchased.SourceType?.ToString() ?? "未知",
+                                TotalPurchased = purchased.TotalPurchased,
+                                ConsumedCount = consumedCount,
+                                RefundedCount = refundedCount,
+                                RemainingCount = remainingCount,
+                            }
+                        );
                     }
                 }
 
@@ -662,7 +553,7 @@ namespace NCC.Extend.LqKhxx
                 {
                     MemberId = memberId,
                     MemberName = memberInfo.Khmc,
-                    RemainingItems = remainingItems
+                    RemainingItems = remainingItems,
                 };
             }
             catch (Exception ex)
diff --git a/netcore/src/Modularity/Extend/NCC.Extend/LqTkjlbService.cs b/netcore/src/Modularity/Extend/NCC.Extend/LqTkjlbService.cs
index 32f64c7..677b6f4 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend/LqTkjlbService.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend/LqTkjlbService.cs
@@ -62,6 +62,7 @@ namespace NCC.Extend.LqTkjlb
             return output;
         }
         #endregion
+
         #region 获取拓客管理列表
 
         /// <summary>
@@ -111,6 +112,7 @@ namespace NCC.Extend.LqTkjlb
             return PageResult<LqTkjlbListOutput>.SqlSugarPageResult(data);
         }
         #endregion
+
         #region 新建拓客管理
         /// <summary>
         /// 新建拓客管理
@@ -136,6 +138,7 @@ namespace NCC.Extend.LqTkjlb
                 throw NCCException.Oh(ErrorCode.COM1000);
         }
         #endregion
+
         #region 获取拓客管理无分页列表
         /// <summary>
         /// 获取拓客管理无分页列表
@@ -182,6 +185,7 @@ namespace NCC.Extend.LqTkjlb
             return data;
         }
         #endregion
+
         #region 导出拓客管理
         /// <summary>
         /// 导出拓客管理
@@ -226,6 +230,7 @@ namespace NCC.Extend.LqTkjlb
             return output;
         }
         #endregion
+
         #region 批量删除拓客管理
 
         /// <summary>
@@ -257,6 +262,7 @@ namespace NCC.Extend.LqTkjlb
             }
         }
         #endregion
+
         #region 更新拓客管理
         /// <summary>
         /// 更新拓客管理
@@ -273,6 +279,7 @@ namespace NCC.Extend.LqTkjlb
                 throw NCCException.Oh(ErrorCode.COM1001);
         }
         #endregion
+
         #region 删除拓客管理
         /// <summary>
         /// 删除拓客管理
@@ -288,6 +295,7 @@ namespace NCC.Extend.LqTkjlb
                 throw NCCException.Oh(ErrorCode.COM1002);
         }
         #endregion
+
         #region 获取拓客排行榜
         /// <summary>
         /// 获取拓客排行榜
@@ -308,6 +316,7 @@ namespace NCC.Extend.LqTkjlb
             return sortedData;
         }
         #endregion
+
         #region 获取战队人员详细报表
         /// <summary>
         /// 获取战队人员详细报表