李双庆 10 months ago
parent
commit
58419a2546
  1. 24
      api/apiRoute.js
  2. 9
      pages.json
  3. 68
      pages/common/my_attendance.vue
  4. 10
      pages/market/clue/clue_info.vue
  5. 165
      pages/market/clue/index.vue
  6. 293
      pages/market/clue/order_list.vue

24
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;
})
},

9
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",

68
pages/common/my_attendance.vue

@ -73,39 +73,33 @@
v-for="(v,k) in tableList"
:key="k"
>
<view class="left">
<view class="left" @click="openInfo(v)">
<view class="content">普通考勤</view>
<view class="content">
{{v.status_name}}
</view>
<view class="content">
校区{{v.campus_id_name}}
校区{{v.campus_id_name || ''}}
</view>
<view class="content">
备注{{v.remarks || ''}}
</view>
<view class="content">
<text>{{v.attendance_date}} {{v.check_in_time}}</text>
<text v-if="v.check_out_time" style="padding: 0 20rpx">-</text>
<text v-if="v.check_out_time">{{v.attendance_date}} {{v.check_out_time}}</text>
<view class="item" v-if="v.status != 'leave'">
<!--考勤-->
<text>开始时间{{ v.attendance_date }} {{ v.check_in_time || '' }}</text>
<text v-if="v.check_out_time">结束时间{{ v.attendance_date }} {{ v.check_out_time || '' }}</text>
</view>
<!--请假-->
<view class="item" v-else>
<text>开始时间{{ v.attendance_date }} {{v.leave_start_time || ''}}</text>
<text>结束时间{{ v.attendance_date }} {{v.leave_end_time || ''}}</text>
</view>
</view>
</view>
<view class="right">
<view class="content">普通考勤</view>
<view class="content">
{{v.status_name}}
</view>
<view class="content">
校区{{v.campus_id_name}}
</view>
<view class="content">
备注{{v.remarks || ''}}
</view>
<view class="content">
<text>{{v.attendance_date}} {{v.check_in_time}}</text>
<text v-if="v.check_out_time" style="padding: 0 20rpx">-</text>
<text v-if="v.check_out_time">{{v.attendance_date}} {{v.check_out_time}}</text>
</view>
<view v-if="v.status == 'present' && !v.check_out_time" class="btn" style="background-color: #00b0f0;" @click="openSignInShow('sign_out',v)">签退</view>
</view>
</view>
</view>
@ -125,39 +119,33 @@
v-for="(v,k) in tableList"
:key="k"
>
<view class="left">
<view class="left" @click="openInfo(v)">
<view class="content">普通考勤</view>
<view class="content">
{{v.status_name}}
</view>
<view class="content">
校区{{v.campus_id_name}}
校区{{v.campus_id_name || ''}}
</view>
<view class="content">
备注{{v.remarks || ''}}
</view>
<view class="content">
<text>{{v.attendance_date}} {{v.check_in_time}}</text>
<text v-if="v.check_out_time" style="padding: 0 20rpx">-</text>
<text v-if="v.check_out_time">{{v.attendance_date}} {{v.check_out_time}}</text>
<view class="item" v-if="v.status != 'leave'">
<!--考勤-->
<text>开始时间{{ v.attendance_date }} {{ v.check_in_time || '' }}</text>
<text v-if="v.check_out_time">结束时间{{ v.attendance_date }} {{ v.check_out_time || '' }}</text>
</view>
<!--请假-->
<view class="item" v-else>
<text>开始时间{{ v.attendance_date }} {{v.leave_start_time || ''}}</text>
<text>结束时间{{ v.attendance_date }} {{v.leave_end_time || ''}}</text>
</view>
</view>
</view>
<view class="right">
<view class="content">普通考勤</view>
<view class="content">
{{v.status_name}}
</view>
<view class="content">
校区{{v.campus_id_name}}
</view>
<view class="content">
备注{{v.remarks || ''}}
</view>
<view class="content">
<text>{{v.attendance_date}} {{v.check_in_time}}</text>
<text v-if="v.check_out_time" style="padding: 0 20rpx">-</text>
<text v-if="v.check_out_time">{{v.attendance_date}} {{v.check_out_time}}</text>
</view>
<view v-if="v.status == 'present' && !v.check_out_time" class="btn" style="background-color: #00b0f0;" @click="openSignInShow('sign_out',v)">签退</view>
</view>
</view>
</view>

10
pages/market/clue/clue_info.vue

