From da7fc6272d0eb665f6845e64ba86c555e23646b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=91=E5=9D=A4?= <yuankun1102@126.com>
Date: Sun, 25 May 2025 14:40:55 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=98=AF=E5=90=A6=E4=B8=BA?=
 =?UTF-8?q?=E8=B4=9F=E8=B4=A3=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/crm/contact/ContactForm.vue | 65 +++++++++++++--------------
 src/views/crm/contact/index.vue       |  4 +-
 2 files changed, 34 insertions(+), 35 deletions(-)

diff --git a/src/views/crm/contact/ContactForm.vue b/src/views/crm/contact/ContactForm.vue
index 3199651e9..c4efc283b 100644
--- a/src/views/crm/contact/ContactForm.vue
+++ b/src/views/crm/contact/ContactForm.vue
@@ -34,13 +34,6 @@
             </el-select> -->
           </el-form-item>
         </el-col>
-        <el-col :span="12">
-          <el-form-item label="联系人" prop="name">
-            <el-input v-model="formData.name" placeholder="请输入联系人" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row>
         <el-col :span="12">
           <el-form-item label="登记人" prop="ownerUserId">
             <el-select
@@ -58,11 +51,35 @@
             </el-select>
           </el-form-item>
         </el-col>
+        <el-col :span="12">
+          <el-form-item label="联系人" prop="name">
+            <el-input v-model="formData.name" placeholder="请输入联系人" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="角色" prop="contactRoleType">
+            <el-select v-model="formData.contactRoleType" placeholder="请选择角色" class="w-1/1">
+              <el-option
+                  v-for="dict in getIntDictOptions(DICT_TYPE.CRM_CONTACT_ROLE_TYPE)"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
         <el-col :span="12">
           <el-form-item label="手机" prop="mobile">
             <el-input v-model="formData.mobile" placeholder="请输入手机" />
           </el-form-item>
         </el-col>
+        <el-col :span="12">
+          <el-form-item label="职位" prop="post">
+            <el-input v-model="formData.post" placeholder="请输入职位" />
+          </el-form-item>
+        </el-col>
       </el-row>
       <el-row>
 <!--        <el-col :span="12">
@@ -74,31 +91,13 @@
           <el-form-item label="邮箱" prop="email">
             <el-input v-model="formData.email" placeholder="请输入邮箱" />
           </el-form-item>
-        </el-col>
-         <el-col :span="12">
-          <el-form-item label="角色" prop="contactRoleType">
-            <el-select v-model="formData.contactRoleType" placeholder="请选择角色" class="w-1/1">
-              <el-option
-                v-for="dict in getIntDictOptions(DICT_TYPE.CRM_CONTACT_ROLE_TYPE)"
-                :key="dict.value"
-                :label="dict.label"
-                :value="dict.value"
-              />
-            </el-select>
-          </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="微信" prop="wechat">
             <el-input v-model="formData.wechat" placeholder="请输入微信" />
           </el-form-item>
         </el-col>
-
-        <el-col :span="12">
-          <el-form-item label="职位" prop="post">
-            <el-input v-model="formData.post" placeholder="请输入职位" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
+<!--        <el-col :span="12">
           <el-form-item label="关键决策人" prop="master" style="width: 400px">
             <el-radio-group v-model="formData.master">
               <el-radio
@@ -110,7 +109,7 @@
               </el-radio>
             </el-radio-group>
           </el-form-item>
-        </el-col>
+        </el-col>-->
         <el-col :span="12">
           <el-form-item label="性别" prop="sex">
             <el-select v-model="formData.sex" placeholder="请选择" class="w-1/1">
@@ -128,7 +127,7 @@
             <el-input v-model="formData.birthday" placeholder="请输入生日" />
           </el-form-item>
         </el-col>
-        <el-col :span="12">
+        <el-col>
           <el-form-item label="爱好" prop="hobby">
             <el-input v-model="formData.hobby" placeholder="请输入爱好" />
           </el-form-item>
@@ -161,16 +160,16 @@
             />
           </el-form-item>
         </el-col>-->
-         <el-col >
-          <el-form-item label="注册地址" prop="registeredAddress">
-            <el-input v-model="formData.registeredAddress" disabled placeholder="请输入注册地址" />
-          </el-form-item>
-        </el-col>
         <el-col >
           <el-form-item label="家庭地址" prop="detailAddress">
             <el-input v-model="formData.detailAddress" placeholder="请输入家庭地址" />
           </el-form-item>
         </el-col>
+        <el-col >
+          <el-form-item label="办公地址" prop="registeredAddress">
+            <el-input v-model="formData.registeredAddress" disabled placeholder="办公地址自动带出" />
+          </el-form-item>
+        </el-col>
       </el-row>
       <el-row>
 <!--        <el-col :span="12">
diff --git a/src/views/crm/contact/index.vue b/src/views/crm/contact/index.vue
index 985828a28..0136c7279 100644
--- a/src/views/crm/contact/index.vue
+++ b/src/views/crm/contact/index.vue
@@ -118,11 +118,11 @@
       <el-table-column align="center" label="邮箱" prop="email" width="180" />
       <el-table-column align="center" label="职位" prop="post" width="120" />
       <el-table-column align="center" label="地址" prop="detailAddress" width="120" />
-      <el-table-column align="center" label="关键决策人" prop="master" width="100">
+<!--      <el-table-column align="center" label="关键决策人" prop="master" width="100">
         <template #default="scope">
           <dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="scope.row.master" />
         </template>
-      </el-table-column>
+      </el-table-column>-->
       <el-table-column align="center" label="直属上级" prop="parentName" width="160">
         <template #default="scope">
           <el-link :underline="false" type="primary" @click="openDetail(scope.row.parentId)">