From 0fdccb9c997e3fcdda3b6712e80699668f1fa648 Mon Sep 17 00:00:00 2001
From: xpz2018 <107107461@qq.com>
Date: Wed, 2 Jul 2025 15:13:58 +0800
Subject: [PATCH] no message

---
 src/enums/customerEnum.ts           | 17 +++++++
 src/views/clue/clueList/index.vue   | 13 ++---
 src/views/clue/components/data.ts   | 75 ++++++++++++++++++-----------
 src/views/clue/customer/data.ts     | 74 +++++++++++++++++-----------
 src/views/clue/followlist/index.vue | 13 ++---
 src/views/invite/components/data.ts |  2 +-
 src/views/invite/index/index.vue    | 23 +++++----
 src/views/invite/myList/index.vue   | 22 +++------
 src/views/invite/seasList/index.vue | 18 ++-----
 9 files changed, 142 insertions(+), 115 deletions(-)

diff --git a/src/enums/customerEnum.ts b/src/enums/customerEnum.ts
index 20ce383..e1b48a3 100644
--- a/src/enums/customerEnum.ts
+++ b/src/enums/customerEnum.ts
@@ -80,4 +80,21 @@ export const incomeList = [
   { label: '20001~25000', value: 6 },
   { label: '25001~30000', value: 7 },
   { label: '30000以上', value: 8 },
+]
+
+
+export const paymentList = [
+  { label: '不考虑', value: 1 },
+  { label: '可以考虑', value: 2 },
+  { label: '愿意', value: 3 },
+  { label: '可以试试', value: 4 },
+  { label: '有明确预算', value: 5 },
+  { label: '其他地方交过', value: 6 },
+]
+
+export const marriageList = [
+  { label: '1年内', value: 1 },
+  { label: '2年内', value: 2 },
+  { label: '3年内', value: 3 },
+  { label: '先恋爱', value: 4 },
 ]
\ No newline at end of file
diff --git a/src/views/clue/clueList/index.vue b/src/views/clue/clueList/index.vue
index a80ddbc..c8d1dca 100644
--- a/src/views/clue/clueList/index.vue
+++ b/src/views/clue/clueList/index.vue
@@ -22,14 +22,9 @@
         <Timeline :list="record.datingClueFollowRecordList"/>
       </template>
       <template #action="{ record }">
-        <TableAction
-          :actions="[
-            {
-              label: '详情',
-              onClick: toDetail.bind(null, record),
-            },
-          ]"
-        />
+        <div class="flex-col-center-start">
+          <Button style="width: 100px;" type="primary" @click.stop="toDetail(record)">详情</Button>
+        </div>
       </template>
     </BasicTable>
   </div>
@@ -46,7 +41,7 @@
 <script setup lang="ts">
   import moment from 'moment/moment'
   import { computed, ref, reactive } from 'vue'
-  import { Avatar, Card, Image, InputNumber, Result } from 'ant-design-vue'
+  import { Avatar, Card, Button, InputNumber, Result } from 'ant-design-vue'
   import { useRouter } from 'vue-router'
   import { tableColumns, tableFormSchema } from './data'
   import { BasicTable, useTable, TableAction } from '/@/components/Table'
diff --git a/src/views/clue/components/data.ts b/src/views/clue/components/data.ts
index 6f9918e..5510af3 100644
--- a/src/views/clue/components/data.ts
+++ b/src/views/clue/components/data.ts
@@ -1,7 +1,7 @@
 import { FormSchema } from '/@/components/Table'
 import { ref } from 'vue'
 import dayjs, { Dayjs } from 'dayjs'
-import { genderList, channelList, clueStatusList, followStatusList, validStatusList } from '/@/enums/customerEnum'
+import { genderList, channelList, clueStatusList, followStatusList, paymentList, marriageList } from '/@/enums/customerEnum'
 import { useAddressData } from '/@/hooks/common'
 import {
   getIncomeList,
@@ -190,21 +190,22 @@ export const modalFormSchema: FormSchema[] = [
     },
   },
   { field: 'childrenNum', label: '孩子数量', component: 'InputNumber', colProps: { span: 8 }, },