@ -261,6 +261,7 @@
<view @click="openViewEditClues()">编辑详情</view>
<view @click="callTel(clientInfo.student_phone)">拨打电话</view>
<view @click="openViewEditCluesLog()">修改记录</view>
<view @click="openViewOrder()">订单列表</view>
</view>
</view>
</view>
@ -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({

165
pages/market/clue/index.vue

@ -11,12 +11,12 @@
@scrolltolower="loadMoreData_1"
style="height: 100vh;"
>
<view class="search_section">
<view class="search_section" >
<view class="item">
<view class="input_box">
<fui-input :clearable="true" label="时间筛选" borderTop placeholder="开始时间-结束时间" @click="openDatePicker" v-model="filteredData_1.shared_at_str"></fui-input>
<view class="input_box" @click="openShowDrawer()">
<view class="input_box_text">用户名/手机号/时间范围</view>
</view>
<view class="button" @click="searchData()">搜索</view>
<view class="button" @click="openShowDrawer()">搜索</view>
</view>
</view>
<view class="card" v-for="(v,k) in tableList_1" :key="k">
@ -79,10 +79,10 @@
>
<view class="search_section">
<view class="item">
<view class="input_box">
<fui-input :clearable="true" label="时间筛选" borderTop placeholder="开始时间-结束时间" @click="openDatePicker" v-model="filteredData_2.shared_at_str"></fui-input>
<view class="input_box" @click="openShowDrawer()">
<view class="input_box_text">用户名/手机号/时间范围</view>
</view>
<view class="button" @click="searchData()">搜索</view>
<view class="button" @click="openShowDrawer()">搜索</view>
</view>
</view>
<view class="card" v-for="(v,k) in tableList_2" :key="k">
@ -132,10 +132,54 @@
</view>
</scroll-view>
<!--下拉选择器-->
<fui-select :show="select_show" :options="select_options" title="请选择员工" @confirm="getSales" @close="closeAssign"></fui-select>
<!-- 时间范围选择器-->
<fui-date-picker range :show="date_picker_show" type="3" @change="changeDatePicker" @cancel="cancelDatePicker"></fui-date-picker>
<!-- 我的客户搜索条件栏目-->
<fui-drawer :show="showDrawer" direction="left" :maskClosable="true">
<view class="fui-scroll__view">
<view class="fui-title">筛选</view>
<scroll-view scroll-y style="height: 720rpx;">
<view class="drawer_box">
<fui-list-cell>
<view class="item">
<view class="title">时间筛选</view>
<view class="input_box">
<fui-input :clearable="true" borderTop placeholder="开始时间-结束时间" @click="openDatePicker" v-model="showDrawerForm.shared_at_str"></fui-input>
</view>
</view>
</fui-list-cell>
<fui-list-cell>
<view class="item">
<view class="title">姓名筛选</view>
<view class="input_box">
<fui-input :clearable="true" borderTop placeholder="姓名筛选" v-model="showDrawerForm.name"></fui-input>
</view>
</view>
</fui-list-cell>
<fui-list-cell>
<view class="item">
<view class="title">电话筛选</view>
<view class="input_box">
<fui-input :clearable="true" borderTop placeholder="电话筛选" v-model="showDrawerForm.phone_number"></fui-input>
</view>
</view>
</fui-list-cell>
</view>
</scroll-view>
<view class="fui-btn__box">
<fui-button type="success" width="400rpx" height="84rpx" text="搜索" bold @click="searchData()">
</fui-button>
<fui-button type="warning" width="400rpx" height="84rpx" text="关闭" bold @click="closeShowDrawer()">
</fui-button>
</view>
</view>
</fui-drawer>
<view style="height: 170rpx;"></view>
<AQTabber/>
@ -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;
}
}
</style>

293
pages/market/clue/order_list.vue

