Skip to content

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

问题修复

parent 8838d5e6
Showing with 110 additions and 50 deletions
src/api/school-center/louZhang/louZhangManagerAPI.js
......@@ -2,14 +2,15 @@ import {postAction,downFilePost} from '@/api/manage'
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 downloadMoBan = (params) => downFilePost(prefix + "/lzKpi/downloadMoBan" , params);
let lzKpiList = (params) => postAction(prefix + "/lzKpi/list" , params);
let lzKpiDelete = (params) => postAction(prefix + "/lzKpi/delete", 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);
export {
......@@ -19,6 +20,7 @@ export {
downloadMoBan,
lzKpiList,
lzKpiDelete,
checkAccount,
lzKpiInsert,
lzKpiUpdate,
}
src/api/school-center/louZhang/lzSalaryManagerAPI.js
......@@ -2,9 +2,9 @@ import {postAction,downFilePost} from '@/api/manage'
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 downloadMoBan = (params) => downFilePost(prefix + "/lzWage/downloadMoBan" , 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'
const prefix = '/manager/ciop';
// 楼长KPI管理
let initSubstName = (params) => postAction(prefix + "/ysmUser/initSubstName" , params);
let getSchoolNames = (params) => postAction(prefix + "/ysmUser/getSchoolNames" , params);
let initSubstName = (params) => postAction(prefix + "/newUser/initSubstName" , params);
let getSchoolNames = (params) => postAction(prefix + "/newUser/getSchoolNames" , params);
let uploadExcel = (params) => downFilePost(prefix + "/zjlWage/excelOut" , params);
let downloadMoBan = (params) => downFilePost(prefix + "/zjlWage/downloadMoBan" , 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'
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);
// 删除
......
src/api/school-center/salesOrderLists/salesCensusAPI.js
......@@ -2,9 +2,9 @@ import {postAction,downFilePost} from '@/api/manage'
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);
// 导出放号充值达标清单
......
src/api/school-center/salesOrderLists/salesOrderAPI.js
......@@ -2,9 +2,9 @@ import {postAction,downFilePost} from '@/api/manage'
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);
// 导出放号充值达标清单
......
src/api/school-center/schoolAllocationAPI.js
......@@ -11,13 +11,6 @@ let addAllocation = (params) => postAction(prefix + "/school/schoolAllocation/ad
// 删除
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 {
getList,addAllocation,deleteAllocation,getSubstList,getSchoolList
getList,addAllocation,deleteAllocation
}
src/api/school-center/userManager/newUserAPI.js
......@@ -2,12 +2,15 @@ import {postAction} from '@/api/manage'
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 update = (params) => postAction(prefix + "/newUser/update" , params);
export {
initUsers,
initSubstName,
getSchoolNames,
list,
......
src/api/school-center/yxtManager/yxtOrderAPI.js
......@@ -2,9 +2,9 @@ import {postAction,downFilePost} from '@/api/manage'
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 downloadMoBan = (params) => downFilePost(prefix + "/yxtOrder/downloadMoBan" , params);
......
src/views/school-center/louZhang/louZhangKPI.vue
......@@ -117,7 +117,7 @@
<a-input placeholder="姓名" v-decorator="[ 'sysuName', {rules: [{ required: true, message: '姓名不能为空！' }]} ]" :disabled="isdisabled"/>
</a-form-item>
<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 :labelCol="{span: 5}" :wrapperCol="{span: 9, offset: 1}" label="汇总任务量(满分:30)：">
<a-input-number
......@@ -169,7 +169,7 @@
disabled/>
</a-form-item>
<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 v-show="false" :labelCol="{span: 5}" :wrapperCol="{span: 9, offset: 1}" label="是否删除：">
<a-select v-decorator="['isDel']" style="width: 330px">
......@@ -187,7 +187,7 @@
import ImportBtn from "../../../components/sysmanage/ImportBtn";
import {
lzKpiList, lzKpiDelete, lzKpiInsert, lzKpiUpdate,
getSchoolNames, initSubstName, uploadExcel, downloadMoBan
getSchoolNames, initSubstName, uploadExcel, downloadMoBan, checkAccount
} from "../../../api/school-center/louZhang/louZhangManagerAPI"
import {cloneObject, exportFile} from '@/utils/util';
import Vue from 'vue';
......@@ -406,6 +406,12 @@
if (this.add) {
let obj = that.modelData;
delete obj.id
checkAccount({"account":obj.account}).then((res) => {
if (res.state != "success") {
this.$message.error(res.msg);
return;
}
})
let lzKpi = JSON.stringify(obj);
lzKpiInsert({lzKpi}).then((res) => {
this.modifyvisible = false;
......
src/views/school-center/louZhang/lzSalary.vue
......@@ -117,7 +117,7 @@
<p v-else=""></p>
</template>
<template slot="minGanZi" slot-scope="text">
{{ text.substring(0,2)+'**'}}
{{ text.substring(0,1)+'**'+text.substring(2)}}
</template>
<template slot="operation" slot-scope="text,record">
<span>
......
src/views/school-center/louZhang/managerKpi.vue
......@@ -13,11 +13,13 @@
<a-col :md="6" :sm="12">
<a-form-item label="月份">
<a-range-picker
showTime
:placeholder="['开始月份', '结束月份']"
format="YYYYMM"
:value="queryParam.month"
:mode="tempMode"
@panelChange="handlePanelChange"
@ok="onOk"
style="width: 16rem;"
/>
</a-form-item>
......@@ -128,6 +130,8 @@
title: ConstantActivity.title,
queryParam: {
name: '',
beginTime: '',
endTime: '',
month: ['', ''],
},
modelData: {
......@@ -208,6 +212,10 @@
this.tempMode = [mode[0] === 'date' ? 'month' : mode[0], mode[1] === 'date' ? 'month' : mode[1]];
//console.log("this.tempMode=================="+this.tempMode);
},
onOk(value) {
this.queryParam.month = value;
console.log('onOk: ', value);
},
excelOut() {
let params = {
pageNo: 1,
......@@ -229,7 +237,7 @@
this.zjlkpivisible = true
},
downloadMoBan: function () {
exportFile(downloadMoBan(), "总经理KPI信息.xlsx");
exportFile(downloadMoBan(), "总经理KPI信息模板.xlsx");
},
doPush(res) {
console.log(res);
......@@ -243,6 +251,7 @@
return false;
}
this.$message.success("上传成功！" + response.data, 5);
this.$refs.table.refresh({search: true})
},
createfunctionOk() {
......
src/views/school-center/louZhang/zjlSalary.vue
......@@ -13,12 +13,14 @@
<a-col :md="6" :sm="12">
<a-form-item label="月份">
<a-range-picker
:placeholder="['开始月份', '结束月份']"
format="YYYYMM"
:value="queryParam.month"
:mode="tempMode"
@panelChange="handlePanelChange"
style="width: 16rem;"
showTime
:placeholder="['开始月份', '结束月份']"
format="YYYYMM"
:value="queryParam.month"
:mode="tempMode"
@panelChange="handlePanelChange"
@ok="onOk"
style="width: 16rem;"
/>
</a-form-item>
</a-col>
......@@ -247,6 +249,10 @@
this.tempMode = [mode[0] === 'date' ? 'month' : mode[0], mode[1] === 'date' ? 'month' : mode[1]];
//console.log("this.tempMode=================="+this.tempMode);
},
onOk(value) {
this.queryParam.month = value;
console.log('onOk: ', value);
},
excelOut() {
let params = {
pageNo: 1,
......
src/views/school-center/productManagement/exchangeCoupon.vue
......@@ -119,17 +119,13 @@
<a-modal :title="add ?'添加正则配置': '编辑正则配置'" :visible="modifyvisible" @ok="createfunctionOk" @cancel="createfunctionCancel" html-type="submit" width="1024px">
<a-form :form="Formtable">
<a-form-item :labelCol="{span: 5}" :wrapperCol="{span: 9, offset: 1}" label="兑换券账号：">
<a-input placeholder="兑换券账号"
v-decorator="[ 'cardNumber', {rules: [{ required: true, message: '兑换券账号不能为空！' }]} ]"/>
<a-input placeholder="兑换券账号" v-decorator="[ 'cardNumber', {rules: [{ required: true, message: '兑换券账号不能为空！' }]} ]"/>
</a-form-item>
<a-form-item :labelCol="{span: 5}" :wrapperCol="{span: 9, offset: 1}" label="密码：">
<a-input placeholder="密码"
v-decorator="[ 'password', {rules: [{ required: true, message: '密码不能为空！' }]} ]"/>
<a-input placeholder="密码" v-decorator="[ 'password', {rules: [{ required: true, message: '密码不能为空！' }]} ]"/>
</a-form-item>
<a-form-item :labelCol="{span: 5}" :wrapperCol="{span: 9, offset: 1}" label="有效截止日期：">
<a-date-picker @change="onChange" placeholder="有效截止日期"
v-decorator="[ 'validityPeriod', {rules: [{ required: true, message: '有效截止日期不能为空！' }]} ]"
style="width: 20rem;"/>
<a-date-picker @change="onChange" placeholder="有效截止日期" v-decorator="[ 'validityPeriod', {rules: [{ required: true, message: '有效截止日期不能为空！' }]} ]" style="width: 20rem;"/>
</a-form-item>
</a-form>
</a-modal>
......
src/views/school-center/schoolmanager/schoolmanagement.vue
......@@ -10,14 +10,22 @@
<a-input placeholder="网点名称" v-model="queryParam.networkName"></a-input>
</a-form-item>
</a-col>
<a-col :md="4" :sm="12">
<a-form-item label="县分：">
<a-input placeholder="县分" v-model="queryParam.subName"></a-input>
<a-col :md="3" :sm="6">
<a-form-item label="县分">
<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-col>
<a-col :md="4" :sm="12">
<a-form-item label="学校名称">
<a-input placeholder="学校名称" v-model="queryParam.schoolName"></a-input>
<a-col :md="5" :sm="10">
<a-form-item label="学校">
<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-col>
<a-col :md="6" :sm="12">
......@@ -169,6 +177,7 @@
import STable from '@/components/table';
import {findByList,choosepages,modify,insert,hidestatus} from "@/api/school-center/schoolManagermentAPI"
import {cloneObject} from '@/utils/util';
import {getSchoolNames, initSubstName} from "../../../api/school-center/userManager/newUserAPI";
export default {
name: "schoolmanagement",
components: {
......@@ -205,6 +214,8 @@
isRecv:"",
chosePages:""
},
subNames: [],
schoolNames: [],
subNameList: [],
packageName:[],
chosePages:[],
......@@ -212,8 +223,8 @@
//输入框列表
queryParam: {
networkName: '',
subName: '',
status: '',
subName: '',
schoolName: '',
},
modifyvisible: false,
......@@ -496,9 +507,43 @@
this.modifyForm.chosePages=""
this.chosePages.splice(0,this.chosePages.length)
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>
......
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