-  {
-    field: 'nationCode',
-    label: '民族',
-    colProps: { span: 8 },
-    component: 'ApiSelect',
-    componentProps: {
-      labelField: 'cn',
-      valueField: 'id',
-      api: getNationList,
-      getPopupContainer: () => document.body,
-      onChange: (_: any, v: any) => {
-        basicInfoData.value.nation = v?.label
-      },
-    },
-  },
+  // {
+  //   field: 'nationCode',
+  //   label: '民族',
+  //   colProps: { span: 8 },
+  //   component: 'ApiSelect',
+  //   componentProps: {
+  //     labelField: 'cn',
+  //     valueField: 'id',
+  //     api: getNationList,
+  //     getPopupContainer: () => document.body,
+  //     onChange: (_: any, v: any) => {
+  //       basicInfoData.value.nation = v?.label
+  //     },
+  //   },
+  // },
+  
   // {
   //   field: 'bodilyFormCode',
   //   label: '体型',
@@ -264,18 +265,18 @@ export const modalFormSchema: FormSchema[] = [
       },
     },
   },
-  {
-    field: 'onlyChild',
-    label: '是否独生子女',
-    colProps: { span: 8 },
-    component: 'Select',
-    componentProps: {
-      options: [
-        { label: '是', value: 1 },
-        { label: '否', value: 0 },
-      ],
-    },
-  },
+  // {
+  //   field: 'onlyChild',
+  //   label: '是否独生子女',
+  //   colProps: { span: 8 },
+  //   component: 'Select',
+  //   componentProps: {
+  //     options: [
+  //       { label: '是', value: 1 },
+  //       { label: '否', value: 0 },
+  //     ],
+  //   },
+  // },
   {
     field: 'propertyPermitsCode',
     label: '购房情况',
@@ -318,6 +319,24 @@ export const modalFormSchema: FormSchema[] = [
       },
     },
   },
+  {
+    field: 'paymentIntention',
+    label: '付费意愿',
+    colProps: { span: 8 },
+    component: 'Select',
+    componentProps: {
+      options: paymentList
+    },
+  },
+  {
+    field: 'marriageIntention',
+    label: '结婚意愿',
+    colProps: { span: 8 },
+    component: 'Select',
+    componentProps: {
+      options: marriageList
+    },
+  },
   {
     field: 'profilePhoto',
     component: 'Upload',
diff --git a/src/views/clue/customer/data.ts b/src/views/clue/customer/data.ts
index 9db45e7..6326665 100644
--- a/src/views/clue/customer/data.ts
+++ b/src/views/clue/customer/data.ts
@@ -2,7 +2,7 @@ import { useAddressData } from '/@/hooks/common'
 import { ref } from 'vue'
 import dayjs, { Dayjs } from 'dayjs'
 import { FormSchema } from '/@/components/Form'
-import { genderList, followTypeList, followStageList } from '/@/enums/customerEnum'
+import { genderList, followTypeList, followStageList, paymentList, marriageList } from '/@/enums/customerEnum'
 import {
   getIncomeList,
   getNationList,
@@ -177,21 +177,21 @@ export const basicSchema: FormSchema[] = [
   //     },
   //   },
   // },
-  {
-    field: 'nationCode',
-    label: '民族',
-    component: 'ApiSelect',
-    colProps: { span: 8 },
-    componentProps: {
-      labelField: 'cn',
-      valueField: 'id',
-      api: getNationList,
-      getPopupContainer: () => document.body,
-      onChange: (_: any, v: any) => {
-        basicInfoMoreData.value.nation = v?.label
-      },
-    },
-  },
+  // {
+  //   field: 'nationCode',
+  //   label: '民族',
+  //   component: 'ApiSelect',
+  //   colProps: { span: 8 },
+  //   componentProps: {
+  //     labelField: 'cn',
+  //     valueField: 'id',
+  //     api: getNationList,
+  //     getPopupContainer: () => document.body,
+  //     onChange: (_: any, v: any) => {
+  //       basicInfoMoreData.value.nation = v?.label
+  //     },
+  //   },
+  // },
   // {
   //   field: 'bodilyFormCode',
   //   label: '体型',
@@ -251,18 +251,18 @@ export const basicSchema: FormSchema[] = [
       },
     },
   },
-  {
-    field: 'onlyChild',
-    label: '是否独生子女',
-    component: 'Select',
-    colProps: { span: 8 },
-    componentProps: {
-      options: [
-        { label: '是', value: 1 },
-        { label: '否', value: 0 },
-      ],
-    },
-  },
+  // {
+  //   field: 'onlyChild',
+  //   label: '是否独生子女',
+  //   component: 'Select',
+  //   colProps: { span: 8 },
+  //   componentProps: {
+  //     options: [
+  //       { label: '是', value: 1 },
+  //       { label: '否', value: 0 },
+  //     ],
+  //   },
+  // },
   {
     field: 'housePurchase',
     label: '购房情况',
@@ -291,6 +291,24 @@ export const basicSchema: FormSchema[] = [
       },
     },
   },
