refactor(zhjw):调整跟进日志和提醒功能的代码结构

- 移除了 follow_up_logs 和 follow_up_reminders 页面中未使用的 roleId 相关代码
- 优化了 follow_up_reminders 页面的代码格式和结构
- 修复了一些小的代码问题，如未闭合的注释等

admin/src/addon/zhjw/views/follow_up_logs/follow_up_logs.vue

@@ -225,7 +225,7 @@
 
           <el-table-column prop="staff_id_name" :label="t('staffId')" min-width="120" :show-overflow-tooltip="true"/>
 
-<!--          <el-table-column prop="role_id" :label="t('roleId')" min-width="120" :show-overflow-tooltip="true"/>-->
+          <!--          <el-table-column prop="role_id" :label="t('roleId')" min-width="120" :show-overflow-tooltip="true"/>-->
 
           <el-table-column :label="t('entryType')" min-width="180" align="center" :show-overflow-tooltip="true">
             <template #default="{ row }">

admin/src/addon/zhjw/views/follow_up_logs/follow_up_logs_edit.vue

@@ -34,9 +34,9 @@
           </el-select>
         </el-form-item>
 
-<!--        <el-form-item :label="t('roleId')" prop="role_id">-->
-<!--          <el-input v-model="formData.role_id" clearable :placeholder="t('roleIdPlaceholder')" class="input-width"/>-->
-<!--        </el-form-item>-->
+        <!--        <el-form-item :label="t('roleId')" prop="role_id">-->
+        <!--          <el-input v-model="formData.role_id" clearable :placeholder="t('roleIdPlaceholder')" class="input-width"/>-->
+        <!--        </el-form-item>-->
 
         <el-form-item :label="t('entryType')" prop="entry_type">
           <el-select class="input-width" v-model="formData.entry_type" clearable

admin/src/addon/zhjw/views/follow_up_reminders/follow_up_reminders.vue

@@ -3,7 +3,7 @@
     <el-card class="box-card !border-none" shadow="never">
 
       <div class="flex justify-between items-center">
-                <span class="text-lg">{{pageName}}</span>
+        <span class="text-lg">{{ pageName }}</span>
         <el-button type="primary" @click="addEvent">
           {{ t('addFollowUpReminders') }}
         </el-button>
@@ -13,7 +13,8 @@
         <el-form :inline="true" :model="followUpRemindersTable.searchParam" ref="searchFormRef">
 
           <el-form-item :label="t('followUpLogsId')" prop="follow_up_logs_id">
-                        <el-select class="w-[280px]" v-model="followUpRemindersTable.searchParam.follow_up_logs_id" clearable :placeholder="t('followUpLogsIdPlaceholder')">
+            <el-select class="w-[280px]" v-model="followUpRemindersTable.searchParam.follow_up_logs_id" clearable
+                       :placeholder="t('followUpLogsIdPlaceholder')">
               <el-option
                   v-for="(item, index) in followUpLogsIdList"
                   :key="index"
@@ -24,13 +25,15 @@
           </el-form-item>
 
           <el-form-item :label="t('reminderTime')" prop="reminder_time">
-                        <el-date-picker v-model="followUpRemindersTable.searchParam.reminder_time" type="datetimerange" format="YYYY-MM-DD hh:mm:ss"
-                            :start-placeholder="t('startDate')" :end-placeholder="t('endDate')" />
+            <el-date-picker v-model="followUpRemindersTable.searchParam.reminder_time" type="datetimerange"
+                            format="YYYY-MM-DD hh:mm:ss"
+                            :start-placeholder="t('startDate')" :end-placeholder="t('endDate')"/>
           </el-form-item>
 
 
           <el-form-item :label="t('reminderMethod')" prop="reminder_method">
-                        <el-select class="w-[280px]" v-model="followUpRemindersTable.searchParam.reminder_method" clearable :placeholder="t('reminderMethodPlaceholder')">
+            <el-select class="w-[280px]" v-model="followUpRemindersTable.searchParam.reminder_method" clearable
+                       :placeholder="t('reminderMethodPlaceholder')">
               <el-option label="全部" value=""></el-option>
               <el-option
                   v-for="(item, index) in reminder_methodList"
@@ -43,7 +46,8 @@
 
 
           <el-form-item :label="t('taskStatus')" prop="task_status">
-                        <el-select class="w-[280px]" v-model="followUpRemindersTable.searchParam.task_status" clearable :placeholder="t('taskStatusPlaceholder')">
+            <el-select class="w-[280px]" v-model="followUpRemindersTable.searchParam.task_status" clearable
+                       :placeholder="t('taskStatusPlaceholder')">
               <el-option label="全部" value=""></el-option>
               <el-option
                   v-for="(item, index) in task_statusList"
