From b4a860c1c506e4aad8a298f65f9f6236f8df1619 Mon Sep 17 00:00:00 2001
From: kaeery <3491123437@qq.com>
Date: Fri, 28 Feb 2025 14:38:51 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=8B=9B=E7=94=9F=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E7=AB=AF=E3=80=91=20=E6=96=B0=E5=A2=9E#=20=E5=AE=A2=E6=88=B7?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=EF=BC=9A=E5=AF=B9=E6=8E=A5=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/enums/index.ts                            | 12 ++++-
 src/utils/validate.ts                         | 16 +++++--
 .../customer/components/customer-dialog.vue   | 47 +++++++++++--------
 src/views/customer/index.vue                  |  3 +-
 src/views/customer/modules/customer-list.vue  | 24 ++++++++--
 src/views/customer/modules/search-form.vue    |  6 ++-
 6 files changed, 79 insertions(+), 29 deletions(-)

diff --git a/src/enums/index.ts b/src/enums/index.ts
index 8495ffd..c74af8c 100644
--- a/src/enums/index.ts
+++ b/src/enums/index.ts
@@ -54,10 +54,19 @@ export const conversitionMap: Record<ConverSuccessEnum, string> = {
     [ConverSuccessEnum.YES]: '是',
     [ConverSuccessEnum.NO]: '否'
 }
