Skip to content

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

文件调整

parent be3ce4d1
Showing with 24 additions and 237 deletions
src/api/school-center/salesOrdersAPI.js → src/api/school-center/salesListAPI.js
...@@ -2,19 +2,17 @@ import {postAction,getAotion,downFilePost} from '@/api/manage' ...@@ -2,19 +2,17 @@ import {postAction,getAotion,downFilePost} from '@/api/manage'
const prefix = '/manager/ciop'; const prefix = '/manager/ciop';
// 获取活动列表 // 获取活动列表
let getList = (params) => postAction(prefix + "/salesOrders/list" , params); let getList = (params) => postAction(prefix + "/salesList/list" , params);
// 删除 // 删除
let deleteOrder = (params) => postAction(prefix + "/salesOrders/deleteOrder" , params); let deleteOrder = (params) => postAction(prefix + "/salesList/deleteOrder" , params);
// 下载放号上传模板 // 下载放号上传模板
let downloadTemplateFH = (params) => downFilePost(prefix + "/salesOrders/downloadTemplateFH" , params); let downloadTemplateFH = (params) => downFilePost(prefix + "/salesList/downloadTemplateFH" , params);
// 下载充值审核模板 // 下载充值审核模板
let downloadTemplateCZ = (params) => downFilePost(prefix + "/salesOrders/downloadTemplateCZ" , params); let downloadTemplateCZ = (params) => downFilePost(prefix + "/salesList/downloadTemplateCZ" , params);
// 上传图片
// let uploadImg = (params) => postAction(prefix + "/salesOrders/uploadImg" , params);
// 获取县分下拉列表 // 获取县分下拉列表
let getSubstList = (params) => postAction(prefix + "/school/schoolManagement/substList" , params); let getSubstList = (params) => postAction(prefix + "/school/schoolManagement/substList" , params);
...@@ -23,10 +21,10 @@ let getSubstList = (params) => postAction(prefix + "/school/schoolManagement/sub ...@@ -23,10 +21,10 @@ let getSubstList = (params) => postAction(prefix + "/school/schoolManagement/sub
let getSchoolList = (params) => postAction(prefix + "/school/schoolManagement/schoolList" , params); let getSchoolList = (params) => postAction(prefix + "/school/schoolManagement/schoolList" , params);
// 下载导入结果清单 // 下载导入结果清单
let downloadResult = (params) => downFilePost(prefix + "/salesOrders/exportResult" , params); let downloadResult = (params) => downFilePost(prefix + "/salesList/exportResult" , params);
// 导出订单 // 导出订单
let exportList = (params) => downFilePost(prefix + "/salesOrders/exportOrderList" , params); let exportList = (params) => downFilePost(prefix + "/salesList/exportOrderList" , params);
export { export {
getList,deleteOrder,getSubstList,getSchoolList,downloadTemplateFH,downloadTemplateCZ, getList,deleteOrder,getSubstList,getSchoolList,downloadTemplateFH,downloadTemplateCZ,
......
src/api/school-center/salesOrder.js
...@@ -2,7 +2,7 @@ import {postAction,downFilePost} from '@/api/manage' ...@@ -2,7 +2,7 @@ import {postAction,downFilePost} from '@/api/manage'
const prefix = '/manager/ciop'; const prefix = '/manager/ciop';
// 智能平台账号实名 // 智能平台账号实名
let salesOrderInfo = (params) => postAction(prefix + "/salesOrders/salesOrderInfo" , params); let salesOrderInfo = (params) => postAction(prefix + "/salesList/salesOrderInfo" , params);
let ysmUserNotThrough = (id,params) => postAction(prefix + "/ysmUser/notThrough/"+id,params); let ysmUserNotThrough = (id,params) => postAction(prefix + "/ysmUser/notThrough/"+id,params);
let ysmUserInsert = (params) => postAction(prefix + "/ysmUser/insert" , params); let ysmUserInsert = (params) => postAction(prefix + "/ysmUser/insert" , params);
let ysmUserUpdate = (params) => postAction(prefix + "/ysmUser/update",params); let ysmUserUpdate = (params) => postAction(prefix + "/ysmUser/update",params);
......
src/views/school-center/PartnerManagement/PartnerManagement.vue
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
</a-col> </a-col>
<a-col :md="4" :sm="12"> <a-col :md="4" :sm="12">
<a-form-item label="县分"> <a-form-item label="县分">
<a-input placeholder="县分" v-model="queryParam.area"></a-input> <a-input placeholder="县分" v-model="queryParam.substName"></a-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :md="4" :sm="12"> <a-col :md="4" :sm="12">
...@@ -80,10 +80,6 @@ ...@@ -80,10 +80,6 @@
<a-input placeholder="请输入密码" type="password" v-decorator="[ 'password', {rules: [{ required: true, message: '密码不能为空！' ,whitespace:true}]} ]"></a-input> <a-input placeholder="请输入密码" type="password" v-decorator="[ 'password', {rules: [{ required: true, message: '密码不能为空！' ,whitespace:true}]} ]"></a-input>
</a-form-item> </a-form-item>
<a-form-item :labelCol="{span: 6}" :wrapperCol="{span: 8, offset: 1}" label="重复密码">
<a-input placeholder="请再次输入密码" type="password" v-decorator="[ 'repassword', {rules: [{ required: true, message: '重复密码不能为空！' ,whitespace:true}]} ]"></a-input>
</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(1)" v-model="addForm.subName" > <a-select placeholder="请选择" @change="changeSubst(1)" v-model="addForm.subName" >
<a-select-option key="">请选择</a-select-option> <a-select-option key="">请选择</a-select-option>
...@@ -142,6 +138,11 @@ ...@@ -142,6 +138,11 @@
<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-input placeholder="身份证" v-decorator="[ 'idCard', {rules: [{ required: true, message: '身份证不能为空！' ,whitespace:true}]} ]"></a-input> <a-input placeholder="身份证" v-decorator="[ 'idCard', {rules: [{ required: true, message: '身份证不能为空！' ,whitespace:true}]} ]"></a-input>
</a-form-item> </a-form-item>
<a-form-item :labelCol="{span: 6}" :wrapperCol="{span: 8, offset: 1}" label="密码">
<a-input placeholder="密码不变时，不用填写" type="password" v-decorator="[ 'password' ]"></a-input>
</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-radio-group v-decorator="['sex', {rules: [{ required: true, message: '性别不能为空！' ,whitespace:true}]} ]" > <a-radio-group v-decorator="['sex', {rules: [{ required: true, message: '性别不能为空！' ,whitespace:true}]} ]" >
<a-radio value="1">男</a-radio> <a-radio value="1">男</a-radio>
...@@ -246,7 +247,7 @@ ...@@ -246,7 +247,7 @@
addFormtable: this.$form.createForm(this, {name: 'addFormtable'}), addFormtable: this.$form.createForm(this, {name: 'addFormtable'}),
queryParam: { queryParam: {
name: '', name: '',
area:'', substName:'',
school:'' school:''
}, },
addForm: { addForm: {
...@@ -257,7 +258,6 @@ ...@@ -257,7 +258,6 @@
sex: '', sex: '',
grade: '', grade: '',
password: '', password: '',
repassword: '',
subName: '', subName: '',
substName: '', substName: '',
schoolId: '', schoolId: '',
...@@ -275,9 +275,10 @@ ...@@ -275,9 +275,10 @@
name: '', name: '',
account: '', account: '',
idCard: '', idCard: '',
password: '',
sex: '', sex: '',
grade: '', grade: '',
area: '', substName: '',
ysm: '', ysm: '',
schoolId: '', schoolId: '',
roleId: '', roleId: '',
...@@ -296,7 +297,7 @@ ...@@ -296,7 +297,7 @@
{dataIndex: 'idCard', width: 200, title: '身份证 ', align: "center"}, {dataIndex: 'idCard', width: 200, title: '身份证 ', align: "center"},
{dataIndex: 'account', width: 200, title: '账号 ', align: "center"}, {dataIndex: 'account', width: 200, title: '账号 ', align: "center"},
{dataIndex: 'sex', width: 100, title: '性别 ', align: "center",scopedSlots: {customRender: 'genderoperation'},}, {dataIndex: 'sex', width: 100, title: '性别 ', align: "center",scopedSlots: {customRender: 'genderoperation'},},
{dataIndex: 'area', width: 100, title: '县分 ', align: "center"}, {dataIndex: 'substName', width: 100, title: '县分 ', align: "center"},
{ {
dataIndex: 'operation', dataIndex: 'operation',
width: 100, width: 100,
...@@ -371,7 +372,7 @@ ...@@ -371,7 +372,7 @@
ysm: data.ysm, ysm: data.ysm,
}) })
this.modifyForm.subName = data.area; this.modifyForm.subName = data.substName;
this.modifyForm.roleId = data.roleid; this.modifyForm.roleId = data.roleid;
this.modifyForm.position = data.position; this.modifyForm.position = data.position;
this.recordId = data.parentId; this.recordId = data.parentId;
...@@ -387,7 +388,7 @@ ...@@ -387,7 +388,7 @@
}, },
//提交表单 //提交表单
createfunctionOk(){ createfunctionOk(){
this.Formtable.validateFields(["account",'phone','name',"idCard", 'sex','schoolId', 'roleid','ysm'], {force: true}, (err, values)=>{ this.Formtable.validateFields(["account",'phone','name',"idCard", 'password', 'sex','schoolId', 'roleid','ysm'], {force: true}, (err, values)=>{
if (!err){ if (!err){
this.modifyForm.account=values.account this.modifyForm.account=values.account
this.modifyForm.phone=values.phone this.modifyForm.phone=values.phone
...@@ -395,6 +396,7 @@ ...@@ -395,6 +396,7 @@
this.modifyForm.idCard=values.idCard this.modifyForm.idCard=values.idCard
this.modifyForm.sex=values.sex this.modifyForm.sex=values.sex
this.modifyForm.ysm=values.ysm this.modifyForm.ysm=values.ysm
this.modifyForm.password = values.password
if(this.modifyForm.idCard.length != 18){ if(this.modifyForm.idCard.length != 18){
this.$message.error( '身份证不合法', 5); this.$message.error( '身份证不合法', 5);
...@@ -467,7 +469,7 @@ ...@@ -467,7 +469,7 @@
this.addForm.parentIds = ''; this.addForm.parentIds = '';
}, },
createOk(){ createOk(){
this.addFormtable.validateFields(["account", 'phone', "name", "idCard", "sex", 'grade',"password", 'repassword','schoolId','role','position','parentId'], {force: true}, (err, values)=>{ this.addFormtable.validateFields(["account", 'phone', "name", "idCard", "sex", 'grade',"password",'schoolId','role','position','parentId'], {force: true}, (err, values)=>{
if (!err){ if (!err){
this.addForm.account=values.account this.addForm.account=values.account
this.addForm.phone=values.phone this.addForm.phone=values.phone
...@@ -476,7 +478,6 @@ ...@@ -476,7 +478,6 @@
this.addForm.sex=values.sex this.addForm.sex=values.sex
this.addForm.grade=values.grade this.addForm.grade=values.grade
this.addForm.password=values.password this.addForm.password=values.password
this.addForm.repassword=values.repassword
this.addForm.schoolId=values.schoolId this.addForm.schoolId=values.schoolId
this.addForm.postion=values.position this.addForm.postion=values.position
this.addForm.parentId=values.parentId this.addForm.parentId=values.parentId
...@@ -490,10 +491,6 @@ ...@@ -490,10 +491,6 @@
this.$message.error( '密码长度必须大于8', 5); this.$message.error( '密码长度必须大于8', 5);
return null; return null;
} }
if(this.addForm.password != this.addForm.repassword){
this.$message.error( '两次密码必须一致', 5);
return null;
}
if(this.addForm.roleId == null || this.addForm.roleId == ''){ if(this.addForm.roleId == null || this.addForm.roleId == ''){
this.$message.error( '角色不能为空', 5); this.$message.error( '角色不能为空', 5);
......
src/views/school-center/activityIntegral/activityIntegral.vue deleted 100644 → 0
<template>
<div class="flex-container">
<!-- 查询区域 -->
<div class="table-page-search-wrapper">
<!-- 搜索区域 -->
<a-form layout="inline">
<a-row :gutter="24">
<a-col :md="6" :sm="12">
<a-form-item :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}" label="积分类型">
<a-select placeholder="请选择" v-model="queryParam.activityType">
<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="6" :sm="12">
<a-form-item :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}" label="积分小类">
<a-select placeholder="请选择" v-model="queryParam.subclass">
<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-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.name"></a-input>
</a-form-item>
</a-col>
<a-col :md="4" :sm="12">
<a-form-item label="账号：">
<a-input placeholder="" v-model="queryParam.account"></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 v-show="!callback" @click="handleSubmit" style="margin-left: 10px">导出</a-button>
<a-button v-show="callback" style="margin-left: 10px">导出中<a-spin style="margin-left: 5px" size="small"/></a-button>
</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="operation" slot-scope="text,record">
<a @click="modifyfunction(record)">审核</a>
</template>
</s-table>
<!--编辑----弹框-->
<!-- <a-modal :title="titleName" :visible="modifyvisible" @ok="createfunctionOk" @cancel="createfunctionCancel" html-type="submit" width="840px">
<a-form :form="Formtable">
<a-form-item :labelCol="{span: 6}" :wrapperCol="{span: 8, offset: 1}" label="审核状态">
<a-radio-group v-decorator="['status', {rules: [{ required: true, message: '审核状态不能为空！'}]} ]">
<a-radio value="2">通过</a-radio>
<a-radio value="3">不通过</a-radio>
</a-radio-group>
</a-form-item>
<a-form-item :labelCol="{span: 6}" :wrapperCol="{span: 8, offset: 1}" label="所得积分">
<a-input placeholder="所得积分" v-decorator="[ 'integral', {rules: [{ required: true,type:'number', message: '所得积分不能为空！' ,whitespace:true,transform:(value)=> {return Number(value)} }]} ]"></a-input>
</a-form-item>
<a-form-item :labelCol="{span: 6}" :wrapperCol="{span: 8, offset: 1}" label="审核备注">
<a-input placeholder="审核备注" v-decorator="[ 'remark', {rules: [{ required: false }]} ]"></a-input>
</a-form-item>
</a-form>
</a-modal>-->
</div>
</template>
<script>
import STable from '@/components/table';
import {getIntegralList,exportIntegral,download} from "@/api/school-center/activityIntegralAPI"
import {cloneObject,exportFile} from '@/utils/util';
import moment from "moment";
export default {
name: "activityIntegral",
components: {
STable,
},
data: function () {
return {
emptyText: {emptyText: '暂无数据'},
previewVisible: false,
callback:false,
previewImage: '',
fileList: [
],
fileid:{},
// form
Formtable: this.$form.createForm(this, {name: 'Formtable'}),
titleName:"",
modifyForm: {
id: '',
status: '',
integral: '',
remark: ''
},
subNameList: [],
packageName:[],
chosePages:[],
products:[],
//输入框列表
queryParam: {
title: '',
activityType: '',
subclass: '',
name: '',
account: '',
startTime :'',
endTime :'',
orderseq :'',
orderUniversityName :'',
status :'',
ordername :''
},
modifyvisible: false,
columns: [
{dataIndex: 'name', width: 200, title: '姓名', align: "center"},
{dataIndex: 'account', width: 200, title: '账号', align: "center"},
{dataIndex: 'recordIntegral', width: 200, title: '所得积分', align: "center"},
{dataIndex: 'activityType', width: 200, title: '积分类型', align: "center"},
{dataIndex: 'subclass', width: 200, title: '积分小类', align: "center"},
{dataIndex: 'substName', width: 200, title: '县分', align: "center"},
{dataIndex: 'schoolName', width: 200, title: '学校', align: "center"},
{dataIndex: 'createTime', width: 200, title: '创建时间', align: "center"},
{
dataIndex: 'operation',
width: 200,
title: '操作',
align: "center",
scopedSlots: {customRender: 'operation'},
fixed: "right"
}]
,
rowdata: parameter => {
let params = {
pageNo: parameter.pageNo,
pageSize: parameter.pageSize
}
//表示
let obj = cloneObject(this.queryParam)
return getIntegralList(Object.assign(params, obj)).then(res => {
let data = {}
if (res.state !== 'success') {
this.emptyText.emptyText = '查询失败！'
this.$message.error("查询失败！", 5);
data = {
data: [],
pageSize: parameter.pageSize,
pageNo: 1,
totalCount: 0
}
} else {
if (res.data.records.length==0){
return data
}
data = {
data: res.data.records,
pageSize: parameter.pageSize,
pageNo: parameter.pageNo,
totalCount: res.data.total
}
}
return data
})
}
}
},
methods:{
chosePagesfunction(data){
this.chosePages=data
},
search() {
this.$refs.table.refresh({search: true})
},
handleSubmit() {
let downqueryParam=this.queryParam
let nowdate = moment().format('YYYY-MM-DD');
this.callback=true;
exportFile(exportIntegral(downqueryParam), "积分记录清单.xls",this.downloadstatu);
//exportFile(download(downqueryParam), "宽带订单清单" + nowdate + ".xls",this.downloadstatu);
},
downloadstatu(){
this.callback=false;
}
}
}
</script>
<style scoped>
</style>
src/views/school-center/salesOrders/salesOrders.vue → src/views/school-center/salesList/salesList.vue
...@@ -157,7 +157,7 @@ ...@@ -157,7 +157,7 @@
deleteOrder,getSubstList,getSchoolList, deleteOrder,getSubstList,getSchoolList,
downloadTemplateFH,downloadTemplateCZ, downloadTemplateFH,downloadTemplateCZ,
downloadResult,exportList downloadResult,exportList
} from "@/api/school-center/salesOrdersAPI" } from "@/api/school-center/salesListAPI"
import {cloneObject,exportFile} from '@/utils/util'; import {cloneObject,exportFile} from '@/utils/util';
import ImportBtn from "../../../components/sysmanage/ImportBtn"; import ImportBtn from "../../../components/sysmanage/ImportBtn";
...@@ -306,13 +306,13 @@ ...@@ -306,13 +306,13 @@
handleSubmit1() { handleSubmit1() {
this.importTile = "放号上传"; this.importTile = "放号上传";
this.FHTemplate = true; this.FHTemplate = true;
this.importUrl = "manager/ciop/salesOrders/importOrder"; this.importUrl = "manager/ciop/salesList/importOrder";
this.modifyvisible = true; this.modifyvisible = true;
}, },
handleSubmit2() { handleSubmit2() {
this.importTile = "充值审核"; this.importTile = "充值审核";
this.CZTemplate = true; this.CZTemplate = true;
this.importUrl = "manager/ciop/salesOrders/importRechargeData"; this.importUrl = "manager/ciop/salesList/importRechargeData";
this.modifyvisible = true; this.modifyvisible = true;
}, },
downloadTemplateFH: function() { downloadTemplateFH: function() {
......
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