Skip to content

C
confucius
Commit 466edf2c authored by 罗超's avatar 罗超
Browse files
Options

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

parents 56a56aeb 8bd75631
Show whitespace changes
Inline Side-by-side
Showing with 55 additions and 36 deletions
src/components/course/classstu-form.vue
View file @ 466edf2c
...@@ -59,7 +59,11 @@ ...@@ -59,7 +59,11 @@
<template v-slot:body-cell-IsRenew="props"> <template v-slot:body-cell-IsRenew="props">
<q-td auto-width :props="props"> <q-td auto-width :props="props">
<span style="color:red;" v-if="props.row.IsRenew==0">否</span> <span style="color:red;" v-if="props.row.IsRenew==0">否</span>
<span style="color:green;" v-if="props.row.IsRenew==1">是</span> <span style="color:green;" v-if="props.row.IsRenew==1">是
<q-tooltip :offset="[10, 10]">
原订单:{{props.row.RenewOrderId}}
</q-tooltip>
</span>
</q-td> </q-td>
</template> </template>
<template v-slot:body-cell-GuestName="props"> <template v-slot:body-cell-GuestName="props">
...@@ -162,7 +166,7 @@ ...@@ -162,7 +166,7 @@
}, },
{ {
name: 'IsRenew', name: 'IsRenew',
label: '续费课程', label: '续费订单',
field: 'IsRenew', field: 'IsRenew',
align: 'left' align: 'left'
} }
......
src/components/global/user-right-box.vue
View file @ 466edf2c
...@@ -144,9 +144,12 @@ export default { ...@@ -144,9 +144,12 @@ export default {
this.$emit('close') this.$emit('close')
}, },
goUrlgeren(){//个人资料 goUrlgeren(){//个人资料
this.$root.$emit("goworkobj")
this.$router.push({ this.$router.push({
path: '/user/personalData', path: '/user/personalData',
}) })
}, },
undefinedGongneng() { undefinedGongneng() {
this.$q.dialog({ this.$q.dialog({
......
src/components/sale/orderlist.vue
View file @ 466edf2c
...@@ -62,6 +62,9 @@ ...@@ -62,6 +62,9 @@
<td :rowspan="3" style="text-align: left"> <td :rowspan="3" style="text-align: left">
<div class="order_OfferId" @click="goOrderdetails(item,1)">{{item.OrderId}} <div class="order_OfferId" @click="goOrderdetails(item,1)">{{item.OrderId}}
</div> </div>
<div class="order_OfferId" v-if="item.RenewOrderId&&item.RenewOrderId>0">
原订单:{{item.RenewOrderId}}
</div>
<div>{{item.EnterName}}</div> <div>{{item.EnterName}}</div>
<div style="margin-top: 10px">{{item.CreateTime}}</div> <div style="margin-top: 10px">{{item.CreateTime}}</div>
<template v-if="AuthorityObj.isShowName"> <template v-if="AuthorityObj.isShowName">
...@@ -316,7 +319,8 @@ ...@@ -316,7 +319,8 @@
</template> </template>
<template v-else> <template v-else>
<q-btn color="secondary" size="sm" @click="goContractMannage(subItem)" label="查看合同" /> <q-btn color="secondary" size="sm" @click="goContractMannage(subItem)" label="查看合同" />
<q-btn style="margin-left:5px;" v-if="subItem.ContractStatus==0" color="purple" size="sm" @click="goContractAudit(subItem)" label="提交审核" /> <q-btn style="margin-left:5px;" v-if="subItem.ContractStatus==0" color="purple" size="sm"
@click="goContractAudit(subItem)" label="提交审核" />
</template> </template>
</td> </td>
</tr> </tr>
...@@ -1337,7 +1341,7 @@ ...@@ -1337,7 +1341,7 @@
}); });
}, },
//合同提交审核 //合同提交审核
goContractAudit(subItem){ goContractAudit(subItem) {
let msg = { let msg = {
ContractId: subItem.ContractId, ContractId: subItem.ContractId,
State: 1 State: 1
......
src/components/user/summaryInfo.vue
View file @ 466edf2c
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
.summaryInfo .box_t_item { .summaryInfo .box_t_item {
background: #FFF; background: #FFF;
height: 468px; height: 368px;
border-radius: 6px; border-radius: 6px;
padding: 30px 20px; padding: 30px 20px;
} }
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
padding: 20px; padding: 20px;
display: flex; display: flex;
align-items: flex-start; align-items: flex-start;
border-bottom: 1px solid #e2e2e2;
} }
...@@ -53,7 +54,7 @@ ...@@ -53,7 +54,7 @@
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
background: #E1E9FF; background: #F2F3F9;
} }
.summaryInfo .noticeitem_l_img{ .summaryInfo .noticeitem_l_img{
background: url('../../assets/images/Noticen.png'); background: url('../../assets/images/Noticen.png');
...@@ -62,11 +63,20 @@ ...@@ -62,11 +63,20 @@
width: 41px; width: 41px;
height: 39px; height: 39px;
} }
.summaryInfo .noticeitem:hover .noticeitem_l {
width: 82px;
height: 82px;
border-radius: 6px;
display: flex;
align-items: center;
justify-content: center;
background: #E1E9FF;
}
.summaryInfo .noticeitem:hover .gonggaoName{ .summaryInfo .noticeitem:hover .gonggaoName{
font-size: 16px;font-family: PingFang SC;font-weight: 800;color: #2961FE; font-size: 16px;font-family: PingFang SC;font-weight: 800;color: #2961FE;width: 1px;flex: 1;overflow: hidden;white-space: nowrap; text-overflow: ellipsis
} }
.summaryInfo .gonggaoName{ .summaryInfo .gonggaoName{
font-size: 16px;font-family: PingFang SC;font-weight: 800;color: #3F4254; font-size: 16px;font-family: PingFang SC;font-weight: 800;color: #3F4254;width: 1px;flex: 1;overflow: hidden;white-space: nowrap; text-overflow: ellipsis
} }
.summaryInfo .box_c { .summaryInfo .box_c {
...@@ -169,31 +179,30 @@ ...@@ -169,31 +179,30 @@
<span class="box_t_itext">公告</span> <span class="box_t_itext">公告</span>
</div> </div>
</div> </div>
<div class="scrollbox" v-if='noticeList.length>0' style="margin-top: 10px;background: #fff;height: 368px; width: 100%;overflow-y: auto;cursor: pointer;padding: 2px;"> <div class="scrollbox" v-if='noticeList.length>0' style="margin-top: 10px;background: #fff;height: 268px; width: 100%;overflow-y: auto;cursor: pointer;padding: 2px;">
<div v-if='noticeList.length>0'> <div v-if='noticeList.length>0'>
<div v-for="(item,index) in noticeList" :key='index' class="noticeitem" <div v-for="(item,index) in noticeList" :key='index' class="noticeitem"
@click="goNoticeDetail(item)"> @click="goNoticeDetail(item)">
<div class="noticeitem_l"> <!-- <div class="noticeitem_l">
<div class="noticeitem_l_img"></div> <div class="noticeitem_l_img"></div>
<!-- <img src="../../assets/images/Noticen.png" </div> -->
style="width: 41px;height: 39px; " /> --> <div style="width: 1px;flex: 1;">
</div>
<div style="width: 1px;flex: 1;margin-left: 20px;">
<div style="width: 100%;display: flex;align-items: flex-start;justify-content: space-between;"> <div style="width: 100%;display: flex;align-items: flex-start;justify-content: space-between;">
<span class="gonggaoName" >{{item.UpdateByName}}</span> <span class="gonggaoName" >{{item.Title}}</span>
<span style="font-size: 14px;font-weight: 500;color: #C4C6D1;">{{item.DayStr}}</span> <span style="font-size: 14px;font-weight: 500;color: #C4C6D1;">{{item.DayStr}}</span>
</div> </div>
<div style="font-size: 14px; font-family: PingFang SC;font-weight: 400;color: #9A9DAB;margin-top: 10px;overflow: hidden;white-space: nowrap; text-overflow: ellipsis"> <div style="font-size: 14px; font-family: PingFang SC;font-weight: 400;color: #9A9DAB;margin-top: 10px;display: flex;align-items: center;">
{{item.Title}} <span>{{item.UpdateByName}}</span> <span style="margin-left: 20px;">编号：{{item.Number}}</span>
</div> </div>
<div style="font-size: 14px; font-family: PingFang SC;font-weight: 400;color: #9A9DAB;margin-top: 10px;"> 编号：{{item.Number}}</div>
</div> </div>
</div> </div>
<div class="notifyLoadMore" style="text-align: center;margin-top: 10px;" v-if="noticeMsg.pageSize<Count" @click="getMoreNotify()"> <div class="notifyLoadMore" style="text-align: center;margin-top: 10px;" v-if="noticeMsg.pageSize<Count" @click="getMoreNotify()">
<span>加载更多</span> <span>加载更多</span>
</div> </div>
</div> </div>
<div v-else style="width: 100%;height: 80px;text-align: center;line-height: 80px;color: #9A9DAB;">暂无数据</div> <div v-else class="q-mt-lg flex column justify-center items-center">
<span class="q-mt-md remark-font">没有找到相关数据信息</span>
</div>
</div> </div>
</div> </div>
...@@ -208,7 +217,7 @@ ...@@ -208,7 +217,7 @@
</div> </div>
</div> </div>
<div class="scrollbox" <div class="scrollbox"
style="margin-top: 10px;background: #fff;height: 368px; width: 100%;overflow-y: auto;cursor: pointer;padding: 2px;"> style="margin-top: 10px;background: #fff;height: 268px; width: 100%;overflow-y: auto;cursor: pointer;padding: 2px;">
<q-list v-if="socektArr.length>0" > <q-list v-if="socektArr.length>0" >
<q-item class="q-my-sm q-pa-xs items-start" v-for="(x,i) in socektArr" :key="i" style="padding: 10px 0;" <q-item class="q-my-sm q-pa-xs items-start" v-for="(x,i) in socektArr" :key="i" style="padding: 10px 0;"
clickable v-ripple @click="goMsgDetail(x.JumpUrl,x),readMsgLog(x.Id,i)"> clickable v-ripple @click="goMsgDetail(x.JumpUrl,x),readMsgLog(x.Id,i)">
...@@ -227,7 +236,9 @@ ...@@ -227,7 +236,9 @@
</q-item-section> </q-item-section>
</q-item> </q-item>
</q-list> </q-list>
<div v-else style="width: 100%;height: 80px;text-align: center;line-height: 80px;color: #9A9DAB;">暂无数据</div> <div v-else class="q-mt-lg flex column justify-center items-center">
<span class="q-mt-md remark-font">没有找到相关数据信息</span>
</div>
</div> </div>
</div> </div>
......
src/layouts/MainLayout.vue
View file @ 466edf2c
...@@ -178,15 +178,10 @@ ...@@ -178,15 +178,10 @@
if (this.userInfo && this.userInfo.MenuList) { if (this.userInfo && this.userInfo.MenuList) {
this.secondNavs = this.userInfo.MenuList.length > 0 ? this.userInfo.MenuList[i].SubList : [] this.secondNavs = this.userInfo.MenuList.length > 0 ? this.userInfo.MenuList[i].SubList : []
} }
// this.MsgBus.$on('add',(payload) => { this.$root.$on("goworkobj", (data)=>{
// let that= this // this.setNavs(0)
// that.userInfo.AccountName = payload.EmployeeName this.secondNavs=[]
// that.userInfo.UserIcon = payload.UserIcon });
// that.userInfo.Email = payload.Email
// that.userInfo.SchoolName = payload.SchoolName
// // location.reload();
// });
this.getLogList(); this.getLogList();
this.getMsg(); this.getMsg();
}, },
......
src/pages/user/personalData.vue
View file @ 466edf2c
...@@ -51,6 +51,7 @@ ...@@ -51,6 +51,7 @@
padding-left: 39px; padding-left: 39px;
/* margin-top: 55px; */ /* margin-top: 55px; */
margin-top: 8px; margin-top: 8px;
cursor: pointer;
} }
.personalData .box_l_cen { .personalData .box_l_cen {
...@@ -63,6 +64,7 @@ ...@@ -63,6 +64,7 @@
color: #3F4254; color: #3F4254;
padding-left: 39px; padding-left: 39px;
margin-top: 8px; margin-top: 8px;
cursor: pointer;
justify-content: space-between; justify-content: space-between;
} }
...@@ -131,7 +133,7 @@ ...@@ -131,7 +133,7 @@
<span class="box_l_t_l">部门：</span> <span class="box_l_t_l">部门：</span>
<span>{{showObj.DeptName}}</span> <span>{{showObj.DeptName}}</span>
</div> </div>
<!-- <div :class="rightType==0?'box_l_title':'box_l_cen'" @click='rightType=0'>概要信息</div> --> <div :class="rightType==0?'box_l_title':'box_l_cen'" @click='rightType=0'>概要信息</div>
<!-- <div :class="rightType==3?'box_l_title':'box_l_cen'" @click='rightType=3'>预警信息</div> --> <!-- <div :class="rightType==3?'box_l_title':'box_l_cen'" @click='rightType=3'>预警信息</div> -->
<div :class="rightType==1?'box_l_title':'box_l_cen'" @click='rightType=1'>账户资料</div> <div :class="rightType==1?'box_l_title':'box_l_cen'" @click='rightType=1'>账户资料</div>
<div :class="rightType==2?'box_l_title':'box_l_cen'" @click='rightType=2'>密码修改</div> <div :class="rightType==2?'box_l_title':'box_l_cen'" @click='rightType=2'>密码修改</div>
...@@ -237,7 +239,7 @@ ...@@ -237,7 +239,7 @@
loading1: false, loading1: false,
loading2:false, loading2:false,
showObj: {}, showObj: {},
rightType: 1,//右边显示类型 rightType: 0,//右边显示类型
datamodify: {}, datamodify: {},
CompanyList: [], CompanyList: [],
passwordMsg:Object.assign({},defaultpassword), passwordMsg:Object.assign({},defaultpassword),
......
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