@@ -55,10 +59,12 @@
           </el-form-item>
 
           <el-form-item :label="t('createTime')" prop="create_time">
-                        <el-date-picker v-model="followUpRemindersTable.searchParam.create_time" type="datetimerange" format="YYYY-MM-DD hh:mm:ss"
-                            :start-placeholder="t('startDate')" :end-placeholder="t('endDate')" />
+            <el-date-picker v-model="followUpRemindersTable.searchParam.create_time" type="datetimerange"
+                            format="YYYY-MM-DD hh:mm:ss"
+                            :start-placeholder="t('startDate')" :end-placeholder="t('endDate')"/>
           </el-form-item>
 
+
           <el-form-item>
             <el-button type="primary" @click="loadFollowUpRemindersList()">{{ t('search') }}</el-button>
             <el-button @click="resetForm(searchFormRef)">{{ t('reset') }}</el-button>
@@ -73,9 +79,11 @@
           </template>
           <el-table-column prop="id" :label="t('id')" min-width="120" :show-overflow-tooltip="true"/>
 
-                    <el-table-column prop="follow_up_logs_id_name" :label="t('followUpLogsId')" min-width="120" :show-overflow-tooltip="true"/>
+          <el-table-column prop="follow_up_logs_id_name" :label="t('followUpLogsId')" min-width="120"
+                           :show-overflow-tooltip="true"/>
 
-                    <el-table-column prop="reminder_time" :label="t('reminderTime')" min-width="120" :show-overflow-tooltip="true"/>
+          <el-table-column prop="reminder_time" :label="t('reminderTime')" min-width="120"
+                           :show-overflow-tooltip="true"/>
 
           <el-table-column :label="t('reminderMethod')" min-width="180" align="center" :show-overflow-tooltip="true">
             <template #default="{ row }">
@@ -101,6 +109,7 @@
             </template>
           </el-table-column>
 
+
           <el-table-column :label="t('operation')" fixed="right" min-width="120">
             <template #default="{ row }">
               <el-button type="primary" link @click="editEvent(row)">{{ t('edit') }}</el-button>
@@ -110,9 +119,10 @@
 
         </el-table>
         <div class="mt-[16px] flex justify-end">
-                    <el-pagination v-model:current-page="followUpRemindersTable.page" v-model:page-size="followUpRemindersTable.limit"
+          <el-pagination v-model:current-page="followUpRemindersTable.page"
+                         v-model:page-size="followUpRemindersTable.limit"
                          layout="total, sizes, prev, pager, next, jumper" :total="followUpRemindersTable.total"
-                        @size-change="loadFollowUpRemindersList()" @current-change="loadFollowUpRemindersList" />
+                         @size-change="loadFollowUpRemindersList()" @current-change="loadFollowUpRemindersList"/>
         </div>
       </div>
 
@@ -122,14 +132,19 @@
 </template>
 
 <script lang="ts" setup>
-import { reactive, ref, watch } from 'vue'
-import { t } from '@/lang'
-import { useDictionary } from '@/app/api/dict'
-import { getFollowUpRemindersList, deleteFollowUpReminders, getWithFollowUpLogsList } from '@/addon/zhjw/api/follow_up_reminders'
-import { img } from '@/utils/common'
-import { ElMessageBox,FormInstance } from 'element-plus'
-import { useRouter } from 'vue-router'
-import { useRoute } from 'vue-router'
+import {reactive, ref, watch} from 'vue'
+import {t} from '@/lang'
+import {useDictionary} from '@/app/api/dict'
+import {
+  getFollowUpRemindersList,
+  deleteFollowUpReminders,
+  getWithFollowUpLogsList
+} from '@/addon/zhjw/api/follow_up_reminders'
+import {img} from '@/utils/common'
+import {ElMessageBox, FormInstance} from 'element-plus'
+import {useRouter} from 'vue-router'
+import {useRoute} from 'vue-router'
+
 const route = useRoute()
 const pageName = route.meta.title;
 
