Skip to content

G
gdtel-gztel-school-center-ui
Commit e86a6437 by 彭祥礼
Options

问题修复

parent 8838d5e6
Showing with 230 additions and 123 deletions
src/api/school-center/louZhang/louZhangManagerAPI.js
...@@ -2,14 +2,15 @@ import {postAction,downFilePost} from '@/api/manage' ...@@ -2,14 +2,15 @@ import {postAction,downFilePost} from '@/api/manage'
const prefix = '/manager/ciop'; const prefix = '/manager/ciop';
//获取县分下拉列表 //获取县分下拉列表
let initSubstName = (params) => postAction(prefix + "/ysmUser/initSubstName" , params); let initSubstName = (params) => postAction(prefix + "/newUser/initSubstName" , params);
//获取学校下拉列表 //获取学校下拉列表
let getSchoolNames = (params) => postAction(prefix + "/ysmUser/getSchoolNames" , params); let getSchoolNames = (params) => postAction(prefix + "/newUser/getSchoolNames" , params);
let uploadExcel = (params) => downFilePost(prefix + "/lzKpi/excelOut" , params); let uploadExcel = (params) => downFilePost(prefix + "/lzKpi/excelOut" , params);
let downloadMoBan = (params) => downFilePost(prefix + "/lzKpi/downloadMoBan" , params); let downloadMoBan = (params) => downFilePost(prefix + "/lzKpi/downloadMoBan" , params);
let lzKpiList = (params) => postAction(prefix + "/lzKpi/list" , params); let lzKpiList = (params) => postAction(prefix + "/lzKpi/list" , params);
let lzKpiDelete = (params) => postAction(prefix + "/lzKpi/delete", params); let lzKpiDelete = (params) => postAction(prefix + "/lzKpi/delete", params);
let lzKpiInsert = (params) => postAction(prefix + "/lzKpi/insert" , params); let lzKpiInsert = (params) => postAction(prefix + "/lzKpi/insert" , params);
let checkAccount = (params) => postAction(prefix + "/lzKpi/checkAccount" , params);
let lzKpiUpdate = (params) => postAction(prefix + "/lzKpi/update",params); let lzKpiUpdate = (params) => postAction(prefix + "/lzKpi/update",params);
export { export {
...@@ -19,6 +20,7 @@ export { ...@@ -19,6 +20,7 @@ export {
downloadMoBan, downloadMoBan,
lzKpiList, lzKpiList,
lzKpiDelete, lzKpiDelete,
checkAccount,
lzKpiInsert, lzKpiInsert,
lzKpiUpdate, lzKpiUpdate,
} }
src/api/school-center/louZhang/lzSalaryManagerAPI.js
...@@ -2,9 +2,9 @@ import {postAction,downFilePost} from '@/api/manage' ...@@ -2,9 +2,9 @@ import {postAction,downFilePost} from '@/api/manage'
const prefix = '/manager/ciop'; const prefix = '/manager/ciop';
//获取县分下拉列表 //获取县分下拉列表
let initSubstName = (params) => postAction(prefix + "/ysmUser/initSubstName" , params); let initSubstName = (params) => postAction(prefix + "/newUser/initSubstName" , params);
//获取学校下拉列表 //获取学校下拉列表
let getSchoolNames = (params) => postAction(prefix + "/ysmUser/getSchoolNames" , params); let getSchoolNames = (params) => postAction(prefix + "/newUser/getSchoolNames" , params);
let uploadExcel = (params) => downFilePost(prefix + "/lzWage/excelOut" , params); let uploadExcel = (params) => downFilePost(prefix + "/lzWage/excelOut" , params);
let downloadMoBan = (params) => downFilePost(prefix + "/lzWage/downloadMoBan" , params); let downloadMoBan = (params) => downFilePost(prefix + "/lzWage/downloadMoBan" , params);
let lzSalaryList = (params) => postAction(prefix + "/lzWage/list" , params); let lzSalaryList = (params) => postAction(prefix + "/lzWage/list" , params);
......
src/api/school-center/louZhang/zjlSalaryManagerAPI.js
...@@ -2,8 +2,8 @@ import {postAction,downFilePost} from '@/api/manage' ...@@ -2,8 +2,8 @@ import {postAction,downFilePost} from '@/api/manage'
const prefix = '/manager/ciop'; const prefix = '/manager/ciop';
// 楼长KPI管理 // 楼长KPI管理
let initSubstName = (params) => postAction(prefix + "/ysmUser/initSubstName" , params); let initSubstName = (params) => postAction(prefix + "/newUser/initSubstName" , params);
let getSchoolNames = (params) => postAction(prefix + "/ysmUser/getSchoolNames" , params); let getSchoolNames = (params) => postAction(prefix + "/newUser/getSchoolNames" , params);
let uploadExcel = (params) => downFilePost(prefix + "/zjlWage/excelOut" , params); let uploadExcel = (params) => downFilePost(prefix + "/zjlWage/excelOut" , params);
let downloadMoBan = (params) => downFilePost(prefix + "/zjlWage/downloadMoBan" , params); let downloadMoBan = (params) => downFilePost(prefix + "/zjlWage/downloadMoBan" , params);
let zjlSalaryList = (params) => postAction(prefix + "/zjlWage/list" , params); let zjlSalaryList = (params) => postAction(prefix + "/zjlWage/list" , params);
......
src/api/school-center/salesListAPI.js
...@@ -2,9 +2,9 @@ import {postAction,getAotion,downFilePost} from '@/api/manage' ...@@ -2,9 +2,9 @@ import {postAction,getAotion,downFilePost} from '@/api/manage'
const prefix = '/manager/ciop'; const prefix = '/manager/ciop';
//获取县分下拉列表 //获取县分下拉列表
let getSubstList = (params) => postAction(prefix + "/ysmUser/initSubstName" , params); let getSubstList = (params) => postAction(prefix + "/newUser/initSubstName" , params);
//获取学校下拉列表 //获取学校下拉列表
let getSchoolList = (params) => postAction(prefix + "/ysmUser/getSchoolNames" , params); let getSchoolList = (params) => postAction(prefix + "/newUser/getSchoolNames" , params);
// 获取活动列表 // 获取活动列表
let getList = (params) => postAction(prefix + "/salesList/list" , params); let getList = (params) => postAction(prefix + "/salesList/list" , params);
// 删除 // 删除
......
src/api/school-center/salesOrderLists/salesCensusAPI.js
...@@ -2,9 +2,9 @@ import {postAction,downFilePost} from '@/api/manage' ...@@ -2,9 +2,9 @@ import {postAction,downFilePost} from '@/api/manage'
const prefix = '/manager/ciop'; const prefix = '/manager/ciop';
//获取县分下拉列表 //获取县分下拉列表
let initSubstName = (params) => postAction(prefix + "/ysmUser/initSubstName" , params); let initSubstName = (params) => postAction(prefix + "/newUser/initSubstName" , params);
//获取学校下拉列表 //获取学校下拉列表
let getSchoolNames = (params) => postAction(prefix + "/ysmUser/getSchoolNames" , params); let getSchoolNames = (params) => postAction(prefix + "/newUser/getSchoolNames" , params);
// 获取充值达标列表 // 获取充值达标列表
let getList = (params) => postAction(prefix + "/saleCensus/list" , params); let getList = (params) => postAction(prefix + "/saleCensus/list" , params);
// 导出放号充值达标清单 // 导出放号充值达标清单
......
src/api/school-center/salesOrderLists/salesOrderAPI.js
...@@ -2,9 +2,9 @@ import {postAction,downFilePost} from '@/api/manage' ...@@ -2,9 +2,9 @@ import {postAction,downFilePost} from '@/api/manage'
const prefix = '/manager/ciop'; const prefix = '/manager/ciop';
//获取县分下拉列表 //获取县分下拉列表
let initSubstName = (params) => postAction(prefix + "/ysmUser/initSubstName" , params); let initSubstName = (params) => postAction(prefix + "/newUser/initSubstName" , params);
//获取学校下拉列表 //获取学校下拉列表
let getSchoolNames = (params) => postAction(prefix + "/ysmUser/getSchoolNames" , params); let getSchoolNames = (params) => postAction(prefix + "/newUser/getSchoolNames" , params);
// 获取充值达标列表 // 获取充值达标列表
let getList = (params) => postAction(prefix + "/salesOrder/list" , params); let getList = (params) => postAction(prefix + "/salesOrder/list" , params);
// 导出放号充值达标清单 // 导出放号充值达标清单
......
src/api/school-center/schoolAllocationAPI.js
...@@ -11,13 +11,6 @@ let addAllocation = (params) => postAction(prefix + "/school/schoolAllocation/ad ...@@ -11,13 +11,6 @@ let addAllocation = (params) => postAction(prefix + "/school/schoolAllocation/ad
// 删除 // 删除
let deleteAllocation = (params) => postAction(prefix + "/school/schoolAllocation/deleteSchoolAllocation" , params); let deleteAllocation = (params) => postAction(prefix + "/school/schoolAllocation/deleteSchoolAllocation" , params);
// 获取县分下拉列表
let getSubstList = (params) => postAction(prefix + "/school/schoolManagement/substList" , params);
// 获取学校下拉列表
let getSchoolList = (params) => postAction(prefix + "/school/schoolManagement/schoolList" , params);
export { export {
getList,addAllocation,deleteAllocation,getSubstList,getSchoolList getList,addAllocation,deleteAllocation
} }
src/api/school-center/userManager/newUserAPI.js
...@@ -2,12 +2,15 @@ import {postAction} from '@/api/manage' ...@@ -2,12 +2,15 @@ import {postAction} from '@/api/manage'
const prefix = '/manager/ciop'; const prefix = '/manager/ciop';
//获取县分下拉列表 //获取县分下拉列表
let initSubstName = (params) => postAction(prefix + "/ysmUser/initSubstName" , params); let initSubstName = (params) => postAction(prefix + "/newUser/initSubstName" , params);
//获取学校下拉列表 //获取学校下拉列表
let getSchoolNames = (params) => postAction(prefix + "/ysmUser/getSchoolNames" , params); let getSchoolNames = (params) => postAction(prefix + "/newUser/getSchoolNames" , params);
//初始用户信息
let initUsers = (params) => postAction(prefix + "/newUser/initUsers" , params);
let list = (params) => postAction(prefix + "/newUser/list" , params); let list = (params) => postAction(prefix + "/newUser/list" , params);
let update = (params) => postAction(prefix + "/newUser/update" , params); let update = (params) => postAction(prefix + "/newUser/update" , params);
export { export {
initUsers,
initSubstName, initSubstName,
getSchoolNames, getSchoolNames,
list, list,
......
src/api/school-center/yxtManager/yxtOrderAPI.js
...@@ -2,9 +2,9 @@ import {postAction,downFilePost} from '@/api/manage' ...@@ -2,9 +2,9 @@ import {postAction,downFilePost} from '@/api/manage'
const prefix = '/manager/ciop'; const prefix = '/manager/ciop';
//获取县分下拉列表 //获取县分下拉列表
let initSubstName = (params) => postAction(prefix + "/ysmUser/initSubstName" , params); let initSubstName = (params) => postAction(prefix + "/newUser/initSubstName" , params);
//获取学校下拉列表 //获取学校下拉列表
let getSchoolNames = (params) => postAction(prefix + "/ysmUser/getSchoolNames" , params); let getSchoolNames = (params) => postAction(prefix + "/newUser/getSchoolNames" , params);
let uploadExcel = (params) => downFilePost(prefix + "/yxtOrder/excelOut" , params); let uploadExcel = (params) => downFilePost(prefix + "/yxtOrder/excelOut" , params);
let downloadMoBan = (params) => downFilePost(prefix + "/yxtOrder/downloadMoBan" , params); let downloadMoBan = (params) => downFilePost(prefix + "/yxtOrder/downloadMoBan" , params);
......
src/views/school-center/louZhang/louZhangKPI.vue
...@@ -117,7 +117,7 @@ ...@@ -117,7 +117,7 @@
<a-input placeholder="姓名" v-decorator="[ 'sysuName', {rules: [{ required: true, message: '姓名不能为空！' }]} ]" :disabled="isdisabled"/> <a-input placeholder="姓名" v-decorator="[ 'sysuName', {rules: [{ required: true, message: '姓名不能为空！' }]} ]" :disabled="isdisabled"/>
</a-form-item> </a-form-item>
<a-form-item :labelCol="{span: 5}" :wrapperCol="{span: 9, offset: 1}" label="账号："> <a-form-item :labelCol="{span: 5}" :wrapperCol="{span: 9, offset: 1}" label="账号：">
<a-input placeholder="账号" v-decorator="[ 'account', {rules: [{ required: true, message: '账号不能为空！' }]} ]" :disabled="isdisabled"/> <a-input placeholder="账号" v-decorator="[ 'account', {rules: [{ required: true, message: '账号不能为空！'}]} ]" :disabled="isdisabled"/>
</a-form-item> </a-form-item>
<a-form-item :labelCol="{span: 5}" :wrapperCol="{span: 9, offset: 1}" label="汇总任务量(满分:30)："> <a-form-item :labelCol="{span: 5}" :wrapperCol="{span: 9, offset: 1}" label="汇总任务量(满分:30)：">
<a-input-number <a-input-number
...@@ -169,7 +169,7 @@ ...@@ -169,7 +169,7 @@
disabled/> disabled/>
</a-form-item> </a-form-item>
<a-form-item v-show="add" :labelCol="{span: 5}" :wrapperCol="{span: 9, offset: 1}" label="KPI月份："> <a-form-item v-show="add" :labelCol="{span: 5}" :wrapperCol="{span: 9, offset: 1}" label="KPI月份：">
<a-month-picker @change="onChange" placeholder="选择KPI月份" v-decorator="[ 'month' ]" style="width: 20rem;"/> <a-month-picker @change="onChange" placeholder="选择KPI月份" v-decorator="[ 'month' , {rules: [{required: true, message: 'KPI月份不能为空！' }]}]" style="width: 20rem;"/>
</a-form-item> </a-form-item>
<a-form-item v-show="false" :labelCol="{span: 5}" :wrapperCol="{span: 9, offset: 1}" label="是否删除："> <a-form-item v-show="false" :labelCol="{span: 5}" :wrapperCol="{span: 9, offset: 1}" label="是否删除：">
<a-select v-decorator="['isDel']" style="width: 330px"> <a-select v-decorator="['isDel']" style="width: 330px">
...@@ -187,7 +187,7 @@ ...@@ -187,7 +187,7 @@
import ImportBtn from "../../../components/sysmanage/ImportBtn"; import ImportBtn from "../../../components/sysmanage/ImportBtn";
import { import {
lzKpiList, lzKpiDelete, lzKpiInsert, lzKpiUpdate, lzKpiList, lzKpiDelete, lzKpiInsert, lzKpiUpdate,
getSchoolNames, initSubstName, uploadExcel, downloadMoBan getSchoolNames, initSubstName, uploadExcel, downloadMoBan, checkAccount
} from "../../../api/school-center/louZhang/louZhangManagerAPI" } from "../../../api/school-center/louZhang/louZhangManagerAPI"
import {cloneObject, exportFile} from '@/utils/util'; import {cloneObject, exportFile} from '@/utils/util';
import Vue from 'vue'; import Vue from 'vue';
...@@ -406,6 +406,12 @@ ...@@ -406,6 +406,12 @@
if (this.add) { if (this.add) {
let obj = that.modelData; let obj = that.modelData;
delete obj.id delete obj.id
checkAccount({"account":obj.account}).then((res) => {
if (res.state != "success") {
this.$message.error(res.msg);
return;
}
})
let lzKpi = JSON.stringify(obj); let lzKpi = JSON.stringify(obj);
lzKpiInsert({lzKpi}).then((res) => { lzKpiInsert({lzKpi}).then((res) => {
this.modifyvisible = false; this.modifyvisible = false;
......
src/views/school-center/louZhang/lzSalary.vue
...@@ -117,7 +117,7 @@ ...@@ -117,7 +117,7 @@
<p v-else=""></p> <p v-else=""></p>
</template> </template>
<template slot="minGanZi" slot-scope="text"> <template slot="minGanZi" slot-scope="text">
{{ text.substring(0,2)+'**'}} {{ text.substring(0,1)+'**'+text.substring(2)}}
</template> </template>
<template slot="operation" slot-scope="text,record"> <template slot="operation" slot-scope="text,record">
<span> <span>
......
src/views/school-center/louZhang/managerKpi.vue
...@@ -13,11 +13,13 @@ ...@@ -13,11 +13,13 @@
<a-col :md="6" :sm="12"> <a-col :md="6" :sm="12">
<a-form-item label="月份"> <a-form-item label="月份">
<a-range-picker <a-range-picker
showTime
:placeholder="['开始月份', '结束月份']" :placeholder="['开始月份', '结束月份']"
format="YYYYMM" format="YYYYMM"
:value="queryParam.month" :value="queryParam.month"
:mode="tempMode" :mode="tempMode"
@panelChange="handlePanelChange" @panelChange="handlePanelChange"
@ok="onOk"
style="width: 16rem;" style="width: 16rem;"
/> />
</a-form-item> </a-form-item>
...@@ -128,6 +130,8 @@ ...@@ -128,6 +130,8 @@
title: ConstantActivity.title, title: ConstantActivity.title,
queryParam: { queryParam: {
name: '', name: '',
beginTime: '',
endTime: '',
month: ['', ''], month: ['', ''],
}, },
modelData: { modelData: {
...@@ -208,6 +212,10 @@ ...@@ -208,6 +212,10 @@
this.tempMode = [mode[0] === 'date' ? 'month' : mode[0], mode[1] === 'date' ? 'month' : mode[1]]; this.tempMode = [mode[0] === 'date' ? 'month' : mode[0], mode[1] === 'date' ? 'month' : mode[1]];
//console.log("this.tempMode=================="+this.tempMode); //console.log("this.tempMode=================="+this.tempMode);
}, },
onOk(value) {
this.queryParam.month = value;
console.log('onOk: ', value);
},
excelOut() { excelOut() {
let params = { let params = {
pageNo: 1, pageNo: 1,
...@@ -229,7 +237,7 @@ ...@@ -229,7 +237,7 @@
this.zjlkpivisible = true this.zjlkpivisible = true
}, },
downloadMoBan: function () { downloadMoBan: function () {
exportFile(downloadMoBan(), "总经理KPI信息.xlsx"); exportFile(downloadMoBan(), "总经理KPI信息模板.xlsx");
}, },
doPush(res) { doPush(res) {
console.log(res); console.log(res);
...@@ -243,6 +251,7 @@ ...@@ -243,6 +251,7 @@
return false; return false;
} }
this.$message.success("上传成功！" + response.data, 5); this.$message.success("上传成功！" + response.data, 5);
this.$refs.table.refresh({search: true})
}, },
createfunctionOk() { createfunctionOk() {
......
src/views/school-center/louZhang/zjlSalary.vue
...@@ -13,12 +13,14 @@ ...@@ -13,12 +13,14 @@
<a-col :md="6" :sm="12"> <a-col :md="6" :sm="12">
<a-form-item label="月份"> <a-form-item label="月份">
<a-range-picker <a-range-picker
:placeholder="['开始月份', '结束月份']" showTime
format="YYYYMM" :placeholder="['开始月份', '结束月份']"
:value="queryParam.month" format="YYYYMM"
:mode="tempMode" :value="queryParam.month"
@panelChange="handlePanelChange" :mode="tempMode"
style="width: 16rem;" @panelChange="handlePanelChange"
@ok="onOk"
style="width: 16rem;"
/> />
</a-form-item> </a-form-item>
</a-col> </a-col>
...@@ -247,6 +249,10 @@ ...@@ -247,6 +249,10 @@
this.tempMode = [mode[0] === 'date' ? 'month' : mode[0], mode[1] === 'date' ? 'month' : mode[1]]; this.tempMode = [mode[0] === 'date' ? 'month' : mode[0], mode[1] === 'date' ? 'month' : mode[1]];
//console.log("this.tempMode=================="+this.tempMode); //console.log("this.tempMode=================="+this.tempMode);
}, },
onOk(value) {
this.queryParam.month = value;
console.log('onOk: ', value);
},
excelOut() { excelOut() {
let params = { let params = {
pageNo: 1, pageNo: 1,
......
src/views/school-center/productManagement/exchangeCoupon.vue
...@@ -119,17 +119,13 @@ ...@@ -119,17 +119,13 @@
<a-modal :title="add ?'添加正则配置': '编辑正则配置'" :visible="modifyvisible" @ok="createfunctionOk" @cancel="createfunctionCancel" html-type="submit" width="1024px"> <a-modal :title="add ?'添加正则配置': '编辑正则配置'" :visible="modifyvisible" @ok="createfunctionOk" @cancel="createfunctionCancel" html-type="submit" width="1024px">
<a-form :form="Formtable"> <a-form :form="Formtable">
<a-form-item :labelCol="{span: 5}" :wrapperCol="{span: 9, offset: 1}" label="兑换券账号："> <a-form-item :labelCol="{span: 5}" :wrapperCol="{span: 9, offset: 1}" label="兑换券账号：">
<a-input placeholder="兑换券账号" <a-input placeholder="兑换券账号" v-decorator="[ 'cardNumber', {rules: [{ required: true, message: '兑换券账号不能为空！' }]} ]"/>
v-decorator="[ 'cardNumber', {rules: [{ required: true, message: '兑换券账号不能为空！' }]} ]"/>
</a-form-item> </a-form-item>
<a-form-item :labelCol="{span: 5}" :wrapperCol="{span: 9, offset: 1}" label="密码："> <a-form-item :labelCol="{span: 5}" :wrapperCol="{span: 9, offset: 1}" label="密码：">
<a-input placeholder="密码" <a-input placeholder="密码" v-decorator="[ 'password', {rules: [{ required: true, message: '密码不能为空！' }]} ]"/>
v-decorator="[ 'password', {rules: [{ required: true, message: '密码不能为空！' }]} ]"/>
</a-form-item> </a-form-item>
<a-form-item :labelCol="{span: 5}" :wrapperCol="{span: 9, offset: 1}" label="有效截止日期："> <a-form-item :labelCol="{span: 5}" :wrapperCol="{span: 9, offset: 1}" label="有效截止日期：">
<a-date-picker @change="onChange" placeholder="有效截止日期" <a-date-picker @change="onChange" placeholder="有效截止日期" v-decorator="[ 'validityPeriod', {rules: [{ required: true, message: '有效截止日期不能为空！' }]} ]" style="width: 20rem;"/>
v-decorator="[ 'validityPeriod', {rules: [{ required: true, message: '有效截止日期不能为空！' }]} ]"
style="width: 20rem;"/>
</a-form-item> </a-form-item>
</a-form> </a-form>
</a-modal> </a-modal>
......
src/views/school-center/schoolmanager/schoolmanagement.vue
...@@ -10,14 +10,22 @@ ...@@ -10,14 +10,22 @@
<a-input placeholder="网点名称" v-model="queryParam.networkName"></a-input> <a-input placeholder="网点名称" v-model="queryParam.networkName"></a-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :md="4" :sm="12"> <a-col :md="3" :sm="6">
<a-form-item label="县分："> <a-form-item label="县分">
<a-input placeholder="县分" v-model="queryParam.subName"></a-input> <a-select v-model="queryParam.subName" @change="getSchoolNames" style="width: 8rem;">
<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-form-item>
</a-col> </a-col>
<a-col :md="4" :sm="12"> <a-col :md="5" :sm="10">
<a-form-item label="学校名称"> <a-form-item label="学校">
<a-input placeholder="学校名称" v-model="queryParam.schoolName"></a-input> <a-select v-model="queryParam.schoolName" 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-form-item>
</a-col> </a-col>
<a-col :md="6" :sm="12"> <a-col :md="6" :sm="12">
...@@ -169,6 +177,7 @@ ...@@ -169,6 +177,7 @@
import STable from '@/components/table'; import STable from '@/components/table';
import {findByList,choosepages,modify,insert,hidestatus} from "@/api/school-center/schoolManagermentAPI" import {findByList,choosepages,modify,insert,hidestatus} from "@/api/school-center/schoolManagermentAPI"
import {cloneObject} from '@/utils/util'; import {cloneObject} from '@/utils/util';
import {getSchoolNames, initSubstName} from "../../../api/school-center/userManager/newUserAPI";
export default { export default {
name: "schoolmanagement", name: "schoolmanagement",
components: { components: {
...@@ -205,6 +214,8 @@ ...@@ -205,6 +214,8 @@
isRecv:"", isRecv:"",
chosePages:"" chosePages:""
}, },
subNames: [],
schoolNames: [],
subNameList: [], subNameList: [],
packageName:[], packageName:[],
chosePages:[], chosePages:[],
...@@ -212,8 +223,8 @@ ...@@ -212,8 +223,8 @@
//输入框列表 //输入框列表
queryParam: { queryParam: {
networkName: '', networkName: '',
subName: '',
status: '', status: '',
subName: '',
schoolName: '', schoolName: '',
}, },
modifyvisible: false, modifyvisible: false,
...@@ -496,9 +507,43 @@ ...@@ -496,9 +507,43 @@
this.modifyForm.chosePages="" this.modifyForm.chosePages=""
this.chosePages.splice(0,this.chosePages.length) this.chosePages.splice(0,this.chosePages.length)
this.modifyvisible=false; this.modifyvisible=false;
},
getSchoolNames() {
this.schoolNames = []
this.queryParam.schoolName = ''
getSchoolNames({"substName": this.queryParam.subName}).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
})
})
}
})
} }
}, },
created(){ mounted() {
this.initSubstName();
this.getSchoolNames();
} }
} }
</script> </script>
......
src/views/school-center/userManager/schoolAllocation.vue
...@@ -5,20 +5,32 @@ ...@@ -5,20 +5,32 @@
<!-- 搜索区域 --> <!-- 搜索区域 -->
<a-form layout="inline"> <a-form layout="inline">
<a-row :gutter="24"> <a-row :gutter="24">
<a-col :md="4" :sm="12"> <a-col :md="3" :sm="6">
<a-form-item label="账号">
<a-input placeholder="账号" v-model="queryParam.account"></a-input>
</a-form-item>
</a-col>
<a-col :md="3" :sm="6">
<a-form-item label="姓名"> <a-form-item label="姓名">
<a-input placeholder="姓名" v-model="queryParam.name"></a-input> <a-input placeholder="姓名" v-model="queryParam.name"></a-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :md="3" :sm="6">
<a-col :md="4" :sm="12"> <a-form-item label="县分">
<a-form-item label="县分"> <a-select v-model="queryParam.substName" @change="getSchoolNames">
<a-input placeholder="县分" v-model="queryParam.substName"></a-input> <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-form-item>
</a-col> </a-col>
<a-col :md="4" :sm="12"> <a-col :md="5" :sm="10">
<a-form-item label="学校"> <a-form-item label="学校">
<a-input placeholder="学校" v-model="queryParam.schoolName"></a-input> <a-select v-model="queryParam.schoolName" 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-form-item>
</a-col> </a-col>
<span class="table-page-search-submitButtons" style="float: left; overflow: hidden;"> <span class="table-page-search-submitButtons" style="float: left; overflow: hidden;">
...@@ -42,28 +54,23 @@ ...@@ -42,28 +54,23 @@
</s-table> </s-table>
<!--编辑----弹框--> <!--编辑----弹框-->
<a-modal :title="titleName" :visible="modifyvisible" @ok="createfunctionOk" @cancel="createfunctionCancel" html-type="submit" width="720px"> <a-modal :title="titleName" :visible="modifyvisible" @ok="createfunctionOk" @cancel="createfunctionCancel" html-type="submit" width="720px" height="1600px">
<a-form :form="Formtable"> <a-form :form="Formtable">
<a-form-item :labelCol="{span: 6}" :wrapperCol="{span: 8, offset: 1}" label="账号">
<a-form-item :labelCol="{span: 6}" :wrapperCol="{span: 8, offset: 1}" label="账号"> <a-select mode="tags" v-model="modifyForm.account" placeholder="请选择账号" @change="handleChange">
<a-input placeholder="账号" v-decorator="[ 'account', {rules: [{ required: true, message: '账号不能为空！' ,whitespace:true}]} ]"></a-input> <a-select-option v-for="d in userList" :value="d.account">{{ d.name}}</a-select-option>
</a-select>
</a-form-item> </a-form-item>
<a-form-item :labelCol="{span: 6}" :wrapperCol="{span: 8, offset: 1}" label="县分"> <a-form-item :labelCol="{span: 6}" :wrapperCol="{span: 8, offset: 1}" label="县分">
<a-select placeholder="请选择" @change="changeSubst()" v-model="modifyForm.subName" > <a-select placeholder="请选择" @change="getSchoolNames2" v-model="modifyForm.subName" >
<a-select-option key="">请选择</a-select-option> <a-select-option key="">请选择</a-select-option>
<a-select-option v-for="data in subNameList" :value="data"> <a-select-option v-for="d in subNames2" :value="d.value">{{ d.text}}</a-select-option>
{{ data}}
</a-select-option>
</a-select> </a-select>
</a-form-item> </a-form-item>
<a-form-item :labelCol="{span: 6}" :wrapperCol="{span: 8, offset: 1}" label="学校名称"> <a-form-item :labelCol="{span: 6}" :wrapperCol="{span: 8, offset: 1}" label="学校名称">
<a-select placeholder="请选择" v-model="modifyForm.schoolId"> <a-select placeholder="请选择" v-model="modifyForm.schoolId">
<a-select-option key="">请选择</a-select-option> <a-select-option key="">请选择</a-select-option>
<a-select-option v-for="data in schoolList" :value="data.id"> <a-select-option v-for="d in schoolNames2" :value="d.id">{{ d.schoolName}}</a-select-option>
{{ data.school_name}}
</a-select-option>
</a-select> </a-select>
</a-form-item> </a-form-item>
...@@ -75,13 +82,11 @@ ...@@ -75,13 +82,11 @@
<script> <script>
import STable from '@/components/table'; import STable from '@/components/table';
import { import {getList,addAllocation,deleteAllocation} from "../../../api/school-center/schoolAllocationAPI"
getList,addAllocation,
deleteAllocation,getSubstList,getSchoolList
} from "@/api/school-center/schoolAllocationAPI"
import {cloneObject} from '@/utils/util' import {cloneObject} from '@/utils/util'
import treecheck from '@/components/sysmanage/treeCheck' import treecheck from '@/components/sysmanage/treeCheck'
import treeList from '@/components/sysmanage/treeList' import treeList from '@/components/sysmanage/treeList'
import {getSchoolNames, initSubstName, initUsers} from "../../../api/school-center/userManager/newUserAPI";
export default { export default {
name: "schoolAllocation", name: "schoolAllocation",
...@@ -98,17 +103,22 @@ ...@@ -98,17 +103,22 @@
account: '', account: '',
name: '', name: '',
substName:'', substName:'',
schoolName:'' schoolName: '',
}, },
titleName: '', titleName: '',
modifyvisible:false, modifyvisible:false,
subNames: [],
schoolNames: [],
userList:[],
subNames2: [],
schoolNames2: [],
modifyForm: { modifyForm: {
id: '', id: '',
subName: '',
account: '', account: '',
schoolId: '', schoolId: '',
}, },
autoCompleteResult:[], autoCompleteResult:[],
subNameList: [],
schoolList:[], schoolList:[],
addSubName:'', addSubName:'',
columns: [ columns: [
...@@ -133,16 +143,6 @@ ...@@ -133,16 +143,6 @@
//表示 //表示
let obj = cloneObject(this.queryParam) let obj = cloneObject(this.queryParam)
this.subNameList = [];
// 获取县分下拉清单
getSubstList(Object.assign(params,obj)).then(res => {
if (res.state == 'success') {
res.data.forEach((key)=>{
this.subNameList.push(key.sub_name)
})
}
})
return getList(Object.assign(params,obj)).then(res => { return getList(Object.assign(params,obj)).then(res => {
let data = {} let data = {}
if (res.state !== 'success') { if (res.state !== 'success') {
...@@ -171,18 +171,6 @@ ...@@ -171,18 +171,6 @@
} }
}, },
methods:{ methods:{
onLoad(){
let params = [];
params.substName = "";
// 获取县分下拉清单
getSubstList(params).then(res => {
if (res.state == 'success') {
res.data.forEach((key)=>{
this.subNameList.push(key.sub_name)
})
}
})
},
search() { search() {
this.$refs.table.refresh({search: true}) this.$refs.table.refresh({search: true})
}, },
...@@ -190,13 +178,15 @@ ...@@ -190,13 +178,15 @@
this.titleName = "添加学校分配"; this.titleName = "添加学校分配";
this.modifyvisible = true; this.modifyvisible = true;
}, },
handleChange(value) {
this.modifyForm.account = value
console.log(`selected ${value}`);
},
//提交表单 //提交表单
createfunctionOk(){ createfunctionOk(){
this.Formtable.validateFields(["account"], {force: true}, (err, values)=>{ this.Formtable.validateFields(["account"], {force: true}, (err, values)=>{
if (!err){ if (!err){
this.modifyForm.account=values.account addAllocation({"account":this.modifyForm.account,"schoolId":this.modifyForm.schoolId}).then(res=>{
addAllocation(this.modifyForm).then(res=>{
if (res.state=="success") { if (res.state=="success") {
this.$message.success(res.data ? res.data : '添加成功！', 5); this.$message.success(res.data ? res.data : '添加成功！', 5);
this.search(); this.search();
...@@ -231,35 +221,92 @@ ...@@ -231,35 +221,92 @@
} }
}) })
}, },
changeSubst(){ getSchoolNames() {
let schoolParams = {}; this.schoolNames = []
schoolParams.substName = this.modifyForm.subName; this.queryParam.schoolName = ''
this.schoolList = []; getSchoolNames({"substName": this.queryParam.substName}).then((res) => {
if (res.state == "success") {
getSchoolList(schoolParams).then(res => { const result = res.data
if (res.state == 'success') { result.forEach((r) => {
res.data.forEach((key) => { if (r.schoolName === 'null')
this.schoolList.push(key) return;
this.schoolNames.push({
value: r.schoolName,
text: r.schoolName
})
}) })
} }
}) })
}, },
changeSchool(schoolId){ initSubstName() {
let schoolParams = {}; initSubstName().then((res) => {
schoolParams.substName = this.modifyForm.subName; if (res.state == "success") {
this.schoolList = []; const result = res.data
result.forEach((r) => {
getSchoolList(schoolParams).then(res => { if (r.subName === 'null')
if (res.state == 'success') { return;
res.data.forEach((key) => { this.subNames.push({
this.schoolList.push(key) value: r.subName,
text: r.subName
})
}) })
this.modifyForm.schoolId = schoolId;
} }
}) })
}, },
getSchoolNames2() {
this.schoolNames2 = []
this.modifyForm.schoolId = ''
getSchoolNames({"substName": this.modifyForm.subName}).then((res) => {
if (res.state == "success") {
const result = res.data
result.forEach((r) => {
if (r.schoolName === 'null')
return;
this.schoolNames2.push({
id: r.id,
schoolName: r.schoolName
})
})
}
})
},
initSubstName2() {
initSubstName().then((res) => {
if (res.state == "success") {
const result = res.data
result.forEach((r) => {
if (r.subName === 'null')
return;
this.subNames2.push({
value: r.subName,
text: r.subName
})
})
}
})
},
initUsers(){
initUsers().then((res) => {
if (res.state == "success") {
const result = res.data
result.forEach((r) => {
if (r.name === 'null')
return;
this.userList.push({
account: r.account,
name: r.name
})
})
}
})
}
},
mounted() {
this.initUsers();
this.initSubstName();
this.getSchoolNames();
this.initSubstName2();
this.getSchoolNames2();
} }
} }
</script> </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