Skip to content

C
confucius
Commit d3db4bd6 authored by Mac's avatar Mac
Browse files
Options

增加字段

parent 19f3a8fb
Hide whitespace changes
Inline Side-by-side
Showing with 147 additions and 5 deletions
src/pages/financial/financalDocument/addReceivablesDocuments.vue
View file @ d3db4bd6
......@@ -1649,7 +1649,7 @@
this.msg.RB_Branch_Id = this.msg.RB_Branch_Id == 0 || this.msg.RB_Branch_Id == ParentCompanyId ? this
.getLocalStorage().School_Id : this.msg.RB_Branch_Id;
if(!this.$route.query.companyID&&userInfo.Group_Id==100000 && !iscopy){
if(!this.$route.query.companyID&&userInfo.Group_Id==100000 && !this.iscopy){
this.msg.RB_Branch_Id = 4
}
......
src/pages/sale/studentTracking.vue
View file @ d3db4bd6
......@@ -178,13 +178,19 @@
v-loading="loading"
>
<tr>
<th width="120" rowspan="2" style="min-width: 120px;z-index: 999;">学生</th>
<th width="120" rowspan="2" style="min-width: 120px;">电话</th>
<th width="120" rowspan="2" style="min-width: 120px;">课程顾问</th>
<th width="120" rowspan="2" style="min-width: 110px;z-index: 999;">学生</th>
<th width="120" rowspan="2" style="min-width: 110px;">电话</th>
<th width="120" rowspan="2" style="min-width: 110px;">课程顾问</th>
<th width="120" rowspan="2" style="min-width: 110px;">协助老师</th>
<th width="100" rowspan="2" style="min-width: 100px;">合同时间</th>
<th width="200" rowspan="2" style="min-width: 200px;">所报课程</th>
<th width="80" rowspan="2" style="min-width: 80px;">当前级别</th>
<th width="100" rowspan="2" style="min-width: 100px;">生日</th>
<th width="100" rowspan="2" style="min-width: 100px;">客户来源</th>
<th width="100" rowspan="2" style="min-width: 100px;">来源关联人</th>
<th width="100" rowspan="2" style="min-width: 100px;">收客渠道</th>
<th width="100" rowspan="2" style="min-width: 100px;">负责人</th>
<th width="100" rowspan="2" style="min-width: 100px;">合同状态</th>
<th width="500" colspan="3" style="min-width: 500px;" v-for=" ( item , index ) in RListlength " :key = 'index'>
......@@ -206,7 +212,10 @@
<span>{{ item.StuRealMobile }}</span>
</td>
<td>
<span>{{ item.AssistName?item.AssistName:'-' }}</span>
<span v-html="getCurseManager(item)" ></span>
</td>
<td>
<span v-html="getTeacherManager(item)"></span>
</td>
<td>
<span>{{ item.ContractSTime }}</span>
......@@ -220,6 +229,18 @@
<td>
<span>{{ item.StuBirthStr }}</span>
</td>
<td>
<span>{{ item.CreateTypeName?item.CreateTypeName:'-' }}</span>
</td>
<td>
<span>{{ item.StuSourceIdName?item.StuSourceIdName:'-' }}</span>
</td>
<td>
<span>{{ item.StuChannelName?item.StuChannelName:'-' }}</span>
</td>
<td>
<span>{{ item.StuCreateByName?item.StuCreateByName:'-' }}</span>
</td>
<td>
<span>{{ item.StuGuestStateName }}</span>
</td>
......@@ -590,6 +611,28 @@ export default {
}
})
},
getCurseManager(row) {
let managerName = "<span class='text-grey-4'>暂未推送</span>";
if (row.AssistList && row.AssistList.length > 0) {
row.AssistList.forEach(y => {
if (y.AssistType == 2) {
managerName = `<span class='text-dark'>${y.AssistName}</span>`;
}
});
}
return managerName;
},
getTeacherManager(row) {
let managerName = "<span class='text-grey-4'>暂无</span>";
if (row.AssistList && row.AssistList.length > 0) {
row.AssistList.forEach(y => {
if (y.AssistType == 4) {
managerName = `<span class='text-dark'>${y.AssistName}</span>`;
}
});
}
return managerName;
},
},
}
......
src/pages/stuMan/stuList.vue
View file @ d3db4bd6
......@@ -246,6 +246,13 @@
</div>
</q-td>
</template>
<template v-slot:body-cell-GuestName="props">
<q-td :props="props">
<div class="text-blue cursor-pointer" @click="getStuRight(props.row)">
{{ props.value }}
</div>
</q-td>
</template>
<template v-slot:body-cell-ClassName="props">
<q-td :props="props">
<div style="color: #f00; cursor: pointer" @click="seeClassDetail(props.row)">
......@@ -309,6 +316,12 @@
</div>
</q-td>
</template>
<template v-slot:body-cell-CurseManager="props">
<q-td :props="props" v-html="getCurseManager(props.row)"></q-td>
</template>
<template v-slot:body-cell-TeacherManager="props">
<q-td :props="props" v-html="getTeacherManager(props.row)"></q-td>
</template>
<template v-slot:body-cell-optioned="props">
<q-td :props="props">
<div>
......@@ -353,6 +366,16 @@
<list v-if="isShowList" :type="showType" :set-obj="eventObj" @close="closeHandle" />
<!-- 事件记录 -->
<eventLog v-if="isShowEventLog" :set-obj="eventObj" @modify="modifyEvent" @close="closeHandle" />
<studentRight-form
v-if="isShowStuRight"
:isJudgeTrans="isJudgeTrans"
:BelongType="BelongType"
:save-obj="stuOption"
@close="closeStuForm"
@success="refreshStuList"
@reload="refreshStuList"
>
</studentRight-form>
</div>
</template>
<script>
......@@ -379,6 +402,8 @@
import myOrderForm from "../../components/sale/myOrder-form"; //订单详情
import list from "../../components/stuMan/makeUpHours.vue"; //可补课课时，缺勤次数，请假次数
import eventLog from "../../components/stuMan/eventRecord.vue"; //事件记录
import studentRightForm from "../../components/school/student/studentRight-form";
export default {
meta: {
title: "学员名单",
......@@ -392,7 +417,9 @@
myOrderForm,
list,
eventLog,
studentRightForm
},
data() {
return {
IsShowQuery: false,
......@@ -424,6 +451,7 @@
align: "left",
required: true,
},
{
name: "GuestName",
label: "姓名",
......@@ -431,6 +459,16 @@
field: "GuestName",
required: true,
},
{
name: "CurseManager",
label: "课程顾问",
align: "left"
},
{
name: "TeacherManager",
label: "协助老师",
align: "left"
},
{
name: "Mobile",
label: "电话",
......@@ -545,6 +583,22 @@
field: "EventlogNum",
align: "left",
},
{
name: "CreateTypeName",
label: "客户来源",
field: "CreateTypeName",
align: "left",
},{
name: "StuSourceIdName",
label: "来源关联人",
field: "StuSourceIdName",
align: "left",
},{
name: "StuChannelName",
label: "收客渠道",
field: "StuChannelName",
align: "left",
},
{
name: "GuestStateStr",
label: "状态",
......@@ -569,6 +623,12 @@
field: "JoinTypeStr",
align: "left",
},
{
name: "StuCreateByName",
label: "负责人",
align: "left",
field: "StuCreateByName"
},
{
name: "optioned",
label: "操作",
......@@ -605,6 +665,10 @@
showType: 1,
isShowEventLog: false, //是否显示事件记录
GuestStateList: [], //学员状态列表
stuOption: null,
BelongType:1,
isShowStuRight:false,
isJudgeTrans:1
};
},
......@@ -864,6 +928,41 @@
this.eventObj = val;
this.isShowAddEvent = true;
},
getCurseManager(row) {
let managerName = "<span class='text-grey-4'>暂未推送</span>";
if (row.AssistList && row.AssistList.length > 0) {
row.AssistList.forEach(y => {
if (y.AssistType == 2) {
managerName = `<span class='text-dark'>${y.AssistName}</span>`;
}
});
}
return managerName;
},
getTeacherManager(row) {
let managerName = "<span class='text-grey-4'>暂无</span>";
if (row.AssistList && row.AssistList.length > 0) {
row.AssistList.forEach(y => {
if (y.AssistType == 4) {
managerName = `<span class='text-dark'>${y.AssistName}</span>`;
}
});
}
return managerName;
},
getStuRight(obj) {
if (obj) {
this.stuOption = {StuId:obj.Student_Id,noEdit:true}
this.BelongType = obj.BelongType;
}
this.isShowStuRight = true;
},
closeStuForm() {
this.isShowStuRight = false;
},
refreshStuList(){
this.getList()
}
},
};
</script>
......
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