Skip to content

G
gdtel-gztel-school-center-ui
Commit 5787a6d6 by 董有沛
Options

Merge remote-tracking branch 'origin/master'

parents 6a3fdf29 e449bf95
Showing with 311 additions and 48 deletions
SS deleted 100644 → 0
SS
\ No newline at end of file
src/api/school-center/PartnerManagementAPI.js 0 → 100644
import {postAction,getAotion} from '@/api/manage'
const prefix = '/schoolcenter/ciop';
// 获取活动列表
let findByList = (params) => postAction(prefix + "/school/partner/list" , params);
// 编辑
let modify = (params) => postAction(prefix + "/school/partner/update" , params);
// 编辑
let getlistysm = (params) => postAction(prefix + "/ysmUser/getlist" , params);
export {
findByList,modify,getlistysm
}
\ No newline at end of file
src/api/school-center/packageManagementAPI.js
...@@ -13,8 +13,10 @@ let modify = (params) => postAction(prefix + "/packageManagement/package/update" ...@@ -13,8 +13,10 @@ let modify = (params) => postAction(prefix + "/packageManagement/package/update"
//新增 //新增
let insert= (params) => postAction(prefix + "/packageManagement/package/insert" , params); let insert= (params) => postAction(prefix + "/packageManagement/package/insert" , params);
//隐藏状态 //删除
let hidestatus= (params) => postAction(prefix + "/packageManagement/package/hidestatus" , params); let delet= (params) => postAction(prefix + "/packageManagement/package/delete" , params);
//套餐全称列表
let packageAllList= () => postAction(prefix + "/packageManagement/package/packageAllList" );
export { export {
findByList,choosepages,modify,insert,hidestatus findByList,choosepages,modify,insert,packageAllList,delet
} }
\ No newline at end of file
src/api/school-center/ysmUser.js 0 → 100644
import {postAction,downFilePost} from '@/api/manage'
const prefix = '/schoolcenter/ciop';
// 智能平台账号实名
let ysmUserList = (params) => postAction(prefix + "/ysmUser/list" , params);
let ysmUserNotThrough = (id,params) => postAction(prefix + "/ysmUser/notThrough/"+id,params);
let ysmUserInsert = (params) => postAction(prefix + "/ysmUser/insert" , params);
let ysmUserUpdate = (params) => postAction(prefix + "/ysmUser/update",params);
export {
ysmUserList,
ysmUserNotThrough,
ysmUserInsert,
ysmUserUpdate
}
\ No newline at end of file
src/components/menu/SideMenu.vue
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
:collapsible="collapsible" :collapsible="collapsible"
v-model="collapsed" v-model="collapsed"
:trigger="null"> :trigger="null">
<logo title="外呼集约" titleUrl="./logoJY.png"/> <logo title="合伙人" titleUrl="./logoJY.png"/>
<s-menu <s-menu
:collapsed="collapsed" :collapsed="collapsed"
:menu="menus" :menu="menus"
......
src/views/school-center/management/schoolmanagement.vue
...@@ -184,7 +184,7 @@ ...@@ -184,7 +184,7 @@
}, },
{ {
dataIndex: 'operation', dataIndex: 'operation',
width: 100, width: 200,
title: '操作', title: '操作',
align: "center", align: "center",
scopedSlots: {customRender: 'operation'}, scopedSlots: {customRender: 'operation'},
......
src/views/school-center/orderView/orderView.vue
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<!-- 搜索区域 --> <!-- 搜索区域 -->
<a-form layout="inline"> <a-form layout="inline">
<a-row :gutter="24"> <a-row :gutter="24">
<a-col :md="6" :sm="12"> <a-col :md="5" :sm="12">
<a-form-item label="时间选择："> <a-form-item label="时间选择：">
<a-range-picker @change="onChange" /> <a-range-picker @change="onChange" />
</a-form-item> </a-form-item>
...@@ -40,9 +40,14 @@ ...@@ -40,9 +40,14 @@
</a-select> </a-select>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-button @click="search()" type="primary">查询</a-button> <span class="table-page-search-submitButtons" style="float: left; overflow: hidden;">
<a-col :md="4" :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" @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-button v-show="callback" style="margin-left: 10px">导出中<a-spin style="margin-left: 5px" size="small"/></a-button>
</a-col>
</span>
</a-row> </a-row>
</a-form> </a-form>
</div> </div>
...@@ -61,14 +66,17 @@ ...@@ -61,14 +66,17 @@
<p style="white-space: pre-line;">{{text}}</p> <p style="white-space: pre-line;">{{text}}</p>
</template> </template>
<template slot="productState" slot-scope="text"> <template slot="productState" slot-scope="text">
<p v-if="text=='1'">待提交</p> <span v-if="text=='1'">待提交</span>
<p v-if="text=='4'">归档</p> <span v-if="text=='4'">归档</span>
<p v-if="text=='5'">作废</p> <span v-if="text=='5'">作废</span>
<p v-if="text=='3'">受理成功</p> <span v-if="text=='6'">待配送</span>
<p v-if="text=='9'">已收费</p> <span v-if="text=='7'">物流配送中</span>
<p v-if="text=='10'">受理异常</p> <span v-if="text=='8'">配送成功</span>
<p v-if="text=='2'">待受理</p> <span v-if="text=='3'">受理成功</span>
<p v-if="text=='100'">未支付</p> <span v-if="text=='9'">已收费</span>
<span v-if="text=='10'">受理异常</span>
<span v-if="text=='2'">待受理</span>
<span v-if="text=='100'">未支付</span>
</template> </template>
<template slot="operation" slot-scope="text, record"> <template slot="operation" slot-scope="text, record">
<span> <span>
...@@ -92,6 +100,9 @@ ...@@ -92,6 +100,9 @@
<p v-if="orderInfo.status=='1'">订单状态：待提交</p> <p v-if="orderInfo.status=='1'">订单状态：待提交</p>
<p v-if="orderInfo.status=='4'">订单状态：归档</p> <p v-if="orderInfo.status=='4'">订单状态：归档</p>
<p v-if="orderInfo.status=='5'">订单状态：作废</p> <p v-if="orderInfo.status=='5'">订单状态：作废</p>
<p v-if="orderInfo.status=='6'">订单状态：待配送</p>
<p v-if="orderInfo.status=='7'">订单状态：物流配送中</p>
<p v-if="orderInfo.status=='8'">订单状态：配送成功</p>
<p v-if="orderInfo.status=='3'">订单状态：受理成功</p> <p v-if="orderInfo.status=='3'">订单状态：受理成功</p>
<p v-if="orderInfo.status=='9'">订单状态：已收费</p> <p v-if="orderInfo.status=='9'">订单状态：已收费</p>
<p v-if="orderInfo.status=='10'">订单状态：受理异常</p> <p v-if="orderInfo.status=='10'">订单状态：受理异常</p>
...@@ -145,7 +156,7 @@ ...@@ -145,7 +156,7 @@
<p>用户类别：{{orderInfo.orderCustomerType}}</p> <p>用户类别：{{orderInfo.orderCustomerType}}</p>
</a-col> </a-col>
<a-col :span="12"> <a-col :span="12">
<p>区域：{{orderInfo.orderRegion}}</p> <p>县分：{{orderInfo.orderRegion}}</p>
</a-col> </a-col>
</a-row> </a-row>
<a-row> <a-row>
...@@ -236,18 +247,18 @@ ...@@ -236,18 +247,18 @@
columns: [ columns: [
{dataIndex: 'orderseq', width: 200, title: '订单号码 '}, {dataIndex: 'orderseq', width: 200, title: '订单号码 '},
{dataIndex: 'productname', width: 200, title: '产品名称'}, {dataIndex: 'productname', width: 200, title: '产品名称'},
{dataIndex: 'orderSetMeal', width: 200, title: '套餐 '}, {dataIndex: 'orderSetMeal', width: 80, title: '套餐 '},
{dataIndex: 'orderUniversityName', width: 200, title: '学校'}, {dataIndex: 'orderUniversityName', width: 200, title: '学校'},
{dataIndex: 'ordername', width: 200, title: '姓名 '}, {dataIndex: 'ordername', width: 80, title: '姓名 '},
{dataIndex: 'orderdate', width: 200, title: '提交时间 ' ,scopedSlots: {customRender: 'productLastUpdateTime'}}, {dataIndex: 'orderdate', width: 150, title: '提交时间 ' ,scopedSlots: {customRender: 'productLastUpdateTime'}},
{dataIndex: 'status', width: 200, title: '状态 ', scopedSlots: {customRender: 'productState'}}, {dataIndex: 'status', width: 50, title: '状态 ', scopedSlots: {customRender: 'productState'}},
{dataIndex: 'orderRegion', width: 200, title: '区域'}, {dataIndex: 'orderRegion', width: 70, title: '县分'},
{dataIndex: 'orderCustomerType', width: 200, title: '用户类别 '}, {dataIndex: 'orderCustomerType', width: 80, title: '用户类别 '},
/* {dataIndex: 'productIntroduction', width: 200, title: '产品情况 ', scopedSlots: {customRender: 'text'}}, /* {dataIndex: 'productIntroduction', width: 200, title: '产品情况 ', scopedSlots: {customRender: 'text'}},
{dataIndex: 'productSetMealIntroduction', width: 200, title: '资费介绍 ', scopedSlots: {customRender: 'text'}},*/ {dataIndex: 'productSetMealIntroduction', width: 200, title: '资费介绍 ', scopedSlots: {customRender: 'text'}},*/
{ {
dataIndex: 'operation', dataIndex: 'operation',
width: 100, width: 50,
title: '操作', title: '操作',
scopedSlots: {customRender: 'operation'}, scopedSlots: {customRender: 'operation'},
fixed: "right" fixed: "right"
......
src/views/school-center/university/university.vue
...@@ -6,8 +6,8 @@ ...@@ -6,8 +6,8 @@
<a-form layout="inline"> <a-form layout="inline">
<a-row :gutter="24"> <a-row :gutter="24">
<a-col :md="6" :sm="12"> <a-col :md="6" :sm="12">
<a-form-item label="区域："> <a-form-item label="县分：">
<a-input placeholder="区域" v-model="queryParam.universityRegion"></a-input> <a-input placeholder="县分" v-model="queryParam.universityRegion"></a-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :md="6" :sm="12"> <a-col :md="6" :sm="12">
...@@ -15,12 +15,13 @@ ...@@ -15,12 +15,13 @@
<a-input placeholder="学校名称" v-model="queryParam.universityName" ></a-input> <a-input placeholder="学校名称" v-model="queryParam.universityName" ></a-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :md="3" :sm="12"> <span class="table-page-search-submitButtons" style="float: left; overflow: hidden;">
<a-button @click="search()" type="primary">查询</a-button> <a-col :md="6" :sm="24">
</a-col> <a-button @click="search()" type="primary">查询</a-button>
<a-col :md="3" :sm="12"> <a-divider type="vertical"/>
<a-button @click="modifyfunction()" type="primary">添加</a-button> <a-button @click="modifyfunction()" type="primary">添加</a-button>
</a-col> </a-col>
</span>
</a-row> </a-row>
</a-form> </a-form>
</div> </div>
...@@ -128,17 +129,17 @@ ...@@ -128,17 +129,17 @@
}, },
columns: [ columns: [
{dataIndex: 'universityName', width: 200, title: '学校名称'}, {dataIndex: 'universityName', width: 200, title: '学校名称'},
{dataIndex: 'universityRegion', width: 200, title: '所在区域 '}, {dataIndex: 'universityRegion', width: 80, title: '县分 '},
{dataIndex: 'universityInstalledAddress', width: 200, title: '装机地址'}, {dataIndex: 'universityInstalledAddress', width: 300, title: '装机地址'},
{dataIndex: 'universityExteriorLines', width: 200, title: '外线方式 '}, {dataIndex: 'universityExteriorLines', width: 120, title: '外线方式 '},
{dataIndex: 'universityPackageNumber', width: 200, title: '揽装工号 '}, {dataIndex: 'universityPackageNumber', width: 100, title: '揽装工号 '},
{dataIndex: 'universityUserType', width: 200, title: '用户类型 '}, {dataIndex: 'universityUserType', width: 150, title: '用户类型 '},
{dataIndex: 'universityMonthlyRentType', width: 200, title: '月租类型 '}, {dataIndex: 'universityMonthlyRentType', width: 80, title: '月租类型 '},
{dataIndex: 'universityChargeMode', width: 200, title: '收费模式 '}, {dataIndex: 'universityChargeMode', width: 120, title: '收费模式 '},
{dataIndex: 'universityChargingAttribute', width: 200, title: '计费属性 '}, {dataIndex: 'universityChargingAttribute', width: 80, title: '计费属性 '},
{dataIndex: 'universityContactPhone', width: 200, title: '学校联系号码 '}, {dataIndex: 'universityContactPhone', width: 200, title: '学校联系号码 '},
{dataIndex: 'universityLastUpdateTime', width: 200, title: '更新时间 ' ,scopedSlots: {customRender: 'productLastUpdateTime'}}, {dataIndex: 'universityLastUpdateTime', width: 150, title: '更新时间 ' ,scopedSlots: {customRender: 'productLastUpdateTime'}},
{dataIndex: 'universityCreateTime', width: 200, title: '创建时间 ', scopedSlots: {customRender: 'productCreateTime'}}, {dataIndex: 'universityCreateTime', width: 150, title: '创建时间 ', scopedSlots: {customRender: 'productCreateTime'}},
{ {
dataIndex: 'operation', dataIndex: 'operation',
width: 100, width: 100,
...@@ -181,7 +182,10 @@ ...@@ -181,7 +182,10 @@
this.$refs.table.refresh({search: true}) this.$refs.table.refresh({search: true})
}, },
remove(id) { remove(id) {
universityDelete(id).then(() => { universityDelete(id).then((res) => {
if(res.state=="success"){
this.$notification.success({message: res.data, description: '', duration: 4})
}
this.$refs.table.refresh({search: true}) this.$refs.table.refresh({search: true})
}) })
}, },
...@@ -234,7 +238,9 @@ ...@@ -234,7 +238,9 @@
universityInsert({university}).then((res) => { universityInsert({university}).then((res) => {
this.modifyvisible=false; this.modifyvisible=false;
this.clearmodel() this.clearmodel()
this.$notification.success({message: res.data, description: '', duration: 4}) if(res.state=="success"){
this.$notification.success({message: res.data, description: '', duration: 4})
}
this.search() this.search()
}) })
}else { }else {
...@@ -243,7 +249,9 @@ ...@@ -243,7 +249,9 @@
universityUpdate({university}).then((res) => { universityUpdate({university}).then((res) => {
this.modifyvisible=false; this.modifyvisible=false;
this.clearmodel() this.clearmodel()
this.$notification.success({message: res.data, description: '', duration: 4}) if(res.state=="success"){
this.$notification.success({message: res.data, description: '', duration: 4})
}
this.search() this.search()
}) })
} }
...@@ -256,6 +264,7 @@ ...@@ -256,6 +264,7 @@
}, },
//清除弹窗信息 //清除弹窗信息
clearmodel() { clearmodel() {
this.add=true
this.modelData.universityId='' this.modelData.universityId=''
this.Formtable.setFieldsValue({ this.Formtable.setFieldsValue({
"universityName":'', "universityName":'',
......
src/views/school-center/ysmUser/ysmUser.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="6" :sm="12">
<a-form-item label="预实名账号：">
<a-input placeholder="预实名账号" v-model="queryParam.userName"></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="modifyfunction()" type="primary">添加</a-button>
</a-col>
</span>
</a-row>
</a-form>
</div>
<!--列表-->
<s-table :columns="columns" :data="rowdata" bordered ref="table" size="small" class="flex-filling">
<template slot="operation" slot-scope="text, record">
<span>
<a @click="modifyfunction(record)">修改</a>
<a-divider type="vertical"/>
<a-popconfirm v-if="record.status == 1" title="是否不通过佣金系统？" @confirm="notThrough(record.id,0)">
<a>不通过佣金系统</a>
</a-popconfirm>
<a-popconfirm v-if="record.status == 0" title="是否通过佣金系统？" @confirm="notThrough(record.id,1)">
<a>通过佣金系统</a>
</a-popconfirm>
</span>
</template>
</s-table>
<!----弹框-->
<a-modal :title="add ?'添加预实名账号': '编辑预实名账号'" :visible="modifyvisible" @ok="createfunctionOk" @cancel="createfunctionCancel" html-type="submit" width="1024px">
<a-form :form="Formtable">
<a-form-item :labelCol="{span: 5}" :wrapperCol="{span: 9, offset: 1}" label="账号：">
<a-input placeholder="预实名账号" v-decorator="[ 'userName', {rules: [{ required: true, message: '预实名账号不能为空！' ,validator: 'click'}]} ]"></a-input>
</a-form-item>
<a-form-item :labelCol="{span: 5}" :wrapperCol="{span: 9, offset: 1}" label="签名：">
<a-input placeholder="签名" v-decorator="[ 'sign', {rules: [{ required: true, message: '签名不能为空！' ,validator: 'click'}]} ]"></a-input>
</a-form-item>
</a-form>
</a-modal>
</div>
</template>
<script>
import STable from '@/components/table';
import {ysmUserList, ysmUserNotThrough, ysmUserInsert, ysmUserUpdate} from "@/api/school-center/ysmUser"
import {cloneObject} from '@/utils/util';
export default {
name: "ysmUser",
components: {
STable,
},
data(){
return {
Formtable: this.$form.createForm(this),
modifyvisible: false,
add: true,
queryParam: {
userName :''
},
modelData:{
id:'',
userName:'',
sign:''
},
columns: [
{dataIndex: 'userName', width: 200, title: '预实名账号'},
{dataIndex: 'sign', width: 200, title: '签名'},
{
dataIndex: 'operation',
width: 100,
title: '操作',
scopedSlots: {customRender: 'operation'},
fixed: "right"
}]
,
rowdata: parameter => {
let params = {
pageNo: parameter.pageNo,
pageSize: parameter.pageSize
}
let obj = cloneObject(this.queryParam)
//表示
return ysmUserList(Object.assign(params,obj)).then(res => {
let data = {}
if (res.state !== 'success') {
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:{
search() {
this.$refs.table.refresh({search: true})
},
notThrough(id,status) {
ysmUserNotThrough(id,{status}).then((res) => {
if(res.state=="success"){
this.$notification.success({message: res.data, description: '', duration: 4})
}
this.$refs.table.refresh({search: true})
})
},
modifyfunction(data){
if(data != undefined ){
this.modelData.id=data.id
setTimeout(()=>{
this.Formtable.setFieldsValue({
"userName":data.userName,
"sign":data.sign
})
},0)
this.add=false;
}
this.modifyvisible=true;
},
createfunctionOk(){
let that = this;
that.Formtable.validateFields(['userName','sign'], {force: true}, (err, values) => {
if (err ) {
return;
}
that.modelData.userName=values.userName
that.modelData.sign=values.sign
if(this.add){
let obj= that.modelData;
delete obj.id
let ysmUser= JSON.stringify(obj);
ysmUserInsert({ysmUser}).then((res) => {
this.modifyvisible=false;
this.clearmodel()
if(res.state=="success"){
this.$notification.success({message: res.data, description: '', duration: 4})
}
this.search()
})
}else {
let obj= that.modelData;
let ysmUser= JSON.stringify(obj);
ysmUserUpdate({ysmUser}).then((res) => {
this.modifyvisible=false;
this.clearmodel()
if(res.state=="success"){
this.$notification.success({message: res.data, description: '', duration: 4})
}
this.search()
})
}
})
},
createfunctionCancel(){
this.modifyvisible=false;
this.clearmodel()
this.add=true;
},
//清除弹窗信息
clearmodel() {
this.add=true
let that = this;
that.modelData.id=''
this.Formtable.setFieldsValue({
userName:'',
sign:''
})
}
}
}
</script>
<style scoped>
</style>
\ No newline at end of file
src/views/system/systemUser.vue
...@@ -360,14 +360,22 @@ export default { ...@@ -360,14 +360,22 @@ export default {
if (!err) { if (!err) {
this.editpasswordfrom.newPwd= encodeURIComponent(this.getPass(this.EditPassFrom.getFieldValue('editpassword'))) this.editpasswordfrom.newPwd= encodeURIComponent(this.getPass(this.EditPassFrom.getFieldValue('editpassword')))
this.editpasswordfrom.rePwd=this.editpasswordfrom.newPwd this.editpasswordfrom.rePwd=this.editpasswordfrom.newPwd
debugger
changeOtherPwd(this.editpasswordfrom).then(res => { changeOtherPwd(this.editpasswordfrom).then(res => {
if (res.code == 200) { if (res.code == 200) {
this.EditPassFrom.setFieldsValue({editpassword:""}); this.EditPassFrom.setFieldsValue({editpassword:""});
this.EditPassFrom.setFieldsValue({editrepassword:""}); this.EditPassFrom.setFieldsValue({editrepassword:""});
this.$message.success(res.message != "" ? res.message : "", 5); if(res.message==undefined){
this.$message.success(res.data != "" ? res.data : "修改成功", 5);
}else {
this.$message.success(res.message != "" ? res.message : "修改成功", 5);
}
}else{ }else{
this.$message.error(res.message != "" ? res.message : "", 5); if(res.message==undefined){
this.$message.error(res.data != "" ? res.data : "失败修改", 5);
}else {
this.$message.error(res.message != "" ? res.message : "失败修改", 5);
}
} }
this.editpaswordmodel = false this.editpaswordmodel = false
}) })
...@@ -376,6 +384,10 @@ export default { ...@@ -376,6 +384,10 @@ export default {
}, },
editPasswordcancel(){ editPasswordcancel(){
this.editpaswordmodel=false this.editpaswordmodel=false
this.EditPassFrom.setFieldsValue({
editpassword:'',
editrepassword:''
})
}, },
compareToFirstPassword (rule, value, callback) { compareToFirstPassword (rule, value, callback) {
const form = this.EditPassFrom; const form = this.EditPassFrom;
......
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