Skip to content

G
gdtel-gztel-school-center-ui
Commit 0897f175 by 董有沛
Options

Merge remote-tracking branch 'remotes/origin/master'

parents 53cef792 7a4a998a
Showing with 141 additions and 244 deletions
src/api/school-center/salesOrdersAPI.js
......@@ -3,7 +3,6 @@ const prefix = '/manager/ciop';
// 获取县分下拉列表
let getSubstList = (params) => postAction(prefix + "/school/schoolManagement/substList" , params);
// 获取学校下拉列表
let getSchoolList = (params) => postAction(prefix + "/school/schoolManagement/schoolList" , params);
// 获取活动列表
......
src/api/school-center/userManager/newUser.js deleted 100644 → 0
import {postAction,downFilePost} from '@/api/manage'
const prefix = '/manager/ciop';
// 楼长KPI管理
let excelOut = (params) => downFilePost(prefix + "/studentDwkVerify/excelOut" , params);
let list = (params) => postAction(prefix + "/studentDwkVerify/list" , params);
let update = (params) => postAction(prefix + "/studentDwkVerify/update" , params);
let queryById = (params) => postAction(prefix + "/studentDwkVerify/queryById" , params);
export {
excelOut,
list,
update,
queryById
}
src/api/school-center/userManager/newUserAPI.js 0 → 100644
import {postAction} from '@/api/manage'
const prefix = '/manager/ciop';
//获取县分下拉列表
let initSubstName = (params) => postAction(prefix + "/ysmUser/initSubstName" , params);
//获取学校下拉列表
let getSchoolNames = (params) => postAction(prefix + "/ysmUser/getSchoolNames" , params);
let list = (params) => postAction(prefix + "/newUser/list" , params);
let update = (params) => postAction(prefix + "/newUser/update" , params);
export {
initSubstName,
getSchoolNames,
list,
update,
}
src/views/school-center/salesOrders/salesOrder.vue
......@@ -160,7 +160,7 @@
<script>
import STable from '@/components/table';
import {} from "@/api/school-center/salesOrder";
import {} from "../../../api/school-center/salesOrder";
import {
getSchoolNames, initSubstName, getList, deleteOrder,
downloadTemplateFH, downloadTemplateCZ, downloadResult, exportOut
......@@ -380,6 +380,7 @@
getSchoolNames() {
this.schoolNames = []
this.queryParam.schoolName = ''
getSchoolNames({"substName": this.queryParam.salesSubst}).then((res) => {
if (res.state == "success") {
......
src/views/school-center/statistics/saleCensus.vue
......@@ -313,6 +313,7 @@
getSchoolNames() {
this.schoolNames = []
this.queryParam.schoolName = ''
getSchoolNames({"substName": this.queryParam.salesSubst}).then((res) => {
if (res.state == "success") {
......
src/views/school-center/statistics/salesOrder.vue
......@@ -375,6 +375,7 @@
getSchoolNames() {
this.schoolNames = []
this.queryParam.schoolName = ''
getSchoolNames({"substName": this.queryParam.salesSubst}).then((res) => {
if (res.state == "success") {
......
src/views/school-center/userManager/newUser.vue
......@@ -6,23 +6,36 @@
<a-form layout="inline">
<a-row :gutter="24">
<a-col :md="4" :sm="8">
<a-form-item label="用户姓名">
<a-input placeholder="用户姓名" v-model="queryParam.userName" style="width: 8rem;"></a-input>
<a-form-item label="账号">
<a-input placeholder="账号" v-model="queryParam.account" style="width: 8rem;"></a-input>
</a-form-item>
</a-col>
<a-col :md="4" :sm="8">
<a-form-item label="办理号码">
<a-input placeholder="办理号码" v-model="queryParam.orderPhone" style="width: 8rem;"></a-input>
<a-form-item label="姓名">
<a-input placeholder="姓名" v-model="queryParam.name" style="width: 8rem;"></a-input>
</a-form-item>
</a-col>
<a-col :md="4" :sm="8">
<a-form-item label="联系号码">
<a-input placeholder="联系号码" v-model="queryParam.linkPhone" style="width: 8rem;"></a-input>
<a-col :md="4" :sm="4">
<a-form-item label="县分">
<a-select v-model="queryParam.substName" @change="getSchoolNames">
<a-select-option key="">--全部--</a-select-option>
<a-select-option v-for="d in subNames" :key="d.value" :value="d.value">{{d.text}}
</a-select-option>
</a-select>
</a-form-item>
</a-col>
<a-col :md="4" :sm="8">
<a-form-item label="是否审核通过">
<a-select v-model="queryParam.auditState" style="width: 8rem;">
<a-col :md="6" :sm="12">
<a-form-item label="学校">
<a-select v-model="queryParam.salesSchool" style="width: 15rem;">
<a-select-option key="">--全部--</a-select-option>
<a-select-option v-for="d in schoolNames" :key="d.value" :value="d.value">{{d.text}}
</a-select-option>
</a-select>
</a-form-item>
</a-col>
<a-col v-show="false" :md="4" :sm="8">
<a-form-item label="状态">
<a-select v-model="queryParam.status" style="width: 8rem;">
<a-select-option key="">--全部--</a-select-option>
<a-select-option key="1">未审核</a-select-option>
<a-select-option key="2">是</a-select-option>
......@@ -31,42 +44,16 @@
</a-select>
</a-form-item>
</a-col>
<a-col :md="4" :sm="8">
<a-form-item label="审核人">
<a-input placeholder="审核人" v-model="queryParam.auditName" style="width: 8rem;"></a-input>
</a-form-item>
</a-col>
<a-col :md="6" :sm="10">
<a-form-item label="上传资料时间">
<a-range-picker @change="onChange" v-model="queryParam.uploadDate"/>
</a-form-item>
</a-col>
<a-col :md="6" :sm="10">
<a-form-item label="审核时间">
<a-range-picker @change="onChange1" v-model="queryParam.auditDate"/>
<a-form-item label="注册时间">
<a-range-picker @change="onChange" v-model="queryParam.createtime"/>
</a-form-item>
</a-col>
<span class="table-page-search-submitButtons" style="float: left; overflow: hidden;">
<a-col :md="6" :sm="24">
<a-button @click="search()" type="primary">查询</a-button>
<a-divider type="vertical"/>
<a-button type="primary":disabled="hasSelected" :loading="loading" @click="start('2')">
审核
</a-button>
<a-divider type="vertical"/>
<a-button type="primary" :loading="loading" @click="start('2')">
批量通过
</a-button>
<a-divider type="vertical"/>
<a-button type="primary" :loading="loading" @click="start('3')">
批量不通过
</a-button>
<a-divider type="vertical"/>
<a-button @click="excelOut('')" type="primary">导出所有数据</a-button>
<a-divider type="vertical"/>
<a-button @click="excelOut('2')" type="primary">导出审核通过数据</a-button>
<a-divider type="vertical"/>
<a-button @click="excelOut('3')" type="primary">导出审核不通过数据</a-button>
<a-button type="primary" :loading="loading" @click="start()">审核</a-button>
</a-col>
</span>
</a-row>
......@@ -76,80 +63,37 @@
<!--列表-->
<s-table :columns="columns" :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }" :data="rowdata" bordered ref="table" size="small" class="flex-filling" :locale="emptyText">
<!--拦截器-->
<template slot="uploadDate" slot-scope="text">
{{ text | dayjs}}
</template>
<!--拦截器-->
<template slot="crnActivateDate" slot-scope="text">
<template slot="createtime" slot-scope="text">
{{ text | dayjs}}
</template>
<!--拦截器-->
<template slot="auditDate" slot-scope="text">
<template slot="updateTime" slot-scope="text">
{{ text | dayjs}}
</template>
<template slot="isComboMoney49" slot-scope="text">
<p v-if="text=='0'">否</p>
<p v-if="text=='1'">是</p>
<p v-else=""></p>
</template>
<template slot="isFull" slot-scope="text">
<p v-if="text=='0'">否</p>
<p v-if="text=='1'">是</p>
<template slot="sex" slot-scope="text">
<p v-if="text=='0'">女</p>
<p v-if="text=='1'">男</p>
<p v-else=""></p>
</template>
<template slot="isClear" slot-scope="text">
<p v-if="text=='0'">否</p>
<p v-if="text=='1'">是</p>
<template slot="status" slot-scope="text">
<p v-if="text=='1'">启用</p>
<p v-if="text=='2'">冻结</p>
<p v-if="text=='3'">删除</p>
<p v-if="text=='4'">待审核</p>
<p v-else=""></p>
</template>
<template slot="isUnderYears" slot-scope="text">
<p v-if="text=='0'">否</p>
<p v-if="text=='1'">是</p>
<p v-else=""></p>
</template>
<template slot="isStudentAccordance" slot-scope="text">
<p v-if="text=='0'">否</p>
<p v-if="text=='1'">是</p>
<p v-else=""></p>
</template>
<template slot="isSchoolAccordance" slot-scope="text">
<p v-if="text=='0'">否</p>
<p v-if="text=='1'">是</p>
<p v-else=""></p>
</template>
<template slot="isUploadBeforeActivate" slot-scope="text">
<p v-if="text=='0'">否</p>
<p v-if="text=='1'">是</p>
<p v-else=""></p>
</template>
<template slot="isFirstUpload" slot-scope="text">
<p v-if="text=='0'">否</p>
<p v-if="text=='1'">是</p>
<p v-else=""></p>
</template>
<template slot="auditState" slot-scope="text">
<p v-if="text=='1'">未审核</p>
<p v-if="text=='2'">审核通过</p>
<p v-if="text=='3'">审核不通过</p>
<p v-if="text=='4'">无效</p>
<p v-else=""></p>
</template>
<template slot="studentCardUrl" slot-scope="text">
<van-image width="100" height="100" @click="imgClick(text)" :src="apis + text" />
<template slot="idcardImgUrl" slot-scope="text">
<p v-show="text == null">未上传</p>
<p v-show="text == ''">未上传</p>
<van-image v-show="text != null && text != ''" width="100" height="100" @click="imgClick(text)" :src="apis + text" />
<!--<van-image width="100" height="100" @click="imgClick('https://img.yzcdn.cn/vant/cat.jpeg')" src="https://img.yzcdn.cn/vant/cat.jpeg" />-->
</template>
<template slot="schoolCardUrl" slot-scope="text">
<van-image width="100" height="100" @click="imgClick(text)" :src="apis + text" />
<template slot="studentImgUrl" slot-scope="text">
<p v-show="text == null">未上传</p>
<p v-show="text == ''">未上传</p>
<van-image v-show="text != null && text != ''" width="100" height="100" @click="imgClick(text)" :src="apis + text" />
<!--<van-image width="100" height="100" @click="imgClick('https://img.yzcdn.cn/vant/cat.jpeg')" src="https://img.yzcdn.cn/vant/cat.jpeg" />-->
</template>
<template slot="noticeUrl" slot-scope="text">
<van-image width="100" height="100" @click="imgClick(text)" :src="apis + text" />
<!--<van-image width="100" height="100" @click="imgClick('https://img.yzcdn.cn/vant/cat.jpeg')" src="https://img.yzcdn.cn/vant/cat.jpeg" />-->
</template>
<template slot="otherUrl" slot-scope="text">
<!--<van-image width="100" height="100" @click="imgClick(text)" :src="apis + text" />-->
<van-image width="100" height="100" @click="imgClick('https://img.yzcdn.cn/vant/cat.jpeg')" src="https://img.yzcdn.cn/vant/cat.jpeg" />
</template>
<!--<template slot="operation" slot-scope="text,record">
<span>
<a v-if="record.auditState == 1" @click="modifyfunction(record)">审核</a>
......@@ -175,27 +119,12 @@
<a-modal title="审核" :visible="modifyvisible" @ok="createfunctionOk" @cancel="createfunctionCancel" html-type="submit" width="824px">
<!-- 搜索区域 -->
<a-form layout="inline">
<a-form-item label="用户姓名">{{Formtable.userName}}</a-form-item>
<a-form-item label="办理号码">{{Formtable.orderPhone}}</a-form-item>
<br>
<a-form-item label="联系号码">{{Formtable.linkPhone}}</a-form-item>
<a-form-item label="上传资料时间">{{Formtable.uploadDate | dayjs}}</a-form-item>
<br>
<a-form-item label="上传图片1：">
<a v-show="Formtable.studentCardUrl != '' " href="javascript:void(0);" @click="imgClick('https://img.yzcdn.cn/vant/cat.jpeg')">点击查看</a>
</a-form-item>
<a-form-item label="上传图片2">
<a v-show="Formtable.otherImgUrl1 != '' " href="javascript:void(0);" @click="imgClick('https://img.yzcdn.cn/vant/cat.jpeg')">点击查看</a>
</a-form-item>
<a-form-item label="上传图片3">
<a v-show="Formtable.otherImgUrl2 != '' " href="javascript:void(0);" @click="imgClick('https://img.yzcdn.cn/vant/cat.jpeg')">点击查看</a>
</a-form-item>
<br>
<a-form-item label="是否审核通过">
<a-select v-model="Formtable.auditState" style="width: 8rem;">
<a-select-option key="是">是</a-select-option>
<a-select-option key="否">否</a-select-option>
<a-select-option key="无效">无效</a-select-option>
<a-select v-model="Formtable.status" style="width: 8rem;">
<a-select-option key="1">启用</a-select-option>
<a-select-option key="2">冻结</a-select-option>
<a-select-option key="3">删除</a-select-option>
<a-select-option key="4" selectedRowKeys>待审核</a-select-option>
</a-select>
</a-form-item>
</a-form>
......@@ -206,13 +135,12 @@
<script>
import STable from '@/components/table';
import ImportBtn from "../../../components/sysmanage/ImportBtn";
import {list, excelOut,update} from "../../../api/school-center/uploadVerify/studentdwkVerifyKpiAPI"
import {cloneObject, exportFile} from '@/utils/util';
import {list,update,getSchoolNames, initSubstName} from "../../../api/school-center/userManager/newUserAPI"
import {cloneObject} from '@/utils/util';
import ConstantActivity from "@/constant/ConstantActivity";
import Vue from 'vue';
import moment from "moment";
import {DatetimePicker,Dialog} from 'vant';
import {queryById} from "../../../api/school-center/uploadVerify/studentdwkVerifyKpiAPI";
import { Image as VanImage } from 'vant';
Vue.use(VanImage);
......@@ -230,40 +158,32 @@
modifyvisible: false,
Formtable: {
id: '',
userName: '',
orderPhone: '',
linkPhone: '',
auditState: '',
uploadDate: '',
auditDate: '',
studentCardUrl: '',
otherImgUrl1: '',
otherImgUrl2: '',
otherImgUrl3: '',
status: '4',
},
title: ConstantActivity.title,
queryParam: {
userName: '',
orderPhone: '',
linkPhone: '',
auditName: '',
auditState: '',
uploadDate: ['', ''],
auditDate: ['', ''],
account: '',
name: '',
status: '',
substName: '',
salesSchool: '',
createtime: ['', ''],
},
columns: [
{dataIndex: 'userName', width: 60, title: '姓名'},
{dataIndex: 'orderPhone', width: 100, title: '办理号码'},
{dataIndex: 'linkPhone', width: 100, title: '联系号码'},
{dataIndex: 'auditName', width: 100, title: '审核人姓名'},
{dataIndex: 'auditDate', width: 100, title: '审核时间', scopedSlots: {customRender: "auditDate"}},
{ dataIndex: 'auditState',width: 100,title: '是否通过审核',ellipsis: true,scopedSlots: {customRender: "auditState"}},
{dataIndex: 'studentCardUrl', width: 180, title: '学生证封面照片', scopedSlots: {customRender: "studentCardUrl"}},
{dataIndex: 'schoolCardUrl', width: 180, title: '学生证内页照片', scopedSlots: {customRender: "schoolCardUrl"}},
{dataIndex: 'noticeUrl', width: 180, title: '身份证照片', scopedSlots: {customRender: "noticeUrl"}},
{dataIndex: 'otherUrl', width: 180, title: '补充照片', scopedSlots: {customRender: "otherUrl"}},
{dataIndex: 'uploadDate', width: 100, title: '上传时间', scopedSlots: {customRender: "uploadDate"}},
{dataIndex: 'agentBusinessman', width: 60, title: '代理商'},
{dataIndex: 'phone', width: 100, title: '手机'},
{dataIndex: 'name', width: 60, title: '姓名'},
{dataIndex: 'sex', width: 50, title: '性别',scopedSlots: {customRender: "sex"}},
{dataIndex: 'schoolName', width: 100, title: '所属校园'},
{dataIndex: 'grade', width: 60, title: '年级'},
{ dataIndex: 'subName',width: 60,title: '县分'},
{ dataIndex: 'idCard',width: 150,title: '身份证号'},
{dataIndex: 'idcardImgUrl', width: 180, title: '身份证扫描件(正面)', scopedSlots: {customRender: "idcardImgUrl"}},
{dataIndex: 'studentImgUrl', width: 180, title: '学生证', scopedSlots: {customRender: "studentImgUrl"}},
{dataIndex: 'createtime', width: 100, title: '注册时间', scopedSlots: {customRender: "createtime"}},
{dataIndex: 'updateTime', width: 100, title: '修改时间', scopedSlots: {customRender: "updateTime"}},
{dataIndex: 'noticeUrl', width: 120, title: '角色名称'},
{dataIndex: 'position', width: 100, title: '职位'},
{dataIndex: 'status', width: 80, title: '人员状态', scopedSlots: {customRender: "status"}},
],
rowdata: parameter => {
......@@ -296,6 +216,8 @@
})
},
tempMode: ['month', 'month'],
schoolNames: [],
subNames: [],
apis: 'img/',
imgInfo: '',
visiblepicture: false,
......@@ -305,75 +227,22 @@
},
methods: {
moment,
start(auditState) {
console.log(auditState);
start() {
if(this.selectedRowKeys.length == 0){
this.$message.error("请勾选审核项！！！");
return;
}
if(this.selectedRowKeys.length == 1){
queryById({'ids': this.selectedRowKeys}).then(res => {
if (res.state == 'success') {
this.Formtable.id = res.data.id
this.Formtable.userName = res.data.userName
this.Formtable.orderPhone = res.data.orderPhone
this.Formtable.linkPhone = res.data.linkPhone
this.Formtable.uploadDate = res.data.uploadDate
this.Formtable.auditDate = res.data.auditDate
this.Formtable.studentCardUrl = res.data.studentCardUrl
this.Formtable.otherImgUrl1 = res.data.otherImgUrl1
this.Formtable.otherImgUrl2 = res.data.otherImgUrl2
this.Formtable.otherImgUrl3 = res.data.otherImgUrl3
this.Formtable.auditState = '是'
if(res.data.auditState != 1){
Dialog.confirm({
title: '提示',
message: '已审核过，是否重新审核？？？',
}).then(() => {
this.modifyvisible = true;
}).catch(() => {
this.modifyvisible = false;
this.Formtable = [];
return;
});
}else{
this.modifyvisible = true;
}
}
})
}else{
update({'ids': this.selectedRowKeys,'state':auditState}).then(res => {
if (res.state !== 'success') {
this.$message.error("审核失败！", 5);
}else{
setTimeout(() => {
this.loading = false;
this.selectedRowKeys = [];
}, 1000);
this.hasSelected = true;
this.$refs.table.refresh({search: true})
}
})
}
},
onSelectChange(selectedRowKeys) {
console.log('selectedRowKeys changed: ', selectedRowKeys);
this.selectedRowKeys = selectedRowKeys;
if(this.selectedRowKeys.length > 1){
this.hasSelected = true;
}else{
this.hasSelected = false;
}
},
onChange(date, dateString) {
//this.queryParam.uploadDate = dateString;
console.log(dateString);
},
onChange1(date, dateString) {
//this.queryParam.auditDate = dateString;
console.log(dateString);
},
pictureOnClose() {
this.imgInfo = ''
this.visiblepicture = false;
......@@ -382,39 +251,64 @@
this.imgInfo = this.apis + res
this.visiblepicture = true
},
excelOut(state) {
if(state != ''){
this.queryParam.auditState = state;
}
let nowdate = moment().format("YYYY-MM-DD");
//导出
exportFile(
excelOut(this.queryParam),
"大王卡证件稽核清单" + nowdate + ".xlsx",
);
},
createfunctionOk() {
update({'ids': this.selectedRowKeys,'status':this.Formtable.status}).then(res => {
if (res.state !== 'success') {
this.$message.error("审核失败！", 5);
}else{
setTimeout(() => {
this.loading = false;
this.selectedRowKeys = [];
}, 1000);
this.hasSelected = true;
this.modifyvisible=false
this.clearmodel();
this.$refs.table.refresh({search: true})
}
})
},
createfunctionCancel() {
this.modifyvisible=false
this.clearmodel0();
},
clearmodel() {
this.importTile = "";
this.zjlmoBan = false;
this.importUrl = "";
},
search() {
console.log("queryParam.month==================" + this.queryParam);
this.$refs.table.refresh({search: true})
},
getSchoolNames() {
this.queryParam.schoolName = ''
this.schoolNames = []
getSchoolNames({"substName": this.queryParam.substName}).then((res) => {
if (res.state == "success") {
const result = res.data
result.forEach((r) => {
if (r.schoolName === 'null')
return;
this.schoolNames.push({
value: r.schoolName,
text: r.schoolName
})
})
}
})
},
initSubstName() {
initSubstName().then((res) => {
if (res.state == "success") {
const result = res.data
result.forEach((r) => {
if (r.subName === 'null')
return;
this.subNames.push({
value: r.subName,
text: r.subName
})
})
}
})
}
},
mounted() {
this.initSubstName();
this.getSchoolNames();
}
}
</script>
......
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