From 06805572012fce2b029d100c80c5bf0e9cfb223e Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Fri, 3 Feb 2023 13:51:40 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=9A=E5=91=98=E7=94=BB=E5=83=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/communityParty/dyhx/crateForm.vue | 46 ++++++++++++-------
 .../modules/communityParty/dyhx/party.vue     |  4 +-
 2 files changed, 31 insertions(+), 19 deletions(-)

diff --git a/src/views/modules/communityParty/dyhx/crateForm.vue b/src/views/modules/communityParty/dyhx/crateForm.vue
index 212ed31a3..5c948dd26 100644
--- a/src/views/modules/communityParty/dyhx/crateForm.vue
+++ b/src/views/modules/communityParty/dyhx/crateForm.vue
@@ -6,12 +6,12 @@
       <div class="m-row">
         <div class="m-row-2">
           <div class="info-prop">
-            <span class="info-title-3">所属党组织：</span>
+            <span class="info-title-2">所属党组织：</span>
             <span>{{ form.orgName }}</span>
           </div>
 
           <div class="info-prop">
-            <span class="info-title-3">党员中心户：</span>
+            <span class="info-title-2">党员中心户：</span>
             <span>{{ form.isDyzxh==='1'?'是':'否'}}</span>
           </div>
         </div>
@@ -19,12 +19,12 @@
         <div class="m-row-2">
 
           <div class="info-prop">
-            <span class="info-title-3">姓名：</span>
+            <span class="info-title-2">姓名：</span>
             <span>{{ form.name}}</span>
           </div>
 
           <div class="info-prop">
-            <span class="info-title-3">免学习：</span>
+            <span class="info-title-2">免学习：</span>
             <span>{{form.isMxx==='1'?'是':'否'}}</span>
           </div>
         </div>
@@ -32,11 +32,11 @@
         <div class="m-row-2">
 
           <div class="info-prop">
-            <span class="info-title-3">手机号：</span>
+            <span class="info-title-2">手机号：</span>
             <span>{{ form.showMobile }}</span>
           </div>
           <div class="info-prop">
-            <span class="info-title-3">职务：</span>
+            <span class="info-title-2">职务：</span>
             <span>{{  form.postName|| "--"}}</span>
           </div>
         </div>
@@ -44,11 +44,11 @@
         <div class="m-row-2">
 
           <div class="info-prop">
-            <span class="info-title-3">身份证：</span>
+            <span class="info-title-2">身份证：</span>
             <span>{{ form.showIdCard  }}</span>
           </div>
           <div class="info-prop">
-            <span class="info-title-3">文化程度：</span>
+            <span class="info-title-2">文化程度：</span>
             <span>{{form.cultureName || "--"}}</span>
           </div>
 
@@ -56,11 +56,11 @@
         <div class="m-row-2">
 
           <div class="info-prop">
-            <span class="info-title-3">地址：</span>
+            <span class="info-title-2">地址：</span>
             <span>{{ form.address|| "--" }}</span>
           </div>
           <div class="info-prop">
-            <span class="info-title-3">入党时间：</span>
+            <span class="info-title-2">入党时间：</span>
             <span>{{ form.rdsj || "--"}}</span>
           </div>
 
@@ -68,11 +68,11 @@
         <div class="m-row-2">
 
           <div class="info-prop">
-            <span class="info-title-3">流动党员：</span>
+            <span class="info-title-2">流动党员：</span>
             <span>{{  form.isLd==='1'?'是':'否'  }}</span>
           </div>
           <div class="info-prop">
-            <span class="info-title-3">党员流动号：</span>
+            <span class="info-title-2">党员流动号：</span>
             <span>{{ form.ldzh || "--"  }}</span>
           </div>
 
@@ -80,7 +80,7 @@
         <div class="m-row-2">
 
           <div class="info-prop">
-            <span class="info-title-3">备注：</span>
+            <span class="info-title-2">备注：</span>
             <span>{{  form.remark || "--" }}</span>
           </div>
 
@@ -88,6 +88,12 @@
 
       </div>
 
+      <people-more v-if="showedPeopleMoreInfo"
+                   :view_real_data="true"
+                   :userId="info.icResiUser"
+                   :gridName="info.orgName"
+                   @close="handleCancleLook" />
+
     </div>
 
     <div class="div-btn">
@@ -107,11 +113,12 @@
 <script>
 import { isCard, isMobile } from '@/utils/validate'
 import { computedCard } from '@/utils/index'
-import cptCard from "@/views/modules/visual/cpts/card";
+
+import peopleMore from "@/views/modules/shequ/cpts/people-more";
 
 export default {
   components: {
-    cptCard
+    peopleMore
   },
   props: {
     partyList: {
@@ -158,7 +165,8 @@ export default {
       },
       eduList: [],
 
-      partyOrgs: []
+      partyOrgs: [],
+      showedPeopleMoreInfo: false
     }
   },
   watch: {
@@ -268,7 +276,11 @@ export default {
       this.savePoints(params)
     },
     async jump (icResiUserId) {
-      this.$emit('saveBase', icResiUserId)
+      this.showedPeopleMoreInfo = true
+      // this.$emit('saveBase', icResiUserId)
+    },
+    handleCancleLook () {
+      this.showedPeopleMoreInfo = false
     },
     async saveBase () {
       const params = {
diff --git a/src/views/modules/communityParty/dyhx/party.vue b/src/views/modules/communityParty/dyhx/party.vue
index 4282056a8..4a5a850cf 100644
--- a/src/views/modules/communityParty/dyhx/party.vue
+++ b/src/views/modules/communityParty/dyhx/party.vue
@@ -222,7 +222,7 @@
                 @cancle="handlerCancle" /> -->
     <el-dialog title="党员信息"
                :visible.sync="memberDialog"
-               width="60%"
+               width="850px"
                top="5vh"
                class="dialog-h"
                append-to-body
@@ -368,7 +368,7 @@ export default {
   },
   async mounted () {
     await nextTick(100);
-    // await this.getAgencyList()
+    await this.getAgencyList()
     await this.getPartyOggList()
     // this.getAgeCount(this.$store.state.user.agencyId, 'agency')
     // this.getEduCount(this.$store.state.user.agencyId, 'agency')