Commit 54cd23f0 by lizhi

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

parent 21d624e3
......@@ -4,7 +4,7 @@ const prodEnv = require("./prod.env");
module.exports = merge(prodEnv, {
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://admin-api.macrozheng.com"',
BASE_API: '"http://test.csasedu.com:10032"' //系统服务器地址
......
......@@ -28,8 +28,8 @@
ref="listQuery"
size="small"
label-width="140px"
@keyup.enter.native="handleSearchList()"
>
<el-checkbox v-model="isMatch">未匹配课程代码</el-checkbox>
<el-form-item label="课程代码:" prop="courseCode">
......@@ -40,8 +40,6 @@
></el-input>
</el-form-item>
<el-form-item label="课程名称:" prop="courseName">
<el-input
style="width: 203px"
......@@ -50,7 +48,6 @@
></el-input>
</el-form-item>
<el-form-item label="审课学校:" prop="school ">
<el-input
style="width: 203px"
......@@ -58,10 +55,6 @@
placeholder=""
></el-input>
</el-form-item>
</el-form>
</div>
</el-card>
......@@ -279,11 +272,6 @@
<template slot-scope="scope">{{ scope.row.courseName }}</template>
</el-table-column>
<!-- @click="
handleupdateNoticeAll(scope.row.id, scope.row.schoolName,scope.row.schoolBrief)
" -->
......
......@@ -29,8 +29,8 @@
ref="listQuery"
size="small"
label-width="140px"
@keyup.enter.native="handleSearchList()"
>
<el-form-item label="课程名称:" prop="courseName">
<el-input
style="width: 203px"
......@@ -39,7 +39,6 @@
></el-input>
</el-form-item>
<el-form-item label="课程代码:" prop="courseCode">
<el-input
style="width: 203px"
......@@ -47,9 +46,6 @@
placeholder=""
></el-input>
</el-form-item>
</el-form>
</div>
</el-card>
......@@ -258,16 +254,14 @@ export default {
handleCurrentChange(val) {
// 翻页
this.listQuery.pageNum = val;
this.getData()
this.getData();
},
handleSizeChange(val){
handleSizeChange(val) {
//切换展示条数
this.listQuery.pageSize = val;
this.getData()
this.getData();
},
submitForm(formName) {
if (this.updateId) {
this.csoInfo.id = this.updateId;
......
......@@ -28,8 +28,8 @@
ref="listQuery"
size="small"
label-width="140px"
@keyup.enter.native="handleSearchList()"
>
<el-checkbox v-model="isMatch">未匹配课程代码</el-checkbox>
<el-form-item label="课程代码:" prop="courseCode">
......@@ -40,8 +40,6 @@
></el-input>
</el-form-item>
<el-form-item label="课程名称:" prop="courseName">
<el-input
style="width: 203px"
......@@ -50,7 +48,6 @@
></el-input>
</el-form-item>
<el-form-item label="学生所在学校:" prop="school ">
<el-input
style="width: 203px"
......@@ -58,7 +55,6 @@
placeholder=""
></el-input>
</el-form-item>
</el-form>
</div>
</el-card>
......@@ -290,10 +286,6 @@
<template slot-scope="scope">{{ scope.row.courseName }}</template>
</el-table-column>
<!-- @click="
handleupdateNoticeAll(scope.row.id, scope.row.schoolName,scope.row.schoolBrief)
" -->
......
......@@ -2,7 +2,15 @@
<div class="container">
<!-- <h1>newStu</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>
<i class="el-icon-search"></i>
<span>筛选搜索</span>
......@@ -29,6 +37,7 @@
ref="listQuery"
size="small"
label-width="140px"
@keyup.enter.native="handleSearchList()"
>
<el-form-item label="归属老师:">
<el-select
......@@ -168,7 +177,7 @@ export default {
pageSize: null,
pageNum: null,
total: null,
roles:"",
roles: "",
listLoading: true,
multipleSelection: [],
formLabelWidth: "120px",
......@@ -194,7 +203,7 @@ export default {
this.listQuery.pageNum = val;
this.getNewStu();
},
handleSizeChange(val){
handleSizeChange(val) {
//切换展示条数
this.listQuery.pageSize = val;
this.getNewStu();
......
......@@ -28,6 +28,7 @@
ref="listQuery"
size="small"
label-width="140px"
@keyup.enter.native="handleSearchList()"
>
<el-form-item label="学生上课年份:" prop="yearTime">
<el-select clearable v-model="listQuery.year">
......
......@@ -28,6 +28,7 @@
ref="listQuery"
size="small"
label-width="140px"
@keyup.enter.native="handleSearchList()"
>
<el-form-item label="上课年份:" prop="yearTime">
<el-select clearable v-model="listQuery.yearTime">
......@@ -41,7 +42,6 @@
</el-select>
</el-form-item>
<el-form-item label="上课学期:" prop="term ">
<el-input
style="width: 203px"
......@@ -65,7 +65,6 @@
></el-input>
</el-form-item>
<el-form-item label="审课学校:" prop="auditSchool">
<el-select clearable v-model="listQuery.auditSchool">
<el-option
......@@ -85,7 +84,6 @@
placeholder=""
></el-input>
</el-form-item>
</el-form>
</div>
</el-card>
......
......@@ -35,6 +35,7 @@
ref="listQuery"
size="small"
label-width="140px"
@keyup.enter.native="handleSearchList()"
>
<el-form-item label="归属老师:">
<el-select
......
......@@ -37,6 +37,7 @@
ref="listQuery"
size="small"
label-width="140px"
@keyup.enter.native="handleSearchList()"
>
<el-form-item label="归属老师:">
<el-select
......
......@@ -2,7 +2,15 @@
<div class="container">
<!-- <h1>newStu</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>
<i class="el-icon-search"></i>
<span>筛选搜索</span>
......@@ -29,6 +37,7 @@
ref="listQuery"
size="small"
label-width="140px"
@keyup.enter.native="handleSearchList()"
>
<el-form-item label="归属老师:">
<el-select
......@@ -82,7 +91,6 @@
<span v-if="scope.row.userStatus == 1">在读学员</span>
<span v-if="scope.row.userStatus == 2">退费学员</span>
<span v-if="scope.row.userStatus == 3">结课学员</span>
</template>
</el-table-column>
<el-table-column label="渠道" align="center">
......@@ -169,7 +177,7 @@ export default {
pageSize: null,
pageNum: null,
total: null,
roles:"",
roles: "",
listLoading: true,
multipleSelection: [],
formLabelWidth: "120px",
......@@ -195,10 +203,10 @@ export default {
this.listQuery.pageNum = val;
this.getNewStu();
},
handleSizeChange(val){
handleSizeChange(val) {
//切换展示条数
this.listQuery.pageSize = val;
this.getNewStu()
this.getNewStu();
},
handleStuDetail(id) {
// 测试用的
......@@ -245,7 +253,7 @@ export default {
handleResetSearch(formName) {
this.$refs[formName].resetFields();
this.listQuery = Object.assign({}, defaultListQuery);
this.getNewStu()
this.getNewStu();
// 重置
},
getTeacherList() {
......@@ -259,7 +267,7 @@ export default {
this.getNewStu();
this.getTeacherList();
this.roles = this.$store.state.user.roles;
console.log(this.roles,'this.roles');
console.log(this.roles, "this.roles");
}
};
</script>
......
......@@ -28,6 +28,7 @@
ref="listQuery"
size="small"
label-width="140px"
@keyup.enter.native="handleSearchList()"
>
<el-form-item label="姓名:" prop="customerName">
<el-input
......
......@@ -37,6 +37,7 @@
ref="listQuery"
size="small"
label-width="140px"
@keyup.enter.native="handleSearchList()"
>
<el-form-item label="归属老师:">
<el-select
......
......@@ -37,6 +37,7 @@
ref="listQuery"
size="small"
label-width="140px"
@keyup.enter.native="handleSearchList()"
>
<el-form-item label="归属老师:">
<el-select
......
......@@ -26,6 +26,7 @@
:model="listQuery"
size="small"
label-width="140px"
@keyup.enter.native="handleSearchList()"
>
<!-- <el-form-item label="姓名:">
<el-input
......@@ -331,8 +332,8 @@ export default {
pageNum: null,
total: null,
listLoading: true,
ambList:[],
ambListQuery:{},
ambList: [],
ambListQuery: {},
multipleSelection: [],
schoolList: [],
money: 0,
......@@ -410,10 +411,10 @@ export default {
this.listQuery.starPaymentTime = undefined;
this.listQuery.endPaymentTime = undefined;
this.ambListQuery.starTime = undefined;
this.ambListQuery.endTime = undefined
this.ambListQuery.endTime = undefined;
}
this.getCampusAgentList()
this.getCampusAgentList();
}
},
filters: {
......@@ -463,10 +464,9 @@ export default {
});
},
//校园大使下拉框
getCampusAgentList(){
getCampusAgentList() {
getCampusAgent(this.ambListQuery).then(res => {
this.ambList = []
this.ambList = [];
res.data.forEach(item => {
let obj = {};
obj.value = item;
......@@ -476,7 +476,6 @@ export default {
this.$forceUpdate();
// console.log(this.ambList,'校园大使列表');
});
},
handleStuDetail(id) {
......
......@@ -26,6 +26,7 @@
:model="listQuery"
size="small"
label-width="140px"
@keyup.enter.native="handleSearchList()"
>
<!-- <el-form-item label="姓名:">
<el-input
......
......@@ -27,6 +27,7 @@
ref="form"
size="small"
label-width="140px"
@keyup.enter.native="handleSearchList()"
>
<el-form-item label="姓名:" prop="customerName">
<el-input
......@@ -136,9 +137,7 @@
align="center"
prop="addTime"
>
<template slot-scope="scope">{{
scope.row.addTime
}}</template>
<template slot-scope="scope">{{ scope.row.addTime }}</template>
</el-table-column>
<el-table-column label="选课数量" align="center">
<template slot-scope="scope">{{
......
......@@ -28,8 +28,8 @@
ref="listQuery"
size="small"
label-width="140px"
@keyup.enter.native="handleSearchList()"
>
<el-form-item label="上课年份:" prop="yearTime">
<el-select clearable v-model="listQuery.yearTime">
<el-option
......@@ -85,7 +85,6 @@
></el-input>
</el-form-item>
<el-form-item label="成绩录入时间:" prop="inputTime">
<el-date-picker
v-model="inputTime"
......@@ -238,13 +237,21 @@
<template slot-scope="scope">
<el-button
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"
>导出</el-button
>
<el-button
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"
>新导出</el-button
>
......@@ -494,7 +501,7 @@ export default {
name: "gpaPdf",
params: {
userId: userId,
termCourseId: termCourseId,
termCourseId: termCourseId
}
});
// console.log(123);
......@@ -505,7 +512,7 @@ export default {
name: "NewGpaPdf",
params: {
userId: userId,
termCourseId: termCourseId,
termCourseId: termCourseId
}
});
// console.log(123);
......
......@@ -26,6 +26,7 @@
:model="listQuery"
size="small"
label-width="140px"
@keyup.enter.native="handleSearchList()"
>
<el-form-item label="姓名:">
<el-input
......@@ -121,7 +122,14 @@
></el-input>
</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
clearable
style="width: 203px"
......@@ -310,7 +318,7 @@
</div>
</template>
<script>
import { myStu,adminList } from "@/api/cso";
import { myStu, adminList } from "@/api/cso";
import { formatDate } from "@/utils/date";
const defaultListQuery = {
......@@ -326,7 +334,7 @@ export default {
pageSize: null,
pageNum: null,
total: null,
roles:"",
roles: "",
listLoading: true,
multipleSelection: [],
pickerOptions: {
......@@ -483,7 +491,6 @@ export default {
});
},
handleResetSearch() {
// 重置
// this.selectProductCateValue = [];
......
......@@ -28,6 +28,7 @@
ref="form"
size="small"
label-width="140px"
@keyup.enter.native="handleSearchList()"
>
<!-- <el-form-item label="姓名:" prop="customerName">
<el-input
......@@ -197,7 +198,11 @@
<el-table-column label="分配老师" align="center">
<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
v-for="item in options"
:key="item.id"
......
......@@ -27,6 +27,7 @@
:model="listQuery"
size="small"
label-width="140px"
@keyup.enter.native="handleSearchList()"
>
<el-form-item label="姓名:">
<el-input
......@@ -122,7 +123,14 @@
></el-input>
</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
clearable
style="width: 203px"
......@@ -347,7 +355,7 @@ export default {
pageSize: null,
pageNum: null,
total: null,
roles:"",
roles: "",
listLoading: true,
multipleSelection: [],
pickerOptions: {
......
......@@ -28,6 +28,7 @@
ref="listQuery"
size="small"
label-width="140px"
@keyup.enter.native="handleSearchList()"
>
<el-form-item label="姓名:" prop="customerName">
<el-input
......
......@@ -28,6 +28,7 @@
ref="listQuery"
size="small"
label-width="140px"
@keyup.enter.native="handleSearchList()"
>
<el-form-item label="姓名:" prop="customerName">
<el-input
......
......@@ -28,6 +28,7 @@
ref="listQuery"
size="small"
label-width="140px"
@keyup.enter.native="handleSearchList()"
>
<el-form-item label="学生上课年份:" prop="yearTime">
<el-select clearable v-model="listQuery.year">
......
......@@ -28,6 +28,7 @@
ref="listQuery"
size="small"
label-width="140px"
@keyup.enter.native="handleSearchList()"
>
<el-form-item label="录入时间:" prop="inputTime">
<el-date-picker
......
......@@ -28,6 +28,7 @@
ref="listQuery"
size="small"
label-width="140px"
@keyup.enter.native="handleSearchList()"
>
<el-form-item label="姓名:" prop="customerName">
<el-input
......
......@@ -28,6 +28,7 @@
ref="listQuery"
size="small"
label-width="140px"
@keyup.enter.native="handleSearchList()"
>
<el-form-item label="姓名:" prop="customerName">
<el-input
......
......@@ -28,6 +28,7 @@
ref="listQuery"
size="small"
label-width="140px"
@keyup.enter.native="handleSearchList()"
>
<el-form-item label="姓名:" prop="customerName">
<el-input
......@@ -85,7 +86,6 @@
></el-input>
</el-form-item>
<el-form-item label="审课学校:" prop="auditSchool">
<el-input
style="width: 203px"
......@@ -242,7 +242,6 @@
<template slot-scope="scope">{{ scope.row.auditSenior }}</template>
</el-table-column>
<el-table-column label="审课1" align="center">
<template slot-scope="scope" v-if="scope.row.userCourseList[0]"
>{{
......@@ -489,7 +488,7 @@ export default {
total: null,
listLoading: true,
multipleSelection: [],
auditSeniorQuery:{},
auditSeniorQuery: {},
pickerOptions: {
shortcuts: [
{
......@@ -526,7 +525,7 @@ export default {
paymentTime: [],
schoolList: [],
courseTimeList: [],
auditSeniorList:[],
auditSeniorList: [],
passStateList: [
{
value: 1,
......@@ -558,33 +557,32 @@ export default {
// }
// },
watch: {
'listQuery.yearTime'(newValue, oldValue){
"listQuery.yearTime"(newValue, oldValue) {
// console.log(newValue, oldValue,this.listQuery.yearTime,'=====');
if(this.listQuery.yearTime){
this.auditSeniorQuery.yearTime = this.listQuery.yearTime
}else{
this.auditSeniorQuery.yearTime = undefined
};
this.getAuditSeniorList()
if (this.listQuery.yearTime) {
this.auditSeniorQuery.yearTime = this.listQuery.yearTime;
} else {
this.auditSeniorQuery.yearTime = undefined;
}
this.getAuditSeniorList();
},
'listQuery.term'(newValue, oldValue){
"listQuery.term"(newValue, oldValue) {
// console.log(newValue, oldValue,this.listQuery.yearTime,'=====');
if(this.listQuery.term){
this.auditSeniorQuery.term = this.listQuery.term
}else{
this.auditSeniorQuery.term = undefined
};
this.getAuditSeniorList()
if (this.listQuery.term) {
this.auditSeniorQuery.term = this.listQuery.term;
} else {
this.auditSeniorQuery.term = undefined;
}
this.getAuditSeniorList();
},
isPassAuditCourse(newValue, oldValue){
isPassAuditCourse(newValue, oldValue) {
if (this.isPassAuditCourse) {
this.auditSeniorQuery.isPassAuditCourse = 0
}else{
this.auditSeniorQuery.isPassAuditCourse = null
this.auditSeniorQuery.isPassAuditCourse = 0;
} else {
this.auditSeniorQuery.isPassAuditCourse = null;
}
this.getAuditSeniorList()
this.getAuditSeniorList();
},
//分配时间
inputTime(newValue, oldValue) {
......@@ -617,10 +615,10 @@ export default {
} else {
this.listQuery.starTime = undefined;
this.listQuery.endTime = undefined;
this.auditSeniorQuery.starTime = undefined,
this.auditSeniorQuery.endTime = undefined
(this.auditSeniorQuery.starTime = undefined),
(this.auditSeniorQuery.endTime = undefined);
}
this.getAuditSeniorList()
this.getAuditSeniorList();
},
//审课通过时间
paymentTime(newValue, oldValue) {
......@@ -634,12 +632,12 @@ export default {
this.auditSeniorQuery.auditPassEndTime
] = this.paymentTime;
} else {
this.auditSeniorQuery.auditPassStarTime = undefined,
this.auditSeniorQuery.auditPassEndTime = undefined
(this.auditSeniorQuery.auditPassStarTime = undefined),
(this.auditSeniorQuery.auditPassEndTime = undefined);
this.listQuery.auditPassStarTime = undefined;
this.listQuery.auditPassEndTime = undefined;
}
this.getAuditSeniorList()
this.getAuditSeniorList();
}
},
filters: {
......@@ -656,7 +654,7 @@ export default {
this.getList();
this.getSchool();
this.getCourseTime();
this.getAuditSeniorList()
this.getAuditSeniorList();
},
methods: {
......@@ -702,14 +700,12 @@ export default {
});
},
//得到审课学姐
getAuditSeniorList(){
getAuditSeniorList() {
getAuditSenior(this.auditSeniorQuery).then(res => {
this.auditSeniorList = []
this.auditSeniorList = [];
// this.schoolList = res.data;
// console.log(this.schoolList, "this.schoolList");
res.data.forEach(item => {
let obj = {};
obj.value = item;
obj.label = item;
......@@ -718,7 +714,6 @@ export default {
this.$forceUpdate();
// console.log(this.auditSeniorList,'学姐列表');
});
},
getSchool() {
school().then(res => {
......@@ -789,7 +784,7 @@ export default {
// this.paymentTime = undefined;
this.listQuery = Object.assign({}, defaultListQuery);
this.getList();
this.getAuditSeniorList()
this.getAuditSeniorList();
},
handleSelectionChange(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