Commit a104a9fd authored by zhengke's avatar zhengke

修改

parent c05d4b50
...@@ -6,14 +6,18 @@ ...@@ -6,14 +6,18 @@
<q-timeline-entry v-for="(item,index) in contractList" :key="index"> <q-timeline-entry v-for="(item,index) in contractList" :key="index">
<template v-slot:title> <template v-slot:title>
<div class="visit_Cont Log_Content"> <div class="visit_Cont Log_Content">
<div>订单编号:{{item.OrderId}}</div> <div>
订单编号:
<span class="Stu_OrderId" @click="goOrderDetail(item.OrderId)">{{item.OrderId}}</span></div>
<div>班级名称:{{item.ClassName}}</div> <div>班级名称:{{item.ClassName}}</div>
<div>班级编号:{{item.ClassNo}}</div> <div>班级编号:{{item.ClassNo}}</div>
<div>总课时:{{item.TotalHours}}</div> <div>
<span class="Stu_HtLeft">总课时</span>
{{item.TotalHours}}</div>
<div>完成课时:{{item.CompleteHours}}</div> <div>完成课时:{{item.CompleteHours}}</div>
<div>学员名称:{{item.GuestName}}</div> <div>学员名称:{{item.GuestName}}</div>
<div>课程名称:{{item.CourseName}}</div> <div>课程名称:{{item.CourseName}}</div>
<div>合同编号:{{item.ContractNo}} {{item.ContractId}}</div> <div>合同编号:<span class="Stu_OrderId" @click="goContractView(item.ContractId)">{{item.ContractNo}}</span></div>
</div> </div>
</template> </template>
</q-timeline-entry> </q-timeline-entry>
...@@ -75,6 +79,24 @@ ...@@ -75,6 +79,24 @@
changePage(val) { changePage(val) {
this.customMsg.pageIndex = val; this.customMsg.pageIndex = val;
this.getStuContractPage(); this.getStuContractPage();
},
//跳转订单
goOrderDetail(OrderId){
this.$router.push({
path: "/sale/myOrder",
query: {
OrderId: OrderId
}
});
},
//跳转合同
goContractView(ContractId){
this.$router.push({
path: "/contractView",
query: {
ContractId: ContractId
}
});
} }
}, },
} }
......
...@@ -6,10 +6,11 @@ ...@@ -6,10 +6,11 @@
<q-timeline-entry v-for="(item,index) in orderList" :key="index"> <q-timeline-entry v-for="(item,index) in orderList" :key="index">
<template v-slot:title> <template v-slot:title>
<div class="visit_Cont Log_Content"> <div class="visit_Cont Log_Content">
<div>订单编号:{{item.OrderId}}</div> <div>订单编号:<span class="Stu_OrderId" @click="goOrderDetail(item.OrderId)">{{item.OrderId}}</span></div>
<div>班级名称:{{item.ClassName}}</div> <div>班级名称:{{item.ClassName}}</div>
<div>班级编号:{{item.ClassNo}}</div> <div>班级编号:{{item.ClassNo}}</div>
<div>总课时:{{item.TotalHours}}</div> <div>
<span class="Stu_HtLeft">总课时</span>{{item.TotalHours}}</div>
<div>完成课时:{{item.CompleteHours}}</div> <div>完成课时:{{item.CompleteHours}}</div>
<div>学员名称:{{item.GuestName}}</div> <div>学员名称:{{item.GuestName}}</div>
<div>课程名称:{{item.CourseName}}</div> <div>课程名称:{{item.CourseName}}</div>
...@@ -74,6 +75,14 @@ ...@@ -74,6 +75,14 @@
changePage(val) { changePage(val) {
this.customMsg.pageIndex = val; this.customMsg.pageIndex = val;
this.getStuOrderPage(); this.getStuOrderPage();
},
goOrderDetail(OrderId){
this.$router.push({
path: "/sale/myOrder",
query: {
OrderId: OrderId
}
});
} }
}, },
} }
......
...@@ -76,8 +76,8 @@ ...@@ -76,8 +76,8 @@
<div class="StuCom_Inner">{{tItem.ClassContent}}</div> <div class="StuCom_Inner">{{tItem.ClassContent}}</div>
</div> </div>
<div>主讲老师:{{tItem.TeacherName}}</div> <div>主讲老师:{{tItem.TeacherName}}</div>
<div> <div class="StuCom_Remark">
<span style="display:inline-block;width:71px;text-align:right;">教室:</span>{{tItem.RoomName}} <span class="StuCom_Left">教室</span>{{tItem.RoomName}}
</div> </div>
</div> </div>
<div @click="delFollow(tItem.Id)" style="margin-top:10px;" class="visit_delete text-negative">删除</div> <div @click="delFollow(tItem.Id)" style="margin-top:10px;" class="visit_delete text-negative">删除</div>
......
...@@ -55,16 +55,16 @@ ...@@ -55,16 +55,16 @@
<div class="visit_Cont"> <div class="visit_Cont">
<div class="Log_Content"> <div class="Log_Content">
<div>到访校区:{{tItem.SchoolName}}</div> <div>到访校区:{{tItem.SchoolName}}</div>
<div> <div class="StuCom_Remark">
<span style="display:inline-block;width:71px;text-align:right;"> <span class="StuCom_Left">接待人</span>
接待人:</span>{{tItem.ReceptionPersionName}} {{tItem.ReceptionPersionName}}
</div> </div>
<div class="StuCom_Remark"> <div class="StuCom_Remark">
<div class="StuCom_Left">备注</div> <div class="StuCom_Left">备注</div>
<div class="StuCom_Inner">{{tItem.Remark}}</div> <div class="StuCom_Inner">{{tItem.Remark}}</div>
</div> </div>
<div class="StuCom_Remark"> <div class="StuCom_Remark">
<div class="StuCom_Left">反馈</div> <div class="StuCom_Left">反馈</div>
<div class="StuCom_Inner">{{tItem.Feedback}} </div> <div class="StuCom_Inner">{{tItem.Feedback}} </div>
</div> </div>
</div> </div>
......
...@@ -54,11 +54,11 @@ ...@@ -54,11 +54,11 @@
<div>约访时间:{{tItem.AppointmentTime}}</div> <div>约访时间:{{tItem.AppointmentTime}}</div>
<div>约访地点:{{tItem.AppointmentPoint}}</div> <div>约访地点:{{tItem.AppointmentPoint}}</div>
<div class="StuCom_Remark"> <div class="StuCom_Remark">
<div class="StuCom_Left">备注</div> <div class="StuCom_Left">备注</div>
<div class="StuCom_Inner">{{tItem.Remark}}</div> <div class="StuCom_Inner">{{tItem.Remark}}</div>
</div> </div>
<div class="StuCom_Remark"> <div class="StuCom_Remark">
<div class="StuCom_Left">反馈</div> <div class="StuCom_Left">反馈</div>
<div class="StuCom_Inner">{{tItem.Feedback}} </div> <div class="StuCom_Inner">{{tItem.Feedback}} </div>
</div> </div>
</div> </div>
......
...@@ -55,11 +55,6 @@ ...@@ -55,11 +55,6 @@
</script> </script>
<style> <style>
.custom_RModel {
width: 500px;
height: 100%;
}
.MycustomMain { .MycustomMain {
width: auto !important; width: auto !important;
display: flex; display: flex;
...@@ -69,33 +64,6 @@ ...@@ -69,33 +64,6 @@
background-color: #f4f4f6; background-color: #f4f4f6;
} }
.custom_Top {
width: 100%;
padding: 22px;
background: #fff;
border-radius: 8px;
display: flex;
justify-content: space-between;
align-items: center;
}
.F_16 {
font-size: 16px;
}
.Name_List {
display: flex;
flex-direction: column;
justify-content: space-around;
overflow: hidden;
}
.wechat_Name {
color: #9999a8;
display: flex;
font-size: 14px;
}
.myCustomBottom { .myCustomBottom {
flex: 1; flex: 1;
display: flex; display: flex;
...@@ -118,190 +86,4 @@ ...@@ -118,190 +86,4 @@
.myDetail-info::-webkit-scrollbar { .myDetail-info::-webkit-scrollbar {
display: none; display: none;
} }
.detail-travel {
width: 100%;
flex-grow: 1;
display: flex;
flex-direction: column;
padding-top: 28px;
background: #fff;
border-radius: 8px 8px 0 0;
overflow: hidden;
}
.edit_bar {
display: flex;
justify-content: space-between;
align-items: center;
padding: 12px 22px;
}
.edit_info_wrap {
padding: 0 22px 12px;
}
.custom_Line {
width: calc(100% - 44px);
margin: 16px 22px;
border-bottom: 1px solid #d7d7d7;
}
.custom_Edit {
display: flex;
justify-content: center;
align-items: center;
width: 78px;
height: 26px;
margin-right: 3px;
border: 1px dashed #858598;
border-radius: 4px;
font-size: 12px;
cursor: pointer;
}
.tripTypeContent {
display: flex;
overflow-x: auto;
white-space: nowrap;
}
.ckedClass {
color: #3470ff;
font-weight: 700;
}
.tripTypeContent div {
margin-right: 20px;
cursor: pointer;
}
.q-timeline__title {
margin-bottom: 5px;
}
.customUpdateTime {
display: flex;
justify-content: space-between;
font-size: 14px;
color: #9696a6;
}
.q-timeline__subtitle {
opacity: 1;
font-weight: normal;
}
.follow_Component {
padding: 0 22px;
margin-top: 10px;
width: 100%;
background-color: #f6f6f6;
border-radius: 5px;
}
.detail_first {
margin: 0 22px;
display: flex;
flex-direction: column;
height: 100%;
}
.detail_Main {
display: flex;
flex-direction: column;
width: 100%;
height: 100%;
}
.student_Name {
width: 100%;
height: 100%;
background: #004d40;
color: #fff;
text-align: center;
line-height: 60px;
font-size: 20px;
}
.TimeLineDiv {
height: 620px;
flex: 1;
height: 100%;
padding-right: 20px;
}
.Time_TopList {
display: flex;
justify-content: space-between;
}
.visit_Cont {
font-size: 14px;
}
.visit_delete {
font-size: 14px;
cursor: pointer;
width: 30px;
}
.operate_Content {
overflow: auto;
padding-right: 20px;
}
.operate_Content::-webkit-scrollbar {
width: 6px;
height: 8px;
}
.operate_Content::-webkit-scrollbar-thumb {
border-radius: 4px;
-webkit-box-shadow: inset 0 0 2px rgba(0, 0, 0, 0.2);
background: #c9c9c9;
}
.operate_Content::-webkit-scrollbar-thumb {
-webkit-box-shadow: inset 0 0 2px rgba(0, 0, 0, 0.2);
border-radius: 4px;
background: #EDEDED;
}
.Log_Content {
padding: 10px;
border-radius: 5px;
background-color: #f4f4f6;
color: #818194;
line-height: 2;
margin-top: 10px;
}
.stu_ComFeed {
color: #3470ff;
cursor: pointer;
margin-left: 20px;
}
.StuCom_Remark {
display: flex;
}
.StuCom_Inner {
width: 100%;
}
.StuCom_Left {
flex-shrink: 0;
width: 71px;
text-align: right;
}
</style> </style>
...@@ -463,7 +463,18 @@ ...@@ -463,7 +463,18 @@
.StuCom_Left { .StuCom_Left {
flex-shrink: 0; flex-shrink: 0;
width: 71px; width: 57px;
text-align: right; text-align-last: justify;
}
.Stu_OrderId{
color: #2961FE;
font-weight: bold;
text-decoration: underline;
cursor: pointer;
}
.Stu_HtLeft{
width:57px;
display: inline-block;
text-align-last: justify;
} }
</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