Commit 54cd23f0 by lizhi

@keyup.enter.native="handleSearchList()"表单回车搜索

parent 21d624e3
...@@ -4,7 +4,7 @@ const prodEnv = require("./prod.env"); ...@@ -4,7 +4,7 @@ const prodEnv = require("./prod.env");
module.exports = merge(prodEnv, { module.exports = merge(prodEnv, {
NODE_ENV: '"development"', NODE_ENV: '"development"',
// BASE_API: '"http://localhost:8080"' // BASE_API: '"http://192.168.10.111:8057"'
// BASE_API: '"https://pandaxuequ.com.cn/xs/admin"' //本地系统服务器地址 // BASE_API: '"https://pandaxuequ.com.cn/xs/admin"' //本地系统服务器地址
// BASE_API: '"https://admin-api.macrozheng.com"', // BASE_API: '"https://admin-api.macrozheng.com"',
BASE_API: '"http://test.csasedu.com:10032"' //系统服务器地址 BASE_API: '"http://test.csasedu.com:10032"' //系统服务器地址
......
<template> <template>
<div class="container"> <div class="container">
<el-card class="filter-container" shadow="never"> <el-card class="filter-container" shadow="never">
<div> <div>
<i class="el-icon-search"></i> <i class="el-icon-search"></i>
<span>筛选搜索</span> <span>筛选搜索</span>
...@@ -28,10 +28,10 @@ ...@@ -28,10 +28,10 @@
ref="listQuery" ref="listQuery"
size="small" size="small"
label-width="140px" label-width="140px"
@keyup.enter.native="handleSearchList()"
> >
<el-checkbox v-model="isMatch">未匹配课程代码</el-checkbox> <el-checkbox v-model="isMatch">未匹配课程代码</el-checkbox>
<el-form-item label="课程代码:" prop="courseCode"> <el-form-item label="课程代码:" prop="courseCode">
<el-input <el-input
style="width: 203px" style="width: 203px"
...@@ -40,8 +40,6 @@ ...@@ -40,8 +40,6 @@
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="课程名称:" prop="courseName"> <el-form-item label="课程名称:" prop="courseName">
<el-input <el-input
style="width: 203px" style="width: 203px"
...@@ -50,7 +48,6 @@ ...@@ -50,7 +48,6 @@
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="审课学校:" prop="school "> <el-form-item label="审课学校:" prop="school ">
<el-input <el-input
style="width: 203px" style="width: 203px"
...@@ -58,10 +55,6 @@ ...@@ -58,10 +55,6 @@
placeholder="" placeholder=""
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>
</el-card> </el-card>
...@@ -261,29 +254,24 @@ ...@@ -261,29 +254,24 @@
width="60" width="60"
align="center" align="center"
></el-table-column> ></el-table-column>
<el-table-column label="cso课程代码" align="center" prop="csoCode"> <el-table-column label="cso课程代码" align="center" prop="csoCode">
<template slot-scope="scope">{{ scope.row.csoCode }}</template> <template slot-scope="scope">{{ scope.row.csoCode }}</template>
</el-table-column> </el-table-column>
<el-table-column label="cso课程名称" align="center"> <el-table-column label="cso课程名称" align="center">
<template slot-scope="scope">{{ scope.row.csoName }}</template> <template slot-scope="scope">{{ scope.row.csoName }}</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.school }}</template> <template slot-scope="scope">{{ scope.row.school }}</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.courseCode }}</template> <template slot-scope="scope">{{ scope.row.courseCode }}</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.courseName }}</template> <template slot-scope="scope">{{ scope.row.courseName }}</template>
</el-table-column> </el-table-column>
<!-- @click=" <!-- @click="
handleupdateNoticeAll(scope.row.id, scope.row.schoolName,scope.row.schoolBrief) handleupdateNoticeAll(scope.row.id, scope.row.schoolName,scope.row.schoolBrief)
" --> " -->
...@@ -433,18 +421,18 @@ export default { ...@@ -433,18 +421,18 @@ export default {
// this.listQuery = Object.assign({}, defaultListQuery); // this.listQuery = Object.assign({}, defaultListQuery);
// this.getData(); // this.getData();
// }, // },
handleSearchList() { handleSearchList() {
//搜索 //搜索
this.listQuery.pageNum = 1; this.listQuery.pageNum = 1;
this.getData(); this.getData();
}, },
handleResetSearch(formName) { handleResetSearch(formName) {
this.$refs[formName].resetFields(); this.$refs[formName].resetFields();
// 重置 // 重置
// this.selectProductCateValue = []; // this.selectProductCateValue = [];
this.isMatch = false; this.isMatch = false;
this.listQuery = Object.assign({}, defaultListQuery); this.listQuery = Object.assign({}, defaultListQuery);
this.getData(); this.getData();
}, },
......
<template> <template>
<div class="container"> <div class="container">
<div> <div>
<el-card class="filter-container" shadow="never"> <el-card class="filter-container" shadow="never">
<div> <div>
<i class="el-icon-search"></i> <i class="el-icon-search"></i>
<span>筛选搜索</span> <span>筛选搜索</span>
<el-button <el-button
style="float: right" style="float: right"
@click="handleSearchList()" @click="handleSearchList()"
type="primary" type="primary"
size="small" size="small"
> >
查询结果 查询结果
</el-button> </el-button>
<el-button <el-button
style="float: right; margin-right: 15px" style="float: right; margin-right: 15px"
@click="handleResetSearch('listQuery')" @click="handleResetSearch('listQuery')"
size="small" size="small"
> >
重置 重置
</el-button> </el-button>
</div> </div>
<div style="margin-top: 15px"> <div style="margin-top: 15px">
<el-form <el-form
:inline="true" :inline="true"
:model="listQuery" :model="listQuery"
:data="list" :data="list"
ref="listQuery" ref="listQuery"
size="small" size="small"
label-width="140px" label-width="140px"
> @keyup.enter.native="handleSearchList()"
>
<el-form-item label="课程名称:" prop="courseName"> <el-form-item label="课程名称:" prop="courseName">
<el-input <el-input
style="width: 203px" style="width: 203px"
v-model="listQuery.courseName" v-model="listQuery.courseName"
placeholder="" placeholder=""
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="课程代码:" prop="courseCode">
<el-input
style="width: 203px"
v-model="listQuery.courseCode"
placeholder=""
></el-input>
</el-form-item>
</el-form> <el-form-item label="课程代码:" prop="courseCode">
</div> <el-input
</el-card> style="width: 203px"
v-model="listQuery.courseCode"
placeholder=""
></el-input>
</el-form-item>
</el-form>
</div>
</el-card>
</div> </div>
<el-dialog <el-dialog
title="添加课程代码" title="添加课程代码"
...@@ -240,17 +236,17 @@ export default { ...@@ -240,17 +236,17 @@ export default {
}); });
}, },
handleSearchList() { handleSearchList() {
//搜索 //搜索
this.listQuery.pageNum = 1; this.listQuery.pageNum = 1;
this.getData(); this.getData();
}, },
handleResetSearch(formName) { handleResetSearch(formName) {
this.$refs[formName].resetFields(); this.$refs[formName].resetFields();
// 重置 // 重置
// this.selectProductCateValue = []; // this.selectProductCateValue = [];
this.isMatch = false; this.isMatch = false;
this.listQuery = Object.assign({}, defaultListQuery); this.listQuery = Object.assign({}, defaultListQuery);
this.getData(); this.getData();
}, },
...@@ -258,16 +254,14 @@ export default { ...@@ -258,16 +254,14 @@ export default {
handleCurrentChange(val) { handleCurrentChange(val) {
// 翻页 // 翻页
this.listQuery.pageNum = val; this.listQuery.pageNum = val;
this.getData() this.getData();
}, },
handleSizeChange(val){ handleSizeChange(val) {
//切换展示条数 //切换展示条数
this.listQuery.pageSize = val; this.listQuery.pageSize = val;
this.getData() this.getData();
}, },
submitForm(formName) { submitForm(formName) {
if (this.updateId) { if (this.updateId) {
this.csoInfo.id = this.updateId; this.csoInfo.id = this.updateId;
......
<template> <template>
<div class="container"> <div class="container">
<el-card class="filter-container" shadow="never"> <el-card class="filter-container" shadow="never">
<div> <div>
<i class="el-icon-search"></i> <i class="el-icon-search"></i>
<span>筛选搜索</span> <span>筛选搜索</span>
...@@ -28,10 +28,10 @@ ...@@ -28,10 +28,10 @@
ref="listQuery" ref="listQuery"
size="small" size="small"
label-width="140px" label-width="140px"
@keyup.enter.native="handleSearchList()"
> >
<el-checkbox v-model="isMatch">未匹配课程代码</el-checkbox> <el-checkbox v-model="isMatch">未匹配课程代码</el-checkbox>
<el-form-item label="课程代码:" prop="courseCode"> <el-form-item label="课程代码:" prop="courseCode">
<el-input <el-input
style="width: 203px" style="width: 203px"
...@@ -40,8 +40,6 @@ ...@@ -40,8 +40,6 @@
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="课程名称:" prop="courseName"> <el-form-item label="课程名称:" prop="courseName">
<el-input <el-input
style="width: 203px" style="width: 203px"
...@@ -50,7 +48,6 @@ ...@@ -50,7 +48,6 @@
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="学生所在学校:" prop="school "> <el-form-item label="学生所在学校:" prop="school ">
<el-input <el-input
style="width: 203px" style="width: 203px"
...@@ -58,7 +55,6 @@ ...@@ -58,7 +55,6 @@
placeholder="" placeholder=""
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>
</el-card> </el-card>
...@@ -277,7 +273,7 @@ ...@@ -277,7 +273,7 @@
<el-table-column label="cso课程代码" align="center" prop="csoCode"> <el-table-column label="cso课程代码" align="center" prop="csoCode">
<template slot-scope="scope">{{ scope.row.csoCode }}</template> <template slot-scope="scope">{{ scope.row.csoCode }}</template>
</el-table-column> </el-table-column>
<el-table-column label="cso课程名称" align="center"> <el-table-column label="cso课程名称" align="center">
<template slot-scope="scope">{{ scope.row.csoName }}</template> <template slot-scope="scope">{{ scope.row.csoName }}</template>
</el-table-column> </el-table-column>
<el-table-column label="招生院校" align="center"> <el-table-column label="招生院校" align="center">
...@@ -289,11 +285,7 @@ ...@@ -289,11 +285,7 @@
<el-table-column label="招生院校课程名称" align="center"> <el-table-column label="招生院校课程名称" align="center">
<template slot-scope="scope">{{ scope.row.courseName }}</template> <template slot-scope="scope">{{ scope.row.courseName }}</template>
</el-table-column> </el-table-column>
<!-- @click=" <!-- @click="
handleupdateNoticeAll(scope.row.id, scope.row.schoolName,scope.row.schoolBrief) handleupdateNoticeAll(scope.row.id, scope.row.schoolName,scope.row.schoolBrief)
" --> " -->
...@@ -445,17 +437,17 @@ export default { ...@@ -445,17 +437,17 @@ export default {
this.$forceUpdate(); this.$forceUpdate();
}); });
}, },
handleSearchList() { handleSearchList() {
//搜索 //搜索
this.listQuery.pageNum = 1; this.listQuery.pageNum = 1;
this.getData(); this.getData();
}, },
handleResetSearch(formName) { handleResetSearch(formName) {
this.$refs[formName].resetFields(); this.$refs[formName].resetFields();
// 重置 // 重置
// this.selectProductCateValue = []; // this.selectProductCateValue = [];
this.isMatch = false; this.isMatch = false;
this.listQuery = Object.assign({}, defaultListQuery); this.listQuery = Object.assign({}, defaultListQuery);
this.getData(); this.getData();
}, },
......
...@@ -2,7 +2,15 @@ ...@@ -2,7 +2,15 @@
<div class="container"> <div class="container">
<!-- <h1>newStu</h1> <!-- <h1>newStu</h1>
<h1>新增学员</h1> --> <h1>新增学员</h1> -->
<el-card v-if="roles.includes('客服部主管') || roles.includes('学服部主管') || roles.includes('超级管理员')" class="filter-container" shadow="never"> <el-card
v-if="
roles.includes('客服部主管') ||
roles.includes('学服部主管') ||
roles.includes('超级管理员')
"
class="filter-container"
shadow="never"
>
<div> <div>
<i class="el-icon-search"></i> <i class="el-icon-search"></i>
<span>筛选搜索</span> <span>筛选搜索</span>
...@@ -29,6 +37,7 @@ ...@@ -29,6 +37,7 @@
ref="listQuery" ref="listQuery"
size="small" size="small"
label-width="140px" label-width="140px"
@keyup.enter.native="handleSearchList()"
> >
<el-form-item label="归属老师:"> <el-form-item label="归属老师:">
<el-select <el-select
...@@ -78,10 +87,10 @@ ...@@ -78,10 +87,10 @@
</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">
<span v-if="scope.row.userStatus == 0">未报名</span> <span v-if="scope.row.userStatus == 0">未报名</span>
<span v-if="scope.row.userStatus == 1">在读学员</span> <span v-if="scope.row.userStatus == 1">在读学员</span>
<span v-if="scope.row.userStatus == 2">退费学员</span> <span v-if="scope.row.userStatus == 2">退费学员</span>
<span v-if="scope.row.userStatus == 3">结课学员</span> <span v-if="scope.row.userStatus == 3">结课学员</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="渠道" align="center"> <el-table-column label="渠道" align="center">
...@@ -168,7 +177,7 @@ export default { ...@@ -168,7 +177,7 @@ export default {
pageSize: null, pageSize: null,
pageNum: null, pageNum: null,
total: null, total: null,
roles:"", roles: "",
listLoading: true, listLoading: true,
multipleSelection: [], multipleSelection: [],
formLabelWidth: "120px", formLabelWidth: "120px",
...@@ -194,10 +203,10 @@ export default { ...@@ -194,10 +203,10 @@ export default {
this.listQuery.pageNum = val; this.listQuery.pageNum = val;
this.getNewStu(); this.getNewStu();
}, },
handleSizeChange(val){ handleSizeChange(val) {
//切换展示条数 //切换展示条数
this.listQuery.pageSize = val; this.listQuery.pageSize = val;
this.getNewStu(); this.getNewStu();
}, },
handleStuDetail(id) { handleStuDetail(id) {
......
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
ref="listQuery" ref="listQuery"
size="small" size="small"
label-width="140px" label-width="140px"
@keyup.enter.native="handleSearchList()"
> >
<el-form-item label="学生上课年份:" prop="yearTime"> <el-form-item label="学生上课年份:" prop="yearTime">
<el-select clearable v-model="listQuery.year"> <el-select clearable v-model="listQuery.year">
......
...@@ -28,8 +28,9 @@ ...@@ -28,8 +28,9 @@
ref="listQuery" ref="listQuery"
size="small" size="small"
label-width="140px" label-width="140px"
@keyup.enter.native="handleSearchList()"
> >
<el-form-item label="上课年份:" prop="yearTime"> <el-form-item label="上课年份:" prop="yearTime">
<el-select clearable v-model="listQuery.yearTime"> <el-select clearable v-model="listQuery.yearTime">
<el-option <el-option
v-for="item in courseTimeList" v-for="item in courseTimeList"
...@@ -41,7 +42,6 @@ ...@@ -41,7 +42,6 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="上课学期:" prop="term "> <el-form-item label="上课学期:" prop="term ">
<el-input <el-input
style="width: 203px" style="width: 203px"
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
placeholder="" placeholder=""
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="课程代码:" prop="courseName"> <el-form-item label="课程代码:" prop="courseName">
<el-input <el-input
style="width: 203px" style="width: 203px"
v-model="listQuery.courseName" v-model="listQuery.courseName"
...@@ -64,7 +64,6 @@ ...@@ -64,7 +64,6 @@
placeholder="" placeholder=""
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="审课学校:" prop="auditSchool"> <el-form-item label="审课学校:" prop="auditSchool">
<el-select clearable v-model="listQuery.auditSchool"> <el-select clearable v-model="listQuery.auditSchool">
...@@ -78,14 +77,13 @@ ...@@ -78,14 +77,13 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="微信号:" prop="wechatNumber"> <el-form-item label="微信号:" prop="wechatNumber">
<el-input <el-input
style="width: 203px" style="width: 203px"
v-model="listQuery.wechatNumber" v-model="listQuery.wechatNumber"
placeholder="" placeholder=""
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>
</el-card> </el-card>
......
...@@ -35,6 +35,7 @@ ...@@ -35,6 +35,7 @@
ref="listQuery" ref="listQuery"
size="small" size="small"
label-width="140px" label-width="140px"
@keyup.enter.native="handleSearchList()"
> >
<el-form-item label="归属老师:"> <el-form-item label="归属老师:">
<el-select <el-select
......
...@@ -37,6 +37,7 @@ ...@@ -37,6 +37,7 @@
ref="listQuery" ref="listQuery"
size="small" size="small"
label-width="140px" label-width="140px"
@keyup.enter.native="handleSearchList()"
> >
<el-form-item label="归属老师:"> <el-form-item label="归属老师:">
<el-select <el-select
......
...@@ -2,7 +2,15 @@ ...@@ -2,7 +2,15 @@
<div class="container"> <div class="container">
<!-- <h1>newStu</h1> <!-- <h1>newStu</h1>
<h1>新增学员</h1> --> <h1>新增学员</h1> -->
<el-card v-if="roles.includes('客服部主管') || roles.includes('学服部主管') || roles.includes('超级管理员')" class="filter-container" shadow="never"> <el-card
v-if="
roles.includes('客服部主管') ||
roles.includes('学服部主管') ||
roles.includes('超级管理员')
"
class="filter-container"
shadow="never"
>
<div> <div>
<i class="el-icon-search"></i> <i class="el-icon-search"></i>
<span>筛选搜索</span> <span>筛选搜索</span>
...@@ -29,6 +37,7 @@ ...@@ -29,6 +37,7 @@
ref="listQuery" ref="listQuery"
size="small" size="small"
label-width="140px" label-width="140px"
@keyup.enter.native="handleSearchList()"
> >
<el-form-item label="归属老师:"> <el-form-item label="归属老师:">
<el-select <el-select
...@@ -78,11 +87,10 @@ ...@@ -78,11 +87,10 @@
</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">
<span v-if="scope.row.userStatus == 0">未报名</span> <span v-if="scope.row.userStatus == 0">未报名</span>
<span v-if="scope.row.userStatus == 1">在读学员</span> <span v-if="scope.row.userStatus == 1">在读学员</span>
<span v-if="scope.row.userStatus == 2">退费学员</span> <span v-if="scope.row.userStatus == 2">退费学员</span>
<span v-if="scope.row.userStatus == 3">结课学员</span> <span v-if="scope.row.userStatus == 3">结课学员</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="渠道" align="center"> <el-table-column label="渠道" align="center">
...@@ -169,7 +177,7 @@ export default { ...@@ -169,7 +177,7 @@ export default {
pageSize: null, pageSize: null,
pageNum: null, pageNum: null,
total: null, total: null,
roles:"", roles: "",
listLoading: true, listLoading: true,
multipleSelection: [], multipleSelection: [],
formLabelWidth: "120px", formLabelWidth: "120px",
...@@ -195,10 +203,10 @@ export default { ...@@ -195,10 +203,10 @@ export default {
this.listQuery.pageNum = val; this.listQuery.pageNum = val;
this.getNewStu(); this.getNewStu();
}, },
handleSizeChange(val){ handleSizeChange(val) {
//切换展示条数 //切换展示条数
this.listQuery.pageSize = val; this.listQuery.pageSize = val;
this.getNewStu() this.getNewStu();
}, },
handleStuDetail(id) { handleStuDetail(id) {
// 测试用的 // 测试用的
...@@ -245,7 +253,7 @@ export default { ...@@ -245,7 +253,7 @@ export default {
handleResetSearch(formName) { handleResetSearch(formName) {
this.$refs[formName].resetFields(); this.$refs[formName].resetFields();
this.listQuery = Object.assign({}, defaultListQuery); this.listQuery = Object.assign({}, defaultListQuery);
this.getNewStu() this.getNewStu();
// 重置 // 重置
}, },
getTeacherList() { getTeacherList() {
...@@ -259,7 +267,7 @@ export default { ...@@ -259,7 +267,7 @@ export default {
this.getNewStu(); this.getNewStu();
this.getTeacherList(); this.getTeacherList();
this.roles = this.$store.state.user.roles; this.roles = this.$store.state.user.roles;
console.log(this.roles,'this.roles'); console.log(this.roles, "this.roles");
} }
}; };
</script> </script>
......
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
ref="listQuery" ref="listQuery"
size="small" size="small"
label-width="140px" label-width="140px"
@keyup.enter.native="handleSearchList()"
> >
<el-form-item label="姓名:" prop="customerName"> <el-form-item label="姓名:" prop="customerName">
<el-input <el-input
......
...@@ -37,6 +37,7 @@ ...@@ -37,6 +37,7 @@
ref="listQuery" ref="listQuery"
size="small" size="small"
label-width="140px" label-width="140px"
@keyup.enter.native="handleSearchList()"
> >
<el-form-item label="归属老师:"> <el-form-item label="归属老师:">
<el-select <el-select
......
...@@ -37,6 +37,7 @@ ...@@ -37,6 +37,7 @@
ref="listQuery" ref="listQuery"
size="small" size="small"
label-width="140px" label-width="140px"
@keyup.enter.native="handleSearchList()"
> >
<el-form-item label="归属老师:"> <el-form-item label="归属老师:">
<el-select <el-select
......
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
:model="listQuery" :model="listQuery"
size="small" size="small"
label-width="140px" label-width="140px"
@keyup.enter.native="handleSearchList()"
> >
<!-- <el-form-item label="姓名:"> <!-- <el-form-item label="姓名:">
<el-input <el-input
...@@ -40,7 +41,7 @@ ...@@ -40,7 +41,7 @@
v-model="listQuery.campusAgent" v-model="listQuery.campusAgent"
placeholder="" placeholder=""
></el-input> --> ></el-input> -->
<el-select clearable v-model="listQuery.campusAgent"> <el-select clearable v-model="listQuery.campusAgent">
<el-option <el-option
v-for="item in ambList" v-for="item in ambList"
:key="item.value" :key="item.value"
...@@ -331,8 +332,8 @@ export default { ...@@ -331,8 +332,8 @@ export default {
pageNum: null, pageNum: null,
total: null, total: null,
listLoading: true, listLoading: true,
ambList:[], ambList: [],
ambListQuery:{}, ambListQuery: {},
multipleSelection: [], multipleSelection: [],
schoolList: [], schoolList: [],
money: 0, money: 0,
...@@ -402,18 +403,18 @@ export default { ...@@ -402,18 +403,18 @@ export default {
this.listQuery.starPaymentTime, this.listQuery.starPaymentTime,
this.listQuery.endPaymentTime this.listQuery.endPaymentTime
] = this.paymentTime; ] = this.paymentTime;
[ [
this.ambListQuery.starTime, this.ambListQuery.starTime,
this.ambListQuery.endTime this.ambListQuery.endTime
] = this.paymentTime; ] = this.paymentTime;
} else { } else {
this.listQuery.starPaymentTime = undefined; this.listQuery.starPaymentTime = undefined;
this.listQuery.endPaymentTime = undefined; this.listQuery.endPaymentTime = undefined;
this.ambListQuery.starTime = undefined; this.ambListQuery.starTime = undefined;
this.ambListQuery.endTime = undefined this.ambListQuery.endTime = undefined;
} }
this.getCampusAgentList() this.getCampusAgentList();
} }
}, },
filters: { filters: {
...@@ -463,20 +464,18 @@ export default { ...@@ -463,20 +464,18 @@ export default {
}); });
}, },
//校园大使下拉框 //校园大使下拉框
getCampusAgentList(){ getCampusAgentList() {
getCampusAgent(this.ambListQuery).then(res => { getCampusAgent(this.ambListQuery).then(res => {
this.ambList = [] this.ambList = [];
res.data.forEach(item => { res.data.forEach(item => {
let obj = {}; let obj = {};
obj.value = item; obj.value = item;
obj.label = item; obj.label = item;
this.ambList.push(obj); this.ambList.push(obj);
}); });
this.$forceUpdate(); this.$forceUpdate();
// console.log(this.ambList,'校园大使列表'); // console.log(this.ambList,'校园大使列表');
}); });
}, },
handleStuDetail(id) { handleStuDetail(id) {
......
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
:model="listQuery" :model="listQuery"
size="small" size="small"
label-width="140px" label-width="140px"
@keyup.enter.native="handleSearchList()"
> >
<!-- <el-form-item label="姓名:"> <!-- <el-form-item label="姓名:">
<el-input <el-input
......
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
ref="form" ref="form"
size="small" size="small"
label-width="140px" label-width="140px"
@keyup.enter.native="handleSearchList()"
> >
<el-form-item label="姓名:" prop="customerName"> <el-form-item label="姓名:" prop="customerName">
<el-input <el-input
...@@ -136,9 +137,7 @@ ...@@ -136,9 +137,7 @@
align="center" align="center"
prop="addTime" prop="addTime"
> >
<template slot-scope="scope">{{ <template slot-scope="scope">{{ scope.row.addTime }}</template>
scope.row.addTime
}}</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">{{
......
...@@ -28,8 +28,8 @@ ...@@ -28,8 +28,8 @@
ref="listQuery" ref="listQuery"
size="small" size="small"
label-width="140px" label-width="140px"
@keyup.enter.native="handleSearchList()"
> >
<el-form-item label="上课年份:" prop="yearTime"> <el-form-item label="上课年份:" prop="yearTime">
<el-select clearable v-model="listQuery.yearTime"> <el-select clearable v-model="listQuery.yearTime">
<el-option <el-option
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
placeholder="" placeholder=""
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="审课学校:" prop="auditSchool"> <el-form-item label="审课学校:" prop="auditSchool">
<el-select clearable v-model="listQuery.auditSchool"> <el-select clearable v-model="listQuery.auditSchool">
<el-option <el-option
...@@ -85,7 +85,6 @@ ...@@ -85,7 +85,6 @@
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="成绩录入时间:" prop="inputTime"> <el-form-item label="成绩录入时间:" prop="inputTime">
<el-date-picker <el-date-picker
v-model="inputTime" v-model="inputTime"
...@@ -238,13 +237,21 @@ ...@@ -238,13 +237,21 @@
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
v-if="scope.row.auditSchool == '上海理工大学'" v-if="scope.row.auditSchool == '上海理工大学'"
@click="output(scope.row.userId, scope.row.termCourseId,scope.row.name)" @click="
output(scope.row.userId, scope.row.termCourseId, scope.row.name)
"
type="mini" type="mini"
>导出</el-button >导出</el-button
> >
<el-button <el-button
v-if="scope.row.auditSchool == '上海理工大学'" v-if="scope.row.auditSchool == '上海理工大学'"
@click="outputPDF(scope.row.userId, scope.row.termCourseId,scope.row.name)" @click="
outputPDF(
scope.row.userId,
scope.row.termCourseId,
scope.row.name
)
"
type="mini" type="mini"
>新导出</el-button >新导出</el-button
> >
...@@ -494,18 +501,18 @@ export default { ...@@ -494,18 +501,18 @@ export default {
name: "gpaPdf", name: "gpaPdf",
params: { params: {
userId: userId, userId: userId,
termCourseId: termCourseId, termCourseId: termCourseId
} }
}); });
// console.log(123); // console.log(123);
}, },
outputPDF(userId, termCourseId) { outputPDF(userId, termCourseId) {
this.$router.push({ this.$router.push({
path: "/pms/NewGpaPdf", path: "/pms/NewGpaPdf",
name: "NewGpaPdf", name: "NewGpaPdf",
params: { params: {
userId: userId, userId: userId,
termCourseId: termCourseId, termCourseId: termCourseId
} }
}); });
// console.log(123); // console.log(123);
......
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
:model="listQuery" :model="listQuery"
size="small" size="small"
label-width="140px" label-width="140px"
@keyup.enter.native="handleSearchList()"
> >
<el-form-item label="姓名:"> <el-form-item label="姓名:">
<el-input <el-input
...@@ -121,7 +122,14 @@ ...@@ -121,7 +122,14 @@
></el-input> ></el-input>
</el-form-item> </el-form-item>
<!-- 客服主管添加归属老师 --> <!-- 客服主管添加归属老师 -->
<el-form-item label="归属老师:" v-if="roles.includes('客服部主管') || roles.includes('学服部主管') || roles.includes('超级管理员')"> <el-form-item
label="归属老师:"
v-if="
roles.includes('客服部主管') ||
roles.includes('学服部主管') ||
roles.includes('超级管理员')
"
>
<el-select <el-select
clearable clearable
style="width: 203px" style="width: 203px"
...@@ -237,10 +245,10 @@ ...@@ -237,10 +245,10 @@
</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">
<span v-if="scope.row.userStatus == 0">未报名</span> <span v-if="scope.row.userStatus == 0">未报名</span>
<span v-if="scope.row.userStatus == 1">在读学员</span> <span v-if="scope.row.userStatus == 1">在读学员</span>
<span v-if="scope.row.userStatus == 2">退费学员</span> <span v-if="scope.row.userStatus == 2">退费学员</span>
<span v-if="scope.row.userStatus == 3">结课学员</span> <span v-if="scope.row.userStatus == 3">结课学员</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="渠道" align="center"> <el-table-column label="渠道" align="center">
...@@ -310,7 +318,7 @@ ...@@ -310,7 +318,7 @@
</div> </div>
</template> </template>
<script> <script>
import { myStu,adminList } from "@/api/cso"; import { myStu, adminList } from "@/api/cso";
import { formatDate } from "@/utils/date"; import { formatDate } from "@/utils/date";
const defaultListQuery = { const defaultListQuery = {
...@@ -326,7 +334,7 @@ export default { ...@@ -326,7 +334,7 @@ export default {
pageSize: null, pageSize: null,
pageNum: null, pageNum: null,
total: null, total: null,
roles:"", roles: "",
listLoading: true, listLoading: true,
multipleSelection: [], multipleSelection: [],
pickerOptions: { pickerOptions: {
...@@ -420,8 +428,8 @@ export default { ...@@ -420,8 +428,8 @@ export default {
}, },
created() { created() {
this.getList(); this.getList();
this.getTeacherList(); this.getTeacherList();
this.roles = this.$store.state.user.roles; this.roles = this.$store.state.user.roles;
}, },
methods: { methods: {
...@@ -483,7 +491,6 @@ export default { ...@@ -483,7 +491,6 @@ export default {
}); });
}, },
handleResetSearch() { handleResetSearch() {
// 重置 // 重置
// this.selectProductCateValue = []; // this.selectProductCateValue = [];
......
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
ref="form" ref="form"
size="small" size="small"
label-width="140px" label-width="140px"
@keyup.enter.native="handleSearchList()"
> >
<!-- <el-form-item label="姓名:" prop="customerName"> <!-- <el-form-item label="姓名:" prop="customerName">
<el-input <el-input
...@@ -197,7 +198,11 @@ ...@@ -197,7 +198,11 @@
<el-table-column label="分配老师" align="center"> <el-table-column label="分配老师" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-select clearable v-model="scope.row.studyCareId" :placeholder="scope.row.customerCareName"> <el-select
clearable
v-model="scope.row.studyCareId"
:placeholder="scope.row.customerCareName"
>
<el-option <el-option
v-for="item in options" v-for="item in options"
:key="item.id" :key="item.id"
......
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
:model="listQuery" :model="listQuery"
size="small" size="small"
label-width="140px" label-width="140px"
@keyup.enter.native="handleSearchList()"
> >
<el-form-item label="姓名:"> <el-form-item label="姓名:">
<el-input <el-input
...@@ -122,7 +123,14 @@ ...@@ -122,7 +123,14 @@
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="归属老师:" v-if="roles.includes('客服部主管') || roles.includes('学服部主管') || roles.includes('超级管理员')"> <el-form-item
label="归属老师:"
v-if="
roles.includes('客服部主管') ||
roles.includes('学服部主管') ||
roles.includes('超级管理员')
"
>
<el-select <el-select
clearable clearable
style="width: 203px" style="width: 203px"
...@@ -347,7 +355,7 @@ export default { ...@@ -347,7 +355,7 @@ export default {
pageSize: null, pageSize: null,
pageNum: null, pageNum: null,
total: null, total: null,
roles:"", roles: "",
listLoading: true, listLoading: true,
multipleSelection: [], multipleSelection: [],
pickerOptions: { pickerOptions: {
...@@ -442,7 +450,7 @@ export default { ...@@ -442,7 +450,7 @@ export default {
created() { created() {
this.getList(); this.getList();
this.getTeacherList(); this.getTeacherList();
this.roles = this.$store.state.user.roles; this.roles = this.$store.state.user.roles;
}, },
methods: { methods: {
......
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
ref="listQuery" ref="listQuery"
size="small" size="small"
label-width="140px" label-width="140px"
@keyup.enter.native="handleSearchList()"
> >
<el-form-item label="姓名:" prop="customerName"> <el-form-item label="姓名:" prop="customerName">
<el-input <el-input
......
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
ref="listQuery" ref="listQuery"
size="small" size="small"
label-width="140px" label-width="140px"
@keyup.enter.native="handleSearchList()"
> >
<el-form-item label="姓名:" prop="customerName"> <el-form-item label="姓名:" prop="customerName">
<el-input <el-input
......
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
ref="listQuery" ref="listQuery"
size="small" size="small"
label-width="140px" label-width="140px"
@keyup.enter.native="handleSearchList()"
> >
<el-form-item label="学生上课年份:" prop="yearTime"> <el-form-item label="学生上课年份:" prop="yearTime">
<el-select clearable v-model="listQuery.year"> <el-select clearable v-model="listQuery.year">
......
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
ref="listQuery" ref="listQuery"
size="small" size="small"
label-width="140px" label-width="140px"
@keyup.enter.native="handleSearchList()"
> >
<el-form-item label="录入时间:" prop="inputTime"> <el-form-item label="录入时间:" prop="inputTime">
<el-date-picker <el-date-picker
......
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
ref="listQuery" ref="listQuery"
size="small" size="small"
label-width="140px" label-width="140px"
@keyup.enter.native="handleSearchList()"
> >
<el-form-item label="姓名:" prop="customerName"> <el-form-item label="姓名:" prop="customerName">
<el-input <el-input
......
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
ref="listQuery" ref="listQuery"
size="small" size="small"
label-width="140px" label-width="140px"
@keyup.enter.native="handleSearchList()"
> >
<el-form-item label="姓名:" prop="customerName"> <el-form-item label="姓名:" prop="customerName">
<el-input <el-input
......
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
ref="listQuery" ref="listQuery"
size="small" size="small"
label-width="140px" label-width="140px"
@keyup.enter.native="handleSearchList()"
> >
<el-form-item label="姓名:" prop="customerName"> <el-form-item label="姓名:" prop="customerName">
<el-input <el-input
...@@ -37,7 +38,7 @@ ...@@ -37,7 +38,7 @@
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="审课学姐:" prop="auditSenior"> <el-form-item label="审课学姐:" prop="auditSenior">
<el-select clearable v-model="listQuery.auditSenior"> <el-select clearable v-model="listQuery.auditSenior">
<el-option <el-option
v-for="item in auditSeniorList" v-for="item in auditSeniorList"
:key="item.value" :key="item.value"
...@@ -85,7 +86,6 @@ ...@@ -85,7 +86,6 @@
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="审课学校:" prop="auditSchool"> <el-form-item label="审课学校:" prop="auditSchool">
<el-input <el-input
style="width: 203px" style="width: 203px"
...@@ -242,7 +242,6 @@ ...@@ -242,7 +242,6 @@
<template slot-scope="scope">{{ scope.row.auditSenior }}</template> <template slot-scope="scope">{{ scope.row.auditSenior }}</template>
</el-table-column> </el-table-column>
<el-table-column label="审课1" align="center"> <el-table-column label="审课1" align="center">
<template slot-scope="scope" v-if="scope.row.userCourseList[0]" <template slot-scope="scope" v-if="scope.row.userCourseList[0]"
>{{ >{{
...@@ -489,7 +488,7 @@ export default { ...@@ -489,7 +488,7 @@ export default {
total: null, total: null,
listLoading: true, listLoading: true,
multipleSelection: [], multipleSelection: [],
auditSeniorQuery:{}, auditSeniorQuery: {},
pickerOptions: { pickerOptions: {
shortcuts: [ shortcuts: [
{ {
...@@ -526,7 +525,7 @@ export default { ...@@ -526,7 +525,7 @@ export default {
paymentTime: [], paymentTime: [],
schoolList: [], schoolList: [],
courseTimeList: [], courseTimeList: [],
auditSeniorList:[], auditSeniorList: [],
passStateList: [ passStateList: [
{ {
value: 1, value: 1,
...@@ -558,33 +557,32 @@ export default { ...@@ -558,33 +557,32 @@ export default {
// } // }
// }, // },
watch: { watch: {
'listQuery.yearTime'(newValue, oldValue){ "listQuery.yearTime"(newValue, oldValue) {
// console.log(newValue, oldValue,this.listQuery.yearTime,'====='); // console.log(newValue, oldValue,this.listQuery.yearTime,'=====');
if(this.listQuery.yearTime){ if (this.listQuery.yearTime) {
this.auditSeniorQuery.yearTime = this.listQuery.yearTime this.auditSeniorQuery.yearTime = this.listQuery.yearTime;
}else{ } else {
this.auditSeniorQuery.yearTime = undefined this.auditSeniorQuery.yearTime = undefined;
}; }
this.getAuditSeniorList() this.getAuditSeniorList();
}, },
'listQuery.term'(newValue, oldValue){ "listQuery.term"(newValue, oldValue) {
// console.log(newValue, oldValue,this.listQuery.yearTime,'====='); // console.log(newValue, oldValue,this.listQuery.yearTime,'=====');
if(this.listQuery.term){ if (this.listQuery.term) {
this.auditSeniorQuery.term = this.listQuery.term this.auditSeniorQuery.term = this.listQuery.term;
}else{ } else {
this.auditSeniorQuery.term = undefined this.auditSeniorQuery.term = undefined;
}; }
this.getAuditSeniorList() this.getAuditSeniorList();
}, },
isPassAuditCourse(newValue, oldValue){ isPassAuditCourse(newValue, oldValue) {
if (this.isPassAuditCourse) {
if (this.isPassAuditCourse) { this.auditSeniorQuery.isPassAuditCourse = 0;
this.auditSeniorQuery.isPassAuditCourse = 0 } else {
}else{ this.auditSeniorQuery.isPassAuditCourse = null;
this.auditSeniorQuery.isPassAuditCourse = null
} }
this.getAuditSeniorList() this.getAuditSeniorList();
}, },
//分配时间 //分配时间
inputTime(newValue, oldValue) { inputTime(newValue, oldValue) {
...@@ -594,10 +592,10 @@ export default { ...@@ -594,10 +592,10 @@ export default {
this.listQuery.endAllocateTime this.listQuery.endAllocateTime
] = this.inputTime; ] = this.inputTime;
// console.log(this.inputTime,'==inputTime'); // console.log(this.inputTime,'==inputTime');
// [ // [
// this.auditSeniorQuery.starAllocateTime, // this.auditSeniorQuery.starAllocateTime,
// this.auditSeniorQuery.endAllocateTime // this.auditSeniorQuery.endAllocateTime
// ] = this.inputTime; // ] = this.inputTime;
} else { } else {
this.listQuery.starAllocateTime = undefined; this.listQuery.starAllocateTime = undefined;
this.listQuery.endAllocateTime = undefined; this.listQuery.endAllocateTime = undefined;
...@@ -610,17 +608,17 @@ export default { ...@@ -610,17 +608,17 @@ export default {
chatTime(newValue, oldValue) { chatTime(newValue, oldValue) {
if (this.chatTime) { if (this.chatTime) {
[this.listQuery.starTime, this.listQuery.endTime] = this.chatTime; [this.listQuery.starTime, this.listQuery.endTime] = this.chatTime;
[ [
this.auditSeniorQuery.starTime, this.auditSeniorQuery.starTime,
this.auditSeniorQuery.endTime this.auditSeniorQuery.endTime
] = this.chatTime; ] = this.chatTime;
} else { } else {
this.listQuery.starTime = undefined; this.listQuery.starTime = undefined;
this.listQuery.endTime = undefined; this.listQuery.endTime = undefined;
this.auditSeniorQuery.starTime = undefined, (this.auditSeniorQuery.starTime = undefined),
this.auditSeniorQuery.endTime = undefined (this.auditSeniorQuery.endTime = undefined);
} }
this.getAuditSeniorList() this.getAuditSeniorList();
}, },
//审课通过时间 //审课通过时间
paymentTime(newValue, oldValue) { paymentTime(newValue, oldValue) {
...@@ -629,17 +627,17 @@ export default { ...@@ -629,17 +627,17 @@ export default {
this.listQuery.auditPassStarTime, this.listQuery.auditPassStarTime,
this.listQuery.auditPassEndTime this.listQuery.auditPassEndTime
] = this.paymentTime; ] = this.paymentTime;
[ [
this.auditSeniorQuery.auditPassStarTime, this.auditSeniorQuery.auditPassStarTime,
this.auditSeniorQuery.auditPassEndTime this.auditSeniorQuery.auditPassEndTime
] = this.paymentTime; ] = this.paymentTime;
} else { } else {
this.auditSeniorQuery.auditPassStarTime = undefined, (this.auditSeniorQuery.auditPassStarTime = undefined),
this.auditSeniorQuery.auditPassEndTime = undefined (this.auditSeniorQuery.auditPassEndTime = undefined);
this.listQuery.auditPassStarTime = undefined; this.listQuery.auditPassStarTime = undefined;
this.listQuery.auditPassEndTime = undefined; this.listQuery.auditPassEndTime = undefined;
} }
this.getAuditSeniorList() this.getAuditSeniorList();
} }
}, },
filters: { filters: {
...@@ -656,7 +654,7 @@ export default { ...@@ -656,7 +654,7 @@ export default {
this.getList(); this.getList();
this.getSchool(); this.getSchool();
this.getCourseTime(); this.getCourseTime();
this.getAuditSeniorList() this.getAuditSeniorList();
}, },
methods: { methods: {
...@@ -702,23 +700,20 @@ export default { ...@@ -702,23 +700,20 @@ export default {
}); });
}, },
//得到审课学姐 //得到审课学姐
getAuditSeniorList(){ getAuditSeniorList() {
getAuditSenior(this.auditSeniorQuery).then(res => { getAuditSenior(this.auditSeniorQuery).then(res => {
this.auditSeniorList = [] this.auditSeniorList = [];
// this.schoolList = res.data; // this.schoolList = res.data;
// console.log(this.schoolList, "this.schoolList"); // console.log(this.schoolList, "this.schoolList");
res.data.forEach(item => { res.data.forEach(item => {
let obj = {}; let obj = {};
obj.value = item; obj.value = item;
obj.label = item; obj.label = item;
this.auditSeniorList.push(obj); this.auditSeniorList.push(obj);
}); });
this.$forceUpdate(); this.$forceUpdate();
// console.log(this.auditSeniorList,'学姐列表'); // console.log(this.auditSeniorList,'学姐列表');
}); });
}, },
getSchool() { getSchool() {
school().then(res => { school().then(res => {
...@@ -778,7 +773,7 @@ export default { ...@@ -778,7 +773,7 @@ export default {
this.$refs[formName].resetFields(); this.$refs[formName].resetFields();
// 重置 // 重置
// this.selectProductCateValue = []; // this.selectProductCateValue = [];
this.inputTime = undefined; this.inputTime = undefined;
this.chatTime = undefined; this.chatTime = undefined;
this.paymentTime = undefined; this.paymentTime = undefined;
...@@ -789,7 +784,7 @@ export default { ...@@ -789,7 +784,7 @@ export default {
// this.paymentTime = undefined; // this.paymentTime = undefined;
this.listQuery = Object.assign({}, defaultListQuery); this.listQuery = Object.assign({}, defaultListQuery);
this.getList(); this.getList();
this.getAuditSeniorList() this.getAuditSeniorList();
}, },
handleSelectionChange(val) { handleSelectionChange(val) {
this.multipleSelection = val; this.multipleSelection = val;
......
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