Skip to content

C
confucius
Commit 155e0ae8 authored by zhengke's avatar zhengke
Browse files
Options

1

parent c85a2d12
Hide whitespace changes
Inline Side-by-side
Showing with 98 additions and 34 deletions
src/components/school/student/student-genjin.vue
View file @ 155e0ae8
...@@ -52,7 +52,10 @@ ...@@ -52,7 +52,10 @@
UeEditor UeEditor
}, },
props: { props: {
saveObj: {
type: Object,
default: null
}
}, },
data() { data() {
return { return {
...@@ -66,12 +69,19 @@ ...@@ -66,12 +69,19 @@
}, },
msg: { msg: {
pageIndex: 1, pageIndex: 1,
pageSize: 12 pageSize: 12,
StuId: 0
}, },
dataList:[], dataList:[],
page_Count:0 page_Count:0
} }
}, },
created() {
if (this.saveObj && this.saveObj.StuId) {
this.msg.StuId = this.saveObj.StuId;
}
},
mounted() { mounted() {
this.getList(); this.getList();
}, },
......
src/components/school/student/student-visit.vue
View file @ 155e0ae8
...@@ -53,27 +53,39 @@ ...@@ -53,27 +53,39 @@
<q-timeline-entry v-for="(tItem,tIndex) in dataList" :key="tIndex"> <q-timeline-entry v-for="(tItem,tIndex) in dataList" :key="tIndex">
<template v-slot:title> <template v-slot:title>
<div class="visit_Cont"> <div class="visit_Cont">
<div>到访校区：{{tItem.SchoolName}}</div> <div class="Log_Content">
<div>接待人：{{tItem.ReceptionPersionName}}</div> <div>到访校区：{{tItem.SchoolName}}</div>
<div>备注：{{tItem.Remark}}</div> <div>
<div>反馈：{{tItem.Feedback}} <span style="display:inline-block;width:71px;text-align:right;">
<q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400;" 接待人：</span>{{tItem.ReceptionPersionName}}
:label="tItem.Feedback==''?'添加反馈':'编辑反馈'" @click="clickItem(tItem)"> </div>
<div class="StuCom_Remark">
<div class="StuCom_Left">备注：</div>
<div class="StuCom_Inner">{{tItem.Remark}}</div>
</div>
<div class="StuCom_Remark">
<div class="StuCom_Left">反馈：</div>
<div class="StuCom_Inner">{{tItem.Feedback}} </div>
</div>
</div>
<div style="display:flex;margin-top:10px;">
<div @click="delVisit(tItem.Id)" class="visit_delete text-negative">删除</div>
<div @click="clickItem(tItem)" class="stu_ComFeed">
{{tItem.Feedback==null||tItem.Feedback==''?'添加反馈':'编辑反馈'}}
<q-popup-proxy> <q-popup-proxy>
<q-banner v-if="isShowEdit"> <q-banner v-if="isShowEdit">
<div class="row wrap"> <div class="row wrap" style="margin-top:10px;width:300px;">
<q-input filled v-model="feedBackMsg.Feedback" :rows="3" type="textarea" <q-input filled v-model="feedBackMsg.Feedback" :rows="3" type="textarea"
class="col-12 q-pb-lg" label="反馈"> class="col-12 q-pb-lg" label="反馈">
</q-input> </q-input>
</div> </div>
<div class="row wrap" style="margin-bottom:10px;"> <div class="row wrap" style="float:right;margin-bottom:10px;">
<q-btn label="保存" color="accent q-mb-lg" size="md" @click="SetFeedBack()" /> <q-btn label="保存" color="accent" size="sm" @click="SetFeedBack()" />
</div> </div>
</q-banner> </q-banner>
</q-popup-proxy> </q-popup-proxy>
</q-btn> </div>
</div> </div>
<div @click="delVisit(tItem.Id)" class="visit_delete">删除</div>
</div> </div>
</template> </template>
<template v-slot:subtitle> <template v-slot:subtitle>
...@@ -86,7 +98,7 @@ ...@@ -86,7 +98,7 @@
</q-timeline> </q-timeline>
</div> </div>
</div> </div>
<div style="margin:20px 0;"> <div style="margin-bottom:20px;">
<q-pagination class="full-width justify-end" v-model="msg.pageIndex" color="primary" :max="page_Count" input <q-pagination class="full-width justify-end" v-model="msg.pageIndex" color="primary" :max="page_Count" input
@input="changePage" /> @input="changePage" />
</div> </div>
...@@ -163,7 +175,7 @@ ...@@ -163,7 +175,7 @@
//点击到访 //点击到访
clickItem(item) { clickItem(item) {
this.feedBackMsg.Id = item.Id; this.feedBackMsg.Id = item.Id;
this.feedBackMsg.Feedback=item.Feedback; this.feedBackMsg.Feedback = item.Feedback;
this.isShowEdit = true; this.isShowEdit = true;
}, },
SetFeedBack() { SetFeedBack() {
...@@ -284,4 +296,5 @@ ...@@ -284,4 +296,5 @@
} }
}, },
} }
</script>
\ No newline at end of file </script>
src/components/school/student/student-yuefang.vue
View file @ 155e0ae8
...@@ -11,11 +11,26 @@ ...@@ -11,11 +11,26 @@
<template v-if="isShowAdd"> <template v-if="isShowAdd">
<div class="row wrap"> <div class="row wrap">
<q-input filled class="col-6 q-pb-lg q-pr-lg" v-model="yueMsg.AppointmentPoint" label="约访地点"></q-input> <q-input filled class="col-6 q-pb-lg q-pr-lg" v-model="yueMsg.AppointmentPoint" label="约访地点"></q-input>
<q-input filled class="col-6 q-pb-lg" v-model="yueMsg.AppointmentTime" mask="date" label="约访时间"> <q-input filled v-model="yueMsg.AppointmentTime">
<template v-slot:append> <template v-slot:prepend>
<q-icon name="event" class="cursor-pointer"> <q-icon name="event" class="cursor-pointer">
<q-popup-proxy ref="qDateProxy1" transition-show="scale" transition-hide="scale"> <q-popup-proxy transition-show="scale" transition-hide="scale">
<q-date v-model="yueMsg.AppointmentTime" @input="() => $refs.qDateProxy1.hide()" /> <q-date v-model="yueMsg.AppointmentTime" mask="YYYY-MM-DD HH:mm">
<div class="row items-center justify-end">
<q-btn v-close-popup label="Close" color="primary" flat />
</div>
</q-date>
</q-popup-proxy>
</q-icon>
</template>
<template v-slot:append>
<q-icon name="access_time" class="cursor-pointer">
<q-popup-proxy transition-show="scale" transition-hide="scale">
<q-time v-model="yueMsg.AppointmentTime" mask="YYYY-MM-DD HH:mm" format24h>
<div class="row items-center justify-end">
<q-btn v-close-popup label="Close" color="primary" flat />
</div>
</q-time>
</q-popup-proxy> </q-popup-proxy>
</q-icon> </q-icon>
</template> </template>
...@@ -35,27 +50,36 @@ ...@@ -35,27 +50,36 @@
<q-timeline-entry v-for="(tItem,tIndex) in dataList" :key="tIndex"> <q-timeline-entry v-for="(tItem,tIndex) in dataList" :key="tIndex">
<template v-slot:title> <template v-slot:title>
<div class="visit_Cont"> <div class="visit_Cont">
<div>约访时间：{{tItem.AppointmentTime}}</div> <div class="Log_Content">
<div>约访地点：{{tItem.AppointmentPoint}}</div> <div>约访时间：{{tItem.AppointmentTime}}</div>
<div>备注：{{tItem.Remark}}</div> <div>约访地点：{{tItem.AppointmentPoint}}</div>
<div>反馈：{{tItem.Feedback}} <div class="StuCom_Remark">
<q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400;" <div class="StuCom_Left">备注：</div>
:label="tItem.Feedback==''?'添加反馈':'编辑反馈'" @click="clickItem(tItem)"> <div class="StuCom_Inner">{{tItem.Remark}}</div>
</div>
<div class="StuCom_Remark">
<div class="StuCom_Left">反馈：</div>
<div class="StuCom_Inner">{{tItem.Feedback}} </div>
</div>
</div>
<div style="display:flex;margin-top:10px;">
<div @click="delVisit(tItem.Id)" class="visit_delete text-negative">删除</div>
<div @click="clickItem(tItem)" class="stu_ComFeed">
{{tItem.Feedback==null||tItem.Feedback==''?'添加反馈':'编辑反馈'}}
<q-popup-proxy> <q-popup-proxy>
<q-banner v-if="isShowEdit"> <q-banner v-if="isShowEdit">
<div class="row wrap"> <div class="row wrap" style="margin-top:10px;width:300px;">
<q-input filled v-model="feedBackMsg.Feedback" :rows="3" type="textarea" <q-input filled v-model="feedBackMsg.Feedback" :rows="3" type="textarea"
class="col-12 q-pb-lg" label="反馈"> class="col-12 q-pb-lg" label="反馈">
</q-input> </q-input>
</div> </div>
<div class="row wrap" style="margin-bottom:10px;"> <div class="row wrap" style="float:right;margin-bottom:10px;">
<q-btn label="保存" color="accent q-mb-lg" size="md" @click="SetFeedBack()" /> <q-btn label="保存" color="accent" size="sm" @click="SetFeedBack()" />
</div> </div>
</q-banner> </q-banner>
</q-popup-proxy> </q-popup-proxy>
</q-btn> </div>
</div> </div>
<div @click="delVisit(tItem.Id)" class="visit_delete">删除</div>
</div> </div>
</template> </template>
<template v-slot:subtitle> <template v-slot:subtitle>
...@@ -68,7 +92,7 @@ ...@@ -68,7 +92,7 @@
</q-timeline> </q-timeline>
</div> </div>
</div> </div>
<div style="margin:20px 0;"> <div style="margin-bottom:20px">
<q-pagination class="full-width justify-end" v-model="msg.pageIndex" color="primary" :max="page_Count" input <q-pagination class="full-width justify-end" v-model="msg.pageIndex" color="primary" :max="page_Count" input
@input="changePage" /> @input="changePage" />
</div> </div>
...@@ -223,4 +247,5 @@ ...@@ -223,4 +247,5 @@
} }
} }
} }
</script>
\ No newline at end of file </script>
src/components/school/student/studentRight-form.vue
View file @ 155e0ae8
...@@ -405,9 +405,9 @@ ...@@ -405,9 +405,9 @@
font-size:14px; font-size:14px;
} }
.visit_delete{ .visit_delete{
color:#3470ff;
font-size:14px; font-size:14px;
cursor: pointer; cursor: pointer;
width:30px;
} }
.operate_Content{ .operate_Content{
overflow: auto; overflow: auto;
...@@ -435,4 +435,20 @@ ...@@ -435,4 +435,20 @@
line-height: 2; line-height: 2;
margin-top:10px; 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>
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