diff --git a/src/api/login.js b/src/api/login.js index 4be9d0d..7026f28 100644 --- a/src/api/login.js +++ b/src/api/login.js @@ -150,8 +150,10 @@ export class socialBindLogin { export function getUserTenant(data) { return request({ - url: '/system/auth/getTenant', - method: 'post', - data: data + url: '/system/auth/getListByPhone', + method: 'get', + params: { + phone: data + } }) } diff --git a/src/components/tenantSelect/tenantSelect.vue b/src/components/tenantSelect/tenantSelect.vue new file mode 100644 index 0000000..32b1356 --- /dev/null +++ b/src/components/tenantSelect/tenantSelect.vue @@ -0,0 +1,206 @@ + + + + + diff --git a/src/views/inspection/businessChannel/api/index.js b/src/views/inspection/businessChannel/api/index.js new file mode 100644 index 0000000..ba4ba61 --- /dev/null +++ b/src/views/inspection/businessChannel/api/index.js @@ -0,0 +1,52 @@ +import request from '@/utils/request' + +// 查询菜单列表 +export function listBusiness(query) { + return request({ + url: '/channel/tree', + method: 'get', + params: query + }) +} + +// 查询菜单（精简)列表 +export function listSimpleMenus() { + return request({ + url: '/system/menu/list-all-simple', + method: 'get' + }) +} + +// 查询菜单详细 +export function getBusiness(id) { + return request({ + url: '/channel/' + id, + method: 'get' + }) +} + +// 新增菜单 +export function addBusiness(data) { + return request({ + url: '/channel/add', + method: 'post', + data: data + }) +} + +// 修改菜单 +export function updateBusiness(data) { + return request({ + url: '/channel/update', + method: 'put', + data: data + }) +} + +// 删除菜单 +export function delBusiness(id) { + return request({ + url: '/channel/delete/' + id, + method: 'delete' + }) +} diff --git a/src/views/inspection/businessChannel/index.vue b/src/views/inspection/businessChannel/index.vue new file mode 100644 index 0000000..fd55297 --- /dev/null +++ b/src/views/inspection/businessChannel/index.vue @@ -0,0 +1,303 @@ + + + diff --git a/src/views/inspection/staff/api/staff.js b/src/views/inspection/staff/api/staff.js index 336092c..4bd7add 100644 --- a/src/views/inspection/staff/api/staff.js +++ b/src/views/inspection/staff/api/staff.js @@ -70,7 +70,7 @@ export function updateUser(data) { // 删除用户 export function delUser(userId) { return request({ - url: '/system/user/delete?id=' + userId, + url: '/inspectionStaff/delete?id=' + userId, method: 'delete' }) } diff --git a/src/views/inspection/staff/index.vue b/src/views/inspection/staff/index.vue index d100a60..2a1a04b 100644 --- a/src/views/inspection/staff/index.vue +++ b/src/views/inspection/staff/index.vue @@ -571,10 +571,10 @@ export default { if (!this.form.folderId) { addFolder(this.form.id).then(response => { this.form.folderId = response.data - this.$router.push({path: '/jc/shop/partner/file/file', query: {"folderId": this.form.folderId}}) + this.$router.push({path: '/jc/shop/nbgl/partner/file/file', query: {"folderId": this.form.folderId}}) }) } else { - this.$router.push({path: '/jc/shop/partner/file/file', query: {"folderId": this.form.folderId}}) + this.$router.push({path: '/jc/shop/nbgl/partner/file/file', query: {"folderId": this.form.folderId}}) } }, // 查询驾驶证类型 diff --git a/src/views/login.vue b/src/views/login.vue index d8cb2d7..ab6f26f 100644 --- a/src/views/login.vue +++ b/src/views/login.vue @@ -2,7 +2,7 @@
-
+
@@ -13,7 +13,7 @@ -
+
@@ -94,13 +94,35 @@
+
+
+ +
+ + + + + + + + + + + + + +
@@ -124,18 +146,22 @@ import { } from "@/utils/auth"; import Verify from '@/components/Verifition/Verify'; +import TenantSelect from "@/components/tenantSelect/tenantSelect.vue"; import {resetUserPwd} from "@/api/system/user"; export default { name: "Login", components: { - Verify + Verify, + TenantSelect }, data() { return { // tenantCode:"lighting", tenantCode:"lanan", codeUrl: "", + showTenantList:false, + tenant:undefined, //是否开启图形验证码 captchaEnable: false, tenantEnable: true, @@ -150,6 +176,7 @@ export default { rememberMe: false, tenantName: "租户管理员", }, + tenantList:[], scene: 21, LoginRules: { @@ -221,7 +248,8 @@ export default { getCode() { // 情况一，未开启：则直接登录 if (!this.captchaEnable) { - this.handleLogin({}) + // this.handleLogin({}) + this.getTenantList() return; } @@ -242,7 +270,17 @@ export default { tenantName: tenantName ? tenantName : this.loginForm.tenantName, }; }, + selectTenant(tenant){ + this.tenant = tenant + if (!this.tenant) { + this.$message.error("请选择租户") + } + console.log('当前租户',this.tenant) + setTenantId(this.tenant) + this.handleLogin() + }, handleLogin(captchaParams) { + // 加载动画 this.$refs.loginForm.validate(async valid => { console.log("登录", this.loginForm) if (valid) { @@ -259,12 +297,11 @@ export default { removeRememberMe() removeTenantName() } - this.loginForm.captchaVerification = captchaParams.captchaVerification + if (captchaParams){ + this.loginForm.captchaVerification = captchaParams.captchaVerification + } //获取当前登陆人的租户 - await getUserTenant(this.loginForm).then(res => { - console.log('当前登陆人信息', res) - setTenantId(res.data.tenant_id) - }); + // 发起登陆 // console.log("发起登录", this.loginForm); this.$store.dispatch(this.loginForm.loginType === "sms" ? "SmsLogin" : "Login", this.loginForm).then(() => { @@ -272,10 +309,19 @@ export default { }); }).catch(() => { this.loading = false; + this.showTenantList = false }); } }); }, + async getTenantList(){ + await getUserTenant(this.loginForm.username).then(res => { + console.log('当前登陆人信息', res) + // setTenantId(res.data.tenant_id) + this.tenantList = res.data + }); + this.showTenantList = true + }, async doSocialLogin(socialTypeEnum) { // 设置登录中 this.loading = true; diff --git a/src/views/partner/delWorkOrder.vue b/src/views/partner/delWorkOrder.vue index bb09510..7895c54 100644 --- a/src/views/partner/delWorkOrder.vue +++ b/src/views/partner/delWorkOrder.vue @@ -409,7 +409,7 @@ this.$set(this.dict.type,this.$options.dicts[i],res.data) }) } - this.getpid() + this.getList(); this.customerSource(); }, methods: { diff --git a/src/views/partner/file/file.vue b/src/views/partner/file/file.vue index 1f69d52..dab8348 100644 --- a/src/views/partner/file/file.vue +++ b/src/views/partner/file/file.vue @@ -76,7 +76,7 @@
编辑
- +
下载
预览
分配权限 @@ -175,6 +175,7 @@