Skip to content

C
confucius
Commit 8bf1cda7 authored by 罗超's avatar 罗超
Browse files
Options

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

parents bdf51e2a daf67bdb
Hide whitespace changes
Inline Side-by-side
Showing with 352 additions and 366 deletions
src/api/sale/sale.js
View file @ 8bf1cda7
...@@ -457,6 +457,16 @@ export function CheckExistsStu(data) { ...@@ -457,6 +457,16 @@ export function CheckExistsStu(data) {
}); });
} }
//获取客户下拉
export function GetCustomerList(data) {
return request({
url: '/B2BCustomer/GetCustomerList',
method: 'post',
data
});
}
src/components/sale/b2bcustomerinfo/passbook.vue
View file @ 8bf1cda7
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
/> />
</template> </template>
</q-table> </q-table>
<withdraw v-if="tabs==2" :Type="2"></withdraw> <withdraw v-if="tabs==2" :Type="2" :Id="Id"></withdraw>
</div> </div>
</template> </template>
<script> <script>
...@@ -164,6 +164,7 @@ export default { ...@@ -164,6 +164,7 @@ export default {
}, },
//获取数据 //获取数据
getList() { getList() {
this.msg.CustomerId=this.Id
this.loading = true; this.loading = true;
GetCustomerBalanceDetailPage(this.msg) GetCustomerBalanceDetailPage(this.msg)
.then(res => { .then(res => {
......
src/components/sale/b2bcustomerinfo/rakeback.vue
View file @ 8bf1cda7
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
/> />
</template> </template>
</q-table> </q-table>
<withdraw v-if="tabs==2" :Type="1"></withdraw> <withdraw v-if="tabs==2" :Type="1" :Id="Id"></withdraw>
</div> </div>
</template> </template>
<script> <script>
...@@ -84,7 +84,7 @@ export default { ...@@ -84,7 +84,7 @@ export default {
pageIndex: 1, pageIndex: 1,
pageSize: 10, pageSize: 10,
rowsPerPage: 10, rowsPerPage: 10,
RebateType: 2, RebateType: 1,
Description: "" Description: ""
}, },
pageCount: 0, pageCount: 0,
...@@ -165,6 +165,7 @@ export default { ...@@ -165,6 +165,7 @@ export default {
}, },
//获取数据 //获取数据
getList() { getList() {
this.msg.CustomerId=this.Id
this.loading = true; this.loading = true;
GetCustomerBalanceDetailPage(this.msg) GetCustomerBalanceDetailPage(this.msg)
.then(res => { .then(res => {
......
src/components/sale/b2bcustomerinfo/withdraw.vue
View file @ 8bf1cda7
...@@ -137,7 +137,11 @@ export default { ...@@ -137,7 +137,11 @@ export default {
Type:{ Type:{
type:Number, type:Number,
default:1 default:1
} },
Id:{
type:Number,
default:0
}
}, },
data() { data() {
return { return {
...@@ -149,6 +153,7 @@ export default { ...@@ -149,6 +153,7 @@ export default {
rowsPerPage: 12, rowsPerPage: 12,
Type: '0', // 类型 1返佣 2幸福存折 Type: '0', // 类型 1返佣 2幸福存折
AuditStatus: '0', //状态 1申请中 2待打款 3已打款 4拒绝 AuditStatus: '0', //状态 1申请中 2待打款 3已打款 4拒绝
CustomerId:0
}, },
loading: false, loading: false,
...@@ -271,6 +276,7 @@ export default { ...@@ -271,6 +276,7 @@ export default {
//获取分页数据 //获取分页数据
getList() { getList() {
this.msg.Type=this.Type this.msg.Type=this.Type
this.msg.CustomerId=this.Id
getCustomerRemitPageList(this.msg).then(res => { getCustomerRemitPageList(this.msg).then(res => {
this.dataList = res.Data.PageData; this.dataList = res.Data.PageData;
this.loading = false; this.loading = false;
......
src/components/school/student/student-left.vue
View file @ 8bf1cda7
...@@ -84,7 +84,7 @@ ...@@ -84,7 +84,7 @@
<div class="info_item"> <div class="info_item">
<div class="item_label">客户来源</div> <div class="item_label">客户来源</div>
<div class="item_value"> <div class="item_value">
<q-select filled v-model="customObj.CreateType" dense :options="customFromList" option-label="Name" option-value="Id" <q-select filled v-model="customObj.CreateType" @input="resetStuSource()" dense :options="customFromList" option-label="Name" option-value="Id"
emit-value map-options label="客户来源" /> emit-value map-options label="客户来源" />
</div> </div>
</div> </div>
...@@ -94,8 +94,8 @@ ...@@ -94,8 +94,8 @@
<span v-if="customObj.CreateType==4">转介人</span> <span v-if="customObj.CreateType==4">转介人</span>
</div> </div>
<div class="item_value"> <div class="item_value">
<q-select filled v-model="customObj.StuSourceId" dense @filter="filterEmployee" use-input <q-select filled v-model="customObj.StuSourceId" dense :options="customList" option-label="CustomerName"
:options="myEmployeeList" option-label="EmployeeName" option-value="Id" emit-value map-options /> option-value="CustomerId" emit-value map-options />
</div> </div>
</div> </div>
...@@ -200,7 +200,8 @@ ...@@ -200,7 +200,8 @@
getGuestLearningGoalsEnumList, getGuestLearningGoalsEnumList,
GetStuChannelList, GetStuChannelList,
CreateTypeList, CreateTypeList,
CheckExistsStu CheckExistsStu,
GetCustomerList
} from '../../../api/sale/sale' } from '../../../api/sale/sale'
import { import {
queryEmployee queryEmployee
...@@ -259,6 +260,7 @@ ...@@ -259,6 +260,7 @@
StuChannelList: [], //收客渠道 StuChannelList: [], //收客渠道
AssistDropList: [], //协助人员 AssistDropList: [], //协助人员
customFromList: [], //客户来源 customFromList: [], //客户来源
customList: [],
checkMsg:{ checkMsg:{
StuId:0, StuId:0,
StuTel:'' StuTel:''
...@@ -273,6 +275,7 @@ ...@@ -273,6 +275,7 @@
this.getEmployeeList(); this.getEmployeeList();
this.GetStuChannelList(); this.GetStuChannelList();
this.getCustomFrom(); this.getCustomFrom();
this.GetCustomerList();
if (this.saveObj && this.saveObj.StuId > 0) { if (this.saveObj && this.saveObj.StuId > 0) {
this.customMsg.StuId = this.saveObj.StuId; this.customMsg.StuId = this.saveObj.StuId;
this.checkMsg.StuId = this.saveObj.StuId; this.checkMsg.StuId = this.saveObj.StuId;
...@@ -417,6 +420,15 @@ ...@@ -417,6 +420,15 @@
this.customState = res.Data; this.customState = res.Data;
}) })
}, },
//获取客户下拉数据
GetCustomerList(){
GetCustomerList().then(res => {
if(res.Code==1){
this.customList = res.Data;
}
console.log(res,'数据');
})
},
queryStuInfo() { queryStuInfo() {
getStudentInfo({ getStudentInfo({
StuId: this.customMsg.StuId StuId: this.customMsg.StuId
...@@ -461,6 +473,10 @@ ...@@ -461,6 +473,10 @@
CheckExistsStu(this.checkMsg).then(res => { CheckExistsStu(this.checkMsg).then(res => {
}) })
},
//切换客户来源重置
resetStuSource(){
this.customObj.StuSourceId = 0;
} }
} }
} }
......
src/components/school/student/stulist.vue
View file @ 8bf1cda7
<style lang="scss"> <style lang="scss">
.stuList .q-table__bottom { .stuList .q-table__bottom {
min-height: 0; min-height: 0;
} }
</style> </style>
<template> <template>
<div class="stuList"> <div class="stuList">
<q-table <q-table :pagination="pageMsg" :loading="loading" no-data-label="暂无相关数据" flat selection="multiple"
:pagination="pageMsg" :selected.sync="selection" class="sticky-right-column-table sticky-tow-column-table" separator="none"
:loading="loading" :data="dataList" :columns="columns" row-key="StuId" hide-bottom>
no-data-label="暂无相关数据"
flat
selection="multiple"
:selected.sync="selection"
class="sticky-right-column-table sticky-tow-column-table"
separator="none"
:data="dataList"
:columns="columns"
row-key="StuId"
hide-bottom
>
<template v-slot:top="props"> <template v-slot:top="props">
<div class="col-2 q-table__title">我的客户</div> <div class="col-2 q-table__title">我的客户</div>
<q-space /> <q-space />
<div class="page-option"> <div class="page-option">
<q-btn <q-btn color="accent" class="q-mr-md" size="sm" icon="swap_horiz" label="转订单" :disable="selection.length===0"
color="accent" @click="transferOrder" />
class="q-mr-md" <q-btn color="accent" class="q-mr-md" size="sm" icon="add" label="新增客户" @click="EditStudent(null)" />
size="sm"
icon="swap_horiz"
label="转订单"
:disable="selection.length===0"
@click="transferOrder"
/>
<q-btn
color="accent"
class="q-mr-md"
size="sm"
icon="add"
label="新增客户"
@click="EditStudent(null)"
/>
</div> </div>
</template> </template>
<template v-slot:body-cell-StuIcon="props"> <template v-slot:body-cell-StuIcon="props">
...@@ -47,14 +22,8 @@ ...@@ -47,14 +22,8 @@
<q-avatar size="md" v-if="props.value"> <q-avatar size="md" v-if="props.value">
<img :src="props.value" /> <img :src="props.value" />
</q-avatar> </q-avatar>
<q-avatar <q-avatar size="md" color="teal-10" text-color="white" v-if="!props.value">
size="md" {{ props.row.StuName.substring(0, 1) }}</q-avatar>
color="teal-10"
text-color="white"
v-if="!props.value"
>
{{ props.row.StuName.substring(0, 1) }}</q-avatar
>
</q-td> </q-td>
</template> </template>
<template v-slot:body-cell-StuName="props"> <template v-slot:body-cell-StuName="props">
...@@ -66,301 +35,305 @@ ...@@ -66,301 +35,305 @@
</template> </template>
<template v-slot:body-cell-StuSex="props"> <template v-slot:body-cell-StuSex="props">
<q-td :props="props"> <q-td :props="props">
<q-badge <q-badge :color="props.value == 1 ? 'negative' : 'primary'" :label="props.value == 1 ? '女' : '男'" />
:color="props.value == 1 ? 'negative' : 'primary'"
:label="props.value == 1 ? '女' : '男'"
/>
</q-td> </q-td>
</template> </template>
<template v-slot:body-cell-Status="props"> <template v-slot:body-cell-Status="props">
<q-td :props="props"> <q-td :props="props">
<q-toggle <q-toggle size="md" color="primary" :false-value="1" :true-value="0" v-model="props.row.Status"
size="md" title="注意：关闭后，学员将无法正常使用." @input="deleteStudentInfo(props.row)" />
color="primary"
:false-value="1"
:true-value="0"
v-model="props.row.Status"
title="注意：关闭后，学员将无法正常使用."
@input="deleteStudentInfo(props.row)"
/>
</q-td> </q-td>
</template> </template>
</q-table> </q-table>
<student-form <student-form v-if="isShowStuForm" :save-obj="stuOption" @close="closeStuForm" @success="refreshStuList">
v-if="isShowStuForm"
:save-obj="stuOption"
@close="closeStuForm"
@success="refreshStuList"
>
</student-form> </student-form>
<studentRight-form <studentRight-form v-if="isShowStuRight" :save-obj="stuOption" @close="closeStuForm" @success="refreshStuList">
v-if="isShowStuRight"
:save-obj="stuOption"
@close="closeStuForm"
@success="refreshStuList"
>
</studentRight-form> </studentRight-form>
<studentAdd-form <studentAdd-form v-if="isShowAdd" :save-obj="stuOption" @close="closeStuForm" @success="refreshStuList">
v-if="isShowAdd"
:save-obj="stuOption"
@close="closeStuForm"
@success="refreshStuList"
>
</studentAdd-form> </studentAdd-form>
<transfer-order <transfer-order v-if="isShowTransfer" :select="selection" @close="closeStuForm" @success="refreshStuList">
v-if="isShowTransfer"
:select="selection"
@close="closeStuForm"
@success="refreshStuList"
>
</transfer-order> </transfer-order>
</div> </div>
</template> </template>
<script> <script>
import studentForm from "./student-form"; import studentForm from "./student-form";
import studentRightForm from "./studentRight-form"; import studentRightForm from "./studentRight-form";
import studentAddForm from "./studentAdd-form"; import studentAddForm from "./studentAdd-form";
import transferOrder from "./transfer-order" import transferOrder from "./transfer-order"
export default { export default {
props: { props: {
dataList: { dataList: {
type: Array, type: Array,
default: null default: null
} }
}, },
components: { components: {
studentForm, studentForm,
studentRightForm, studentRightForm,
studentAddForm, studentAddForm,
transferOrder transferOrder
}, },
data() { data() {
return { return {
columns: [ columns: [{
{ name: "StuIcon",
name: "StuIcon", label: "",
label: "", field: "StuIcon",
field: "StuIcon", align: "left"
align: "left" },
}, {
{ name: "StuName",
name: "StuName", required: true,
required: true, label: "昵称",
label: "昵称", align: "left",
align: "left", field: row => row.StuName
field: row => row.StuName },
}, {
{ name: "StuSex",
name: "StuSex", label: "性别",
label: "性别", field: "StuSex",
field: "StuSex", align: "left"
align: "left" },
}, {
{ name: "StuTel",
name: "StuBirth", label: "电话",
label: "出生日期", field: "StuTel",
field: "StuBirth", align: "left"
align: "left" },
}, {
{ name: "StuStageName",
name: "StuTel", label: "客户阶段",
label: "手机号码", field: "StuStageName",
field: "StuTel", align: "left"
align: "left" },
}, {
{ name: "StuProfession",
name: "CreateTypeStr", label: "职业",
label: "客户来源", field: "StuProfession",
field: "CreateTypeStr", align: "left"
align: "left" },
}, {
{ name: "StuEducationName",
name: "StuStageName", label: "学历",
label: "客户阶段", field: "StuEducationName",
field: "StuStageName", align: "left"
align: "left" },
}, {
{ name: "StuPurposeName",
name: "CreateTimeStr", label: "目的",
label: "创建时间", field: "StuPurposeName",
field: "CreateTimeStr", align: "left"
align: "left" },
{
name: "CreateByName",
label: "负责人",
align: "left",
field: "CreateByName"
},
{
name: "AssistList",
label: "协同人",
align: "left",
field: "AssistList"
},
{
name: "CreateTypeStr",
label: "获取渠道",
field: "CreateTypeStr",
align: "left"
},
{
name: "StuSourceIdName",
label: "关联人",
field: "StuSourceIdName",
align: "left"
},
{
name: "VisitCount",
label: "到访次数",
field: "VisitCount",
align: "left"
},
{
name: "TrialLessonCount",
label: "试听次数",
field: "TrialLessonCount",
align: "left"
},
{
name: "CreateTimeStr",
label: "创建时间",
field: "CreateTimeStr",
align: "left"
}
],
pageMsg: {
rowsPerPage: 12
}, },
{ loading: false,
name: "CreateByName", isShowStuForm: false,
label: "负责人", resetLoading: false,
align: "left", isShowStuRight: false,
field: "CreateByName" stuOption: null,
} isShowAdd: false,
], selection: [],
pageMsg: { isShowTransfer: false,
rowsPerPage: 12
},
loading: false,
isShowStuForm: false,
resetLoading: false,
isShowStuRight: false,
stuOption: null,
isShowAdd: false,
selection: [],
isShowTransfer:false,
}; };
}, },
created() { created() {
this.initAuth(); this.initAuth();
}, },
mounted() {}, mounted() {},
methods: { methods: {
//初始化权限 //初始化权限
initAuth() {}, initAuth() {},
//创建账号 //创建账号
createAccount(id) { createAccount(id) {
let that = this; let that = this;
createStudentAccount({ createStudentAccount({
StuId: id StuId: id
}).then(res => { }).then(res => {
that.$q that.$q
.dialog({
title: "创建账号",
message: res.Message,
persistent: true,
ok: {
label: "确认",
flat: true,
focus: true
}
})
.onOk(() => {
that.getStudent();
})
.onCancel(() => {
that.getStudent();
});
});
},
resetPw(id) {
let that = this;
this.$q
.dialog({ .dialog({
title: "创建账号", title: "重置密码",
message: res.Message, message: "你正在进行重置密码行为，是否确认执行",
persistent: true, persistent: true,
cancel: {
label: "取消",
flat: true
},
ok: { ok: {
label: "确认", label: "确认重置",
flat: true, flat: true,
focus: true focus: true
} }
}) })
.onOk(() => { .onOk(() => {
that.getStudent(); that.resetLoading = true;
}) resetPassword({
.onCancel(() => { AccountType: 4,
that.getStudent(); AccountId: id
})
.then(res => {
that.resetLoading = false;
that.$q.dialog({
title: "密码重置成功",
message: res.Message,
persistent: true,
ok: {
label: "确认",
flat: true,
focus: true
}
});
})
.catch(() => {
that.resetLoading = false;
});
}); });
}); },
}, //删除客户资料
resetPw(id) { deleteStudentInfo(obj) {
let that = this; let that = this;
this.$q var str = obj.Status == 1 ? "【禁用】" : "【启用】";
.dialog({ this.$q
title: "重置密码", .dialog({
message: "你正在进行重置密码行为，是否确认执行", title: str + "学员",
persistent: true, message: "你正在进行" + str + "学员行为，一旦执行无法找回，是否确认执行？",
cancel: { persistent: true,
label: "取消", cancel: {
flat: true label: "取消",
}, flat: true
ok: { },
label: "确认重置", ok: {
flat: true, label: "确认",
focus: true flat: true,
} focus: true
}) }
.onOk(() => {
that.resetLoading = true;
resetPassword({
AccountType: 4,
AccountId: id
}) })
.then(res => { .onOk(() => {
that.resetLoading = false; that.resetLoading = true;
that.$q.dialog({ deleteStudent({
title: "密码重置成功", StuId: obj.StuId,
message: res.Message, Status: obj.Status
persistent: true, }).then(res => {
ok: { this.$q.notify({
label: "确认", icon: "iconfont icon-chenggong",
flat: true, color: "accent",
focus: true timeout: 2000,
} message: "数据操作成功！",
position: "top"
}); });
}) this.getStudent();
.catch(() => {
that.resetLoading = false;
});
});
},
//删除客户资料
deleteStudentInfo(obj) {
let that = this;
var str = obj.Status == 1 ? "【禁用】" : "【启用】";
this.$q
.dialog({
title: str + "学员",
message:
"你正在进行" + str + "学员行为，一旦执行无法找回，是否确认执行？",
persistent: true,
cancel: {
label: "取消",
flat: true
},
ok: {
label: "确认",
flat: true,
focus: true
}
})
.onOk(() => {
that.resetLoading = true;
deleteStudent({
StuId: obj.StuId,
Status: obj.Status
}).then(res => {
this.$q.notify({
icon: "iconfont icon-chenggong",
color: "accent",
timeout: 2000,
message: "数据操作成功！",
position: "top"
}); });
this.getStudent(); })
.onCancel(() => {
obj.Status = obj.Status == 1 ? 0 : 1;
}); });
},
refreshStuList() {
this.$emit("success");
},
EditStudent(obj) {
if (obj) {
this.stuOption = obj;
} else {
this.stuOption = null;
}
this.isShowAdd = true;
},
closeStuForm() {
this.isShowStuForm = false;
this.isShowStuRight = false;
this.isShowAdd = false;
this.isShowTransfer = false;
},
//点击学生姓名弹出
getStuRight(obj) {
if (obj) {
this.stuOption = obj;
} else {
this.stuOption = null;
}
this.isShowStuRight = true;
},
transferOrder() {
const firstId = this.selection[0].CustomerId
const flag = this.selection.every(e => {
return e.CustomerId == firstId
}) })
.onCancel(() => { if (!flag) {
obj.Status = obj.Status == 1 ? 0 : 1; this.$q.notify({
});
},
refreshStuList() {
this.$emit("success");
},
EditStudent(obj) {
if (obj) {
this.stuOption = obj;
} else {
this.stuOption = null;
}
this.isShowAdd = true;
},
closeStuForm() {
this.isShowStuForm = false;
this.isShowStuRight = false;
this.isShowAdd = false;
this.isShowTransfer=false;
},
//点击学生姓名弹出
getStuRight(obj) {
if (obj) {
this.stuOption = obj;
} else {
this.stuOption = null;
}
this.isShowStuRight = true;
},
transferOrder(){
const firstId=this.selection[0].CustomerId
const flag= this.selection.every(e=>{
return e.CustomerId==firstId
})
if(!flag){
this.$q.notify({
type: 'negative', type: 'negative',
position: "top", position: "top",
message: `负责人不一致，请重新选择` message: `负责人不一致，请重新选择`
}) })
return return
}
this.isShowTransfer = true
} }
this.isShowTransfer=true
} }
} };
}; </script>
</script> \ No newline at end of file
src/components/school/student/transfer-order.vue
View file @ 8bf1cda7
...@@ -115,10 +115,10 @@ ...@@ -115,10 +115,10 @@
</q-step> </q-step>
<q-step :name="2" title="确认" icon="settings" :done="step > 2"> <q-step :name="2" title="确认" icon="settings" :done="step > 2">
<orderForm <orderForm
ref="orderForm" ref="orderForm"
:save-obj="saveObj" :save-obj="saveObj"
:stuData="stuData" :stuData="stuData"
:isChaBan="isChaBan" :modityOrderType="1"
@success="$emit('close')" @success="$emit('close')"
></orderForm> ></orderForm>
</q-step> </q-step>
...@@ -226,7 +226,6 @@ export default { ...@@ -226,7 +226,6 @@ export default {
courseData: [], //课程列表 courseData: [], //课程列表
coursePageCount: 0, //课程页数 coursePageCount: 0, //课程页数
saveObj: {}, //所选课程 saveObj: {}, //所选课程
isChaBan: 0, //是否插班
//关联校区列表 //关联校区列表
schoolList: [], schoolList: [],
ClassList: [], //关联课程下拉数据 ClassList: [], //关联课程下拉数据
...@@ -250,11 +249,6 @@ export default { ...@@ -250,11 +249,6 @@ export default {
const ids = this.select.map(e => e.StuId).toString(); const ids = this.select.map(e => e.StuId).toString();
getOrderGuestRenewState({ StuIds: ids }).then(res => { getOrderGuestRenewState({ StuIds: ids }).then(res => {
this.stuData = res.Data; this.stuData = res.Data;
if (res.Data.RenewNum == 0) {
this.isChaBan = 0;
} else {
this.isChaBan = 1;
}
}); });
}, },
//获取课程分页列表 //获取课程分页列表
......
src/components/school/student/transfer-order/order-form.vue
View file @ 8bf1cda7
<style> <style>
.editOrderDrawerTop { .field {
width: 100%; height: 60px;
height: 50px;
display: flex;
justify-content: space-between;
background-color: #f0f5fb;
padding: 5px 10px;
align-items: center;
} }
</style> </style>
<!--订单操作--> <!--订单操作-->
<template> <template>
<div> <div>
<!-- <div class="editOrderDrawerTop">
<div style="display:flex;align-items:center;margin-left:10px;">
<span class="drawer_Span">{{
OrderMsg.OrderId > 0 ? "修改订单" : "立即下单"
}}</span>
</div>
</div> -->
<div class="row q-mb-md"> <div class="row q-mb-md">
<div class="col-10"> <div class="col-10">
<div v-for="(item, index) in stuData.StuList"> <div v-for="(item, index) in stuData.StuList">
...@@ -29,25 +16,31 @@ ...@@ -29,25 +16,31 @@
</div> </div>
</div> </div>
<div class="col-2"> <div class="col-2">
<q-toggle v-model="isChaBan" :true-value="1" :false-value='0' label="插班报入" /> <q-toggle
v-model="OrderMsg.isChaBan"
:true-value="1"
:false-value="0"
label="插班报入"
/>
</div> </div>
</div> </div>
<div style="row items-center"> <div style="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">
<q-input <div class="col-6 field">
filled <q-input
stack-label filled
maxlength="3" stack-label
:dense="false" maxlength="3"
@keyup.native="checkInteger(OrderMsg, 'GuestNum')" :dense="false"
v-model="OrderMsg.GuestNum" @keyup.native="checkInteger(OrderMsg, 'GuestNum')"
@input="calcPrice()" v-model="OrderMsg.GuestNum"
class="col-6" @input="calcPrice()"
label="人数" label="人数"
:rules="[val => !!val || '请填写人数']" :rules="[val => !!val || '请填写人数']"
disable disable
/> />
<template v-if="isChaBan == 1"> </div>
<template v-if="OrderMsg.isChaBan == 1">
<q-select <q-select
filled filled
option-value="CourseId" option-value="CourseId"
...@@ -268,7 +261,7 @@ ...@@ -268,7 +261,7 @@
</q-item> </q-item>
</template> </template>
</q-select> </q-select>
<q-select <!-- <q-select
:disable="modityOrderType == 2 || OrderMsg.JoinType == 3" :disable="modityOrderType == 2 || OrderMsg.JoinType == 3"
v-model="OrderMsg.CustomerId" v-model="OrderMsg.CustomerId"
:options="myCustomerList" :options="myCustomerList"
...@@ -290,7 +283,7 @@ ...@@ -290,7 +283,7 @@
</q-item-section> </q-item-section>
</q-item> </q-item>
</template> </template>
</q-select> </q-select> -->
<q-input <q-input
:disable="modityOrderType == 2" :disable="modityOrderType == 2"
v-if="OrderMsg.OrderSource == 3" v-if="OrderMsg.OrderSource == 3"
...@@ -401,13 +394,12 @@ export default { ...@@ -401,13 +394,12 @@ export default {
data() { data() {
return { return {
IsShowEditOrder: true, IsShowEditOrder: true,
OrderMsg: { OrderMsg: {
ClassId: 0, //班级编号 ClassId: 0, //班级编号
GuestNum: 0, //人数 GuestNum: 0, //人数
B2CRatio: 0, B2CRatio: 0,
B2CReNewRatio: 0, B2CReNewRatio: 0,
CustomerId: 0, //市场专员
Unit_Price: 0, Unit_Price: 0,
PreferPrice: 0, //应收 PreferPrice: 0, //应收
OrderSource: 0, OrderSource: 0,
...@@ -435,9 +427,10 @@ export default { ...@@ -435,9 +427,10 @@ export default {
CourseConsultantId: 0, //课程顾问 CourseConsultantId: 0, //课程顾问
CustomerId: 0, //同行 CustomerId: 0, //同行
OrderIdentify: 2, //标识参数， 1产品下单 2客户转订单 OrderIdentify: 2, //标识参数， 1产品下单 2客户转订单
StuIds: "" StuIds: "",
// NormalCommission:'',//正常返佣金额 // NormalCommission:'',//正常返佣金额
// RenewCommission:"",// 预计返佣金额 // RenewCommission:"",// 预计返佣金额
isChaBan: 0
}, },
Unit_PriceRemark: "", //单价规则 Unit_PriceRemark: "", //单价规则
IsShowUpPrice: false, //是否显示高于定价 IsShowUpPrice: false, //是否显示高于定价
...@@ -610,8 +603,8 @@ export default { ...@@ -610,8 +603,8 @@ export default {
if (this.OrderMsg.OrderType == 2) { if (this.OrderMsg.OrderType == 2) {
this.OrderMsg.OldPreferPrice = Number(guestNum * unit_price).toFixed(2); this.OrderMsg.OldPreferPrice = Number(guestNum * unit_price).toFixed(2);
} }
this.OrderMsg.GuestNum = this.stuData.StuList.length; this.OrderMsg.GuestNum = this.stuData.StuList.length;
console.log("tag551", this.OrderMsg.GuestNum);
this.OrderMsg.DiscountMoney = 0; this.OrderMsg.DiscountMoney = 0;
this.stuData.StuList.map(e => { this.stuData.StuList.map(e => {
if (e.IsRenewGuest == 0) { if (e.IsRenewGuest == 0) {
...@@ -624,7 +617,7 @@ export default { ...@@ -624,7 +617,7 @@ export default {
}); });
}, },
initData() { initData() {
console.log("tag", "init", this.saveObj); console.log("init", this.saveObj);
if (this.saveObj && this.saveObj.OrderId > 0) { if (this.saveObj && this.saveObj.OrderId > 0) {
getClassOrderInfo({ getClassOrderInfo({
OrderId: this.saveObj.OrderId OrderId: this.saveObj.OrderId
...@@ -730,8 +723,6 @@ export default { ...@@ -730,8 +723,6 @@ export default {
} }
this.IsShowEditOrder = true; this.IsShowEditOrder = true;
this.calcPrice(); this.calcPrice();
// console.log("this.saveObj", this.saveObj);
} }
}, },
//筛选员工 //筛选员工
...@@ -797,7 +788,7 @@ export default { ...@@ -797,7 +788,7 @@ export default {
//修改订单 //修改订单
saveOrderInfo() { saveOrderInfo() {
//插班验证课程和生效时间 //插班验证课程和生效时间
if (this.isChaBan == 1) { if (this.OrderMsg.isChaBan == 1) {
this.$refs.CourseId.validate(); this.$refs.CourseId.validate();
this.$refs.EffectTime.validate(); this.$refs.EffectTime.validate();
if (this.$refs.CourseId.hasError) { if (this.$refs.CourseId.hasError) {
...@@ -852,6 +843,7 @@ export default { ...@@ -852,6 +843,7 @@ export default {
} }
} }
this.OrderMsg.StuIds = this.stuData.StuList.map(e => e.StuId).toString(); this.OrderMsg.StuIds = this.stuData.StuList.map(e => e.StuId).toString();
this.OrderMsg.CustomerId = this.stuData.CustomerId;
setClassOrder(this.OrderMsg).then(res => { setClassOrder(this.OrderMsg).then(res => {
if (res.Code == 1) { if (res.Code == 1) {
this.$q.notify({ this.$q.notify({
...@@ -910,10 +902,3 @@ export default { ...@@ -910,10 +902,3 @@ export default {
} }
}; };
</script> </script>
<style>
.savebtn {
position: absolute;
bottom: 0;
right: 0;
}
</style>
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