Skip to content

C
confucius
Commit 428eaa4a authored by 黄奎's avatar 黄奎
Browse files
Options

页面修改

parent 7e982163
Hide whitespace changes
Inline Side-by-side
Showing with 96 additions and 80 deletions
src/components/school/student/student-left.vue
View file @ 428eaa4a
...@@ -119,8 +119,8 @@ ...@@ -119,8 +119,8 @@
<div class="info_item"> <div class="info_item">
<div class="item_label">创建人</div> <div class="item_label">创建人</div>
<div class="item_value"> <div class="item_value">
<q-select filled v-model="customObj.CreateBy" disable @filter="filterEmployee" use-input :options="myEmployeeList" option-label="EmployeeName" <q-select filled v-model="customObj.CreateBy" disable @filter="filterEmployee" use-input
option-value="Id" emit-value map-options /> :options="myEmployeeList" option-label="EmployeeName" option-value="Id" emit-value map-options />
</div> </div>
</div> </div>
<div class="info_item"> <div class="info_item">
...@@ -243,6 +243,7 @@ ...@@ -243,6 +243,7 @@
message: '数据保存成功！', message: '数据保存成功！',
position: 'top' position: 'top'
}) })
this.$emit('success');
} }
}) })
}, },
...@@ -256,7 +257,7 @@ ...@@ -256,7 +257,7 @@
}) })
}, },
//筛选员工 //筛选员工
filterEmployee(val, update, abort){ filterEmployee(val, update, abort) {
update(() => { update(() => {
this.myEmployeeList = this.employeeList.filter( this.myEmployeeList = this.employeeList.filter(
v => v.EmployeeName.indexOf(val) > -1 v => v.EmployeeName.indexOf(val) > -1
......
src/components/school/student/studentRight-form.vue
View file @ 428eaa4a
...@@ -5,8 +5,7 @@ ...@@ -5,8 +5,7 @@
<div class="custom_Top"> <div class="custom_Top">
<div class="custom_HLeft"> <div class="custom_HLeft">
<div class="nameplate_avatar"> <div class="nameplate_avatar">
<img v-if="baseObj.StuIcon" style="width:100%;height:100%;" <img v-if="baseObj.StuIcon" style="width:100%;height:100%;" :src="baseObj.StuIcon" alt />
:src="baseObj.StuIcon" alt />
<div class="student_Name" v-else> <div class="student_Name" v-else>
<span v-if="baseObj.StuName">{{baseObj.StuName.substring(0,1)}}</span> <span v-if="baseObj.StuName">{{baseObj.StuName.substring(0,1)}}</span>
</div> </div>
...@@ -20,9 +19,10 @@ ...@@ -20,9 +19,10 @@
<q-btn color="primary" size="sm" label="转交" @click="isShowTrans=true"> <q-btn color="primary" size="sm" label="转交" @click="isShowTrans=true">
<q-popup-proxy :offset="[10, 10]"> <q-popup-proxy :offset="[10, 10]">
<q-banner v-if="isShowTrans"> <q-banner v-if="isShowTrans">
<q-select style="margin-top:20px;" filled v-model="transMsg.CreateBy" @filter="filterEmployee" use-input :options="myEmployeeList" option-label="EmployeeName" <q-select style="margin-top:20px;" filled v-model="transMsg.CreateBy" @filter="filterEmployee" use-input
option-value="Id" emit-value map-options /> :options="myEmployeeList" option-label="EmployeeName" option-value="Id" emit-value map-options />
<q-btn label="保存" style="float:right;margin-top:15px" color="accent q-mb-lg" size="sm" @click="saveTransForm" /> <q-btn label="保存" style="float:right;margin-top:15px" color="accent q-mb-lg" size="sm"
@click="saveTransForm" />
</q-banner> </q-banner>
</q-popup-proxy> </q-popup-proxy>
</q-btn> </q-btn>
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
</div> </div>
<div class="custom_Bottom"> <div class="custom_Bottom">
<div class="detail-info"> <div class="detail-info">
<student-left :save-obj="saveObj"></student-left> <student-left :save-obj="saveObj" @success="refreshStudentPage"></student-left>
</div> </div>
<div class="detail-travel"> <div class="detail-travel">
<div class="detail_first"> <div class="detail_first">
...@@ -40,33 +40,33 @@ ...@@ -40,33 +40,33 @@
<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 class="operate_Content" style="flex:1;" > <div class="operate_Content" style="flex:1;">
<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"
:class="{ 'ckedClass': qIndex+1 == secondType }" @click="getckedType(qItem)">{{ qItem.Name }} :class="{ 'ckedClass': qIndex+1 == secondType }" @click="getckedType(qItem)">{{ qItem.Name }}
</div> </div>
</div> </div>
<!-- 记录 --> <!-- 记录 -->
<template v-if="ckedTab==1"> <template v-if="ckedTab==1">
<student-record :save-obj="baseObj"></student-record> <student-record :save-obj="baseObj" @success="refreshStudentPage"></student-record>
</template> </template>
<!-- 操作 --> <!-- 操作 -->
<template v-if="ckedTab==2"> <template v-if="ckedTab==2">
<div class="operate_Content" style="margin-top:20px;"> <div class="operate_Content" style="margin-top:20px;">
<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" @success="refreshStudentPage"></student-visit>
<student-yuefang :save-obj="baseObj" v-if="secondType==2"></student-yuefang> <student-yuefang :save-obj="baseObj" v-if="secondType==2" @success="refreshStudentPage"></student-yuefang>
<student-genjin :save-obj="baseObj" v-if="secondType==3"></student-genjin> <student-genjin :save-obj="baseObj" v-if="secondType==3" @success="refreshStudentPage"></student-genjin>
<student-shiting :save-obj="baseObj" v-if="secondType==4"></student-shiting> <student-shiting :save-obj="baseObj" v-if="secondType==4" @success="refreshStudentPage"></student-shiting>
</div> </div>
</template> </template>
<!-- 订单 --> <!-- 订单 -->
<template v-if="ckedTab==3"> <template v-if="ckedTab==3">
<student-order :save-obj="baseObj"></student-order> <student-order :save-obj="baseObj" @success="refreshStudentPage"></student-order>
</template> </template>
<!-- 合同 --> <!-- 合同 -->
<template v-if="ckedTab==4"> <template v-if="ckedTab==4">
<student-hetong :save-obj="baseObj"></student-hetong> <student-hetong :save-obj="baseObj" @success="refreshStudentPage"></student-hetong>
</template> </template>
</div> </div>
</div> </div>
...@@ -120,37 +120,36 @@ ...@@ -120,37 +120,36 @@
return { return {
persistent: true, persistent: true,
ckedTab: '1', ckedTab: '1',
secondType:1, secondType: 1,
visitList:[{ visitList: [{
Name:'到访', Name: '到访',
Id:1 Id: 1
},{ }, {
Name:'约访', Name: '约访',
Id:2 Id: 2
},{ }, {
Name:'跟进', Name: '跟进',
Id:3 Id: 3
},{ }, {
Name:'试听', Name: '试听',
Id:4 Id: 4
}], }],
msg: { msg: {
}, },
baseObj:{}, baseObj: {},
transMsg:{ transMsg: {
StuId:1, StuId: 1,
CreateBy:'' CreateBy: ''
}, },
//员工列表 //员工列表
employeeList: [], employeeList: [],
myEmployeeList:[], myEmployeeList: [],
isShowTrans:false isShowTrans: false
} }
}, },
mounted() { mounted() {
console.log(this.saveObj,'saveObj');
this.baseObj = this.saveObj; this.baseObj = this.saveObj;
this.getEmployeeList(); this.getEmployeeList();
}, },
...@@ -158,8 +157,12 @@ ...@@ -158,8 +157,12 @@
closeCutomer() { closeCutomer() {
this.$emit('close') this.$emit('close')
}, },
//刷新列表
refreshStudentPage() {
this.$emit('success');
},
//点击第二排 //点击第二排
getckedType(obj){ getckedType(obj) {
this.secondType = obj.Id; this.secondType = obj.Id;
}, },
//获取员工列表 //获取员工列表
...@@ -172,7 +175,7 @@ ...@@ -172,7 +175,7 @@
}) })
}, },
//筛选员工 //筛选员工
filterEmployee(val, update, abort){ filterEmployee(val, update, abort) {
update(() => { update(() => {
this.myEmployeeList = this.employeeList.filter( this.myEmployeeList = this.employeeList.filter(
v => v.EmployeeName.indexOf(val) > -1 v => v.EmployeeName.indexOf(val) > -1
...@@ -180,7 +183,7 @@ ...@@ -180,7 +183,7 @@
}); });
}, },
//保存转交 //保存转交
saveTransForm(){ saveTransForm() {
this.transMsg.StuId = this.baseObj.StuId; this.transMsg.StuId = this.baseObj.StuId;
ForwardStudent(this.transMsg).then(res => { ForwardStudent(this.transMsg).then(res => {
if (res.Code == 1) { if (res.Code == 1) {
...@@ -192,12 +195,11 @@ ...@@ -192,12 +195,11 @@
position: 'top' position: 'top'
}) })
} }
this.isShowTrans=false; this.isShowTrans = false;
}) })
} }
}, },
} }
</script> </script>
<style> <style>
.custom_RModel { .custom_RModel {
...@@ -382,73 +384,86 @@ ...@@ -382,73 +384,86 @@
height: 100%; height: 100%;
} }
.student_Name{ .student_Name {
width:100%; width: 100%;
height:100%; height: 100%;
background: #004d40; background: #004d40;
color:#fff; color: #fff;
text-align: center; text-align: center;
line-height: 60px; line-height: 60px;
font-size:20px; font-size: 20px;
} }
.TimeLineDiv { .TimeLineDiv {
height:620px; height: 620px;
flex: 1; flex: 1;
height: 100%; height: 100%;
padding-right: 20px; padding-right: 20px;
} }
.Time_TopList{
.Time_TopList {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
} }
.visit_Cont{
font-size:14px; .visit_Cont {
font-size: 14px;
} }
.visit_delete{
font-size:14px; .visit_delete {
font-size: 14px;
cursor: pointer; cursor: pointer;
width:30px; width: 30px;
} }
.operate_Content{
.operate_Content {
overflow: auto; overflow: auto;
padding-right:20px; padding-right: 20px;
} }
.operate_Content::-webkit-scrollbar{
.operate_Content::-webkit-scrollbar {
width: 6px; width: 6px;
height: 8px; height: 8px;
} }
.operate_Content::-webkit-scrollbar-thumb { .operate_Content::-webkit-scrollbar-thumb {
border-radius: 4px; border-radius: 4px;
-webkit-box-shadow: inset 0 0 2px rgba(0, 0, 0, 0.2); -webkit-box-shadow: inset 0 0 2px rgba(0, 0, 0, 0.2);
background: #c9c9c9; background: #c9c9c9;
} }
.operate_Content::-webkit-scrollbar-thumb { .operate_Content::-webkit-scrollbar-thumb {
-webkit-box-shadow: inset 0 0 2px rgba(0, 0, 0, 0.2); -webkit-box-shadow: inset 0 0 2px rgba(0, 0, 0, 0.2);
border-radius: 4px; border-radius: 4px;
background: #EDEDED; background: #EDEDED;
} }
.Log_Content{
.Log_Content {
padding: 10px; padding: 10px;
border-radius: 5px; border-radius: 5px;
background-color: #f4f4f6; background-color: #f4f4f6;
color: #818194; color: #818194;
line-height: 2; line-height: 2;
margin-top:10px; margin-top: 10px;
} }
.stu_ComFeed{
color:#3470ff; .stu_ComFeed {
color: #3470ff;
cursor: pointer; cursor: pointer;
margin-left:20px; margin-left: 20px;
} }
.StuCom_Remark{
.StuCom_Remark {
display: flex; display: flex;
} }
.StuCom_Inner{
width:100%; .StuCom_Inner {
width: 100%;
} }
.StuCom_Left{
.StuCom_Left {
flex-shrink: 0; flex-shrink: 0;
width:71px; width: 71px;
text-align: right; text-align: right;
} }
</style> </style>
\ No newline at end of file
src/components/school/student/stulist.vue
View file @ 428eaa4a
...@@ -35,9 +35,9 @@ ...@@ -35,9 +35,9 @@
</template> </template>
</q-table> </q-table>
<student-form v-if="isShowStuForm" :save-obj="stuOption" @close="closeStuForm" @success="refreshPage"> <student-form v-if="isShowStuForm" :save-obj="stuOption" @close="closeStuForm" @success="refreshStuList">
</student-form> </student-form>
<studentRight-form v-if="isShowStuRight" :save-obj="stuOption" @close="closeStuForm" @success="refreshPage"> <studentRight-form v-if="isShowStuRight" :save-obj="stuOption" @close="closeStuForm" @success="refreshStuList">
</studentRight-form> </studentRight-form>
</div> </div>
</template> </template>
...@@ -227,7 +227,7 @@ ...@@ -227,7 +227,7 @@
obj.Status = obj.Status == 1 ? 0 : 1; obj.Status = obj.Status == 1 ? 0 : 1;
}); });
}, },
refreshPage() { refreshStuList() {
this.$emit('success'); this.$emit('success');
}, },
EditStudent(obj) { EditStudent(obj) {
......
src/pages/sale/mystu.vue
View file @ 428eaa4a
...@@ -116,7 +116,7 @@ ...@@ -116,7 +116,7 @@
}) })
}, },
refreshPage() { refreshPage() {
console.log("11111");
this.getStudent() this.getStudent()
}, },
}, },
......
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