Skip to content

C
confucius
Commit 336da5d1 authored by zhengke's avatar zhengke
Browse files
Options

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

parents d6070f02 c2a224e2
Hide whitespace changes
Inline Side-by-side
Showing with 156 additions and 47 deletions
src/components/activity/active-from.vue
View file @ 336da5d1
......@@ -15,16 +15,16 @@
</div>
<div class="row wrap">
<div class="col-12">
<q-input filled v-model="addMsg.StartTime" mask="date" label="开始时间" ref="StartTime"
<q-input filled v-model="addMsg.StartTime" mask="####-##-## ##:##:##" label="开始时间" ref="StartTime"
:rules="[val => !!val || '请选择开始时间']">
<template v-slot:append>
<q-icon name="event" class="cursor-pointer">
<q-popup-proxy ref="qDateProxy" transition-show="scale" transition-hide="scale">
<q-date v-model="addMsg.StartTime" mask="YYYY-MM-DD" minimal>
<div class="row items-center justify-end">
<q-btn v-close-popup label="关闭" color="primary" flat />
</div>
</q-date>
<div class="q-gutter-md row items-start">
<q-date v-model="addMsg.StartTime" mask="YYYY-MM-DD" ></q-date>
<q-time v-model="addMsg.StartTime" format24h mask="YYYY-MM-DD HH:mm:ss" @input="time" />
</div>
<q-btn v-close-popup label="关闭" color="primary" flat style="float:right" />
</q-popup-proxy>
</q-icon>
</template>
......@@ -33,16 +33,16 @@
</div>
<div class="row wrap">
<div class="col-12">
<q-input filled v-model="addMsg.EndTime" mask="date" label="结束时间" ref="EndTime"
<q-input filled v-model="addMsg.EndTime" mask="####-##-## ##:##:##" label="结束时间" ref="EndTime"
:rules="[val => !!val || '请选择结束时间']">
<template v-slot:append>
<q-icon name="event" class="cursor-pointer">
<q-popup-proxy ref="qDateProxy" transition-show="scale" transition-hide="scale">
<q-date v-model="addMsg.EndTime" mask="YYYY-MM-DD" minimal>
<div class="row items-center justify-end">
<q-btn v-close-popup label="关闭" color="primary" flat />
</div>
</q-date>
<div class="q-gutter-md row items-start">
<q-date v-model="addMsg.EndTime" mask="YYYY-MM-DD" ></q-date>
<q-time v-model="addMsg.EndTime" format24h mask="YYYY-MM-DD HH:mm:ss" @input="time" />
</div>
<q-btn v-close-popup label="关闭" color="primary" flat style="float:right" />
</q-popup-proxy>
</q-icon>
</template>
......@@ -70,7 +70,7 @@
<div class="row wrap">
<div class="col-12">
<q-input filled v-model="addMsg.SignEndTime" mask="####-##-## ##:##:##" ref="SignEndTime" label="报名结束时间"
:rules="[val => !!val || '请选择报名开始时间']">
:rules="[val => !!val || '请选择报名结束时间']">
<template v-slot:append>
<q-icon name="event" class="cursor-pointer">
<q-popup-proxy ref="qDateProxy" transition-show="scale" transition-hide="scale">
......@@ -345,17 +345,17 @@
methods: {
// 选择报名开始时间
date(val) {
this.addMsg.SignStartTime = val
// this.addMsg.SignStartTime = val
},
time(val) {
this.addMsg.SignStartTime = val
// this.addMsg.SignStartTime = val
},
// 选择报名结束时间
endDate(val) {
this.addMsg.SignEndTime = val
// this.addMsg.SignEndTime = val
},
endTime(val) {
this.addMsg.SignEndTime = val
// this.addMsg.SignEndTime = val
},
// 选择年龄范围
changeAge(val) {
......@@ -381,7 +381,8 @@
!this.$refs.EndTime.hasError &&
!this.$refs.SignStartTime.hasError &&
!this.$refs.SignEndTime.hasError) {
this.addMsg.SignStartTime=this.addMsg.SignStartTimeStr
this.addMsg.SignEndTime=this.addMsg.SignEndTimeStr
this.apipostDS("/api/Education/SetActivity", this.addMsg, (res) => {
if (res.data.resultCode === 1) {
this.Success(res.data.message);
......
src/components/course/classstu-form.vue
View file @ 336da5d1
......@@ -62,6 +62,16 @@
<span style="color:green;" v-if="props.row.IsRenew==1">是</span>
</q-td>
</template>
<template v-slot:body-cell-GuestName="props">
<q-td auto-width :props="props">
<span v-if="props.row.GuestState==1">{{props.row.GuestName}}</span>
<span style="color:red;cursor:pointer" v-else>{{props.row.GuestName}}
<q-tooltip :offset="[10, 10]">
{{props.row.GuestStateStr}}
</q-tooltip>
</span>
</q-td>
</template>
<template v-slot:body-cell-StuType="props">
<q-td auto-width :props="props">
<span v-if="props.row.IsChaBan==0">正常报入</span>
......@@ -202,14 +212,13 @@
}
})
},
//获取学员信息
getStudentData() {
this.studentList = [];
queryClassStudent({
ClassId: this.setingObj.ClassId,
School_Id: this.setingObj.School_Id
School_Id: this.setingObj.School_Id,
QEffectStatus: 2,
}).then(res => {
if (res.Code == 1) {
this.studentList = res.Data;
......
src/components/sale/orderlist.vue
View file @ 336da5d1
......@@ -106,7 +106,8 @@
</div>
<template v-if="item.IsCommissionGive==1">
<div style="color:red" v-if="item.YFCommissionMoney>0">应发提成：{{item.YFCommissionMoney}}</div>
<div style="color:red;cursor: pointer;text-decoration: underline;" @click='gourltx(item.OrderId)'>已发提成：{{item.CommissionMoney}}</div>
<div style="color:red;cursor: pointer;text-decoration: underline;" @click='gourltx(item.OrderId)'>
已发提成：{{item.CommissionMoney}}</div>
<div style="color:red" v-if="item.ExtraCommissionMoney>0">额外奖励实发：{{item.ExtraCommissionMoney}}</div>
<div style="color:red;" v-if="item.ExtraRewardMoney>0">额外奖励：{{item.ExtraRewardMoney}}</div>
<div style="color:red" v-if="item.ExtraDeductMoney>0">额外扣除：{{item.ExtraDeductMoney}}</div>
......@@ -165,12 +166,10 @@
</div>
</td>
<td style="border:none">
<template v-if="isEditOrder||AuthorityObj.isShowEdit">
<q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400" label="编辑"
@click="editOrder(item)" />
<q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400" label="编辑"
@click="editOrder(item)" />
</template>
<q-btn-dropdown flat size="xs" color="dark" label="更多" style="margin-left:10px;">
<q-list>
<q-item clickable v-close-popup>
......@@ -259,8 +258,15 @@
<td :colspan="12" style="text-align: left">
<div class="row" v-if="item.GuestList&&item.GuestList.length>0">
学生名单：
<span v-for="(x,j) in item.GuestList" :index="j" v-if="x.GuestState==1"
style="color:#2961FE;margin-right: 5px">{{x.GuestName}} </span>
<template v-for="(x,j) in item.GuestList" :index="j">
<span v-if="x.GuestState==1" style="color:#2961FE;margin-right: 5px">{{x.GuestName}} </span>
<span v-else style="color:red;margin-right: 5px">
{{x.GuestName}}
<q-tooltip :offset="[10, 10]">
{{x.GuestStateStr}}
</q-tooltip>
</span>
</template>
</div>
<div v-if="AuthorityObj.isShowContract&&item.GuestList&&item.GuestList.length>0" class="takeContract">
<span @click="isShowPop=true">查看合同</span>
......@@ -970,7 +976,7 @@
});
},
//跳转到预约单号
goVisitorReser(Id){
goVisitorReser(Id) {
this.OpenNewUrl("/sale/appointManagement", {
Id: Id
});
......@@ -1297,7 +1303,7 @@
ContractId: subItem.ContractId
});
},
gourltx(OrderId){
gourltx(OrderId) {
this.OpenNewUrl("/financial/cycleOrderList", {
OrderId: OrderId
});
......
src/pages/activity/advmanager.vue
View file @ 336da5d1
......@@ -13,7 +13,7 @@
<q-btn label="新增" size="sm" color="accent q-px-md" style="font-weight:400 !important" @click="add" />
</div>
<div class="content" >
<vueWaterfallEasy :imgsArr="addatas" ref="waterfall" @scrollReachBottom="handleCurrentChange" :maxCols='7' :imgWidth='208' :enablePullDownEvent='true'>
<vueWaterfallEasy :imgsArr="addatas" ref="waterfall" @scrollReachBottom="handleCurrentChange" :maxCols='7' :imgWidth='208' :enablePullDownEvent='true' v-if="addatas.length>0">
<template slot-scope="props">
<span class="money" v-if="props.value.IsFee==1">￥{{props.value.ChargeAmount.toFixed(2)}}</span>
<span class="free" v-else>{{$t('advmanager.v_free')}}</span>
......@@ -29,8 +29,13 @@
<i class="el-icon-edit" :title="$t('pub.updateMsg')" @click="update(props.value)"></i>
<i class="el-icon-delete" :title="$t('system.table_delete')" @click="delAD(props.value.ID)" ></i>
</div>
</template>
<div slot="waterfall-over">没有更多了</div>
</vueWaterfallEasy>
<div v-if="addatas.length===0" style="text-align:center">
暂无数据
</div>
</div>
<!-- 新增修改广告图 -->
<AdvmanagerForm v-if="showForm" @close="closeruleset" :save-obj="model" @success="getaddatas(0)">
......@@ -116,13 +121,14 @@ export default {
x.src=`${x.SamplePicturesUrl}?x-oss-process=image/resize,w_200`
x.id=x.ID
})
if(type==0){
this.addatas=res.Data.PageData
}else{
this.addatas=this.addatas.concat(res.Data.PageData)
}
this.total=res.Data.Count
if (res.Data.PageData.length == 0) {
if (res.Data.PageData.length == 0) {
this.$refs.waterfall.waterfallOver()
}
}
......
src/pages/activity/makeAd.vue
View file @ 336da5d1
......@@ -9,15 +9,15 @@
<div class="board" ref="board">
<img :src="bg" class="bg" @click="currentNode={},currentNodeList=[]" />
<a style="display:none" ref='down'></a>
<VueDraggableResizable @click="moreSelect()" v-for="item in nodes" tabindex="0" :key="item.nodeId"
<VueDraggableResizable @click="moreSelect()" v-for="item in nodes" tabindex="0" :key="item.nodeId"
:active="item.active" :parent="item.rotate==0||item.rotate==360?true:false"
:style="{transform:'rotate('+item.rotate+'deg)'}" @activated="onActivated(item.nodeId)" :w="item.width"
:style="{transform:'rotate('+item.rotate+'deg)','min-height':'100px !important'}" @activated="onActivated(item.nodeId)" :w="item.width"
:h="item.height" :x="item.x" :y="item.y" :minh='item.fontSize' :minw='item.fontSize' :z="item.zindex"
@resizestop="onResizstop" @dragstop="onDragstop">
<div v-if="item.type==0" class='text'
:style="{'font-size':item.fontSize+'px','letter-spacing':item.letterSpacing+'px','background':item.bg,'font-family':item.fontname,'color':item.color,'line-height':item.lineHeight,'text-align':item.textAlign,'font-weight':(item.isBold==0?'400':'bold'),'font-style':(item.isXie==0?'normal':'italic'),'border-radius':item.radius+'px','text-shadow':item.hshadow+'px '+item.vshadow+'px '+item.blur+'px '+item.shadowcolor,'text-stroke':item.strokeWidth+'px '+item.strokeColor}">
{{item.content}}</div>
<img class="img" v-if="item.type==1" :src="item.src"
<img class="img" v-if="item.type==1" :src="item.src"
:style="{'border-radius':item.radius+'px','box-shadow':item.hshadow+'px '+item.vshadow+'px '+item.blur+'px '+item.shadowcolor,'opacity':(item.alpha/100),'border':item.strokeWidth+'px solid '+item.strokeColor}" />
<div style='height:1px' v-if="item.type==2"
:style="{'border-bottom':item.height+'px '+item.style+' '+item.bg,'border-radius':item.radius+'px','box-shadow':item.hshadow+'px '+item.vshadow+'px '+item.blur+'px '+item.shadowcolor,'opacity':(item.alpha/100)}">
......@@ -288,16 +288,27 @@
</div>
<div class="property-box" v-if='currentNode.type==3 && !isMax'>
<el-form ref="form" :model="currentNode" label-width="80px">
<el-form-item label="内容：">
<el-form-item label="类型：">
<el-select v-model="qrCodeType" placeholder="请选择">
<el-option :key="0" label="普通二维码" :value="0"></el-option>
<el-option :key="1" label="小程序二维码" :value="1"></el-option>
</el-select>
</el-form-item>
<el-form-item label="路径：" v-show="qrCodeType===1">
<el-input v-model="qrPath" >
<template slot="prepend">/pages/</template>
</el-input>
</el-form-item>
<el-form-item label="内容：" v-show="qrCodeType===0">
<el-input type="textarea" v-model="currentNode.content"></el-input>
</el-form-item>
<el-form-item label="背景颜色：">
<el-form-item label="背景颜色：" v-show="qrCodeType===0">
<el-color-picker v-model="currentNode.bg"></el-color-picker>
<label style="margin:0 0 0 15px;vertical-align: top;">前置颜色：</label>
<el-color-picker v-model="currentNode.forecolor"></el-color-picker>
</el-form-item>
<el-form-item label="">
<el-button type="danger" @click='canvasQrCode'>重新生成二维码</el-button>
<el-button type="danger" @click='getQRCode'>重新生成二维码</el-button>
</el-form-item>
<el-form-item label="旋转：">
<el-input-number @mousewheel.native="whellRotate()" v-model="currentNode.rotate" :min="0" :max="360">
......@@ -352,9 +363,8 @@
</div>
</div>
<div class="content">
<vueWaterfallEasy :imgsArr="addatas" ref="waterfall" @scrollReachBottom="handleCurrentChange" :maxCols='7'
:imgWidth='208' :enablePullDownEvent='true'>
:imgWidth='208' :enablePullDownEvent='true' v-if="addatas.length>0">
<template slot-scope="props">
<span class="money" v-if="props.value.IsFee==1">￥{{props.value.ChargeAmount.toFixed(2)}}</span>
<span class="free" v-else>{{$t('advmanager.v_free')}}</span>
......@@ -370,7 +380,11 @@
<i class="el-icon-edit-outline" title="选择此图" @click="chosenbg(props.value)"></i>
</div>
</template>
<div slot="waterfall-over">没有更多了</div>
</vueWaterfallEasy>
<div v-if="addatas.length===0" style="text-align:center">
暂无数据
</div>
</div>
</div>
</div>
......@@ -473,7 +487,10 @@
pageIndex:1,
pageSize:10,
IsFee:0
}
},
qrcodeImg:"",
qrCodeType:0,
qrPath:""
}
},
mounted() {
......@@ -590,7 +607,7 @@
this.st = data.SamplePicturesUrl + '?width=470'
this.templateId = data.AdvertisingID
this.nodes = JSON.parse(data.Content)
console.log('tag1', this.nodes)
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
......@@ -1135,7 +1152,18 @@
this.nodes[this.nodes.length - 1].active = true
this.currentNode = this.nodes[this.nodes.length - 1]
this.currentnodeId = t.nodeId
this.canvasQrCode()
this.getQRCode()
},
getQRCode(){
if(this.qrCodeType===0){
this.canvasQrCode()
}else if(this.qrCodeType===1){
if(this.qrPath.length===0){
this.Error("请填写二维码路径")
return
}
 this.showQRcode(this.qrPath);
}
},
canvasQrCode() {
let that = this
......@@ -1271,7 +1299,23 @@
}
})
}
}
},
  showQRcode(path) {
      this.apipostDS(
        "/api/user/GetWeiXinQRCodeForHT",
        { Path: "/pages/"+path+'?JumpType=17', With: 212 },
        (res) => {
          if (res.data.resultCode == 1) {
            if (res.data.data) {
this.currentNode.src = this.domainManager().mallUrl+ res.data.data;
this.$forceUpdate()
            }
          } else {
            this.Error(res.data.message);
          }
        }
      );
    },
}
}
......
src/pages/activity/myadvert.vue
View file @ 336da5d1
......@@ -14,6 +14,7 @@
<i class="el-icon-delete" title="删除" @click="deleteItem(props.value)"></i>
</div>
</template>
<div slot="waterfall-over">没有更多了</div>
</vueWaterfallEasy>
<div v-if='addatas.length==0' style='width:100%;margin-top:50px;text-align:center;color: #ccc;'>
......
src/pages/financial/lessonCostStatistics.vue
View file @ 336da5d1
......@@ -260,8 +260,22 @@
this.getList()
},
txexport() {
if(this.valuemonth ==null || this.valueyear==null){
this.$q.notify({
type: 'negative',
position: "top",
message: `请选择日期`
})
return
}
let text = '';
if (this.datetype == 2) {
text = this.valuemonth +'课耗统计.xls'
} else if (this.datetype == 1) {
text = this.valueyear+'年课耗统计.xls'
}
var msg = JSON.parse(JSON.stringify(this.msg));
EduDownLoad("/finance/GetTeacherConsumptionHoursStatisticsToExcel", msg, "课耗统计.xls")
EduDownLoad("/finance/GetTeacherConsumptionHoursStatisticsToExcel", msg, text)
}
......
src/pages/financial/studentsClassfee.vue
View file @ 336da5d1
......@@ -278,8 +278,22 @@
this.getList()
},
txexport(){
if(this.valuemonth ==null || this.valueyear==null){
this.$q.notify({
type: 'negative',
position: "top",
message: `请选择日期`
})
return
}
let text = '';
if (this.datetype == 2) {
text = this.valuemonth +'课耗学生明细.xls'
} else if (this.datetype == 1) {
text = this.valueyear+'年课耗学生明细.xls'
}
var msg = JSON.parse(JSON.stringify(this.msg));
EduDownLoad("/finance/GetStudentConsumptionHoursDetialPageListToExcel", msg, "课耗学生明细.xls")
EduDownLoad("/finance/GetStudentConsumptionHoursDetialPageListToExcel", msg, text)
},
gobaoming(Id){
this.OpenNewUrl('/sale/orderStatistics', {
......
src/pages/financial/teacherclassfee.vue
View file @ 336da5d1
......@@ -248,8 +248,22 @@
this.getList()
},
txexport(){
if(this.valuemonth ==null || this.valueyear==null){
this.$q.notify({
type: 'negative',
position: "top",
message: `请选择日期`
})
return
}
let text = '';
if (this.datetype == 2) {
text = this.valuemonth +'课耗老师明细.xls'
} else if (this.datetype == 1) {
text = this.valueyear+'年课耗老师明细.xls'
}
var msg = JSON.parse(JSON.stringify(this.msg));
EduDownLoad("/finance/GetTeacherConsumptionHoursDetialPageListToExcel", msg, "课耗老师明细.xls")
EduDownLoad("/finance/GetTeacherConsumptionHoursDetialPageListToExcel", msg, text)
}
},
......
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