Commit 99540928 authored by 赵茹林's avatar 赵茹林

回访信息 [更新] 去掉只读时不能添加回访信息的权限判断

回访信息 [修复] 班级成员界面点沟通情况时未传teacher id导致不能添加回访信息的问题
教师列表选择框 [更新] 接口条数限制改为500
parent 24b04b2a
This diff is collapsed.
......@@ -88,7 +88,9 @@
<el-table-column type="selection" width="40"></el-table-column>
<el-table-column width="120" label="沟通情况">
<template slot-scope="scope">
<teacher-desc :row="scope.row" :typeFlag="true" :descType="2" @onSuccess="searchList()"></teacher-desc>
<!--<teacher-desc :row="scope.row" :typeFlag="true" :descType="2" @onSuccess="searchList()"></teacher-desc>-->
<!---->
<teacher-desc :teacherId="userObj.teacherId" :row="scope.row" :typeFlag="true" :descType="2" @onSuccess="searchList()"></teacher-desc>
</template>
</el-table-column>
<el-table-column label="用户" className="f-c" min-width="180" sortable prop="user_id">
......
This diff is collapsed.
......@@ -72,6 +72,7 @@
&::-webkit-scrollbar {
background-color: #333333; /* or add it to the track */
&:hover {
&::-webkit-scrollbar-thumb {
background-color: #999;
......
......@@ -401,7 +401,7 @@
show: false,
nowPage: 1,
total: 0,
limit: 100,
limit: 500,
teacher_id: ''
},
teacherList: [],
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -59,7 +59,8 @@
</el-card>
<!--添加回访信息-->
<el-card shadow="never" v-if="callbackObj.teacher_id && !$store.state.readonly" class="callback-item callback-input">
<!--<el-card shadow="never" v-if="callbackObj.teacher_id && !$store.state.readonly" class="callback-item callback-input">-->
<el-card shadow="never" v-if="callbackObj.teacher_id" class="callback-item callback-input">
<el-form size="small" inline>
<el-form-item required>
<el-select v-model="add.method" placeholder="回访方式" style="width: 140px;">
......@@ -186,7 +187,8 @@
props: {
callbackObj: { // user_id、teacher_id、timestamp
type: Object,
default: () => {}
default: () => {
}
},
hasUserInfo: { // 是否传过来用户信息,传来用户信息就不调接口请求用户新,否则请求(防止同时请求用户信息接口报错)
type: Boolean,
......@@ -482,6 +484,7 @@
<style lang="less">
.callback-container {
border: none;
.el-divider--horizontal {
margin: 20px 0;
}
......
......@@ -24,27 +24,28 @@
</template>
<script>
import {getTeacherListApi,addRelatedTeacherApi} from "../../service/api";
import {getTeacherListApi, addRelatedTeacherApi} from "../../service/api";
export default {
props:[
props: [
'dialogObj'
],
data(){
return{
form:{
data() {
return {
form: {
id: '',
teacher_id:'',
teacher_id: '',
},
teacherList:[],
teacherList: [],
}
},
methods:{
initPage(){
let json ={
page:1,
limit:200
methods: {
initPage() {
let json = {
page: 1,
limit: 500
}
getTeacherListApi(json).then(res=>{
getTeacherListApi(json).then(res => {
this.teacherList = res.list;
});
this.form = {
......@@ -52,9 +53,9 @@
teacher_id: this.dialogObj.teacher_id ? this.dialogObj.teacher_id : ''
};
},
onSave(){
onSave() {
let json = {
teacher_id: this.form.teacher_id ? this.form.teacher_id : 0
teacher_id: this.form.teacher_id ? this.form.teacher_id : 0
};
addRelatedTeacherApi(this.form.id, json).then(res => {
this.$message({
......@@ -66,9 +67,9 @@
})
}
},
watch:{
'dialogObj.show'(value){
if(value){
watch: {
'dialogObj.show'(value) {
if (value) {
this.initPage()
}
}
......
......@@ -3,7 +3,7 @@
:title="dialogObj.title"
:visible.sync="dialogObj.show"
center
width="800px"
width="800px"
>
<el-form ref="form" :model="form" label-width="120px">
<el-form-item label="老师">
......@@ -25,27 +25,28 @@
</template>
<script>
import {getTeacherListApi,bindTeacherApi} from "../../service/api";
import {getTeacherListApi, bindTeacherApi} from "../../service/api";
export default {
props:[
props: [
'dialogObj'
],
data(){
return{
form:{
data() {
return {
form: {
id: '',
teacher_id:'',
teacher_id: '',
},
teacherList:[],
teacherList: [],
}
},
methods:{
initPage(){
let json ={
page:1,
limit:200
methods: {
initPage() {
let json = {
page: 1,
limit: 500
}
getTeacherListApi(json).then(res=>{
getTeacherListApi(json).then(res => {
this.teacherList = res.list;
});
this.form = {
......@@ -53,9 +54,9 @@
teacher_id: this.dialogObj.teacher_id ? this.dialogObj.teacher_id : ''
};
},
onSave(){
let teacher_id=this.form.teacher_id ? this.form.teacher_id : 0
bindTeacherApi(this.form.id,teacher_id).then(res => {
onSave() {
let teacher_id = this.form.teacher_id ? this.form.teacher_id : 0
bindTeacherApi(this.form.id, teacher_id).then(res => {
this.$message({
type: 'success',
message: '绑定成功!'
......@@ -64,8 +65,8 @@
})
}
},
watch:{
'dialogObj'(value){
watch: {
'dialogObj'(value) {
this.initPage()
}
}
......
This diff is collapsed.
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