Skip to content

C
confucius
Commit ae926ab5 authored by Mac's avatar Mac
Browse files
Options

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

parents a41bce05 67896c6c
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1331 additions and 664 deletions
src/components/sale/activeOrder-form.vue
View file @ ae926ab5
......@@ -22,13 +22,13 @@
</div>
<div style="padding:20px 15px;">
<q-input filled stack-label maxlength="30" :dense="false"
v-model="OrderMsg.LinkMan" class="col-12" label="姓名"
v-model="OrderMsg.LinkMan" class="col-12" ref="LinkMan" label="姓名"
:rules="[val => !!val || '请填写姓名']" />
<q-input filled stack-label maxlength="30" :dense="false"
v-model="OrderMsg.LinkTel" class="col-12" label="联系电话"
v-model="OrderMsg.LinkTel" class="col-12" ref="LinkTel" label="联系电话"
:rules="[val => !!val || '请填写联系电话']" />
<q-input filled stack-label :dense="false" v-model="OrderMsg.Remark" style="margin-top: 20px"
type="textarea" class="col-12" label="备注" />
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()" />
......@@ -63,6 +63,7 @@
}
},
mounted() {
console.log(66,this.saveObj)
this.OrderMsg.Id=this.saveObj.Id
},
watch: {
......@@ -75,7 +76,22 @@
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
){
this.apipostDS("/api/Education/", this.OrderMsg, (res) => {
if (res.data.resultCode === 1) {
this.Success(res.data.message);
this.closeEditOrder();
// this.$emit('success');
} else {
this.Error(res.data.message);
}
})
}
},
}
}
......
src/components/sale/activeOrder-item.vue
View file @ ae926ab5
This diff is collapsed.
src/components/sale/myActiveOrder-form.vue 0 → 100644
View file @ ae926ab5
This diff is collapsed.
src/components/school/teacher/teacher-form.vue
View file @ ae926ab5
......@@ -11,22 +11,22 @@
class="col-6 q-pr-lg q-pb-lg" label="教师名称" :rules="[val => !!val || '请填写教师姓名']" />
<q-select filled stack-label option-value="SId" option-label="SName" v-model="objOption.School_Id"
ref="School_Id" :options="schoolList" label="所属校区" :dense="false" class="col-6 q-pb-lg" emit-value
map-options :rules="[val => !!val || '请选择所属校区']" @input="schoolChagne" />
map-options @input="schoolChagne" />
<q-input type="tel" filled stack-label maxlength="20" :dense="false" v-model="objOption.TeacherTel"
ref="TeacherTel" class="col-6 q-pr-lg q-pb-lg" label="联系电话" :rules="[val => !!val || '请填写教师联系电话']" />
<q-input filled stack-label maxlength="100" :dense="false" v-model="objOption.TeacherSay" ref="TeacherSay"
class="col-6 q-pb-lg" label="教师营销语" />
<selectTree v-if="DeptList&&DeptList.length>0" :treeData='DeptList' :defaultArray="returnString"
<selectTree :treeData='DeptList' :defaultArray="returnString"
nodeKey="DeptId" :multiple="false" labelKey="DeptName" childrenKey="ChildList" tipText="选择部门"
@getChild="getChild" classStr="col-6 q-pr-lg q-pb-lg"></selectTree>
<q-select filled stack-label option-value="PostId" option-label="PostName" v-model="objOption.Post_Id"
ref="Post_Id" :options="PostList" label="岗位" :dense="false" class="col-6 q-pr-lg" emit-value map-options />
ref="Post_Id" :options="PostList" label="岗位" :dense="false" class="col-6 q-pb-lg" emit-value map-options />
<q-input filled stack-label maxlength="5" :dense="false" v-model="objOption.BaseStuNum" ref="BaseStuNum"
class="col-6 q-pb-lg" label="带班基础人数" @keyup.native="checkInteger(objOption,'BaseStuNum')" />
class="col-6 q-pr-lg q-pb-lg" label="带班基础人数" @keyup.native="checkInteger(objOption,'BaseStuNum')" />
<q-input filled stack-label maxlength="5" :dense="false" v-model="objOption.BaseHourFee" ref="BaseHourFee"
class="col-6 q-pr-lg" label="基础课时费" @keyup.native="checkPrice(objOption,'BaseHourFee')" />
<q-select filled stack-label option-value="Id" option-label="Name" v-model="chooseSpecialty" ref="School_Id"
:options="SpecialtyList" label="老师特长" :dense="false" class="col-6 q-pb-lg" emit-value map-options
class="col-6 q-pb-lg" label="基础课时费" @keyup.native="checkPrice(objOption,'BaseHourFee')" />
<q-select filled stack-label option-value="Id" option-label="Name" v-model="chooseSpecialty" ref="SpecialtyList"
:options="SpecialtyList" label="老师特长" :dense="false" class="col-6 q-pr-lg q-pb-lg" emit-value map-options
@input="schoolChagne" multiple clearable />
</div>
......@@ -332,11 +332,9 @@
if (this.objOption.Dept_Id && this.objOption.Dept_Id == "") {
this.objOption.Dept_Id = 0;
}
this.$refs.School_Id.validate()
this.$refs.TeacherName.validate()
this.$refs.TeacherTel.validate()
if (
!this.$refs.School_Id.hasError &&
!this.$refs.TeacherName.hasError &&
!this.$refs.TeacherTel.hasError
) {
......
src/pages/activity/activeDetail.vue
View file @ ae926ab5
......@@ -128,11 +128,8 @@ import DetailItem from "../../components/activity/activeDetail-item"
let res= this.$refs.child.every(x=>{
return x.ruleVerification();
})
console.log('res', res)
if(res){
this.apipostDS("/api/Education/GetSetActivityPlan", this.msg, (res) => {
console.log(136,res)
if (res.data.resultCode === 1) {
this.Success(res.data.message);
} else {
......
src/pages/activity/makeAd.vue
View file @ ae926ab5
......@@ -607,7 +607,6 @@
this.st = data.SamplePicturesUrl + '?width=470'
this.templateId = data.AdvertisingID
this.nodes = JSON.parse(data.Content)
console.log('596', this.nodes)
this.nodes.forEach(y => {
this.currentZIndex = y.zindex > this.currentZIndex ? y.zindex : this.currentZIndex
this.currentMaxId = y.nodeId > this.currentMaxId ? y.nodeId : this.currentMaxId
......@@ -639,7 +638,6 @@
let blob = that.base64ToBlob(imgUrl)
UploadViittoBlobFile ("Edu",blob,(res)=>{
this.isLoading = false;
console.log(671,res);
if(res.Code===1){
msg.AdvertisingPicUrl = res.FileUrl
new browserMD5File(blob, function (err, md5) {
......
src/pages/activity/payment.vue
View file @ ae926ab5
......@@ -583,7 +583,7 @@
// "ReFinanceId":this.msg.Id,
// "companyID": this.msg.Id,
// "path": "",
// 'blank': 'y',
'blank': 'y',
'orderObj': JSON.stringify(orderObj),
// 'tradeWay': '',
}
......
src/pages/course/chapter.vue
View file @ ae926ab5
This diff is collapsed.
src/pages/course/chapterEditor.vue
View file @ ae926ab5
<template>
<!-- <div class="flex flex-start window-height" style="min-width:1300px;overflow-x:auto;overlfow-y:hidden;"> -->
<div class="flex flex-start window-height">
<q-splitter v-model="splitterModel" style="height: 100%;width:100%">
<q-splitter v-model="splitterModel" :limits="[30, 100]" style="height: 100%;width:100%">
<template v-slot:before>
<div class="q-pa-lg full-height">
<div class="q-pa-lg full-height" style="min-width:380px;">
<q-card class="q-pa-md bg-dark text-white q-mb-lg">
<span>{{courseInfo.CourseName}}</span>
</q-card>
......@@ -13,7 +14,11 @@
icon="iconfont icon-up"></q-btn>
<q-btn color="primary" size="xs" title="向下移动" :disable="!canDown" @click="moveDown" outline
icon="iconfont icon-down1"></q-btn>
<q-btn color="primary" size="xs" title="导入 ..." unelevated label="导入 ..."></q-btn>
<q-btn color="primary" size="xs" unelevated label="导入 ...">
<q-tooltip>
此功能正在开发中。。。
</q-tooltip>
</q-btn>
</div>
<div class="q-mt-lg" style="height:calc(100% - 140px)">
<q-scroll-area :thumb-style="thumbStyle" :content-style="contentStyle"
......@@ -27,8 +32,8 @@
<div class="row chapter-node full-width" slot-scope="{ node, data }">
<div class="q-mr-md">{{ data.ChapterNo.length>1?data.ChapterNo:`0${data.ChapterNo}` }}</div>
<div class="col q-mr-xs" v-if="editorNodeId==data.ChapterId">
<input type="text" @click.stop="" @blur="changeChapterName(data)" maxlength="100"
@click.native="ChapterNameClick" class="tree-input" v-focus v-model="data.ChapterName"
<input type="text" @blur="changeChapterName(data)" maxlength="100"
draggable="true" class="tree-input" v-focus v-model="data.ChapterName"
@focus="selectValue($event)" />
</div>
<div class="col q-mr-md ellipsis" v-if="editorNodeId!=data.ChapterId">{{data.ChapterName}}</div>
......@@ -49,7 +54,7 @@
</div>
</template>
<template v-slot:after>
<div class="col full-height q-pa-lg chapter-content scroll">
<div class="col full-height q-pa-lg chapter-content scroll" style="min-width:900px;">
<div v-if="chapter">
<div class="text-h6 q-mb-md">章节学习内容</div>
<div class="row q-mb-md">
......@@ -82,7 +87,6 @@
<!-- <div v-else class="text-center text-h5 text-grey-4 q-mt-lg">单元节点不支持编辑相关内容</div> -->
</div>
</div>
</template>
</q-splitter>
<q-btn round padding="md" v-if="chapter && chapter.ChapterId>0" @click="saveChapterUpdate" :loading="submiting"
......@@ -208,9 +212,6 @@
this.rateList = r.Data
})
},
ChapterNameClick() {
},
changeNode(data, node, ev) {
if (this.chapter && this.chapter.ChapterId > 0) {
......@@ -219,7 +220,7 @@
this.chapter.CourseRateName = this.defauRateObj.Name
}
if (!compareObject(this.bakObj, this.chapter, false)) {
this.saveChapterUpdate()
this.saveChapterUpdate(1)
if (this.bakObj.CourseRate != this.chapter.CourseRate) {
if (this.chapter.ChildList && this.chapter.ChildList.length > 0) {
this.updateRate()
......@@ -312,7 +313,7 @@
})
},
saveChapterUpdate() {
saveChapterUpdate(type) {
if (!this.submiting) {
this.submiting = true
if (this.defauRateObj.Id != 0) {
......@@ -326,11 +327,17 @@
msg.Requirement = encodeURIComponent(msg.Requirement)
saveChapter(msg).then(r => {
this.submiting = false
let msg = '';
if(type==1){
msg='自动保存成功！'
}else{
msg='数据保存成功！'
}
this.$q.notify({
icon: 'iconfont icon-chenggong',
color: 'accent',
timeout: 2000,
message: '数据保存成功！',
message: msg,
position: 'top'
})
if (this.bakObj.CourseRate != this.defauRateObj.Id) {
......@@ -592,9 +599,9 @@
.chapter-tree .chapter-node .rate-box {
display: block;
}
.chapter-tree .el-tree-node__content {
height: 32px !important;
padding-right:20px;
}
.chapter-tree .el-tree-node__content:hover,
......
src/pages/sale/activeOrderList.vue
View file @ ae926ab5
<template>
<div class="page-body myOrder">
<div class="row col" style="height: 40px">
<div class="row col" style="justify-content: space-between;align-items: center;margin-bottom: 10px">
<div>
<template v-if="data&& data.ClassInfo">
{{data.ClassInfo.ClassName}}
</template>
</div>
<div class="row" style="align-items: center">
<span>带班老师</span>
<q-avatar size="sm" style="margin:0 5px;" v-if="data.ClassInfo&&data.ClassInfo.TeacherIcon">
<img :src="data.ClassInfo.TeacherIcon" />
</q-avatar>
<q-avatar style="margin:0 5px;" size="sm" color="teal-10" text-color="white" v-else>
<template
v-if="data.ClassInfo&&data.ClassInfo.TeacherName">{{data.ClassInfo.TeacherName.substring(0,1)}}</template>
</q-avatar>
<span v-if="data&& data.ClassInfo" style="color:#2961FE;font-weight: bold">
{{data.ClassInfo.TeacherName}}
</span>
</div>
<div class="row col " style="align-items: center;margin-bottom: 10px">
<q-btn color="accent" size="sm" class="q-mr-md " label="返回" @click="goBack" />
<div v-if="activeName">
活动名称：{{activeName}}
</div>
</div>
</div>
<div class="page-content">
<OrderItem :dataList="dataList" ref="orderL" :authObj="authObj" :modityOrderType="2" :cancelList="CancelList"
<OrderItem :dataList="data.List" ref="orderL" :authObj="authObj" :modityOrderType="2" :cancelList="CancelList"
@success="refreshClassOrder"></OrderItem>
</div>
</div>
......@@ -41,8 +27,9 @@
data() {
return {
data: {},
activeName:"",
msg: {
Id: 0
ActivityId: 0
},
//正常订单
dataList: [],
......@@ -62,54 +49,35 @@
},
created() {
if (this.$route.query.Id) {
this.msg.Id = this.$route.query.Id
this.msg.ActivityId = this.$route.query.Id
}
// this.getList();
if (this.$route.query.name) {
this.activeName = this.$route.query.name
}
this.getList();
},
mounted() {
},
methods: {
//获取菜单分页列表
//获取订单列表
getList() {
this.loading = true;
quertClassOrderList(this.msg).then(res => {
this.data = res.Data;
if (this.data && this.data.OrderList && this.data.OrderList.NorList) {
this.dataList = this.data.OrderList.NorList;
let OrderIds = []
this.dataList.forEach(x => {
OrderIds.push(x.OrderId)
})
if (OrderIds.length > 0) {
OrderIds = OrderIds.join(',')
if (this.dataList.length > 0) {
this.$refs.orderL.getOrderFinanceList(OrderIds, 1)
}
}
}
if (this.data && this.data.OrderList && this.data.OrderList.CancelList) {
this.CancelList = this.data.OrderList.CancelList;
let OrderIds = []
this.CancelList.forEach(x => {
OrderIds.push(x.OrderId)
})
if (OrderIds.length > 0) {
OrderIds = OrderIds.join(',')
if (this.CancelList.length > 0) {
this.$refs.orderL.getOrderFinanceList(OrderIds, 2)
}
}
}
this.loading = false
}).catch(() => {
this.apipostDS("/api/Education/GetConsultOrderStatisticsPage",this.msg, (res) => {
this.loading = false
if (res.data.resultCode === 1) {
this.data = res.data.data.pageData;
this.pageCount = res.data.data.pageCount;
}
})
},
//刷新页面
refreshClassOrder() {
this.getList();
}
},
goBack(){
this.$router.go(-1)
} ,
}
}
......
src/pages/sale/activeOrderStatistics.vue
View file @ ae926ab5
<template>
<div class="page-body myOrder">
<div style="width: 100%;display: flex;justify-content: space-between">
<span style="font-size: 20px;font-weight: 400; ">活动报名订单</span>
<span style="font-size: 20px;font-weight: 400; ">活动报名统计</span>
</div>
<div class="page-search row items-center">
<div class="col row wrap q-mr-lg q-col-gutter-md">
......@@ -75,14 +75,14 @@
<span class="stics-name">取消人数</span>
<span>{{data.Statistics.CancelNum}}人</span>
</div>
<div class="col stics">
<!-- <div class="col stics">
<span class="stics-name">提成金额</span>
<span>{{data.Statistics.CommissionMoney}}</span>
</div>
<div class="col stics">
<span class="stics-name">额外奖励</span>
<span>{{data.Statistics.ExtraRewardMoney}}</span>
</div>
</div> -->
</div>
<div class="row col" style="justify-content: flex-end">
<div class="row tis">
......@@ -103,7 +103,7 @@
</div>
</div>
<div class="page-content">
<activeOrder :dataList="data.List" :authObj="authObj" @success="refreshClassOrder" :modityOrderType="1"
<activeOrder :dataList="data.List" :authObj="authObj" @success="refreshClassOrder" :modityOrderType="1"
ref="orderL">
</activeOrder>
<div class="row" style="justify-content: flex-end;padding: 5px 20px">
......@@ -119,14 +119,14 @@
import {
queryEmployee
} from '../../api/users/user' //获取业务员列表
import myOrderForm from '../../components/sale/myOrder-form'
// import myOrderForm from '../../components/sale/myOrder-form'
import activeOrder from '../../components/sale/activeOrder-item'
export default {
meta: {
title: "我的活动订单"
},
components: {
myOrderForm,
// myOrderForm,
activeOrder
},
data() {
......@@ -265,17 +265,18 @@
this.apipostDS("/api/Education/GetConsultOrderStatisticsPage", msg, (res) => {
this.loading = false
if (res.data.resultCode === 1) {
console.log(319, res)
this.data = res.data.data;
let OrderIds = []
this.data.forEach(x => {
OrderIds.push(x.Id)
})
OrderIds = OrderIds.join(',')
if (this.data.length > 0) {
this.$refs.orderL.getOrderFinanceList(OrderIds, 1)
}
// this.pageCount = res.data.PageCount;
this.data = res.data.data.pageData;
console.log(319, this.data)
// let OrderIds = []
// this.data.forEach(x => {
// OrderIds.push(x.Id)
// })
// OrderIds = OrderIds.join(',')
// if (this.data.length > 0) {
// this.$refs.orderL.getOrderFinanceList(OrderIds, 1)
// }
this.pageCount = res.data.data.pageCount;
}
})
},
......
src/pages/sale/activityList.vue
View file @ ae926ab5
......@@ -446,9 +446,12 @@ import ActiveOrderForm from '../../components/sale/activeOrder-form.vue'
},
//跳转到订单中心
goUrl(item) {
var tempStr = '/sale/activeOrderList?Id=' + item.Id;
this.$router.push({
path: tempStr
path: "/sale/activeOrderList",
query:{
Id:item.Id,
name:item.ActivityName
}
});
},
}
......
src/pages/sale/myActiveOrder.vue
View file @ ae926ab5
......@@ -63,14 +63,14 @@
<span class="stics-name">取消人数</span>
<span>{{data.Statistics.CancelNum}}人</span>
</div>
<div class="col stics">
<!-- <div class="col stics">
<span class="stics-name">提成金额</span>
<span>{{data.Statistics.CommissionMoney}}</span>
</div>
<div class="col stics">
<span class="stics-name">额外奖励</span>
<span>{{data.Statistics.ExtraRewardMoney}}</span>
</div>
</div> -->
</div>
<div class="row col" style="justify-content: flex-end">
<div class="row tis">
......@@ -206,9 +206,10 @@
this.apipostDS("/api/Education/GetConsultOrderStatisticsPage", msg, (res) => {
this.loading = false
if (res.data.resultCode === 1) {
console.log(319, res.data)
this.data = res.data.pageData;
let OrderIds = []
this.data = res.data.data.pageData;
// let OrderIds = []
// this.data.forEach(x => {
// OrderIds.push(x.Id)
// })
......@@ -216,7 +217,7 @@
// if (this.data.length > 0) {
// this.$refs.orderL.getOrderFinanceList(OrderIds, 1)
// }
this.pageCount = res.data.pageCount;
this.pageCount = res.data.data.pageCount;
}
})
},
......
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