Skip to content

C
confucius
Commit 67e3fb88 authored by 罗超's avatar 罗超
Browse files
Options

1

parent 4035228e
Hide whitespace changes
Inline Side-by-side
Showing with 62 additions and 18 deletions
src/components/sale/activeOrder-form.vue
View file @ 67e3fb88
......@@ -22,18 +22,18 @@
</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"
emit-value map-options label="学员" option-value="Id" option-label="name" @change="stuChange"/>
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="姓名"
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"
<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"
<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"
<!-- <q-input filled stack-label maxlength="30" :dense="false" type="number"
v-model="OrderMsg.PeopleNum" class="col-12" :min="1" label="人数"
:rules="[val => !!val || '请填写人数']" />
:rules="[val => !!val || '请填写人数']" /> -->
<div>
单价：{{OrderMsg.UnitPrice}}
</div>
......@@ -98,7 +98,8 @@
Id:2,
name:"女"
}
]
],
isdisable:false,
}
},
mounted() {
......@@ -111,6 +112,8 @@
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.LinkMan=this.saveObj.LinkMan
this.OrderMsg.LinkTel=this.saveObj.LinkTel
......@@ -143,10 +146,6 @@
this.Error("请选择学员");
return
}
if(this.OrderMsg.PeopleNum<1){
this.Error("人数不能小于1");
return
}
this.OrderMsg.Money= this.OrderMsg.UnitPrice*this.OrderMsg.PeopleNum
this.apipostDS("/api/Education/SetActivityEnrollInfo", this.OrderMsg, (res) => {
if (res.data.resultCode === 1) {
......@@ -161,7 +160,6 @@
},
getStu(){
this.apipostDS("/api/Education/GetEduStudent", {EduUserId:this.loginId}, (res) => {
console.log(111,res)
if (res.data.resultCode === 1) {
this.stuList=res.data.data
} else {
......@@ -170,7 +168,19 @@
})
},
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/components/sale/activeOrder-item.vue
View file @ 67e3fb88
......@@ -359,9 +359,12 @@
<div class="col">
<div class="row" style="justify-content: space-between">
<span>收款单据：</span>
<q-btn flat size="xs" icon="edit"
<q-btn flat size="xs" icon="edit"
v-if="item.UserId===0"
style="font-weight:400;color: #02C499" label="修改" @click="goShoukuan(item,1)" />
<!-- <q-btn flat size="xs" icon="edit"
v-if="AuthorityObj.isShowFinanceBtn&&AuthorityObj.isShowEdit&&item.OrderType==2"
style="font-weight:400;color: #02C499" label="修改" @click="chanceType(item,1)" />
style="font-weight:400;color: #02C499" label="修改" @click="chanceType(item,1)" /> -->
<template v-if="AuthorityObj.isShowFinanceBtn&&AuthorityObj.isShowEdit&&item.OrderType==1">
<q-btn flat size="xs" icon="edit" style="font-weight:400;color: #02C499" label="修改"
@click="showChooseStudent=true" />
......@@ -401,8 +404,11 @@
<div class="row" style="justify-content: space-between">
<span>付款单据：</span>
<q-btn flat size="xs" icon="edit"
v-if="item.UserId===0"
style="font-weight:400;color: #02C499" label="修改" @click="goShoukuan(item,2)" />
<!-- <q-btn flat size="xs" icon="edit"
v-if="AuthorityObj.isShowFinanceBtn&&AuthorityObj.isShowEdit&&item.OrderType==2"
style="font-weight:400;color: #02C499" label="修改" @click="chanceType(item,2)" />
style="font-weight:400;color: #02C499" label="修改" @click="chanceType(item,2)" /> -->
<template v-if="AuthorityObj.isShowFinanceBtn&&AuthorityObj.isShowEdit&&item.OrderType==1">
<q-btn flat size="xs" icon="edit" style="font-weight:400;color: #02C499" label="修改"
@click="showChooseStudent=true" />
......@@ -1276,7 +1282,35 @@
this.OpenNewUrl("/financial/cycleOrderList", {
OrderId: OrderId
});
}
},
//跳转到收款单type=2付款，1收款
goShoukuan(item,type) {
// let TCIDARR = []
// TCIDARR.push(this.msg.ClassId)
let orderObj = {
// OrderID: 0,
OrderSource: 17,
// Obj: {},
// SourceID: 0,
// TCIDList: TCIDARR,
OtherType: 41,
ReFinanceId: item.ActivityId,//活动id
ReFinanceId2: item.Id,//订单id
}
this.$router.push({
path: '/financial/financalDocument/ChoiceAddFinancialDocuments',
query: {
"Type": type,
// "ReFinanceId":this.msg.Id,
// "companyID": this.msg.Id,
// "path": "",
'blank': 'y',
'orderObj': JSON.stringify(orderObj),
// 'tradeWay': '',
}
});
},
}
}
......
src/pages/activity/payment.vue
View file @ 67e3fb88
......@@ -563,7 +563,7 @@
}
})
},
//跳转到收款单
//跳转到收款单type=2付款，1收款
goShoukuan(type) {
// let TCIDARR = []
// TCIDARR.push(this.msg.ClassId)
......
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