+  {
+    field: 'paymentIntention',
+    label: '付费意愿',
+    colProps: { span: 8 },
+    component: 'Select',
+    componentProps: {
+      options: paymentList
+    },
+  },
+  {
+    field: 'marriageIntention',
+    label: '结婚意愿',
+    colProps: { span: 8 },
+    component: 'Select',
+    componentProps: {
+      options: marriageList
+    },
+  },
   {
     field: 'remark',
     label: '个人描述',
diff --git a/src/views/clue/followlist/index.vue b/src/views/clue/followlist/index.vue
index 700963a..0fd96dc 100644
--- a/src/views/clue/followlist/index.vue
+++ b/src/views/clue/followlist/index.vue
@@ -22,14 +22,9 @@
         <Timeline :list="record.datingClueFollowRecordList"/>
       </template>
       <template #action="{ record }">
-        <TableAction
-          :actions="[
-            {
-              label: '详情',
-              onClick: toDetail.bind(null, record),
-            },
-          ]"
-        />
+        <div class="flex-col-center-start">
+          <Button style="width: 100px;" type="primary" @click.stop="toDetail(record)">详情</Button>
+        </div>
       </template>
     </BasicTable>
   </div>
@@ -46,7 +41,7 @@
 <script setup lang="ts">
   import moment from 'moment/moment'
   import { computed, ref, reactive } from 'vue'
-  import { Avatar, Card, Image, InputNumber, Result } from 'ant-design-vue'
+  import { Avatar, Card, Button, InputNumber, Result } from 'ant-design-vue'
   import { useRouter } from 'vue-router'
   import { tableColumns, tableFormSchema } from './data'
   import { BasicTable, useTable, TableAction } from '/@/components/Table'
