Skip to content

G
gdtel-gztel-school-center-ui
Commit 7c4fec56 by 董有沛
Options

冲突解决

parents 7fb44195 bf9dd993
Showing with 698 additions and 22 deletions
src/api/school-center/salesCensusAPI.js 0 → 100644
import {postAction,downFilePost} from '@/api/manage'
const prefix = '/manager/ciop';
//获取县分下拉列表
let initSubstName = (params) => postAction(prefix + "/saleCensus/initSubstName" , params);
//获取学校下拉列表
let getSchoolNames = (params) => postAction(prefix + "/saleCensus/getSchoolNames" , params);
// 获取充值达标列表
let getList = (params) => postAction(prefix + "/saleCensus/list" , params);
// 导出放号充值达标清单
let exportOut= (params) => downFilePost(prefix + "/saleCensus/exportList" , params);
export {
initSubstName,
getSchoolNames,
getList,
exportOut
}
src/api/school-center/salesOrderAPI.js 0 → 100644
import {postAction,downFilePost} from '@/api/manage'
const prefix = '/manager/ciop';
//获取县分下拉列表
let initSubstName = (params) => postAction(prefix + "/salesOrder/initSubstName" , params);
//获取学校下拉列表
let getSchoolNames = (params) => postAction(prefix + "/salesOrder/getSchoolNames" , params);
// 获取充值达标列表
let getList = (params) => postAction(prefix + "/salesOrder/list" , params);
// 导出放号充值达标清单
let exportOut= (params) => downFilePost(prefix + "/salesOrder/exportList" , params);
// 删除
let deleteOrder = (params) => postAction(prefix + "/salesOrder/deleteOrder" , params);
// 下载导入结果清单
let downloadResult = (params) => downFilePost(prefix + "/salesOrder/exportResult" , params);
export {
initSubstName,
getSchoolNames,
getList,
deleteOrder,
downloadResult,
exportOut
}
src/api/school-center/zjlSalaryManagerAPI.js
...@@ -4,7 +4,7 @@ const prefix = '/manager/ciop'; ...@@ -4,7 +4,7 @@ const prefix = '/manager/ciop';
// 楼长KPI管理 // 楼长KPI管理
let initSubstName = (params) => postAction(prefix + "/zjlWage/initSubstName" , params); let initSubstName = (params) => postAction(prefix + "/zjlWage/initSubstName" , params);
let getSchoolNames = (params) => postAction(prefix + "/zjlWage/getSchoolNames" , params); let getSchoolNames = (params) => postAction(prefix + "/zjlWage/getSchoolNames" , params);
let uploadExcel = (params) => downFilePost(prefix + "/zjlWage/excelOut" , params); let excelOut = (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);
let zjlSalaryDelete = (params) => postAction(prefix + "/zjlWage/delete", params); let zjlSalaryDelete = (params) => postAction(prefix + "/zjlWage/delete", params);
...@@ -16,7 +16,7 @@ let createSalary = (params) => postAction(prefix + "/zjlWage/createSalary",param ...@@ -16,7 +16,7 @@ let createSalary = (params) => postAction(prefix + "/zjlWage/createSalary",param
export { export {
initSubstName, initSubstName,
getSchoolNames, getSchoolNames,
uploadExcel, excelOut,
downloadMoBan, downloadMoBan,
zjlSalaryList, zjlSalaryList,
zjlSalaryDelete, zjlSalaryDelete,
......
src/views/school-center/louZhang/louZhangKPI.vue
...@@ -97,6 +97,9 @@ ...@@ -97,6 +97,9 @@
<template slot="productCreateTime" slot-scope="text"> <template slot="productCreateTime" slot-scope="text">
{{ text | dayjs}} {{ text | dayjs}}
</template> </template>
<template slot="minGanZi" slot-scope="text">
{{ text.substring(0,2)+'**'}}
</template>
<template slot="operation" slot-scope="text,record"> <template slot="operation" slot-scope="text,record">
<span> <span>
<a @click="modifyfunction(record)">KPI打分</a> <a @click="modifyfunction(record)">KPI打分</a>
...@@ -108,7 +111,7 @@ ...@@ -108,7 +111,7 @@
</template> </template>
</s-table> </s-table>
<!----弹框--> <!----弹框-->
<a-modal :title="add ?'添加正则配置': '编辑正则配置'" :visible="modifyvisible" @ok="createfunctionOk" @cancel="createfunctionCancel" html-type="submit" width="1024px"> <a-modal :title="add ?'添加楼长KPI': 'KPI打分'" :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="姓名" v-decorator="[ 'sysuName', {rules: [{ required: true, message: '姓名不能为空！' }]} ]" :disabled="isdisabled"/> <a-input placeholder="姓名" v-decorator="[ 'sysuName', {rules: [{ required: true, message: '姓名不能为空！' }]} ]" :disabled="isdisabled"/>
...@@ -233,8 +236,8 @@ ...@@ -233,8 +236,8 @@
isDel: '0' isDel: '0'
}, },
columns: [ columns: [
{dataIndex: 'sysuName', width: 25, title: '姓名'}, {dataIndex: 'sysuName', width: 25, title: '姓名',},
{dataIndex: 'account', width: 40, title: '账号'}, {dataIndex: 'account', width: 40, title: '账号',scopedSlots: {customRender: 'minGanZi'}},
{dataIndex: 'substName', width: 20, title: '县分'}, {dataIndex: 'substName', width: 20, title: '县分'},
{dataIndex: 'schoolName', width: 70, title: '学校'}, {dataIndex: 'schoolName', width: 70, title: '学校'},
{dataIndex: 'reportDaily', width: 25, title: '汇总任务量'}, {dataIndex: 'reportDaily', width: 25, title: '汇总任务量'},
......
src/views/school-center/louZhang/lzSalary.vue
...@@ -116,6 +116,9 @@ ...@@ -116,6 +116,9 @@
<p v-if="text=='0'">正常</p> <p v-if="text=='0'">正常</p>
<p v-else=""></p> <p v-else=""></p>
</template> </template>
<template slot="minGanZi" slot-scope="text">
{{ text.substring(0,2)+'**'}}
</template>
<template slot="operation" slot-scope="text,record"> <template slot="operation" slot-scope="text,record">
<span> <span>
<a v-show="false" @click="modifyfunction(record)">编辑</a> <a v-show="false" @click="modifyfunction(record)">编辑</a>
...@@ -225,7 +228,7 @@ ...@@ -225,7 +228,7 @@
}, },
columns: [ columns: [
{dataIndex: 'month', width: 20, title: 'KPI月份 '}, {dataIndex: 'month', width: 20, title: 'KPI月份 '},
{dataIndex: 'sysuName', width: 25, title: '姓名'}, {dataIndex: 'sysuName', width: 25, title: '姓名',scopedSlots: {customRender: 'minGanZi'}},
{dataIndex: 'substName', width: 20, title: '县分'}, {dataIndex: 'substName', width: 20, title: '县分'},
{dataIndex: 'schoolName', width: 70, title: '学校'}, {dataIndex: 'schoolName', width: 70, title: '学校'},
{dataIndex: 'rechargeNum', width: 25, title: '放号充值数'}, {dataIndex: 'rechargeNum', width: 25, title: '放号充值数'},
......
src/views/school-center/louZhang/managerKpi.vue
...@@ -89,6 +89,9 @@ ...@@ -89,6 +89,9 @@
<p v-if="text=='0'">正常</p> <p v-if="text=='0'">正常</p>
<p v-else=""></p> <p v-else=""></p>
</template> </template>
<template slot="minGanZi" slot-scope="text">
{{ text.substring(0,2)+'**'}}
</template>
<!--<template slot="operation" slot-scope="text,record"> <!--<template slot="operation" slot-scope="text,record">
<span> <span>
<a v-show="false" @click="modifyfunction(record)">编辑</a> <a v-show="false" @click="modifyfunction(record)">编辑</a>
...@@ -107,10 +110,10 @@ ...@@ -107,10 +110,10 @@
import ImportBtn from "../../../components/sysmanage/ImportBtn"; import ImportBtn from "../../../components/sysmanage/ImportBtn";
import { zjlKpiList, uploadExcel, downloadMoBan } from "@/api/school-center/managerKpiAPI" import { zjlKpiList, uploadExcel, downloadMoBan } from "@/api/school-center/managerKpiAPI"
import {cloneObject, exportFile} from '@/utils/util'; import {cloneObject, exportFile} from '@/utils/util';
import ConstantActivity from "@/constant/ConstantActivity";
import Vue from 'vue'; import Vue from 'vue';
import {DatetimePicker} from 'vant';
import moment from "moment"; import moment from "moment";
import ConstantActivity from "@/constant/ConstantActivity"; import {DatetimePicker} from 'vant';
Vue.use(DatetimePicker); Vue.use(DatetimePicker);
...@@ -147,7 +150,7 @@ ...@@ -147,7 +150,7 @@
columns: [ columns: [
{dataIndex: 'month', width: 20, title: '月份 '}, {dataIndex: 'month', width: 20, title: '月份 '},
{dataIndex: 'county', width: 20, title: '县分'}, {dataIndex: 'county', width: 20, title: '县分'},
{dataIndex: 'name', width: 25, title: '督导'}, {dataIndex: 'name', width: 25, title: '督导',},
{dataIndex: 'totalPerformance', width: 30, title: '绩效奖金合计'}, {dataIndex: 'totalPerformance', width: 30, title: '绩效奖金合计'},
{dataIndex: 'performanceBase', width: 25, title: '绩效基数'}, {dataIndex: 'performanceBase', width: 25, title: '绩效基数'},
{dataIndex: 'yfPerformance', width: 25, title: '应发绩效'}, {dataIndex: 'yfPerformance', width: 25, title: '应发绩效'},
......
src/views/school-center/louZhang/zjlSalary.vue
...@@ -107,7 +107,7 @@ ...@@ -107,7 +107,7 @@
import STable from '@/components/table'; import STable from '@/components/table';
import ImportBtn from "../../../components/sysmanage/ImportBtn"; import ImportBtn from "../../../components/sysmanage/ImportBtn";
import { import {
zjlSalaryList, zjlSalaryDelete, uploadExcel, downloadMoBan,createSalary zjlSalaryList, zjlSalaryDelete, excelOut, downloadMoBan,createSalary
} from "@/api/school-center/zjlSalaryManagerAPI" } from "@/api/school-center/zjlSalaryManagerAPI"
import {cloneObject, exportFile} from '@/utils/util'; import {cloneObject, exportFile} from '@/utils/util';
import Vue from 'vue'; import Vue from 'vue';
...@@ -256,7 +256,7 @@ ...@@ -256,7 +256,7 @@
let nowdate = moment().format("YYYY-MM-DD"); let nowdate = moment().format("YYYY-MM-DD");
//导出 //导出
exportFile( exportFile(
uploadExcel(Object.assign(params, obj)), excelOut(Object.assign(params, obj)),
"总经理薪酬管理信息" + nowdate + ".xlsx", "总经理薪酬管理信息" + nowdate + ".xlsx",
); );
......
src/views/school-center/salesList/saleCensus.vue 0 → 100644
<template>
<div class="flex-container">
<!-- 查询区域 -->
<div class="table-page-search-wrapper">
<!-- 搜索区域 -->
<a-form layout="inline">
<a-row :gutter="24">
<a-col :md="4" :sm="4">
<a-form-item label="放号人">
<a-input placeholder="" v-model="queryParam.name"></a-input>
</a-form-item>
</a-col>
<a-col :md="4" :sm="10">
<a-form-item label="放号账号">
<a-input placeholder="" v-model="queryParam.account"></a-input>
</a-form-item>
</a-col>
<a-col :md="4" :sm="2">
<a-form-item label="县分">
<a-select v-model="queryParam.salesSubst" @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="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 :md="4" :sm="8">
<a-form-item :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}" label="职位">
<a-select placeholder="--全部--" v-model="queryParam.position">
<a-select-option key="">--全部--</a-select-option>
<a-select-option key="总经理">总经理</a-select-option>
<a-select-option key="楼长">楼长</a-select-option>
<a-select-option key="成员">成员</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.leader"></a-input>
</a-form-item>
</a-col>
<a-col :md="6" :sm="12">
<a-form-item label="激活时间">
<a-range-picker
:placeholder="['开始月份', '结束月份']"
format="YYYYMM"
:value="queryParam.activateTime"
:mode="tempMode"
@panelChange="handlePanelChange"
style="width: 16rem;"
/>
</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 @click="exportList()" type="primary">导出所有数据</a-button>
<a-dropdown >
<a-button v-show="false" style="margin-left: 8px">导入<a-icon type="down" />
<a-menu slot="overlay" @click="handleMenuClick">
<a-menu-item key="1">
<a-icon type="arrow-up" />放号上传
</a-menu-item>
<a-menu-item key="2">
<a-icon type="arrow-up" />充值审核
</a-menu-item>
<a-menu-item key="3">
<a-icon type="arrow-up" />累计充值导入
</a-menu-item>
</a-menu>
</a-button>
</a-dropdown>
</a-col>
</span>
</a-row>
</a-form>
</div>
<!--列表-->
<s-table :locale="emptyText" :columns="columns" :data="rowdata" bordered ref="table" size="small" class="flex-filling">
<!--拦截器-->
<template slot="createTime" slot-scope="text">
{{ text | dayjs}}
</template>
<!--拦截器-->
<template slot="activateTime" slot-scope="text">
{{ text | dayjs}}
</template>
<template slot="operation" slot-scope="text,record">
<!-- <a @click="modifyfunction(record)">编辑</a>-->
<a-divider type="vertical"/>
<a-popconfirm title="是否要删除此行？" @confirm="deleteOrder(record.id)">
<a>删除</a>
</a-popconfirm>
<a-divider type="vertical"/>
</template>
</s-table>
<a-modal
title="批量导入"
:visible="modifyvisible"
@ok="createfunctionOk"
@cancel="createfunctionCancel"
html-type="submit"
width="400px"
>
<a-row :gutter="24">
<a-col :md="24" :sm="12">
<p style="text-align:center">{{ importTile }}</p>
</a-col>
</a-row>
<import-btn :url="importUrl" :responseFun="doPush">
<a-tooltip placement="topLeft" title="导入文件" arrowPointAtCenter>
<a-row :gutter="24">
<a-col :md="24" :sm="12">
<p>
选择文件：
<a-button type="primary">选择文件</a-button>
</p>
</a-col>
</a-row>
</a-tooltip>
</import-btn>
<a-row :gutter="24">
<a-col :md="24" :sm="12">
<p v-show="FHTemplate">
模板下载：
<a-button type="primary" @click="downloadTemplateFH">放号上传模板</a-button>
</p>
<p v-show="CZTemplate">
模板下载：
<a-button type="primary" @click="downloadTemplateCZ">充值审核模板</a-button>
</p>
<!-- <p v-show="LJTemplate">-->
<!-- 模板下载：-->
<!-- <a-button type="primary" @click="downloadTemplateLJ">累计审核模板</a-button>-->
<!-- </p>-->
</a-col>
</a-row>
</a-modal>
</div>
</template>
<script>
import STable from '@/components/table';
import {} from "@/api/school-center/salesOrder";
import {getSchoolNames, initSubstName, getList,exportOut} from "../../../api/school-center/salesCensusAPI";
import {cloneObject,exportFile} from '@/utils/util';
import ImportBtn from "../../../components/sysmanage/ImportBtn";
import Vue from 'vue';
import moment from "moment";
import {DatetimePicker} from 'vant';
Vue.use(DatetimePicker);
export default {
name: "saleCensus",
components: {
STable,ImportBtn
},
data: function () {
return {
emptyText: {emptyText: '暂无数据'},
previewVisible: false,
previewImage: '',
fileList: [
],
apis:'',
fileid:{},
brackgroundurl:"manager/ciop/school/schoolManagement/qrcodeUpload",
// form
Formtable: this.$form.createForm(this, {name: 'Formtable'}),
FHTemplate: false,
CZTemplate: false,
importUrl: "",
importTile: "",
modifyvisible: false,
modifyForm: {
id: '',
title: '',
desc: '',
integral: '',
activityType: '',
subclass: '',
imageUrl: '',
range: '',
sort: '',
},
packageName:[],
chosePages:[],
products:[],
//输入框列表
queryParam: {
name: '',
account: '',
salesSubst: '',
salesSchool: '',
activateTime: '',
position:'',
leader: '',
},
tempMode:['month', 'month'],
schoolNames: [],
subNames: [],
columns: [
{dataIndex: 'name', width: 25, title: '姓名', align: "center"},
{dataIndex: 'account', width: 30, title: '账号', align: "center"},
{dataIndex: 'salesSubst', width: 15, title: '县分', align: "center"},
{dataIndex: 'salesSchool', width: 30, title: '学校', align: "center"},
{dataIndex: 'num', width: 30, title: '达标充值数', align: "center"},
{dataIndex: 'position', width: 30, title: '职位', align: "center"},
{dataIndex: 'leader', width: 30, title: '上级领导', align: "center"},
/*{
dataIndex: 'operation',
width: 200,
title: '操作',
align: "center",
scopedSlots: {customRender: 'operation'},
fixed: "right"
}*/]
,
rowdata: parameter => {
/*const env = process.env.NODE_ENV; //获取当前环境
if(env === 'development'){ //测试环境默认添加前缀
this.apis = '/api/';
}*/
let params = {
pageNo: parameter.pageNo,
pageSize: parameter.pageSize
}
//表示
let obj = cloneObject(this.queryParam)
return getList(Object.assign(params, obj)).then(res => {
let data = {}
if (res.state !== 'success') {
this.$message.error("查询失败！", 5);
this.emptyText.emptyText = '查询失败！'
data = {
data: [],
pageSize: parameter.pageSize,
pageNo: 1,
totalCount: 0
}
} else {
data = {
data: res.data.records,
pageSize: parameter.pageSize,
pageNo: parameter.pageNo,
totalCount: res.data.total
}
}
return data
})
}
}
},
methods:{
moment,
handlePanelChange(value, mode) {
this.queryParam.activateTime = value;
this.tempMode = [mode[0] === 'date' ? 'month' : mode[0], mode[1] === 'date' ? 'month' : mode[1]];
//console.log("this.tempMode=================="+this.tempMode);
},
search() {
this.$refs.table.refresh({search: true})
},
handleMenuClick(e) {
if (e.key == "1") {
this.handleSubmit1();
}
if (e.key == "2") {
this.handleSubmit2();
}
},
createfunctionOk() {
this.modifyvisible = false;
this.clearmodel();
},
createfunctionCancel() {
this.modifyvisible = false;
this.clearmodel();
},
clearmodel() {
this.importTile = "";
this.FHTemplate = false;
this.CZTemplate = false;
this.importUrl = "";
},
exportList(){
let obj = cloneObject(this.queryParam)
let nowdate = moment().format("YYYY-MM-DD");
//导出
exportFile(
exportOut(Object.assign(obj)),
"学子公司销量统计" + nowdate + ".xlsx",
);
},
getSchoolNames() {
this.queryParam.schoolName = ''
getSchoolNames({"substName": this.queryParam.salesSubst}).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>
<style scoped>
</style>
src/views/school-center/schoolmanager/schoolAllocation.vue 0 → 100644
<template>
<div class="flex-container">
<!-- 查询区域 -->
<div class="table-page-search-wrapper">
<!-- 搜索区域 -->
<a-form layout="inline">
<a-row :gutter="24">
<a-col :md="4" :sm="12">
<a-form-item label="姓名">
<a-input placeholder="姓名" v-model="queryParam.name"></a-input>
</a-form-item>
</a-col>
<a-col :md="4" :sm="12">
<a-form-item label="县分">
<a-input placeholder="县分" v-model="queryParam.substName"></a-input>
</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-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-button @click="openAllocation()" style="margin-left: 8px" icon="plus" type="primary">新增</a-button>
</a-col>
</span>
</a-row>
</a-form>
<!--列表-->
<s-table :columns="columns" :data="rowdata" bordered ref="table" size="small" class="flex-filling" :locale="emptyText">
<template slot="operation" slot-scope="text, record">
<a-divider type="vertical"/>
<a-popconfirm title="是否要删除此行？" @confirm="deleteAllocation(record.id)">
<a>删除</a>
</a-popconfirm>
<a-divider type="vertical"/>
</template>
</s-table>
<!--编辑----弹框-->
<a-modal :title="titleName" :visible="modifyvisible" @ok="createfunctionOk" @cancel="createfunctionCancel" html-type="submit" width="720px">
<a-form :form="Formtable">
<a-form-item :labelCol="{span: 6}" :wrapperCol="{span: 8, offset: 1}" label="账号">
<a-input placeholder="账号" v-decorator="[ 'account', {rules: [{ required: true, message: '账号不能为空！' ,whitespace:true}]} ]"></a-input>
</a-form-item>
<a-form-item :labelCol="{span: 6}" :wrapperCol="{span: 8, offset: 1}" label="县分">
<a-select placeholder="请选择" @change="changeSubst()" v-model="modifyForm.subName" >
<a-select-option key="">请选择</a-select-option>
<a-select-option v-for="data in subNameList" :value="data">
{{ data}}
</a-select-option>
</a-select>
</a-form-item>
<a-form-item :labelCol="{span: 6}" :wrapperCol="{span: 8, offset: 1}" label="学校名称">
<a-select placeholder="请选择" v-model="modifyForm.schoolId">
<a-select-option key="">请选择</a-select-option>
<a-select-option v-for="data in schoolList" :value="data.id">
{{ data.school_name}}
</a-select-option>
</a-select>
</a-form-item>
</a-form>
</a-modal>
</div>
</div>
</template>
<script>
import STable from '@/components/table';
import {
getList,addAllocation,
deleteAllocation,getSubstList,getSchoolList
} from "@/api/school-center/schoolAllocationAPI"
import {cloneObject} from '@/utils/util'
import treecheck from '@/components/sysmanage/treeCheck'
import treeList from '@/components/sysmanage/treeList'
export default {
name: "schoolAllocation",
components: {
STable,
treeList,
treecheck,
},
data: function () {
return {
emptyText: {emptyText: '暂无数据'},
Formtable: this.$form.createForm(this, {name: 'Formtable'}),
queryParam: {
account: '',
name: '',
substName:'',
schoolName:''
},
titleName: '',
modifyvisible:false,
modifyForm: {
id: '',
account: '',
schoolId: '',
},
autoCompleteResult:[],
subNameList: [],
schoolList:[],
addSubName:'',
columns: [
{dataIndex: 'name', width: 100, title: '姓名 ', align: "center"},
{dataIndex: 'account', width: 100, title: '账号', align: "center"},
{dataIndex: 'substName', width: 100, title: '管辖学校所属县分 ', align: "center"},
{dataIndex: 'schoolName', width: 200, title: '管辖学校 ', align: "center"},
{
dataIndex: 'operation',
width: 100,
title: '操作',
align: "center",
scopedSlots: {customRender: 'operation'},
fixed: "right"
}]
,
rowdata: parameter => {
let params = {
pageNo: parameter.pageNo,
pageSize: parameter.pageSize
}
//表示
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 => {
let data = {}
if (res.state !== 'success') {
this.$message.error("查询失败！", 5);
this.emptyText.emptyText = '查询失败！'
data = {
data: [],
pageSize: parameter.pageSize,
pageNo: 1,
totalCount: 0
}
} else {
data = {
data: res.data.records,
pageSize: parameter.pageSize,
pageNo: parameter.pageNo,
totalCount: res.data.total
}
}
return data
})
},
keyRecord: '',
recordId: '',
addUser: false,
}
},
methods:{
onLoad(){
alert();
// 获取县分下拉清单
getSubstList(Object.assign(params,obj)).then(res => {
if (res.state == 'success') {
res.data.forEach((key)=>{
this.subNameList.push(key.sub_name)
})
}
})
},
search() {
this.$refs.table.refresh({search: true})
},
openAllocation() {
this.titleName = "添加学校分配";
this.modifyvisible = true;
},
//提交表单
createfunctionOk(){
this.Formtable.validateFields(["account"], {force: true}, (err, values)=>{
if (!err){
this.modifyForm.account=values.account
addAllocation(this.modifyForm).then(res=>{
if (res.state=="success") {
this.$message.success(res.data ? res.data : '添加成功！', 5);
this.search();
this.modifyvisible = false;
return null;
}
this.$message.error(res.data ? res.data : '添加失败！', 5);
})
}
})
},
createfunctionCancel(){
this.modifyvisible=false
this.autoCompleteResult=[]
this.Formtable.setFieldsValue({
account: ''
})
this.addForm.subName = '';
},
deleteAllocation(id){
let params = {};
params.id = id;
deleteAllocation(params).then(res=>{
if (res.state=="success") {
this.$message.success(res.data ? res.data : '删除成功！', 5);
this.search();
this.modifyvisible = false;
return null;
}
this.$message.error(res.data ? res.data : '删除失败！', 5);
})
},
changeSubst(type){
let schoolParams = {};
schoolParams.subName = this.modifyForm.subName;
this.schoolList = [];
getSchoolList(schoolParams).then(res => {
if (res.state == 'success') {
res.data.forEach((key) => {
this.schoolList.push(key)
})
}
})
},
changeSchool(schoolId){
let schoolParams = {};
schoolParams.subName = this.modifyForm.subName;
this.schoolList = [];
getSchoolList(schoolParams).then(res => {
if (res.state == 'success') {
res.data.forEach((key) => {
this.schoolList.push(key)
})
this.modifyForm.schoolId = schoolId;
}
})
},
}
}
</script>
<style scoped>
</style>
\ No newline at end of file
src/views/school-center/product/product.vue → src/views/school-center/wideband/product.vue
...@@ -125,13 +125,10 @@ ...@@ -125,13 +125,10 @@
<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-select v-model="regularName" style="width: 330px"> <a-select v-model="regularName" style="width: 330px">
<a-select-option @click="regularsName('请选择')" value="请选择">请选择</a-select-option> <a-select-option @click="regularsName('请选择')" value="请选择">请选择</a-select-option>
<a-select-option @click="regularsName(item)" v-for="item in regulars" :value="item.regularId"> <a-select-option @click="regularsName(item)" v-for="item in regulars" :value="item.regularId">{{item.regularName}}</a-select-option>
{{item.regularName}}
</a-select-option>
</a-select> </a-select>
<a @click="visibleT2 = true">详情</a>
</a-form-item> </a-form-item>
<div v-show="!add"> <div>
<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-select placeholder="状态" v-decorator="[ 'productState']"> <a-select placeholder="状态" v-decorator="[ 'productState']">
<a-select-option key="0">正常</a-select-option> <a-select-option key="0">正常</a-select-option>
...@@ -362,7 +359,6 @@ ...@@ -362,7 +359,6 @@
this.universityName = '请选择' this.universityName = '请选择'
this.regularName = "请选择"; this.regularName = "请选择";
} }
this.modifyvisible = true; this.modifyvisible = true;
}, },
createfunctionOk() { createfunctionOk() {
...@@ -430,6 +426,9 @@ ...@@ -430,6 +426,9 @@
that.modelData.productUniversity = '' that.modelData.productUniversity = ''
that.modelData.universityId = '' that.modelData.universityId = ''
that.modelData.productIntroductionPic2 = '' that.modelData.productIntroductionPic2 = ''
that.productIntroduction = ''
that.productSetMealIntroduction= ''
that.productRf2=''
this.Formtable.setFieldsValue({ this.Formtable.setFieldsValue({
productMeal: '', productMeal: '',
productTitle: '', productTitle: '',
......
src/views/school-center/yxtManager/exchangeCoupon.vue
...@@ -84,8 +84,7 @@ ...@@ -84,8 +84,7 @@
</a-row> </a-row>
</a-modal> </a-modal>
<!--列表--> <!--列表-->
<s-table :columns="columns" :data="rowdata" bordered ref="table" size="small" class="flex-filling" <s-table :columns="columns" :data="rowdata" bordered ref="table" size="small" class="flex-filling" :locale="emptyText">
:locale="emptyText">
<!--拦截器--> <!--拦截器-->
<template slot="updateDate" slot-scope="text"> <template slot="updateDate" slot-scope="text">
{{ text | dayjs}} {{ text | dayjs}}
...@@ -117,8 +116,7 @@ ...@@ -117,8 +116,7 @@
</template> </template>
</s-table> </s-table>
<!----弹框--> <!----弹框-->
<a-modal :title="add ?'添加正则配置': '编辑正则配置'" :visible="modifyvisible" @ok="createfunctionOk" <a-modal :title="add ?'添加正则配置': '编辑正则配置'" :visible="modifyvisible" @ok="createfunctionOk" @cancel="createfunctionCancel" html-type="submit" width="1024px">
@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="兑换券账号"
......
src/views/system/modal/roleModal.vue
...@@ -126,7 +126,9 @@ export default { ...@@ -126,7 +126,9 @@ export default {
}, },
handleOk() { handleOk() {
let that = this let that = this
if(that.modelData.num == null || that.modelData.num == undefined){
that.modelData.num == ''
}
if (that.modelData.id == '') { if (that.modelData.id == '') {
userAdd(that.modelData).then(() => { userAdd(that.modelData).then(() => {
that.visible = false that.visible = false
......
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