From 0abba68dec02ba466fd91c873df233784a90b257 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Fri, 05 Nov 2021 16:39:32 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/zhba_enterprises
---
src/views/securityGuard/securityGuard.vue | 29 ++++++++++++++++++-----------
1 files changed, 18 insertions(+), 11 deletions(-)
diff --git a/src/views/securityGuard/securityGuard.vue b/src/views/securityGuard/securityGuard.vue
index 5749c1b..172ce35 100644
--- a/src/views/securityGuard/securityGuard.vue
+++ b/src/views/securityGuard/securityGuard.vue
@@ -136,7 +136,7 @@
<el-button icon="el-icon-edit"
:size="size"
:type="type"
- v-if="permission.securityGuard_check"
+ v-if="permission.securityGuard_paper"
@click.stop="certificateClick(row)">纸质证书制作
</el-button>
</template>
@@ -315,6 +315,7 @@
grant,
resetPassword,
getUserPractitionersInfo,
+ updatePaperTime,
saveOrUpdateUserPractitionersInfo,
} from "@/api/system/user";
import { securityApply } from '@/api/accreditationRecords/accreditationRecords'
@@ -327,9 +328,6 @@
import { getToken } from "@/util/auth";
import { securityFormPageColumn } from "./data";
import { mapState } from "vuex";
-import {
- updatePaperTime
-} from "@/api/system/user";
export default {
data () {
@@ -1066,7 +1064,13 @@
}),
},
beforeCreate () { },
- created () { },
+ created () {
+ console.log(this.userInfo.role_name,123541);
+ if(this.userInfo.role_name=="办证管理员"){
+ console.log(this.userInfo.role_name,5555225);
+ this.search["userType"] = 7;
+ }
+ },
mounted () {
// this.option.column[0].hide = true
// 非保安单位模式默认加载管理组数据
@@ -1074,6 +1078,9 @@
this.initData(website.tenantId);
}
this.search["status"] = 1;
+ if(this.userInfo.roleName=="办证管理员"){
+ this.search["userType"] = 7;
+ }
this.deptIds = this.userInfo.dept_id;
},
methods: {
@@ -1126,7 +1133,7 @@
//更新发证时间
var printDom = document.getElementById("certificateDom");
printDom.style.position = "absolute";
- printDom.style.top = "-28.5%";
+ printDom.style.top = "-27.5%";
printDom.style.left = "-23%";
printDom.style.width = "120%";
printDom.style.height = "100%";
@@ -1755,7 +1762,7 @@
}
// 标题
$upTop: 45px;
-$downTop: 260px; //整体高度
+$downTop: 265px; //整体高度
//经国家保安员考试审查合格。<br />特颁此证。
.security_main-title {
position: absolute;
@@ -1845,19 +1852,19 @@
letter-spacing: 3px;
}
//发证时间
-$timeTop: 309px; //整体高度
+$timeTop: 304px; //整体高度
//年
.security_m_l_titlepaperTimenian {
position: absolute;
top: $timeTop;
- left: 110px;
+ left: 107px;
line-height: 40px;
}
//月
.security_m_l_titlepaperTimeyue {
position: absolute;
top: $timeTop;
- left: 169px;
+ left: 166px;
line-height: 40px;
}
//日
@@ -1900,7 +1907,7 @@
// 身份证
.security_m_r_o_rightcardid {
position: absolute;
- top: $downTop + $lineHigeht * 4 -12px;
+ top: $downTop + $lineHigeht * 4 -2px;
left: $centerLeft;
// width: $rightWidth;
}
--
Gitblit v1.9.3