end7less
/
program_xm_vue
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

增加加入机构申请功能

master
qqkj 5 years ago
parent
f2dc7f7b04
commit
db0e0b1c30
5 changed files with 191 additions and 57 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      src/api/branch.js
  2. 14
      src/utils/auth.js
  3. 215
      src/views/login/BranchAdd.vue
  4. 11
      src/views/login/index.vue
  5. 2
      src/views/login/socialsignin.vue

6
src/api/branch.js
View File

@ -26,4 +26,8 @@ export const batchDelBranch = params => { return axios.post(`${base}/mdp/sys/bra
export const editBranch = params => { return axios.post(`${base}/mdp/sys/branch/edit`, params); }; export const editBranch = params => { return axios.post(`${base}/mdp/sys/branch/edit`, params); };
//新增一条管理端机构表（机构下面若干部门） //新增一条管理端机构表（机构下面若干部门）
export const addBranchNoAuth = params => { return axios.post(`${base}/mdp/sys/branch/addBranchNoAuth`, params); };
export const addBranchNoAuth = params => { return axios.post(`${base}/mdp/sys/branch/addBranchNoAuth`, params); };
//新增一条企业入驻审核流程
export const addUserJoinBranchRequire = params => { return axios.post(`${base}/mdp/sys/userJoinBranchRequire/add`, params); };

14
src/utils/auth.js
View File

@ -2,6 +2,8 @@ import Cookies from 'js-cookie'
const TokenKey = 'token' const TokenKey = 'token'
const UserInfoKey='userInfo'
export function getToken() { export function getToken() {
return localStorage.getItem(TokenKey) return localStorage.getItem(TokenKey)
} }
@ -15,15 +17,13 @@ export function removeToken() {
} }
export function getCacheUserInfo(){ export function getCacheUserInfo(){
var userInfo= localStorage.getItem(localStorage.getItem(TokenKey));
var userInfo= localStorage.getItem(UserInfoKey);
return JSON.parse(userInfo); return JSON.parse(userInfo);
} }
export function setCacheUserInfo(userInfo){
var tokenValue=localStorage.getItem(TokenKey)
localStorage.setItem(tokenValue, JSON.stringify(userInfo))
export function setCacheUserInfo(userInfo){
localStorage.setItem(UserInfoKey, JSON.stringify(userInfo))
return; return;
} }
export function removeCacheUserInfo() {
var tokenValue=localStorage.getItem(TokenKey)
return localStorage.removeItem(tokenValue)
export function removeCacheUserInfo() {
return localStorage.removeItem(UserInfoKey)
} }

215
src/views/login/BranchAdd.vue
View File

@ -1,18 +1,19 @@
<template> <template>
<section> <section>
<el-row class="app-container"> <el-row class="app-container">
<el-row class="app-container">
<el-tag type="warning">您不在任何一个公司或者部门中，您可以 创建新公司 或者 申请加入已有公司</el-tag>
</el-row>
<el-row class="app-container">
<el-radio v-model="addOrJoinBranch" label="add" >创建新公司</el-radio><el-radio v-model="addOrJoinBranch" label="join" >申请加入已有公司</el-radio>
</el-row>
<!--新增界面 Branch 管理端机构表（机构下面若干部门）--> <!--新增界面 Branch 管理端机构表（机构下面若干部门）-->
<el-form :model="addForm" label-width="120px" :rules="addFormRules" ref="addForm">
<el-form-item label="" prop="branchName">
<el-tag>您不在任何一个公司或者部门中，需要【先创建公司】 或者请【管理员加您进入公司】</el-tag>
</el-form-item>
<el-form-item label="机构名称" prop="branchName">
<el-form :model="addForm" v-show="addOrJoinBranch=='add'" label-width="100px" :rules="addFormRules" ref="addForm">
<el-form-item label="公司名称" prop="branchName">
<el-input v-model="addForm.branchName" auto-complete="off"> <el-input v-model="addForm.branchName" auto-complete="off">
<el-button slot="append" @click.prevent="checkBranchExists">查询机构是否存在</el-button>
<el-button slot="append" round type="primary" plain @click="checkBranchExists">查询机构是否存在</el-button>
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item label="行业分类" prop="industryCategory"> <el-form-item label="行业分类" prop="industryCategory">
<el-select <el-select
v-model="addForm.industryCategory" v-model="addForm.industryCategory"
@ -28,7 +29,7 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="姓名" prop="cusername">
<el-form-item label="联系人姓名" prop="cusername">
<el-input v-model="addForm.cusername" auto-complete="off"></el-input> <el-input v-model="addForm.cusername" auto-complete="off"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="联系电话" prop="phoneNo"> <el-form-item label="联系电话" prop="phoneNo">
@ -37,16 +38,47 @@
<el-form-item label="邮件" prop="emaill"> <el-form-item label="邮件" prop="emaill">
<el-input v-model="addForm.emaill" auto-complete="off"></el-input> <el-input v-model="addForm.emaill" auto-complete="off"></el-input>
</el-form-item> </el-form-item>
<el-form-item>
<el-col :span="4" :offset="16">
<el-button @click.native="handleCancel">取消</el-button>
</el-col>
<el-col :span="4">
<el-button v-loading="load.add" type="primary" @click.native="addSubmit" >提交</el-button>
</el-col>
<el-form-item>
<el-button @click.native="handleCancel">取消</el-button>
<el-button v-loading="load.add" type="primary" round @click.native="addSubmit" >创建新公司</el-button>
</el-form-item>
</el-form>
<!--新增界面 Branch 管理端机构表（机构下面若干部门）-->
<el-form :model="joinForm" v-show="addOrJoinBranch=='join'" label-width="100px" :rules="joinFormRules" ref="joinForm">
<el-form-item label="公司查询" prop="joinBranchId">
<el-select
v-model="joinForm.joinBranchId"
filterable
remote
clearable
placeholder="请输入2个关键词查询"
:remote-method="searchBranchs"
value-key="id"
:loading="load.list">
<el-option
v-for="item in branchs"
:key="item.id"
:label="item.branchName"
:value="item.id">
</el-option>
</el-select>
<el-tag>选择已有公司-申请加入</el-tag>
</el-form-item>
<el-form-item label="加入理由" prop="joinReason">
<el-input type="textarea" rows="4" v-model="joinForm.joinReason" auto-complete="off"></el-input>
</el-form-item>
<el-form-item label="联系人姓名" prop="joinUsername" >
<el-input v-model="joinForm.joinUsername" auto-complete="off"></el-input>
</el-form-item>
<el-form-item label="联系电话" prop="joinUserPhoneno" >
<el-input v-model="joinForm.joinUserPhoneno" auto-complete="off"></el-input>
</el-form-item>
<el-form-item>
<el-button @click.native="handleCancel">取消</el-button>
<el-button v-loading="load.add" type="warning" round @click.native="joinBranch" >加入公司</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
</el-row> </el-row>
</section> </section>
</template> </template>
@ -54,7 +86,7 @@
<script> <script>
import util from '@/common/js/util';//全局公共库 import util from '@/common/js/util';//全局公共库
import { listOption } from '@/api/itemOption';//下拉框数据查询 import { listOption } from '@/api/itemOption';//下拉框数据查询
import { addBranchNoAuth,listBranchNoAuth } from '@/api/branch';
import { addBranchNoAuth,listBranchNoAuth,addUserJoinBranchRequire } from '@/api/branch';
import { mapGetters } from 'vuex' import { mapGetters } from 'vuex'
export default { export default {
@ -70,18 +102,53 @@
} }
}, },
data() { data() {
const validateBranchName = (rule, value, callback) => {
if( !value || value.length<=6){
callback(new Error('请输入6位以上公司名称'))
}else{
callback()
}
}
const validatePhoneNo = (rule, value, callback) => {
if( !value || value.length !=11 ){
callback(new Error('手机号码必须为11位号码'))
}else{
callback()
}
}
const validateCusername = (rule, value, callback) => {
if( !value || value.length <2 ){
callback(new Error('请输入联系人名称'))
}else{
callback()
}
}
return { return {
options:{},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} options:{},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]}
load:{ list: false, edit: false, del: false, add: false },//查询中... load:{ list: false, edit: false, del: false, add: false },//查询中...
addFormRules: { addFormRules: {
id: [
//{ required: true, message: '机构编号不能为空', trigger: 'blur' }
]
branchName: [{ required: true, trigger: 'blur', validator: validateBranchName }],
cusername: [{ required: true, trigger: 'blur', validator: validateCusername }],
phoneNo: [{ required: true, trigger: 'blur', validator: validatePhoneNo }],
}, },
//新增界面数据 管理端机构表（机构下面若干部门） //新增界面数据 管理端机构表（机构下面若干部门）
addForm: { addForm: {
id:'',branchName:'',enabled:'',industryCategory:'',cuserid:'',cdate:'',cusername:'',phoneNo:'',emaill:'' id:'',branchName:'',enabled:'',industryCategory:'',cuserid:'',cdate:'',cusername:'',phoneNo:'',emaill:''
}
},
joinFormRules: {
//branchName: [{ required: true, trigger: 'blur', validator: validateBranchName }],
joinUsername: [{ required: true, trigger: 'blur', validator: validateCusername }],
joinUserPhoneno: [{ required: true, trigger: 'blur', validator: validatePhoneNo }],
joinBranchId:[{ required: true, message: '要加入的公司不能为空', trigger: 'blur' }],
joinReason:[{ required: true, message: '加入理由不能为空', trigger: 'blur' }],
},
//新增界面数据 管理端机构表（机构下面若干部门）
joinForm: {
id:'',joinBranchId:'',joinUserPhoneno:'',joinUserid:'',joinUsername:'',joinDeptid:'',joinReason:''
},
branchs:[],
addOrJoinBranch:'join'
/**begin 在下面加自定义属性,记得补上面的一个逗号**/ /**begin 在下面加自定义属性,记得补上面的一个逗号**/
/**end 在上面加自定义属性**/ /**end 在上面加自定义属性**/
@ -96,35 +163,94 @@
addSubmit: function () { addSubmit: function () {
this.$refs.addForm.validate((valid) => { this.$refs.addForm.validate((valid) => {
if (valid) {
if (valid) {
this.$confirm('确认提交吗？', '提示', {}).then(() => { this.$confirm('确认提交吗？', '提示', {}).then(() => {
this.load.add=true
let params = Object.assign({}, this.addForm);
console.log("dddddddddddddddddddddddddddddddddddddddddddddddd")
console.log(this.userInfo)
params.cuserid=this.userInfo.userid
addBranchNoAuth(params).then((res) => {
this.load.add=false
var tips=res.data.tips;
if(tips.isOk){
this.$refs['addForm'].resetFields();
this.$emit('submit',res.data.data );// @submit="afterAddSubmit"
if(this.addForm.branchName.length>=6){
var params={
key:"%"+this.addForm.branchName+"%"
} }
this.$message({ message: tips.msg, type: tips.isOk?'success':'error' });
}).catch(() => this.load.add=false);
listBranchNoAuth(params).then(res=>{
if(res.data.tips.isOk){
if(res.data.data.length<=0){
this.load.add=true
let params = Object.assign({}, this.addForm);
params.cuserid=this.userInfo.userid
addBranchNoAuth(params).then((res) => {
this.load.add=false
var tips=res.data.tips;
if(tips.isOk){
this.$emit('submit',res.data.data );// @submit="afterAddSubmit"
}
this.$message({ message: tips.msg, type: tips.isOk?'success':'error' });
}).catch(() => this.load.add=false);
}else{
this.$message({ message: "该公司名已注册，不可以使用", type: 'error' });
return;
}
}
})
}else{
this.$message({ message: "公司名必须6个字以上", type: 'error' });
return;
}
}); });
} }
}); });
}, },
searchBranchs:function(query){
this.load.list=true;
if(query.length>=2){
var params={
key:"%"+query+"%"
}
listBranchNoAuth(params).then(res=>{
this.load.list=false;
if(res.data.tips.isOk){
if(res.data.data.length>=0){
this.branchs=res.data.data;
return;
}else{
this.branchs=[]
return;
}
}
})
}else{
this.load.list=false;
this.$message({ message: "最少输入两个字", type: 'info' });
return;
}
},
joinBranch:function(){
this.$refs.joinForm.validate((valid) => {
if (valid) {
this.$confirm('确认提交吗？', '提示', {}).then(() => {
var params= this.joinForm
addUserJoinBranchRequire(params).then(res=>{
var tips = res.data.tips;
if(tips.isOk){
this.$message({ message:tips.msg, type: 'success' });
//this.$emit('submit',res.data.data );// @submit="afterAddSubmit"
return;
}else{
this.$message({ message: tips.msg, type: 'error' });
return;
}
})
});
}
});
},
checkBranchExists:function(){ checkBranchExists:function(){
if(this.addForm.branchName.length>=2){ if(this.addForm.branchName.length>=2){
var params={ var params={
key:this.addForm.branchName
key:"%"+this.addForm.branchName+"%"
} }
listBranchNoAuth(params).then(res=>{ listBranchNoAuth(params).then(res=>{
if(res.data.tips.isOk){ if(res.data.tips.isOk){
if(res.data.total<=0){
if(res.data.data.length<=0){
this.$message({ message: "该公司名未注册，可以使用", type: 'success' }); this.$message({ message: "该公司名未注册，可以使用", type: 'success' });
return; return;
}else{ }else{
@ -133,6 +259,9 @@
} }
} }
}) })
}else{
this.$message({ message: "最少输入两个字", type: 'error' });
return;
} }
} }
/**begin 在下面加自定义方法,记得补上面的一个逗号**/ /**begin 在下面加自定义方法,记得补上面的一个逗号**/
@ -151,7 +280,13 @@
mounted() { mounted() {
this.addForm=Object.assign(this.addForm, this.branch); this.addForm=Object.assign(this.addForm, this.branch);
this.addForm.cusername=this.userInfo.username this.addForm.cusername=this.userInfo.username
this.addForm.phoneNo=this.userInfo.phoneNo;
this.addForm.phoneNo=this.userInfo.phoneno;
this.addForm.cuserid=this.userInfo.userid;
this.addForm.emaill=this.userInfo.email;
this.joinForm.joinUsername=this.userInfo.username
this.joinForm.joinReason="员工申请加入公司";
this.joinForm.joinUserid=this.userInfo.userid;
this.joinForm.joinUserPhoneno=this.userInfo.phoneno;
this.load.list=true this.load.list=true
listOption([{categoryId:'all',itemCode:'industryCategory'}]).then(res=>{ listOption([{categoryId:'all',itemCode:'industryCategory'}]).then(res=>{
this.load.list=false this.load.list=false

11
src/views/login/index.vue
View File

@ -231,7 +231,8 @@ export default {
//this.userDeptid=res2.data.userInfo.deptid //this.userDeptid=res2.data.userInfo.deptid
this.loading = false this.loading = false
if(res2.data.tips.isOk==true){ if(res2.data.tips.isOk==true){
if(this.$store.state.user.myBranchs==null ||this.$store.state.user.myBranchs.length==0||this.$store.state.user.myDepts==null || this.$store.state.user.myDepts.length<=0){
if(this.$store.state.user.myBranchs==null ||this.$store.state.user.myBranchs.length==0||this.$store.state.user.myDepts==null || this.$store.state.user.myDepts.length<=0){
//if(1==1){
//this.$message.error("亲，您不在任何一个公司或者部门中，需要【先创建公司】\n 或者请【管理员加您进入公司】哦"); //this.$message.error("亲，您不在任何一个公司或者部门中，需要【先创建公司】\n 或者请【管理员加您进入公司】哦");
this.addBranchFormVisible=true; this.addBranchFormVisible=true;
}else if(this.$store.state.user.myDepts.length>1 ){ }else if(this.$store.state.user.myDepts.length>1 ){
@ -303,13 +304,7 @@ export default {
afterAddBranchSubmit(branch){ afterAddBranchSubmit(branch){
this.addBranchFormVisible=false; this.addBranchFormVisible=false;
this.loading=true
this.$store.dispatch('GetUserInfo').then((res)=>{
this.userDeptid=res.data.userInfo.deptid
this.loading = false;
//角色身份验证
this.rolesChecked();
});
this.handleLogin();
}, },
afterQRScan() { afterQRScan() {
// const hash = window.location.hash.slice(1) // const hash = window.location.hash.slice(1)

2
src/views/login/socialsignin.vue
View File

@ -17,7 +17,7 @@ export default {
methods: { methods: {
wechatHandleClick(thirdpart) { wechatHandleClick(thirdpart) {
this.$store.commit('SET_AUTH_TYPE', thirdpart) this.$store.commit('SET_AUTH_TYPE', thirdpart)
const appid = 'xxxxx'
const appid = 'wx0c261f0d6052439c'
const redirect_uri = encodeURIComponent('xxx/redirect?redirect=' + window.location.origin + '/authredirect') const redirect_uri = encodeURIComponent('xxx/redirect?redirect=' + window.location.origin + '/authredirect')
const url = 'https://open.weixin.qq.com/connect/qrconnect?appid=' + appid + '&redirect_uri=' + redirect_uri + '&response_type=code&scope=snsapi_login#wechat_redirect' const url = 'https://open.weixin.qq.com/connect/qrconnect?appid=' + appid + '&redirect_uri=' + redirect_uri + '&response_type=code&scope=snsapi_login#wechat_redirect'
openWindow(url, thirdpart, 540, 540) openWindow(url, thirdpart, 540, 540)

Write Preview
Loading…
Cancel
Save