Skip to content

C
confucius
Commit 656b2bb9 authored by 黄奎's avatar 黄奎
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/luochao/confucius

parents 4b844cc8 eb29da8c
Hide whitespace changes
Inline Side-by-side
Showing with 63 additions and 15 deletions
src/pages/sale/mystu.vue
View file @ 656b2bb9
...@@ -3,26 +3,28 @@ ...@@ -3,26 +3,28 @@
<div class="page-search row items-center"> <div class="page-search row items-center">
<div class="col row wrap q-mr-lg q-col-gutter-md"> <div class="col row wrap q-mr-lg q-col-gutter-md">
<div class="col-3"> <div class="col-3">
<q-input @input="resetSearch" clearable filled v-model="msg.StuName" label="昵称" maxlength="20" /> <q-input @input="resetSearch" dense clearable filled v-model="msg.StuName" label="昵称" maxlength="20" />
</div> </div>
<div class="col-3"> <div class="col-3">
<q-input @input="resetSearch" clearable filled v-model="msg.StuTel" label="电话" maxlength="20" /> <q-input @input="resetSearch" dense clearable filled v-model="msg.StuTel" label="电话" maxlength="20" />
</div> </div>
<div class="col-3"> <div class="col-3">
<q-select @input="resetSearch" filled v-model="msg.StuStage" :options="customState" option-label="Name" <q-input @input="resetSearch" dense clearable filled v-model="msg.QQ" label="QQ" maxlength="20" />
option-value="Id" emit-value map-options label="客户状态" clearable />
</div> </div>
<div class="col-3"> <div class="col-3">
<q-field filled> <q-input @input="resetSearch" dense clearable filled v-model="msg.WechatNo" label="微信号" maxlength="20" />
<template v-slot:control> </div>
<el-date-picker v-model="dateArray" @change="resetSearch" value-format="yyyy-MM-dd" type="daterange" <div class="col-3">
style="border:none;" range-separator="至" start-placeholder="开始时间" end-placeholder="结束时间" /> <q-select @input="resetSearch" filled v-model="msg.StuType" dense :options="customTypeList" option-label="Name"
</template> option-value="Id" emit-value map-options label="客户类型" />
</q-field> </div>
<div class="col-3">
<q-select @input="resetSearch" dense filled v-model="msg.StuStage" :options="customState" option-label="Name"
option-value="Id" emit-value map-options label="客户状态" clearable />
</div> </div>
<div class="col-3"> <div class="col-3">
<q-select @input="resetSearch" v-model="msg.CustomerId" :options="myCustomerList" filled use-input label="同行" <q-select @input="resetSearch" dense v-model="msg.CustomerId" :options="myCustomerList" filled use-input label="同行"
option-label="CustomerName" option-value="CustomerId" ref="CustomerName" class="col-6 q-pb-lg" emit-value option-label="CustomerName" option-value="CustomerId" ref="CustomerName" class="col-6" emit-value
map-options @filter="cusfilterFn"> map-options @filter="cusfilterFn">
<template v-slot:no-option> <template v-slot:no-option>
<q-item> <q-item>
...@@ -34,9 +36,17 @@ ...@@ -34,9 +36,17 @@
</q-select> </q-select>
</div> </div>
<div class="col-3"> <div class="col-3">
<q-select @input="resetSearch" filled option-value="Id" option-label="Name" <q-select @input="resetSearch" dense filled option-value="Id" option-label="Name"
v-model="msg.BelongType" :options="BelongTypeList" emit-value map-options label="归属类型" /> v-model="msg.BelongType" :options="BelongTypeList" emit-value map-options label="归属类型" />
</div> </div>
<div class="col-3">
<q-field filled dense>
<template v-slot:control>
<el-date-picker v-model="dateArray" size="mini" @change="resetSearch" value-format="yyyy-MM-dd" type="daterange"
style="border:none;" range-separator="至" start-placeholder="开始时间" end-placeholder="结束时间" />
</template>
</q-field>
</div>
</div> </div>
</div> </div>
<div class="page-content"> <div class="page-content">
...@@ -55,7 +65,8 @@ ...@@ -55,7 +65,8 @@
getSchoolDropdown, getSchoolDropdown,
deleteStudent, deleteStudent,
createStudentAccount, createStudentAccount,
queryStuStageList queryStuStageList,
GetStudentTypeList
} from "../../api/school/index"; } from "../../api/school/index";
import { import {
queryEmployee queryEmployee
...@@ -94,6 +105,9 @@ ...@@ -94,6 +105,9 @@
EndTime: "", //结束时间 EndTime: "", //结束时间
CustomerId: 0, CustomerId: 0,
BelongType: 1, //归属类型 BelongType: 1, //归属类型
QQ:'',
WechatNo:'',
StuType:''
}, },
dateArray: [], //日期数组 dateArray: [], //日期数组
pageCount: 0, pageCount: 0,
...@@ -101,6 +115,7 @@ ...@@ -101,6 +115,7 @@
customState: [], customState: [],
myCustomerList: [], //同行列表 myCustomerList: [], //同行列表
allCustomerList: [], //所有同行列表 allCustomerList: [], //所有同行列表
customTypeList: [], //客户类型
//归属类型列表 //归属类型列表
BelongTypeList: [{ BelongTypeList: [{
Id: 1, Id: 1,
...@@ -120,6 +135,7 @@ ...@@ -120,6 +135,7 @@
created() { created() {
this.getSchool(); this.getSchool();
this.getStuStageList(); this.getStuStageList();
this.getCustomTypeList();
}, },
mounted() { mounted() {
this.currentUrl = this.$route.path; this.currentUrl = this.$route.path;
...@@ -133,6 +149,14 @@ ...@@ -133,6 +149,14 @@
this.customState = res.Data; this.customState = res.Data;
}); });
}, },
//获取客户类型
getCustomTypeList(){
GetStudentTypeList().then(res => {
if (res.Code == 1) {
this.customTypeList = res.Data;
}
})
},
resetSearch() { resetSearch() {
this.msg.pageIndex = 1; this.msg.pageIndex = 1;
this.getStudent(); this.getStudent();
......
src/pages/school/student.vue
View file @ 656b2bb9
...@@ -18,6 +18,16 @@ ...@@ -18,6 +18,16 @@
<div class="col-3"> <div class="col-3">
<q-input @input="resetSearch" clearable filled v-model="msg.StuTel" label="电话" maxlength="20" /> <q-input @input="resetSearch" clearable filled v-model="msg.StuTel" label="电话" maxlength="20" />
</div> </div>
<div class="col-3">
<q-input @input="resetSearch" clearable filled v-model="msg.QQ" label="QQ" maxlength="20" />
</div>
<div class="col-3">
<q-input @input="resetSearch" clearable filled v-model="msg.WechatNo" label="微信号" maxlength="20" />
</div>
<div class="col-3">
<q-select @input="resetSearch" filled v-model="msg.StuType" :options="customTypeList" option-label="Name"
option-value="Id" emit-value map-options label="客户类型" clearable />
</div>
<div class="col-3"> <div class="col-3">
<q-select @input="resetSearch" filled v-model="msg.CreateBy" @filter="filterEmployee" use-input <q-select @input="resetSearch" filled v-model="msg.CreateBy" @filter="filterEmployee" use-input
:options="myEmployeeList" option-label="EmployeeName" option-value="Id" emit-value map-options label="负责人" :options="myEmployeeList" option-label="EmployeeName" option-value="Id" emit-value map-options label="负责人"
...@@ -54,7 +64,8 @@ ...@@ -54,7 +64,8 @@
getSchoolDropdown, getSchoolDropdown,
deleteStudent, deleteStudent,
createStudentAccount, createStudentAccount,
queryStuStageList queryStuStageList,
GetStudentTypeList
} from '../../api/school/index' } from '../../api/school/index'
import { import {
...@@ -86,6 +97,9 @@ ...@@ -86,6 +97,9 @@
StuStage: "", //客户阶段 StuStage: "", //客户阶段
StartTime: "", //开始时间 StartTime: "", //开始时间
EndTime: "", //结束时间 EndTime: "", //结束时间
QQ:'',
WechatNo:'',
StuType:''
}, },
dateArray: [], //日期数组 dateArray: [], //日期数组
pageCount: 0, pageCount: 0,
...@@ -93,11 +107,13 @@ ...@@ -93,11 +107,13 @@
myEmployeeList: [], myEmployeeList: [],
//客户阶段状态列表 //客户阶段状态列表
customState: [], customState: [],
customTypeList: [] //客户类型
} }
}, },
created() { created() {
this.getEmployeeList(); this.getEmployeeList();
this.getStuStageList(); this.getStuStageList();
this.getCustomTypeList();
}, },
mounted() { mounted() {
this.currentUrl = this.$route.path this.currentUrl = this.$route.path
...@@ -110,6 +126,14 @@ ...@@ -110,6 +126,14 @@
this.customState = res.Data; this.customState = res.Data;
}) })
}, },
//获取客户类型
getCustomTypeList(){
GetStudentTypeList().then(res => {
if (res.Code == 1) {
this.customTypeList = res.Data;
}
})
},
//获取员工列表 //获取员工列表
getEmployeeList() { getEmployeeList() {
queryEmployee({ queryEmployee({
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment