feat:跳转到学校关系页面

web/src/components/custom/FollowDialog.vue

@@ -7,7 +7,7 @@
   >
     <ElForm ref="formRef" :model="formData" :rules="rules" label-width="auto">
       <ElFormItem :label="selectLabelArr[0]" prop="first_id">
-        <ElSelect v-model="formData.first_id" :empty-values="[0]">
+        <ElSelect v-model="formData.first_id" :empty-values="[0]" :value-on-clear="0">
           <ElOption
             v-for="item in selectList"
             :key="item.id"
@@ -57,7 +57,7 @@
       </ElFormItem>
       <ElFormItem label="跟进详情" prop="detail">
         <!-- 富文本编辑器 -->
-        <ArtWangEditor class="el-top" v-model="formData.detail" height="250px"/>
+        <ArtWangEditor class="el-top" v-model="formData.detail" height="300px" mode="simple"/>
       </ElFormItem>
     </ElForm>
     <template #footer>

web/src/views/school/list/index.vue

@@ -7,6 +7,17 @@
     <!-- 搜索栏 -->
     <UserSearch v-model="searchForm" @search="handleSearch" @reset="resetSearchParams"></UserSearch>
 
+    <!--   跟进弹窗   -->
+    <FollowDialog
+        v-model:visible="followDialogVisible"
+        :user-data="currentRow"
+        :type="'school'"
+        :first_id="currentRow.id || 0"
+        :second_id="0"
+        :selectList="selectList"
+        @submit="handleDialogSubmit"
+    />
+
     <ElCard class="art-table-card" shadow="never">
       <!-- 表格头部 -->
       <ArtTableHeader v-model:columns="columnChecks" @refresh="refreshData">
@@ -70,7 +81,7 @@
         direction="rtl"
         size="70%"
     >
-      <template #title>
+      <template #header>
         <span style="font-size: 20px; font-weight: bold;">{{ currentRow.name }}</span>
       </template>
       <ElRow>
@@ -188,17 +199,6 @@
       </ElRow>
     </el-drawer>
   </div>
-
-  <!--   跟进弹窗   -->
-  <FollowDialog
-      v-model:visible="followDialogVisible"
-      :user-data="currentRow"
-      :type="'school'"
-      :first_id="currentRow.id || 0"
-      :second_id="0"
-      :selectList="selectList"
-      @submit="handleDialogSubmit"
-  />
 </template>
 
 <script setup lang="ts">
@@ -297,7 +297,7 @@ const {
         prop: 'concat',
         label: '关系人',
         formatter: (row) => {
-          return h(ElButton, {type: 'primary'}, () => '查看')
+          return h(ElButton, {type: 'primary', onClick: () => showContact(row)}, () => '查看')
         }
       },
       {
@@ -511,7 +511,15 @@ const showDrawer = (row: Api.School.SchoolListItem): void => {
       }
     }
   })
-  console.log(`%c timelineData.value == `, 'background:#41b883 ; padding:1px; color:#fff', timelineData.value);
+}
+
+const showContact = (row: Api.School.SchoolListItem):void => {
+  router.push({
+    path: RoutesAlias.SchoolRelation,
+    query: {
+      school_id: row.id
+    }
+  })
 }
 
 /**

web/src/views/school/relation/index.vue

@@ -78,11 +78,12 @@
   // 选中行
   const selectedRows = ref<SchoolContactItem[]>([])
 
+
   // 搜索表单
   const searchForm = ref({
     name: '',
     phone: '',
-    school_id: ''
+    school_id: parseInt(<string>useRoute().query.school_id)  || '',
   })
 
   const selectList = ref<Api.Common.SelectRelationInfo[]>([])

web/src/views/school/relation/modules/user-dialog.vue

@@ -10,7 +10,7 @@
         <ElInput v-model="formData.name" maxlength="20" type="text" />
       </ElFormItem>
       <ElFormItem label="学校" prop="school_id">
-        <ElSelect v-model="formData.school_id" :empty-values="[0]">
+        <ElSelect v-model="formData.school_id" :empty-values="[0]" :value-on-clear="0">
           <ElOption
             v-for="item in selectList"
             :key="item.id"