@ -0,0 +1,293 @@
<!--订单列表-列表-->
<template>
<view class="main_box">
<view class="main_section">
<scroll-view
class="section_1"
scroll-y="true"
:lower-threshold="lowerThreshold"
@scrolltolower="loadMoreData"
style="height: 90vh;"
>
<view
class="item"
v-for="(v,k) in tableList"
:key="k"
>
<view class="top">
<view class="title">订单状态</view>
<!-- <view class="btn" @click="downloadFile($util.img(v.file_data))">下载合同 <fui-icon name="arrowright" color="#A4ADB3" size="35"></fui-icon></view>-->
</view>
<view class="bottom">
<view class="box">
<view class="title">客户姓名</view>
<view class="content">{{ v.resource_id_name }}</view>
</view>
<view class="box">
<view class="title">付款类型</view>
<view class="content">
{{ v.payment_type === 'cash' ? '现金支付' : v.payment_type === 'scan_code' ? '扫码支付' : '订阅支付' }}
</view>
</view>
<view class="box">
<view class="title">订单金额</view>
<view class="content">{{ v.order_amount }}</view>
</view>
<view class="box">
<view class="title">课程</view>
<view class="content">{{ v.course_id_name }}</view>
</view>
<view class="box">
<view class="title">班级</view>
<view class="content">{{ v.class_id_name }}</view>
</view>
<view class="box">
<view class="title">人员</view>
<view class="content">{{ v.staff_id_name }}</view>
</view>
<view class="box">
<view class="title">支付时间</view>
<view class="content">{{ v.payment_time }}</view>
</view>
</view>
</view>
</scroll-view>
</view>
</view>
</template>
<script>
import apiRoute from '@/api/apiRoute.js';
import marketApi from '@/api/market.js';
export default {
components: {
},
data() {
return {
loading:false,//
lowerThreshold: 100,//
isReachedBottom: false,//|true=|false=
//
filteredData:{
page:1,//
limit:10,//
total:10,//
resource_id:'',//id
},
tableList:[],//
}
},
onLoad(options) {
this.filteredData.resource_id = options.resource_id//id
},
onShow(){
this.init()
},
//
async onPullDownRefresh() {
//
await this.resetFilteredData()
await this.getList()
},
methods: {
//
async init(){
await this.getList();
},
//()
loadMoreData() {
//
if (!this.isReachedBottom) {
this.isReachedBottom = true;//
this.getList();
}
},
//
async resetFilteredData() {
this.isReachedBottom = false; // 便
this.filteredData.page = 1//
this.filteredData.limit = 10//
this.filteredData.total = 10//
},
//
async getList(){
this.loading = true
let params = {...this.filteredData}
//
if ((this.filteredData.page - 1) * this.filteredData.limit >= this.filteredData.total) {
this.loading = false
uni.showToast({
title: '暂无更多',
icon: 'none'
})
return
}
if(params.page == 1){
this.tableList = []
}
let res = await apiRoute.xs_orderTableList(params)//
this.loading = false
this.isReachedBottom = false;
if (res.code != 1){
uni.showToast({
title: res.msg,
icon: 'none'
})
return
}
this.tableList = this.tableList.concat(res.data.data); // 使 concat
// this.tableList.unshift(...res.data.data); //
console.log('列表',this.tableList)
this.filteredData.total = res.data.total
this.filteredData.page++
},
//
openViewArticleInfo(item) {
let id = item.id
let redirect = item.redirect//
uni.navigateTo({
url: `/pages/common/article_info?id=${id}`
})
},
//
async downloadFile(fileUrl) {
if (!fileUrl) {
this.$util.showToast({
title: '暂无电子发票'
});
return false;
}
uni.downloadFile({
url: fileUrl,
success: function (res) {
console.log('下载成功');
// uni.openDocument({
// filePath: res.tempFilePath,
// fileType: 'pdf',
// success: function (res) {
// console.log('');
// }
// });
}
});
}
}
}
</script>
<style lang="less" scoped>
.main_box {
background: #292929;
}
//
.navbar_section {
display: flex;
justify-content: center;
align-items: center;
background: #29d3b4;
.title {
padding: 20rpx 0;
font-size: 30rpx;
color: #315d55;
}
}
.main_section {
min-height: 100vh;
background: #292929 100%;
padding: 0 0rpx;
padding-top: 32rpx;
padding-bottom: 150rpx;
font-size: 28rpx;
display: flex;
flex-direction: column;
gap: 20rpx;
.section {
background-color: #434544;
padding: 40rpx 40rpx;
}
.section_1{
padding: 0 24rpx;
display: flex;
flex-direction: column;
.item{
margin-bottom: 38rpx;
display: flex;
flex-direction: column;
padding: 32rpx 24rpx;
border-radius: 14rpx;
background-color: #434544;
color: #fff;
.top{
font-size: 28rpx;
display: flex;
justify-content: space-between;
.title{
font-size: 30rpx;
}
.btn{
display: flex;
align-items: center;
color: #29D3B4;
}
}
.bottom{
font-size: 26rpx;
margin-top: 25rpx;
display: flex;
flex-direction: column;
gap: 15rpx;
.box{
display: flex;
justify-content: space-between;
.title{
width: 180rpx;
}
.content{
width: 100%;
}
}
}
}
}
}
.describe {
color: #999999;
padding-left: 30rpx;
}
</style>
Loading…
Cancel
Save