diff --git a/api/apiRoute.js b/api/apiRoute.js
index 1cdf8bd..081d694 100644
--- a/api/apiRoute.js
+++ b/api/apiRoute.js
@@ -413,6 +413,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;
+ })
+ },
+
diff --git a/pages.json b/pages.json
index 1bc726a..7bec910 100644
--- a/pages.json
+++ b/pages.json
@@ -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/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..f91da5e 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:{},//六要素信息
},//共享资源详情
@@ -374,6 +376,14 @@
})
},
+ //跳转页面-订单列表
+ openViewOrder() {
+ let resource_id = this.clientInfo.resource_id//客户资源id
+ this.$navigateTo({
+ url: `/pages/market/clue/order_list?resource_id=${resource_id}`
+ })
+ },
+
//跳转页面-转接跟进任务
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..0ef299a
--- /dev/null
+++ b/pages/market/clue/order_list.vue
@@ -0,0 +1,293 @@
+
+
+
+
+
+
+
+
+ 订单状态
+
+
+
+
+ 客户姓名：
+ {{ v.resource_id_name }}
+
+
+
+ 付款类型：
+
+ {{ v.payment_type === 'cash' ? '现金支付' : v.payment_type === 'scan_code' ? '扫码支付' : '订阅支付' }}
+
+
+
+
+ 订单金额：
+ ￥{{ v.order_amount }}
+
+
+
+ 课程：
+ {{ v.course_id_name }}
+
+
+
+ 班级：
+ {{ v.class_id_name }}
+
+
+
+ 人员：
+ {{ v.staff_id_name }}
+
+
+
+ 支付时间：
+ {{ v.payment_time }}
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file