Skip to content

C
confucius
Commit 8abd4c0d authored by zhengke's avatar zhengke
Browse files
Options

1

parent 15a8e232
Hide whitespace changes
Inline Side-by-side
Showing with 111 additions and 75 deletions
src/components/school/student/student-visit.vue
View file @ 8abd4c0d
...@@ -3,80 +3,78 @@ ...@@ -3,80 +3,78 @@
</style> </style>
<template> <template>
<div> <div>
<div style="margin-top:30px;"> <q-btn label="新增" color="accent q-mb-lg" size="sm" @click="isShowAdd=true" />
<q-btn label="新增" color="accent q-mb-lg" size="sm" @click="isShowAdd=true" /> <template v-if="isShowAdd">
<template v-if="isShowAdd"> <div class="row wrap">
<div class="row wrap"> <q-select filled option-value="SId" class="col-6 q-pb-lg q-pr-lg" option-label="SName"
<q-select filled option-value="SId" class="col-6 q-pb-lg q-pr-lg" option-label="SName" v-model="VisitMsg.School_Id" :options="schoolList" emit-value map-options label="到访校区" />
v-model="VisitMsg.School_Id" :options="schoolList" emit-value map-options label="到访校区" /> <q-input filled v-model="VisitMsg.Date" class="col-6 q-pb-lg" mask="date" label="日期">
<q-input filled v-model="VisitMsg.Date" class="col-6 q-pb-lg" mask="date" label="日期"> <template v-slot:append>
<template v-slot:append> <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 ref="qDateProxy1" transition-show="scale" transition-hide="scale"> <q-date v-model="VisitMsg.Date" @input="() => $refs.qDateProxy1.hide()" />
<q-date v-model="VisitMsg.Date" @input="() => $refs.qDateProxy1.hide()" /> </q-popup-proxy>
</q-popup-proxy> </q-icon>
</q-icon> </template>
</template> </q-input>
</q-input> </div>
</div> <div class="row warp">
<div class="row warp"> <q-input filled mask="time" v-model="VisitMsg.VisitTime" :rules="['time']" class="col-6 q-pb-lg q-pr-lg">
<q-input filled mask="time" v-model="VisitMsg.VisitTime" :rules="['time']" class="col-6 q-pb-lg q-pr-lg"> <template v-slot:append>
<template v-slot:append> <q-icon name="access_time" class="cursor-pointer">
<q-icon name="access_time" class="cursor-pointer"> <q-popup-proxy transition-show="scale" transition-hide="scale">
<q-popup-proxy transition-show="scale" transition-hide="scale"> <q-time v-model="VisitMsg.VisitTime">
<q-time v-model="VisitMsg.VisitTime"> <div class="row items-center justify-end">
<div class="row items-center justify-end"> <q-btn v-close-popup label="Close" color="primary" flat />
<q-btn v-close-popup label="Close" color="primary" flat />
</div>
</q-time>
</q-popup-proxy>
</q-icon>
</template>
</q-input>
<q-input filled v-model="VisitMsg.ReceptionPersion" class="col-6 q-pb-lg" label="接待人"></q-input>
</div>
<div class="row wrap">
<q-input filled v-model="VisitMsg.Remark" :rows="3" type="textarea" class="col-12 q-pb-lg" label="备注">
</q-input>
</div>
<div class="row wrap">
<q-input filled v-model="VisitMsg.Feedback" :rows="3" type="textarea" class="col-12 q-pb-lg" label="反馈">
</q-input>
</div>
<div class="row wrap" style="margin-bottom:10px;">
<q-btn label="保存" color="accent q-mb-lg" size="md" @click="saveVisit()" />
</div>
</template>
<div style="display:flex;flex:1;flex-direction: column;overflow:hidden;">
<div class="TimeLineDiv">
<q-timeline color="primary">
<q-timeline-entry v-for="(tItem,tIndex) in dataList" :key="tIndex">
<template v-slot:title>
<div class="visit_Cont">
<div>到访校区：{{tItem.School_Id}}</div>
<div>接待人：{{tItem.ReceptionPersion}}</div>
<div>备注：{{tItem.Remark}}</div>
<div>反馈：{{tItem.Feedback}}</div>
<div @click="delVisit(tItem.Id)" class="visit_delete">删除</div>
</div>
</template>
<template v-slot:subtitle>
<div class="Time_TopList">
<div>
<span style="margin-right:20px;">{{ tItem.Date }}</span>
<span>{{tItem.VisitTime}}</span>
</div> </div>
<div>{{ tItem.CreateBy }}</div> </q-time>
</div> </q-popup-proxy>
</template> </q-icon>
</q-timeline-entry> </template>
</q-timeline> </q-input>
</div> <q-input filled v-model="VisitMsg.ReceptionPersion" class="col-6 q-pb-lg" label="接待人"></q-input>
</div>
<div class="row wrap">
<q-input filled v-model="VisitMsg.Remark" :rows="3" type="textarea" class="col-12 q-pb-lg" label="备注">
</q-input>
</div>
<div class="row wrap">
<q-input filled v-model="VisitMsg.Feedback" :rows="3" type="textarea" class="col-12 q-pb-lg" label="反馈">
</q-input>
</div> </div>
<div style="margin:20px 0;"> <div class="row wrap" style="margin-bottom:10px;">
<q-pagination class="full-width justify-end" v-model="msg.pageIndex" color="primary" <q-btn label="保存" color="accent q-mb-lg" size="md" @click="saveVisit()" />
:max="page_Count" input @input="changePage" />
</div> </div>
</template>
<div style="display:flex;flex:1;flex-direction: column;overflow:hidden;">
<div class="TimeLineDiv">
<q-timeline color="primary">
<q-timeline-entry v-for="(tItem,tIndex) in dataList" :key="tIndex">
<template v-slot:title>
<div class="visit_Cont">
<div>到访校区：{{tItem.School_Id}}</div>
<div>接待人：{{tItem.ReceptionPersion}}</div>
<div>备注：{{tItem.Remark}}</div>
<div>反馈：{{tItem.Feedback}}</div>
<div @click="delVisit(tItem.Id)" class="visit_delete">删除</div>
</div>
</template>
<template v-slot:subtitle>
<div class="Time_TopList">
<div>
<span style="margin-right:20px;">{{ tItem.Date }}</span>
<span>{{tItem.VisitTime}}</span>
</div>
<div>{{ tItem.CreateBy }}</div>
</div>
</template>
</q-timeline-entry>
</q-timeline>
</div>
</div>
<div style="margin:20px 0;">
<q-pagination class="full-width justify-end" v-model="msg.pageIndex" color="primary" :max="page_Count" input
@input="changePage" />
</div> </div>
</div> </div>
</template> </template>
...@@ -167,11 +165,24 @@ ...@@ -167,11 +165,24 @@
position: 'top' position: 'top'
}) })
this.getList(); this.getList();
this.clearMsg();
} }
}).catch(() => { }).catch(() => {
}) })
}, },
//清除数据
clearMsg() {
this.VisitMsg.Id = 0;
this.VisitMsg.StuId = 0;
this.VisitMsg.School_Id = 0;
this.VisitMsg.Date = '';
this.VisitMsg.VisitTime = '';
this.VisitMsg.ReceptionPersion = '';
this.VisitMsg.Remark = '';
this.VisitMsg.Feedback = '';
this.isShowAdd = false;
},
//删除到访 //删除到访
delVisit(Id) { delVisit(Id) {
let that = this let that = this
...@@ -196,7 +207,7 @@ ...@@ -196,7 +207,7 @@
}) })
}).onCancel(() => {}); }).onCancel(() => {});
}, },
changePage(val){ changePage(val) {
this.msg.pageIndex = val; this.msg.pageIndex = val;
this.getList(); this.getList();
} }
......
src/components/school/student/student-yuefang.vue
View file @ 8abd4c0d
...@@ -28,6 +28,12 @@ ...@@ -28,6 +28,12 @@
</div> </div>
</template> </template>
<script> <script>
import {
saveStudentAppointment,
queryStudentAppointmentPage,
deleteStudentAppointment
} from '../../../api/customerstudent/customerstudent';
export default { export default {
meta: { meta: {
title: "" title: ""
...@@ -36,7 +42,7 @@ ...@@ -36,7 +42,7 @@
}, },
props: { props: {
}, },
data() { data() {
return { return {
......
src/components/school/student/studentRight-form.vue
View file @ 8abd4c0d
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
<q-tab name="3" label="订单" /> <q-tab name="3" label="订单" />
<q-tab name="4" label="合同" /> <q-tab name="4" label="合同" />
</q-tabs> </q-tabs>
<div style="flex:1;overflow:hidden;"> <div style="flex:1;overflow:auto" >
<div class="detail_Main"> <div class="detail_Main">
<div class="tripTypeContent" style="flex-shrink:0" v-if="ckedTab==2"> <div class="tripTypeContent" style="flex-shrink:0" v-if="ckedTab==2">
<div v-for="(qItem,qIndex) in visitList" :key="qIndex" <div v-for="(qItem,qIndex) in visitList" :key="qIndex"
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
</template> </template>
<!-- 操作 --> <!-- 操作 -->
<template v-if="ckedTab==2"> <template v-if="ckedTab==2">
<div style="overflow:auto;"> <div class="operate_Content">
<student-visit :save-obj="baseObj" :StuId="baseObj.StuId" v-if="secondType==1"></student-visit> <student-visit :save-obj="baseObj" :StuId="baseObj.StuId" v-if="secondType==1"></student-visit>
<student-yuefang :save-obj="baseObj" v-if="secondType==2"></student-yuefang> <student-yuefang :save-obj="baseObj" v-if="secondType==2"></student-yuefang>
<student-genjin :save-obj="baseObj" v-if="secondType==3"></student-genjin> <student-genjin :save-obj="baseObj" v-if="secondType==3"></student-genjin>
...@@ -397,4 +397,23 @@ ...@@ -397,4 +397,23 @@
font-size:14px; font-size:14px;
cursor: pointer; cursor: pointer;
} }
.operate_Content{
overflow: auto;
margin-top: 30px;
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;
}
</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