From 0089f6e00c0acce83d7120c7fa8451dfc938c016 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Thu, 31 Aug 2023 20:02:03 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=9A=E5=91=98=E6=96=B0=E5=A2=9E=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/communityParty/members/create.vue | 176 +++++++-----------
 .../communityParty/members/memberList.vue     |  32 +++-
 2 files changed, 99 insertions(+), 109 deletions(-)

diff --git a/src/views/modules/communityParty/members/create.vue b/src/views/modules/communityParty/members/create.vue
index 938f72f3a..912c44c17 100644
--- a/src/views/modules/communityParty/members/create.vue
+++ b/src/views/modules/communityParty/members/create.vue
@@ -1,18 +1,18 @@
 <template>
-  <el-dialog :visible="visible"
-             :title="'新增党员'"
-             :close-on-click-modal="false"
-             :close-on-press-escape="true"
-             @close="handleDlgClose">
-
-    <el-form class="form"
+     <div>
+      <div
+      class="dialog-h-content scroll-h"
+      :class="{ 'visiual-form': source === 'visiual' }"
+    >
+    <el-form class="div_form"
              :model="dataForm"
              :rules="dataRule"
              ref="dataForm"
              @keyup.enter.native=""
+              :inline="true"
              :label-width="$i18n.locale === 'en-US' ? '120px' : '100px'">
 
-      <el-row :gutter="5">
+      <el-row >
         <el-col :span="12">
             <el-form-item prop="partyOrgId"
                           label="所属党组织">
@@ -29,7 +29,7 @@
                           label="党员姓名">
               <el-input
                   v-model="dataForm.name"
-                  style="width: 300px"
+                  
                   clearable
                   placeholder="请输入党员姓名"
               ></el-input>
@@ -37,13 +37,12 @@
         </el-col>
       </el-row>
 
-      <el-row :gutter="5">
+      <el-row >
         <el-col :span="12">
           <el-form-item prop="mobile"
                         label="联系电话">
             <el-input
                 v-model="dataForm.mobile"
-                style="width: 300px"
                 clearable
                 placeholder="请输入联系电话"
             ></el-input>
@@ -54,7 +53,7 @@
                         label="身份证号">
             <el-input
                 v-model="dataForm.idCard"
-                style="width: 300px"
+                
                 clearable
                 placeholder="请输入身份证号"
             ></el-input>
@@ -62,14 +61,14 @@
         </el-col>
       </el-row>
 
-      <el-row :gutter="5">
+      <el-row >
         <el-col :span="12">
           <el-form-item prop="birthday"
                         label="出生日期">
             <el-date-picker
                 v-model="dataForm.birthday"
                 value-format="yyyy-MM-dd"
-                style="width: 300px"
+                style="width: 202px"
                 type="date"
                 placeholder="选择日期">
             </el-date-picker>
@@ -79,7 +78,7 @@
           <!--1男 2女 0未知-->
           <el-form-item prop="gender"
                         label="性别">
-            <el-select v-model="dataForm.gender" placeholder="性别" style="width: 300px">
+            <el-select v-model="dataForm.gender" placeholder="性别" >
               <el-option
                   v-for="item in genderOptions"
                   :key="item.value"
@@ -91,11 +90,11 @@
         </el-col>
       </el-row>
 
-      <el-row :gutter="5">
+      <el-row >
         <el-col :span="12">
           <!--民族-->
           <el-form-item prop="nation" label="民族">
-            <el-select v-model="dataForm.nation" placeholder="请选择" style="width: 300px">
+            <el-select v-model="dataForm.nation" placeholder="请选择" >
               <el-option v-for="n in nationOptions"
                          :key="n.value"
                          :value="n.value"
@@ -107,7 +106,7 @@
         <el-col :span="12">
           <!--本地户籍-->
           <el-form-item prop="localResidenceFlag" label="本地户籍">
