Skip to content

G
gdtel-gztel-school-center-ui
Commit f3eb94bb by 陈浩建
Options

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	src/views/school-center/order/order.vue
parents 60180863 77979758
Showing with 668 additions and 45 deletions
package.json
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
"clipboard": "^2.0.4", "clipboard": "^2.0.4",
"codemirror": "^5.49.2", "codemirror": "^5.49.2",
"dayjs": "^1.8.17", "dayjs": "^1.8.17",
"echarts": "^4.5.0", "echarts": "^4.9.0",
"enquire.js": "^2.1.6", "enquire.js": "^2.1.6",
"html2canvas": "^1.0.0-rc.5", "html2canvas": "^1.0.0-rc.5",
"js-cookie": "^2.2.1", "js-cookie": "^2.2.1",
...@@ -29,6 +29,8 @@ ...@@ -29,6 +29,8 @@
"lodash.pick": "^4.4.0", "lodash.pick": "^4.4.0",
"mavon-editor": "^2.9.0", "mavon-editor": "^2.9.0",
"md5": "^2.2.1", "md5": "^2.2.1",
"moment": "^2.29.1",
"npm": "^6.14.9",
"nprogress": "^0.2.0", "nprogress": "^0.2.0",
"qrcodejs2": "^0.0.2", "qrcodejs2": "^0.0.2",
"reqwest": "^2.0.5", "reqwest": "^2.0.5",
......
src/api/appConfig.js 0 → 100644
/**
* 应用配置api管理
*/
import { getAction, postAction } from '@/api/manage'
const prefix = '/manager/ciop';
let getList = (params) => getAction(prefix+"/appConfig/list", params);
let getInfo = (params) => getAction(prefix+"/appConfig/getConfigInfo", params);
let add = (params) => postAction(prefix+"/appConfig/add", params);
let update = (params) => postAction(prefix+"/appConfig/update", params);
export {
getList,
getInfo,
add,
update
}
src/views/school-center/broadbandList/RhPhone.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="8">
<a-form-item label="手机号：">
<a-input placeholder="手机号" v-model="queryParam.orderCustomerAccount"></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-divider type="vertical"/>
<a-button @click="add()" type="primary">添加</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-popconfirm title="是否要删除此行？" @confirm="deleteActivity(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="840px">
<a-form :form="Formtable">
<a-form-item :labelCol="{span: 6}" :wrapperCol="{span: 8, offset: 1}" label="手机号">
<a-input v-decorator="[ 'sort', {rules: [{ required: true, type:'number', message: '手机号！' ,whitespace:true,transform:(value)=> {return Number(value)} }]} ]"></a-input>
</a-form-item>
</a-form>
</a-modal>
</div>
</template>
<script>
import STable from '@/components/table';
import {cloneObject} from '@/utils/util';
export default {
name: "RhPhone",
components: {
STable,
},
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'}),
titleName:"",
modifyForm: {
accountNumber:"",
},
subNameList: [],
packageName:[],
chosePages:[],
products:[],
//输入框列表
queryParam: {
accountNumber: '',
},
modifyvisible: false,
visiblepicture: false,
columns: [
{dataIndex: 'phone', width: 200, title: '手机号', align: "center"},
{
dataIndex: 'operation',
width: 200,
title: '操作',
align: "center",
scopedSlots: {customRender: 'operation'},
fixed: "right"
}]
,
rowdata: parameter => {
}
}
},
methods:{
deleteActivity(id){
},
search() {
this.$refs.table.refresh({search: true})
},
add(){
this.titleName="添加"
this.modifyForm.id = '';
setTimeout(()=>{
this.Formtable.setFieldsValue({
phone:""
})
},0)
this.modifyvisible=true;
},
//提交表单
createfunctionOk(){
},
createfunctionCancel(){
},
}
}
</script>
<style scoped>
</style>
src/views/school-center/broadbandList/kdyList.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="8">
<a-form-item label="多媒体账号：">
<a-input placeholder="多媒体账号" v-model="queryParam.accountNumber"></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-divider type="vertical"/>
<a-button @click="add()" type="primary">添加</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>
<a-divider type="vertical"/>
<a-popconfirm title="是否要删除此行？" @confirm="deleteActivity(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="840px">
<a-form :form="Formtable">
<a-form-item :labelCol="{span: 6}" :wrapperCol="{span: 8, offset: 1}" label="宽带接入号">
<a-input v-decorator="[ 'sort', {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 v-decorator="[ 'sort', {rules: [{ required: true, type:'number', message: '多媒体账号不能为空！' ,whitespace:true,transform:(value)=> {return Number(value)} }]} ]"></a-input>
</a-form-item>
</a-form>
</a-modal>
</div>
</template>
<script>
import STable from '@/components/table';
import {cloneObject} from '@/utils/util';
export default {
name: "kdyList",
components: {
STable,
},
data: function () {
return {
emptyText: {emptyText: '暂无数据'},
fileList: [
],
apis:'',
// form
Formtable: this.$form.createForm(this, {name: 'Formtable'}),
titleName:"",
modifyForm: {
id: '',
accountNumber:"",
},
chosePages:[],
//输入框列表
queryParam: {
id: '',
accountNumber: '',
},
modifyvisible: false,
visiblepicture: false,
columns: [
{dataIndex: 'id', width: 200, title: '宽带接入号', align: "center"},
{dataIndex: 'accountNumber', width: 200, title: '多媒体账号', align: "center"},
{
dataIndex: 'operation',
width: 200,
title: '操作',
align: "center",
scopedSlots: {customRender: 'operation'},
fixed: "right"
}]
,
rowdata: parameter => {
}
}
},
methods:{
deleteActivity(id){
},
search() {
this.$refs.table.refresh({search: true})
},
add(){
this.titleName="添加"
this.modifyForm.id = '';
setTimeout(()=>{
this.Formtable.setFieldsValue({
id: '',
accountNumber:"",
})
},0)
this.modifyvisible=true;
},
modifyfunction(data){
},
//提交表单
createfunctionOk(){
},
createfunctionCancel(){
},
}
}
</script>
<style scoped>
</style>
src/views/school-center/broadbandList/multimediaAccount.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="8">
<a-form-item label="多媒体账号：">
<a-input placeholder="多媒体账号" v-model="queryParam.orderCustomerAccount"></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-divider type="vertical"/>
<a-button @click="add()" type="primary">添加</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-popconfirm title="是否要删除此行？" @confirm="deleteActivity(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="840px">
<a-form :form="Formtable">
<a-form-item :labelCol="{span: 6}" :wrapperCol="{span: 8, offset: 1}" label="排序号">
<a-input v-decorator="[ 'sort', {rules: [{ required: true, type:'number', message: '排序号不能为空！' ,whitespace:true,transform:(value)=> {return Number(value)} }]} ]"></a-input>
</a-form-item>
</a-form>
</a-modal>
</div>
</template>
<script>
import STable from '@/components/table';
import {cloneObject} from '@/utils/util';
export default {
name: "multimediaAccount",
components: {
STable,
},
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'}),
titleName:"",
modifyForm: {
id: '',
accountNumber:"",
},
subNameList: [],
packageName:[],
chosePages:[],
products:[],
//输入框列表
queryParam: {
id: '',
accountNumber: '',
},
modifyvisible: false,
visiblepicture: false,
columns: [
{dataIndex: '', width: 200, title: '宽带接入号', align: "center"},
{dataIndex: 'orderCustomerAccount', width: 200, title: '多媒体账号', align: "center"},
{
dataIndex: 'operation',
width: 200,
title: '操作',
align: "center",
scopedSlots: {customRender: 'operation'},
fixed: "right"
}]
,
rowdata: parameter => {
}
}
},
methods:{
deleteActivity(id){
},
search() {
this.$refs.table.refresh({search: true})
},
add(){
this.titleName="添加"
this.modifyForm.id = '';
setTimeout(()=>{
this.Formtable.setFieldsValue({
id: '',
accountNumber:"",
})
},0)
this.modifyvisible=true;
},
//提交表单
createfunctionOk(){
},
createfunctionCancel(){
},
}
}
</script>
<style scoped>
</style>
src/views/school-center/order/order.vue
...@@ -1284,11 +1284,10 @@ ...@@ -1284,11 +1284,10 @@
this.edit = false; this.edit = false;
}, },
showDrawer(data,type) { showDrawer(data,type) {
this.certificatePhoto.push(this.apis + (data.idCardz != null ? data.idCardz.replace("manager", "app") : ""));
this.certificatePhoto.push(this.apis + data.idCardz); this.certificatePhoto.push(this.apis + (data.idCardf != null ? data.idCardf.replace("manager", "app") : ""));
this.certificatePhoto.push(this.apis + data.idCardf); this.certificatePhoto.push(this.apis + (data.idCardzs != null ? data.idCardzs.replace("manager", "app") : ""));
this.certificatePhoto.push(this.apis + data.idCardzs); this.certificatePhoto.push(this.apis + (data.studentCard != null ? data.studentCard.replace("manager", "app") : ""));
this.certificatePhoto.push(this.apis + data.studentCard);
/* this.certificatePhoto.push('http://yrym.winsun-aly.com/gdtel-xyzx-hhr/images/yrym-ruanyan-logo.png') /* this.certificatePhoto.push('http://yrym.winsun-aly.com/gdtel-xyzx-hhr/images/yrym-ruanyan-logo.png')
this.certificatePhoto.push('http://yrym.winsun-aly.com/gdtel-xyzx-hhr/images/yrym-ruanyan-logo.png') this.certificatePhoto.push('http://yrym.winsun-aly.com/gdtel-xyzx-hhr/images/yrym-ruanyan-logo.png')
this.certificatePhoto.push('http://yrym.winsun-aly.com/gdtel-xyzx-hhr/images/yrym-ruanyan-logo.png') this.certificatePhoto.push('http://yrym.winsun-aly.com/gdtel-xyzx-hhr/images/yrym-ruanyan-logo.png')
......
src/views/school-center/productManagement/package.vue
...@@ -170,8 +170,8 @@ ...@@ -170,8 +170,8 @@
fileListxiaotu:[], fileListxiaotu:[],
fileid:{}, fileid:{},
brackgroundurl:"manager/ciop/packageManagement/package/backgroundUpload", brackgroundurl:"app/ciop/packageManagement/package/backgroundUpload",
xiaotuurl:"manager/ciop/packageManagement/package/xiaotuUpload", xiaotuurl:"app/ciop/packageManagement/package/xiaotuUpload",
Formtable: this.$form.createForm(this, {name: 'Formtable'}), Formtable: this.$form.createForm(this, {name: 'Formtable'}),
//输入框列表 //输入框列表
autoCompleteResult:[], autoCompleteResult:[],
...@@ -345,7 +345,7 @@ ...@@ -345,7 +345,7 @@
this.fileid={ this.fileid={
id:data.id id:data.id
} }
let url=this.baseuploadUrl()+"manager/ciop"+data.advImg.replace("enclosure","ciop") let url=this.baseuploadUrl()+"app/ciop"+data.advImg.replace("enclosure","ciop")
if (!(data.advImg == null || data.advImg=="")) { if (!(data.advImg == null || data.advImg=="")) {
//下载图片浏览 //下载图片浏览
this.fileList.push({ this.fileList.push({
...@@ -358,7 +358,7 @@ ...@@ -358,7 +358,7 @@
//下载图片浏览 //下载图片浏览
if (!(data.logo == null || data.logo == "")) { if (!(data.logo == null || data.logo == "")) {
let xiaotuurl = this.baseuploadUrl() +"manager/ciop"+ data.logo.replace("enclosure","ciop") let xiaotuurl = this.baseuploadUrl() +"app/ciop"+ data.logo.replace("enclosure","ciop")
this.fileListxiaotu.push({ this.fileListxiaotu.push({
uid: this.getuuid(), uid: this.getuuid(),
name: '找不到图片', name: '找不到图片',
......
src/views/school-center/schoolmanager/schoolmanagement.vue
...@@ -146,6 +146,14 @@ ...@@ -146,6 +146,14 @@
</a-tree-select> </a-tree-select>
</template> </template>
</a-form-item> </a-form-item>
<a-form-item :labelCol="{span: 6}" :wrapperCol="{span: 8, offset: 1}" label="随身厅终端编码">
<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-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-upload <a-upload
ref="upload" ref="upload"
...@@ -212,7 +220,7 @@ ...@@ -212,7 +220,7 @@
"Authorization":Vue.ls.get(ACCESS_TOKEN) "Authorization":Vue.ls.get(ACCESS_TOKEN)
}, },
fileid:{}, fileid:{},
brackgroundurl:"manager/ciop/school/schoolManagement/qrcodeUpload", brackgroundurl:"app/ciop/school/schoolManagement/qrcodeUpload",
// form // form
Formtable: this.$form.createForm(this, {name: 'Formtable'}), Formtable: this.$form.createForm(this, {name: 'Formtable'}),
titleName:"", titleName:"",
...@@ -239,6 +247,8 @@ ...@@ -239,6 +247,8 @@
endDateStr: "", endDateStr: "",
startDate: "", startDate: "",
endDate: "", endDate: "",
appKey: "",
appId: ""
}, },
treeData: [ treeData: [
{ {
...@@ -257,8 +267,8 @@ ...@@ -257,8 +267,8 @@
key: 'tcsj', key: 'tcsj',
children: [{ children: [{
title: '手机卡套餐升级', title: '手机卡套餐升级',
value: 'sjktcsj', value: 'status',
key: 'sjktcsj', key: 'status',
},{ },{
title: '毕业生宽带优惠', title: '毕业生宽带优惠',
value: 'bysrh', value: 'bysrh',
...@@ -302,8 +312,8 @@ ...@@ -302,8 +312,8 @@
] ]
},{ },{
title: '优惠购机', title: '优惠购机',
value: 'isShowyhgj', value: 'yhgj',
key: 'isShowyhgj', key: 'yhgj',
} }
], ],
}, },
...@@ -348,8 +358,6 @@ ...@@ -348,8 +358,6 @@
}, },
modifyvisible: false, modifyvisible: false,
columns: [ columns: [
{dataIndex: 'networkCode', width: 200, title: '网点编码', align: "center"},
{dataIndex: 'networkName', width: 200, title: '网点名称', align: "center"},
{dataIndex: 'subName', width: 100, title: '县分', align: "center"}, {dataIndex: 'subName', width: 100, title: '县分', align: "center"},
{dataIndex: 'schoolName', width: 200, title: '学校名称', align: "center"}, {dataIndex: 'schoolName', width: 200, title: '学校名称', align: "center"},
{ {
...@@ -359,24 +367,6 @@ ...@@ -359,24 +367,6 @@
scopedSlots: {customRender: 'statusDefault'}, scopedSlots: {customRender: 'statusDefault'},
align: "center" align: "center"
}, },
{dataIndex: 'startDate', width: 200, title: '开学时间', align: "center",
customRender: (text, row, index) => {
if (text == null) {
return "";
}
return moment(text).format("YYYY-MM-DD");
}
},
{dataIndex: 'endDate', width: 200, title: '结束时间', align: "center",
customRender: (text, row, index) => {
if (text == null) {
return "";
}
return moment(text).format("YYYY-MM-DD");
}
},
{dataIndex: 'greaterFifty', width: 80, title: '大于50元激励', align: "center"},
{dataIndex: 'greaterHundred', width: 90, title: '大于100元激励', align: "center"},
{ {
dataIndex: 'operation', dataIndex: 'operation',
width: 200, width: 200,
...@@ -394,6 +384,7 @@ ...@@ -394,6 +384,7 @@
//表示 //表示
let obj = cloneObject(this.queryParam) let obj = cloneObject(this.queryParam)
return findByList(Object.assign(params, obj)).then(res => { return findByList(Object.assign(params, obj)).then(res => {
console.log(res);
let data = {}; let data = {};
if (res.state !== 'success') { if (res.state !== 'success') {
this.emptyText.emptyText = '查询失败！' this.emptyText.emptyText = '查询失败！'
...@@ -532,6 +523,8 @@ ...@@ -532,6 +523,8 @@
this.modifyForm.startDate = ""; this.modifyForm.startDate = "";
this.modifyForm.endDate = ""; this.modifyForm.endDate = "";
this.modifyForm.buttons = []; this.modifyForm.buttons = [];
this.modifyForm.appKey = "";
this.modifyForm.appId = "";
setTimeout(()=>{ setTimeout(()=>{
this.Formtable.setFieldsValue({ this.Formtable.setFieldsValue({
networkCode: '', networkCode: '',
...@@ -567,9 +560,9 @@ ...@@ -567,9 +560,9 @@
let url= ""; let url= "";
console.log(data); console.log(data);
if (data.serviceQrcode != undefined) { if (data.serviceQrcode != undefined) {
url = this.baseuploadUrl()+"manager/ciop"+data.serviceQrcode.replace("enclosure", ""); url = this.baseuploadUrl()+"app/ciop"+data.serviceQrcode.replace("enclosure", "");
}else{ }else{
url = this.baseuploadUrl()+"manager/"; url = this.baseuploadUrl()+"app/";
} }
if (!(data.serviceQrcode == null || data.serviceQrcode=="")) { if (!(data.serviceQrcode == null || data.serviceQrcode=="")) {
...@@ -642,8 +635,8 @@ ...@@ -642,8 +635,8 @@
if (data.tcsj == 1) { if (data.tcsj == 1) {
buttons.push({label: "套餐升级", value: "tcsj"}); buttons.push({label: "套餐升级", value: "tcsj"});
} }
if (data.sjktcsj == 1) { if (data.status == 1) {
buttons.push({label: "手机卡套餐升级", value: "sjktcsj"}); buttons.push({label: "手机卡套餐升级", value: "status"});
} }
if (data.bysrh == 1) { if (data.bysrh == 1) {
buttons.push({label: "毕业生宽带优惠", value: "bysrh"}); buttons.push({label: "毕业生宽带优惠", value: "bysrh"});
...@@ -660,8 +653,8 @@ ...@@ -660,8 +653,8 @@
if (data.jiltKdy == 1) { if (data.jiltKdy == 1) {
buttons.push({label: "是否甩单", value: "jiltKdy"}); buttons.push({label: "是否甩单", value: "jiltKdy"});
} }
if (data.isShowyhgj == 1) { if (data.yhgj == 1) {
buttons.push({label: "优惠购机", value: "isShowyhgj"}); buttons.push({label: "优惠购机", value: "yhgj"});
} }
if (data.udBtn == 1) { if (data.udBtn == 1) {
buttons.push({label: "线上线下", value: "udBtn"}); buttons.push({label: "线上线下", value: "udBtn"});
...@@ -682,7 +675,8 @@ ...@@ -682,7 +675,8 @@
networkCode: data.networkCode, networkCode: data.networkCode,
greaterFifty: data.greaterFifty, greaterFifty: data.greaterFifty,
greaterHundred: data.greaterHundred, greaterHundred: data.greaterHundred,
appKey: data.appKey,
appId: data.appId,
}) })
},50) },50)
this.customimg="./img/custom"+data.serviceQrcode this.customimg="./img/custom"+data.serviceQrcode
...@@ -690,7 +684,7 @@ ...@@ -690,7 +684,7 @@
}, },
//提交表单 //提交表单
createfunctionOk(){ createfunctionOk(){
this.Formtable.validateFields(['networkCode','networkName','schoolName', 'bandproductId',"subName","lzgh", 'netId',"isShowband", 'isShowrh',"netPhone" ,'isRecv','greaterFifty','greaterHundred'], {force: true}, (err, values)=>{ this.Formtable.validateFields(['networkCode','networkName','schoolName', 'bandproductId',"subName","lzgh", 'netId',"isShowband", 'isShowrh',"netPhone" ,'isRecv','greaterFifty','greaterHundred', 'appId', 'appKey'], {force: true}, (err, values)=>{
if (!err){ if (!err){
this.modifyForm.networkCode = values.networkCode this.modifyForm.networkCode = values.networkCode
this.modifyForm.networkName = values.networkName == undefined ? "" : values.networkName this.modifyForm.networkName = values.networkName == undefined ? "" : values.networkName
...@@ -702,6 +696,10 @@ ...@@ -702,6 +696,10 @@
this.modifyForm.chosePages = "" this.modifyForm.chosePages = ""
this.modifyForm.startDateStr = this.modifyForm.startDate; this.modifyForm.startDateStr = this.modifyForm.startDate;
this.modifyForm.endDateStr = this.modifyForm.endDate; this.modifyForm.endDateStr = this.modifyForm.endDate;
this.modifyForm.appId = values.appId;
this.modifyForm.appKey = values.appKey;
// 日期类型不传入后端 // 日期类型不传入后端
Vue.delete(this.modifyForm,'startDate'); Vue.delete(this.modifyForm,'startDate');
Vue.delete(this.modifyForm,'endDate'); Vue.delete(this.modifyForm,'endDate');
......
src/views/school-center/uploadVerify/studentCardVerify.vue
...@@ -263,7 +263,8 @@ ...@@ -263,7 +263,8 @@
{dataIndex: 'studentCardUrl', width: 180, title: '学生证封面照片', scopedSlots: {customRender: "studentCardUrl"}}, {dataIndex: 'studentCardUrl', width: 180, title: '学生证封面照片', scopedSlots: {customRender: "studentCardUrl"}},
{dataIndex: 'otherImgUrl1', width: 180, title: '学生证内页照片', scopedSlots: {customRender: "otherImgUrl1"}}, {dataIndex: 'otherImgUrl1', width: 180, title: '学生证内页照片', scopedSlots: {customRender: "otherImgUrl1"}},
{dataIndex: 'otherImgUrl2', width: 180, title: '身份证照片', scopedSlots: {customRender: "otherImgUrl2"}}, {dataIndex: 'otherImgUrl2', width: 180, title: '身份证照片', scopedSlots: {customRender: "otherImgUrl2"}},
{dataIndex: 'otherImgUrl3', width: 180, title: '补充照片', scopedSlots: {customRender: "otherImgUrl3"}}, {dataIndex: 'otherImgUrl3', width: 180, title: '补充照片', scopedSlots: {customRender: "otherImgUrl3"}
},
/*{dataIndex: 'county', width: 80, title: '县分'}, /*{dataIndex: 'county', width: 80, title: '县分'},
{dataIndex: 'school', width: 120, title: '学校'}, {dataIndex: 'school', width: 120, title: '学校'},
...@@ -400,9 +401,17 @@ ...@@ -400,9 +401,17 @@
this.visiblepicture = false; this.visiblepicture = false;
}, },
imgClick(res) { imgClick(res) {
this.imgInfo = this.apis + res this.imgInfo = this.baseuploadUrl() + res
this.visiblepicture = true this.visiblepicture = true
}, },
baseuploadUrl(){
const env = process.env.NODE_ENV; //获取当前环境
let apis = "/";
if(env === 'development'){ //测试环境默认添加前缀
apis = '/api/';
}
return apis
},
excelOut() { excelOut() {
let obj = cloneObject(this.queryParam) let obj = cloneObject(this.queryParam)
let nowdate = moment().format("YYYY-MM-DD"); let nowdate = moment().format("YYYY-MM-DD");
......
src/views/school-center/userManager/PartnerManagement.vue
...@@ -387,6 +387,7 @@ ...@@ -387,6 +387,7 @@
xzUserList:[], xzUserList:[],
addSubName:'', addSubName:'',
columns: [ columns: [
{dataIndex: 'id', width:100, title: '合伙人id', align: 'center'},
{dataIndex: 'name', width: 100, title: '姓名 ', align: "center"}, {dataIndex: 'name', width: 100, title: '姓名 ', align: "center"},
{dataIndex: 'phone', width: 200, title: '电话', align: "center"}, {dataIndex: 'phone', width: 200, title: '电话', align: "center"},
{dataIndex: 'school', width: 200, title: '学校 ', align: "center"}, {dataIndex: 'school', width: 200, title: '学校 ', align: "center"},
......
src/views/system/appConfig.vue 0 → 100644
<template>
<!--搜索区域-->
<a-col :md="24" :sm="24" :order="1" class="flex-container-nowidth">
<div class="table-page-search-wrapper">
<a-form layout="inline">
<a-row :gutter="48">
<a-col :md="6" :sm="24">
<a-form-item label="应用名称">
<a-input v-model="queryParams.appName" placeholder="请输入" />
</a-form-item>
</a-col>
<a-col :md="6" :sm="24">
<a-button type="primary" icon="search" @click="reflashTable" >搜索</a-button>
<a-button style="margin-left: 8px" type="primary" icon="plus" @click="handleAdd">添加</a-button>
</a-col>
</a-row>
</a-form>
</div>
<s-table
ref="table"
size="small"
class="flex-filling"
style="word-break: break-all;"
bordered
:columns="columns"
:data="rowdata"
>
<template slot="createtime" slot-scope="text" >
{{ text | dayjs}}
</template>
<template slot="updatetime" slot-scope="text" >
{{ text | dayjs}}
</template>
<template slot="roleName" slot-scope="text, record">
<a-tooltip placement="left">
<template slot="title">
{{text}}
</template>
<div style="width: 180px; overflow:hidden;text-overflow:ellipsis; white-space: nowrap;" >
{{text}}
</div>
</a-tooltip>
</template>
<template slot="operation" slot-scope="text, record" v-if="record.status != 3">
<span>
<a @click="toggle(record.id)">修改</a>
</span>
</template>
</s-table>
<!-- 添加 -->
<a-modal title="添加应用配置" v-model="add_config" @ok="handleOk" destroyOnClose="true">
<a-form>
<a-form-item label="应用名称" >
<a-input placeholder="请输入应用名称" v-model="modelData.appName"></a-input>
</a-form-item>
<a-form-item label="应用id" >
<a-input placeholder="请输入应用id" v-model="modelData.appId"></a-input>
</a-form-item>
<a-form-item label="应用密匙" >
<a-input placeholder="请输入应用密匙" v-model="modelData.appSecret"></a-input>
</a-form-item>
</a-form>
</a-modal>
<!-- 修改 -->
<a-modal title="编辑应用配置" v-model="visible" @ok="handleUpdata">
<a-form>
<a-form-item label="应用名称" >
<a-input placeholder="请输入应用名称" v-model="showModals.appName"></a-input>
</a-form-item>
<a-form-item label="应用id" >
<a-input placeholder="请输入应用id" v-model="showModals.appId"></a-input>
</a-form-item>
<a-form-item label="应用密匙" >
<a-input placeholder="请输入应用密匙" v-model="showModals.appSecret"></a-input>
</a-form-item>
</a-form>
</a-modal>
</a-col>
</template>
<script>
import STable from '@/components/table'
import AInput from 'ant-design-vue/es/input/Input'
import treeList from '@/components/sysmanage/treeList'
import treecheck from '@/components/sysmanage/treeCheck'
import JDate from '@/components/jeecg/JDate'
import {
getList,
getInfo,
add,
update
} from '@/api/appConfig'
export default {
name:"systemUser",
components: {
STable,
AInput,
treeList,
treecheck,
JDate
},
data() {
return {
columns: [
{ dataIndex: 'appName',width:150,fixed: 'left',sort: true, title: '应用名称', },
{ dataIndex: 'appId',width:100,fixed: 'left', sort: true, title: '应用id', },
{ dataIndex: 'appSecret',width:200,fixed: 'left', sort: true, title: '应用密匙'},
{ dataIndex: 'createTime',width:150, sort: true, title: '创建时间', scopedSlots: { customRender: 'createtime' } },
{ dataIndex: 'createBy',width:150, sort: true, title: '创建人' },
{ dataIndex: 'updateTime',width:150, sort: true, title: '更新时间', scopedSlots: { customRender: 'updatetime' }},
{ dataIndex: 'updateBy',width:100, sort: true, title: '更新人', },
{
dataIndex: 'center',
toolbar: '#tableBar',
title: '操作',
width: 200,
fixed: 'right',
scopedSlots: { customRender: 'operation' }
}
],
//查询条件
queryParams: {
appName: '',
},
modelData: {
id: '',
appName: '',
appId: '',
appSecret: '',
},
showModals: {
id: '',
appName: '',
appId: '',
appSecret: '',
},
rowdata: parameter => {
let params = {
pageNo: parameter.pageNo,
pageSize: parameter.pageSize
}
let obj = this.queryParams
return getList(Object.assign(params, obj)).then(res => {
let data = {
data: res.data.records,
pageSize: parameter.pageSize,
pageNo: parameter.pageNo,
totalCount: res.total
}
return data
})
},
add_config: false,
visible: false,
}
},
methods: {
reflashTable() {
this.$refs.table.refresh({ search: true })
},
//清除新增弹窗
clearModelData(){
this.modelData.id = '';
this.modelData.appName = '';
this.modelData.appId = '';
this.modelData.appSecret = '';
},
// 添加应用配置
handleAdd: function() {
this.add_config = true
this.clearModelData()
},
handleOk() {
let that = this
this.add_config = false
add(that.modelData).then(() => {
that.clearModelData();
that.$refs.table.refresh({ search: true })
})
},
// 修改
toggle(id) {
let that = this;
that.visible = true;
getInfo({id}).then(res =>{
let appConfig = res.data;
that.showModals.id = appConfig.id
that.showModals.appName = appConfig.appName;
that.showModals.appId = appConfig.appId;
that.showModals.appSecret = appConfig.appSecret;
})
},
handleUpdata() {
this.visible = false
let that = this
update(that.showModals).then(() => {
that.showModals.id = ''
that.showModals.appName = ''
that.showModals.appId = ''
that.showModals.appSecret = ''
that.$refs.table.refresh({ search: true })
})
},
}
}
</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