Browse Source

框架升级

master
陈裕财 4 years ago
parent
commit
f55ba7a61e
  1. 34
      src/api/cpd.js
  2. 17
      src/router/index.js
  3. 67
      src/routes.js
  4. 8
      src/views/layout/components/Navbar.vue
  5. 222
      src/views/mdp/sys/user/UpdateUserInfo.vue

34
src/api/cpd.js

@ -2,8 +2,36 @@ import axios from '@/utils/request'
import config from '@/common/config'
let base = config.getMallmBasePath();
let base = config.getMallmBasePath();
export const getNoticeMsg = params => { return axios.get(`${base}/mallm/cpd/index/toHandleOrdersCount`, { params: params }); };
//export const getNoticeMsg = params => { return axios.get(`${base}/mallm/cpd/index/toHandleOrdersCount`, { params: params }); };
export const getNoticeMsg = params => {
if(process.env.CONTEXT=='mallm'){
return axios.get(`${base}/mallm/cpd/index/toHandleOrdersCount`, { params: params });
}else{
return new Promise((resolve, reject) => {
var res={
data:{
tips:{
isOk:true,
msg:'请求成功'
},
data:{
toPayNum:0,
toSendNum:0,
toReceNum:0,
toApprovaNum:0,
hadApprovaNum:0,
hadFinishNum:0,
hadCloseNum:0,
hadCancelNum:0,
totalNum:0,
}
}
}
resolve(res)
})
}
};

17
src/router/index.js