-            <el-select v-model="dataForm.localResidenceFlag" placeholder="请选择" style="width: 300px">
+            <el-select v-model="dataForm.localResidenceFlag" placeholder="请选择" >
               <el-option v-for="n in localResidenceFlagOptions"
                          :key="n.value"
                          :value="n.value"
@@ -118,30 +117,30 @@
         </el-col>
       </el-row>
 
-      <el-row :gutter="5">
+      <el-row >
         <el-col :span="24">
           <!--户籍地址-->
-          <el-form-item prop="hjAddress" label="户籍地址">
-            <el-input v-model="dataForm.hjAddress" style="width: 100%">
+          <el-form-item prop="hjAddress" label="户籍地址" class="wd-wr">
+            <el-input v-model="dataForm.hjAddress" placeholder="请输入">
             </el-input>
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="5">
+      <el-row >
         <el-col :span="24">
           <!--居住地址-->
-          <el-form-item prop="jzAddress" label="居住地址" style="width: 100%">
-            <el-input v-model="dataForm.jzAddress">
+          <el-form-item prop="jzAddress" label="居住地址" class="wd-wr">
+            <el-input v-model="dataForm.jzAddress"  placeholder="请输入">
             </el-input>
           </el-form-item>
         </el-col>
       </el-row>
 
-      <el-row :gutter="5">
+      <el-row >
         <el-col :span="12">
           <!--文化程度-->
           <el-form-item prop="cultureLevel" label="文化程度">
-            <el-select v-model="dataForm.cultureLevel" placeholder="请选择" style="width: 300px">
+            <el-select v-model="dataForm.cultureLevel" placeholder="请选择" >
               <el-option v-for="e in cultureLevelOptions"
                          :key="e.value"
                          :value="e.value"
@@ -153,7 +152,7 @@
         <el-col :span="12">
           <!--党组织职务-->
           <el-form-item prop="partyJob" label="党组织职务">
-            <el-select v-model="dataForm.partyJob" placeholder="请选择" style="width: 300px">
+            <el-select v-model="dataForm.partyJob" placeholder="请选择" >
               <el-option v-for="e in partyJobOptions"
                          :key="e.value"
                          :value="e.value"
@@ -163,24 +162,24 @@
         </el-col>
       </el-row>
 
-      <el-row :gutter="5">
+      <el-row >
         <el-col :span="24">
           <!--工作职责-->
-          <el-form-item prop="duty" label="工作职责" style="width: 100%">
-            <el-input v-model="dataForm.duty">
+          <el-form-item prop="duty" label="工作职责"  class="wd-wr">
+            <el-input v-model="dataForm.duty" placeholder="请输入">
             </el-input>
           </el-form-item>
         </el-col>
       </el-row>
 
 
-      <el-row :gutter="5">
+      <el-row >
         <el-col :span="12">
           <!--入党日期-->
           <el-form-item prop="joinTime" label="入党日期" style="width: 100%">
             <el-date-picker
                 v-model="dataForm.joinTime"
-                style="width: 300px"
+                style="width: 202px"
                 value-format="yyyy-MM-dd"
                 type="date"
                 placeholder="选择日期">
@@ -194,7 +193,7 @@
             <el-date-picker
                 v-model="dataForm.positiveTime"
                 value-format="yyyy-MM-dd"
-                style="width: 300px"
+                style="width: 202px"
                 type="date"
                 placeholder="选择日期">
             </el-date-picker>
@@ -202,10 +201,10 @@
         </el-col>
       </el-row>
 
-      <el-row :gutter="5">
+      <el-row >
         <!--党员中心户-->
         <el-form-item prop="centerFlag" label="党员中心户" style="width: 100%">
-          <el-select v-model="dataForm.centerFlag" placeholder="请选择" style="width: 300px">
+          <el-select v-model="dataForm.centerFlag" placeholder="请选择" >
             <el-option v-for="e in centerFlagOptions"
                        :key="e.value"
                        :value="e.value"
@@ -214,11 +213,11 @@
         </el-form-item>
       </el-row>
 
