Skip to content

C
confucius
Commit 7db2ed1f authored by 黄奎's avatar 黄奎
Browse files
Options

页面修改

parent 21a9c8c6
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 2801 additions and 2459 deletions
src/components/activity/advmanager-form.vue
View file @ 7db2ed1f
This diff is collapsed.
src/components/course/classinfo-form.vue
View file @ 7db2ed1f
......@@ -155,8 +155,6 @@
}
},
mounted() {
// this.queryClassInfo();
console.log(this.isShowEditBtn,'this.isShowEditBtn');
if(this.isShowEditBtn==1){
this.isShowMyBtn=1
}
......
src/components/editor/UeEditor.vue
View file @ 7db2ed1f
......@@ -69,7 +69,6 @@
},
watch: {
value(newVal, oldVal) {
console.log("监听到变化1",newVal,this.ue.isReady,this.isInputChange)
if (!this.isInputChange) {
if (this.ue) {
if (this.ue.isReady !== 1) {
......@@ -85,7 +84,7 @@
}, 100);
return;
}
console.log("监听到变化",newVal)
("监听到变化",newVal)
this.ue.setContent(newVal);
} else {
this.tempContent = newVal;
......
src/components/sale/activeOrder-form.vue
View file @ 7db2ed1f
......@@ -109,7 +109,6 @@
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
......@@ -119,8 +118,6 @@
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
......
src/components/sale/backbill-form.vue
View file @ 7db2ed1f
This diff is collapsed.
src/components/sale/backinfo-form.vue deleted 100644 → 0
View file @ 21a9c8c6
This diff is collapsed.
src/components/sale/changebill-form.vue 0 → 100644
View file @ 7db2ed1f
<!--退课表单审核信息-->
<style>
.backbill-Dialog .drawerTop {
width: 100%;
height: 50px;
display: flex;
justify-content: space-between;
background-color: #F0F5FB;
padding: 5px 10px;
align-items: center;
}
.backbill-Dialog .classFirst {
color: #000000;
font-weight: bold;
}
.backbill-Dialog .className {
margin-left: 10px;
}
.backbill-Dialog .classStatus {
padding: 3px 8px;
background-color: #c8d7fc;
color: #2961FE;
font-size: 12px;
border-radius: 2px;
margin-left: 20px;
}
.backbill-Dialog .normalName {
color: #999999;
}
.backbill-Dialog .normalInner {
color: #111111;
}
.drop_NameDown {
margin-top: 20px;
width: 300px;
}
</style>
<template>
<q-dialog v-model="persistent" maximized full-height seamless position="right" @hide="closeShenheForm">
<q-card style="margin-top:61px;width:850px" class="no-border-radius backbill-Dialog">
<div class="drawerTop">
<div style="display:flex;align-items:center;">
<div class="className">
<div class="classFirst">调课审批</div>
</div>
</div>
</div>
<q-tabs style="margin:15px;" v-model="tabCheck" narrow-indicator dense align="left" class="text-primary">
<q-tab :ripple="false" name="first" label="详细信息" />
<q-tab :ripple="false" name="second" label="审批记录" />
</q-tabs>
<div v-if="tabCheck=='first'" style="margin:0 15px;">
<!--  <backinfoForm :seting-obj="setingObj" :showType="showType" @close="closeShenheForm" @success="refreshPage">
</backinfoForm> -->
</div>
<div v-if="tabCheck=='second'">
 <backflowForm :seting-obj="setingObj" :showType="showType" @close="closeShenheForm" @success="refreshPage">
</backflowForm>
</div>
</q-card>
<div class="dialog-out-close" @click="closeShenheForm"
style="height:40px !important;border-top-left-radius: 4px !important;border-bottom-left-radius: 4px !important;">
<q-icon name="iconfont icon-jujue1" size="26px" />
</div>
</q-dialog>
</template>
<script>
import flowinfoForm from '../sale/flowinfo-form';
export default {
props: {
setingObj: {
type: Object,
default: null
},
showType: {
type: Number,
default: 1
},
},
components: {
flowinfoForm,
},
data() {
return {
persistent: true,
tabCheck: 'first', //默认选第一个
loading: false,
}
},
created() {
console.log("setingObj", this.setingObj)
},
mounted() {},
methods: {
refreshPage() {
this.persistent = false;
this.$emit('success');
},
closeShenheForm() {
this.persistent = false;
this.$emit('close');
},
}
}
</script>
src/components/sale/backflow-form.vue → src/components/sale/flowinfo-form.vue
View file @ 7db2ed1f
<style>
.backflowMain {
.eduflowMain {
width: 90%;
margin: auto;
height: auto;
......@@ -8,14 +8,14 @@
padding-bottom: 15px;
}
.backflowMain .backflow_Top {
.eduflowMain .backflow_Top {
position: relative;
width: 100%;
height: 36px;
line-height: 36px;
}
.backflowMain .back_Circle {
.eduflowMain .back_Circle {
width: 36px;
height: 36px;
background-color: #2961FE;
......@@ -29,13 +29,13 @@
font-size: 12px;
}
.backflowMain .back_Name {
.eduflowMain .back_Name {
color: #2D2D2D;
font-weight: bold;
font-size: 15px;
}
.backflowMain .back_OrderStatus {
.eduflowMain .back_OrderStatus {
padding: 1px 5px;
background: #FEB528;
color: #fff;
......@@ -44,29 +44,29 @@
border-radius: 3px;
}
.backflowMain .back_Bottom {
.eduflowMain .back_Bottom {
height: auto;
margin: 10px 0 0 10px;
padding-bottom: 15px;
}
.backflowMain .back_subList {
.eduflowMain .back_subList {
display: flex;
align-items: center;
justify-content: space-between;
}
.backflowMain .back_Time {
.eduflowMain .back_Time {
color: #2D2D2D;
font-size: 12px;
}
.backflowMain .back_Names {
.eduflowMain .back_Names {
color: #2D2D2D;
font-size: 14px;
}
.backflowMain .back_remark {
.eduflowMain .back_remark {
position: relative;
background-color: #EEEEEF;
min-height: 40px;
......@@ -76,11 +76,11 @@
}
.back_Bottom:last-child,
.backflowMain:last-child {
.eduflowMain:last-child {
padding-bottom: 0;
}
.backflowMain .triangle_border_up {
.eduflowMain .triangle_border_up {
width: 0;
height: 0;
border-width: 0 7px 10px;
......@@ -93,28 +93,28 @@
left: 15px;
}
.backflowContent {
.eduflowContent {
padding-bottom: 40px;
height: 770px;
overflow: auto;
margin-bottom: 40px;
}
.backflowContent::-webkit-scrollbar {
.eduflowContent::-webkit-scrollbar {
width: 3px;
height: 3px;
background-color: #F5F5F5;
}
/*!*定义滚动条轨道 内阴影+圆角*!*/
.backflowContent::-webkit-scrollbar-track {
.eduflowContent::-webkit-scrollbar-track {
-webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3);
border-radius: 10px;
background-color: #F5F5F5;
}
/*!*定义滑块 内阴影+圆角*!*/
.backflowContent::-webkit-scrollbar-thumb {
.eduflowContent::-webkit-scrollbar-thumb {
border-radius: 10px;
-webkit-box-shadow: -webkit-gradient(linear, 0 0, 0 100%, color-stop(.5, rgba(255, 255, 255, .2)), color-stop(.5, transparent), to(transparent));
background-color: #0ae;
......@@ -122,12 +122,13 @@
</style>
<template>
<div class="backflowContent">
<div class="backflowMain" v-for="(item,index) in DataList" :key="index">
<div class="eduflowContent">
<div class="eduflowMain" v-for="(item,index) in DataList" :key="index">
<div class="backflow_Top">
<div class="back_Circle">{{item.AduitStatusName}}</div>
<span class="back_Name">{{item.NodeName}}</span>
<span class="back_OrderStatus" v-if="item.AuditWayName && item.SubList&&item.SubList.length>1">{{item.AuditWayName}}</span>
<span class="back_OrderStatus"
v-if="item.AuditWayName && item.SubList&&item.SubList.length>1">{{item.AuditWayName}}</span>
</div>
<div class="back_Bottom" v-for="(subItem,subIndex) in item.SubList" :key="subIndex">
<div class="back_subList">
......@@ -149,7 +150,7 @@
<script>
import {
GetEduReceiptInfo
GetEduReceiptInfo
} from '../../api/teacher/index'
export default {
props: {
......@@ -178,7 +179,7 @@
},
methods: {
getStuBaclFlow() {
GetEduReceiptInfo (this.qMsg).then(res => {
GetEduReceiptInfo(this.qMsg).then(res => {
if (res.Code == 1) {
this.DataList = res.Data
}
......
src/components/sale/myActiveOrder-form.vue
View file @ 7db2ed1f
......@@ -12,7 +12,7 @@
<div
style="background: rgba(2, 196, 153, 0.2);border-radius: 4px;text-align: center;padding: 2px 13px;margin-left: 30px">
<!-- <span style="color: #02C499">{{Detail.OrderStateName}}</span> -->
<span style="color: #02C499" v-if="saveObj.Status ===0">正常</span>
<span style="color: #02C499" v-if="saveObj.Status ===1">已取消</span>
</div>
......@@ -108,7 +108,7 @@
</div>
<div class="col-6 row">
<span class="two-left">实收：</span>
<div class="two-r">
<template v-if="saveObj.Income>0 ">
{{getTwoWei(saveObj.Income)}}
......@@ -125,24 +125,24 @@
<div class="col-6 row">
<span class="two-left">平台税金：</span>
<div class="two-r">
<template v-if="saveObj.PlatformTax>0">
{{getTwoWei(saveObj.PlatformTax)}}
<template v-if="saveObj.PlatformTax>0">
{{getTwoWei(saveObj.PlatformTax)}}
</template>
<template v-else>
<span class="redstyle">0</span>
</template>
</div>
</div>
<div class="col-6 row">
<span class="two-left">结束时间：</span>
<span class="two-r">{{saveObj.EndTime}}</span>
</div>
<div class="col-6 row">
<div class="col-6 row">
<span class="two-left">退款：</span>
<div class="two-r">
<template v-if="saveObj.RefundPrice>0">
{{getTwoWei(saveObj.RefundPrice)}}
{{getTwoWei(saveObj.RefundPrice)}}
</template>
<template v-else>
<span class="redstyle">0</span>
......@@ -218,20 +218,20 @@
</div>
</el-timeline-item> -->
<el-timeline-item color="#2961FE">
<div v-if="saveObj.Remark">
{{saveObj.Remark}}
</div>
<div v-else>
暂无
</div>
<div v-if="saveObj.Remark">
{{saveObj.Remark}}
</div>
<div v-else>
暂无
</div>
</el-timeline-item>
<el-timeline-item color="#8175FB">
<div v-if="saveObj.CancelRemark">
{{saveObj.CancelRemark}}
{{saveObj.CancelRemark}}
</div>
<div v-else>
暂无
</div>
<div v-else>
暂无
</div>
</el-timeline-item>
</el-timeline>
<!-- <q-pagination class="full-width justify-end" v-model="msg2.PageIndex" color="primary" :max="pageCount2"
......@@ -575,19 +575,14 @@
}
},
created() {
console.log(507, this.saveObj)
if (this.saveObj.tab) {
this.tab = (this.saveObj.tab).toString();
}
this.msg.OrderId = this.saveObj.OrderId;
this.msg2.OrderId = this.saveObj.OrderId;
this.msg3.SourceId = this.saveObj.OrderId;
this.msg.ClassId = this.saveObj.ClassId;
this.getOrderInfo()
// this.getRolelist()
// this.getRemarkList()
// this.OrderLogList()
},
methods: {
Financial_post_GetFinancLogList: function (id) { // 获取单据日志
......@@ -606,22 +601,11 @@
}
}, null)
},
// getOrderInfo() {
// getClassOrderForDetail({
// OrderId: this.saveObj.Id
// }).then(res => {
// this.Detail = res.Data;
// this.getfinanciaALLPageList(1, this.Detail.ClassId, this.Detail.OrderId) //财务单据
// }).catch(() => {
// })
// },
getOrderInfo() {
this.apipostDS("/api/Education/GetActivityBalanceSheet", {
Id: this.saveObj.ActivityId,
OrderId: this.saveObj.Id
}, (res) => {
console.log(553, this.dataList)
if (res.data.resultCode === 1) {
this.dataList = res.data.data.FiniceReciveList;
this.dataListp = res.data.data.FinicePayList;
......
src/components/schedul/vacationPlan-form.vue
View file @ 7db2ed1f
......@@ -89,8 +89,8 @@
}
this.addMsg.StartTime = this.date[0]
this.addMsg.EndTime = this.date[1]
console.log(97, this.date, this.addMsg)
if (this.addMsg.StartTime == "" || this.addMsg.EndTime == ""||!this.addMsg.StartTime||!this.addMsg.EndTime) {
if (this.addMsg.StartTime == "" || this.addMsg.EndTime == "" || !this.addMsg.StartTime || !this.addMsg
.EndTime) {
this.$q.notify({
icon: "error",
color: "negative",
......@@ -99,15 +99,14 @@
})
return
}
setHolidayPlan(this.addMsg).then(res=>{
if(res.Code===1){
this.Success(res.Message)
this.closeVisitForm();
this.$emit("success")
}
setHolidayPlan(this.addMsg).then(res => {
if (res.Code === 1) {
this.Success(res.Message)
this.closeVisitForm();
this.$emit("success")
}
})
},
}
};
......
src/components/teacher/changeClassForm.vue
View file @ 7db2ed1f
This diff is collapsed.
src/pages/activity/activeDetail.vue
View file @ 7db2ed1f
......@@ -195,11 +195,10 @@
...this.msg,
...this.activeBaseData
}
console.log(144, msg)
this.apipostDS("/api/Education/SetActivity", msg, (res) => {
if (res.data.resultCode === 1) {
this.Success(res.data.message);
// this.getDetail()
this.$router.push("/activity/activityList")
} else {
this.Error(res.data.message);
......
src/pages/activity/activeSignUpList.vue
View file @ 7db2ed1f
......@@ -313,12 +313,10 @@
},
//同意
agreeApply(item) {
console.log(305,item)
this.bdMsg.Id = item.Id;
this.bdMsg.ApplyForCancelStatus = 1;
this.apipostDS("/api/Education/SetCommerceConsultApplyCancel", this.bdMsg, res => {
if (res.data.resultCode == 1) {
// location.reload();
this.Success("操作成功")
this.getList()
} else {
......
src/pages/activity/advmanager.vue
View file @ 7db2ed1f
<style>
@import "../../assets/css/advert/advmanager.css";
@import "../../assets/css/advert/advmanager.css";
</style>
<template>
<div class="advmanager-box page-body">
<div class="page-search row items-center">
<div class="col row wrap q-mr-lg q-col-gutter-md">
<div class="col-3">
<q-select @input="getaddatas(0)" standout="bg-primary text-white" v-model="adMsg.IsFee" :options="statusOpts"
emit-value map-options label="类型" />
</div>
</div>
<q-btn label="新增" size="sm" color="accent q-px-md" style="font-weight:400 !important" @click="add" />
<div class="advmanager-box page-body">
<div class="page-search row items-center">
<div class="col row wrap q-mr-lg q-col-gutter-md">
<div class="col-3">
<q-select @input="getaddatas(0)" standout="bg-primary text-white" v-model="adMsg.IsFee" :options="statusOpts"
emit-value map-options label="类型" />
</div>
<div class="content" >
<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>
<div class="star-box">
<i class="iconfont icon-star star"></i>&nbsp; {{props.value.AdvertisingCount}}
</div>
<div class="label-box" v-if="props.value.LableList.length>0">
<div v-for="(item,index) in props.value.LableList" :key="index" class="ad-label" v-if="index<3">
{{ item }}
</div>
</div>
<div class="zezhao">
<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>
<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' 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>
<div class="star-box">
<i class="iconfont icon-star star"></i>&nbsp; {{props.value.AdvertisingCount}}
</div>
<div class="label-box" v-if="props.value.LableList.length>0">
<div v-for="(item,index) in props.value.LableList" :key="index" class="ad-label" v-if="index<3">
{{ item }}
</div>
</div>
<!-- 新增修改广告图 -->
<AdvmanagerForm v-if="showForm" @close="closeruleset" :save-obj="model" @success="getaddatas(0)">
</AdvmanagerForm>
</div>
<div class="zezhao">
<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)">
</AdvmanagerForm>
</div>
</template>
<script>
import vueWaterfallEasy from 'vue-waterfall-easy';
import AdvmanagerForm from "../../components/activity/advmanager-form"
import {getAdvertisingList,delAd} from '../../api/AD/index.js'
export default {
data(){
return{
addatas:[],
model:{},
statusOpts:[
{
import vueWaterfallEasy from 'vue-waterfall-easy';
import AdvmanagerForm from "../../components/activity/advmanager-form"
import {
getAdvertisingList,
delAd
} from '../../api/AD/index.js'
export default {
data() {
return {
addatas: [],
model: {},
statusOpts: [{
label: "全部",
value: 0
},
......@@ -65,90 +69,90 @@ export default {
label: "免费",
value: 2
}
],
showForm:false,
adMsg:{
pageIndex:1,
pageSize:10,
IsFee:0
}
],
showForm: false,
adMsg: {
pageIndex: 1,
pageSize: 10,
IsFee: 0
}
}
},
mounted(){
this.getaddatas(0)
mounted() {
this.getaddatas(0)
},
components: {
vueWaterfallEasy,
AdvmanagerForm
vueWaterfallEasy,
AdvmanagerForm
},
methods:{
//关闭弹窗
methods: {
//关闭弹窗
closeruleset() {
this.showForm = false;
},
// 新增
add(){
this.showForm=true
this.model={
ID:0,
IsFee:2,
ChargeAmount:0,
PictureUrl:"",
SamplePicturesUrl:"",
Title:"",
LableList:[]
}
// 新增
add() {
this.showForm = true
this.model = {
ID: 0,
IsFee: 2,
ChargeAmount: 0,
PictureUrl: "",
SamplePicturesUrl: "",
Title: "",
LableList: []
}
},
update(x){
console.log(x)
this.showForm=true
this.model=x
},
handleCurrentChange() {
this.adMsg.pageIndex++
this.getaddatas(1)
},
//获取广告图列表
getaddatas(type){
if(type===0){
this.adMsg.pageIndex=1
}
getAdvertisingList(this.adMsg).then(res=>{
if(res.Code===1){
console.log(397,res)
res.Data.PageData.forEach(x=>{
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) {
this.$refs.waterfall.waterfallOver()
}
}
})
},
//删除广告图
delAD(id){
delAd({BAID:id}).then(res=>{
if(res.Code===1){
this.$message.success('删除成功')
this.getaddatas(0)
}else{
this.$message.error(res.message)
}
})
update(x) {
this.showForm = true
this.model = x
},
handleCurrentChange() {
this.adMsg.pageIndex++
this.getaddatas(1)
},
//获取广告图列表
getaddatas(type) {
if (type === 0) {
this.adMsg.pageIndex = 1
}
getAdvertisingList(this.adMsg).then(res => {
if (res.Code === 1) {
res.Data.PageData.forEach(x => {
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) {
this.$refs.waterfall.waterfallOver()
}
}
})
},
//删除广告图
delAD(id) {
delAd({
BAID: id
}).then(res => {
if (res.Code === 1) {
this.$message.success('删除成功')
this.getaddatas(0)
} else {
this.$message.error(res.message)
}
})
}
}
}
</script>
}
</script>
src/pages/activity/makeAd.vue
View file @ 7db2ed1f
......@@ -653,7 +653,7 @@
new browserMD5File(blob, function (err, md5) {
msg.SecretKey = md5;
saveMakeAd(msg).then(res => {
console.log(651, res)
})
})
}
......@@ -844,16 +844,6 @@
});
},
uploadImage(name, file) {
// let newArr = [];
// newArr.push(file);
// var path = `/Adv/user/${this.user.EmployeeId}/${name}`;
// this.uploadSelfBlob(path, newArr, x => {
// console.log(848,x)
// });
// UploadViittoBlobFile ("ad",file,(res)=>{
// console.log(864,res);
// })
},
operation(type) {
......@@ -1317,7 +1307,6 @@
(res) => {
if (res.data.resultCode == 1) {
if (res.data.data) {
console.log(this.domainManager().mallUrl,res.data.data)
let getBlob = this.getAnyFileBlob(this.domainManager().mallUrl + res.data.data)
let that = this
getBlob.then(blob => {
......
src/pages/activity/materialMan.vue
View file @ 7db2ed1f
......@@ -527,7 +527,6 @@
});
},
UploadImage(file) {
console.log(530,file)
this.UploadFileToTencent(this.FileType().GoodsImg, file.file, res => {
if (res.resultCode == 1) {
this.Success('上传成功')
......@@ -540,27 +539,11 @@
}
})
},
//上传视频
// UploadVideo(file) {
// var that = this;
// UploadViittoFile('Edu/Video', file.file, res => {
// console.log("res",res);
// if (res.Code == 1) {
// this.Success('上传成功')
// that.addpageMsg.Image = res.VideoCoverImg;
// that.addpageMsg.Path = res.FileUrl;
// that.addpageMsg.Name = res.FileName;
// that.addPageList();
// that.$forceUpdate();
// }
// })
// },
UploadVideo(file) {
var that = this;
this.UploadFileToTencent(this.FileType().Video, file.file, res => {
if (res.resultCode == 1) {
this.Success('上传成功')
console.log(561,res)
if (this.addpageMsg.Type == 2) {
this.addpageMsg.Image = "";
}
......@@ -731,13 +714,10 @@
//截取视频第一帧
captureImage(video) {
let canvas = document.createElement('canvas')
// canvas.width = video.videoWidth
// canvas.height = video.videoHeight
canvas.width = '140px'
canvas.height = '140px'
let ctx=canvas.getContext('2d')
console.log(816,ctx)
ctx.drawImage(video, 0, 0, canvas.width, canvas.height)
let ctx=canvas.getContext('2d')
ctx.drawImage(video, 0, 0, canvas.width, canvas.height)
return canvas.toDataURL('image/png')
}
},
......
src/pages/classroom/components/schedul-head.vue
View file @ 7db2ed1f
......@@ -110,7 +110,7 @@
watch: {
dataList: {
handler(val) {
console.log(78, val)
}
}
}
......
src/pages/course/chapter.vue
View file @ 7db2ed1f
......@@ -211,8 +211,6 @@
}).then(r => {
this.updateNo = true;
this.getchaperTree();
//this.$refs.chapterTree.remove(data.ChapterId);
this.$q.notify({
icon: "iconfont icon-chenggong",
color: "accent",
......@@ -223,7 +221,7 @@
});
})
.onCancel(() => {
// console.log('>>>> Cancel')
});
},
batchUpdate() {
......@@ -248,14 +246,12 @@
return list;
},
rowsClick(row, column, event) {
//console.log(row,event)
this.$refs.chapterTab.toggleRowExpansion(row);
},
//新增修改章节
EditChapter(obj) {
// this.$router.push({
// path: '/chapter-editor?courseId='+this.CourseId
// });
if (!obj) {
openURL(
window.location.origin +
......@@ -281,7 +277,7 @@
res.Data.forEach(x => {
this.expandKeys.push(x.ChapterId);
});
console.log(this.expandKeys);
this.dataList = res.Data;
if (this.updateNo) {
......
src/pages/course/chapterEditor.vue
View file @ 7db2ed1f
......@@ -218,7 +218,6 @@
})
},
changeNode(data, node, ev) {
console.log(data,'data');
if (this.chapter && this.chapter.ChapterId > 0) {
if (this.defauRateObj.Id != 0) {
this.chapter.CourseRate = this.defauRateObj.Id
......@@ -314,7 +313,7 @@
})
})
}).onCancel(() => {
// console.log('>>>> Cancel')
})
},
......@@ -367,7 +366,7 @@
moveUp() {
let data = this.$refs.chapterTree.getCurrentNode()
let node = this.$refs.chapterTree.getNode(data.ChapterId)
console.log(data)
if (node) {
let noTemp = data.ChapterNo.toString().split('.')
let no = parseInt(noTemp[noTemp.length - 1]) - 1
......@@ -389,7 +388,7 @@
moveDown() {
let data = this.$refs.chapterTree.getCurrentNode()
let node = this.$refs.chapterTree.getNode(data.ChapterId)
console.log(data)
if (node) {
let noTemp = data.ChapterNo.toString().split('.')
let no = parseInt(noTemp[noTemp.length - 1]) - 1
......@@ -468,19 +467,18 @@
}
},
handleDragStart(node, ev) {
console.log('drag start', node);
},
handleDragEnter(draggingNode, dropNode, ev) {
console.log('tree drag enter: ', dropNode.label);
},
handleDragLeave(draggingNode, dropNode, ev) {
console.log('tree drag leave: ', dropNode.label);
},
handleDragOver(draggingNode, dropNode, ev) {
console.log('tree drag over: ', dropNode.label);
},
handleDragEnd(draggingNode, dropNode, dropType, ev) {
console.log(draggingNode, dropNode, dropType)
this.updateChapters = []
if (dropType == 'inner') {
draggingNode.data.ParentId = dropNode.data.ChapterId
......@@ -494,11 +492,7 @@
},
handleDrop(draggingNode, dropNode, dropType, ev) {},
allowDrop(draggingNode, dropNode, type) {
// if (dropNode.data.ChapterName === '二级 3-1') {
// return type !== 'inner';
// } else {
return true;
//}
},
allowDrag(draggingNode) {
return true;
......@@ -508,7 +502,6 @@
queryChapterTree({
CourseId: this.courseId
}).then(r => {
console.log(r);
this.dataList = r.Data
this.canOptions = false
if (this.defaultChapterId != 0) {
......@@ -587,7 +580,7 @@
},
batchUpdate() {
batchUpdateChapterNo(this.updateChapters).then(r => {
console.log(x)
})
},
//点击导入
......
src/pages/course/classHourReward.vue
View file @ 7db2ed1f
......@@ -581,7 +581,6 @@
},
generalFinancacls(item){
this.CheckID = item.Id
console.log(item)
if(item.Money>0){
this.getcomSendEmployeeList()
}else{
......
src/pages/course/lessonPreparation.vue
View file @ 7db2ed1f
......@@ -380,17 +380,14 @@ export default {
methods: {
getList() {
GetClassLessPlan(this.msg).then(res => {
console.log(res.Data)
if (res.Code == 1) {
let data = res.Data;
if (data.Chapter && data.Chapter.length>0) {
if(!data.Chapter[0].ChildList || data.Chapter[0].ChildList.length==0){
console.log(data.Chapter[0].ChildList.length)
data.Chapter[0].ChildList=[]
data.Chapter[0].ChildList.push(data.Chapter[0])
}
this.chapters = data.Chapter
}
this.courseName=data.CourseName
// this.addMsg.CourseNum = data.CourseNum;
......
src/pages/course/prepareclassDetails.vue
View file @ 7db2ed1f
......@@ -578,7 +578,7 @@
let data=res.Data;
if (data.Chapter && data.Chapter.length>0) {
if(!data.Chapter[0].ChildList || data.Chapter[0].ChildList.length==0){
console.log(data.Chapter[0].ChildList.length)
data.Chapter[0].ChildList=[]
data.Chapter[0].ChildList.push(data.Chapter[0])
}
......
src/pages/financial/orderCompleteStatistics.vue
View file @ 7db2ed1f
......@@ -630,7 +630,6 @@
},
goUrl(path,Names){
let Name = encodeURI(Names)
console.log(Name)
this.OpenNewUrl(path, {
Name: Name,
});
......
src/pages/financial/saleAchievementsRank.vue
View file @ 7db2ed1f
......@@ -337,7 +337,6 @@
d1.setMonth(d1.getMonth()+1);
var month = d1.getMonth()+1;
EndTime = d1.getFullYear()+'-'+month
console.log(EndTime)
}
this.OpenNewUrl('/sale/orderStatistics' , {
EnterID:row.EnterID,
......
src/pages/financial/teacherclassfee.vue
View file @ 7db2ed1f
......@@ -224,10 +224,8 @@
if(this.$route.query && this.$route.query.ClassName){
let Name = decodeURI(this.$route.query.ClassName)
this.ClassName = [Name]
console.log(Name)
this.msg.pageSize = 1000
}
},
mounted() {
this.getList();//获取提成周期列表
......
src/pages/sale/activeOrderStatistics.vue
View file @ 7db2ed1f
......@@ -265,17 +265,7 @@
this.apipostDS("/api/Education/GetConsultOrderStatisticsPage", msg, (res) => {
this.loading = false
if (res.data.resultCode === 1) {
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/scheduling/vacationPlan.vue
View file @ 7db2ed1f
......@@ -204,7 +204,6 @@
}
}).onOk(() => {
delHolidayPlan({HolidayId:item.HolidayId}).then(res=>{
console.log(res)
if(res.Code===1){
this.$message.success("操作成功")
that.resetSearch()
......
src/pages/teacher/changeClassManager.vue
View file @ 7db2ed1f
......@@ -189,7 +189,6 @@
billObj: {}, //单据信息
showType: 1, //1-查看，2-审核
OrderTypeList: [],
}
},
created() {
......
src/pages/teacher/studentManager.vue
View file @ 7db2ed1f
......@@ -330,7 +330,6 @@
this.loading = true;
GetStuPageList(this.msg).then(res => {
this.loading = false
console.log(439, res)
if (res.Code === 1) {
this.data = res.Data.PageData
this.pageCount = res.Data.PageCount
......
src/pages/teacher/teacherclassSee.vue
View file @ 7db2ed1f
......@@ -224,7 +224,6 @@
if(this.$route.query && this.$route.query.ClassName){
let Name = decodeURI(this.$route.query.ClassName)
this.ClassName = [Name]
console.log(Name)
this.msg.pageSize = 1000
}
let data=JSON.parse( localStorage.getItem("loginUserInfo"))
......
src/pages/user/billquery.vue 0 → 100644
View file @ 7db2ed1f
<style>
.Sysuser_Date .el-range-editor .el-range-input {
background-color: transparent;
}
.Sysuser_Date .el-range-editor.el-input__inner {
background-color: transparent;
}
.ReceipTypeName {
display: inline-block;
padding: 2px 8px;
color: white;
background-color: rgb(233, 82, 82);
line-height: 16px;
border-radius: 4px;
}
</style>
<template>
<div class="page-body">
<div class="page-search row items-center">
<div class="col row wrap q-col-gutter-md">
<div class="col-3">
<q-input @change="resetSearch" clearable filled v-model="msg.Id" label="单据编号" />
</div>
<div class="col-3">
<q-select @input="resetSearch" clearable filled v-model="msg.AuditStatus" :options="ShowOpts" emit-value
map-options label="审核状态" />
</div>
<div class="col-3">
<q-select @input="resetSearch" clearable option-value="Id" option-label="Name" filled
v-model="msg.ReceiptType" :options="OrderTypeList" emit-value map-options label="单据类型" />
</div>
<div class="col-3 Sysuser_Date">
<q-field filled>
 <template v-slot:control>
<el-date-picker v-model="applyDateList" @change="resetSearch()" value-format="yyyy-MM-dd" type="daterange" style="border:none;"
 range-separator="至"  start-placeholder="申请开始日期"  end-placeholder="申请结束日期">
 </el-date-picker>       
</template>
</q-field>
</div>
</div>
</div>
<div class="page-content">
<q-table :pagination="msg" :loading="loading" no-data-label="暂无相关数据" flat class="sticky-tow-column-table"
separator="none" :data="data" :columns="columns" row-key="name">
<template v-slot:body-cell-ReceiptTypeName="props">
<q-td :props="props">
<span class="ReceipTypeName">{{props.row.ReceiptTypeName}}</span>
</q-td>
</template>
<template v-slot:bottom>
<q-pagination class="full-width justify-end" v-model="msg.pageIndex" color="primary" :max="pageCount"
:input="true" @input="changePage" />
</template>
<template v-slot:body-cell-optioned="props">
<q-td :props="props">
<q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400" label="查看"
@click="showBillForm(props.row,1)" />
</q-td>
</template>
</q-table>
<backbill-form v-if="isShowBackBillForm" :seting-obj="billObj" :showType="showType" @close="closeBillForm"
@success="refreshPage">
</backbill-form>
<changebill-form v-if="isShowChangeBillForm" :seting-obj="billObj" :showType="showType" @close="closeBillForm"
@success="refreshPage">
</changebill-form>
</div>
</div>
</template>
<script>
import {
GetEducationReceiptPage,
GetEducationReceiptType
} from '../../api/teacher/index'
import backbillForm from '../../components/sale/backbill-form';
import changebillForm from '../../components/sale/changebill-form';
export default {
meta: {
title: "教务单据查询"
},
components: {
backbillForm,
changebillForm,
},
data() {
return {
currentUrl: "",
columns: [{
name: 'Id',
label: '单号',
field: 'Id',
align: 'left'
}, {
name: 'Title',
label: '标题',
field: 'Title',
align: 'left'
},
{
name: 'ReceiptTypeName',
label: '单据类型',
field: 'ReceiptTypeName',
align: 'left'
},
{
name: 'AuditStatusName',
label: '审核状态',
field: 'AuditStatusName',
align: 'left'
},
{
name: 'CreateByName',
label: '创建人',
field: 'CreateByName',
align: 'left'
},
{
name: 'CreateTime',
label: '创建时间',
field: 'CreateTime',
align: 'left'
},
{
name: 'optioned',
label: '操作',
field: 'BackId'
}
],
data: [],
loading: true,
applyDateList: [], //申请日期
ShowOpts: [{
label: '审核中',
value: '1'
},
{
label: '通过',
value: '2'
},
{
label: '驳回',
value: '3'
},
{
label: '作废',
value: '4'
}
],
msg: {
pageIndex: 1,
pageSize: 12,
rowsPerPage: 12,
Id: "", //单据编号
AuditStatus: "", //审核状态
StartTime: "", //开始时间
EndTime: "", //结束时间
Conditon: '0',
ReceiptType: '' //单据类型
},
pageCount: 0,
isShowBackBillForm: false, //是否显示退课单据
isShowChangeBillForm: false, //是否显示调课单据
billObj: {}, //单据信息
showType: 1, //1-查看，2-审核
OrderTypeList: [],
}
},
created() {
},
mounted() {
this.currentUrl = this.$route.path;
this.getEducationType();
this.getStuBackBill();
},
methods: {
//跳转到财务单据
goFinaceUrl(path, rowData) {
this.$router.push({
path: '/financial/financalDocument/' + path,
query: {
"id": rowData.FinanceId,
blank: 'y',
tab: '单据详情'
}
})
},
//生成财务单据
createBillForm(item) {
this.billObj = item;
},
//关闭表单
closeBillForm() {
this.isShowBackBillForm = false;
this.isShowChangeBillForm = false;
this.billObj = {};
},
//显示表单
showBillForm(item, type) {
//调课
if (item.ReceiptType == 1) {
this.isShowChangeBillForm = true;
}
//退课
else if (item.ReceiptType == 2) {
this.isShowBackBillForm = true;
}
this.showType = type;
this.billObj = item;
},
//重新查询
resetSearch() {
this.msg.pageIndex = 1;
this.getStuBackBill();
},
//翻页
changePage(val) {
this.msg.pageIndex = val;
this.getStuBackBill();
},
//获取退课单据分页列表
getStuBackBill() {
this.loading = true;
this.data = [];
this.pageCount = 0;
if (this.applyDateList && this.applyDateList.length > 0) {
this.msg.StartTime = this.applyDateList[0];
this.msg.EndTime = this.applyDateList[1];
} else {
this.msg.StartTime = '';
this.msg.EndTime = '';
}
GetEducationReceiptPage(this.msg).then(res => {
this.loading = false;
this.data = res.Data.PageData;
this.pageCount = res.Data.PageCount;
}).catch(() => {
this.loading = false;
})
},
//刷新页面
refreshPage() {
this.isShowBackBillForm = false;
this.isShowChangeBillForm = false;
this.billObj = {};
this.getStuBackBill();
},
//获取下拉数据
getEducationType() {
GetEducationReceiptType().then(res => {
if (res.Code == 1) {
this.OrderTypeList = res.Data;
}
}).catch(() => {})
}
},
watch: {
tabCheck: function (val) {
this.resetSearch();
}
}
}
</script>
<style lang="sass">
@import url('~assets/css/table.sass')
</style>
src/router/routes.js
View file @ 7db2ed1f
......@@ -816,6 +816,11 @@ const routes = [{
component: () =>
import("pages/user/backbill.vue")
},
{
path: "/user/billquery", //单据查询
component: () =>
import("pages/user/billquery.vue")
},
{
path: "/user/personalData", //个人资料
component: () =>
......
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