diff --git a/src/views/crm/customer/CustomerForm.vue b/src/views/crm/customer/CustomerForm.vue
index b9b8d452..6d08450e 100644
--- a/src/views/crm/customer/CustomerForm.vue
+++ b/src/views/crm/customer/CustomerForm.vue
@@ -8,77 +8,92 @@
       label-width="100px"
       v-loading="formLoading"
     >
-      <el-form-item label="客户名称" prop="name">
-        <el-input v-model="formData.name" placeholder="请输入客户名称" />
-      </el-form-item>
-      <el-form-item label="手机" prop="mobile">
-        <el-input v-model="formData.mobile" placeholder="请输入手机" />
-      </el-form-item>
-      <el-form-item label="所属行业" prop="industryId">
-        <el-select v-model="formData.industryId" placeholder="请选择所属行业">
-          <el-option
+      <el-row>
+        <el-form-item label="客户名称" prop="name">
+          <el-input v-model="formData.name" placeholder="请输入客户名称" />
+        </el-form-item>
+        <el-form-item label="所属行业" prop="industryId">
+          <el-select v-model="formData.industryId" placeholder="请选择所属行业">
+            <el-option
               v-for="dict in getStrDictOptions(DICT_TYPE.CRM_CUSTOMER_INDUSTRY)"
-              :key="dict.value + ''"
+              :key="dict.value"
               :label="dict.label"
               :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="客户等级" prop="level">
-        <el-select v-model="formData.level" placeholder="请选择客户等级">
-          <el-option
-              v-for="dict in getStrDictOptions(DICT_TYPE.CRM_CUSTOMER_LEVEL)"
-              :key="dict.value + ''"
-              :label="dict.label"
-              :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="客户来源" prop="source">
-        <el-select v-model="formData.source" placeholder="请选择客户来源">
-          <el-option
+            />
+          </el-select>
+        </el-form-item>
+      </el-row>
+      <el-row>
+        <el-form-item label="客户来源" prop="source">
+          <el-select v-model="formData.source" placeholder="请选择客户来源">
+            <el-option
               v-for="dict in getStrDictOptions(DICT_TYPE.CRM_CUSTOMER_SOURCE)"
-              :key="dict.value + ''"
+              :key="dict.value"
               :label="dict.label"
               :value="dict.value"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="客户等级" prop="level">
+          <el-select v-model="formData.level" placeholder="请选择客户等级">
+            <el-option
+              v-for="dict in getStrDictOptions(DICT_TYPE.CRM_CUSTOMER_LEVEL)"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
+        </el-form-item>
+      </el-row>
+      <el-row>
+        <el-form-item label="手机" prop="mobile">
+          <el-input v-model="formData.mobile" placeholder="请输入手机" />
+        </el-form-item>
+        <el-form-item label="电话" prop="telephone">
+          <el-input v-model="formData.telephone" placeholder="请输入电话" />
+        </el-form-item>
+      </el-row>
+      <el-row>
+        <el-form-item label="邮箱" prop="email">
+          <el-input v-model="formData.email" placeholder="请输入邮箱" />
+        </el-form-item>
+        <el-form-item label="QQ" prop="qq">
+          <el-input v-model="formData.qq" placeholder="请输入QQ" />
+        </el-form-item>
+      </el-row>
+      <el-row>
+        <el-form-item label="微信" prop="wechat">
+          <el-input v-model="formData.wechat" placeholder="请输入微信" />
+        </el-form-item>
+        <el-form-item label="网址" prop="website">
+          <el-input v-model="formData.website" placeholder="请输入网址" />
+        </el-form-item>
+      </el-row>
+      <el-row>
+        <el-form-item label="地区编号" prop="areaId">
+          <el-input v-model="formData.areaId" placeholder="请输入地区编号" />
+        </el-form-item>
+        <el-form-item label="详细地址" prop="detailAddress">
+          <el-input v-model="formData.detailAddress" placeholder="请输入详细地址" />
+        </el-form-item>
+      </el-row>
+      <!-- TODO @Wanwan 少一个负责人字段，默认先选中自己 -->
+      <el-row>
+        <el-form-item label="下次联系时间" prop="contactNextTime">
+          <el-date-picker
+            v-model="formData.contactNextTime"
+            type="date"
+            value-format="x"
+            placeholder="选择下次联系时间"
           />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="电话" prop="telephone">
-        <el-input v-model="formData.telephone" placeholder="请输入电话" />
-      </el-form-item>
-      <el-form-item label="网址" prop="website">
-        <el-input v-model="formData.website" placeholder="请输入网址" />
-      </el-form-item>
-      <el-form-item label="QQ" prop="qq">
-        <el-input v-model="formData.qq" placeholder="请输入QQ" />
-      </el-form-item>
-      <el-form-item label="微信" prop="wechat">
-        <el-input v-model="formData.wechat" placeholder="请输入微信" />
-      </el-form-item>
-      <el-form-item label="邮箱" prop="email">
-        <el-input v-model="formData.email" placeholder="请输入邮箱" />
-      </el-form-item>
+        </el-form-item>
+      </el-row>
       <el-form-item label="客户描述" prop="description">
         <el-input v-model="formData.description" placeholder="请输入客户描述" />
       </el-form-item>
       <el-form-item label="备注" prop="remark">
         <el-input v-model="formData.remark" placeholder="请输入备注" />
       </el-form-item>