diff --git a/src/views/invite/components/data.ts b/src/views/invite/components/data.ts
index a9a6a62..440d317 100644
--- a/src/views/invite/components/data.ts
+++ b/src/views/invite/components/data.ts
@@ -31,7 +31,7 @@ export const modalFormSchema: FormSchema[] = [
   {
     field: 'remark',
     label: '备注',
-    required: false,
+    required: true,
     component: 'InputTextArea',
     componentProps: {
       autosize: {
diff --git a/src/views/invite/index/index.vue b/src/views/invite/index/index.vue
index ed66097..7c8e255 100644
--- a/src/views/invite/index/index.vue
+++ b/src/views/invite/index/index.vue
@@ -32,9 +32,8 @@
         <Profile :info="record" />
       </template>
       <template #action="{ record }">
-        <div class="flex-row-center-start">
-          <Button type="link" @click="toDetail(record)">详情</Button>
-          <span style="color: #999;">|</span>
+        <div class="flex-col-center-start">
+          <Button type="primary" style="width: 100px;" @click="toDetail(record)">详情</Button>
           <Popconfirm placement="topRight" :icon="record.allocationStatus == 1 ? '分配' : '重新分配'" @confirm="allocateList(record.id)">
             <template #title>
               <div class="flex-row-center-start" style="padding: 8px 8px 8px 0px;border-bottom: 1px solid #ddd;min-width: 160px;" v-for="item in memberList" :key="item.userId">
@@ -44,7 +43,7 @@
                 </Checkbox>
               </div>
             </template>
-            <Button type="link" danger >{{record.allocationStatus == 1 ? '分配' : '重新分配'}}</Button>
+            <Button style="width: 100px;margin-top: 8px;" danger>{{record.allocationStatus == 1 ? '分配' : '重新分配'}}</Button>
           </Popconfirm>
         </div>
       </template>
@@ -104,14 +103,14 @@
     showTableSetting: false,
     api: getInvitationPage,
     rowKey: 'id',
-    rowSelection: {
-      type: 'checkbox',
-      onChange,
-      // getCheckboxProps(record: any) {
-      //   // Demo: 第一行（id为0）的选择框禁用
-      //   return { disabled: record.allocationStatus !== 1 };
-      // },
-    },
+    // rowSelection: {
+    //   type: 'checkbox',
+    //   onChange,
+    //   // getCheckboxProps(record: any) {
+    //   //   // Demo: 第一行（id为0）的选择框禁用
+    //   //   return { disabled: record.allocationStatus !== 1 };
+    //   // },
+    // },
     formConfig: {
       labelWidth: 120,
       schemas: tableFormSchema,
diff --git a/src/views/invite/myList/index.vue b/src/views/invite/myList/index.vue
index 0f39c2c..2f7d256 100644
--- a/src/views/invite/myList/index.vue
+++ b/src/views/invite/myList/index.vue
@@ -8,13 +8,13 @@
           <InputNumber placeholder="请输入" style="width: 46%" v-model:value="ageModel.maxAge" />
         </div>
       </template>
-      <template #toolbar>
+      <!-- <template #toolbar>
         <div style="width: 100%; padding: 2px" class="flex-row-center-space">
           <RadioGroup button-style="solid" v-model:value="radioVal" @change="handleRadioChange">
             <RadioButton v-for="item in followStatusList" :key="item.value" :value="item.value">{{item.label}}</RadioButton>
           </RadioGroup>
         </div>
-      </template>
+      </template> -->
       <template #userinfo="{ text, record }">
         <Profile :info="record" />
       </template>
@@ -22,18 +22,10 @@
         <Timeline :list="record.datingClueFollowRecordList"/>
       </template>
       <template #action="{ record }">
-        <TableAction
-          :actions="[
-            {
-              label: '详情',
-              onClick: toDetail.bind(null, record),
-            },
-            {
-              label: '跟进',
-              onClick: handleReport.bind(null, record),
-            },
-          ]"
-        />
+        <div class="flex-col-center-start">
+          <Button type="primary" style="width: 100px;" @click="toDetail(record)">详情</Button>
+          <Button style="width: 100px;margin-top: 8px;" danger @click="handleReport(record)">跟进</Button>
+        </div>
       </template>
     </BasicTable>
     <FollowModal @register="registerModal" @success="handleSuccess" />
@@ -51,7 +43,7 @@
 <script setup lang="ts">
   import moment from 'moment/moment'
   import { computed, ref, reactive } from 'vue'
-  import { Avatar, Card, Image, InputNumber, Result } from 'ant-design-vue'
+  import { Avatar, Card, Button, InputNumber, Result } from 'ant-design-vue'
   import { useRouter } from 'vue-router'
   import { tableColumns, tableFormSchema } from './data'
   import { BasicTable, useTable, TableAction } from '/@/components/Table'
diff --git a/src/views/invite/seasList/index.vue b/src/views/invite/seasList/index.vue
index a9252f6..5767f15 100644
--- a/src/views/invite/seasList/index.vue
+++ b/src/views/invite/seasList/index.vue
@@ -22,18 +22,10 @@
         <Timeline :list="record.datingClueFollowRecordList"/>
       </template>
       <template #action="{ record }">
-        <TableAction
-          :actions="[
-            {
-              label: '详情',
-              onClick: toDetail.bind(null, record),
-            },
-            {
-              label: '领取',
-              onClick: handleReceive.bind(null, record.id),
-            },
-          ]"
-        />
+        <div class="flex-col-center-start">
+          <Button type="primary" style="width: 100px;" @click="toDetail(record)">详情</Button>
+          <Button style="width: 100px;margin-top: 8px;" danger @click="handleReceive(record.id)">领取</Button>
+        </div>
       </template>
     </BasicTable>
   </div>
@@ -50,7 +42,7 @@
 <script setup lang="ts">
   import moment from 'moment/moment'
   import { computed, ref, reactive } from 'vue'
-  import { Avatar, Card, Image, InputNumber, Result } from 'ant-design-vue'
+  import { Avatar, Card, Button, InputNumber, Result } from 'ant-design-vue'
   import { useRouter } from 'vue-router'
   import { tableColumns, tableFormSchema } from './data'
   import { useMessage } from '/@/hooks/web/useMessage'