Commit 454af95c authored by zhengke's avatar zhengke

修改

parent 9cb84960
...@@ -2,9 +2,7 @@ ...@@ -2,9 +2,7 @@
<template> <template>
<div> <div>
<div class="row wrap"> <div class="row wrap">
<q-btn label="新增" color="accent q-mb-lg" size="sm" <q-btn label="新增" v-if="isHaveAddAction" color="accent q-mb-lg" size="sm" @click="isShowAdd = true" />
v-if="!saveObj.IsHaveCurseManager || userInfo.IsCourseConsultant == 1" @click="isShowAdd = true" />
<span v-else class="text-grey-4">学员已推送课程顾问,只能进行查看</span>
<q-btn label="取消" style="margin-left:20px;" v-if="isShowAdd" flat color="grey-10 q-mb-lg" size="sm" <q-btn label="取消" style="margin-left:20px;" v-if="isShowAdd" flat color="grey-10 q-mb-lg" size="sm"
@click="isShowAdd = false" /> @click="isShowAdd = false" />
</div> </div>
...@@ -17,7 +15,8 @@ ...@@ -17,7 +15,8 @@
class="col-6 q-pb-lg" label="胜率" /> class="col-6 q-pb-lg" label="胜率" />
</div> </div>
<div class="row wrap"> <div class="row wrap">
<q-input filled v-model="conMsg.AdvisorDate" dense class="col-6 q-pb-lg q-pr-lg" mask="date" :label="commonName+'跟进月份'"> <q-input filled v-model="conMsg.AdvisorDate" dense class="col-6 q-pb-lg q-pr-lg" mask="date"
:label="commonName+'跟进月份'">
<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="AdvisorDate" transition-show="scale" transition-hide="scale"> <q-popup-proxy ref="AdvisorDate" transition-show="scale" transition-hide="scale">
...@@ -26,7 +25,8 @@ ...@@ -26,7 +25,8 @@
</q-icon> </q-icon>
</template> </template>
</q-input> </q-input>
<q-input filled v-model="conMsg.AdvisorExpectDate" v-if="dataList.length==0" dense class="col-6 q-pb-lg" mask="date" :label="commonName+'期望达成协议日期'"> <q-input filled v-model="conMsg.AdvisorExpectDate" v-if="dataList.length==0" dense class="col-6 q-pb-lg"
mask="date" :label="commonName+'期望达成协议日期'">
<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="AdvisorExpectDate" transition-show="scale" transition-hide="scale"> <q-popup-proxy ref="AdvisorExpectDate" transition-show="scale" transition-hide="scale">
...@@ -91,6 +91,9 @@ ...@@ -91,6 +91,9 @@
SetStudentAdvisor, SetStudentAdvisor,
GetStudentAdvisorPage GetStudentAdvisorPage
} from "../../../api/customerstudent/customerstudent"; } from "../../../api/customerstudent/customerstudent";
import {
mapState
} from "vuex";
export default { export default {
meta: { meta: {
...@@ -137,6 +140,21 @@ ...@@ -137,6 +140,21 @@
} }
}, },
watch: {}, watch: {},
computed: mapState({
//是否有新增课程顾问权限
isHaveAddAction(state) {
if (state.user.userInfo && state.user.userInfo.ActionMenuList && state.user.userInfo.ActionMenuList.length >
0) {
let action = state.user.userInfo.ActionMenuList.find(x => {
if (x.FunctionCode == "MyStu_CourseManager") {
return x;
}
});
return action && action.FunctionCode;
}
return false;
}
}),
mounted() { mounted() {
this.getStatusList(); this.getStatusList();
this.getList(); this.getList();
...@@ -172,7 +190,7 @@ ...@@ -172,7 +190,7 @@
}); });
return; return;
} }
if(this.conMsg.AdvisorDate ==''){ if (this.conMsg.AdvisorDate == '') {
this.$q.notify({ this.$q.notify({
type: "negative", type: "negative",
position: "top", position: "top",
...@@ -181,8 +199,8 @@ ...@@ -181,8 +199,8 @@
}); });
return; return;
} }
if(this.dataList.length==0){ if (this.dataList.length == 0) {
if(this.conMsg.AdvisorExpectDate ==''){ if (this.conMsg.AdvisorExpectDate == '') {
this.$q.notify({ this.$q.notify({
type: "negative", type: "negative",
position: "top", position: "top",
......
...@@ -96,7 +96,7 @@ ...@@ -96,7 +96,7 @@
</div> </div>
<div> <div>
<span @click="morequery=!morequery" style="display:inline-flex;align-items:center;cursor: pointer;"> <span @click="morequery=!morequery" style="display:inline-flex;align-items:center;cursor: pointer;">
<q-btn color="accent" class="q-mr-md" size="sm" style="margin-top:15px;" icon="download" label="下载" <q-btn color="accent" class="q-mr-md" size="sm" icon="download" label="下载" v-if="isHaveDownLoad"
@click="downLoadStudentConsult" /> @click="downLoadStudentConsult" />
<span style="margin-right:5px;color: #089bab;">高级查询</span> <span style="margin-right:5px;color: #089bab;">高级查询</span>
<img v-show="morequery" class="roatImg" style="width:12px;height:12px" src="../../assets/images/more.png" <img v-show="morequery" class="roatImg" style="width:12px;height:12px" src="../../assets/images/more.png"
...@@ -182,6 +182,9 @@ ...@@ -182,6 +182,9 @@
} from "../../api/school/index"; } from "../../api/school/index";
import studentRightForm from "../../components/school/student/studentRight-form"; import studentRightForm from "../../components/school/student/studentRight-form";
import studentFUForm from "../../components/school/student/studentFu-form"; import studentFUForm from "../../components/school/student/studentFu-form";
import {
mapState
} from "vuex";
export default { export default {
meta: { meta: {
...@@ -362,6 +365,22 @@ ...@@ -362,6 +365,22 @@
} }
}) })
}, },
computed: mapState({
//是否有下载权限
isHaveDownLoad(state) {
if (state.user.userInfo && state.user.userInfo.ActionMenuList && state.user.userInfo.ActionMenuList.length >
0) {
let action = state.user.userInfo.ActionMenuList.find(x => {
if (x.FunctionCode == "guestConsult_download") {
return x;
}
});
return action && action.FunctionCode;
}
return false;
}
}),
mounted() { mounted() {
this.getList(); //获取规则 this.getList(); //获取规则
this.getStuStageList() this.getStuStageList()
......
...@@ -167,7 +167,7 @@ ...@@ -167,7 +167,7 @@
</div> </div>
<div style="width: 100%;text-align: right;padding: 0 20px;margin-bottom: 10px;"> <div style="width: 100%;text-align: right;padding: 0 20px;margin-bottom: 10px;">
<span @click="morequery=!morequery" style="display:inline-flex;align-items:center;cursor: pointer;"> <span @click="morequery=!morequery" style="display:inline-flex;align-items:center;cursor: pointer;">
<q-btn color="accent" class="q-mr-md" size="sm" icon="download" label="下载" <q-btn color="accent" class="q-mr-md" size="sm" icon="download" label="下载" v-if="isHaveDownLoad"
@click="downloadStudentFollow" /> @click="downloadStudentFollow" />
<span style="margin-right:5px;color: #089bab;">高级查询</span> <span style="margin-right:5px;color: #089bab;">高级查询</span>
<img v-show="!morequery" style="width:12px;height:12px" src="../../assets/images/more.png" alt=""> <img v-show="!morequery" style="width:12px;height:12px" src="../../assets/images/more.png" alt="">
...@@ -413,6 +413,9 @@ ...@@ -413,6 +413,9 @@
} from "../../api/common/common"; } from "../../api/common/common";
import studentRightForm from "../../components/school/student/studentRight-form"; import studentRightForm from "../../components/school/student/studentRight-form";
import studentFUForm from "../../components/school/student/studentFu-form"; import studentFUForm from "../../components/school/student/studentFu-form";
import {
mapState
} from "vuex";
export default { export default {
meta: { meta: {
...@@ -535,6 +538,21 @@ ...@@ -535,6 +538,21 @@
} }
}) })
}, },
computed: mapState({
//是否有下载权限
isHaveDownLoad(state) {
if (state.user.userInfo && state.user.userInfo.ActionMenuList && state.user.userInfo.ActionMenuList.length >
0) {
let action = state.user.userInfo.ActionMenuList.find(x => {
if (x.FunctionCode == "studentTracking_download") {
return x;
}
});
return action && action.FunctionCode;
}
return false;
}
}),
mounted() { mounted() {
this.getList(); //获取规则 this.getList(); //获取规则
this.getStuStageList(); this.getStuStageList();
......
...@@ -3,23 +3,23 @@ ...@@ -3,23 +3,23 @@
<div class="page-search row items-center"> <div class="page-search row items-center">
<div class="col row wrap q-mr-lg q-col-gutter-md"> <div class="col row wrap q-mr-lg q-col-gutter-md">
<div class="col-3"> <div class="col-3">
<q-input @change="resetSearch" clearable standout="bg-primary text-white" class="col-6 q-pr-lg q-pr-lg" v-model="msg.MenuName" <q-input @change="resetSearch" clearable dense filled class="col-6 q-pr-lg q-pr-lg" v-model="msg.MenuName"
label="菜单名称" maxlength="20" @clear="resetSearch" /> label="菜单名称" maxlength="20" @clear="resetSearch" />
</div> </div>
<div class="col-3"> <div class="col-3">
<q-input @change="resetSearch" clearable standout="bg-primary text-white" class="col-6 q-pr-lg q-pr-lg" v-model="msg.MenuUrl" <q-input @change="resetSearch" clearable dense filled class="col-6 q-pr-lg q-pr-lg" v-model="msg.MenuUrl"
label="菜单地址" maxlength="20" @clear="resetSearch" /> label="菜单地址" maxlength="20" @clear="resetSearch" />
</div> </div>
<div class="col-3"> <div class="col-3">
<q-select @input="resetSearch" standout="bg-primary text-white" v-model="msg.MenuType" class="col-6 q-pr-lg q-pr-lg" :options="MenuTypeOpts" <q-select @input="resetSearch" dense filled v-model="msg.MenuType" class="col-6 q-pr-lg q-pr-lg" :options="MenuTypeOpts"
emit-value map-options label="菜单类型" /> emit-value map-options label="菜单类型" />
</div> </div>
<div class="col-3"> <div class="col-3">
<q-select @input="resetSearch" standout="bg-primary text-white" class="col-6 q-pr-lg q-pr-lg" v-model="msg.MenuLevel" <q-select @input="resetSearch" dense filled class="col-6 q-pr-lg q-pr-lg" v-model="msg.MenuLevel"
:options="MenuLevelOpts" emit-value map-options label="菜单等级" /> :options="MenuLevelOpts" emit-value map-options label="菜单等级" />
</div> </div>
<div class="col-3"> <div class="col-3">
<q-select @input="resetSearch" standout="bg-primary text-white" class="col-6 q-pr-lg q-pr-lg" v-model="msg.Status" :options="ShowOpts" <q-select @input="resetSearch" dense filled class="col-6 q-pr-lg q-pr-lg" v-model="msg.Status" :options="ShowOpts"
emit-value map-options label="状态" /> emit-value map-options label="状态" />
</div> </div>
</div> </div>
......
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