From 0919f896ee3b571a7f586daed0d39476f2e9aff4 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Fri, 05 Nov 2021 13:36:52 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/zhba_enterprises

---
 src/api/system/user.js                          |    9 +++++++++
 src/views/securityGuard/securityGuard.vue       |    8 ++++----
 src/views/securityGuard/securityCertificate.vue |   31 ++++++++++++++++---------------
 3 files changed, 29 insertions(+), 19 deletions(-)

diff --git a/src/api/system/user.js b/src/api/system/user.js
index 1a2970a..2df0fdc 100644
--- a/src/api/system/user.js
+++ b/src/api/system/user.js
@@ -80,6 +80,15 @@
 }
 
 
+export const updatePaperTime = (row) => {
+    return request({
+        url: '/api/blade-user/updatePaperTime',
+        method: 'post',
+        data: row
+    })
+}
+
+
 export const saveOrUpdateUserPractitionersInfo = (row) => {
     return request({
         url: '/api/experience/saveOrUpdate',
diff --git a/src/views/securityGuard/securityCertificate.vue b/src/views/securityGuard/securityCertificate.vue
index d2934cf..159c122 100644
--- a/src/views/securityGuard/securityCertificate.vue
+++ b/src/views/securityGuard/securityCertificate.vue
@@ -62,7 +62,7 @@
 import { mapGetters } from "vuex";
 import dictVertical from "../util/demo/dict-vertical.vue";
 import {
-    update
+  updatePaperTime
 } from "@/api/system/user";
 export default {
     data () {
@@ -127,11 +127,12 @@
             var day = oneHoursAgo.getDay();
             var date = oneHoursAgoY + "-" + oneHoursAgoM + "-" + day;
             const data = {
-                id: this.data.id,
-                rtime: this.data.rtime,
-                paperTime: date
+                id:this.data.id,
+                rtime:this.data.rtime,
+                userType:6,
+                paperTime:date
             }
-            update(data);
+            updatePaperTime(data);
         }
     },
 };
@@ -163,7 +164,7 @@
 }
 // 标题
 $upTop: 45px;
-$downTop: 260px; //整体高度
+$downTop: 265px; //整体高度
 //经国家保安员考试审查合格。<br />特颁此证。
 .security_main-title {
     position: absolute;
@@ -175,14 +176,14 @@
 //发证公安机关&nbsp;（印章）
 .security_m_l_center {
     position: absolute;
-    top: 270px;
+    top: 267px;
     left: 30px;
     line-height: 40px;
 }
 //证件编号 &nbsp;
 .security_m_l_down {
     position: absolute;
-    top: 379px;
+    top: 370px;
     left: 32px;
 }
 
@@ -221,7 +222,7 @@
 //公民身份证
 .security_m_r_d {
     position: absolute;
-    top: 363px;
+    top: 382px;
     left: $rightLeft;
     width: $rightWidth;
     text-align: justify;
@@ -246,25 +247,25 @@
 // 抬头名字
 .security_m_l_titleName {
     position: absolute;
-    top: 35px;
+    top: 45px;
     left: 121px;
     line-height: 45px;
     letter-spacing: 3px;
 }
 //发证时间
-$timeTop: 309px; //整体高度
+$timeTop: 306px; //整体高度
 //年
 .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;
 }
 //日
@@ -277,7 +278,7 @@
 //证件编号
 .security_m_l_downsecuritynumber {
     position: absolute;
-    top: 379px; //整体高度
+    top: 370px; //整体高度
     left: 145px;
 }
 
@@ -308,7 +309,7 @@
 // 身份证
 .security_m_r_o_rightcardid {
     position: absolute;
-    top: $downTop + $lineHigeht * 4 -12px;
+    top: $downTop + $lineHigeht * 4+6px;
     left: $centerLeft;
     // width: $rightWidth;
 }
diff --git a/src/views/securityGuard/securityGuard.vue b/src/views/securityGuard/securityGuard.vue
index f1260e2..10b3cce 100644
--- a/src/views/securityGuard/securityGuard.vue
+++ b/src/views/securityGuard/securityGuard.vue
@@ -735,10 +735,10 @@
                                 label: "电子邮箱",
                                 prop: "email",
                             },
-                            {
-                                label: "籍贯",
-                                prop: "nativeplace",
-                            },
+                            // {
+                            //     label: "籍贯",
+                            //     prop: "nativeplace",
+                            // },
                             {
                                 label: "民族",
                                 prop: "nation",

--
Gitblit v1.9.3