Merge branch 'master' of http://192.168.0.105:10010/r/zhba_enterprises

liuyg

2021-11-08 1e66dbf8da3bf8929a93e42e9217eae35f60237c

 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>
@@ -274,6 +274,9 @@
                            <div class="security_m_l_titleName widt">
                                {{ certificateObj.realName }}
                            </div>
                            <div class="security_m_r_o_jg widt">
                                南昌市公安局
                            </div>
                            <div class="security_m_l_titlepaperTimenian widt">
                                {{ certificateYear }}
                            </div>
@@ -295,6 +298,7 @@
                            <div class="security_m_r_o_rightcardid">
                                {{ certificateObj.cardid }}
                            </div>

                        </div>
                    </div>
                </div>
@@ -315,6 +319,7 @@
    grant,
    resetPassword,
    getUserPractitionersInfo,
    updatePaperTime,
    saveOrUpdateUserPractitionersInfo,
} from "@/api/system/user";
import { securityApply } from '@/api/accreditationRecords/accreditationRecords'
@@ -327,9 +332,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 +1068,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 +1082,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 +1137,7 @@
            //更新发证时间
            var printDom = document.getElementById("certificateDom");
            printDom.style.position = "absolute";
            printDom.style.top = "-28.5%";
            printDom.style.top = "-25.0%";
            printDom.style.left = "-23%";
            printDom.style.width = "120%";
            printDom.style.height = "100%";
@@ -1166,8 +1177,7 @@
            var day = oneHoursAgo.getDay();
            var date = oneHoursAgoY + "-" + oneHoursAgoM + "-" + day;
            const data = {
                id: this.data.id,
                rtime: this.data.rtime,
                id: this.certificateObj.id,
                userType: 6,
                paperTime: date
            }
@@ -1740,7 +1750,7 @@
    align-items: center;
    justify-content: center;
    flex-direction: column;
    font: bold 18px 'SimSun' !important;
    font: normal 18px 'SimSuncss' !important;
}
.security_main {
    width: 630px;
@@ -1755,7 +1765,7 @@
}
// 标题
$upTop: 45px;
$downTop: 260px; //整体高度
$downTop: 265px; //整体高度
//经国家保安员考试审查合格。<br />特颁此证。
.security_main-title {
    position: absolute;
@@ -1838,26 +1848,26 @@
// 抬头名字
.security_m_l_titleName {
    position: absolute;
    top: 35px;
    top: 45px;
    left: 121px;
    right: 0;
    line-height: 45px;
    letter-spacing: 3px;
}
//发证时间
$timeTop: 309px; //整体高度
$timeTop: 312px; //整体高度
//年
.security_m_l_titlepaperTimenian {
    position: absolute;
    top: $timeTop;
    left: 110px;
    left: 109px;
    line-height: 40px;
}
//月
.security_m_l_titlepaperTimeyue {
    position: absolute;
    top: $timeTop;
    left: 169px;
    left: 168px;
    line-height: 40px;
}
//日
@@ -1870,7 +1880,7 @@
//证件编号
.security_m_l_downsecuritynumber {
    position: absolute;
    top: 379px; //整体高度
    top: 386px; //整体高度
    left: 145px;
}

@@ -1895,13 +1905,12 @@
    position: absolute;
    top: $downTop + $lineHigeht * 2 -6px;
    left: $centerLeft;
    width: 160px;
    font: bold 16px 'SimSun' !important;
    width: 185px;
}
// 身份证
.security_m_r_o_rightcardid {
    position: absolute;
    top: $downTop + $lineHigeht * 4 -12px;
    top: $downTop + $lineHigeht * 4 +10px;
    left: $centerLeft;
    // width: $rightWidth;
}
@@ -1914,4 +1923,12 @@
    background-size: 100% 100%;
    background-repeat: no-repeat;
}

.security_m_r_o_jg{
   position: absolute;
    top: 267px;
    left: 210px;
    line-height: 40px;
    letter-spacing: 2px;
}
</style>