Commit 9a8608a9 by cmosquito

修改了部分文案和回车键搜索

parent 21641085
...@@ -88,7 +88,7 @@ ...@@ -88,7 +88,7 @@
</el-form-item> --> </el-form-item> -->
<el-form-item <el-form-item
label="校园大使" label="校园大使"
:prop="form.channel == 1 ? 'campusAgent' : ''" :prop="form.channel == 1 ? 'campusAgent' : ' '"
> >
<el-input v-model="form.campusAgent"></el-input> <el-input v-model="form.campusAgent"></el-input>
</el-form-item> </el-form-item>
...@@ -204,9 +204,7 @@ export default { ...@@ -204,9 +204,7 @@ export default {
channel: [{ required: true, message: "请选择渠道", trigger: "change" }], channel: [{ required: true, message: "请选择渠道", trigger: "change" }],
// gpa: [{ type: 'number', message: 'gpa必须为数字值', trigger: "blur" }], // gpa: [{ type: 'number', message: 'gpa必须为数字值', trigger: "blur" }],
// grade: [{ type: 'number', message: '年级必须为数字值' }], // grade: [{ type: 'number', message: '年级必须为数字值' }],
campusAgent: [ campusAgent: [{ required: true, message: "请输入校园大使", trigger: "blur" }]
{ required: true, message: "请输入校园大使", trigger: "blur" }
]
}, },
labelPosition: "left" labelPosition: "left"
}; };
......
...@@ -52,9 +52,9 @@ ...@@ -52,9 +52,9 @@
scope.row.addTime | formatDateTime scope.row.addTime | formatDateTime
}}</template> }}</template>
</el-table-column> </el-table-column>
<el-table-column label="添加老师" width="100" align="center"> <!-- <el-table-column label="添加老师" width="100" align="center">
<template slot-scope="scope">{{ scope.row.roleName }}</template> <template slot-scope="scope">{{ scope.row.roleName }}</template>
</el-table-column> </el-table-column> -->
<el-table-column label="沟通记录" align="center"> <el-table-column label="沟通记录" align="center">
<template slot-scope="scope">{{ scope.row.context }}</template> <template slot-scope="scope">{{ scope.row.context }}</template>
</el-table-column> </el-table-column>
......
...@@ -212,9 +212,9 @@ ...@@ -212,9 +212,9 @@
scope.row.addTime | formatDateTime scope.row.addTime | formatDateTime
}}</template> }}</template>
</el-table-column> </el-table-column>
<el-table-column label="添加老师" width="100" align="center"> <!-- <el-table-column label="添加老师" width="100" align="center">
<template slot-scope="scope">{{ scope.row.roleName }}</template> <template slot-scope="scope">{{ scope.row.roleName }}</template>
</el-table-column> </el-table-column> -->
<el-table-column label="沟通记录" align="center"> <el-table-column label="沟通记录" align="center">
<template slot-scope="scope">{{ scope.row.context }}</template> <template slot-scope="scope">{{ scope.row.context }}</template>
</el-table-column> </el-table-column>
......
...@@ -123,10 +123,18 @@ ...@@ -123,10 +123,18 @@
<el-table-column label="渠道" align="center"> <el-table-column label="渠道" align="center">
<template slot-scope="scope">{{ <template slot-scope="scope">{{
scope.row.channel == 1 scope.row.channel == "1"
? "转介" ? "主动推荐引流"
: scope.row.channel == 2 : scope.row.channel == "2"
? "活动" ? "客服自主添加"
: scope.row.channel == "3"
? "搜索引擎引流"
: scope.row.channel == "4"
? "外部资源推荐"
: scope.row.channel == "5"
? "自媒体引流"
: scope.row.channel == "6"
? "地推活动"
: "" : ""
}}</template> }}</template>
</el-table-column> </el-table-column>
......
...@@ -319,7 +319,7 @@ ...@@ -319,7 +319,7 @@
scope.row.updateTime | formatDateTime scope.row.updateTime | formatDateTime
}}</template> }}</template>
</el-table-column> </el-table-column>
<!--
<el-table-column label="通过状态" align="center"> <el-table-column label="通过状态" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<div v-if="scope.row.courseState == 1">选课待确认</div> <div v-if="scope.row.courseState == 1">选课待确认</div>
...@@ -327,7 +327,7 @@ ...@@ -327,7 +327,7 @@
<div v-if="scope.row.courseState == 3">审课通过</div> <div v-if="scope.row.courseState == 3">审课通过</div>
<div v-if="scope.row.courseState == 4">审课未通过</div> <div v-if="scope.row.courseState == 4">审课未通过</div>
</template> </template>
</el-table-column> </el-table-column> -->
<el-table-column label="选课数量" align="center"> <el-table-column label="选课数量" align="center">
<template slot-scope="scope">{{ <template slot-scope="scope">{{
scope.row.chooseCourseNum scope.row.chooseCourseNum
......
...@@ -31,8 +31,9 @@ ...@@ -31,8 +31,9 @@
<el-input <el-input
v-model="listQuery.keyword" v-model="listQuery.keyword"
class="input-width" class="input-width"
placeholder="帐号/姓名" placeholder="请输入账号"
clearable clearable
@keyup.enter.native="handleSearchList()"
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
...@@ -240,7 +241,7 @@ import { getToken } from "@/utils/auth"; ...@@ -240,7 +241,7 @@ import { getToken } from "@/utils/auth";
const defaultListQuery = { const defaultListQuery = {
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 10,
keyword: null keyword: null,
}; };
const defaultAdmin = { const defaultAdmin = {
id: null, id: null,
...@@ -317,6 +318,7 @@ export default { ...@@ -317,6 +318,7 @@ export default {
}, },
handleResetSearch() { handleResetSearch() {
this.listQuery = Object.assign({}, defaultListQuery); this.listQuery = Object.assign({}, defaultListQuery);
this.getList();
}, },
handleSearchList() { handleSearchList() {
this.listQuery.pageNum = 1; this.listQuery.pageNum = 1;
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
<div style="margin-top: 15px"> <div style="margin-top: 15px">
<el-form :inline="true" :model="listQuery" size="small" label-width="140px"> <el-form :inline="true" :model="listQuery" size="small" label-width="140px">
<el-form-item label="输入搜索:"> <el-form-item label="输入搜索:">
<el-input v-model="listQuery.keyword" class="input-width" placeholder="角色名称" clearable></el-input> <el-input v-model="listQuery.keyword" class="input-width" placeholder="角色名称" clearable @keyup.enter.native="handleSearchList()"></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>
...@@ -174,6 +174,7 @@ ...@@ -174,6 +174,7 @@
methods: { methods: {
handleResetSearch() { handleResetSearch() {
this.listQuery = Object.assign({}, defaultListQuery); this.listQuery = Object.assign({}, defaultListQuery);
this.getList();
}, },
handleSearchList() { handleSearchList() {
this.listQuery.pageNum = 1; this.listQuery.pageNum = 1;
......
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