@ -13,7 +13,7 @@ import routesForm from './routes_form'
import routesXm from './routes_xm'
import routesDatavXm from './routes_datav_xm'
import routesArc from './routes_arc'
import routesIm from './routes_im'
import routesIm from './routes_im'
export { Layout }
@ -49,9 +49,20 @@ export const constantRouterMap = [
component: _import('xm/core/xmProject/XmProjectMng'),
name: 'dashboard',
meta: { title: 'dashboard', icon: 'home-page', noCache: true }
}],
},
{
path: 'updateUserInfo',
component: _import('mdp/sys/user/UpdateUserInfo'),
name: '账户设置',
meta: {
title: 'updateUserInfo',
icon: 'component'
}
}
],
hidden: true
}
},
]
export default new Router({

67
src/routes.js

@ -1,67 +0,0 @@
import Login from './views/Login.vue'
import NotFound from './views/404.vue'
import Home from './views/Home.vue'
//文档中心
import ArchiveMng from './views/mdp/arc/archive/ArchiveMng.vue'
import ArchiveListFlow from './views/mdp/arc/archive/ArchiveListFlow.vue'
import ArchiveAttachmentMng from './views/mdp/arc/archiveAttachment/ArchiveAttachmentMng.vue'
import ArcCategoryMng from './views/mdp/arc/category/CategoryMng.vue'
import UploadAdd from './views/mdp/arc/image/UploadAdd.vue'
//内容分发
import SendPlanMng from './views/mdp/arc/send/sendPlan/SendPlanMng.vue'
//商城专题设置
//商城end
let routes = [
{
path: '/login',
component: Login,
name: '',
hidden: true
},
{
path: '/404',
component: NotFound,
name: '',
hidden: true
},
{
path: '/',
component: Home,
name: '',
hidden: true
},
{
path: '/oa',
component: Home,
name: '内容/文档中心',
iconCls: 'fa el-icon-menu',
//leaf: true,//只有一个节点
children: [
{ path: '/arc/Index', component: ArchiveMng, name: '文档管理' },
{ path: '/mdp/arc/archive/ArchiveMng/query', component: ArchiveMng, name: '文档查阅' },
{ path: '/mdp/arc/archive/ArchiveListFlow', component: ArchiveListFlow, name: '流程归档查阅' },
{ path: '/mdp/arc/archiveAttachment/ArchiveAttachmentMng', component: ArchiveAttachmentMng, name: '附件管理' },
{ path: '/mdp/arc/category/CategoryMng', component: ArcCategoryMng, name: '分类管理' },
{ path: '/mdp/arc/image/UploadAdd',component:UploadAdd,name:'图片管理'}
]
},
{
path: '/oa',
component: Home,
name: '内容分发',
iconCls: 'fa el-icon-menu',
//leaf: true,//只有一个节点
children: [
{ path: '/mdp/arc/archive/ArchiveMng/1', component: ArchiveMng, name: '文档分发' },
{ path: '/mdp/arc/send/sendPlan/SendPlanMng', component: SendPlanMng, name: '分发计划管理' },
{ path: '/mdp/arc/send/sendPlan/SendPlanMng/1', component: SendPlanMng, name: '分发结果' },
{ path: '/mdp/arc/archive/ArchiveMng/2', component: ArchiveMng, name: '分发模板设置' }
]
},
];
export default routes;

8
src/views/layout/components/Navbar.vue

@ -225,6 +225,14 @@ export default {
window.open(href, '_blank');
NProgress.done() // if current page is login will not trigger afterEach hook, so manually handle it
},
handleCommand(command){
if(command=='updateUserInfo'){
this.$router.push({path:'/updateUserInfo'})
}
},
goToIndex(){
this.$router.push({path:'/'})
}
},
mounted() {

222
src/views/mdp/sys/user/UpdateUserInfo.vue

@ -0,0 +1,222 @@
<template>
<section>
<!--工具条1-->
<!--如果有更多工具条,放开此注释
<el-col :span="24" class="toolbar" style="padding-bottom: 0px;">
<el-col :span="4">
</el-col>
</el-col>
-->
<!--编辑界面 User sys_user-->
<el-row class="padding" v-show="changePasswordVisible==true" >
<el-form :model="passwordForm" label-width="120px" ref="passwordForm">
<el-form-item label="" prop="headimgurl">
<el-avatar :size="100" :src="editForm.headimgurl"></el-avatar>
</el-form-item>
<el-form-item label="原密码" prop="oldPassword" :rules="[{required:true,message:'原密码不能为空'}]">
<el-input style="width:400px;" type="password" v-model="passwordForm.oldPassword" auto-complete="off"></el-input>
</el-form-item>
<el-form-item label="新密码" prop="newPassword" :rules="[{required:true,message:'新密码不能为空'}]">
<el-input style="width:400px;" type="password" v-model="passwordForm.newPassword" auto-complete="off"></el-input>
</el-form-item>
<el-form-item>
<el-button type="primary" @click.native="doChangePassword" :loading="editLoading">保存</el-button>
<el-button @click.native="changePasswordVisible=false" :loading="editLoading">返回</el-button>
</el-form-item>
</el-form>
</el-row>
<el-row class="padding" v-show="changePasswordVisible==false" >
<el-form :model="editForm" label-width="120px" :rules="editFormRules" ref="editForm">
<el-form-item label="" prop="headimgurl">
<el-avatar :size="100" :src="editForm.headimgurl" @click="showUploadHeadimg"></el-avatar>
<br>
<el-button type="text" @click="showUploadHeadimg">更换头像</el-button>
</el-form-item>
<el-form-item label="" v-show="false" prop="headimgurl">
<single-shear-upload ref="uploadImg"
:img-width="100"
:img-height="100"
:show-title="true"
v-model="editForm.headimgurl"
:branch-id="userInfo.branchId"
:deptid="userInfo.deptid"
:remark="userInfo.username"
>
<span slot="title">商品高清大图</span>
</single-shear-upload>
</el-form-item>
<el-form-item label="用户名称" prop="username" :rules="[{required:true,message:'用户名称不能为空'}]">
<el-input style="width:400px;" v-model="editForm.username" auto-complete="off"></el-input>
</el-form-item>
<el-form-item label="登录账号" prop="displayUserid" :rules="[{required:true,message:'登录账号不能为空'}]">
<el-input style="width:400px;" v-model="editForm.displayUserid" auto-complete="off"></el-input>
</el-form-item>
<el-form-item label="邮箱" prop="email" :rules="[{required:true,message:'邮箱不能为空'},{validator:validateEmail}]">
<el-input style="width:400px;" v-model="editForm.email" auto-complete="off"></el-input>
</el-form-item>
<el-form-item>
<el-button @click.native="changePasswordVisible=true" :loading="editLoading">修改密码</el-button>
<el-button type="primary" @click.native="editSubmit" :loading="editLoading">保存</el-button>
</el-form-item>
</el-form>
</el-row>
</section>
</template>
<script>
import util from '../../../../common/js/util';//
import { editUser,changePassword } from '../../../../api/mdp/sys/user';
import { mapGetters } from 'vuex'
import SingleShearUpload from "@/components/Image/Single/Index";
import md5 from "js-md5";
export default {
computed: {
...mapGetters([
'userInfo'
])
},
props:['user'],
watch: {
'user':function(data) {
this.editForm=data;
}
},
data() {
var validatePhoneno = (rule, value, callback) => {
if (!value) {
callback();
} else {
if (value) {
if(value.length<11 || value.length>11){
callback(new Error('手机号码必须11位'));
}
if(!(/^1[3456789]\d{9}$/.test(value))){
callback(new Error('手机号码格式不正确'));
}
}
callback();
}
};
var validateEmail = (rule, value, callback) => {
if (value=='') {
callback();
} else {
if (value !== '') {
var reg = /^([a-zA-Z]|[0-9])(\w|\-)+@[a-zA-Z0-9]+\.([a-zA-Z]{2,4})$/;
if(!reg.test(value)){
callback(new Error('邮箱格式不正确'));
}
}
callback();
}
};
var validateIdCardNo = (rule, value, callback) => {
if (value === ''|| value==null) {
//callback(nPhonenoew Error(''));
callback();
}else {
if (value !== '' && value.length>15) {
var reg = /^[1-9]\d{5}(18|19|20)\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/;
if(!reg.test(value)){
callback(new Error('身份证号码格式不正确'));
}else{
callback();
}
}else if(value !== '' && value.length<15){
callback(new Error('请输入15位或者18位长度身份证号码'));
}else{
callback();
}
}
};
return {
validateEmail:validateEmail,
uploadHeadimgVisible:false,
changePasswordVisible:false,
options:{},//
editLoading: false,
editFormRules: {
displayUserid: [
{ required: true, message: '账号必填', trigger: 'blur' }
],
username: [
{ required: true, message: '用户名称必填', trigger: 'blur' }
],
email: [
{ validator:validateEmail, trigger: 'blur' }
]
},
// User sys_user
editForm: {
unionid:'',displayUserid:'',userid:'',locked:'',startdate:'',nickname:'',username:'',phoneno:'',password:'',salt:'',fingerpassword1:'',fingerpassword2:'',fingerpassword3:'',fingerpassword4:'',pwdtype:'',headimgurl:'',country:'',city:'',province:'',address:'',sex:'',enddate:'',districtId:'',userid:'',userAccount:'',userPwd:'',userName:'',userDesc:'',officePhoneno:'',idCardNo:'',email:''
},
passwordForm:{
newPassword:'',oldPassword:''
}
}
},
methods: {
// @cancel="editFormVisible=false"
handleCancel:function(){
this.$emit('cancel');
},
//User sys_user@submit="afterEditSubmit"
editSubmit: function () {
this.$refs.editForm.validate((valid) => {
if (valid) {
this.$confirm('确认提交吗?', '提示', {}).then(() => {
this.editLoading = true;
let params = Object.assign({}, this.editForm);
editUser(params).then((res) => {
this.editLoading = false;
var tips=res.data.tips;
if(tips.isOk){
this.$emit('submit');// @submit="afterEditSubmit"
}
this.$message({ message: tips.msg, type: tips.isOk?'success':'error' });
}).catch(() => {
this.editLoading = false;
});
});
}
});
},
doChangePassword(){
this.$refs.passwordForm.validate((valid) => {
if (valid) {
changePassword({oldPassword:md5(this.passwordForm.oldPassword),newPassword:md5(this.passwordForm.newPassword)}).then(res=>{
var tips = res.data.tips;
this.$message({ message: tips.msg, type: tips.isOk?'success':'error' });
})
}
})
},
showUploadHeadimg(){
this.$refs.uploadImg.showAdd();
}
},
components: {
SingleShearUpload
},
mounted() {
this.editForm=Object.assign(this.editForm, this.userInfo);
}
}
</script>
<style scoped>
</style>
Loading…
Cancel
Save