Skip to content

M
mes-ui
Commit 4c158a8e authored by renjintao's avatar renjintao
Browse files
Options

tenantCode

parent 4b9a5ead
Show whitespace changes
Inline Side-by-side
Showing with 466 additions and 432 deletions
pages/basicData/user/add.vue
View file @ 4c158a8e
<template> <template>
<div class="addUser"> <div class="addUser">
<Form ref="form" :model="entity" :rules="rules" :label-width="100"> <Form ref="form" :model="entity" :rules="rules" :label-width="100">
<Row class="rowTitle100"> <Row class="rowTitle100">
<Col :span="12"> <Col :span="12">
...@@ -84,9 +84,11 @@ ...@@ -84,9 +84,11 @@
<Button @click="handleClose" class="ml20">取消</Button> <Button @click="handleClose" class="ml20">取消</Button>
</FormItem> </FormItem>
</Form> </Form>
</div> </div>
</template> </template>
<script>
<script>
import Api from "./api"; import Api from "./api";
const valideTel = (rule, value, callback) => { const valideTel = (rule, value, callback) => {
var re = /^1[3-9]{1}[0-9]{9}/; var re = /^1[3-9]{1}[0-9]{9}/;
...@@ -123,18 +125,34 @@ export default { ...@@ -123,18 +125,34 @@ export default {
property: false property: false
}, },
rules: { rules: {
userName: [{ required: true, message: "必填", trigger: "blur" }], userName: [{
cardNo: [ required: true,
{ required: true, message: "必填", trigger: "blur" }, message: "必填",
{ validator: validateCarNo, trigger: "blur" } trigger: "blur"
], }],
departmentTitle: [ cardNo: [{
{ required: true, message: "必选", trigger: "change" } required: true,
message: "必填",
trigger: "blur"
},
{
validator: validateCarNo,
trigger: "blur"
}
], ],
departmentTitle: [{
required: true,
message: "必选",
trigger: "change"
}],
// email: [ // email: [
// { required: true, message: '必填', trigger: 'blur', type: 'email' } // { required: true, message: '必填', trigger: 'blur', type: 'email' }
// ], // ],
phone: [{ validator: valideTel, required: true, trigger: "blur" }] phone: [{
validator: valideTel,
required: true,
trigger: "blur"
}]
// degreeId: [ // degreeId: [
// { required: true, message: '必填', trigger: 'blur', type: 'number' } // { required: true, message: '必填', trigger: 'blur', type: 'number' }
// ], // ],
...@@ -165,8 +183,8 @@ export default { ...@@ -165,8 +183,8 @@ export default {
userId: r.result.id, userId: r.result.id,
loginName: this.entity.phone, //用户电话 loginName: this.entity.phone, //用户电话
status: this.entity.status, //状态 status: this.entity.status, //状态
tanantCode: this.$store.state.userInfo.tanantCode, //商户号 tenantCode: this.$store.state.userInfo.tenantCode, //商户号
name:this.entity.userName name: this.entity.userName
}; };
Api.authAccount(parms).then(res => { Api.authAccount(parms).then(res => {
if (res.success) { if (res.success) {
...@@ -226,6 +244,7 @@ export default { ...@@ -226,6 +244,7 @@ export default {
} }
}; };
</script> </script>
<style lang="less"> <style lang="less">
.addUser { .addUser {
.ivu-radio-wrapper { .ivu-radio-wrapper {
......
pages/basicData/user/edit.vue
View file @ 4c158a8e
<template> <template>
<div class="addUser"> <div class="addUser">
<Form ref="form" :model="entity" :rules="rules" :label-width="100"> <Form ref="form" :model="entity" :rules="rules" :label-width="100">
<Row class="rowTitle100"> <Row class="rowTitle100">
<Col :span="12"> <Col :span="12">
...@@ -84,8 +84,9 @@ ...@@ -84,8 +84,9 @@
<Button @click="handleClose" class="ml20">取消</Button> <Button @click="handleClose" class="ml20">取消</Button>
</FormItem> </FormItem>
</Form> </Form>
</div> </div>
</template> </template>
<script> <script>
import Api from "./api"; import Api from "./api";
...@@ -107,8 +108,16 @@ export default { ...@@ -107,8 +108,16 @@ export default {
showDeptTree: false, showDeptTree: false,
entity: {}, entity: {},
rules: { rules: {
userName: [{ required: true, message: "必填", trigger: "blur" }], userName: [{
departmentTitle: [{ required: true, message: "必选", trigger: "blur" }], required: true,
message: "必填",
trigger: "blur"
}],
departmentTitle: [{
required: true,
message: "必选",
trigger: "blur"
}],
//cardNo: [{ required: true, message: '必填', trigger: 'blur' }], //cardNo: [{ required: true, message: '必填', trigger: 'blur' }],
// birthday: [{ required: true, message: '必填', trigger: 'change' }], // birthday: [{ required: true, message: '必填', trigger: 'change' }],
// degreeId: [ // degreeId: [
...@@ -117,7 +126,11 @@ export default { ...@@ -117,7 +126,11 @@ export default {
// email: [ // email: [
// { required: true, message: '必填', trigger: 'blur', type: 'email' } // { required: true, message: '必填', trigger: 'blur', type: 'email' }
// ], // ],
phone: [{ validator: valideTel, required: true, trigger: "blur" }] phone: [{
validator: valideTel,
required: true,
trigger: "blur"
}]
} }
}; };
}, },
...@@ -126,7 +139,9 @@ export default { ...@@ -126,7 +139,9 @@ export default {
}, },
methods: { methods: {
load(v) { load(v) {
Api.get({ id: v }).then(r => { Api.get({
id: v
}).then(r => {
this.entity = r.result; this.entity = r.result;
if (r.result.property == 2) { if (r.result.property == 2) {
this.entity.property = true; this.entity.property = true;
...@@ -158,8 +173,8 @@ export default { ...@@ -158,8 +173,8 @@ export default {
userId: this.entity.id, userId: this.entity.id,
loginName: this.entity.phone, //用户电话 loginName: this.entity.phone, //用户电话
status: this.entity.status, status: this.entity.status,
tanantCode: this.$store.state.userInfo.tanantCode, //商户号 tenantCode: this.$store.state.userInfo.tenantCode, //商户号
name:this.entity.userName name: this.entity.userName
}; };
Api.authAccount(parms2).then(res => { Api.authAccount(parms2).then(res => {
//同步电话信息等 //同步电话信息等
...@@ -175,8 +190,8 @@ export default { ...@@ -175,8 +190,8 @@ export default {
userId: this.entity.id, userId: this.entity.id,
loginName: this.entity.phone, //用户电话 loginName: this.entity.phone, //用户电话
status: this.entity.status, status: this.entity.status,
tanantCode: this.$store.state.userInfo.tanantCode, //商户号 tenantCode: this.$store.state.userInfo.tenantCode, //商户号
name:this.entity.userName name: this.entity.userName
}; };
Api.authAccount(parms).then(res1 => { Api.authAccount(parms).then(res1 => {
if (res1.success) { if (res1.success) {
...@@ -236,6 +251,7 @@ export default { ...@@ -236,6 +251,7 @@ export default {
} }
}; };
</script> </script>
<style lang="less"> <style lang="less">
.addUser { .addUser {
.ivu-radio-wrapper { .ivu-radio-wrapper {
...@@ -243,4 +259,3 @@ export default { ...@@ -243,4 +259,3 @@ export default {
} }
} }
</style> </style>
pages/basicData/user/index.vue
View file @ 4c158a8e
...@@ -494,7 +494,7 @@ export default { ...@@ -494,7 +494,7 @@ export default {
let parms = { let parms = {
userId: this.curId, userId: this.curId,
accountId: this.selectRow.accountId, accountId: this.selectRow.accountId,
tenantCode: util.cookies.get("tanantCode"), tenantCode: util.cookies.get("tenantCode"),
isDeleted: true, isDeleted: true,
name: this.selectRow.userName, name: this.selectRow.userName,
}; };
...@@ -649,7 +649,7 @@ export default { ...@@ -649,7 +649,7 @@ export default {
userId: this.selectRow.id, userId: this.selectRow.id,
loginName: this.selectRow.phone, loginName: this.selectRow.phone,
status: this.selectRow.status, status: this.selectRow.status,
tenantCode: util.cookies.get("tanantCode"), tenantCode: util.cookies.get("tenantCode"),
name: this.selectRow.userName, name: this.selectRow.userName,
}; };
if (this.selectRow.phone && this.selectRow.phone != "") { if (this.selectRow.phone && this.selectRow.phone != "") {
......
store/admin/account.js
View file @ 4c158a8e
...@@ -41,7 +41,7 @@ export const actions = { ...@@ -41,7 +41,7 @@ export const actions = {
if (res.result) { if (res.result) {
util.cookies.set('uuid', res.result.userId); util.cookies.set('uuid', res.result.userId);
util.cookies.set('tanantCode', res.result.tanantCode); util.cookies.set('tenantCode', res.result.tenantCode);
util.cookies.set('token', res.result.accessToken); util.cookies.set('token', res.result.accessToken);
sessionStorage.setItem('token', res.result.accessToken) sessionStorage.setItem('token', res.result.accessToken)
// // 设置 vuex 用户信息 // // 设置 vuex 用户信息
......
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