-      <el-row :gutter="5">
+      <el-row >
         <el-col :span="12">
           <!--流动党员-->
           <el-form-item prop="flowFlag" label="流动党员">
-            <el-select v-model="dataForm.flowFlag" placeholder="请选择" style="width: 300px">
+            <el-select v-model="dataForm.flowFlag" placeholder="请选择" >
               <el-option v-for="e in flowFlagOptions"
                          :key="e.value"
                          :value="e.value"
@@ -229,17 +228,17 @@
 
         <el-col :span="12">
           <!--流动党员证号-->
-          <el-form-item prop="flowActNum" label="流动党员证号">
-            <el-input v-model="dataForm.flowActNum"></el-input>
+          <el-form-item prop="flowActNum" label="流动党员证号" class="wd-wr">
+            <el-input v-model="dataForm.flowActNum" placeholder="请输入"></el-input>
           </el-form-item>
         </el-col>
       </el-row>
 
-      <el-row :gutter="5">
+      <el-row >
         <el-col :span="12">
           <!--免学习-->
           <el-form-item prop="studyNotNeed" label="免学习">
-            <el-select v-model="dataForm.studyNotNeed" placeholder="请选择" style="width: 300px">
+            <el-select v-model="dataForm.studyNotNeed" placeholder="请选择" >
               <el-option v-for="e in studyNotNeedOptions"
                          :key="e.value"
                          :value="e.value"
@@ -251,7 +250,7 @@
         <el-col :span="12">
           <!--是否退休-->
           <el-form-item prop="retiredFlag" label="是否退休">
-            <el-select v-model="dataForm.retiredFlag" placeholder="请选择" style="width: 300px">
+            <el-select v-model="dataForm.retiredFlag" placeholder="请选择" >
               <el-option v-for="e in retiredFlagOptions"
                          :key="e.value"
                          :value="e.value"
@@ -261,11 +260,11 @@
         </el-col>
       </el-row>
 
-      <el-row :gutter="5">
+      <el-row >
         <el-col :span="12">
           <!--入党时所在党支部-->
-          <el-form-item prop="joinBranchName" label="入党时所在党支部">
-            <el-input v-model="dataForm.joinBranchName"></el-input>
+          <el-form-item prop="joinBranchName" label="入党时所在党支部" class="wd-wr">
+            <el-input v-model="dataForm.joinBranchName" placeholder="请输入"></el-input>
           </el-form-item>
         </el-col>
 
@@ -275,7 +274,7 @@
             <el-date-picker
                 v-model="dataForm.joinCommunityTime"
                 value-format="yyyy-MM-dd"
-                style="width: 300px"
+                style="width: 202px"
                 type="date"
                 placeholder="选择日期">
             </el-date-picker>
@@ -283,21 +282,27 @@
         </el-col>
       </el-row>
 
-      <el-row :gutter="5">
+      <el-row >
         <el-col :span="24">
           <!--备注-->
-          <el-form-item prop="remark" label="备注">
-            <el-input v-model="dataForm.remark"></el-input>
+          <el-form-item prop="remark" label="备注" class="wd-wr">
+            <el-input v-model="dataForm.remark" placeholder="请输入"></el-input>
           </el-form-item>
         </el-col>
       </el-row>
     </el-form>
-    <template slot="footer">
+  </div>
       <!--<el-button @click="handleDlgClose">取消</el-button>-->
-      <el-button type="primary" @click="handleSubmitCreate">确定</el-button>
-      <el-button type="primary" @click="handleDlgClose">取消</el-button>
-    </template>
-  </el-dialog>
+      <div class="div_btn">
+      <el-button size="small" @click="handleDlgClose">取 消</el-button>
+      <el-button
+        size="small"
+        type="primary"
+        @click="handleSubmitCreate"
+        >确 定</el-button
+      >
+    </div>
+     </div>
 </template>
 
 <script>
