From 2249a20826b2b4147d53e05266e0620d61e68485 Mon Sep 17 00:00:00 2001
From: wxz <wxz@test.com>
Date: Thu, 31 Aug 2023 15:52:52 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E8=A7=92=E8=89=B2=E5=88=97=E8=A1=A8url?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/base/organization/organization.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/modules/base/organization/organization.vue b/src/views/modules/base/organization/organization.vue
index 85ba83230..ced7c2bf0 100644
--- a/src/views/modules/base/organization/organization.vue
+++ b/src/views/modules/base/organization/organization.vue
@@ -1339,7 +1339,7 @@ export default {
     async getRoleList () {
       this.tableLoading = true;
 
-      const url = "/gov/access/govrole/list";
+      const url = "/gov/access/govrole/roleListOfCustomer";
 
       let params = {};
 

From 807f774afbcaf3b73da0539f68bd9d54e707a272 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Thu, 31 Aug 2023 15:59:39 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E6=A8=A1=E6=9D=BF?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=86=99=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/residentManagement/housingNature/housingNature.vue     | 2 +-
 .../subsistenceAllowance/subsistenceAllowance.vue               | 2 +-
 src/views/modules/base/residentManagement/tefu/tefuList.vue     | 2 +-
 .../base/residentManagement/unemployment/unemployment.vue       | 2 +-
 src/views/modules/base/residentManagement/veteran/veteran.vue   | 2 +-
 .../modules/base/residentManagement/volunteer/volunteer.vue     | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/views/modules/base/residentManagement/housingNature/housingNature.vue b/src/views/modules/base/residentManagement/housingNature/housingNature.vue
index 31c77edfa..5098a7cf0 100644
--- a/src/views/modules/base/residentManagement/housingNature/housingNature.vue
+++ b/src/views/modules/base/residentManagement/housingNature/housingNature.vue
@@ -608,7 +608,7 @@ export default {
     },
     // 下载模板
     async handleExportModule () {
-      let url = "";
+      let url = "/actual/base/resiCategorized/ensureHouse/downloadImportTemplate";
       let params = {};
       await this.$http({
         method: "POST",
diff --git a/src/views/modules/base/residentManagement/subsistenceAllowance/subsistenceAllowance.vue b/src/views/modules/base/residentManagement/subsistenceAllowance/subsistenceAllowance.vue
index 958e41413..94f756c77 100644
--- a/src/views/modules/base/residentManagement/subsistenceAllowance/subsistenceAllowance.vue
+++ b/src/views/modules/base/residentManagement/subsistenceAllowance/subsistenceAllowance.vue
@@ -654,7 +654,7 @@
       },
       // 下载模板
       async handleExportModule() {
-        let url = "";
+        let url = "/actual/base/resiCategorized/resiSubsistenceAllowance/downloadImportTemplate";
         let params = {};
         await this.$http({
           method: "POST",
diff --git a/src/views/modules/base/residentManagement/tefu/tefuList.vue b/src/views/modules/base/residentManagement/tefu/tefuList.vue
index 9bab86415..b9f392a9a 100644
--- a/src/views/modules/base/residentManagement/tefu/tefuList.vue
+++ b/src/views/modules/base/residentManagement/tefu/tefuList.vue
@@ -831,7 +831,7 @@ export default {
     },
     // 下载模板
     async handleExportModule () {
-      let url = "";
+      let url = "/actual/base/resiCategorized/specialSupport/downloadImportTemplate";
       let params = {};
       await this.$http({
         method: "POST",
diff --git a/src/views/modules/base/residentManagement/unemployment/unemployment.vue b/src/views/modules/base/residentManagement/unemployment/unemployment.vue
index 37bab4265..7801c2ac0 100644
--- a/src/views/modules/base/residentManagement/unemployment/unemployment.vue
+++ b/src/views/modules/base/residentManagement/unemployment/unemployment.vue
@@ -909,7 +909,7 @@ export default {
     },
     // 下载模板
     async handleExportModule() {
-      let url = "";
+      let url = "/actual/base/resiCategorized/resiUnemployment/downloadImportTemplate";
       let params = {};
       await this.$http({
         method: "POST",
diff --git a/src/views/modules/base/residentManagement/veteran/veteran.vue b/src/views/modules/base/residentManagement/veteran/veteran.vue
index 5097fa831..c500c65dd 100644
--- a/src/views/modules/base/residentManagement/veteran/veteran.vue
+++ b/src/views/modules/base/residentManagement/veteran/veteran.vue
@@ -888,7 +888,7 @@ export default {
     },
     // 下载模板
     async handleExportModule() {
-      let url = "";
+      let url = "/actual/base/resiCategorized/veteran/downloadImportTemplate";
       let params = {};
       await this.$http({
         method: "POST",
diff --git a/src/views/modules/base/residentManagement/volunteer/volunteer.vue b/src/views/modules/base/residentManagement/volunteer/volunteer.vue
index 0a3c693a2..d95bb09bf 100644
--- a/src/views/modules/base/residentManagement/volunteer/volunteer.vue
+++ b/src/views/modules/base/residentManagement/volunteer/volunteer.vue
@@ -766,7 +766,7 @@ export default {
     },
     // 下载模板
     async handleExportModule() {
-      let url = "";
+      let url = "/actual/base/resiCategorized/volunteer/downloadImportTemplate";
       let params = {};
       await this.$http({
         method: "POST",

From 544b480d4ce3f89d19b4a1a7310d3b3d90438d46 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Thu, 31 Aug 2023 17:24:16 +0800
Subject: [PATCH 3/5] =?UTF-8?q?bug#488=20=E5=85=9A=E7=BB=84=E7=BB=87?=
 =?UTF-8?q?=E5=9C=B0=E5=9B=BE=E9=97=AE=E9=A2=98,=E5=85=9A=E5=91=98?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=88=97=E8=A1=A8=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../housingNature/housingNature.vue           |   2 +-
 .../resiDisability/resiDisability.vue         |   2 -
 .../subsistenceAllowance.vue                  |   4 +-
 .../base/residentManagement/tefu/tefuList.vue |   2 +-
 .../unemployment/unemployment.vue             |   4 +-
 .../residentManagement/veteran/veteran.vue    |   2 +-
 .../volunteer/volunteer.vue                   |   2 +-
 .../communityParty/members/memberList.vue     | 324 +++++++++---------
 .../communityParty/partyOrg/create.vue        |   6 -
 9 files changed, 178 insertions(+), 170 deletions(-)

diff --git a/src/views/modules/base/residentManagement/housingNature/housingNature.vue b/src/views/modules/base/residentManagement/housingNature/housingNature.vue
index 5098a7cf0..10ec1f5e7 100644
--- a/src/views/modules/base/residentManagement/housingNature/housingNature.vue
+++ b/src/views/modules/base/residentManagement/housingNature/housingNature.vue
@@ -611,7 +611,7 @@ export default {
       let url = "/actual/base/resiCategorized/ensureHouse/downloadImportTemplate";
       let params = {};
       await this.$http({
-        method: "POST",
+        method: "get",
         url,
         responseType: "blob",
         data: params,
diff --git a/src/views/modules/base/residentManagement/resiDisability/resiDisability.vue b/src/views/modules/base/residentManagement/resiDisability/resiDisability.vue
index 52364c49c..80230c63b 100644
--- a/src/views/modules/base/residentManagement/resiDisability/resiDisability.vue
+++ b/src/views/modules/base/residentManagement/resiDisability/resiDisability.vue
@@ -198,7 +198,6 @@
 
       <div class="m-table">
         <div class="div_btn">
-          <div class="div_btn_left">
             <el-button
               size="small"
               @click="handleAdd"
@@ -206,7 +205,6 @@
               icon="el-icon-plus"
               >新增</el-button
             >
-          </div>
           <el-button
             @click="handleExport"
             type="primary"
diff --git a/src/views/modules/base/residentManagement/subsistenceAllowance/subsistenceAllowance.vue b/src/views/modules/base/residentManagement/subsistenceAllowance/subsistenceAllowance.vue
index 94f756c77..c6bd8da4e 100644
--- a/src/views/modules/base/residentManagement/subsistenceAllowance/subsistenceAllowance.vue
+++ b/src/views/modules/base/residentManagement/subsistenceAllowance/subsistenceAllowance.vue
@@ -654,10 +654,10 @@
       },
       // 下载模板
       async handleExportModule() {
-        let url = "/actual/base/resiCategorized/resiSubsistenceAllowance/downloadImportTemplate";
+        let url = "/actual/base/resiCategorized/subsistenceAllowance/downloadImportTemplate";
         let params = {};
         await this.$http({
-          method: "POST",
+          method: "get",
           url,
           responseType: "blob",
           data: params,
diff --git a/src/views/modules/base/residentManagement/tefu/tefuList.vue b/src/views/modules/base/residentManagement/tefu/tefuList.vue
index b9f392a9a..63b84fdf4 100644
--- a/src/views/modules/base/residentManagement/tefu/tefuList.vue
+++ b/src/views/modules/base/residentManagement/tefu/tefuList.vue
@@ -834,7 +834,7 @@ export default {
       let url = "/actual/base/resiCategorized/specialSupport/downloadImportTemplate";
       let params = {};
       await this.$http({
-        method: "POST",
+        method: "get",
         url,
         responseType: "blob",
         data: params,
diff --git a/src/views/modules/base/residentManagement/unemployment/unemployment.vue b/src/views/modules/base/residentManagement/unemployment/unemployment.vue
index 7801c2ac0..ba6be6a4b 100644
--- a/src/views/modules/base/residentManagement/unemployment/unemployment.vue
+++ b/src/views/modules/base/residentManagement/unemployment/unemployment.vue
@@ -909,10 +909,10 @@ export default {
     },
     // 下载模板
     async handleExportModule() {
-      let url = "/actual/base/resiCategorized/resiUnemployment/downloadImportTemplate";
+      let url = "/actual/base/resiCategorized/unemployed/downloadImportTemplate";
       let params = {};
       await this.$http({
-        method: "POST",
+        method: "get",
         url,
         responseType: "blob",
         data: params,
diff --git a/src/views/modules/base/residentManagement/veteran/veteran.vue b/src/views/modules/base/residentManagement/veteran/veteran.vue
index c500c65dd..33108dc72 100644
--- a/src/views/modules/base/residentManagement/veteran/veteran.vue
+++ b/src/views/modules/base/residentManagement/veteran/veteran.vue
@@ -891,7 +891,7 @@ export default {
       let url = "/actual/base/resiCategorized/veteran/downloadImportTemplate";
       let params = {};
       await this.$http({
-        method: "POST",
+        method: "get",
         url,
         responseType: "blob",
         data: params,
diff --git a/src/views/modules/base/residentManagement/volunteer/volunteer.vue b/src/views/modules/base/residentManagement/volunteer/volunteer.vue
index d95bb09bf..c8d4834b1 100644
--- a/src/views/modules/base/residentManagement/volunteer/volunteer.vue
+++ b/src/views/modules/base/residentManagement/volunteer/volunteer.vue
@@ -769,7 +769,7 @@ export default {
       let url = "/actual/base/resiCategorized/volunteer/downloadImportTemplate";
       let params = {};
       await this.$http({
-        method: "POST",
+        method: "get",
         url,
         responseType: "blob",
         data: params,
diff --git a/src/views/modules/communityParty/members/memberList.vue b/src/views/modules/communityParty/members/memberList.vue
index c3a081a7a..1bef326bb 100644
--- a/src/views/modules/communityParty/members/memberList.vue
+++ b/src/views/modules/communityParty/members/memberList.vue
@@ -104,159 +104,165 @@
           </el-col>
         </el-row>
     </div>
-      
        
-      <div class="g-table">
-        <el-button type="primary"
-                   @click="handleCreateBtnClick">新增
-        </el-button>
-        <el-upload
-            :headers="$getElUploadHeaders()"
-            ref="upload"
-            class="upload-btn"
-            action="uploadUlr"
-            :limit="1"
-            :accept="'.xls,.xlsx'"
-            :with-credentials="true"
-            :show-file-list="false"
-            :auto-upload="true"
-            :on-success="handleExcelSuccess"
-            :before-upload="beforeExcelUpload"
-            :http-request="uploadHttpRequest"
-            style="display: inline-block;margin:0px 10px"
-        >
-          <el-button type="primary" :loading="importLoading">导入</el-button>
-        </el-upload>
-        <el-button type="primary"
-                   :loading="exportBtnLoading"
-                   @click="handleExportBtnClick">导出
-        </el-button>
-        <el-button type="primary"
-                   @click="handleDownloadTemplateBtnClick">下载模板
-        </el-button>
-        <el-button type="primary"
-                   @click="handleDeleteBatchBtnClick">批量删除
-        </el-button>
-      </div>
-    
-      <div style="margin-top: 10px;margin-bottom: 10px">
-        <el-table
-            :data="partymemberList"
-            border
-            v-loading="loading"
-            @select-all="handleMultiSelect"
-            @selection-change="handleMultiSelect"
-            style="width: 100%"
-            table
-            >
-          <el-table-column
-              type="selection"
-              width="55">
-          </el-table-column>
-          <el-table-column
-              prop="partyOrgName"
-              label="党组织名称"
-              width="180">
-          </el-table-column>
-          <el-table-column
-              prop="name"
-              label="姓名"
-              width="180">
-          </el-table-column>
-          <el-table-column
-              prop="mobile"
-              label="联系电话">
-          </el-table-column>
-          <el-table-column
-              prop="idCard"
-              label="身份证号">
-          </el-table-column>
-          <el-table-column
-              prop="jzAddress"
-              label="居住地址">
-          </el-table-column>
-          <el-table-column
-              prop="partyJobName"
-              label="职务">
-          </el-table-column>
-          <el-table-column
-              prop="joinTime"
-              label="入党日期">
-          </el-table-column>
-          <el-table-column
-              prop="payStatus"
-              label="是否缴费" style="width: 50px">
-            <template slot-scope="scope">
-              {{ scope.row.payStatus ? '是' : '否' }}
-            </template>
-          </el-table-column>
-          <el-table-column
-              prop="latestPayDate"
-              label="最近缴费日期">
-          </el-table-column>
-          <el-table-column
-              prop="centerFlag"
-              label="党员中心户">
-            <template slot-scope="scope">
-              {{ scope.row.centerFlag == null ? null : (scope.row.centerFlag === 1 ? '是' : '否') }}
-            </template>
-          </el-table-column>
-          <el-table-column
-              prop="flowFlag"
-              label="流动党员">
-            <template slot-scope="scope">
-              {{ scope.row.flowFlag == null ? null : (scope.row.flowFlag === 1 ? '是' : '否') }}
-            </template>
-          </el-table-column>
-          <el-table-column
-              prop="studyNotNeed"
-              label="免学习">
-            <template slot-scope="scope">
-              {{ scope.row.studyNotNeed == null ? null : scope.row.studyNotNeed === 1 ? '是' : '否' }}
-            </template>
-          </el-table-column>
-
-          <el-table-column
-              label="操作"
-              width="280">
-            <template slot-scope="scope">
-              <el-button type="text"
-                         @click="handleDetailBtnClick(scope.row)"
-                         size="small"
-                         class="div-table-button--detail">查看</el-button>
-              <el-button type="text"
-                         @click="handleUpdateBtnClick(scope.row)"
-                         size="small"
-                         class="div-table-button--detail">编辑</el-button>
-              <el-button type="text"
-                         @click="handleDeleteSingleBtnClick(scope.row)"
-                         size="small"
-                         class="div-table-button--detail">删除</el-button>
-              <el-button type="text"
-                         @click="handlePayRecordBtnClick(scope.row)"
-                         size="small"
-                         class="div-table-button--detail">缴费记录</el-button>
-              <el-button type="text"
-                         @click="handlePointsRecordBtnClick(scope.row)"
-                         size="small"
-                         class="div-table-button--detail">量化积分</el-button>
-            </template>
-          </el-table-column>
-        </el-table>
-      </div>
-      
-      <div>
-        <el-pagination
-            background
-            layout="sizes, prev, pager, next"
-            @size-change="handleSizeChange"
-            @current-change="handleCurrentChange"
-            :current-page.sync="searchForm.pageNo"
-            :page-sizes="pageSizes"
-            :page-size="searchForm.pageSize"
-            :total="total">
-        </el-pagination>
-      </div>
+      <div class="m-table">
+          <div class="div_btn">
+            <el-button type="primary"
+                    size="small"
+                     @click="handleCreateBtnClick">新增
+          </el-button>
+          <el-upload
+              :headers="$getElUploadHeaders()"
+              ref="upload"
+              class="upload-btn"
+              action="uploadUlr"
+              :limit="1"
+              :accept="'.xls,.xlsx'"
+              :with-credentials="true"
+              :show-file-list="false"
+              :auto-upload="true"
+              :on-success="handleExcelSuccess"
+              :before-upload="beforeExcelUpload"
+              :http-request="uploadHttpRequest"
+              style="display: inline-block;margin:0px 10px"
+          >
+              <el-button type="primary" :loading="importLoading"   
+                size="small"
+                class="diy-button--white el-button--default">导入</el-button>
+            </el-upload>
+            <el-button type="primary"
+                        size="small"
+                       :loading="exportBtnLoading"
+                       @click="handleExportBtnClick">导出
+            </el-button>
+            <el-button type="primary"
+                       size="small"
+                       class="diy-button--white el-button--default"
+                       @click="handleDownloadTemplateBtnClick">下载模板
+            </el-button>
+            <el-button type="primary"
+                     size="small"
+                       @click="handleDeleteBatchBtnClick">批量删除
+            </el-button>
+            </div>
+            <el-table
+              :data="partymemberList"
+              border
+              v-loading="loading"
+              @select-all="handleMultiSelect"
+              @selection-change="handleMultiSelect"
+              style="width: 100%"
+              class="m-table-item"
+              :height="maxTableHeight"
+              >
+            <el-table-column
+                type="selection"
+                width="55">
+            </el-table-column>
+            <el-table-column
+                prop="partyOrgName"
+                label="党组织名称"
+                width="180">
+            </el-table-column>
+            <el-table-column
+
+                prop="name"
+                label="姓名"
+                width="180">
+            </el-table-column>
+            <el-table-column
+                prop="mobile"
+                label="联系电话">
+            </el-table-column>
+            <el-table-column
+                prop="idCard"
+                label="身份证号">
+            </el-table-column>
+            <el-table-column
+                prop="jzAddress"
+                label="居住地址">
+            </el-table-column>
+            <el-table-column
+                prop="partyJobName"
+                label="职务">
+            </el-table-column>
+            <el-table-column
+                prop="joinTime"
+                label="入党日期">
+            </el-table-column>
+            <el-table-column
+                prop="payStatus"
+                label="是否缴费" style="width: 50px">
+              <template slot-scope="scope">
+                {{ scope.row.payStatus ? '是' : '否' }}
+              </template>
+            </el-table-column>
+            <el-table-column
+                prop="latestPayDate"
+                label="最近缴费日期">
+            </el-table-column>
+            <el-table-column
+                prop="centerFlag"
+                label="党员中心户">
+              <template slot-scope="scope">
+                {{ scope.row.centerFlag == null ? null : (scope.row.centerFlag === 1 ? '是' : '否') }}
+              </template>
+            </el-table-column>
+            <el-table-column
+                prop="flowFlag"
+                label="流动党员">
+              <template slot-scope="scope">
+                {{ scope.row.flowFlag == null ? null : (scope.row.flowFlag === 1 ? '是' : '否') }}
+              </template>
+            </el-table-column>
+            <el-table-column
+                prop="studyNotNeed"
+                label="免学习">
+              <template slot-scope="scope">
+                {{ scope.row.studyNotNeed == null ? null : scope.row.studyNotNeed === 1 ? '是' : '否' }}
+              </template>
+            </el-table-column>
+
+            <el-table-column
+                label="操作"
+                width="280">
+              <template slot-scope="scope">
+                <el-button type="text"
+                           @click="handleDetailBtnClick(scope.row)"
+                           size="small"
+                           class="div-table-button--detail">查看</el-button>
+                <el-button type="text"
+                           @click="handleUpdateBtnClick(scope.row)"
+                           size="small"
+                           class="div-table-button--detail">编辑</el-button>
+                <el-button type="text"
+                           @click="handleDeleteSingleBtnClick(scope.row)"
+                           size="small"
+                           class="div-table-button--detail">删除</el-button>
+                <el-button type="text"
+                           @click="handlePayRecordBtnClick(scope.row)"
+                           size="small"
+                           class="div-table-button--detail">缴费记录</el-button>
+                <el-button type="text"
+                           @click="handlePointsRecordBtnClick(scope.row)"
+                           size="small"
+                           class="div-table-button--detail">量化积分</el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+          <div>
+          <el-pagination
+              background
+              layout="sizes, prev, pager, next"
+              @size-change="handleSizeChange"
+              @current-change="handleCurrentChange"
+              :current-page.sync="searchForm.pageNo"
+              :page-sizes="pageSizes"
+              :page-size="searchForm.pageSize"
+              :total="total">
+          </el-pagination>
+        </div>
+        </div>
     <Create ref="create" @finishUpdate="search"></Create>
     <Detail ref="detail" @finishUpdate="search"></Detail>
     <Update ref="update" @finishUpdate="search"></Update>
@@ -268,6 +274,7 @@
 
 import { defineComponent } from 'vue'
 import { Loading } from 'element-ui';
+import { mapGetters } from "vuex";
 import Create from './create'
 import Detail from './detail'
 import Update from './update'
@@ -358,7 +365,8 @@ export default {
         label: 'partyOrgName',
         checkStrictly: true,
         multiple: false
-      }
+      },
+      searchH: 160,
     }
   },
 
@@ -702,7 +710,15 @@ export default {
       this.searchForm.pageNo = pageNo;
       this.search();
     },
-  }
+  },
+  computed: {
+    maxTableHeight() {
+      const h = this.clientHeight - this.searchH - 330 + this.iframeHeight;
+      const _h = this.clientHeight - 330 - this.searchH;
+      return this.$store.state.inIframe ? h : _h;
+    },
+    ...mapGetters(["clientHeight", "iframeHeight"]),
+  },
 }
 
 </script>
diff --git a/src/views/modules/communityParty/partyOrg/create.vue b/src/views/modules/communityParty/partyOrg/create.vue
index 81337d21d..36bca0a26 100644
--- a/src/views/modules/communityParty/partyOrg/create.vue
+++ b/src/views/modules/communityParty/partyOrg/create.vue
@@ -120,7 +120,6 @@
     </template>
   </el-dialog>
 </template>
-
 <script>
 var map
 var search
@@ -192,12 +191,7 @@ export default {
       let { latitude, longitude } = this.$store.state.user;
 
       this.$nextTick(() => {
-        if (!map) {
           this.initMap(latitude, longitude);
-        } else {
-          map.setCenter(latitude, longitude);
-          map.setMarker(latitude, longitude);
-        }
       })  
     },
 

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 4/5] =?UTF-8?q?=E5=85=9A=E5=91=98=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E6=A0=B7=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;

From 2e3df3f83aa0caf7672cec5721f6921880628790 Mon Sep 17 00:00:00 2001
From: wxz <wxz@test.com>
Date: Fri, 1 Sep 2023 09:52:22 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E5=85=9A=E5=91=98=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=80=BB=E6=9D=A1=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/communityParty/members/memberList.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/modules/communityParty/members/memberList.vue b/src/views/modules/communityParty/members/memberList.vue
index c9790975e..c5a4c3d49 100644
--- a/src/views/modules/communityParty/members/memberList.vue
+++ b/src/views/modules/communityParty/members/memberList.vue
@@ -253,7 +253,7 @@
           <div>
           <el-pagination
               background
-              layout="sizes, prev, pager, next"
+              layout="total, sizes, prev, pager, next"
               @size-change="handleSizeChange"
               @current-change="handleCurrentChange"
               :current-page.sync="searchForm.pageNo"