@@ -139,12 +154,12 @@ let followUpRemindersTable = reactive({
   total: 0,
   loading: true,
   data: [],
-    searchParam:{
-      "follow_up_logs_id":"",
-      "reminder_time":[],
-      "reminder_method":"",
-      "task_status":"",
-      "create_time":[]
+  searchParam: {
+    "follow_up_logs_id": "",
+    "reminder_time": [],
+    "reminder_method": "",
+    "task_status": "",
+    "create_time": []
   }
 })
 
@@ -154,16 +169,17 @@ const searchFormRef = ref<FormInstance>()
 const selectData = ref<any[]>([])
 
 // 字典数据
-    const reminder_methodList = ref([] as any[])
-    const reminder_methodDictList = async () => {
+const reminder_methodList = ref([] as any[])
+const reminder_methodDictList = async () => {
   reminder_methodList.value = await (await useDictionary('reminder_method')).data.dictionary
-    }
-    reminder_methodDictList();
-    const task_statusList = ref([] as any[])
-    const task_statusDictList = async () => {
+}
+reminder_methodDictList();
+const task_statusList = ref([] as any[])
+const task_statusDictList = async () => {
   task_statusList.value = await (await useDictionary('task_status')).data.dictionary
-    }
-    task_statusDictList();
+}
+task_statusDictList();
+
 
 /**
  * 获取跟进提醒管理列表
@@ -200,7 +216,7 @@ const addEvent = () => {
  * @param data
  */
 const editEvent = (data: any) => {
-    router.push('/follow_up_reminders/follow_up_reminders_edit?id='+data.id)
+  router.push('/follow_up_reminders/follow_up_reminders_edit?id=' + data.id)
 }
 
 /**
@@ -222,11 +238,11 @@ const deleteEvent = (id: number) => {
 }
 
 
-    const followUpLogsIdList = ref([])
-    const setFollowUpLogsIdList = async () => {
+const followUpLogsIdList = ref([])
+const setFollowUpLogsIdList = async () => {
   followUpLogsIdList.value = await (await getWithFollowUpLogsList({})).data
-    }
-    setFollowUpLogsIdList()
+}
+setFollowUpLogsIdList()
 
 const resetForm = (formEl: FormInstance | undefined) => {
   if (!formEl) return
@@ -244,5 +260,5 @@ const resetForm = (formEl: FormInstance | undefined) => {
   display: -webkit-box;
   -webkit-line-clamp: 2;
   -webkit-box-orient: vertical;
-	}
+}
 </style>

admin/src/addon/zhjw/views/follow_up_reminders/follow_up_reminders_edit.vue

@@ -3,7 +3,7 @@
     <div class="detail-head">
       <div class="left" @click="back()">
         <span class="iconfont iconxiangzuojiantou !text-xs"></span>
-                <span class="ml-[1px]">{{t('returnToPreviousPage')}}</span>
+        <span class="ml-[1px]">{{ t('returnToPreviousPage') }}</span>
       </div>
       <span class="adorn">|</span>
       <span class="right">{{ pageName }}</span>
@@ -11,7 +11,8 @@
     <el-card class="box-card !border-none" shadow="never">
       <el-form :model="formData" label-width="90px" ref="formRef" :rules="formRules" class="page-form">
         <el-form-item :label="t('followUpLogsId')" prop="follow_up_logs_id">
-                    <el-select class="input-width" v-model="formData.follow_up_logs_id" clearable :placeholder="t('followUpLogsIdPlaceholder')">
+          <el-select class="input-width" v-model="formData.follow_up_logs_id" clearable
+                     :placeholder="t('followUpLogsIdPlaceholder')">
             <el-option label="请选择" value=""></el-option>
             <el-option
                 v-for="(item, index) in followUpLogsIdList"
@@ -33,7 +34,8 @@
           </el-date-picker>
         </el-form-item>
         <el-form-item :label="t('reminderMethod')" prop="reminder_method">
-                    <el-select class="input-width"  v-model="formData.reminder_method" clearable :placeholder="t('reminderMethodPlaceholder')">
+          <el-select class="input-width" v-model="formData.reminder_method" clearable
+                     :placeholder="t('reminderMethodPlaceholder')">
             <el-option label="请选择" value=""></el-option>
             <el-option
                 v-for="(item, index) in reminder_methodList"
@@ -45,7 +47,8 @@
         </el-form-item>
 
         <el-form-item :label="t('taskStatus')" prop="task_status">
-                    <el-select class="input-width"  v-model="formData.task_status" clearable :placeholder="t('taskStatusPlaceholder')">
+          <el-select class="input-width" v-model="formData.task_status" clearable
+                     :placeholder="t('taskStatusPlaceholder')">
             <el-option label="请选择" value=""></el-option>
             <el-option
                 v-for="(item, index) in task_statusList"
@@ -56,9 +59,11 @@
           </el-select>
         </el-form-item>
 
-                <el-form-item :label="t('errMsg')" >
-                    <el-input v-model="formData.err_msg" type="textarea" rows="4" clearable :placeholder="t('errMsgPlaceholder')" class="input-width"/>
+        <el-form-item :label="t('errMsg')">
+          <el-input v-model="formData.err_msg" type="textarea" rows="4" clearable :placeholder="t('errMsgPlaceholder')"
+                    class="input-width"/>
         </el-form-item>
+
       </el-form>
     </el-card>
     <div class="fixed-footer-wrap">
@@ -71,20 +76,24 @@
 </template>
 
 <script lang="ts" setup>
-import { ref, reactive, computed, watch } from 'vue'
-import { t } from '@/lang'
-import { useDictionary } from '@/app/api/dict'
-import type { FormInstance } from 'element-plus'
-import { getFollowUpRemindersInfo,addFollowUpReminders,editFollowUpReminders, getWithFollowUpLogsList } from '@/addon/zhjw/api/follow_up_reminders';
-import { useRoute } from 'vue-router'
+import {ref, reactive, computed, watch} from 'vue'
+import {t} from '@/lang'
+import {useDictionary} from '@/app/api/dict'
+import type {FormInstance} from 'element-plus'
+import {
+  getFollowUpRemindersInfo,
+  addFollowUpReminders,
+  editFollowUpReminders,
+  getWithFollowUpLogsList
+} from '@/addon/zhjw/api/follow_up_reminders';
+import {useRoute} from 'vue-router'
 
 const route = useRoute()
-const id:number = parseInt(route.query.id);
+const id: number = parseInt(route.query.id);
 const loading = ref(false)
 const pageName = route.meta.title
 
 
-
 /**
  * 表单数据
  */
@@ -95,70 +104,75 @@ const initialFormData = {
   reminder_method: '',
   task_status: '',
   err_msg: '',
+
 }
-const formData: Record<string, any> = reactive({ ...initialFormData })
+const formData: Record<string, any> = reactive({...initialFormData})
 
-const setFormData = async (id:number = 0) => {
+const setFormData = async (id: number = 0) => {
   Object.assign(formData, initialFormData)
   const data = await (await getFollowUpRemindersInfo(id)).data
   Object.keys(formData).forEach((key: string) => {
     if (data[key] != undefined) formData[key] = data[key]
   })
 }
-if(id) setFormData(id);
+if (id) setFormData(id);
 
 const formRef = ref<FormInstance>()
 // 选中数据
 const selectData = ref<any[]>([])
 
 // 字典数据
-    let reminder_methodList = ref([])
-    const reminder_methodDictList = async () => {
+let reminder_methodList = ref([])
+const reminder_methodDictList = async () => {
   reminder_methodList.value = await (await useDictionary('reminder_method')).data.dictionary
-    }
-    reminder_methodDictList();
-    watch(() => reminder_methodList.value, () => { formData.reminder_method = reminder_methodList.value[0].value })
-    let task_statusList = ref([])
-    const task_statusDictList = async () => {
+}
+reminder_methodDictList();
+watch(() => reminder_methodList.value, () => {
+  formData.reminder_method = reminder_methodList.value[0].value
+})
+let task_statusList = ref([])
+const task_statusDictList = async () => {
   task_statusList.value = await (await useDictionary('task_status')).data.dictionary
-    }
-    task_statusDictList();
-    watch(() => task_statusList.value, () => { formData.task_status = task_statusList.value[0].value })
+}
+task_statusDictList();
+watch(() => task_statusList.value, () => {
+  formData.task_status = task_statusList.value[0].value
+})
 
 
-    const followUpLogsIdList = ref([] as any[])
-    const setFollowUpLogsIdList = async () => {
+const followUpLogsIdList = ref([] as any[])
+const setFollowUpLogsIdList = async () => {
   followUpLogsIdList.value = await (await getWithFollowUpLogsList({})).data
-    }
-    setFollowUpLogsIdList()
+}
+setFollowUpLogsIdList()
 // 表单验证规则
 const formRules = computed(() => {
   return {
     follow_up_logs_id: [
-        { required: true, message: t('followUpLogsIdPlaceholder'), trigger: 'blur' },
+      {required: true, message: t('followUpLogsIdPlaceholder'), trigger: 'blur'},
 
     ]
-,
+    ,
     reminder_time: [
-        { required: true, message: t('reminderTimePlaceholder'), trigger: 'blur' },
+      {required: true, message: t('reminderTimePlaceholder'), trigger: 'blur'},
 
     ]
-,
+    ,
     reminder_method: [
-        { required: true, message: t('reminderMethodPlaceholder'), trigger: 'blur' },
+      {required: true, message: t('reminderMethodPlaceholder'), trigger: 'blur'},
 
     ]
-,
+    ,
     task_status: [
-        { required: true, message: t('taskStatusPlaceholder'), trigger: 'blur' },
+      {required: true, message: t('taskStatusPlaceholder'), trigger: 'blur'},
 
     ]
-,
+    ,
     err_msg: [
-        { required: true, message: t('errMsgPlaceholder'), trigger: 'blur' },
+      {required: true, message: t('errMsgPlaceholder'), trigger: 'blur'},
 
     ]
-,
+    ,
   }
 })