diff --git a/api/apiRoute.js b/api/apiRoute.js index d961702..7841748 100644 --- a/api/apiRoute.js +++ b/api/apiRoute.js @@ -66,6 +66,20 @@ export default { return res; }) }, + //公共端-获取全部课程列表 + common_getCourseAll(data = {}) { + let url = '/common/getCourseAll' + return http.get(url, data).then(res => { + return res; + }) + }, + //公共端-获取全部班级列表 + common_getClassAll(data = {}) { + let url = '/common/getClassAll' + return http.get(url, data).then(res => { + return res; + }) + }, //公共端-教师/销售端验证旧密码是否正确 common_personnelCheckOldPwd(data = {}) { let url = '/personnel/checkOldPwd' @@ -143,6 +157,45 @@ export default { //↓↓↓↓↓↓↓↓↓↓↓↓-----教练接口相关-----↓↓↓↓↓↓↓↓↓↓↓↓ + + + + + //获取我的页面统计个数 + getStatisticsInfo(data = {}) { + let url = '/class/Statistics/info' + return http.get(url, data).then(res => { + return res; + }) + }, + //添加作业 + jlPublishJob(data = {}) { + let url = '/class/jlPublishJob/add' + return http.get(url, data).then(res => { + return res; + }) + }, + //添加作业-学员列表 + jlGetStudentList(data = {}) { + let url = '/class/jlGetStudentList/list' + return http.get(url, data).then(res => { + return res; + }) + }, + //添加作业-获取课程列表 + jlGetCoursesList(data = {}) { + let url = '/class/jlGetCoursesList/list' + return http.get(url, data).then(res => { + return res; + }) + }, + //添加作业-获取班级列表 + jlGetClassesList(data = {}) { + let url = '/class/jlGetClasses/list' + return http.get(url, data).then(res => { + return res; + }) + }, //体测报告-详情 physicalTestInfo(data = {}) { let url = '/class/physicalTest/info' @@ -380,6 +433,30 @@ export default { }) }, + //员工端(销售)-订单管理-列表 + xs_orderTableList(data = {}) { + let url = '/orderTable' + return http.get(url, data).then(res => { + return res; + }) + }, + + //员工端(销售)-订单管理-详情 + xs_orderTableInfo(data = {}) { + let url = '/orderTable/info' + return http.get(url, data).then(res => { + return res; + }) + }, + + //员工端(销售)-订单管理-添加 + xs_orderTableAdd(data = {}) { + let url = '/orderTable/add' + return http.post(url, data).then(res => { + return res; + }) + }, + @@ -580,6 +657,28 @@ export default { }) }, + //学生端-订单管理-列表 + xy_orderTableList(data = {}) { + let url = '/xy/orderTable' + return http.get(url, data).then(res => { + return res; + }) + }, + //学生端-订单管理-详情 + xy_orderTableInfo(data = {}) { + let url = '/xy/orderTable/info' + return http.get(url, data).then(res => { + return res; + }) + }, + + //学生端-订单管理-添加 + xy_orderTableAdd(data = {}) { + let url = '/xy/orderTable/add' + return http.post(url, data).then(res => { + return res; + }) + }, diff --git a/pages.json b/pages.json index 1bc726a..b8379c2 100644 --- a/pages.json +++ b/pages.json @@ -207,7 +207,7 @@ { "path" : "pages/common/contract_list", "style": { - "navigationBarTitleText": "合同列表", + "navigationBarTitleText": "订单列表", "navigationStyle": "default", "navigationBarBackgroundColor": "#292929", "navigationBarTextStyle": "white" @@ -483,6 +483,15 @@ "navigationBarBackgroundColor": "#29d3b4", "navigationBarTextStyle": "black" } + }, + { + "path": "pages/market/clue/order_list", + "style": { + "navigationBarTitleText": "订单列表", + "navigationStyle": "default", + "navigationBarBackgroundColor": "#29d3b4", + "navigationBarTextStyle": "black" + } }, { "path": "pages/market/clue/index", diff --git a/pages/coach/home/index.vue b/pages/coach/home/index.vue index df7226e..f81d44d 100644 --- a/pages/coach/home/index.vue +++ b/pages/coach/home/index.vue @@ -4,7 +4,7 @@ 待办 - 发布作业 + 发布作业 diff --git a/pages/coach/job/add.vue b/pages/coach/job/add.vue index af4e45f..6fa5823 100644 --- a/pages/coach/job/add.vue +++ b/pages/coach/job/add.vue @@ -84,7 +84,7 @@ - + 提交 @@ -101,7 +101,7 @@ @@ -104,4 +220,10 @@ color: #999999; padding-left: 30rpx; } + + .btn_box{ + display: flex; + flex-direction: column; + gap: 40rpx; + } \ No newline at end of file diff --git a/pages/coach/student/info.vue b/pages/coach/student/info.vue index 9540b1d..42ffaee 100644 --- a/pages/coach/student/info.vue +++ b/pages/coach/student/info.vue @@ -10,7 +10,7 @@ - + @@ -276,8 +276,10 @@ export default { }) return } + + console.log(res,111) - this.surveyList = this.surveyList.concat(res.data.data); // 使用 concat 方法 将新数据追加到数组中 + this.surveyList = this.surveyList.concat(res.data.physical_test.data); // 使用 concat 方法 将新数据追加到数组中 console.log('列表',this.surveyList) this.filteredData.total = res.data.total diff --git a/pages/coach/student/physical_examination.vue b/pages/coach/student/physical_examination.vue index 0e0d007..84a847e 100644 --- a/pages/coach/student/physical_examination.vue +++ b/pages/coach/student/physical_examination.vue @@ -1,85 +1,185 @@ + \ No newline at end of file diff --git a/pages/common/contract_list.vue b/pages/common/contract_list.vue index b20a320..6f8c762 100644 --- a/pages/common/contract_list.vue +++ b/pages/common/contract_list.vue @@ -1,4 +1,4 @@ - + \ No newline at end of file diff --git a/pages/common/my_attendance.vue b/pages/common/my_attendance.vue index cf71e4b..7bf632c 100644 --- a/pages/common/my_attendance.vue +++ b/pages/common/my_attendance.vue @@ -73,39 +73,33 @@ v-for="(v,k) in tableList" :key="k" > - + 普通考勤 {{v.status_name}} - 校区：{{v.campus_id_name}} + 校区：{{v.campus_id_name || ''}} 备注：{{v.remarks || ''}} - {{v.attendance_date}} {{v.check_in_time}} - - - {{v.attendance_date}} {{v.check_out_time}} + + + 开始时间：{{ v.attendance_date }} {{ v.check_in_time || '' }} + 结束时间：{{ v.attendance_date }} {{ v.check_out_time || '' }} + + + + + 开始时间：{{ v.attendance_date }} {{v.leave_start_time || ''}} + 结束时间：{{ v.attendance_date }} {{v.leave_end_time || ''}} + - 普通考勤 - - {{v.status_name}} - - - 校区：{{v.campus_id_name}} - - - 备注：{{v.remarks || ''}} - - - {{v.attendance_date}} {{v.check_in_time}} - - - {{v.attendance_date}} {{v.check_out_time}} - + 签退 @@ -125,39 +119,33 @@ v-for="(v,k) in tableList" :key="k" > - + 普通考勤 {{v.status_name}} - 校区：{{v.campus_id_name}} + 校区：{{v.campus_id_name || ''}} 备注：{{v.remarks || ''}} - {{v.attendance_date}} {{v.check_in_time}} - - - {{v.attendance_date}} {{v.check_out_time}} + + + 开始时间：{{ v.attendance_date }} {{ v.check_in_time || '' }} + 结束时间：{{ v.attendance_date }} {{ v.check_out_time || '' }} + + + + + 开始时间：{{ v.attendance_date }} {{v.leave_start_time || ''}} + 结束时间：{{ v.attendance_date }} {{v.leave_end_time || ''}} + - 普通考勤 - - {{v.status_name}} - - - 校区：{{v.campus_id_name}} - - - 备注：{{v.remarks || ''}} - - - {{v.attendance_date}} {{v.check_in_time}} - - - {{v.attendance_date}} {{v.check_out_time}} - + 签退 diff --git a/pages/market/clue/clue_info.vue b/pages/market/clue/clue_info.vue index 78a09b7..bec3426 100644 --- a/pages/market/clue/clue_info.vue +++ b/pages/market/clue/clue_info.vue @@ -261,6 +261,7 @@ 编辑详情 拨打电话 修改记录 + 订单列表 @@ -280,6 +281,7 @@ resource_sharing_id:'',//共享资源表id clientInfo:{ id:'',//共享资源id + resource_id:'',//客户资源id customerResource:{},//客户资源信息 sixSpeed:{},//六要素信息 },//共享资源详情 @@ -288,6 +290,9 @@ followList:[], //通话记录列表 listCallUp:[], + + //当前登录的员工信息 + userInfo:{}, } }, onLoad(options) { @@ -299,10 +304,25 @@ methods: { async init(){ await this.getInfo()//客户详情 - // this.getFollowList()//获取跟进记录 + this.getUserInfo()//获取当前登录的员工信息 // this.getListCallUp()//获取通话记录 }, + //获取当前登录的员工信息 + async getUserInfo(){ + let res = await apiRoute.getPersonnelInfo({}) + if (res.code != 1) { + uni.showToast({ + title: res.msg, + icon: 'none' + }) + return + } + + this.userInfo = res.data + // console.log('员工',this.userInfo) + }, + //获取客户详情 async getInfo(){ let data = { @@ -374,6 +394,19 @@ }) }, + //跳转页面-订单列表 + openViewOrder() { + let resource_id = this.clientInfo.resource_id//客户资源id + let resource_name = this.clientInfo.customerResource.name || ''//客户资源id姓名 + + let staff_id = this.userInfo.id//员工id + let staff_id_name = this.userInfo.name || ''//员工姓名 + + this.$navigateTo({ + url: `/pages/market/clue/order_list?resource_id=${resource_id}&resource_name=${resource_name}&staff_id=${staff_id}&staff_id_name=${staff_id_name}` + }) + }, + //跳转页面-转接跟进任务 openViewNewTask() { this.$navigateTo({ diff --git a/pages/market/clue/index.vue b/pages/market/clue/index.vue index 2163f43..6732e86 100644 --- a/pages/market/clue/index.vue +++ b/pages/market/clue/index.vue @@ -11,12 +11,12 @@ @scrolltolower="loadMoreData_1" style="height: 100vh;" > - + - - + + 用户名/手机号/时间范围 - 搜索 + 搜索 @@ -79,10 +79,10 @@ > - - + + 用户名/手机号/时间范围 - 搜索 + 搜索 @@ -132,10 +132,54 @@ + + + + + + 筛选 + + + + + 时间筛选 + + + + + + + + + 姓名筛选 + + + + + + + + + 电话筛选 + + + + + + + + + + + + + + + @@ -166,9 +210,6 @@ export default { is_gh: '2',//1=资源分配,2=我的客户 }, - - - //顶部Tab栏 values: [ { @@ -191,6 +232,8 @@ export default { total:10,//数据总条数 shared_by:'',//共享人ID|0=未分配 shared_at_str:'',//共享时间|开始时间(Y-m-d)-结束时间(Y-m-d) + phone_number:'',//客户资源表-手机号 + name:'',//客户资源表-用户姓名 }, //数据列表 tableList_1:[],//表格数据 @@ -203,6 +246,8 @@ export default { total:10,//数据总条数 shared_by:'0',//共享人ID|0=未分配 shared_at_str:'',//共享时间|[开始时间(Y-m-d),结束时间(Y-m-d)] + phone_number:'',//客户资源表-手机号 + name:'',//客户资源表-用户姓名 }, //数据列表 tableList_2:[],//表格数据 @@ -220,6 +265,15 @@ export default { //时间选择器相关 date_picker_show:false,//是否展示时间选择器 + //抽屉搜索条件展示窗相关 + showDrawer:false,//是否展示|false=否 + showDrawerForm:{ + shared_at_str:'',//共享时间|[开始时间(Y-m-d),结束时间(Y-m-d)] + phone_number:'',//客户资源表-手机号 + name:'',//客户资源表-用户姓名 + }, + + } }, onLoad(options) {}, @@ -435,12 +489,25 @@ export default { //切换tag列表 async segmented(param) { this.segmented_type = param.id//1=我的客户,2=资源分配 + + //重置筛选抽屉中的表单数据 + this.showDrawerForm.shared_at_str = ''//共享时间|[开始时间(Y-m-d),结束时间(Y-m-d)] + this.showDrawerForm.phone_number = ''//客户资源表-手机号 + this.showDrawerForm.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 = ''//客户资源表-用户姓名 + //我的客户 //重置为第一页 await this.resetFilteredData_1() await this.getList_1() }else{ + this.filteredData_2.shared_at_str = ''//共享时间|[开始时间(Y-m-d),结束时间(Y-m-d)] + this.filteredData_2.phone_number = ''//客户资源表-手机号 + this.filteredData_2.name = ''//客户资源表-用户姓名 //资源分配 //重置为第一页 await this.resetFilteredData_2() @@ -557,14 +624,7 @@ export default { changeDatePicker(e){ console.log('时间',e) let shared_at_str = `${e.startDate.result} ~ ${e.endDate.result}` - - if (this.segmented_type == 1) { - //我的客户 - this.filteredData_1.shared_at_str = shared_at_str - } else { - //资源分配 - this.filteredData_2.shared_at_str = shared_at_str - } + this.showDrawerForm.shared_at_str = shared_at_str this.cancelDatePicker() }, //打开时间选择器 @@ -579,14 +639,30 @@ export default { //检索数据 async searchData(){ if(this.segmented_type == 1){ + this.filteredData_1.shared_at_str = this.showDrawerForm.shared_at_str//共享时间|[开始时间(Y-m-d),结束时间(Y-m-d)] + this.filteredData_1.phone_number = this.showDrawerForm.phone_number//客户资源表-手机号 + this.filteredData_1.name = this.showDrawerForm.name//客户资源表-用户姓名 //我的客户 await this.resetFilteredData_1() await this.getList_1() }else{ + this.filteredData_2.shared_at_str = this.showDrawerForm.shared_at_str//共享时间|[开始时间(Y-m-d),结束时间(Y-m-d)] + this.filteredData_2.phone_number = this.showDrawerForm.phone_number//客户资源表-手机号 + this.filteredData_2.name = this.showDrawerForm.name//客户资源表-用户姓名 //资源分配 await this.resetFilteredData_2() await this.getList_2() } + this.closeShowDrawer() + }, + + //打开抽屉筛选弹窗 + openShowDrawer(){ + this.showDrawer = true + }, + //关闭抽屉筛选弹窗 + closeShowDrawer(){ + this.showDrawer = false } } } @@ -609,8 +685,13 @@ export default { justify-content: center; .input_box { width: 75%; - ::v-deep .fui-input__wrap{ - height: 100%; + .input_box_text{ + height: 60rpx; + line-height: 60rpx; + background-color: #fff; + padding-left: 20rpx; + color: #cccccc; + font-size: 28rpx; } } .button{ @@ -723,4 +804,48 @@ export default { height: 50rpx; background-color: #F59A23; } + + //抽屉搜索栏 + .fui-scroll__view { + margin-top: 60rpx; + width: 520rpx; + flex: 1; + overflow: hidden; + .fui-title { + padding: 40rpx 32rpx; + padding-bottom: 20rpx; + box-sizing: border-box; + font-weight: bold; + } + .drawer_box{ + border: 1px solid red; + .item{ + display: flex; + flex-direction: column; + gap: 15rpx; + .title{} + .input_box { + border: 1px solid #292929; + width: 450rpx; + ::v-deep .fui-input__wrap{ + padding: 10rpx !important; + height: 100%; + } + } + } + } + .fui-btn__box { + padding: 40rpx 0; + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; + gap: 30rpx; + } + } + + + + + diff --git a/pages/market/clue/order_list.vue b/pages/market/clue/order_list.vue new file mode 100644 index 0000000..8566f5f --- /dev/null +++ b/pages/market/clue/order_list.vue @@ -0,0 +1,767 @@ + + + + + + \ No newline at end of file diff --git a/pages/student/my/my.vue b/pages/student/my/my.vue index 445fb23..3bc4909 100644 --- a/pages/student/my/my.vue +++ b/pages/student/my/my.vue @@ -56,7 +56,7 @@ - + 我的订单 @@ -147,10 +147,19 @@ }) }, - //跳转页面-合同列表 - openViewContractList(item) { + //跳转页面-订单列表 + openViewOrder() { + let resource_id = this.member_info.id//客户资源id + let resource_name = this.member_info.name || ''//客户资源id姓名 + + // let staff_id = this.userInfo.id//员工id + // let staff_id_name = this.userInfo.name || ''//员工姓名 + + let staff_id = ''//员工id + let staff_id_name = ''//员工姓名 + this.$navigateTo({ - url: `/pages/common/contract_list` + url: `/pages/common/contract_list?resource_id=${resource_id}&resource_name=${resource_name}&staff_id=${staff_id}&staff_id_name=${staff_id_name}` }) },