From 3acd33943d3e168d009e1e008ab8a25771be8943 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Sun, 26 Sep 2021 17:55:36 +0800
Subject: [PATCH] 保安公司 单位信息 修改 强行使用dept_id
---
src/views/securityGuard/securityGuardDetail.vue | 2 +-
vue.config.js | 4 ++--
src/views/securityGuard/securityGuard.vue | 10 ++++++----
src/views/securityUnitChild/index.vue | 4 ++++
src/views/system/user.vue | 3 ++-
5 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/src/views/securityGuard/securityGuard.vue b/src/views/securityGuard/securityGuard.vue
index 18bd865..2b262b4 100644
--- a/src/views/securityGuard/securityGuard.vue
+++ b/src/views/securityGuard/securityGuard.vue
@@ -477,7 +477,7 @@
align: "center",
index: true,
delBtnText: "注销",
- menuWidth: 271,
+ menuWidth: 327,
selection: true,
viewBtn: true,
defaultExpandAll: true,
@@ -765,11 +765,13 @@
// value: 3,
// },
],
- rules: [{
+ rules: [
+ {
required: true,
message: "请选择性别",
- trigger: "blur"
- }]
+ trigger: "blur",
+ },
+ ],
},
// {
// label: "生日",
diff --git a/src/views/securityGuard/securityGuardDetail.vue b/src/views/securityGuard/securityGuardDetail.vue
index 57f952b..82c3bd5 100644
--- a/src/views/securityGuard/securityGuardDetail.vue
+++ b/src/views/securityGuard/securityGuardDetail.vue
@@ -155,7 +155,7 @@
},
{
// icon: "el-icon-info",
- label: "保安员证书",
+ label: "上岗证",
prop: "tab5",
},
],
diff --git a/src/views/securityUnitChild/index.vue b/src/views/securityUnitChild/index.vue
index 35b019a..c458472 100644
--- a/src/views/securityUnitChild/index.vue
+++ b/src/views/securityUnitChild/index.vue
@@ -435,6 +435,9 @@
},
methods: {
submit0(row, done, loading) {
+ if (this.userInfo.role_name == "保安公司管理员") {
+ row["departmentid"] = this.userInfo.dept_id;
+ }
console.log(row);
update(row).then(
() => {
@@ -444,6 +447,7 @@
type: "success",
message: "操作成功!",
});
+ this.onloads();
done();
},
(error) => {
diff --git a/src/views/system/user.vue b/src/views/system/user.vue
index 366c2f5..a1b9937 100644
--- a/src/views/system/user.vue
+++ b/src/views/system/user.vue
@@ -99,7 +99,7 @@
<el-tag>{{ row.roleName }}</el-tag>
</template>
<template slot-scope="{ row }" slot="deptName">
- <el-tag>{{ row.deptName }}</el-tag>
+ <el-tag>{{ row.deptName.split(",").join(" ，") }}</el-tag>
</template>
<template slot-scope="{ row }" slot="userTypeName">
<el-tag>{{ row.userTypeName }}</el-tag>
@@ -306,6 +306,7 @@
label: "登录账号",
prop: "account",
search: true,
+ width: 190,
display: false,
},
{
diff --git a/vue.config.js b/vue.config.js
index 3a4fc9f..582c944 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -28,10 +28,10 @@
'/api': {
// 本地服务接口地址
// target: 'http://localhost:81',
- // target: 'http://192.168.0.114:81',//钟日健W
+ target: 'http://192.168.0.114:81',//钟日健W
// target: 'http://localhost:81', //原W
// target: 'http://192.168.0.108:81',//原W
- target: 'http://192.168.0.112:81',//唐N
+ // target: 'http://192.168.0.110:81',//唐N
// target: 'http://223.82.109.183:81',//唐N
//远程演示服务地址,可用于直接启动项目
ws: true,
--
Gitblit v1.9.3