Skip to content

C
confucius
Commit 642688ac authored by 黄奎's avatar 黄奎
Browse files
Options

页面修改

parent f2e99ac2
Hide whitespace changes
Inline Side-by-side
Showing with 164 additions and 209 deletions
src/components/sale/activeOrder-form.vue
View file @ 642688ac
...@@ -132,7 +132,8 @@ ...@@ -132,7 +132,8 @@
} }
this.OrderMsg.LinkMan = this.saveObj.LinkMan this.OrderMsg.LinkMan = this.saveObj.LinkMan
this.OrderMsg.LinkTel = this.saveObj.LinkTel this.OrderMsg.LinkTel = this.saveObj.LinkTel
this.OrderMsg.Remark = this.saveObj.Remark this.OrderMsg.Remark = this.saveObj.Remark;
this.OrderMsg.TeacherId = this.saveObj.TeacherId;
} }
this.getStu(); this.getStu();
}, },
...@@ -156,14 +157,10 @@ ...@@ -156,14 +157,10 @@
saveOrderInfo() { saveOrderInfo() {
this.$refs.LinkMan.validate(); this.$refs.LinkMan.validate();
this.$refs.LinkTel.validate(); this.$refs.LinkTel.validate();
// this.$refs.Remark.validate();
if (!this.$refs.LinkMan.hasError && if (!this.$refs.LinkMan.hasError &&
!this.$refs.LinkTel.hasError !this.$refs.LinkTel.hasError
) { ) {
// if(this.saveObj.LnsideLimit===1&&!this.OrderMsg.EduStudentId){
// this.Error("请选择学员");
// return
// }
if (this.OrderMsg.EduStudentId === null || !this.OrderMsg.EduStudentId) { if (this.OrderMsg.EduStudentId === null || !this.OrderMsg.EduStudentId) {
this.OrderMsg.EduStudentId = 0 this.OrderMsg.EduStudentId = 0
} }
......
src/pages/activity/activeSignUpList.vue
View file @ 642688ac
...@@ -2,242 +2,200 @@ ...@@ -2,242 +2,200 @@
<div class="page-body myActiveOrder"> <div class="page-body myActiveOrder">
<div class="row col" style="margin-bottom: 10px"> <div class="row col" style="margin-bottom: 10px">
<div class="row col"> <div class="row col">
<q-btn <q-btn color="accent" size="sm" class="q-mr-md" label="返回" @click="goBack" />
color="accent"
size="sm"
class="q-mr-md"
label="返回"
@click="goBack"
/>
<div v-if="activeName" style="line-height: 25px"> <div v-if="activeName" style="line-height: 25px">
活动名称：{{ activeName }} 活动名称：{{ activeName }}
</div> </div>
</div> </div>
<q-btn <q-btn color="accent" style="float: right" v-if="from == 1" size="sm" label="参与者名单" @click="gourl" />
color="accent"
style="float: right"
v-if="from == 1"
size="sm"
label="参与者名单"
@click="gourl"
/>
</div> </div>
<div class="page-content"> <div class="page-content">
<OrderItem <OrderItem :dataList="data.List" ref="orderL" :authObj="authObj" :modityOrderType="2" :cancelList="CancelList"
:dataList="data.List" :formActiveMan="true" @agree="agreeApply" @refuse="jujueMsg" @success="refreshClassOrder" isActivity>
ref="orderL" </OrderItem>
:authObj="authObj"
:modityOrderType="2"
:cancelList="CancelList"
:formActiveMan="true"
@agree="agreeApply"
@refuse="jujueMsg"
@success="refreshClassOrder"
isActivity
></OrderItem>
<div class="row" style="justify-content: flex-end; padding: 5px 20px"> <div class="row" style="justify-content: flex-end; padding: 5px 20px">
<q-pagination <q-pagination v-model="msg.pageIndex" :max="pageCount" @input="changePage" class="full-width justify-end"
v-model="msg.pageIndex" color="primary" :input="true">
:max="pageCount"
@input="changePage"
class="full-width justify-end"
color="primary"
:input="true"
>
</q-pagination> </q-pagination>
</div> </div>
</div> </div>
<!-- 拒绝报名 --> <!-- 拒绝报名 -->
<el-dialog title="拒绝报名" :visible.sync="showJujue" width="600px"> <el-dialog title="拒绝报名" :visible.sync="showJujue" width="600px">
<div class="activityFlex"> <div class="activityFlex">
<el-input <el-input type="textarea" rows="4" v-model="bdMsg.RejectRemark"></el-input>
type="textarea"
rows="4"
v-model="bdMsg.RejectRemark"
></el-input>
</div> </div>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<!-- <el-button type="primary" size="small" @click="sureJujue">确定</el-button> --> <!-- <el-button type="primary" size="small" @click="sureJujue">确定</el-button> -->
<q-btn <q-btn text-color="accent" size="sm" class="q-mr-md" label="取消" @click="showJujue = false" />
text-color="accent" <q-btn color="accent" size="sm" class="q-mr-md" label="确定" @click="sureJujue" />
size="sm"
class="q-mr-md"
label="取消"
@click="showJujue = false"
/>
<q-btn
color="accent"
size="sm"
class="q-mr-md"
label="确定"
@click="sureJujue"
/>
</span> </span>
</el-dialog> </el-dialog>
</div> </div>
</template> </template>
<script> <script>
import { quertClassOrderList } from "../../api/sale/sale"; import {
quertClassOrderList
} from "../../api/sale/sale";
import OrderItem from "../../components/sale/activeOrder-item.vue"; import OrderItem from "../../components/sale/activeOrder-item.vue";
export default { export default {
meta: { meta: {
title: "活动报名列表", title: "活动报名列表",
},
components: {
OrderItem,
},
data() {
return {
data: {},
activeName: "",
msg: {
pageIndex: 1,
pageSize: 10,
ActivityId: 0,
},
pageCount: 0,
//正常订单
dataList: [],
//取消订单
CancelList: [],
//权限判断
authObj: {
isShowName: true, //不显示班级名称
isShowEditSale: true, //显示修改销售按钮
isShowEducationRemark: true, //显示修改教务备注
isShowPrincipalRemark: true, //显示校长备注
isShowManagerRemark: true, //显示总经理备注
isShowCommissionEdit: true, //显示修改提成按钮
isShowRewardEdit: true, //显示修改额外提成按钮
},
bdMsg: {
Id: 0, //报名id
ApplyForCancelStatus: 1, //申请取消审核状态 1同意 2拒绝
RejectRemark: "",
},
showJujue: false,
from: 0, //来源页面,1===活动=>活动管理=>活动列表
};
},
created() {
if (this.$route.query.Id) {
this.msg.ActivityId = this.$route.query.Id;
}
if (this.$route.query.name) {
this.activeName = this.$route.query.name;
}
if (this.$route.query.from) {
this.from = this.$route.query.from;
}
this.getList();
},
methods: {
//获取订单列表
getList() {
this.loading = true;
this.apipostDS(
"/api/Education/GetConsultOrderStatisticsPage",
this.msg,
(res) => {
this.loading = false;
if (res.data.resultCode === 1) {
this.data = res.data.data.pageData;
this.pageCount = res.data.data.pageCount;
}
}
);
}, },
//刷新页面 components: {
refreshClassOrder() { OrderItem,
this.getList();
}, },
goBack() { data() {
this.$router.go(-1); return {
data: {},
activeName: "",
msg: {
pageIndex: 1,
pageSize: 10,
ActivityId: 0,
},
pageCount: 0,
//正常订单
dataList: [],
//取消订单
CancelList: [],
//权限判断
authObj: {
isShowName: true, //不显示班级名称
isShowEditSale: true, //显示修改销售按钮
isShowEducationRemark: true, //显示修改教务备注
isShowPrincipalRemark: true, //显示校长备注
isShowManagerRemark: true, //显示总经理备注
isShowCommissionEdit: true, //显示修改提成按钮
isShowRewardEdit: true, //显示修改额外提成按钮
},
bdMsg: {
Id: 0, //报名id
ApplyForCancelStatus: 1, //申请取消审核状态 1同意 2拒绝
RejectRemark: "",
},
showJujue: false,
from: 0, //来源页面,1===活动=>活动管理=>活动列表
};
}, },
//翻页 created() {
changePage(val) { if (this.$route.query.Id) {
this.msg.pageIndex = val; this.msg.ActivityId = this.$route.query.Id;
}
if (this.$route.query.name) {
this.activeName = this.$route.query.name;
}
if (this.$route.query.from) {
this.from = this.$route.query.from;
}
this.getList(); this.getList();
}, },
//同意 methods: {
agreeApply(item) { //获取订单列表
this.bdMsg.Id = item.Id; getList() {
this.bdMsg.ApplyForCancelStatus = 1; this.loading = true;
this.apipostDS( this.apipostDS(
"/api/Education/SetCommerceConsultApplyCancel", "/api/Education/GetConsultOrderStatisticsPage",
this.bdMsg, this.msg,
(res) => { (res) => {
if (res.data.resultCode == 1) { this.loading = false;
this.Success("操作成功"); if (res.data.resultCode === 1) {
this.getList(); this.data = res.data.data.pageData;
} else { this.pageCount = res.data.data.pageCount;
this.Error(res.data.message); }
} }
} );
); },
}, //刷新页面
jujueMsg(item) { refreshClassOrder() {
this.bdMsg.Id = item.Id; this.getList();
this.showJujue = true; },
}, goBack() {
// 拒绝 this.$router.go(-1);
sureJujue() { },
if (!this.bdMsg.RejectRemark) { //翻页
this.Error("请输入拒绝原因"); changePage(val) {
return; this.msg.pageIndex = val;
} this.getList();
this.bdMsg.ApplyForCancelStatus = 2; },
this.apipostDS( //同意
"/api/Education/SetCommerceConsultApplyCancel", agreeApply(item) {
this.bdMsg, this.bdMsg.Id = item.Id;
(res) => { this.bdMsg.ApplyForCancelStatus = 1;
if (res.data.resultCode == 1) { this.apipostDS(
this.showJujue = false; "/api/Education/SetCommerceConsultApplyCancel",
this.Success("操作成功"); this.bdMsg,
this.getList(); (res) => {
} else { if (res.data.resultCode == 1) {
this.Error(res.data.message); this.Success("操作成功");
this.getList();
} else {
this.Error(res.data.message);
}
} }
);
},
jujueMsg(item) {
this.bdMsg.Id = item.Id;
this.showJujue = true;
},
// 拒绝
sureJujue() {
if (!this.bdMsg.RejectRemark) {
this.Error("请输入拒绝原因");
return;
} }
); this.bdMsg.ApplyForCancelStatus = 2;
}, this.apipostDS(
gourl() { "/api/Education/SetCommerceConsultApplyCancel",
this.$router.push({ this.bdMsg,
path: "/activity/activeSignUpList2", (res) => {
query: { if (res.data.resultCode == 1) {
Id: this.msg.ActivityId, this.showJujue = false;
name: this.activeName, this.Success("操作成功");
from: this.from, this.getList();
}, } else {
}); this.Error(res.data.message);
}
}
);
},
gourl() {
this.$router.push({
path: "/activity/activeSignUpList2",
query: {
Id: this.msg.ActivityId,
name: this.activeName,
from: this.from,
},
});
},
}, },
}, };
};
</script> </script>
<style> <style>
.myActiveOrder .table-body { .myActiveOrder .table-body {
height: calc(100vh - 220px); height: calc(100vh - 220px);
} }
/*定义滚动条高宽及背景 高宽分别对应横竖滚动条的尺寸*/ /*定义滚动条高宽及背景 高宽分别对应横竖滚动条的尺寸*/
.myActiveOrder .table-body::-webkit-scrollbar { .myActiveOrder .table-body::-webkit-scrollbar {
width: 5px; width: 5px;
height: 5px; height: 5px;
background-color: #f5f5f5; background-color: #f5f5f5;
} }
/*定义滚动条轨道 内阴影+圆角*/ /*定义滚动条轨道 内阴影+圆角*/
.myActiveOrder .table-body::-webkit-scrollbar-track { .myActiveOrder .table-body::-webkit-scrollbar-track {
-webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3); -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3);
border-radius: 10px; border-radius: 10px;
background-color: #f5f5f5; background-color: #f5f5f5;
} }
/*定义滑块 内阴影+圆角*/ /*定义滑块 内阴影+圆角*/
.myActiveOrder .table-body::-webkit-scrollbar-thumb { .myActiveOrder .table-body::-webkit-scrollbar-thumb {
border-radius: 5px; border-radius: 5px;
-webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3); -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3);
background-color: #555; background-color: #555;
} }
</style> </style>
\ No newline at end of file
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