-      <el-form-item label="地区编号" prop="areaId">
-        <el-input v-model="formData.areaId" placeholder="请输入地区编号" />
-      </el-form-item>
-      <el-form-item label="详细地址" prop="detailAddress">
-        <el-input v-model="formData.detailAddress" placeholder="请输入详细地址" />
-      </el-form-item>
-      <el-form-item label="下次联系时间" prop="contactNextTime">
-        <el-date-picker
-          v-model="formData.contactNextTime"
-          type="date"
-          value-format="x"
-          placeholder="选择下次联系时间"
-        />
-      </el-form-item>
     </el-form>
     <template #footer>
       <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
diff --git a/src/views/crm/customer/index.vue b/src/views/crm/customer/index.vue
index a246e79b..58543449 100644
--- a/src/views/crm/customer/index.vue
+++ b/src/views/crm/customer/index.vue
@@ -51,55 +51,38 @@
   <ContentWrap>
     <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
       <el-table-column label="编号" align="center" prop="id" />
-      <el-table-column label="客户名称" align="center" prop="name" />
-      <el-table-column label="跟进状态" align="center" prop="followUpStatus">
+      <el-table-column label="客户名称" align="center" prop="name" width="160" />
+      <el-table-column label="所属行业" align="center" prop="industryId" width="120">
         <template #default="scope">
-          <dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="scope.row.followUpStatus" />
+          <dict-tag :type="DICT_TYPE.CRM_CUSTOMER_INDUSTRY" :value="scope.row.industryId" />
         </template>
       </el-table-column>
-      <el-table-column label="锁定状态" align="center" prop="lockStatus">
+      <el-table-column label="客户来源" align="center" prop="source" width="100">
         <template #default="scope">
-          <dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="scope.row.lockStatus" />
+          <dict-tag :type="DICT_TYPE.CRM_CUSTOMER_SOURCE" :value="scope.row.source" />
         </template>
       </el-table-column>
+      <el-table-column label="客户等级" align="center" prop="level" width="120">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.CRM_CUSTOMER_LEVEL" :value="scope.row.level" />
+        </template>
+      </el-table-column>
+      <el-table-column label="手机" align="center" prop="mobile" width="120" />
+      <el-table-column label="详细地址" align="center" prop="detailAddress" width="200" />
+      <!--  TODO @Wanwan 负责人回显，所属部门，创建人    -->
+      <el-table-column label="负责人" align="center" prop="ownerUserId" />
+      <el-table-column
+        label="创建时间"
+        align="center"
+        prop="createTime"
+        :formatter="dateFormatter"
+        width="180px"
+      />
       <el-table-column label="成交状态" align="center" prop="dealStatus">
         <template #default="scope">
           <dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="scope.row.dealStatus" />
         </template>
       </el-table-column>
-      <el-table-column label="所属行业" align="center" prop="industryId">
-        <template #default="scope">
-          <dict-tag :type="DICT_TYPE.CRM_CUSTOMER_INDUSTRY" :value="scope.row.industryId" />
-        </template>
-      </el-table-column>
-      <el-table-column label="客户等级" align="center" prop="level">
-        <template #default="scope">
-          <dict-tag :type="DICT_TYPE.CRM_CUSTOMER_LEVEL" :value="scope.row.level" />
-        </template>
-      </el-table-column>
-      <el-table-column label="客户来源" align="center" prop="source">
-        <template #default="scope">
-          <dict-tag :type="DICT_TYPE.CRM_CUSTOMER_SOURCE" :value="scope.row.source" />
-        </template>
-      </el-table-column>
-      <el-table-column label="手机" align="center" prop="mobile" />
-      <el-table-column label="电话" align="center" prop="telephone" />
-      <el-table-column label="网址" align="center" prop="website" />
-      <el-table-column label="QQ" align="center" prop="qq" />
-      <el-table-column label="微信" align="center" prop="wechat" />
-      <el-table-column label="邮箱" align="center" prop="email" />
-      <el-table-column label="客户描述" align="center" prop="description" />
-      <el-table-column label="备注" align="center" prop="remark" />
-      <el-table-column label="负责人的用户编号" align="center" prop="ownerUserId" />
-      <el-table-column label="地区编号" align="center" prop="areaId" />
-      <el-table-column label="详细地址" align="center" prop="detailAddress" />
-      <el-table-column
-        label="最后跟进时间"
-        align="center"
-        prop="contactLastTime"
-        :formatter="dateFormatter"
-        width="180px"
-      />
       <el-table-column
         label="下次联系时间"
         align="center"
@@ -108,13 +91,19 @@
         width="180px"
       />
       <el-table-column
-        label="创建时间"
+        label="最后跟进时间"
         align="center"
-        prop="createTime"
+        prop="contactLastTime"
         :formatter="dateFormatter"
         width="180px"
       />
-      <el-table-column label="操作" align="center">
+      <el-table-column label="锁定状态" align="center" prop="lockStatus">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="scope.row.lockStatus" />
+        </template>
+      </el-table-column>
+      <!--  TODO @Wanwan 距进入公海天数    -->
+      <el-table-column label="操作" align="center" width="160">
         <template #default="scope">
           <el-button
             link