Commit 80d815e3 by 伍思炜

bug修复

parent 7a35f0fc
......@@ -241,10 +241,10 @@
</style>
<!-- 全局配置 -->
<script>
window._CONFIG = {};
window._CONFIG['domianURL'] = 'http://localhost:8080/jeecg-boot';
window._CONFIG['imgDomainURL'] = 'http://localhost:8080/jeecg-boot/sys/common/view';
window._CONFIG['pdfDomainURL'] = 'http://localhost:8080/jeecg-boot/sys/common/pdf/pdfPreviewIframe';
// window._CONFIG = {};
// window._CONFIG['domianURL'] = 'http://localhost:8080/jeecg-boot';
// window._CONFIG['imgDomainURL'] = 'http://localhost:8080/jeecg-boot/sys/common/view';
// window._CONFIG['pdfDomainURL'] = 'http://localhost:8080/jeecg-boot/sys/common/pdf/pdfPreviewIframe';
</script>
</head>
......
......@@ -49,10 +49,11 @@
</span>
</a-row>
</a-form>
</div>
</div>
<!--列表-->
<s-table :locale="emptyText" :columns="columns" :data="rowdata" bordered ref="table" size="small" class="flex-filling">
<s-table :locale="emptyText" :columns="columns" :data="rowdata" bordered ref="table" size="small"
class="flex-filling">
<!--拦截器-->
<template slot="statusDefault" slot-scope="text">
<span v-if="text=='1'">
......@@ -85,11 +86,13 @@
</s-table>
<!--编辑----弹框-->
<a-modal :title="titleName" :visible="modifyvisible" @ok="createfunctionOk" @cancel="createfunctionCancel" html-type="submit" width="840px">
<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-select placeholder="请选择" v-decorator="[ 'subName', {rules: [{ required: true, message: '县分不能为空!' ,whitespace:true}]} ]">
<a-select placeholder="请选择"
v-decorator="[ 'subName', {rules: [{ required: true, message: '县分不能为空!' ,whitespace:true}]} ]">
<a-select-option key="">请选择</a-select-option>
<a-select-option v-for="data in subNameList" :key="data">
{{ data}}
......@@ -97,7 +100,8 @@
</a-select>
</a-form-item>
<a-form-item :labelCol="{span: 6}" :wrapperCol="{span: 8, offset: 1}" label="学校名称">
<a-input placeholder="学校名称" v-decorator="[ 'schoolName', {rules: [{ required: true, message: '学校名称不能为空!' ,whitespace:true}]} ]"></a-input>
<a-input placeholder="学校名称"
v-decorator="[ 'schoolName', {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="请选择" v-decorator="[ 'bandproductId']">
......@@ -114,65 +118,65 @@
<a-input placeholder="揽装工号(宽带)" v-decorator="[ 'lzgh' ]"></a-input>
</a-form-item>
<a-form-item :labelCol="{span: 6}" :wrapperCol="{span: 8, offset: 1}" label="揽装人(宽带)">
<a-input placeholder="揽装人(宽带)" v-decorator="[ 'lzUser' ]"></a-input>
<a-input placeholder="揽装人(宽带)" v-decorator="[ 'lzUser' ]"></a-input>
</a-form-item>
<a-form-item :labelCol="{span: 6}" :wrapperCol="{span: 8, offset: 1}" label="网点编码">
<a-input placeholder="网点编码" v-decorator="[ 'networkCode' ]"></a-input>
<a-input placeholder="网点编码" v-decorator="[ 'networkCode' ]"></a-input>
</a-form-item>
<a-form-item :labelCol="{span: 6}" :wrapperCol="{span: 8, offset: 1}" label="网点名称">
<a-input placeholder="网点名称" v-decorator="[ 'networkName' ]"></a-input>
<a-input placeholder="网点名称" v-decorator="[ 'networkName' ]"></a-input>
</a-form-item>
<!-- <a-form-item :labelCol="{span: 6}" :wrapperCol="{span: 8, offset: 1}" label="是否显示宽带办理">-->
<!-- <a-radio-group v-decorator="['isShowband']">-->
<!-- <a-radio value="0">不显示</a-radio>-->
<!-- <a-radio value="1">显示</a-radio>-->
<!-- </a-radio-group>-->
<!-- </a-form-item>-->
<!-- <a-form-item :labelCol="{span: 6}" :wrapperCol="{span: 8, offset: 1}" label="是否显示0息购机">-->
<!-- <a-radio-group v-decorator="['netPhone']">-->
<!-- <a-radio value="0">不显示</a-radio>-->
<!-- <a-radio value="1">显示</a-radio>-->
<!-- </a-radio-group>-->
<!-- </a-form-item>-->
<!-- <a-form-item :labelCol="{span: 6}" :wrapperCol="{span: 8, offset: 1}" label="是否显示融合办理">-->
<!-- <a-radio-group v-decorator="['isShowrh']">-->
<!-- <a-radio value="0">不显示</a-radio>-->
<!-- <a-radio value="1">显示</a-radio>-->
<!-- </a-radio-group>-->
<!-- </a-form-item>-->
<!-- <a-form-item :labelCol="{span: 6}" :wrapperCol="{span: 8, offset: 1}" label="是否已收到电信卡">-->
<!-- <a-radio-group v-decorator="['isRecv']">-->
<!-- <a-radio value="0">否</a-radio>-->
<!-- <a-radio value="1">是</a-radio>-->
<!-- </a-radio-group>-->
<!-- </a-form-item>-->
<!-- <a-form-item :labelCol="{span: 6}" :wrapperCol="{span: 8, offset: 1}" label="是否显示宽带办理">-->
<!-- <a-radio-group v-decorator="['isShowband']">-->
<!-- <a-radio value="0">不显示</a-radio>-->
<!-- <a-radio value="1">显示</a-radio>-->
<!-- </a-radio-group>-->
<!-- </a-form-item>-->
<!-- <a-form-item :labelCol="{span: 6}" :wrapperCol="{span: 8, offset: 1}" label="是否显示0息购机">-->
<!-- <a-radio-group v-decorator="['netPhone']">-->
<!-- <a-radio value="0">不显示</a-radio>-->
<!-- <a-radio value="1">显示</a-radio>-->
<!-- </a-radio-group>-->
<!-- </a-form-item>-->
<!-- <a-form-item :labelCol="{span: 6}" :wrapperCol="{span: 8, offset: 1}" label="是否显示融合办理">-->
<!-- <a-radio-group v-decorator="['isShowrh']">-->
<!-- <a-radio value="0">不显示</a-radio>-->
<!-- <a-radio value="1">显示</a-radio>-->
<!-- </a-radio-group>-->
<!-- </a-form-item>-->
<!-- <a-form-item :labelCol="{span: 6}" :wrapperCol="{span: 8, offset: 1}" label="是否已收到电信卡">-->
<!-- <a-radio-group v-decorator="['isRecv']">-->
<!-- <a-radio value="0">否</a-radio>-->
<!-- <a-radio value="1">是</a-radio>-->
<!-- </a-radio-group>-->
<!-- </a-form-item>-->
<a-form-item label="按钮配置" :labelCol="{span: 6}" :wrapperCol="{span: 8, offset: 1}">
<template>
<a-tree-select
show-search
v-model="buttons"
style="width: 100%"
:tree-data="treeData"
placeholder="请选择按钮配置"
allow-clear
tree-checkable
:show-checked-strategy="SHOW_PARENT"
multiple
:treeCheckStrictly=treeCheckStrictly
tree-default-expand-all
@change="onTreeChange"
>
<template>
<a-tree-select
show-search
v-model="buttons"
style="width: 100%"
:tree-data="treeData"
placeholder="请选择按钮配置"
allow-clear
tree-checkable
:show-checked-strategy="SHOW_PARENT"
multiple
:treeCheckStrictly=treeCheckStrictly
tree-default-expand-all
@change="onTreeChange"
>
</a-tree-select>
</template>
</a-tree-select>
</template>
</a-form-item>
<a-form-item :labelCol="{span: 6}" :wrapperCol="{span: 8, offset: 1}" label="随身厅终端编码">
<a-input placeholder="随身厅终端编码" v-decorator="[ 'appId' ]"></a-input>
<a-input placeholder="随身厅终端编码" v-decorator="[ 'appId' ]"></a-input>
</a-form-item>
<a-form-item :labelCol="{span: 6}" :wrapperCol="{span: 8, offset: 1}" label="随身厅终端密匙">
<a-input placeholder="随身厅终端密匙" v-decorator="[ 'appKey' ]"></a-input>
<a-input placeholder="随身厅终端密匙" v-decorator="[ 'appKey' ]"></a-input>
</a-form-item>
<a-form-item :labelCol="{span: 6}" :wrapperCol="{span: 8, offset: 1}" label="客服二维码">
<a-upload
......@@ -187,18 +191,43 @@
accept=".jpg"
>
<div>
<a-icon type="plus" />
<div class="ant-upload-text"> <span v-if="fileList.length==0">上传二维码</span> <span v-if="fileList.length>0">更换二维码</span> </div>
<a-icon type="plus"/>
<div class="ant-upload-text"><span v-if="fileList2.length==0">上传二维码</span> <span
v-if="fileList2.length>0">更换二维码</span></div>
</div>
</a-upload>
<a-modal :visible="previewVisible" :footer="null" @cancel="handleCancel">
<img alt="example" style="width: 100%" :src="previewImage"/>
</a-modal>
</a-form-item>
<a-form-item :labelCol="{span: 6}" :wrapperCol="{span: 8, offset: 1}" label="老用户升级套餐二维码">
<a-upload
ref="upload"
:action=uploadUrl2
listType="picture-card"
:fileList="fileList2"
:headers="header"
@preview="handlePreview"
@change="handleChange2"
:data="fileid"
accept=".jpg"
>
<div>
<a-icon type="plus"/>
<div class="ant-upload-text"><span v-if="fileList.length==0">上传二维码</span> <span
v-if="fileList.length>0">更换二维码</span></div>
</div>
</a-upload>
<a-modal :visible="previewVisible" :footer="null" @cancel="handleCancel">
<img alt="example" style="width: 100%" :src="previewImage" />
<img alt="example" style="width: 100%" :src="previewImage"/>
</a-modal>
</a-form-item>
<a-form-item :labelCol="{span: 6}" :wrapperCol="{span: 15, offset: 1}" label="套餐选择">
<a-checkbox-group v-model="chosePages" @change="chosePagesfunction">
<a-row>
<a-col :span="8" v-for=" (p,index) in package" v-if="index < more"><a-checkbox :value="p.value" >{{p.label}}</a-checkbox></a-col>
<a-col :span="8" v-for=" (p,index) in package" v-if="index < more">
<a-checkbox :value="p.value">{{p.label}}</a-checkbox>
</a-col>
</a-row>
<a-button @click="showMore" v-show="isShowMore">更多</a-button>
<a-button @click="hideMore" v-show="!isShowMore">收起</a-button>
......@@ -207,65 +236,66 @@
</a-form>
</a-modal>
<a-modal
title="批量导入"
:visible="impXXModal"
@ok="impOk"
@cancel="impCancel"
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>
title="批量导入"
:visible="impXXModal"
@ok="impOk"
@cancel="impCancel"
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>
选择文件
<a-button type="primary">选择文件</a-button>
</p>
</a-col>
<a-col :md="24" :sm="12">
<p v-show="yrymXXmoBan">
模板下载
<a-button type="primary" @click="downloadXXMoBan">学校导出模板</a-button>
</p>
</a-col>
</a-row>
</a-tooltip>
</import-btn>
<a-row :gutter="24">
<a-col :md="24" :sm="12">
<p v-show="yrymXXmoBan">
模板下载:
<a-button type="primary" @click="downloadXXMoBan">学校导出模板</a-button>
</p>
</a-col>
</a-row>
<a-row :gutter="24" :v-show="yrymXXmoBan">
<a-col :md="24" :sm="12">
<p>说明:</p>
<p>1.批量导入请严格按照模版进行导入;</p>
</a-col>
</a-row>
</a-modal>
<a-row :gutter="24" :v-show="yrymXXmoBan">
<a-col :md="24" :sm="12">
<p>说明:</p>
<p>1.批量导入请严格按照模版进行导入;</p>
</a-col>
</a-row>
</a-modal>
</div>
</template>
<script>
import Vue from 'vue'
import { ACCESS_TOKEN } from "@/store/mutation-types"
import {ACCESS_TOKEN} from "@/store/mutation-types"
import STable from '@/components/table';
import {
excelMBOut,
reportDownload,
findByList,
choosepages,
modify,
insert,
hidestatus,
deleteSchoolById,
excelMBOut,
reportDownload,
findByList,
choosepages,
modify,
insert,
hidestatus,
deleteSchoolById,
} from "../../../api/school-center/schoolManagermentAPI"
import {cloneObject,exportFile} from '@/utils/util';
import {cloneObject, exportFile} from '@/utils/util';
import moment from "moment";
import { TreeSelect } from 'ant-design-vue';
import {TreeSelect} from 'ant-design-vue';
const SHOW_PARENT = TreeSelect.SHOW_ALL;
import {getSchoolNames, initSubstName} from "../../../api/school-center/userManager/newUserAPI";
import ImportBtn from "../../../components/sysmanage/ImportBtn";
......@@ -281,7 +311,7 @@
data: function () {
return {
yrymXXmoBan: false,
impXXModal:false,
impXXModal: false,
importUrl: "",
importTile: "",
treeCheckStrictly: true,
......@@ -291,33 +321,34 @@
callback: false,
previewVisible: false,
previewImage: '',
fileList: [
],
header:{
"Authorization":Vue.ls.get(ACCESS_TOKEN)
fileList: [],
fileList2: [],
header: {
"Authorization": Vue.ls.get(ACCESS_TOKEN)
},
fileid:{},
brackgroundurl:"manager/ciop/school/schoolManagement/qrcodeUpload",
fileid: {},
brackgroundurl: "manager/ciop/school/schoolManagement/qrcodeUpload",
brackgroundurl2: "manager/ciop/school/schoolManagement/qrcodeUpload2",
// form
Formtable: this.$form.createForm(this, {name: 'Formtable'}),
titleName:"",
customimg:"",
titleName: "",
customimg: "",
buttons: [],
modifyForm: {
id:"",
id: "",
networkCode: '',
networkName: '',
subName:"",
schoolName:"",
netId:"",
lzgh:"",
lzUser:"",
bandproductId:'',
isShowband:"",
netPhone:"",
isShowrh:"",
isRecv:"",
chosePages:"",
subName: "",
schoolName: "",
netId: "",
lzgh: "",
lzUser: "",
bandproductId: '',
isShowband: "",
netPhone: "",
isShowrh: "",
isRecv: "",
chosePages: "",
datePeriod: new Array(),
greaterFifty: "",
greaterHundred: "",
......@@ -329,108 +360,125 @@
appId: ""
},
treeData: [
{
title: '首页按钮',
value: 'indexButton',
key: 'indexButton',
disabled: true,
children: [
{
title: '手机卡办理',
value: 'sjkbl',
key: 'sjkbl',
},{
title: '套餐升级',
value: 'tcsj',
key: 'tcsj',
children: [{
title: '手机卡套餐升级',
value: 'status',
key: 'status',
},{
title: '毕业生宽带优惠',
value: 'bysrh',
key: 'bysrh',
},{
title: '5G升级会员包',
value: 'sjktcsj',
key: 'sjktcsj',
}]
},{
title: '校园网办理',
value: 'isShowband',
key: 'isShowband',
{
title: '首页按钮',
value: 'indexButton',
key: 'indexButton',
disabled: true,
children: [
{
title: '普通校园网',
value: 'kdsl',
key: 'kdsl',
disabled: true,
},
{
title: '高速校园网',
value: 'isShowrh',
key: 'isShowrh',
disabled: true,
},
{
title: '是否甩单',
value: 'jiltKd',
key: 'jiltKd',
disabled: true,
},
]
},{
title: '校园网提速',
value: 'kdyBtn',
key: 'kdyBtn',
{
title: '手机卡办理',
value: 'sjkbl',
key: 'sjkbl',
}, {
title: '套餐升级',
value: 'tcsj',
key: 'tcsj',
children: [{
title: '手机卡套餐升级',
value: 'status',
key: 'status',
}, {
title: '毕业生宽带优惠',
value: 'bysrh',
key: 'bysrh',
}, {
title: '5G升级会员包',
value: 'sjktcsj',
key: 'sjktcsj',
}]
}, {
title: '校园网办理',
value: 'isShowband',
key: 'isShowband',
children: [
{
title: '普通校园网',
value: 'kdsl',
key: 'kdsl',
disabled: true,
},
{
title: '高速校园网',
value: 'isShowrh',
key: 'isShowrh',
disabled: true,
},
{
title: '是否甩单',
value: 'jiltKd',
key: 'jiltKd',
disabled: true,
},
]
}, {
title: '校园网提速',
value: 'kdyBtn',
key: 'kdyBtn',
children: [
{
title: '是否甩单',
value: 'jiltKdy',
key: 'jiltKdy',
disabled: true,
}
]
}, {
title: '优惠购机',
value: 'isShowyhgj',
key: 'isShowyhgj',
},
{
title: '毕业生优惠',
value: 'bysyhBTN',
key: 'bysyhBTN',
children: [
{
title: '新用户办理',
value: 'sjkbl',
key: 'sjkbl',
},
{
title: '老用户优惠',
value: 'lyhyh',
key: 'lyhyh',
}
]
}
],
},
{
title: '流程按钮',
value: 'processButton',
key: 'processButton',
disabled: true,
children: [
{
title: '是否甩单',
value: 'jiltKdy',
key: 'jiltKdy',
disabled: true,
}
]
},{
title: '优惠购机',
value: 'isShowyhgj',
key: 'isShowyhgj',
}
],
},
{
title: '流程按钮',
value: 'processButton',
key: 'processButton',
disabled: true,
children: [
{
title: '0息购机',
value: 'netPhone',
key: 'netPhone',
},
{
title: '线上线下',
value: 'udBtn',
key: 'udBtn',
},
{
title: '是否已收到电信卡',
value: 'isRecv',
key: 'isRecv',
},
],
},
{
title: '0息购机',
value: 'netPhone',
key: 'netPhone',
},
{
title: '线上线下',
value: 'udBtn',
key: 'udBtn',
},
{
title: '是否已收到电信卡',
value: 'isRecv',
key: 'isRecv',
},
],
},
],
subNames: [],
schoolNames: [],
subNameList: [],
packageName:[],
packageName: [],
more: 6,
package: [],
chosePages:[],
products:[],
chosePages: [],
products: [],
//输入框列表
queryParam: {
networkName: '',
......@@ -466,7 +514,7 @@
//表示
let obj = cloneObject(this.queryParam)
return findByList(Object.assign(params, obj)).then(res => {
console.log(res);
console.log(res);
let data = {};
if (res.state !== 'success') {
this.emptyText.emptyText = '查询失败!'
......@@ -478,7 +526,7 @@
totalCount: 0
}
} else {
if (res.data.records.length==0){
if (res.data.records.length == 0) {
return data
}
data = {
......@@ -487,21 +535,21 @@
pageNo: parameter.pageNo,
totalCount: res.data.total
}
if (this.subNameList.length==0){
res.data.records[0].subNameList.forEach((key)=>{
if (this.subNameList.length == 0) {
res.data.records[0].subNameList.forEach((key) => {
this.subNameList.push(key.subNameList)
})
res.data.records[0].packageName.forEach((key)=>{
let id=""+key.id
let d={
res.data.records[0].packageName.forEach((key) => {
let id = "" + key.id
let d = {
label: key.packageName,
value: id
}
this.packageName.push(d)
})
res.data.records[0].products.forEach((key)=>{
let productId=""+key.productId
let d={
res.data.records[0].products.forEach((key) => {
let productId = "" + key.productId
let d = {
productId: productId,
ProductUniversity: key.ProductUniversity
}
......@@ -514,28 +562,27 @@
}
}
},
watch: {
},
methods:{
watch: {},
methods: {
showMore() {
this.isShowMore = false;
this.more = (this.packageName.length + 1);
this.isShowMore = false;
this.more = (this.packageName.length + 1);
},
hideMore() {
this.isShowMore = true;
this.more = 6;
this.isShowMore = true;
this.more = 6;
},
onTreeChange(value) {
const values = [];
value.forEach(v => {
values.push(v.value);
})
this.modifyForm.buttons = values
const values = [];
value.forEach(v => {
values.push(v.value);
})
this.modifyForm.buttons = values
},
changeStartDate(dates, dateString) {
this.modifyForm.datePeriod = dates;
this.modifyForm.startDate = dateString[0];
this.modifyForm.endDate = dateString[1];
this.modifyForm.datePeriod = dates;
this.modifyForm.startDate = dateString[0];
this.modifyForm.endDate = dateString[1];
},
getuuid() {
return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
......@@ -544,16 +591,19 @@
return v.toString(16);
});
},
baseuploadUrl(){
baseuploadUrl() {
const env = process.env.NODE_ENV; //获取当前环境
let apis = "/";
if(env === 'development'){ //测试环境默认添加前缀
if (env === 'development') { //测试环境默认添加前缀
apis = '/api/';
}
return apis
},
uploadUrl(){
uploadUrl() {
return this.baseuploadUrl() + this.brackgroundurl
},
uploadUrl2() {
return this.baseuploadUrl() + this.brackgroundurl2
}
,
//背景图
......@@ -565,23 +615,30 @@
this.previewVisible = true;
},
handleChange(obj) {
if (this.fileList.length==2){
this.fileList.splice(0,1)
}else{
if (this.fileList.length == 2) {
this.fileList.splice(0, 1)
} else {
this.fileList = obj.fileList;
}
},
delet(deletdata){
let status=0;
if(deletdata.status==0){
status=1
handleChange2(obj) {
if (this.fileList2.length == 2) {
this.fileList2.splice(0, 1)
} else {
this.fileList2 = obj.fileList;
}
},
delet(deletdata) {
let status = 0;
if (deletdata.status == 0) {
status = 1
}
let parent = {
id: deletdata.id,
status: status
}
hidestatus(parent).then(res=>{
if (res.state=="success"){
hidestatus(parent).then(res => {
if (res.state == "success") {
this.$message.success(res.data ? res.data : '修改成功!', 5);
this.search();
return null
......@@ -589,12 +646,12 @@
this.$message.error(res.data ? res.data : '修改失败!', 5);
})
},
deleteSchool (deleteDate){
deleteSchool(deleteDate) {
let parent = {
id: deleteDate.id,
}
deleteSchoolById(parent).then(res =>{
if (res.state=="success"){
deleteSchoolById(parent).then(res => {
if (res.state == "success") {
this.$message.success(res.data ? res.data : '修改成功!', 5);
this.search();
return null
......@@ -602,29 +659,29 @@
this.$message.error(res.data ? res.data : res.msg, 5);
})
},
chosePagesfunction(data){
this.chosePages=data
chosePagesfunction(data) {
this.chosePages = data
},
search() {
this.$refs.table.refresh({search: true})
},
// 执行上传
doPush(res) {
if (!res || !res.response) {
this.$message.error("上传文件出错!", 10);
return false;
}
const response = res.response;
if (response.state !== "success") {
this.$message.error(response.msg ? response.msg : "上传文件出错!", 10);
return false;
}
this.$message.success("上传成功!" + response.data, 5);
this.impXXModal = false;
if (!res || !res.response) {
this.$message.error("上传文件出错!", 10);
return false;
}
const response = res.response;
if (response.state !== "success") {
this.$message.error(response.msg ? response.msg : "上传文件出错!", 10);
return false;
}
this.$message.success("上传成功!" + response.data, 5);
this.impXXModal = false;
},
add(){
this.titleName="添加"
add() {
this.titleName = "添加"
this.isShowMore = true;
this.more = 6;
this.chosePages = [];
......@@ -634,46 +691,53 @@
this.modifyForm.buttons = [];
this.modifyForm.appKey = "";
this.modifyForm.appId = "";
setTimeout(()=>{
setTimeout(() => {
this.Formtable.setFieldsValue({
networkCode: '',
networkName: '',
greaterFifty: "",
greaterHundred: "",
})
},0)
}, 0)
this.buttons = [];
this.modifyvisible=true;
this.modifyvisible = true;
const temp = [];
this.packageName.forEach(pName => {
temp.push(pName);
temp.push(pName);
})
this.package = temp;
},
modifyfunction(data){
modifyfunction(data) {
// 清空编辑选中内容
this.isShowMore = true;
this.fileList = [];
this.fileList2 = [];
this.more = 6;
// 初始化按钮配置显示值
this.buttons = [];
// 初始化按钮配置选中值
this.modifyForm.buttons = [];
//初始化
this.titleName="编辑学校"
let choosepagespare={
id:data.id
this.titleName = "编辑学校"
let choosepagespare = {
id: data.id
}
this.fileid={
id:data.id
this.fileid = {
id: data.id
}
let url= "";
let url = "";
if (data.serviceQrcode != undefined) {
url = this.baseuploadUrl()+"app/ciop"+data.serviceQrcode.replace("enclosure", "");
}else{
url = this.baseuploadUrl()+"app/";
url = this.baseuploadUrl() + "app/ciop" + data.serviceQrcode.replace("enclosure", "");
} else {
url = this.baseuploadUrl() + "app/";
}
if (data.packageQrcode != undefined) {
url = this.baseuploadUrl() + "app/ciop" + data.packageQrcode.replace("enclosure", "");
} else {
url = this.baseuploadUrl() + "app/";
}
if (!(data.serviceQrcode == null || data.serviceQrcode=="")) {
if (!(data.serviceQrcode == null || data.serviceQrcode == "")) {
//下载图片浏览
this.fileList.push({
uid: this.getuuid(),
......@@ -682,7 +746,16 @@
url: url,
})
}
this.modifyForm.id=data.id
if (!(data.packageQrcode == null || data.packageQrcode == "")) {
//下载图片浏览
this.fileList2.push({
uid: this.getuuid(),
name: '找不到图片',
status: 'done',
url: url,
})
}
this.modifyForm.id = data.id
this.chosePages = [];
const head = [];
const temp = [];
......@@ -691,24 +764,24 @@
})
this.package = [];
//查询中间表
choosepages(choosepagespare).then(res=>{
if (res.state == 'success'){
choosepages(choosepagespare).then(res => {
if (res.state == 'success') {
let d = res.data.choosepages
for (let i = 0; i <d.length ; i++) {
for (let i = 0; i < d.length; i++) {
this.chosePages.push(d[i])
for(let j = 0; j < temp.length; ++j) {
if (this.chosePages.indexOf(temp[j].value) != -1) {
head.push(temp[j]);
temp.splice(j,1);
break;
}
for (let j = 0; j < temp.length; ++j) {
if (this.chosePages.indexOf(temp[j].value) != -1) {
head.push(temp[j]);
temp.splice(j, 1);
break;
}
}
}
if (head.length == 0) {
this.package = this.packageName;
}else{
for(let i = 0; i < temp.length; ++i) {
head.push(temp[i]);
this.package = this.packageName;
} else {
for (let i = 0; i < temp.length; ++i) {
head.push(temp[i]);
}
this.package = head;
}
......@@ -719,7 +792,7 @@
this.modifyForm.datePeriod = [];
this.modifyForm.startDate = "";
this.modifyForm.endDate = "";
}else{
} else {
this.modifyForm.datePeriod = [moment(new Date(data.startDate)), moment(new Date(data.endDate))];
this.modifyForm.startDate = moment(new Date(data.startDate)).format("YYYY-MM-DD");
this.modifyForm.endDate = moment(new Date(data.endDate)).format("YYYY-MM-DD");
......@@ -728,7 +801,7 @@
if (data.isShowrh == 1) {
buttons.push({label: "高速校园网", value: "isShowrh"});
}
if(data.isRecv == 1) {
if (data.isRecv == 1) {
buttons.push({label: "是否已收到电信卡", value: "isRecv"});
}
if (data.isShowband == 1) {
......@@ -738,51 +811,54 @@
buttons.push({label: "0息购机", value: "netPhone"});
}
if (data.sjkbl == 1) {
buttons.push({label: "手机卡办理", value: "sjkbl"});
buttons.push({label: "手机卡办理", value: "sjkbl"});
}
if (data.lyhyh == 1) {
buttons.push({label: "老用户优惠", value: "lyhyh"});
}
if (data.tcsj == 1) {
buttons.push({label: "套餐升级", value: "tcsj"});
buttons.push({label: "套餐升级", value: "tcsj"});
}
if (data.status == 1) {
buttons.push({label: "手机卡套餐升级", value: "status"});
buttons.push({label: "手机卡套餐升级", value: "status"});
}
if (data.bysrh == 1) {
buttons.push({label: "毕业生宽带优惠", value: "bysrh"});
buttons.push({label: "毕业生宽带优惠", value: "bysrh"});
}
if (data.sjktcsj == 1) {
buttons.push({label: "5G加装包", value: "sjktcsj"});
buttons.push({label: "5G加装包", value: "sjktcsj"});
}
if (data.kdsl == 1) {
buttons.push({label: "普通校园网", value: "kdsl"});
buttons.push({label: "普通校园网", value: "kdsl"});
}
if (data.jiltKd == 1) {
buttons.push({label: "是否甩单", value: "jiltKd"});
buttons.push({label: "是否甩单", value: "jiltKd"});
}
if (data.kdyBtn == 1) {
buttons.push({label: "校园网提速", value: "kdyBtn"});
buttons.push({label: "校园网提速", value: "kdyBtn"});
}
if (data.jiltKdy == 1) {
buttons.push({label: "是否甩单", value: "jiltKdy"});
buttons.push({label: "是否甩单", value: "jiltKdy"});
}
if (data.isShowyhgj == 1) {
buttons.push({label: "优惠购机", value: "isShowyhgj"});
buttons.push({label: "优惠购机", value: "isShowyhgj"});
}
if (data.udBtn == 1) {
buttons.push({label: "线上线下", value: "udBtn"});
buttons.push({label: "线上线下", value: "udBtn"});
}
this.buttons = buttons;
// 初始化选中值
this.onTreeChange(this.buttons);
setTimeout(()=>{
setTimeout(() => {
this.Formtable.setFieldsValue({
subName:data.subName,
schoolName:data.schoolName,
bandproductId:data.bandproductId,
netId:data.netId,
lzgh:data.lzgh,
lzUser:data.lzUser,
subName: data.subName,
schoolName: data.schoolName,
bandproductId: data.bandproductId,
netId: data.netId,
lzgh: data.lzgh,
lzUser: data.lzUser,
networkName: data.networkName,
networkCode: data.networkCode,
greaterFifty: data.greaterFifty,
......@@ -790,14 +866,14 @@
appKey: data.appKey,
appId: data.appId,
})
},50)
this.customimg="./img/custom"+data.serviceQrcode
this.modifyvisible=true;
}, 50)
this.customimg = "./img/custom" + data.serviceQrcode
this.modifyvisible = true;
},
//提交表单
createfunctionOk(){
this.Formtable.validateFields(['networkCode','networkName','schoolName', 'bandproductId',"subName","lzgh","lzUser", 'netId',"isShowband", 'isShowrh',"netPhone" ,'isRecv','greaterFifty','greaterHundred', 'appId', 'appKey'], {force: true}, (err, values)=>{
if (!err){
createfunctionOk() {
this.Formtable.validateFields(['networkCode', 'networkName', 'schoolName', 'bandproductId', "subName", "lzgh", "lzUser", 'netId', "isShowband", 'isShowrh', "netPhone", 'isRecv', 'greaterFifty', 'greaterHundred', 'appId', 'appKey'], {force: true}, (err, values) => {
if (!err) {
this.modifyForm.networkCode = values.networkCode
this.modifyForm.networkName = values.networkName == undefined ? "" : values.networkName
this.modifyForm.subName = values.subName
......@@ -814,8 +890,8 @@
this.modifyForm.appKey = values.appKey;
// 日期类型不传入后端
Vue.delete(this.modifyForm,'startDate');
Vue.delete(this.modifyForm,'endDate');
Vue.delete(this.modifyForm, 'startDate');
Vue.delete(this.modifyForm, 'endDate');
this.modifyForm.greaterFifty = values.greaterFifty == undefined ? "" : values.greaterFifty
this.modifyForm.greaterHundred = values.greaterHundred == undefined ? "" : values.greaterHundred
this.modifyForm.isShowrh = (this.modifyForm.buttons.indexOf("isShowrh") > -1) ? 1 : 0;
......@@ -824,6 +900,7 @@
this.modifyForm.isRecv = (this.modifyForm.buttons.indexOf("isRecv") > -1) ? 1 : 0;
this.modifyForm.sjkbl = (this.modifyForm.buttons.indexOf("sjkbl") > -1) ? 1 : 0;
this.modifyForm.lyhyh = (this.modifyForm.buttons.indexOf("lyhyh") > -1) ? 1 : 0;
this.modifyForm.tcsj = (this.modifyForm.buttons.indexOf("tcsj") > -1) ? 1 : 0;
this.modifyForm.sjktcsj = (this.modifyForm.buttons.indexOf("sjktcsj") > -1) ? 1 : 0;
this.modifyForm.bysrh = (this.modifyForm.buttons.indexOf("bysrh") > -1) ? 1 : 0;
......@@ -838,22 +915,22 @@
this.modifyForm.udBtn = (this.modifyForm.buttons.indexOf("udBtn") > -1) ? 1 : 0;
this.chosePages.forEach(value => {
if (value!=undefined && this.modifyForm.chosePages.indexOf(value) == -1){
this.modifyForm.chosePages=value+","+this.modifyForm.chosePages
if (value != undefined && this.modifyForm.chosePages.indexOf(value) == -1) {
this.modifyForm.chosePages = value + "," + this.modifyForm.chosePages
}
})
//插入数据
if (this.modifyForm.id==""){
if (this.modifyForm.id == "") {
for (let key in this.modifyForm) {
if (this.modifyForm[key]==undefined){
this.modifyForm[key]=""
}
if (this.modifyForm[key] == undefined) {
this.modifyForm[key] = ""
}
}
insert(this.modifyForm).then(res=>{
if (res.state=="success") {
insert(this.modifyForm).then(res => {
if (res.state == "success") {
this.$message.success(res.data ? res.data : '添加成功!', 5);
this.search();
this.modifyvisible=false
this.modifyvisible = false
return null;
}
this.$message.error(res.data ? res.data : '添加失败!', 5);
......@@ -861,11 +938,11 @@
return null;
}
//修改数据
modify(this.modifyForm).then(res=>{
if (res.state=="success") {
modify(this.modifyForm).then(res => {
if (res.state == "success") {
this.$message.success(res.data ? res.data : '修改成功!', 5);
this.search();
this.modifyvisible=false;
this.modifyvisible = false;
return null;
}
this.$message.error(res.data ? res.data : '修改失败!', 5);
......@@ -874,27 +951,28 @@
})
},
createfunctionCancel(){
createfunctionCancel() {
this.Formtable.setFieldsValue({
subName:"",
schoolName:"",
netId:"",
lzgh:"",
lzUser:"",
bandproductId:"",
isShowband:"",
netPhone:"",
isShowrh:"",
isRecv:"",
subName: "",
schoolName: "",
netId: "",
lzgh: "",
lzUser: "",
bandproductId: "",
isShowband: "",
netPhone: "",
isShowrh: "",
isRecv: "",
greaterFifty: '',
greaterHundred: ''
})
this.fileList=[]
this.modifyForm.id=""
this.modifyForm.chosePages=""
this.fileList = []
this.fileList2 = []
this.modifyForm.id = ""
this.modifyForm.chosePages = ""
this.modifyForm.datePeriod = [];
this.chosePages = [];
this.modifyvisible=false;
this.modifyvisible = false;
},
getSchoolNames() {
this.schoolNames = []
......@@ -929,49 +1007,49 @@
})
},
excelOut() {
this.callback = true;
let today = new Date();
today.setTime(today.getTime());
let s2 = today.getFullYear() + "-" + (today.getMonth() + 1) + "-" + today.getDate();
exportFile(
reportDownload(this.queryParam),
"校园信息列表" + s2 + ".xlsx",
this.downloadstatu
);
this.callback = true;
let today = new Date();
today.setTime(today.getTime());
let s2 = today.getFullYear() + "-" + (today.getMonth() + 1) + "-" + today.getDate();
exportFile(
reportDownload(this.queryParam),
"校园信息列表" + s2 + ".xlsx",
this.downloadstatu
);
},
downloadXXMoBan:function (){
exportFile(excelMBOut(), "学校列表模板.xlsx");
downloadXXMoBan: function () {
exportFile(excelMBOut(), "学校列表模板.xlsx");
},
downloadstatu() {
this.callback = false;
this.callback = false;
},
impOk() {
},
impCancel() {
this.impXXModal = false;
this.clearmodel();
this.impXXModal = false;
this.clearmodel();
},
imp(){
this.handleSubmit1();
imp() {
this.handleSubmit1();
},
clearmodel() {
this.importTile = "";
this.yrymXXmoBan = false;
this.importTile = "";
this.yrymXXmoBan = false;
this.importUrl = "";
this.importUrl = "";
},
handleSubmit1() {
this.importTile = "学校导入";
this.yrymXXmoBan = true;
this.importUrl = "manager/ciop/school/schoolManagement/importDate";
this.impXXModal = true;
this.importTile = "学校导入";
this.yrymXXmoBan = true;
this.importUrl = "manager/ciop/school/schoolManagement/importDate";
this.impXXModal = true;
},
},
mounted() {
this.initSubstName();
this.getSchoolNames();
},
}
},
mounted() {
this.initSubstName();
this.getSchoolNames();
},
}
</script>
<style scoped>
......
......@@ -424,7 +424,7 @@
}
/deep/ .ant-form-item {
margin-bottom: 24vw / @vw;
margin-bottom: 12vw / @vw;
}
@media (min-width: 1920px) {
......@@ -448,7 +448,7 @@
/deep/ .user-layout-login div .ant-input {
width: 100%;
height: 68vw / @vw;
height: 58vw / @vw;
margin-bottom: 15vw / @vw;
padding-left: 44vw / @vw;
background: rgba(245, 245, 245, 1);
......
......@@ -35,14 +35,35 @@
</a-form-item>
</a-col>
<a-col :span="10">
<j-graphic-code @success="generateCode" style="float: right"></j-graphic-code>
</a-col>
</a-row>
<a-row :gutter="0">
<a-col :span="14">
<a-form-item>
<a-input
v-decorator="['phoneCode',validatorRules.phoneCode]"
size="large"
type="text"
placeholder="请输入验证码">
<a-icon
slot="prefix"
v-if=" inputCodeContent==verifiedCode "
type="smile"
:style="{ color: 'rgba(0,0,0,.25)' }"/>
<a-icon slot="prefix" v-else type="frown" :style="{ color: 'rgba(0,0,0,.25)' }"/>
</a-input>
</a-form-item>
</a-col>
<a-col :span="10">
<a-button
size="small"
type="primary"
htmlType="submit"
class="code-button"
:loading="loginBtn"
@click.stop.prevent="getCode"
:disabled="loginBtn">{{codeMsg}}
:disabled="!loginBtn">{{codeMsg}}
</a-button>
<!-- <j-graphic-code @success="generateCode" style="float: right"></j-graphic-code>-->
</a-col>
......@@ -54,7 +75,7 @@
size="large"
type="password"
autocomplete="false"
placeholder="新密码(6-12位数字和字母组合)">
placeholder="新密码(6-12位数字+字母+字符组合)">
<a-icon slot="prefix" type="lock" :style="{ color: 'rgba(0,0,0,.25)' }"/>
</a-input>
</a-form-item>
......@@ -76,9 +97,8 @@
type="primary"
htmlType="submit"
class="login-button"
:loading="loginBtn"
@click.stop.prevent="handleSubmit"
:disabled="loginBtn">确定
:disabled="!loginBtn">确定
</a-button>
</a-form>
......@@ -144,6 +164,7 @@ export default {
created() {
Vue.ls.remove(ACCESS_TOKEN)
this.getRouterData();
console.log(this.loginBtn)
},
methods: {
// handler
......@@ -160,6 +181,10 @@ export default {
this.customActiveKey = key
// this.form.resetFields()
},
generateCode(value) {
this.loginBtn = false;
this.verifiedCode = value.toLowerCase()
},
getCode(){
// 验证码60秒倒计时
if (!this.timer) {
......@@ -194,6 +219,8 @@ export default {
}
},
handleSubmit() {
var space=/\s/;// 判断必须非空格
let that = this
let loginParams = {
......@@ -204,15 +231,24 @@ export default {
verificationCode:"",
newPwd:"",
rePwd:''
}
};
// 确定修改密码
that.form.validateFields(['username', 'password', 'password2', 'inputCode'], {force: true}, (err, values) => {
that.form.validateFields(['username', 'password', 'password2', 'phoneCode'], {force: true}, (err, values) => {
if(this.getLvl(values.password)){
this.registerRrror("密码需为6-12位字母+数字+字符组合")
return null;
}
if (/\s/.test(values.password)){
this.registerRrror("密码不能存在空格")
return null;
}
if (!err) {
values.password = encodeURIComponent(this.getPass(values.password));
values.password2 = encodeURIComponent(this.getPass(values.password2));
let data = {
account: values.username,
verificationCode: values.inputCode,
verificationCode: values.phoneCode,
newPwd: values.password,
rePwd: values.password
}
......@@ -227,6 +263,21 @@ export default {
})
},
getLvl(pwd) {
let lvl = 0;//默认是0级别
//密码中是否有数字,或者是字母,或者是特殊符号
if(/[0-9]/.test(pwd)){//如果有数字返回true,就让级别++变成1级了
lvl++;
}
if(/[a-zA-Z]/.test(pwd)){
lvl++;
}
if(/[^0-9a-zA-Z_]/.test(pwd)){
lvl++;
}
return lvl !== 3
},
requestFailed(err) {
this.$notification['error']({
message: '登录失败',
......@@ -260,9 +311,6 @@ export default {
callback("您输入的验证码不正确!");
}
},
inputCodeChange(e) {
},
getRouterData() {
this.$nextTick(() => {
this.form.setFieldsValue({
......@@ -270,6 +318,30 @@ export default {
});
})
},
inputCodeChange(e) {
this.inputCodeContent = e.target.value
if (!e.target.value || 0 == e.target.value) {
this.inputCodeNull = true
} else {
this.inputCodeContent = this.inputCodeContent.toLowerCase()
this.inputCodeNull = false
}
if (this.verifiedCode == this.inputCodeContent) {
this.form.validateFields(['username'], {force: true}, (err, values) => {
if (!err && this.countdown == 0) {
clearInterval(this.timer);
this.codeMsg = "获取验证码";
this.countdown = 60;
this.timer = null;
this.formLogin.username = values.username
this.getCode()
}
console.log(123)
this.loginBtn = true
})
}
},
validateToNextPassword (rule, value, callback) {
const form = this.form;
if (value!= form.getFieldValue("password")) {
......@@ -314,7 +386,7 @@ export default {
width: calc(100% - 666vw/@vw);
height: 792vw/@vw;
box-sizing: border-box;
padding:80vw/@vw 80vw/@vw 0 60vw/@vw;
padding:0 80vw/@vw 0 60vw/@vw;
float:left;
.form_title{
font-size:40vw/@vw;
......@@ -327,7 +399,7 @@ export default {
border-bottom: 6vw/@vw solid #57bbff;
}
/deep/ .ant-form-item{
margin-bottom: 24vw/@vw;
margin-bottom: 12vw/@vw;
}
@media (min-width: 1920px) {
/deep/.ant-input-affix-wrapper .ant-input-prefix{
......
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