+export enum SexEnum {
+    MALE = 1,
+    FEMALE = 2
+}
+export const sexMap: Record<SexEnum, string> = {
+    [SexEnum.MALE]: '男',
+    [SexEnum.FEMALE]: '女'
+}
 
 const keys: Record<string, any> = {
     conversionMap: conversionMap,
-    ClueSourceMap: ClueSourceMap
+    ClueSourceMap: ClueSourceMap,
+    sexMap: sexMap
 }
 const generateConverOptions = (key: string) => {
     const mapKey = keys[key]
@@ -70,3 +79,4 @@ const generateConverOptions = (key: string) => {
 }
 export const conversionOptions = generateConverOptions('conversionMap')
 export const clueSourceOptions = generateConverOptions('ClueSourceMap')
+export const sexOptions = generateConverOptions('sexMap')
diff --git a/src/utils/validate.ts b/src/utils/validate.ts
index 0bbc56a..e994dd4 100644
--- a/src/utils/validate.ts
+++ b/src/utils/validate.ts
@@ -236,13 +236,21 @@ export function validateGoodsTime(args: any) {
 }
 /**身份证号 */
 export function validateIdCard(rule: any, value: any, callback: any) {
-    if (value === '') {
-        callback(new Error('请输入身份证号'))
-    } else if (!idCardReg.test(value)) {
-        callback(new Error('身份证号格式有误'))
+    console.log(value)
+    if (value) {
+        if (!idCardReg.test(value)) {
+            callback(new Error('身份证号格式有误'))
+        }
     } else {
         callback()
     }
+    // if (value === '') {
+    //     callback(new Error('请输入身份证号'))
+    // } else if (!idCardReg.test(value)) {
+    //     callback(new Error('身份证号格式有误'))
+    // } else {
+    //     callback()
+    // }
 }
 /**服务类别 */
 export function validateGoodsIds(rule: any, value: any, callback: any) {
diff --git a/src/views/customer/components/customer-dialog.vue b/src/views/customer/components/customer-dialog.vue
index 4f30892..adba27c 100644
--- a/src/views/customer/components/customer-dialog.vue
+++ b/src/views/customer/components/customer-dialog.vue
@@ -1,14 +1,14 @@
 <template>
     <ProDialog ref="proDialogRef" @handle-cancel="handleCancel" @handle-confirm="handleConfirm">
-        <el-form v-model="form" label-postion="right" :label-width="100">
+        <el-form ref="formRef" :rules="rules" :model="form" label-postion="right" :label-width="100">
             <el-row :gutter="24">
                 <el-col :span="12">
-                    <el-form-item label="学生名字">
+                    <el-form-item label="学生名字" prop="studentName">
                         <el-input v-model="form.studentName" placeholder="请输入" maxlength="20" show-word-limit />
                     </el-form-item>
                 </el-col>
                 <el-col :span="12">
-                    <el-form-item label="性别">
+                    <el-form-item label="性别" prop="sex">
                         <el-radio-group v-model="form.sex">
                             <el-radio v-for="option in sexOptions" :key="option.value" :label="option.value">{{ option.label }}</el-radio>
                         </el-radio-group>
@@ -17,36 +17,36 @@
             </el-row>
             <el-row :gutter="24">
                 <el-col :span="12">
-                    <el-form-item label="身份证号码">
+                    <el-form-item label="身份证号码" prop="idCard">
                         <el-input v-model="form.idCard" placeholder="请输入" maxlength="18" show-word-limit />
                     </el-form-item>
                 </el-col>
                 <el-col :span="12">
-                    <el-form-item label="报读专业">
+                    <el-form-item label="报读专业" prop="major">
                         <el-input v-model="form.major" placeholder="请输入" maxlength="50" show-word-limit />
                     </el-form-item>
                 </el-col>
             </el-row>
             <el-row :gutter="24">
                 <el-col :span="12">
-                    <el-form-item label="毕业院校">
+                    <el-form-item label="毕业院校" prop="graduationSchool">
                         <el-input v-model="form.graduationSchool" placeholder="请输入" maxlength="50" show-word-limit />
                     </el-form-item>
                 </el-col>
                 <el-col :span="12">
-                    <el-form-item label="家庭地址">
+                    <el-form-item label="家庭地址" prop="homeAddress">
                         <el-input v-model="form.homeAddress" placeholder="请输入" maxlength="100" show-word-limit />
                     </el-form-item>
                 </el-col>
             </el-row>
             <el-row :gutter="24">
                 <el-col :span="12">
-                    <el-form-item label="家长姓名">
+                    <el-form-item label="家长姓名" prop="parentName">
                         <el-input v-model="form.parentName" placeholder="请输入" maxlength="20" show-word-limit />
                     </el-form-item>
                 </el-col>
                 <el-col :span="12">
-                    <el-form-item label="家长电话">
+                    <el-form-item label="家长电话" prop="parentPhone">
                         <el-input v-model="form.parentPhone" placeholder="请输入" maxlength="11" show-word-limit />
                     </el-form-item>
                 </el-col>
@@ -77,17 +77,17 @@
 </template>
 
 <script setup lang="ts">
-import { customerDetail } from '@/api/customer'
+import type { FormInstance } from 'element-plus'
 import ProDialog, { type IParams } from '@/components/ProDialog/index.vue'
-import { clueSourceOptions } from '@/enums'
+import { customerDetail, customerEdit } from '@/api/customer'
+import { clueSourceOptions, sexOptions } from '@/enums'
+import { validateIdCard } from '@/utils/validate'
+import feedback from '@/utils/feedback'
 
 const emit = defineEmits(['refreshList'])
-const proDialogRef = ref<InstanceType<typeof ProDialog>>()
 
-const sexOptions = ref([
-    { label: '男', value: 1 },
-    { label: '女', value: 2 }
-])
+const proDialogRef = ref<InstanceType<typeof ProDialog>>()
+const formRef = ref<FormInstance>()
 const form = ref({
     id: '',
     studentName: '',
@@ -102,7 +102,9 @@ const form = ref({
     recruitTeacherName: '',
     listSource: 0
 })
-
+const rules = reactive({
+    idCard: { validator: validateIdCard, trigger: 'blur' }
+})
 const fetchDetail = async (id: number) => {
     try {
         const result = await customerDetail({ id })
@@ -124,8 +126,15 @@ const handleCancel = (callback: () => void) => {
     callback()
 }
 const handleConfirm = (callback: () => void) => {
-    callback()
-    emit('refreshList')
+    formRef.value?.validate(async valid => {
+        if (!valid) return
+        try {
+            await customerEdit(form.value)
+            feedback.msgSuccess('编辑成功')
+            callback()
+            emit('refreshList')
+        } catch (error) {}
+    })
 }
 defineExpose({
     openDialog
diff --git a/src/views/customer/index.vue b/src/views/customer/index.vue
index d2a3789..2e1ce6b 100644
--- a/src/views/customer/index.vue
+++ b/src/views/customer/index.vue
@@ -18,7 +18,8 @@ import { usePaging } from '@/hooks/usePaging'
 import { customerLists } from '@/api/customer'
 
 const queryParams = reactive({
-    studentName: ''
+    studentName: '',
+    parentPhone: ''
 })
 const { pager, getLists, resetPage, resetParams } = usePaging({
     fetchFun: customerLists,
diff --git a/src/views/customer/modules/customer-list.vue b/src/views/customer/modules/customer-list.vue
index 82d08ff..52e2a71 100644
--- a/src/views/customer/modules/customer-list.vue
+++ b/src/views/customer/modules/customer-list.vue
@@ -3,8 +3,11 @@
         <el-tabs v-model="activeTab">
             <el-tab-pane label="成交用户" name="complete">
                 <ProTable ref="proTableRef" :columns="columns" :tableData="tableData" :loading="loading" :maxHeight="530">
+                    <template #sex="{ row }">
+                        <span>{{ sexMap[row.sex as SexEnum] }}</span>
+                    </template>
                     <template #listSource="{ row }">
-                        {{ ClueSourceMap[row.listSource] }}
+                        {{ ClueSourceMap[row.listSource as CluseSourceEnum] }}
                     </template>
                     <template #operation="{ row }">
                         <slot name="operation" :row="row" />
@@ -16,15 +19,30 @@
 </template>
 
 <script setup lang="ts">
-import { ClueSourceMap } from '@/enums'
+import { ClueSourceMap, CluseSourceEnum, SexEnum, sexMap } from '@/enums'
+import type { PropType } from 'vue'
 
+interface ICustomer {
+    id: number
+    studentName: string
+    sex: SexEnum
+    idCard: string
+    major: string
+    graduationSchool: string
+    homeAddress: string
+    parentName: string
+    parentPhone: string
+    telemarketingTeacherName: string
+    recruitTeacherName: string
+    listSource: CluseSourceEnum
+}
 defineProps({
     loading: {
         type: Boolean,
         default: false
     },
     tableData: {
-        type: Array,
+        type: Array as PropType<ICustomer[]>,
         default: () => []
     }
 })
diff --git a/src/views/customer/modules/search-form.vue b/src/views/customer/modules/search-form.vue
index 911a51e..9a58b9c 100644
--- a/src/views/customer/modules/search-form.vue
+++ b/src/views/customer/modules/search-form.vue
@@ -4,6 +4,9 @@
             <el-form-item label="学生名字">
                 <el-input class="w-[280px]" placeholder="请输入" v-model="modelValue.studentName" clearable @keyup.enter="$emit('resetPage')" />
             </el-form-item>
+            <el-form-item label="家长电话">
+                <el-input class="w-[280px]" placeholder="请输入" v-model="modelValue.parentPhone" clearable @keyup.enter="$emit('resetPage')" />
+            </el-form-item>
             <el-form-item>
                 <el-button type="primary" @click="$emit('resetPage')">查询</el-button>
                 <el-button @click="$emit('resetParams')">重置</el-button>
@@ -17,7 +20,8 @@ defineProps({
     modelValue: {
         type: Object,
         default: () => ({
-            studentName: ''
+            studentName: '',
+            parentPhone: ''
         })
     }
 })