diff --git a/api/apiRoute.js b/api/apiRoute.js index 31077ea..1b83819 100644 --- a/api/apiRoute.js +++ b/api/apiRoute.js @@ -53,6 +53,13 @@ export default { async common_getPersonnelCampus(data = {}) { return await http.get('/campus/getPersonnelCampus', data); }, + + //获取全部校区 + async common_getCampusesList(data = {}) { + return await http.get('/campus/get_campuses_list', data); + }, + + //公共端-忘记密码-通过短信验证码进行密码重置(学生/员工通用) async common_forgetPassword(data = {}) { return await http.post('/common/forgetPassword', data); diff --git a/pages/market/clue/add_clues.vue b/pages/market/clue/add_clues.vue index 0b69d93..0735c70 100644 --- a/pages/market/clue/add_clues.vue +++ b/pages/market/clue/add_clues.vue @@ -69,6 +69,27 @@ > + + + + + + {{ (formData.campus) ? picker_config.campus.text : '点击选择' }} + + + + + + { + arr.push({ + text: v.campus_name, + value: v.id, + }) + }) + + this.picker_config['campus'].options = arr + + }, //获取用户信息 async getUserInfo(){ let res = await apiRoute.getPersonnelInfo({}) @@ -742,6 +790,8 @@ export default { this.formData.consultant = res.data.id//顾问id this.formData.staff_id = res.data.id//人员ID this.picker_config['consultant'].text = res.data.name//顾问名字 + + await this.get_campus_list()//获取校区 }, //获取字典-课程id选择 diff --git a/pages/market/clue/clue_info.vue b/pages/market/clue/clue_info.vue index a356f69..55594a4 100644 --- a/pages/market/clue/clue_info.vue +++ b/pages/market/clue/clue_info.vue @@ -90,7 +90,7 @@ 附加信息 - + 已成交次数 {{clientInfo.customerResource.cj_count || 0}}次 diff --git a/pages/market/clue/edit_clues.vue b/pages/market/clue/edit_clues.vue index 0d2805b..e4c0a9e 100644 --- a/pages/market/clue/edit_clues.vue +++ b/pages/market/clue/edit_clues.vue @@ -230,6 +230,36 @@ v-model="formData.second_visit_status"> + + + + + + + + + + + + 有效 + + + + + + 无效 + + + + + + @@ -429,6 +459,7 @@ optional_class_time: '', //可选上课时间 first_visit_status: '', //一访情况 second_visit_status: '', //二访情况 + efficacious:'' }, //下拉选择器相关 @@ -600,6 +631,7 @@ optional_class_time: sixSpeed.preferred_class_time || '', //可选上课时间 first_visit_status: sixSpeed.first_visit_status || '', //一访情况 second_visit_status: sixSpeed.second_visit_status || '', //二访情况 + efficacious : sixSpeed.efficacious } this.formData.promised_visit_time = this.$util.formatToDateTime(sixSpeed.promised_visit_time, @@ -955,7 +987,10 @@ this.switchChange_type = 2 } }, - + + changeEfficacious(e) { + this.formData.efficacious = e.detail.value + }, //性别选择器 changeSex(e) { this.formData.gender = e.detail.value diff --git a/pages/market/clue/index.vue b/pages/market/clue/index.vue index 44baab4..23a92b4 100644 --- a/pages/market/clue/index.vue +++ b/pages/market/clue/index.vue @@ -9,7 +9,7 @@ - 用户名/手机号/时间范围 + 校区/用户名/手机号/时间范围 搜索 @@ -22,12 +22,17 @@ {{ v.customerResource.name }} - + {{ v.customerResource.phone_number }} 首联系人:{{ v.customerResource.name }} {{ v.customerResource.decision_maker }} + + + 来源渠道:{{ v.customerResource.source_channel }} + {{ $util.formatToDateTime((v.customerResource.updated_at || ''), 'm-d H:i') }} @@ -71,7 +76,7 @@ - 用户名/手机号/时间范围 + 校区/用户名/手机号/时间范围 搜索 @@ -135,6 +140,18 @@ 筛选 + + + + 校区筛选 + + + + + + + 时间筛选 @@ -225,6 +242,7 @@ shared_at_str: '', //共享时间|开始时间(Y-m-d)-结束时间(Y-m-d) phone_number: '', //客户资源表-手机号 name: '', //客户资源表-用户姓名 + campus_name:'', }, //数据列表 tableList_1: [], //表格数据 @@ -239,6 +257,7 @@ shared_at_str: '', //共享时间|[开始时间(Y-m-d),结束时间(Y-m-d)] phone_number: '', //客户资源表-手机号 name: '', //客户资源表-用户姓名 + campus_name:'', }, //数据列表 tableList_2: [], //表格数据 @@ -259,6 +278,7 @@ //抽屉搜索条件展示窗相关 showDrawer: false, //是否展示|false=否 showDrawerForm: { + campus_name:'', shared_at_str: '', //共享时间|[开始时间(Y-m-d),结束时间(Y-m-d)] phone_number: '', //客户资源表-手机号 name: '', //客户资源表-用户姓名 @@ -493,11 +513,12 @@ this.showDrawerForm.shared_at_str = '' //共享时间|[开始时间(Y-m-d),结束时间(Y-m-d)] this.showDrawerForm.phone_number = '' //客户资源表-手机号 this.showDrawerForm.name = '' //客户资源表-用户姓名 - + this.campus_name = '' if (this.segmented_type == 1) { this.filteredData_1.shared_at_str = '' //共享时间|[开始时间(Y-m-d),结束时间(Y-m-d)] this.filteredData_1.phone_number = '' //客户资源表-手机号 this.filteredData_1.name = '' //客户资源表-用户姓名 + this.filteredData_1.campus_name = '' //我的客户 //重置为第一页 @@ -507,6 +528,7 @@ this.filteredData_2.shared_at_str = '' //共享时间|[开始时间(Y-m-d),结束时间(Y-m-d)] this.filteredData_2.phone_number = '' //客户资源表-手机号 this.filteredData_2.name = '' //客户资源表-用户姓名 + this.filteredData_2.campus_name = '' //资源分配 //重置为第一页 await this.resetFilteredData_2()