@@ -308,7 +313,6 @@ export default {
   data () {
     return {
       epmetResultResolver: null,
-      visible: false,
       partyOrgTree: [], // 党组织数
       genderOptions: [{ 'label': '男', 'value': 1 }, { 'label': '女', 'value': 2 }, { 'label': '未知', 'value': 0 }],
       nationOptions: [], // 民族
@@ -376,7 +380,7 @@ export default {
      */
     handleDlgClose () {
       this.resetForm();// 重置表单
-      this.visible = false;
+      this.$emit('handelCreateClose')
     },
 
     /**
@@ -455,7 +459,6 @@ export default {
      * 初始化方法
      */
     init () {
-      this.visible = true
       // 加载党组织树
       this.handleLoadPartyOrgTreeRoot()
 
@@ -535,62 +538,19 @@ export default {
     },
   },
   props: {
-    // visible: {
-    //   defult: false,
-    //   type: Boolean
-    // }
   }
 }
 </script>
 
 <style lang="scss" scoped>
-@import "@/assets/scss/modules/visual/communityManageForm.scss";
-
-.item_width_1 {
-  width: 560px;
-
-  /deep/ .tox .tox-dialog {
-    z-index: 20000;
-  }
-}
-
-.div_map {
-  position: relative;
-}
-
-.div_searchmap {
-  z-index: 5000;
-  position: absolute;
-  top: 5px;
-  left: 5px;
-}
-
-.tinymce_view {
-  height: 400px;
-  overflow: auto;
-}
-
-.text_p {
-  margin: 0;
-  padding: 0 10px;
-  border: 1px solid #d9d9d9;
-  border-radius: 5px;
-
-  > p {
-    margin: 0;
-  }
-}
-
-
-.el-row {
-  margin-bottom: 20px;
-
-  &:last-child {
-    margin-bottom: 0;
+@import "@/assets/scss/modules/management/form-main.scss";
+@import "@/assets/scss/modules/visual/a_customize.scss";
+@import "@/assets/scss/modules/management/detail-main.scss";
+
+.wd-wr {
+  width: 100%;
+  /deep/ .el-form-item__content {
+    width: calc(100% - 148px);
   }
 }
-
-.el-col {
-  border-radius: 4px;
-}
 </style>
diff --git a/src/views/modules/communityParty/members/memberList.vue b/src/views/modules/communityParty/members/memberList.vue
index 1bef326bb..c9790975e 100644
--- a/src/views/modules/communityParty/members/memberList.vue
+++ b/src/views/modules/communityParty/members/memberList.vue
@@ -263,8 +263,35 @@
           </el-pagination>
         </div>
         </div>
-    <Create ref="create" @finishUpdate="search"></Create>
+        <el-dialog
+      v-if="createDlgShow"
+      :visible.sync="createDlgShow"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      title="新增党员"
+      :modal-append-to-body="false"
+      width="720px"
+      top="5vh"
+      class="dialog-h"
+      @closed="createDlgShow = false"
+    >
+    <Create ref="create" @finishUpdate="search" @handelCreateClose="handelCreateClose"></Create>
+    </el-dialog>
+    <el-dialog
+      v-if="detailDlgShow"
+      :visible.sync="detailDlgShow"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      title="新增党员"
+      :modal-append-to-body="false"
+      width="720px"
+      top="5vh"
+      class="dialog-h"
+      @closed="detailDlgShow = false"
+    >
     <Detail ref="detail" @finishUpdate="search"></Detail>
+    </el-dialog>
+    
     <Update ref="update" @finishUpdate="search"></Update>
     <PayRecord ref="payRecord" ></PayRecord>
     <Points ref="pmPoints" ></Points>
@@ -373,6 +400,9 @@ export default {
   methods: {
 
     /** ● ==================事件================ **/
+    handelCreateClose(){
+      this.createDlgShow =false
+    },
 
     handleMultiSelect(selectedRows) {
       this.multiSelectedRows = selectedRows;