Skip to content

C
confucius
Commit 3ba5954c authored by 罗超's avatar 罗超
Browse files
Options

1

parent 652551f9
Hide whitespace changes
Inline Side-by-side
Showing with 104 additions and 105 deletions
src/components/sale/activeOrder-form.vue
View file @ 3ba5954c
......@@ -21,27 +21,27 @@
</div>
</div>
<div style="padding:20px 15px;">
<q-select standout="bg-primary text-white" v-model="OrderMsg.EduStudentId" class="col-12 q-mb-lg" :options="stuList" clearable
emit-value map-options label="学员" option-value="StuId" option-label="StuName" @input="stuChange"/>
<q-input filled stack-label maxlength="30" :dense="false"
v-model="OrderMsg.LinkMan" class="col-12" ref="LinkMan" label="姓名" :disable="isdisable"
:rules="[val => !!val || '请填写姓名']" />
<q-select standout="bg-primary text-white" v-model="OrderMsg.EduStudentId" class="col-12 q-mb-lg"
:options="stuList" clearable emit-value map-options label="学员" option-value="StuId" option-label="StuName"
@input="stuChange" />
<q-input filled stack-label maxlength="30" :dense="false" v-model="OrderMsg.LinkMan" class="col-12"
ref="LinkMan" label="姓名" :disable="isdisable" :rules="[val => !!val || '请填写姓名']" />
<q-input filled stack-label maxlength="30" :dense="false" type="number" :disable="isdisable"
v-model="OrderMsg.LinkTel" class="col-12" ref="LinkTel" label="联系电话"
:rules="[val => !!val || '请填写联系电话']" />
<q-select standout="bg-primary text-white" v-model="OrderMsg.Sex" class="col-12 q-mb-lg" :options="sexList" :disable="isdisable"
emit-value map-options label="性别" option-value="Id" option-label="name"/>
v-model="OrderMsg.LinkTel" class="col-12" ref="LinkTel" label="联系电话" :rules="[val => !!val || '请填写联系电话']" />
<q-select standout="bg-primary text-white" v-model="OrderMsg.Sex" class="col-12 q-mb-lg" :options="sexList"
:disable="isdisable" emit-value map-options label="性别" option-value="Id" option-label="name" />
<!-- <q-input filled stack-label maxlength="30" :dense="false" type="number"
v-model="OrderMsg.PeopleNum" class="col-12" :min="1" label="人数"
:rules="[val => !!val || '请填写人数']" /> -->
<q-input filled stack-label :dense="false" v-model="OrderMsg.Remark" style="margin-top: 20px" type="textarea"
class="col-12 q-mb-lg" ref="Remark" label="备注" />
<div>
单价：{{OrderMsg.UnitPrice}}
单价：<span style="color:#f00" v-if="OrderMsg.UnitPrice">{{OrderMsg.UnitPrice}}元</span>
</div>
<div>
总价：{{OrderMsg.UnitPrice*OrderMsg.PeopleNum}}
总价：<span style="color:#f00" v-if="OrderMsg.UnitPrice">{{OrderMsg.UnitPrice*OrderMsg.PeopleNum}}元</span>
</div>
<q-input filled stack-label :dense="false" v-model="OrderMsg.Remark" style="margin-top: 20px"
type="textarea" class="col-12" ref="Remark" label="备注" />
<div style="margin:30px 10px 70px 0;">
<q-btn class="q-mr-md" label="取消" @click="closeEditOrder" />
<q-btn color="accent" class="q-mr-md" label="保存" @click="saveOrderInfo()" />
......@@ -55,78 +55,75 @@
</q-dialog>
</template>
<script>
export default {
props: {
saveObj: {
type: Object,
default: null,
},
sourceType:{
type:Number,
default:1
sourceType: {
type: Number,
default: 1
}
},
data() {
return {
IsShowEditOrder: true,
OrderMsg: {
Id:0,//订单id
LinkMan:"",//联系人
LinkTel:"",//联系电话
Remark:"",//备注
ActivityId:0,//活动id
PeopleNum:1,//人数
Sex:1,//性别
EduStudentId:0,//学员id
UnitPrice:0,//单价
Money:0,//总价
EduUserId:0,//销售id
PayWay:0,//付款方式
TenantId:0,//商户id
MallBaseId:0,//小程序id
Id: 0, //订单id
LinkMan: "", //联系人
LinkTel: "", //联系电话
Remark: "", //备注
ActivityId: 0, //活动id
PeopleNum: 1, //人数
Sex: 1, //性别
EduStudentId: 0, //学员id
UnitPrice: 0, //单价
Money: 0, //总价
EduUserId: 0, //销售id
PayWay: 0, //付款方式
TenantId: 0, //商户id
MallBaseId: 0, //小程序id
},
stuList:[],//学员列表
loginId:-1,//登录人id
sexList:[
{
Id:1,
name:"男"
stuList: [], //学员列表
loginId: -1, //登录人id
sexList: [{
Id: 1,
name: "男"
},
{
Id:2,
name:"女"
Id: 2,
name: "女"
}
],
isdisable:false,
isdisable: false,
}
},
mounted() {
let data=JSON.parse(localStorage.getItem("loginUserInfo")).data
this.loginId=data.Id
this.OrderMsg.EduUserId=data.Id
this.OrderMsg.TenantId=data.JHTenantId
this.OrderMsg.MallBaseId=data.JHMallBaseId
console.log(66,this.saveObj)
if(this.saveObj){
if(this.sourceType===1){
this.OrderMsg.ActivityId=this.saveObj.Id
this.OrderMsg.UnitPrice=this.saveObj.Price
}else if(this.sourceType===2){
this.OrderMsg.Id=this.saveObj.Id
this.OrderMsg.ActivityId=this.saveObj.ActivityId
this.OrderMsg.UnitPrice=this.saveObj.UnitPrice
this.OrderMsg.EduStudentId=this.saveObj.EduStudentId
let data = JSON.parse(localStorage.getItem("loginUserInfo")).data
this.loginId = data.Id
this.OrderMsg.EduUserId = data.Id
this.OrderMsg.TenantId = data.JHTenantId
this.OrderMsg.MallBaseId = data.JHMallBaseId
console.log(66, this.saveObj)
if (this.saveObj) {
if (this.sourceType === 1) {
this.OrderMsg.ActivityId = this.saveObj.Id
this.OrderMsg.UnitPrice = this.saveObj.Price
} else if (this.sourceType === 2) {
this.OrderMsg.Id = this.saveObj.Id
this.OrderMsg.ActivityId = this.saveObj.ActivityId
this.OrderMsg.UnitPrice = this.saveObj.UnitPrice
this.OrderMsg.EduStudentId = this.saveObj.EduStudentId
// this.OrderMsg.EduUserId=this.saveObj.EduUserIds
}
this.OrderMsg.LinkMan=this.saveObj.LinkMan
this.OrderMsg.LinkTel=this.saveObj.LinkTel
this.OrderMsg.Remark=this.saveObj.Remark
this.OrderMsg.LinkMan = this.saveObj.LinkMan
this.OrderMsg.LinkTel = this.saveObj.LinkTel
this.OrderMsg.Remark = this.saveObj.Remark
}
this.getStu();
this.getStu();
},
watch: {
......@@ -137,21 +134,21 @@
this.IsShowEditOrder = false;
this.$emit('close')
},
saveOrderInfo(){
this.$refs.LinkMan.validate();
this.$refs.LinkTel.validate();
// this.$refs.Remark.validate();
if (!this.$refs.LinkMan.hasError &&
!this.$refs.LinkTel.hasError
){
// if(this.saveObj.LnsideLimit===1&&!this.OrderMsg.EduStudentId){
// this.Error("请选择学员");
// return
// }
if(this.OrderMsg.EduStudentId===null||!this.OrderMsg.EduStudentId){
this.OrderMsg.EduStudentId=0
}
this.OrderMsg.Money= this.OrderMsg.UnitPrice*this.OrderMsg.PeopleNum
saveOrderInfo() {
this.$refs.LinkMan.validate();
this.$refs.LinkTel.validate();
// this.$refs.Remark.validate();
if (!this.$refs.LinkMan.hasError &&
!this.$refs.LinkTel.hasError
) {
// if(this.saveObj.LnsideLimit===1&&!this.OrderMsg.EduStudentId){
// this.Error("请选择学员");
// return
// }
if (this.OrderMsg.EduStudentId === null || !this.OrderMsg.EduStudentId) {
this.OrderMsg.EduStudentId = 0
}
this.OrderMsg.Money = this.OrderMsg.UnitPrice * this.OrderMsg.PeopleNum
this.apipostDS("/api/Education/SetActivityEnrollInfo", this.OrderMsg, (res) => {
if (res.data.resultCode === 1) {
this.Success("操作成功");
......@@ -161,32 +158,34 @@
this.Error(res.data.message);
}
})
}
},
getStu(){
this.apipostDS("/api/Education/GetEduStudent", {EduUserId:this.loginId}, (res) => {
if (res.data.resultCode === 1) {
this.stuList=res.data.data
} else {
this.Error(res.data.message);
}
})
},
stuChange(val){
let res= this.stuList.filter(item=>{
return item.StuId==val
})
if(res.length>0){
this.OrderMsg.LinkMan=res[0].StuName
this.OrderMsg.LinkTel=res[0].StuTel
this.OrderMsg.Sex=res[0].StuSex
}
if(val>0){
this.isdisable=true
}else{
this.isdisable=false
}
}
}
},
getStu() {
this.apipostDS("/api/Education/GetEduStudent", {
EduUserId: this.loginId
}, (res) => {
if (res.data.resultCode === 1) {
this.stuList = res.data.data
} else {
this.Error(res.data.message);
}
})
},
stuChange(val) {
let res = this.stuList.filter(item => {
return item.StuId == val
})
if (res.length > 0) {
this.OrderMsg.LinkMan = res[0].StuName
this.OrderMsg.LinkTel = res[0].StuTel
this.OrderMsg.Sex = res[0].StuSex
}
if (val > 0) {
this.isdisable = true
} else {
this.isdisable = false
}
}
}
}
......
src/pages/sale/activityList.vue
View file @ 3ba5954c
......@@ -247,7 +247,7 @@
<template v-slot:body-cell-optioned="props">
<q-td :props="props">
<div>
<q-btn size="xs" class="q-mb-xs"
<q-btn size="xs" class="q-mb-xs" v-if="props.row.ActivityStatus!==2"
color="accent" style="font-weight:400;display:block;" label="立即下单" @click='editQuotation(props.row)'/>
<q-btn size="xs"
color="accent" style="font-weight:400" label="订单中心" @click='goUrl(props.row)'/>
......
src/pages/sale/myActiveOrder.vue
View file @ 3ba5954c
......@@ -45,7 +45,7 @@
<div class="col row wrap q-gutter-x-md" v-if="data.Statistics">
<div class="col stics">
<span class="stics-name">应收款</span>
<span>{{data.Statistics.PreferPrice?data.Statistics.PreferPrice:0}}</span>
<span>{{data.Statistics.Money}}</span>
</div>
<div class="col stics">
<span class="stics-name">实收款</span>
......
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