Browse Source

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

- 移除了 follow_up_logs 和 follow_up_reminders 页面中未使用的 roleId 相关代码
- 优化了 follow_up_reminders 页面的代码格式和结构
- 修复了一些小的代码问题,如未闭合的注释等
master
liutong 1 year ago
parent
commit
b4f08798cb
  1. 34
      admin/src/addon/zhjw/views/follow_up_reminders/follow_up_reminders.vue
  2. 30
      admin/src/addon/zhjw/views/follow_up_reminders/follow_up_reminders_edit.vue

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

@ -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"
<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"
<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,7 +119,8 @@
</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"/>
</div>
@ -125,11 +135,16 @@
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 {
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;
@ -165,6 +180,7 @@ const selectData = ref<any[]>([])
}
task_statusDictList();
/**
* 获取跟进提醒管理列表
*/

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

@ -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"
@ -57,8 +60,10 @@
</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-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">
@ -75,7 +80,12 @@ 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 {
getFollowUpRemindersInfo,
addFollowUpReminders,
editFollowUpReminders,
getWithFollowUpLogsList
} from '@/addon/zhjw/api/follow_up_reminders';
import {useRoute} from 'vue-router'
const route = useRoute()
@ -84,7 +94,6 @@ const loading = ref(false)
const pageName = route.meta.title
/**
* 表单数据
*/
@ -95,6 +104,7 @@ const initialFormData = {
reminder_method: '',
task_status: '',
err_msg: '',
}
const formData: Record<string, any> = reactive({...initialFormData})
@ -117,13 +127,17 @@ const selectData = ref<any[]>([])
reminder_methodList.value = await (await useDictionary('reminder_method')).data.dictionary
}
reminder_methodDictList();
watch(() => reminder_methodList.value, () => { formData.reminder_method = reminder_methodList.value[0].value })
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 })
watch(() => task_statusList.value, () => {
formData.task_status = task_statusList.value[0].value
})
const followUpLogsIdList = ref([] as any[])

Loading…
Cancel
Save