Skip to content

E
ElectricitySheep
Commit 8452a17d authored by zhengke's avatar zhengke
Browse files
Options

xiugai

parent c8e91451
Show whitespace changes
Inline Side-by-side
Showing with 489 additions and 609 deletions
src/App.vue
View file @ 8452a17d
......@@ -11,7 +11,7 @@ export default {
</script>
<style>
@import "//at.alicdn.com/t/font_1769104_t7ngfhl994d.css";
@import "//at.alicdn.com/t/font_1769104_3piwls5qg15.css";
@import "./assets/css/common.css";
@import "./assets/css/zkcss.css";
html,
......
src/components/education/addpoint.vue
View file @ 8452a17d
......@@ -5,7 +5,6 @@
</div>
<div class="content">
<el-form :model="addMsg" :rules="rules" ref="addMsg" label-width="150px" style="width:50%">
<el-form-item label="商品名称" prop="GoodsName" class="is-required" size="small">
<el-input v-model="addMsg.GoodsName" placeholder="请输入商品名称" class="w400"/>
</el-form-item>
......@@ -20,7 +19,6 @@
<el-form-item label="赠送点数" prop="GivePonit" class="is-required" size="small">
<el-input v-model="addMsg.GivePonit" placeholder="请输入赠送点数" class="w400" type="number" :min="0"/>
</el-form-item>
</el-form>
</div>
<div style="margin-top:20px">
......@@ -45,8 +43,6 @@
PonitNum:0,
GivePonit:0,
SellingPrice:0,
},
rules: {
GoodsName: [{
......@@ -85,7 +81,6 @@
Save(formName) {
this.$refs[formName].validate((valid) => {
if (valid) {
if(this.addMsg.SellingPrice==0){
this.Error('售价大于0')
return false
......@@ -94,8 +89,7 @@
this.Error('点数大于0')
return false
}
this.addMsg.GivePonit = parseInt(this.addMsg.GivePonit);
this.apipost("/api/Point/SetPointGoods", this.addMsg, res => {
if (res.data.resultCode == 1) {
this.CommonJump('pointList');
......@@ -109,23 +103,20 @@
}
});
},
getData(ID) {
this.loading = true;
this.apipost("/api/Point/GetPointGoodsModel", {
ID: ID
}, res => {
this.loading = false;
this.addMsg = res.data.data;
var tempDate = res.data.data;
this.addMsg.ID = tempDate.ID;
this.addMsg.GoodsName = tempDate.GoodsName;
this.addMsg.PonitNum = tempDate.PonitNum;
this.addMsg.GivePonit = tempDate.GivePonit;
this.addMsg.SellingPrice = tempDate.SellingPrice;
})
},
},
mounted() {
}
......
src/components/education/pointList.vue
View file @ 8452a17d
......@@ -6,76 +6,40 @@
<el-button type="primary" class="el-button--small" @click="addRecharge">新增</el-button>
</div>
</div>
<div style="padding: 20px;background: #fff;margin-top: 20px">
<el-table
:data="tableData"
header-cell-class-name="headClass"
style="width: 100%"
border
>
<el-table-column
prop="ID"
label="ID"
width="100">
<el-table :data="tableData" header-cell-class-name="headClass" style="width: 100%" border>
<el-table-column prop="ID" label="ID" width="100">
</el-table-column>
<el-table-column
prop="GoodsName"
label="产品名称">
<el-table-column prop="GoodsName" label="产品名称">
</el-table-column>
<el-table-column
prop="SellingPrice"
label="售价"
>
<el-table-column prop="SellingPrice" label="售价">
<template slot-scope="scope">
<span>
￥{{scope.row.SellingPrice.toFixed(2)}}元
</span>
</template>
</el-table-column>
<el-table-column
prop="PonitNum"
label="点数">
<el-table-column prop="PonitNum" label="点数">
</el-table-column>
<el-table-column
prop="IsGive"
label="是否赠送点数">
<el-table-column prop="IsGive" label="是否赠送点数">
<template slot-scope="scope">
<el-tag v-if="scope.row.IsGive==0" type="info">不赠送</el-tag>
<el-tag v-if="scope.row.IsGive>0" type="warning">赠送{{scope.row.GivePonit}}点数</el-tag>
</template>
</el-table-column>
<el-table-column
fixed="right"
label="操作"
width="180"
>
<el-table-column fixed="right" label="操作" width="180">
<template slot-scope="scope">
<el-tooltip class="item" effect="dark" content="编辑" placement="top" >
<el-tooltip class="item" effect="dark" content="编辑" placement="top">
<img src="../../assets/img/setup/edit.png" alt="" class="imgstyle" @click="Edit(scope.row)">
</el-tooltip>
<el-tooltip class="item" effect="dark" content="删除" placement="top" >
<el-tooltip class="item" effect="dark" content="删除" placement="top">
<img src="../../assets/img/setup/del.png" alt="" class="imgstyle" @click="delete_b(scope.row)">
</el-tooltip>
</template>
</el-table-column>
</el-table>
<el-pagination style="text-align:right"
background
@current-change="handleCurrentChange"
:page-size="msg.pageSize"
layout="prev, pager, next"
:current-page.sync="msg.pageIndex"
:total="count">
<el-pagination style="text-align:right" background @current-change="handleCurrentChange" :page-size="msg.pageSize"
layout="prev, pager, next" :current-page.sync="msg.pageIndex" :total="count">
</el-pagination>
</div>
</div>
......@@ -84,61 +48,62 @@
<script>
export default {
name: "pointList",
data(){
return{
msg:{
pageIndex:1,
pageSize:15,
data() {
return {
msg: {
pageIndex: 1,
pageSize: 15,
},
changeState:false,
dateList:[],
tableData:[],
count:0,
loading:false,
EnableMsg:{
Ids:'',
TeacherStatus:0,
changeState: false,
dateList: [],
tableData: [],
count: 0,
loading: false,
EnableMsg: {
Ids: '',
TeacherStatus: 0,
},
}
},
created(){
this.getDateList();//获取老师分页
created() {
this.getDateList(); //获取老师分页
},
methods:{
getDateList(){
this.loading=true;
methods: {
getDateList() {
this.loading = true;
this.apipost("/api/Point/GetPointGoodsPageList", this.msg, res => {
this.loading=false;
if(res.data.resultCode==1){
this.loading = false;
if (res.data.resultCode == 1) {
this.tableData = res.data.data.pageData;
this.count = res.data.data.count;
}else {
} else {
this.Info(res.data.message);
}
})
},
addRecharge(){
addRecharge() {
this.$router.push('/addpoint');
},
Edit(row){
Edit(row) {
this.$router.push({
name: 'addpoint',
query: {
ID:row.ID,
ID: row.ID,
blank: "y"
}
});
},
delete_b(row){
let that=this;
delete_b(row) {
let that = this;
that.Confirm("是否删除?", function () {
that.apipost(
"/api/Point/DeletePointGoods",
{Id:row.ID},
"/api/Point/DeletePointGoods", {
Id: row.ID
},
res => {
if (res.data.resultCode == 1) {
that.Success(res.data.message);
......@@ -150,7 +115,7 @@
);
});
},
getList(){
getList() {
this.msg.pageIndex = 1
this.getDateList()
},
......@@ -160,10 +125,11 @@
},
},
}
</script>
<style >
.pointList .el-card__header{
<style>
.pointList .el-card__header {
display: flex;
flex-direction: row;
align-items: center;
......@@ -171,41 +137,50 @@
background: #fff;
}
.pointList .el-button--small{
.pointList .el-button--small {
padding: 9px 15px;
}
.pointList .content .searchInput{
.pointList .content .searchInput {
border: 1px solid #DCDFE6;
border-radius: 4px;
/*margin-left: 10px;*/
}
.pointList .content .searchInput .el-input__inner{
border:none;outline:none;
.pointList .content .searchInput .el-input__inner {
border: none;
outline: none;
height: 30px;
line-height: 30px;
}
.pointList .content .searchInput{
.pointList .content .searchInput {
line-height: normal;
display: inline-table;
border-collapse: separate;
border-spacing: 0;
width:250px;
width: 250px;
}
.pointList .content{
.pointList .content {
background: #fff;
margin-top:10px;
margin-top: 10px;
padding: 15px;
box-sizing: border-box;
}
.pointList .el-tag{
.pointList .el-tag {
margin-right: 5px;
}
.pointList .app-image{
.pointList .app-image {
background-position: center center;
width: 50px;
height: 50px;
border-radius:0%;
border-radius: 0%;
float: left;
margin-right: 8px;
}
</style>
src/components/education/pointOrderList.vue
View file @ 8452a17d
......@@ -3,8 +3,8 @@
<div class="head-title">
订单列表
<el-button @click="dialogVisible=true" style="float:right;margin-top: -5px;" size="small" type="primary">批量导出
</el-button>
<!-- <el-button @click="dialogVisible=true" style="float:right;margin-top: -5px;" size="small" type="primary">批量导出
</el-button> -->
<el-button @click="ClearHsz" style="float:right;margin-top: -5px;margin-right:20px" size="small" type="primary">
清空回收站</el-button>
......@@ -16,21 +16,21 @@
range-separator="至" value-format="yyyy-MM-dd HH:mm:ss" start-placeholder="开始日期" end-placeholder="结束日期">
</el-date-picker>
<span style="margin-left:15px">用户：</span>
<el-select class="w120" @change="msg.pageIndex=1,getList()" v-model="msg.UserId" size="small" :filter-method="ChangeListName" filterable
placeholder="请选择">
<el-select class="w120" @change="msg.pageIndex=1,getList()" v-model="msg.UserId" size="small"
:filter-method="ChangeListName" filterable placeholder="请选择">
<el-option label="不限" :value="0"></el-option>
<el-option v-for="item in userList" :key="item.Id" :label="item.Name" :value="item.Id">
</el-option>
</el-select>
<span style="margin-left:15px">教师：</span>
<el-select class="w120" @change="msg.pageIndex=1,getList()" v-model="msg.TeacherId" size="small"
<el-select class="w120" @change="msg.pageIndex=1,getList()" filterable v-model="msg.TeacherId" size="small"
placeholder="请选择">
<el-option label="全部老师" :value="0"></el-option>
<el-option v-for="item in teacherList" :key="item.Id" :label="item.Name" :value="item.Id">
<el-option v-for="item in teacherList" :key="item.ID" :label="item.Name" :value="item.ID">
</el-option>
</el-select>
<span style="margin-left:15px">订单号：</span>
<el-input @clear="msg.pageIndex=1,getList()" @keyup.enter.native="msg.pageIndex=1,getList()" clearable
<el-input @clear="msg.pageIndex=1,getList(),msg.ID=0" @keyup.enter.native="msg.pageIndex=1,getList()" clearable
style="margin-top:10px;width:200px" class="input-with-select" placeholder="请输入订单号" v-model="msg.ID"
size="small">
</el-input>
......@@ -39,15 +39,14 @@
<div>
<el-tabs style="margin-top:20px" v-model="msg.OrderStaus" @tab-click="handleClick">
<el-tab-pane :dataId="0" label="全部" name="first" :key="0"></el-tab-pane>
<el-tab-pane v-for="item in orderStatusList" :key="item.Id" :dataId="item.Id" :name="item.Id.toString()"
:label="item.Name">
<el-tab-pane label="全部" name="0"></el-tab-pane>
<el-tab-pane v-for="(item,index) in orderStatusList" :key="index" :label="item.Name" :name="item.Id.toString()">
</el-tab-pane>
</el-tabs>
<div class="app-order-title">
<div style="width: 55%;">订单信息</div>
<div style="width: 20%;">实付点数</div>
<div style="width: 20%;">操作</div>
<div style="width: 35%;">实付点数</div>
<div style="width: 10%;">操作</div>
</div>
<div v-loading="loading" class="app-order-list">
<el-card v-for="(item,index) in tableData" :key="index" class="app-order-item" shadow="never">
......@@ -69,69 +68,42 @@
</div>
<div flex="dir:left wrap:wrap" class="app-order-offline">
<el-tag v-if="item.OrderStaus==1" size="small" type="danger">{{item.OrderStatusName}}</el-tag>
<el-tag v-if="item.OrderStaus==2" size="small">{{item.OrderStatusName}}</el-tag>
<el-tag v-if="item.OrderStaus==3" size="small">{{item.OrderStatusName}}</el-tag>
<el-tag v-if="item.OrderStaus==4" size="small" type="success">{{item.OrderStatusName}}</el-tag>
<el-tag v-if="item.OrderStatus!=4" size="small" type="danger">{{item.OrderStatusName}}</el-tag>
</div>
<el-tooltip class="item" effect="dark" content="强制取消" placement="top-start">
<img v-if="item.OrderStatus==1 || item.OrderStatus==2" @click="OrderExit2(item)" style="right:60px"
class="app-order-btnimg" src="../../assets/img/userman/force.png" alt="">
</el-tooltip>
<!-- <el-tooltip class="item" effect="dark" content="加入回收站" placement="top-start">-->
<!-- <img v-if="msg.Recycled!=1" @click="fRhsz(item,4)" class="app-order-btnimg"-->
<!-- src="../../assets/img/userman/del1.png" alt="">-->
<!-- </el-tooltip>-->
</div>
</div>
<div class="app-order-body">
<div class="goods-item" style="width: 65%;">
<div class="goods">
<div>
<!-- <el-image :src="list.CoverImagePath" class="goods-image" :preview-src-list="[list.CoverImagePath]">-->
<!-- </el-image>-->
<div flex="dir:left">
<div class="goods-info">
<div class="goods-info" style="width:45%;">
<div class="goods-name">
<div class="app-ellipsis">
<div class="vue-line-clamp" style="word-break: break-all; -webkit-line-clamp: 2;">
课程名称：{{item.CourseName}}
</div>
<div style="display:flex;align-items:center;font-size:14px;margin-bottom:5px;">
课程名称：{{item.CourseName}}<el-tag size="small" v-if="item.CourseClassTypeName" style="margin-left:5px;">{{item.CourseClassTypeName}}</el-tag>
</div>
</div>
<div style="margin-bottom: 5px;">
<span style="margin-right: 10px;">
分类：<el-tag size="small" style="margin-right:5px;" >{{item.CourseClassTypeName}}</el-tag>
</span>
</div>
<div style="margin-bottom: 5px;align-items: center;display: flex;flex-direction: row" >
<div style="margin-bottom: 5px;align-items: center;display: flex;flex-direction: row">
<img :src="item.TeacherLogo" alt="" style="width: 30px;height: 30px;border-radius: 50%">
<span style="margin-left: 10px">{{item.TeacherName}}</span>
</div>
<div style="margin-bottom: 5px;">
<span style="margin-right: 10px;">
学习时间：{{item.StudyDate}}
</span>
</div>
</div>
<div flex="dir:left box:mean" style="width: 350px;">
<div flex="dir:left box:mean" style="width: 190px;">
<div flex="cross:center main:center"
style="display: flex;flex-direction: column;align-items: flex-start;width: 55%;">
<span style="cursor:pointer">学习时长：{{item.StudyDuration}}{{item.DurationUnit}}
</span>
<span style="cursor:pointer">总时长：{{ item.TotalStudyDuration}}{{item.DurationUnit}}
</span>
<span style="cursor:pointer">是否推送放假信息：{{item.IsSendRoom ==0 ? '否' :'是'}}
</span>
style="display: flex;flex-direction: column;align-items: flex-start;width: 55%;line-height:28px;">
<span>学习时间：{{item.StudyDate}}</span>
<span>学习时长：{{item.StudyDuration}}{{item.DurationUnit}}</span>
<span>总时长：{{ item.TotalStudyDuration}}{{item.DurationUnit}}</span>
<span>推送放假信息：{{item.IsSendRoom ==0 ? '否' :'是'}}</span>
</div>
</div>
<div style="align-items: center;justify-content: center;flex: 1;width: 1px;" flex="dir:left box:mean" >
<div style="flex: 1;width: 1px;margin-top:3px;"
flex="dir:left box:mean">
<div style="font-size: 14px;">房间信息：{{item.RoomInfo!=null ?item.RoomInfo:'无'}}</div>
</div>
......@@ -141,68 +113,20 @@
</div>
</div>
<div flex="cross:center" class="app-order-info" style="width: 15%;">
<div flex="cross:center" class="app-order-info" style="width: 25%;">
<div flex="dir:top">
<div>
<div style="font-size: 12px;">总点数：{{item.TotalPointNum}}</div>
<div style="font-size: 12px;">实际总点数：{{item.ActualPointNum}}</div>
<div style="font-size: 12px;">基础点数：{{item.BasePointNum}}</div>
<div style="width:200px;text-align:left;margin:auto;line-height:28px;">
<div>总点数：{{item.TotalPointNum}}</div>
<div>实际总点数：{{item.ActualPointNum}}</div>
<div>基础点数：{{item.BasePointNum}}</div>
</div>
</div>
</div>
<div class="app-order-info" style="padding: 10px; border-right: 0px; width: 20%;">
<div flex="wrap:wrap cross:center">
<template v-if="msg.Recycled==2">
<!-- 待确认 -->
<el-tooltip class="item" effect="dark" content="确认" placement="top" v-if="item.OrderStatus==2">
<img v-if="item.OrderStatus==2" @click="qrEnd(item,1)" class="app-order-icon"
src="../../assets/img/userman/pass.png" alt="">
</el-tooltip>
<!-- 待出行 -->
<el-tooltip class="item" effect="dark" content="确认出行" placement="top" v-if="item.OrderStatus==3">
<img @click="qrEnd(item,2)" v-if="item.OrderStatus==3" class="app-order-icon"
src="../../assets/img/userman/pass.png" alt="">
</el-tooltip>
<!-- 已收货 -->
<el-tooltip class="item" effect="dark" content="确认完成" placement="top" v-if="item.OrderStatus==4">
<img @click="qrEnd(item,3)" v-if="item.OrderStatus==4" class="app-order-icon"
src="../../assets/img/userman/pass.png" alt="">
</el-tooltip>
<!--待处理-->
<el-tooltip class="item" effect="dark" content="同意" placement="top" v-if="item.OrderStatus==6">
<img @click="pending(item,1)" v-if="item.OrderStatus==6" class="app-order-icon"
src="../../assets/img/userman/pass.png" alt="">
</el-tooltip>
<el-tooltip class="item" effect="dark" content="拒绝" placement="top" v-if="item.OrderStatus==6">
<img @click="pending(item,2)" v-if="item.OrderStatus==6" class="app-order-icon"
src="../../assets/img/userman/nopass.png" alt="">
</el-tooltip>
</template>
<!-- 回收站 -->
<el-tooltip class="item" effect="dark" content="恢复订单" placement="top">
<img @click="fRhsz(item,7)" v-if="msg.Recycled==1" class="app-order-icon"
src="../../assets/img/userman/renew.png" alt="">
</el-tooltip>
<el-tooltip class="item" effect="dark" content="删除订单" placement="top">
<img @click="DeleteOrder(item)" v-if="msg.Recycled==1" class="app-order-icon"
src="../../assets/img/userman/del.png" alt="">
</el-tooltip>
<template v-if="msg.Recycled==2">
<el-tooltip class="item" effect="dark" content="打印小票" placement="top">
<img class="app-order-icon" src="../../assets/img/userman/print.png" alt="">
</el-tooltip>
<el-tooltip class="item" effect="dark" content="添加备注" placement="top">
<img @click="OrderExit(item,1)" class="app-order-icon"
src="../../assets/img/userman/add_remark.png" alt="">
</el-tooltip>
</template>
<div class="app-order-info" style="padding: 10px; border-right: 0px; width: 10%;">
<div flex="wrap:wrap cross:center" style="display:none;">
<el-tooltip class="item" effect="dark" content="查看订单详情" placement="top">
<img class="app-order-icon"
src="../../assets/img/userman/detail.png" alt="">
<img class="app-order-icon" src="../../assets/img/userman/detail.png" alt="">
</el-tooltip>
</div>
</div>
......@@ -302,7 +226,8 @@
<el-input size="small" v-model="priceMsg.Income" @keyup.native="checkPrice(priceMsg,'Income')"></el-input>
</el-form-item>
<el-form-item v-if="priceType==2" label="运费">
<el-input size="small" v-model="priceMsg.FreightMoney" @keyup.native="checkPrice(priceMsg,'FreightMoney')"></el-input>
<el-input size="small" v-model="priceMsg.FreightMoney" @keyup.native="checkPrice(priceMsg,'FreightMoney')">
</el-input>
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
......@@ -439,11 +364,11 @@
msg: {
pageIndex: 1,
pageSize: 15,
OrderStaus:0,
UserId:0,
TeacherId:0,
CourseId:0,
ID:0,
OrderStaus: 0,
UserId: 0,
TeacherId: 0,
CourseId: 0,
ID: 0,
StartTime: '',
EndTime: '',
},
......@@ -466,8 +391,8 @@
SuplierList: [], // 供应商下拉数据
SupplierId: 0, //公用供应商id 给弹窗用
CommonId: 0, //公用id 给弹窗用
userList:[],//用户list
usermsg:{
userList: [], //用户list
usermsg: {
pageIndex: 1,
pageSize: 20,
Name: '',
......@@ -482,9 +407,10 @@
if (this.$route.query.TypeId) {
this.msgId = Number(this.$route.query.TypeId)
}
if (this.$route.query.ID) {
this.msg.ID = this.$route.query.ID;
}
this.getList();
this.getDown();
this.getOrderStatus();
this.getyonghuid()
this.getTeacherList()
......@@ -496,7 +422,7 @@
this.usermsg.Name = val;
this.getyonghuid();
},
getyonghuid(){
getyonghuid() {
this.apipost("/api/user/GetMemberUserDropDownList", this.usermsg, res => {
if (res.data.resultCode == 1) {
let pageData = res.data.data.pageData;
......@@ -507,7 +433,7 @@
getTeacherList() {
this.apipost("/api/Education/GetTeacherList", {}, res => {
if (res.data.resultCode == 1) {
this.teacherList = res.data.data
this.teacherList = res.data.data;
} else {
this.Error(res.data.message);
}
......@@ -904,13 +830,6 @@
},
handleClick(val) {
let dataId = val.$attrs.dataId;
this.msg.OrderStaus = dataId;
this.msg.Recycled = 2;
if (dataId == 8) {
this.msg.OrderStaus = 0;
this.msg.Recycled = 1;
}
this.msg.pageIndex = 1
this.getList();
},
......@@ -947,25 +866,6 @@
costBtn(list, type) {
this.cosType = type;
if (type == 1) {
this.costMsg.Id = list.Id;
this.costMsg.Money = list.CostMoney;
} else if (type == 2) {
this.costMsg.Id = list.Id;
this.costMsg.Money = list.FreightCostMoney > 0 ? list.FreightCostMoney : list.FreightMoney;
}
this.costDig = true;
},
costBtn2(list, type) {
this.CostMoney.OrderDetailId = list.Id;
this.CostMoney.InsuranceCostMoney = list.InsuranceCostMoney;
this.costDig2 = true;
},
costForm(formName) {
this.$refs[formName].validate((valid) => {
if (valid) {
......@@ -976,14 +876,14 @@
msg = {
Id: this.costMsg.Id,
CostMoney: Number(this.costMsg.Money),
EmpId:this.getLocalStorage().EmpId
EmpId: this.getLocalStorage().EmpId
}
} else if (this.cosType == 2) {
cmd = '/api/order/SetOrderFreightCostMoney';
msg = {
Id: this.costMsg.Id,
FreightCostMoney: Number(this.costMsg.Money),
EmpId:this.getLocalStorage().EmpId
EmpId: this.getLocalStorage().EmpId
}
}
this.apipost(cmd, msg,
......
src/components/education/rechargeList.vue
View file @ 8452a17d
<template>
<div class="rechargeList">
<div class="el-card__header">
<span>点数明细列表</span>
<span>充值明细列表</span>
</div>
<div class="content">
<div style="display: flex;flex-direction: row;align-items: center">
<div class="block">
<div class="searchInput" style="width:250px">
<el-input style="display:inline-block;width:225px;height:30px"
placeholder="请输入订单号搜索"
v-model="msg.OrderId"
size="small"
@clear="getList"
@keyup.enter.native="getList"
clearable>
<el-input style="display:inline-block;width:225px;height:30px" placeholder="请输入订单号搜索" v-model="msg.OrderNo"
size="small" @clear="getList" @keyup.enter.native="getList" clearable>
</el-input>
<span @click="getList" class="el-icon-search" style="color:#979dad;font-size:14px;position:relative;top:1px"></span>
<span @click="getList" class="el-icon-search"
style="color:#979dad;font-size:14px;position:relative;top:1px"></span>
</div>
<span>状态</span>
<el-select class="w120" @change="getList()" style="margin-right: 10px;"
v-model="msg.OrderStatus" size="small" placeholder="请选择">
<el-select class="w120" @change="getList()" style="margin-right: 10px;" v-model="msg.OrderStatus" size="small"
placeholder="请选择">
<el-option v-for="item in TypeList" :key="item.Id" :label="item.Name" :value="item.Id">
</el-option>
</el-select>
<span>用户</span>
<el-select class="w120" @change="getList()" v-model="msg.UserId" size="small" :filter-method="ChangeListName" filterable
placeholder="请选择">
<el-select class="w120" @change="getList()" v-model="msg.UserId" size="small" :filter-method="ChangeListName"
filterable placeholder="请选择">
<el-option label="不限" :value="0"></el-option>
<el-option v-for="item in userList" :key="item.Id" :label="item.Name" :value="item.Id">
</el-option>
......@@ -39,66 +35,45 @@
<div style="padding: 20px;background: #fff;margin-top: 20px">
<el-table
:data="tableData"
header-cell-class-name="headClass"
style="width: 100%"
border
>
<el-table :data="tableData" header-cell-class-name="headClass" style="width: 100%" border>
<el-table-column
prop="OrderNo"
label="订单号"
>
<el-table-column prop="OrderNo" label="订单号">
</el-table-column>
<el-table-column
prop="Name"
label="用户信息">
<el-table-column prop="Name" label="用户信息">
<template slot-scope="scope">
<div class="app-image" :style="{backgroundImage:'url(' + scope.row.UserPhoto + ')',backgroundSize:'cover'}"></div>
<div class="app-image" :style="{backgroundImage:'url(' + scope.row.UserPhoto + ')',backgroundSize:'cover'}">
</div>
<div flex="dir:left cross:center">
{{scope.row.UserName}}
</div>
</template>
</el-table-column>
<el-table-column
prop="PonitNum"
label="充值点数"
>
<el-table-column prop="PonitNum" label="充值点数">
</el-table-column>
<el-table-column
prop="GivePoint"
label="赠送点数"
>
<el-table-column prop="GivePoint" label="赠送点数">
</el-table-column>
<el-table-column
prop="GivePoint"
label="实收金额"
>
<el-table-column prop="GivePoint" label="实收金额">
<template slot-scope="scope">
<span>
￥{{scope.row.Income.toFixed(2)}}
</span>
</template>
</el-table-column>
<el-table-column
prop="PayWayName"
label="支付方式"
>
<el-table-column prop="PayWayName" label="支付方式">
<template slot-scope="scope">
<div>{{scope.row.PayWayName}}</div>
<div>{{scope.row.PaymentWayName}}</div>
</template>
</el-table-column>
<el-table-column
prop="OrderStatus"
label="状态">
<el-table-column prop="OrderStatus" label="状态">
<template slot-scope="scope">
<span>
{{scope.row.OrderStatus==1?'待付款':'已付款'}}
</span>
</template>
</el-table-column>
<el-table-column
prop="CreateDate"
label="支付时间">
<el-table-column prop="CreateDate" label="支付时间">
</el-table-column>
<!-- <el-table-column-->
......@@ -117,13 +92,8 @@
<!-- </template>-->
<!-- </el-table-column>-->
</el-table>
<el-pagination style="text-align:right"
background
@current-change="handleCurrentChange"
:page-size="msg.pageSize"
layout="prev, pager, next"
:current-page.sync="msg.pageIndex"
:total="count">
<el-pagination style="text-align:right" background @current-change="handleCurrentChange" :page-size="msg.pageSize"
layout="prev, pager, next" :current-page.sync="msg.pageIndex" :total="count">
</el-pagination>
</div>
</div>
......@@ -132,31 +102,39 @@
<script>
export default {
name: "rechargeList",
data(){
return{
msg:{
pageIndex:1,
pageSize:15,
OrderStatus:0,
UserId:0,
OrderId:'',
data() {
return {
msg: {
pageIndex: 1,
pageSize: 15,
OrderStatus: 0,
OrderNo: '',
OrderId: '',
},
changeState: false,
dateList: [],
TypeList: [{
Name: '不限',
Id: 0
},
{
Name: '待付款',
Id: 1
},
{
Name: '已付款',
Id: 2
},
changeState:false,
dateList:[],
TypeList:[
{Name:'不限',Id:0},
{Name:'待付款',Id:1},
{Name:'已付款',Id:2},
],
tableData:[],
count:0,
loading:false,
EnableMsg:{
Ids:'',
TeacherStatus:0,
tableData: [],
count: 0,
loading: false,
EnableMsg: {
Ids: '',
TeacherStatus: 0,
},
userList:[],
usermsg:{
userList: [],
usermsg: {
pageIndex: 1,
pageSize: 20,
Name: '',
......@@ -167,17 +145,17 @@
}
}
},
created(){
this.getDateList();//获取数据
created() {
this.getDateList(); //获取数据
this.getyonghuid()
},
methods:{
methods: {
ChangeListName(val) {
this.usermsg.Name = val;
this.getyonghuid();
},
getyonghuid(){
getyonghuid() {
this.apipost("/api/user/GetMemberUserDropDownList", this.usermsg, res => {
if (res.data.resultCode == 1) {
let pageData = res.data.data.pageData;
......@@ -185,26 +163,26 @@
}
})
},
getDateList(){
this.loading=true;
getDateList() {
this.loading = true;
let msg = JSON.parse(JSON.stringify(this.msg))
if(msg.OrderId == ''){
if (msg.OrderId == '') {
msg.OrderId = 0
}
msg.OrderId= Number(msg.OrderId)
msg.OrderId = Number(msg.OrderId)
this.apipost("/api/Point/GetUserPointOrderPageList", msg, res => {
this.loading=false;
if(res.data.resultCode==1){
this.loading = false;
if (res.data.resultCode == 1) {
this.tableData = res.data.data.pageData;
this.count = res.data.data.count;
}else {
} else {
this.Info(res.data.message);
}
})
},
getList(){
getList() {
this.msg.pageIndex = 1
this.getDateList()
},
......@@ -214,10 +192,11 @@
},
},
}
</script>
<style >
.rechargeList .el-card__header{
<style>
.rechargeList .el-card__header {
display: flex;
flex-direction: row;
align-items: center;
......@@ -225,41 +204,50 @@
background: #fff;
}
.rechargeList .el-button--small{
.rechargeList .el-button--small {
padding: 9px 15px;
}
.rechargeList .content .searchInput{
.rechargeList .content .searchInput {
border: 1px solid #DCDFE6;
border-radius: 4px;
/*margin-left: 10px;*/
}
.rechargeList .content .searchInput .el-input__inner{
border:none;outline:none;
.rechargeList .content .searchInput .el-input__inner {
border: none;
outline: none;
height: 30px;
line-height: 30px;
}
.rechargeList .content .searchInput{
.rechargeList .content .searchInput {
line-height: normal;
display: inline-table;
border-collapse: separate;
border-spacing: 0;
width:250px;
width: 250px;
}
.rechargeList .content{
.rechargeList .content {
background: #fff;
margin-top:10px;
margin-top: 10px;
padding: 15px;
box-sizing: border-box;
}
.rechargeList .el-tag{
.rechargeList .el-tag {
margin-right: 5px;
}
.rechargeList .app-image{
.rechargeList .app-image {
background-position: center center;
width: 50px;
height: 50px;
border-radius:0%;
border-radius: 0%;
float: left;
margin-right: 8px;
}
</style>
src/components/education/teacherCourseList.vue
View file @ 8452a17d
<style>
.imgstyle {
cursor: pointer;
}
</style>
<template>
<div class="teacherCourseList">
<div class="el-card__header">
......@@ -11,8 +17,8 @@
<div class="page-body teacherLesson" style="background: white;margin-top: 15px;padding: 15px">
<div class="block">
<span>老师</span>
<el-select class="w200" @change="getList()" style="margin-right: 10px;"
v-model="msg.TeacherId" size="small" placeholder="请选择">
<el-select class="w200" @change="getList()" style="margin-right: 10px;" v-model="msg.TeacherId" size="small"
placeholder="请选择">
<el-option label="不限" :value="0"></el-option>
<el-option v-for="item in teacherList" :key="item.ID" :label="item.Name" :value="item.ID">
</el-option>
......@@ -28,21 +34,17 @@
<div class="Cal_List flex">
<div class="Cal_Qiehuan" @click="getBeforeMonth()">
<div class="Cal_Icon">
<i class="el-icon-arrow-left"></i></div> <div>上个月
<i class="el-icon-arrow-left"></i></div>
<div>上个月
</div>
</div>
<div class="Cal_Content col">
<div class="Cal_Inner" v-for="(item,index) in dataNum" :class="{'checkedPlan':ckedIndex==item}" @click="getItem(item)">
<div class="Cal_Inner" v-for="(item,index) in dataNum" :class="{'checkedPlan':ckedIndex==item}"
@click="getItem(item)">
{{item}}
<!-- <div class="beikeStatus beike1" v-if="getLessonStatus(item)=='未备课'">-->
<!-- <span>{{getLessonStatus(item)}}</span>-->
<!-- </div>-->
<!-- <div class="beikeStatus beike2" v-if="getLessonStatus(item)=='部分'">-->
<!-- <span>{{getLessonStatus(item)}}</span>-->
<!-- </div>-->
<!-- <div class="beikeStatus beike3" v-if="getLessonStatus(item)=='已备课'">-->
<!-- <span>{{getLessonStatus(item)}}</span>-->
<!-- </div>-->
<div class="beikeStatus beike1" v-if="getLessonStatus(item)=='有课'">
<span>有课</span>
</div>
</div>
</div>
<div class="Cal_Qiehuan" @click="getNextMonth()">
......@@ -76,17 +78,23 @@
<div>上课时长：{{item.StudyDuration}}{{item.DurationUnitName}}</div>
<div>最少约课时长：{{item.MinDuration}}</div>
<div>需要点数：{{item.PointNum}}</div>
<div>
<el-tooltip class="item" effect="dark" content="编辑" placement="top" >
<div style="display:flex;align-items:center;">
<el-tooltip class="item" effect="dark" content="编辑" placement="top">
<img src="../../assets/img/setup/edit.png" alt="" class="imgstyle" @click="Edit(item)">
</el-tooltip>
<el-tooltip class="item" effect="dark" content="删除" placement="top" >
<img src="../../assets/img/setup/del.png" alt="" class="imgstyle" @click="delete_b(item)">
<el-tooltip class="item" effect="dark" content="删除" placement="top">
<img src="../../assets/img/setup/del.png" alt="" style="margin:0 10px;" class="imgstyle" @click="delete_b(item)">
</el-tooltip>
<el-tooltip class="item" effect="dark" content="订单" placement="top">
<span class="paike_xianqing">
<i class="iconfont icon-xiangqing" @click="goPaike(item)"></i>
</span>
</el-tooltip>
</div>
</div>
<div style="margin:20px 0 30px 0;">
<span class="beikeBtn" v-if="item.LessonPlanNum>0" style="background:#3FC4FF;" @click="goyibeike(item)">已备课</span>
<span class="beikeBtn" v-if="item.LessonPlanNum>0" style="background:#3FC4FF;"
@click="goyibeike(item)">已备课</span>
<span class="beikeBtn" v-if="item.LessonPlanNum==0" @click="goBeike(item)">备课</span>
<span class="beikeBtn" v-if="item.LessonPlanNum>0" @click="goBeike(item)">修改</span>
</div>
......@@ -102,69 +110,66 @@
<script>
export default {
name: "teacherCourseList",
data(){
return{
msg:{
SelectStartTime:'',
SelectEndTime:'',
TeacherId:0,
data() {
return {
msg: {
SelectStartTime: '',
SelectEndTime: '',
TeacherId: 0,
},
changeState:false,
dateList:[],
newDataList:[],
tableData:[],
count:0,
loading:false,
dataNum:[],
EnableMsg:{
Ids:'',
TeacherStatus:0,
changeState: false,
dateList: [],
newDataList: [],
tableData: [],
count: 0,
loading: false,
dataNum: [],
EnableMsg: {
Ids: '',
TeacherStatus: 0,
},
teacherList:[],
teacherList: [],
}
},
created(){
created() {
var myDate = new Date();
this.tYear = myDate.getFullYear();
this.tMonth = myDate.getMonth() + 1;
this.tDay = myDate.getDate();
this.ckedIndex = this.tDay;
this.dataNum = this.mGetDate(this.tYear, this.tMonth);
this.msg.SelectStartTime = this.tYear+'-'+this.tMonth+'-'+'01';
this.msg.SelectEndTime = this.tYear+'-'+this.tMonth+'-'+this.dataNum;
this.msg.SelectStartTime = this.tYear + '-' + this.tMonth + '-' + '01';
this.msg.SelectEndTime = this.tYear + '-' + this.tMonth + '-' + this.dataNum;
this.getList();
this.getTeacherList()
},
methods:{
getList(){
this.loading=true;
methods: {
getList() {
this.loading = true;
this.apipost("/api/Point/GetTeacherCourseList", this.msg, res => {
this.loading=false;
if(res.data.resultCode==1){
this.loading = false;
if (res.data.resultCode == 1) {
this.dataList = res.data.data;
var month = this.tMonth;
var day = this.ckedIndex;
if(month<10){
month='0'+month;
if (month < 10) {
month = '0' + month;
}
if(day<10){
day='0'+day;
if (day < 10) {
day = '0' + day;
}
if(this.dataList.length>0){
this.dataList.forEach(x=>{
if(x.DateYear==this.tYear&&x.DateMonth==month&&x.DateDay==day){
if (this.dataList.length > 0) {
this.dataList.forEach(x => {
if (x.DateYear == this.tYear && x.DateMonth == month && x.DateDay == day) {
this.newDataList = x.PlanList;
}
})
}
}else {
} else {
this.Info(res.data.message);
}
})
},
getTeacherList() {
......@@ -188,8 +193,8 @@
this.tMonth = this.tMonth - 1;
}
this.dataNum = this.mGetDate(this.tYear, this.tMonth);
this.msg.SelectStartTime = this.tYear+'-'+this.tMonth+'-'+'01';
this.msg.SelectEndTime = this.tYear+'-'+this.tMonth+'-'+this.dataNum;
this.msg.SelectStartTime = this.tYear + '-' + this.tMonth + '-' + '01';
this.msg.SelectEndTime = this.tYear + '-' + this.tMonth + '-' + this.dataNum;
this.getList();
},
//点击下个月
......@@ -201,70 +206,63 @@
this.tMonth = this.tMonth + 1;
}
this.dataNum = this.mGetDate(this.tYear, this.tMonth);
this.msg.SelectStartTime = this.tYear+'-'+this.tMonth+'-'+'01';
this.msg.SelectEndTime = this.tYear+'-'+this.tMonth+'-'+this.dataNum;
this.msg.SelectStartTime = this.tYear + '-' + this.tMonth + '-' + '01';
this.msg.SelectEndTime = this.tYear + '-' + this.tMonth + '-' + this.dataNum;
this.getList();
},
//获取备课状态
getLessonStatus(num){
if(num<10){
num='0'+num
getLessonStatus(num) {
if (num < 10) {
num = '0' + num
}
var Str = '';
this.dataList.forEach(x=>{
if(parseInt(x.DateDay)==parseInt(num)){
if(x.IsLessonStatus==0){
Str='未备课'
}
if(x.IsLessonStatus==1){
Str='部分'
}
if(x.IsLessonStatus==2){
Str='已备课'
}
if(x.IsLessonStatus==-1){
Str=''
if(this.dataList&&this.dataList.length>0){
this.dataList.forEach(x => {
if (parseInt(x.DateDay) == parseInt(num)) {
if (x.HaveCourseCount >0) {
Str = '有课'
}
}
})
return Str;
}
},
//点击
getItem(item){
this.ckedIndex=item;
getItem(item) {
this.ckedIndex = item;
var month = this.tMonth;
var day = item;
if(month<10){
month='0'+month;
if (month < 10) {
month = '0' + month;
}
if(day<10){
day='0'+day;
if (day < 10) {
day = '0' + day;
}
this.dataList.forEach(x=>{
if(x.DateYear==this.tYear&&x.DateMonth==month&&x.DateDay==day){
this.dataList.forEach(x => {
if (x.DateYear == this.tYear && x.DateMonth == month && x.DateDay == day) {
this.newDataList = x.PlanList;
}
})
},
addRecharge(){
addRecharge() {
this.$router.push('/addteacherCourse');
},
Edit(row){
Edit(row) {
this.$router.push({
name: 'addteacherCourse',
query: {
ID:row.ID,
ID: row.ID,
blank: "y"
}
});
},
delete_b(row){
let that=this;
delete_b(row) {
let that = this;
that.Confirm("是否删除?", function () {
that.apipost(
"/api/Point/DeleteTeacherCourse",
{Id:row.ID},
"/api/Point/DeleteTeacherCourse", {
Id: row.ID
},
res => {
if (res.data.resultCode == 1) {
that.Success(res.data.message);
......@@ -276,17 +274,25 @@
);
});
},
goPaike(item){
this.$router.push({
name: 'pointOrderList',
query: {
ID:item.ID
}
});
},
handleCurrentChange(val) {
this.msg.pageIndex = val;
this.getList();
},
},
}
</script>
<style >
.teacherCourseList .el-card__header{
<style>
.teacherCourseList .el-card__header {
display: flex;
flex-direction: row;
align-items: center;
......@@ -294,43 +300,52 @@
background: #fff;
}
.teacherCourseList .el-button--small{
.teacherCourseList .el-button--small {
padding: 9px 15px;
}
.teacherCourseList .content .searchInput{
.teacherCourseList .content .searchInput {
border: 1px solid #DCDFE6;
border-radius: 4px;
/*margin-left: 10px;*/
}
.teacherCourseList .content .searchInput .el-input__inner{
border:none;outline:none;
.teacherCourseList .content .searchInput .el-input__inner {
border: none;
outline: none;
height: 30px;
line-height: 30px;
}
.teacherCourseList .content .searchInput{
.teacherCourseList .content .searchInput {
line-height: normal;
display: inline-table;
border-collapse: separate;
border-spacing: 0;
width:250px;
width: 250px;
}
.teacherCourseList .content{
.teacherCourseList .content {
background: #fff;
margin-top:10px;
margin-top: 10px;
padding: 15px;
box-sizing: border-box;
}
.teacherCourseList .el-tag{
.teacherCourseList .el-tag {
margin-right: 5px;
}
.teacherCourseList .app-image{
.teacherCourseList .app-image {
background-position: center center;
width: 50px;
height: 50px;
border-radius:0%;
border-radius: 0%;
float: left;
margin-right: 8px;
}
.teacherLesson .TeacherTop {
display: flex;
min-width: 1200px;
......@@ -365,7 +380,7 @@
.teacherLesson .Cal_List {
display: flex;
width:95%;
width: 95%;
}
.teacherLesson .Cal_Qiehuan {
......@@ -410,7 +425,7 @@
padding: 2px 3px;
margin-top: 5px;
background-color: #2961FE;
color: #fff;
color:red;
font-size: 12px;
border-radius: 5px;
-webkit-transform: scale(0.8);
......@@ -509,28 +524,44 @@
margin-left: 20px;
cursor: pointer;
}
.teacherLesson .timeleft{
margin-left:12px;
.teacherLesson .timeleft {
margin-left: 12px;
}
.checkedPlan{
background-color: #2961FE!important;
.checkedPlan {
background-color: #2961FE !important;
color: #fff !important;
}
.checkedPlan .beikeStatus{
color:#fff!important;
}
/*.checkedPlan .beikeStatus{*/
/* background-color: #fff;*/
/* color:#2961FE!important;*/
/*}*/
.Cal_Content .beike1{
.Cal_Content .beike1 {
background: var(--q-color-negative);
}
.Cal_Content .beike2{
.Cal_Content .beike2 {
background: var(--q-color-warning);
}
.Cal_Content .beike3{
.Cal_Content .beike3 {
background: var(--q-color-dark);
}
.teacherLesson .TeacherName{
color:var(--q-color-primary);
margin-left:10px;
.teacherLesson .TeacherName {
color: var(--q-color-primary);
margin-left: 10px;
}
.paike_xianqing{
width:32px;
height:32px;
display: inline-block;
border-radius: 50%;
background-color: #faecd8;
color:#e6a23c;
text-align: center;
line-height: 32px;
cursor: pointer;
}
</style>
src/components/education/userPointDetailList.vue
View file @ 8452a17d
......@@ -8,26 +8,22 @@
<div style="display: flex;flex-direction: row;align-items: center">
<div class="block">
<div class="searchInput" style="width:250px">
<el-input style="display:inline-block;width:225px;height:30px"
placeholder="请输入订单号搜索"
v-model="msg.OrderId"
size="small"
@clear="getList"
@keyup.enter.native="getList"
clearable>
<el-input style="display:inline-block;width:225px;height:30px" placeholder="请输入订单号搜索" v-model="msg.OrderId"
size="small" @clear="getList" @keyup.enter.native="getList" clearable>
</el-input>
<span @click="getList" class="el-icon-search" style="color:#979dad;font-size:14px;position:relative;top:1px"></span>
<span @click="getList" class="el-icon-search"
style="color:#979dad;font-size:14px;position:relative;top:1px"></span>
</div>
<span>类型</span>
<el-select class="w120" @change="getList()" style="margin-right: 10px;"
v-model="msg.Type" size="small" placeholder="请选择">
<el-select class="w120" @change="getList()" style="margin-right: 10px;" v-model="msg.Type" size="small"
placeholder="请选择">
<el-option v-for="item in TypeList" :key="item.Id" :label="item.Name" :value="item.Id">
</el-option>
</el-select>
<span>用户</span>
<el-select class="w120" @change="getList()" v-model="msg.UserId" size="small" :filter-method="ChangeListName" filterable
placeholder="请选择">
<el-select class="w120" @change="getList()" v-model="msg.UserId" size="small" :filter-method="ChangeListName"
filterable placeholder="请选择">
<el-option label="不限" :value="0"></el-option>
<el-option v-for="item in userList" :key="item.Id" :label="item.Name" :value="item.Id">
</el-option>
......@@ -39,23 +35,13 @@
<div style="padding: 20px;background: #fff;margin-top: 20px">
<el-table
:data="tableData"
header-cell-class-name="headClass"
style="width: 100%"
border
>
<el-table-column
prop="Id"
label="ID"
width="100">
<el-table :data="tableData" header-cell-class-name="headClass" style="width: 100%" border>
<el-table-column prop="Id" label="ID" width="100">
</el-table-column>
<el-table-column
prop="Type"
label="类型">
<el-table-column prop="Type" label="类型" width="150">
<template slot-scope="scope">
<span>
{{scope.row.Type==1?'收入':'支出'}}
......@@ -63,56 +49,47 @@
</template>
</el-table-column>
<el-table-column
prop="Name"
label="用户信息">
<el-table-column prop="Name" label="用户信息" width="250">
<template slot-scope="scope">
<div class="app-image" :style="{backgroundImage:'url(' + scope.row.UserPhoto + ')',backgroundSize:'cover'}"></div>
<div class="app-image" :style="{backgroundImage:'url(' + scope.row.UserPhoto + ')',backgroundSize:'cover'}">
</div>
<div flex="dir:left cross:center">
{{scope.row.UserName}}
</div>
</template>
</el-table-column>
<el-table-column
prop="PonitNum"
width="100"
label="点数">
<el-table-column prop="PonitNum" width="100" label="点数">
</el-table-column>
<el-table-column
prop="Remarks"
label="备注">
<el-table-column prop="PonitNum" width="200" label="关联订单">
<template slot-scope="scope">
<div>订单号：{{scope.row.OrderId}}</div>
</template>
</el-table-column>
<el-table-column prop="Remarks" label="备注">
</el-table-column>
<el-table-column
prop="CreateDate"
label="创建时间">
<el-table-column prop="CreateDate" width="180" label="创建时间">
</el-table-column>
<!-- <el-table-column-->
<!-- fixed="right"-->
<!-- label="操作"-->
<!-- width="180"-->
<!-- >-->
<!-- <template slot-scope="scope">-->
<!-- <el-tooltip class="item" effect="dark" content="编辑" placement="top" >-->
<!-- <img src="../../assets/img/setup/edit.png" alt="" class="imgstyle" @click="Edit(scope.row)">-->
<!-- </el-tooltip>-->
<!-- <el-tooltip class="item" effect="dark" content="删除" placement="top" >-->
<!-- <img src="../../assets/img/setup/del.png" alt="" class="imgstyle" @click="delete_b(scope.row)">-->
<!-- </el-tooltip>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column-->
<!-- fixed="right"-->
<!-- label="操作"-->
<!-- width="180"-->
<!-- >-->
<!-- <template slot-scope="scope">-->
<!-- <el-tooltip class="item" effect="dark" content="编辑" placement="top" >-->
<!-- <img src="../../assets/img/setup/edit.png" alt="" class="imgstyle" @click="Edit(scope.row)">-->
<!-- </el-tooltip>-->
<!-- <el-tooltip class="item" effect="dark" content="删除" placement="top" >-->
<!-- <img src="../../assets/img/setup/del.png" alt="" class="imgstyle" @click="delete_b(scope.row)">-->
<!-- </el-tooltip>-->
<!-- </template>-->
<!-- </el-table-column>-->
</el-table>
<el-pagination style="text-align:right"
background
@current-change="handleCurrentChange"
:page-size="msg.pageSize"
layout="prev, pager, next"
:current-page.sync="msg.pageIndex"
:total="count">
<el-pagination style="text-align:right" background @current-change="handleCurrentChange" :page-size="msg.pageSize"
layout="prev, pager, next" :current-page.sync="msg.pageIndex" :total="count">
</el-pagination>
</div>
</div>
......@@ -121,31 +98,39 @@
<script>
export default {
name: "userPointDetailList",
data(){
return{
msg:{
pageIndex:1,
pageSize:15,
Type:0,
UserId:0,
OrderId:'',
data() {
return {
msg: {
pageIndex: 1,
pageSize: 15,
Type: 0,
UserId: 0,
OrderId: '',
},
changeState: false,
dateList: [],
TypeList: [{
Name: '不限',
Id: 0
},
{
Name: '收入',
Id: 1
},
{
Name: '支出',
Id: 2
},
changeState:false,
dateList:[],
TypeList:[
{Name:'不限',Id:0},
{Name:'收入',Id:1},
{Name:'支出',Id:2},
],
tableData:[],
count:0,
loading:false,
EnableMsg:{
Ids:'',
TeacherStatus:0,
tableData: [],
count: 0,
loading: false,
EnableMsg: {
Ids: '',
TeacherStatus: 0,
},
userList:[],
usermsg:{
userList: [],
usermsg: {
pageIndex: 1,
pageSize: 20,
Name: '',
......@@ -156,17 +141,17 @@
}
}
},
created(){
this.getDateList();//获取数据
created() {
this.getDateList(); //获取数据
this.getyonghuid()
},
methods:{
methods: {
ChangeListName(val) {
this.usermsg.Name = val;
this.getyonghuid();
},
getyonghuid(){
getyonghuid() {
this.apipost("/api/user/GetMemberUserDropDownList", this.usermsg, res => {
if (res.data.resultCode == 1) {
let pageData = res.data.data.pageData;
......@@ -174,26 +159,26 @@
}
})
},
getDateList(){
this.loading=true;
getDateList() {
this.loading = true;
let msg = JSON.parse(JSON.stringify(this.msg))
if(msg.OrderId == ''){
if (msg.OrderId == '') {
msg.OrderId = 0
}
msg.OrderId= Number(msg.OrderId)
msg.OrderId = Number(msg.OrderId)
this.apipost("/api/Point/GetUserPointDetailPageList", msg, res => {
this.loading=false;
if(res.data.resultCode==1){
this.loading = false;
if (res.data.resultCode == 1) {
this.tableData = res.data.data.pageData;
this.count = res.data.data.count;
}else {
} else {
this.Info(res.data.message);
}
})
},
getList(){
getList() {
this.msg.pageIndex = 1
this.getDateList()
},
......@@ -203,10 +188,11 @@
},
},
}
</script>
<style >
.userPointDetailList .el-card__header{
<style>
.userPointDetailList .el-card__header {
display: flex;
flex-direction: row;
align-items: center;
......@@ -214,41 +200,50 @@
background: #fff;
}
.userPointDetailList .el-button--small{
.userPointDetailList .el-button--small {
padding: 9px 15px;
}
.userPointDetailList .content .searchInput{
.userPointDetailList .content .searchInput {
border: 1px solid #DCDFE6;
border-radius: 4px;
/*margin-left: 10px;*/
}
.userPointDetailList .content .searchInput .el-input__inner{
border:none;outline:none;
.userPointDetailList .content .searchInput .el-input__inner {
border: none;
outline: none;
height: 30px;
line-height: 30px;
}
.userPointDetailList .content .searchInput{
.userPointDetailList .content .searchInput {
line-height: normal;
display: inline-table;
border-collapse: separate;
border-spacing: 0;
width:250px;
width: 250px;
}
.userPointDetailList .content{
.userPointDetailList .content {
background: #fff;
margin-top:10px;
margin-top: 10px;
padding: 15px;
box-sizing: border-box;
}
.userPointDetailList .el-tag{
.userPointDetailList .el-tag {
margin-right: 5px;
}
.userPointDetailList .app-image{
.userPointDetailList .app-image {
background-position: center center;
width: 50px;
height: 50px;
border-radius:0%;
border-radius: 0%;
float: left;
margin-right: 8px;
}
</style>
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