From 553dca7b5630442310a0bcc3da8ce20a89c53d98 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Thu, 10 Mar 2022 16:23:55 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                                   |  11 +-
 .../modules/visual/communityManageForm.scss   |  32 ++
 .../modules/base/community/buildForm.vue      |  49 +--
 .../modules/base/community/buildTable.vue     |   1 +
 .../modules/base/community/communityForm.vue  |  49 +--
 .../modules/base/community/communityTable.vue |  12 +-
 src/views/modules/base/community/roomForm.vue |  43 +--
 .../modules/base/community/roomTable.vue      |   2 +
 src/views/modules/base/grid.vue               | 124 +++----
 .../regionalParty/activitys.vue               |   7 +-
 .../regionalParty/activitysDetail.vue         | 195 +++++------
 .../regionalParty/activitysForm.vue           |  41 +--
 .../regionalParty/finishList.vue              |   2 +-
 .../communityParty/regionalParty/units.vue    |  58 ++--
 .../regionalParty/unitsDetail.vue             | 164 +++++-----
 .../regionalParty/unitsForm.vue               | 308 ++++++++----------
 16 files changed, 517 insertions(+), 581 deletions(-)
 create mode 100644 src/assets/scss/modules/visual/communityManageForm.scss

diff --git a/src/App.vue b/src/App.vue
index 4b5a899c..a5052f5d 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -128,11 +128,11 @@ export default {
 .dialog-h {
   .el-dialog__body {
     position: relative;
-    height: 72vh;
+    height: 82vh;
     box-sizing: border-box;
     padding: 0 10px 20px !important;
     .dialog-h-content {
-      height: calc(72vh - 80px);
+      height: calc(82vh - 80px);
       box-sizing: border-box;
       overflow: auto;
     }
@@ -149,14 +149,15 @@ export default {
   &::-webkit-scrollbar-corner,
     /* 滚动条角落 */
   &::-webkit-scrollbar-thumb,
-  &::-webkit-scrollbar-track {      /*滚动条的轨道*/
+  &::-webkit-scrollbar-track {
+    /*滚动条的轨道*/
     border-radius: 4px;
   }
 
   &::-webkit-scrollbar-corner,
   &::-webkit-scrollbar-track {
     /* 滚动条轨道 */
-    
+
     // background: rgba(12, 129, 254, .24);
     box-shadow: inset 0 0 1px rgba(180, 160, 120, 0.5);
   }
@@ -164,7 +165,7 @@ export default {
   &::-webkit-scrollbar-thumb {
     /* 滚动条手柄 */
 
-    background:rgba(0,0,0,0.3);
+    background: rgba(0, 0, 0, 0.3);
     // background: linear-gradient(270deg, #0063FE, #0095FF);
   }
 }
diff --git a/src/assets/scss/modules/visual/communityManageForm.scss b/src/assets/scss/modules/visual/communityManageForm.scss
new file mode 100644
index 00000000..21204911
--- /dev/null
+++ b/src/assets/scss/modules/visual/communityManageForm.scss
@@ -0,0 +1,32 @@
+.item_width_1 {
+  width: 500px;
+}
+.item_width_2 {
+  width: 400px;
+}
+.item_width_3 {
+  margin-left: 10px;
+  width: 200px;
+}
+.item_width_4 {
+  width: 200px;
+}
+
+.div_map {
+  margin-top: 10px;
+}
+
+.div_btn {
+  margin-top: 20px;
+  text-align: center;
+}
+.el-tabs {
+  margin: 0 20px;
+}
+.el-upload__tip {
+  color: rgb(155, 155, 155);
+  margin: 0;
+}
+.form {
+  margin-top: 30px;
+}
diff --git a/src/views/modules/base/community/buildForm.vue b/src/views/modules/base/community/buildForm.vue
index cdea08eb..1f2c2041 100644
--- a/src/views/modules/base/community/buildForm.vue
+++ b/src/views/modules/base/community/buildForm.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <div>
+    <div class="dialog-h-content scroll-h">
 
       <el-form ref="ref_form"
                :inline="true"
@@ -109,8 +109,10 @@
 
     </div>
     <div class="div_btn">
-      <el-button @click="handleCancle">取 消</el-button>
-      <el-button v-if="formType != 'detail'"
+      <el-button size="small"
+                 @click="handleCancle">取 消</el-button>
+      <el-button size="small"
+                 v-if="formType != 'detail'"
                  type="primary"
                  :disabled="btnDisable"
                  @click="handleComfirm">确 定</el-button>
@@ -381,43 +383,6 @@ export default {
   props: {}
 }
 </script>
-<style lang="scss" scoped>
-.item_width_1 {
-  width: 500px;
-}
-.item_width_2 {
-  width: 400px;
-}
-.item_width_3 {
-  margin-left: 10px;
-  width: 200px;
-}
-.item_width_4 {
-  width: 200px;
-}
-
-.div_map {
-  margin-top: 10px;
-}
-
-.div_btn {
-  display: flex;
-  justify-content: flex-end;
-}
-.el-tabs {
-  margin: 0 20px;
-}
-.el-upload__tip {
-  color: rgb(155, 155, 155);
-  margin: 0;
-}
-.form {
-  margin-top: 30px;
-}
-</style>
-
-<style>
-.el-dialog__body {
-  padding: 0 10px 20px !important;
-}
+<style lang="scss" scoped >
+@import "@/assets/scss/modules/visual/communityManageForm.scss";
 </style>
\ No newline at end of file
diff --git a/src/views/modules/base/community/buildTable.vue b/src/views/modules/base/community/buildTable.vue
index 6d71cd1e..d04a7192 100644
--- a/src/views/modules/base/community/buildTable.vue
+++ b/src/views/modules/base/community/buildTable.vue
@@ -184,6 +184,7 @@
                :title="formTitle"
                top="5vh"
                width="900px"
+               class="dialog-h"
                @closed="diaClose">
       <build-form ref="ref_form"
                   @dialogCancle="addFormCancle"
diff --git a/src/views/modules/base/community/communityForm.vue b/src/views/modules/base/community/communityForm.vue
index 60ce06be..f9aec152 100644
--- a/src/views/modules/base/community/communityForm.vue
+++ b/src/views/modules/base/community/communityForm.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <div>
+    <div class="dialog-h-content scroll-h">
       <div v-show="!propertyFormShow">
         <el-form ref="ref_form"
                  :inline="true"
@@ -73,6 +73,7 @@
                       v-model="dataForm.address">
             </el-input>
           </el-form-item>
+
           <el-form-item label="备注"
                         prop="remark"
                         label-width="150px"
@@ -139,8 +140,10 @@
       </div>
     </div>
     <div class="div_btn">
-      <el-button @click="handleCancle">取 消</el-button>
-      <el-button v-if="formType != 'detail'"
+      <el-button size="small"
+                 @click="handleCancle">取 消</el-button>
+      <el-button size="small"
+                 v-if="formType != 'detail'"
                  type="primary"
                  :disabled="btnDisable"
                  @click="handleComfirm">确 定</el-button>
@@ -503,43 +506,9 @@ export default {
   props: {}
 }
 </script>
-<style scoped>
-.item_width_1 {
-  width: 500px;
-}
-.item_width_2 {
-  width: 400px;
-}
-.item_width_3 {
-  margin-left: 10px;
-  width: 200px;
-}
-.item_width_4 {
-  width: 200px;
-}
+<style lang="scss" scoped >
+@import "@/assets/scss/modules/visual/communityManageForm.scss";
+</style>
 
-.div_map {
-  margin-top: 10px;
-}
 
-.div_btn {
-  display: flex;
-  justify-content: flex-end;
-}
-.el-tabs {
-  margin: 0 20px;
-}
-.el-upload__tip {
-  color: rgb(155, 155, 155);
-  margin: 0;
-}
-.form {
-  margin-top: 30px;
-}
-</style>
 
-<style>
-.el-dialog__body {
-  padding: 0 10px 20px !important;
-}
-</style>
diff --git a/src/views/modules/base/community/communityTable.vue b/src/views/modules/base/community/communityTable.vue
index 51949ae8..5bb6d99d 100644
--- a/src/views/modules/base/community/communityTable.vue
+++ b/src/views/modules/base/community/communityTable.vue
@@ -134,6 +134,14 @@
                          label="所属网格"
                          min-width="120">
         </el-table-column>
+        <!-- <el-table-column prop="总单元数"
+                         label="所属网格"
+                         min-width="80">
+        </el-table-column>
+        <el-table-column prop="总户数"
+                         label="所属网格"
+                         min-width="80">
+        </el-table-column> -->
         <el-table-column prop="address"
                          label="详细地址"
                          min-width="180">
@@ -204,6 +212,7 @@
                :title="formTitle"
                width="850px"
                top="5vh"
+               class="dialog-h"
                @closed="diaClose">
       <community-form ref="ref_form"
                       @dialogCancle="addFormCancle"
@@ -766,8 +775,9 @@ export default {
 @import "@/assets/scss/modules/visual/communityManage.scss";
 </style>
 
-<style>
+<style >
 .el-message.is-closable .el-message__content {
   line-height: 20px;
 }
 </style>
+
diff --git a/src/views/modules/base/community/roomForm.vue b/src/views/modules/base/community/roomForm.vue
index 2263b645..dfdda844 100644
--- a/src/views/modules/base/community/roomForm.vue
+++ b/src/views/modules/base/community/roomForm.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <div>
+    <div class="dialog-h-content scroll-h">
       <el-form ref="ref_form"
                :inline="false"
                :model="dataForm"
@@ -112,8 +112,10 @@
 
     </div>
     <div class="div_btn">
-      <el-button @click="handleCancle">取 消</el-button>
-      <el-button v-if="formType != 'detail'"
+      <el-button size="small"
+                 @click="handleCancle">取 消</el-button>
+      <el-button size="small"
+                 v-if="formType != 'detail'"
                  type="primary"
                  :disabled="btnDisable"
                  @click="handleComfirm">确 定</el-button>
@@ -163,7 +165,7 @@ export default {
 
   methods: {
     async initForm (type, row, agencyObj) {
-      debugger
+
       this.$refs.ref_form.resetFields();
       this.agencyObj = agencyObj
       this.dataForm.neighborHoodId = agencyObj.neighborHoodId
@@ -348,35 +350,6 @@ export default {
   props: {}
 }
 </script>
-<style lang="scss" scoped>
-.item_width_1 {
-  width: 500px;
-}
-.item_width_2 {
-  width: 400px;
-}
-.item_width_3 {
-  margin-left: 10px;
-  width: 200px;
-}
-
-.div_btn {
-  display: flex;
-  justify-content: flex-end;
-}
-.el-tabs {
-  margin: 0 20px;
-}
-.el-upload__tip {
-  color: rgb(155, 155, 155);
-  margin: 0;
-}
-.form {
-  margin-top: 30px;
-}
-</style>
-<style>
-.el-dialog__body {
-  padding: 0 10px 20px !important;
-}
+<style lang="scss" scoped >
+@import "@/assets/scss/modules/visual/communityManageForm.scss";
 </style>
\ No newline at end of file
diff --git a/src/views/modules/base/community/roomTable.vue b/src/views/modules/base/community/roomTable.vue
index 62e31c49..6a3638bd 100644
--- a/src/views/modules/base/community/roomTable.vue
+++ b/src/views/modules/base/community/roomTable.vue
@@ -175,6 +175,8 @@
                :close-on-press-escape="false"
                :title="formTitle"
                width="900px"
+               top="5vh"
+               class="dialog-h"
                @closed="diaClose">
       <room-form ref="ref_form"
                  @dialogCancle="addFormCancle"
diff --git a/src/views/modules/base/grid.vue b/src/views/modules/base/grid.vue
index eecc5933..c3c25998 100644
--- a/src/views/modules/base/grid.vue
+++ b/src/views/modules/base/grid.vue
@@ -2,25 +2,24 @@
   <div>
     <div class="resi-container">
       <el-card class="resi-card">
-        <el-row class="resi-row-box" :class="openSearch && 'resi-row-more'">
-          <el-row class="resi-row" :gutter="20">
+        <el-row class="resi-row-box"
+                :class="openSearch && 'resi-row-more'">
+          <el-row class="resi-row"
+                  :gutter="20">
             <el-col span="6">
               <div class="resi-cell">
                 <div class="resi-cell-label">所属组织</div>
-                <div class="resi-cell-value" :class="'resi-cell-value-radio'">
-                  <el-select
-                    v-model="fmData.agencyId"
-                    placeholder="请选择"
-                    size="small"
-                    clearable
-                    class="resi-cell-select"
-                  >
-                    <el-option
-                      v-for="item in options"
-                      :key="item.value"
-                      :label="item.label"
-                      :value="item.value"
-                    >
+                <div class="resi-cell-value"
+                     :class="'resi-cell-value-radio'">
+                  <el-select v-model="fmData.agencyId"
+                             placeholder="请选择"
+                             size="small"
+                             clearable
+                             class="resi-cell-select">
+                    <el-option v-for="item in options"
+                               :key="item.value"
+                               :label="item.label"
+                               :value="item.value">
                     </el-option>
                   </el-select>
                 </div>
@@ -30,54 +29,60 @@
             <el-col span="6">
               <div class="resi-cell">
                 <div class="resi-cell-label">所属组织</div>
-                <div class="resi-cell-value" :class="'resi-cell-value-radio'">
-                  <el-input
-                    v-model="fmData.agencyId"
-                    class="resi-cell-input"
-                    size="small"
-                    clearable
-                    placeholder="请输入内容"
-                  >
+                <div class="resi-cell-value"
+                     :class="'resi-cell-value-radio'">
+                  <el-input v-model="fmData.agencyId"
+                            class="resi-cell-input"
+                            size="small"
+                            clearable
+                            placeholder="请输入内容">
                   </el-input>
                 </div>
               </div>
+
             </el-col>
+
           </el-row>
         </el-row>
-        <el-row class="resi-search">
-          <el-col span="24">
-            <el-button type="primary" size="mini" @click="handleSearch"
-              >查询</el-button
-            >
-          </el-col>
-        </el-row>
+        <div class="resi-card-btn">
+          <el-button type="primary"
+                     size="mini"
+                     @click="handleSearch">查询</el-button>
+        </div>
+
       </el-card>
     </div>
 
     <el-card class="resi-card-table">
       <div class="resi-row-btn">
-        <el-button type="warning" size="small">导出</el-button>
-        <el-button type="success" size="small" @click="handleAdd"
-          >新增</el-button
-        >
+        <el-button type="yellow"
+                   size="small">导出</el-button>
+        <el-button size="small"
+                   type="green"
+                   @click="handleAdd">新增</el-button>
       </div>
-      <el-table :data="tableData" border style="width: 100%">
-        <el-table-column prop="date" label="日期" width="180">
+      <el-table :data="tableData"
+                border
+                style="width: 100%">
+        <el-table-column prop="date"
+                         label="日期"
+                         width="180">
         </el-table-column>
-        <el-table-column prop="name" label="姓名" width="180">
+        <el-table-column prop="name"
+                         label="姓名"
+                         width="180">
         </el-table-column>
-        <el-table-column prop="address" label="地址"> </el-table-column>
+        <el-table-column prop="address"
+                         label="地址"> </el-table-column>
       </el-table>
       <div>
-        <el-pagination
-          @size-change="handleSizeChange"
-          @current-change="handleCurrentChange"
-          :current-page.sync="currentPage"
-          :page-sizes="[100, 200, 300, 400]"
-          :page-size="100"
-          layout="sizes, prev, pager, next"
-          :total="1000"
-        >
+        <el-pagination @size-change="handleSizeChange"
+                       @current-change="handleCurrentChange"
+                       :current-page.sync="currentPage"
+                       :page-sizes="[100, 200, 300, 400]"
+                       :page-size="100"
+                       layout="sizes, prev, pager, next"
+                       :total="1000">
         </el-pagination>
       </div>
     </el-card>
@@ -87,7 +92,7 @@
 <script>
 export default {
   components: {},
-  data() {
+  data () {
     return {
       dialogVisible: false,
       openSearch: false,
@@ -113,25 +118,25 @@ export default {
     }
   },
   methods: {
-    handleSizeChange(val) {
+    handleSizeChange (val) {
       console.log(`每页 ${val} 条`)
     },
-    handleCurrentChange(val) {
+    handleCurrentChange (val) {
       console.log(`当前页: ${val}`)
     },
-    handleClose() {
+    handleClose () {
       this.dialogVisible = false
     },
-    handleSearch(val) {
+    handleSearch (val) {
       console.log('searchhh--', val)
     },
-    handleClick(tab, event) {
+    handleClick (tab, event) {
       console.log(tab, event)
     },
-    handleAdd() {
+    handleAdd () {
       this.dialogVisible = true
     },
-    handleSUbmit() {
+    handleSUbmit () {
       console.log('baseform', this.$refs)
 
       this.tabsList.forEach((item) => {
@@ -223,7 +228,7 @@ export default {
   }
 }
 .resi-row-box {
-  height: 104px;
+  height: 84px;
   overflow: hidden;
   transition: height 0.5s;
 }
@@ -234,6 +239,11 @@ export default {
 .resi-row {
   margin-bottom: 20px;
 }
+.resi-card-btn {
+  position: absolute;
+  right: 20px;
+  bottom: 15px;
+}
 .resi-search {
   .el-col {
     text-align: right;
diff --git a/src/views/modules/communityParty/regionalParty/activitys.vue b/src/views/modules/communityParty/regionalParty/activitys.vue
index 675e7cc3..75fcabe1 100644
--- a/src/views/modules/communityParty/regionalParty/activitys.vue
+++ b/src/views/modules/communityParty/regionalParty/activitys.vue
@@ -203,6 +203,7 @@
                :title="formTitle"
                width="950px"
                top="5vh"
+               class="dialog-h"
                @closed="diaClose">
       <activitys-form ref="ref_form"
                       :unitList="unitList"
@@ -216,9 +217,11 @@
                :title="'活动详情'"
                width="950px"
                top="5vh"
+               class="dialog-h"
                @closed="detailClosed">
       <activitys-detail ref="ref_detail"
-                        :serviceList="serviceList"></activitys-detail>
+                        :serviceList="serviceList"
+                        @diaClose="diaClose"></activitys-detail>
     </el-dialog>
 
   </div>
@@ -630,7 +633,7 @@ export default {
   computed: {
     tableHeight () {
 
-      return (this.clientHeight - 460)
+      return (this.clientHeight - 430)
 
     },
     rowHeight () {
diff --git a/src/views/modules/communityParty/regionalParty/activitysDetail.vue b/src/views/modules/communityParty/regionalParty/activitysDetail.vue
index d635d56b..8e979669 100644
--- a/src/views/modules/communityParty/regionalParty/activitysDetail.vue
+++ b/src/views/modules/communityParty/regionalParty/activitysDetail.vue
@@ -1,100 +1,104 @@
 <template>
   <div>
-    <div>
-      <div>
-        <el-form ref="ref_form"
-                 :inline="true"
-                 :model="formData"
-                 class="form">
-
-          <el-form-item label="服务事项"
-                        label-width="150px"
-                        prop="serviceMatterShow">
-            <span class="detail_span">{{formData.serviceMatterShow}}</span>
-
-          </el-form-item>
-
-          <el-form-item label="单位名称"
-                        prop="unitId"
-                        label-width="150px"
-                        style="display: block">
-            <span class="detail_span">{{formData.unitName}}</span>
-
-          </el-form-item>
-
-          <el-form-item label="活动标题"
-                        prop="title"
-                        label-width="150px"
-                        style="display: block">
-            <span class="detail_span">{{formData.title}}</span>
-
-          </el-form-item>
-
-          <el-form-item label="活动目标"
-                        prop="target"
-                        label-width="150px"
-                        style="display: block">
-            <span class="detail_span">{{formData.target}}</span>
-
-          </el-form-item>
-          <el-form-item label="活动内容"
-                        prop="target"
-                        label-width="150px"
-                        style="display: block">
-            <p class="text_p"
-               v-html="formData.content"></p>
-
-          </el-form-item>
-
-          <el-form-item label="服务人数"
-                        style="display: block"
-                        prop="peopleCount"
-                        label-width="150px">
-            <span class="detail_span">{{formData.peopleCount}}</span>
-
-          </el-form-item>
-          <el-form-item label="活动时间"
-                        style="display: block"
-                        prop="activityTime"
-                        label-width="150px">
-            <span class="detail_span">{{formData.activityTime}}</span>
-
-          </el-form-item>
-
-          <el-form-item label="活动地址"
-                        prop="address"
-                        label-width="150px"
-                        style="display: block">
-            <span class="detail_span">{{formData.address}}</span>
-
-          </el-form-item>
-
-          <el-form-item label="活动坐标"
-                        prop="longitude"
-                        label-width="150px"
-                        style="display: block">
-
-            <div style="width:500px">
-
-              <div id="app">
-
-              </div>
+
+    <div class="dialog-h-content scroll-h">
+      <el-form ref="ref_form"
+               :inline="true"
+               :model="formData"
+               class="form">
+
+        <el-form-item label="服务事项"
+                      label-width="150px"
+                      prop="serviceMatterShow">
+          <span class="detail_span">{{formData.serviceMatterShow}}</span>
+
+        </el-form-item>
+
+        <el-form-item label="单位名称"
+                      prop="unitId"
+                      label-width="150px"
+                      style="display: block">
+          <span class="detail_span">{{formData.unitName}}</span>
+
+        </el-form-item>
+
+        <el-form-item label="活动标题"
+                      prop="title"
+                      label-width="150px"
+                      style="display: block">
+          <span class="detail_span">{{formData.title}}</span>
+
+        </el-form-item>
+
+        <el-form-item label="活动目标"
+                      prop="target"
+                      label-width="150px"
+                      style="display: block">
+          <span class="detail_span">{{formData.target}}</span>
+
+        </el-form-item>
+        <el-form-item label="活动内容"
+                      prop="target"
+                      label-width="150px"
+                      style="display: block">
+          <p class="text_p"
+             v-html="formData.content"></p>
+
+        </el-form-item>
+
+        <el-form-item label="服务人数"
+                      style="display: block"
+                      prop="peopleCount"
+                      label-width="150px">
+          <span class="detail_span">{{formData.peopleCount}}</span>
+
+        </el-form-item>
+        <el-form-item label="活动时间"
+                      style="display: block"
+                      prop="activityTime"
+                      label-width="150px">
+          <span class="detail_span">{{formData.activityTime}}</span>
+
+        </el-form-item>
+
+        <el-form-item label="活动地址"
+                      prop="address"
+                      label-width="150px"
+                      style="display: block">
+          <span class="detail_span">{{formData.address}}</span>
+
+        </el-form-item>
+
+        <el-form-item label="活动坐标"
+                      prop="longitude"
+                      label-width="150px"
+                      style="display: block">
+
+          <div style="width:500px">
+
+            <div id="app">
 
             </div>
 
-          </el-form-item>
+          </div>
 
-          <el-form-item label="活动结果"
-                        prop="result"
-                        label-width="150px"
-                        style="display: block">
+        </el-form-item>
 
-            <p class="text_p"
-               v-html="formData.result"></p>
+        <el-form-item label="活动结果"
+                      prop="result"
+                      label-width="150px"
+                      style="display: block">
+
+          <p class="text_p"
+             v-html="formData.result"></p>
+
+        </el-form-item>
+      </el-form>
+    </div>
 
-          </el-form-item>
-        </el-form>
-      </div>
+    <div class="div_btn">
+      <el-button size="small"
+                 @click="handleCancle">取 消</el-button>
 
     </div>
 
@@ -124,7 +128,11 @@ export default {
   },
 
   methods: {
+    handleCancle () {
 
+      this.$emit('diaClose')
+
+    },
     async initForm (row) {
 
       this.startLoading()
@@ -278,6 +286,11 @@ export default {
   }
 }
 </script>
+
+<style lang="scss" scoped >
+@import "@/assets/scss/modules/visual/communityManageForm.scss";
+</style>
+
 <style  lang="scss" scoped>
 .detail_span {
   width: 500px;
@@ -294,9 +307,5 @@ export default {
     margin: 0 0;
   }
 }
-
-.div_map {
-  position: relative;
-}
 </style>
 
diff --git a/src/views/modules/communityParty/regionalParty/activitysForm.vue b/src/views/modules/communityParty/regionalParty/activitysForm.vue
index 04312f90..b6708343 100644
--- a/src/views/modules/communityParty/regionalParty/activitysForm.vue
+++ b/src/views/modules/communityParty/regionalParty/activitysForm.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
 
-    <div>
+    <div class="dialog-h-content scroll-h">
       <el-form ref="ref_form"
                :inline="true"
                :model="formData"
@@ -192,8 +192,10 @@
     </div>
 
     <div class="div_btn">
-      <el-button @click="handleCancle">取 消</el-button>
-      <el-button v-if="formType != 'detail'"
+      <el-button size="small"
+                 @click="handleCancle">取 消</el-button>
+      <el-button size="small"
+                 v-if="formType != 'detail'"
                  type="primary"
                  :disabled="btnDisable"
                  @click="handleComfirm">确 定</el-button>
@@ -556,6 +558,11 @@ export default {
   }
 }
 </script>
+
+
+<style lang="scss" scoped >
+@import "@/assets/scss/modules/visual/communityManageForm.scss";
+</style>
 <style  lang="scss" scoped>
 .item_width_1 {
   width: 560px;
@@ -569,16 +576,6 @@ export default {
     z-index: 2000000000;
   }
 }
-.item_width_2 {
-  width: 600px;
-}
-.item_width_3 {
-  margin-left: 10px;
-  width: 200px;
-}
-.item_width_4 {
-  width: 200px;
-}
 
 .div_map {
   position: relative;
@@ -590,19 +587,6 @@ export default {
   left: 5px;
 }
 
-.div_btn {
-  display: flex;
-  justify-content: flex-end;
-}
-
-.el-upload__tip {
-  color: rgb(155, 155, 155);
-  margin: 0;
-}
-.form {
-  margin-top: 30px;
-}
-
 .tinymce_view {
   height: 400px;
   overflow: auto;
@@ -618,8 +602,3 @@ export default {
 }
 </style>
 
-<style lang=scss>
-.el-dialog__body {
-  padding: 0 10px 20px !important;
-}
-</style>
diff --git a/src/views/modules/communityParty/regionalParty/finishList.vue b/src/views/modules/communityParty/regionalParty/finishList.vue
index c6c62269..ff5f373d 100644
--- a/src/views/modules/communityParty/regionalParty/finishList.vue
+++ b/src/views/modules/communityParty/regionalParty/finishList.vue
@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div class="dialog-h-content scroll-h">
     <div class="div_table">
       <el-button type="green"
                  size="small"
diff --git a/src/views/modules/communityParty/regionalParty/units.vue b/src/views/modules/communityParty/regionalParty/units.vue
index d5679446..c5355cc9 100644
--- a/src/views/modules/communityParty/regionalParty/units.vue
+++ b/src/views/modules/communityParty/regionalParty/units.vue
@@ -186,36 +186,34 @@
         </el-table-column>
         <el-table-column label="操作"
                          fixed="right"
-                         width="190"
+                         width="250"
                          header-align="center"
                          align="center"
                          class="operate">
           <template slot-scope="scope">
-            <div>
-              <el-button type="text"
-                         style="color:#1C6AFD;text-decoration: underline;"
-                         size="small"
-                         @click="handleDetail(scope.row)">查看</el-button>
-              <el-button type="text"
-                         style="color:#1C6AFD;text-decoration: underline;"
-                         size="small"
-                         @click="handleFinish(scope.row)">完成情况</el-button>
-              <el-button type="text"
-                         style="color:#1C6AFD;text-decoration: underline;"
-                         size="small"
-                         @click="handleScore(scope.row)">积分记录</el-button>
-            </div>
-            <div>
-              <el-button type="text"
-                         style="color:#00A7A9;text-decoration: underline;"
-                         size="small"
-                         @click="handleEdit(scope.row)">修改</el-button>
-
-              <el-button type="text"
-                         style="color:#D51010;text-decoration: underline;"
-                         size="small"
-                         @click="handleDelete(scope.row)">删除</el-button>
-            </div>
+
+            <el-button type="text"
+                       style="color:#1C6AFD;text-decoration: underline;"
+                       size="small"
+                       @click="handleDetail(scope.row)">查看</el-button>
+            <el-button type="text"
+                       style="color:#00A7A9;text-decoration: underline;"
+                       size="small"
+                       @click="handleEdit(scope.row)">修改</el-button>
+            <el-button type="text"
+                       style="color:#1C6AFD;text-decoration: underline;"
+                       size="small"
+                       @click="handleFinish(scope.row)">完成情况</el-button>
+            <el-button type="text"
+                       style="color:#1C6AFD;text-decoration: underline;"
+                       size="small"
+                       @click="handleScore(scope.row)">积分记录</el-button>
+
+            <el-button type="text"
+                       style="color:#D51010;text-decoration: underline;"
+                       size="small"
+                       @click="handleDelete(scope.row)">删除</el-button>
+
           </template>
         </el-table-column>
       </el-table>
@@ -238,6 +236,7 @@
                :title="formTitle"
                width="950px"
                top="5vh"
+               class="dialog-h"
                @closed="editDiaClose">
       <units-form ref="ref_form"
                   :typeList="typeList"
@@ -251,8 +250,10 @@
                :title="'单位详情'"
                width="950px"
                top="5vh"
+               class="dialog-h"
                @closed="diaClose">
-      <units-detail ref="ref_detail"></units-detail>
+      <units-detail ref="ref_detail"
+                    @diaClose="diaClose"></units-detail>
     </el-dialog>
 
     <!-- 完成情况 -->
@@ -262,6 +263,7 @@
                :title="finishDiaTitle"
                width="950px"
                top="5vh"
+               class="dialog-h"
                @closed="diaClose">
       <finish-list ref="ref_finish"></finish-list>
     </el-dialog>
@@ -664,7 +666,7 @@ export default {
   computed: {
     tableHeight () {
 
-      return (this.clientHeight - 460)
+      return (this.clientHeight - 430)
 
     },
     rowHeight () {
diff --git a/src/views/modules/communityParty/regionalParty/unitsDetail.vue b/src/views/modules/communityParty/regionalParty/unitsDetail.vue
index 12e58549..306fc3f8 100644
--- a/src/views/modules/communityParty/regionalParty/unitsDetail.vue
+++ b/src/views/modules/communityParty/regionalParty/unitsDetail.vue
@@ -1,82 +1,89 @@
 <template>
   <div>
-
-    <el-form ref="ref_form"
-             :inline="true"
-             :model="formData"
-             class="form">
-
-      <el-form-item label="单位名称："
-                    prop="unitName"
-                    label-width="150px"
-                    style="display: block">
-        <span class="detail_span">{{formData.unitName}}</span>
-
-      </el-form-item>
-      <el-form-item label="分类："
-                    prop="type"
-                    label-width="150px"
-                    style="display: block">
-
-        <span class="detail_span">{{formData.type}}</span>
-
-      </el-form-item>
-      <el-form-item label="服务事项："
-                    prop="serviceMatterList"
-                    label-width="150px"
-                    style="display: block">
-        <p class="detail_span"
-           v-for="(item,index) in formData.serviceMatterList"
-           :key="index">{{item}}</p>
-
-      </el-form-item>
-      <el-form-item label="联系人："
-                    prop="contact"
-                    label-width="150px"
-                    style="display: block">
-        <span class="detail_span">{{formData.contact}}</span>
-
-      </el-form-item>
-      <el-form-item label="联系电话："
-                    prop="contactMobile"
-                    label-width="150px"
-                    style="display: block">
-        <span class="detail_span">{{formData.contactMobile}}</span>
-      </el-form-item>
-      <el-form-item label="在职党员："
-                    style="display: block"
-                    prop="memberCount"
-                    label-width="150px">
-        <span class="detail_span">{{formData.memberCount}}</span>
-      </el-form-item>
-      <el-form-item label="备注："
-                    prop="remark"
-                    label-width="150px"
-                    style="display: block">
-        <span class="detail_span">{{formData.remark?formData.remark:'无'}}</span>
-      </el-form-item>
-      <el-form-item label="地理位置："
-                    prop="address"
-                    label-width="150px"
-                    style="display: block">
-        <span class="detail_span">{{formData.address}}</span>
-
-      </el-form-item>
-      <el-form-item label="位置坐标："
-                    prop="longitude"
-                    label-width="150px"
-                    style="display: block">
-        <div style="width:500px">
-
-          <div id="app">
+    <div class="dialog-h-content scroll-h">
+
+      <el-form ref="ref_form"
+               :inline="true"
+               :model="formData"
+               class="form">
+
+        <el-form-item label="单位名称："
+                      prop="unitName"
+                      label-width="150px"
+                      style="display: block">
+          <span class="detail_span">{{formData.unitName}}</span>
+
+        </el-form-item>
+        <el-form-item label="分类："
+                      prop="type"
+                      label-width="150px"
+                      style="display: block">
+
+          <span class="detail_span">{{formData.type}}</span>
+
+        </el-form-item>
+        <el-form-item label="服务事项："
+                      prop="serviceMatterList"
+                      label-width="150px"
+                      style="display: block">
+          <p class="detail_span"
+             v-for="(item,index) in formData.serviceMatterList"
+             :key="index">{{item}}</p>
+
+        </el-form-item>
+        <el-form-item label="联系人："
+                      prop="contact"
+                      label-width="150px"
+                      style="display: block">
+          <span class="detail_span">{{formData.contact}}</span>
+
+        </el-form-item>
+        <el-form-item label="联系电话："
+                      prop="contactMobile"
+                      label-width="150px"
+                      style="display: block">
+          <span class="detail_span">{{formData.contactMobile}}</span>
+        </el-form-item>
+        <el-form-item label="在职党员："
+                      style="display: block"
+                      prop="memberCount"
+                      label-width="150px">
+          <span class="detail_span">{{formData.memberCount}}</span>
+        </el-form-item>
+        <el-form-item label="备注："
+                      prop="remark"
+                      label-width="150px"
+                      style="display: block">
+          <span class="detail_span">{{formData.remark?formData.remark:'无'}}</span>
+        </el-form-item>
+        <el-form-item label="地理位置："
+                      prop="address"
+                      label-width="150px"
+                      style="display: block">
+          <span class="detail_span">{{formData.address}}</span>
+
+        </el-form-item>
+        <el-form-item label="位置坐标："
+                      prop="longitude"
+                      label-width="150px"
+                      style="display: block">
+          <div style="width:500px">
+
+            <div id="app">
+
+            </div>
 
           </div>
+        </el-form-item>
 
-        </div>
-      </el-form-item>
+      </el-form>
 
-    </el-form>
+    </div>
+    <div class="div_btn">
+      <el-button size="small"
+                 @click="handleCancle">取 消</el-button>
 
+    </div>
   </div>
 </template>
 
@@ -104,6 +111,11 @@ export default {
   },
 
   methods: {
+    handleCancle () {
+
+      this.$emit('diaClose')
+
+    },
 
     async initForm (row) {
       this.startLoading()
@@ -249,7 +261,9 @@ export default {
   }
 }
 </script>
-
+<style lang="scss" scoped >
+@import "@/assets/scss/modules/visual/communityManageForm.scss";
+</style>
 <style scoped>
 .detail_span {
   width: 500px;
@@ -259,10 +273,6 @@ export default {
   font-size: 16px;
 }
 
-.div_map {
-  position: relative;
-}
-
 .form {
   margin-top: 30px;
 }
diff --git a/src/views/modules/communityParty/regionalParty/unitsForm.vue b/src/views/modules/communityParty/regionalParty/unitsForm.vue
index 7777b20c..5c3f0b4c 100644
--- a/src/views/modules/communityParty/regionalParty/unitsForm.vue
+++ b/src/views/modules/communityParty/regionalParty/unitsForm.vue
@@ -1,153 +1,154 @@
 <template>
   <div>
-    <div>
-      <div>
-        <el-form ref="ref_form"
-                 :inline="true"
-                 :model="formData"
-                 :rules="dataRule"
-                 :disabled="formType === 'detail'"
-                 class="form">
-
-          <el-form-item label="单位名称"
-                        prop="unitName"
-                        label-width="150px"
-                        style="display: block">
-            <el-input class="item_width_1"
-                      maxlength="50"
-                      show-word-limit
-                      placeholder="请输入单位名称"
-                      v-model="formData.unitName">
-            </el-input>
-          </el-form-item>
-          <el-form-item label="分类"
-                        prop="type"
-                        label-width="150px"
-                        style="display: block">
-            <el-select class="item_width_1"
-                       v-model="formData.type"
-                       placeholder="请选择"
-                       filterable
-                       clearable>
-              <el-option v-for="item in typeList"
+
+    <div class="dialog-h-content scroll-h">
+      <el-form ref="ref_form"
+               :inline="true"
+               :model="formData"
+               :rules="dataRule"
+               :disabled="formType === 'detail'"
+               class="form">
+
+        <el-form-item label="单位名称"
+                      prop="unitName"
+                      label-width="150px"
+                      style="display: block">
+          <el-input class="item_width_1"
+                    maxlength="50"
+                    show-word-limit
+                    placeholder="请输入单位名称"
+                    v-model="formData.unitName">
+          </el-input>
+        </el-form-item>
+        <el-form-item label="分类"
+                      prop="type"
+                      label-width="150px"
+                      style="display: block">
+          <el-select class="item_width_1"
+                     v-model="formData.type"
+                     placeholder="请选择"
+                     filterable
+                     clearable>
+            <el-option v-for="item in typeList"
+                       :key="item.value"
+                       :label="item.label"
+                       :value="item.value">
+            </el-option>
+          </el-select>
+
+        </el-form-item>
+        <el-form-item label="服务事项"
+                      prop="serviceMatterList"
+                      label-width="150px"
+                      style="display: block">
+          <el-checkbox-group class="item_width_1"
+                             style="display:flex;flex-wrap:wrap"
+                             v-model="formData.serviceMatterList">
+            <el-checkbox v-for="item in serviceList"
                          :key="item.value"
-                         :label="item.label"
-                         :value="item.value">
-              </el-option>
-            </el-select>
-
-          </el-form-item>
-          <el-form-item label="服务事项"
-                        prop="serviceMatterList"
-                        label-width="150px"
-                        style="display: block">
-            <el-checkbox-group class="item_width_1"
-                               style="display:flex;flex-wrap:wrap"
-                               v-model="formData.serviceMatterList">
-              <el-checkbox v-for="item in serviceList"
-                           :key="item.value"
-                           :label="item.value">{{item.label}}</el-checkbox>
-
-            </el-checkbox-group>
-
-          </el-form-item>
-          <el-form-item label="联系人"
-                        prop="contact"
-                        label-width="150px"
-                        style="display: block">
-            <el-input class="item_width_1"
-                      placeholder="请输入联系人姓名"
-                      v-model="formData.contact">
-            </el-input>
-          </el-form-item>
-          <el-form-item label="联系电话"
-                        prop="contactMobile"
-                        label-width="150px"
-                        style="display: block">
-            <el-input class="item_width_1"
-                      placeholder="请输入联系人电话"
-                      v-model="formData.contactMobile">
-            </el-input>
-          </el-form-item>
-          <el-form-item label="在职党员"
-                        style="display: block"
-                        prop="memberCount"
-                        label-width="150px">
-            <el-input-number class="item_width_1"
-                             v-model="formData.memberCount"
-                             :min="0"
-                             label="在职党员"></el-input-number>
-          </el-form-item>
-          <el-form-item label="备注"
-                        prop="remark"
-                        label-width="150px"
-                        style="display: block">
-            <el-input class="item_width_1"
-                      type="textarea"
-                      maxlength="500"
-                      show-word-limit
-                      :rows="3"
-                      placeholder="请输入备注，不超过500字"
-                      v-model="formData.remark"></el-input>
-          </el-form-item>
-          <el-form-item label="位置坐标"
-                        prop="longitude"
-                        label-width="150px"
-                        style="display: block">
-            <div style="width:500px">
-
-              <div class="div_map">
-                <div id="app">
-
-                </div>
-                <div class="div_searchmap">
-                  <el-input class="item_width_4"
-                            maxlength="50"
-                            size="mini"
-                            placeholder="请输入关键字"
-                            v-model="keyWords">
-                  </el-input>
-                  <el-button style="margin-left: 10px"
-                             type="primary"
-                             size="mini"
-                             @click="handleSearchMap">查询</el-button>
-                </div>
-              </div>
+                         :label="item.value">{{item.label}}</el-checkbox>
+
+          </el-checkbox-group>
+
+        </el-form-item>
+        <el-form-item label="联系人"
+                      prop="contact"
+                      label-width="150px"
+                      style="display: block">
+          <el-input class="item_width_1"
+                    placeholder="请输入联系人姓名"
+                    v-model="formData.contact">
+          </el-input>
+        </el-form-item>
+        <el-form-item label="联系电话"
+                      prop="contactMobile"
+                      label-width="150px"
+                      style="display: block">
+          <el-input class="item_width_1"
+                    placeholder="请输入联系人电话"
+                    v-model="formData.contactMobile">
+          </el-input>
+        </el-form-item>
+        <el-form-item label="在职党员"
+                      style="display: block"
+                      prop="memberCount"
+                      label-width="150px">
+          <el-input-number class="item_width_1"
+                           v-model="formData.memberCount"
+                           :min="0"
+                           label="在职党员"></el-input-number>
+        </el-form-item>
+        <el-form-item label="备注"
+                      prop="remark"
+                      label-width="150px"
+                      style="display: block">
+          <el-input class="item_width_1"
+                    type="textarea"
+                    maxlength="500"
+                    show-word-limit
+                    :rows="3"
+                    placeholder="请输入备注，不超过500字"
+                    v-model="formData.remark"></el-input>
+        </el-form-item>
+        <el-form-item label="位置坐标"
+                      prop="longitude"
+                      label-width="150px"
+                      style="display: block">
+          <div style="width:500px">
+
+            <div class="div_map">
+              <div id="app">
 
-              <div style="margin-top: 10px">
-                <span>经度</span>
-                <el-input class="item_width_3"
-                          maxlength="50"
-                          placeholder="请输入经度"
-                          v-model="formData.longitude">
-                </el-input>
-                <span style="margin-left: 20px">纬度</span>
-                <el-input class="item_width_3"
+              </div>
+              <div class="div_searchmap">
+                <el-input class="item_width_4"
                           maxlength="50"
-                          placeholder="请输入纬度"
-                          v-model="formData.latitude">
+                          size="mini"
+                          placeholder="请输入关键字"
+                          v-model="keyWords">
                 </el-input>
+                <el-button style="margin-left: 10px"
+                           type="primary"
+                           size="mini"
+                           @click="handleSearchMap">查询</el-button>
               </div>
             </div>
-          </el-form-item>
 
-          <el-form-item label="地理位置"
-                        prop="address"
-                        label-width="150px"
-                        style="display: block">
+            <div style="margin-top: 10px">
+              <span>经度</span>
+              <el-input class="item_width_3"
+                        maxlength="50"
+                        placeholder="请输入经度"
+                        v-model="formData.longitude">
+              </el-input>
+              <span style="margin-left: 20px">纬度</span>
+              <el-input class="item_width_3"
+                        maxlength="50"
+                        placeholder="请输入纬度"
+                        v-model="formData.latitude">
+              </el-input>
+            </div>
+          </div>
+        </el-form-item>
 
-            <el-input class="item_width_1"
-                      v-model="formData.address">
-            </el-input>
+        <el-form-item label="地理位置"
+                      prop="address"
+                      label-width="150px"
+                      style="display: block">
 
-          </el-form-item>
-        </el-form>
-      </div>
+          <el-input class="item_width_1"
+                    v-model="formData.address">
+          </el-input>
 
+        </el-form-item>
+      </el-form>
     </div>
+
     <div class="div_btn">
-      <el-button @click="handleCancle">取 消</el-button>
-      <el-button v-if="formType != 'detail'"
+      <el-button size="small"
+                 @click="handleCancle">取 消</el-button>
+      <el-button size="small"
+                 v-if="formType != 'detail'"
                  type="primary"
                  :disabled="btnDisable"
                  @click="handleComfirm">确 定</el-button>
@@ -509,20 +510,6 @@ export default {
 }
 </script>
 <style scoped>
-.item_width_1 {
-  width: 500px;
-}
-.item_width_2 {
-  width: 400px;
-}
-.item_width_3 {
-  margin-left: 10px;
-  width: 200px;
-}
-.item_width_4 {
-  width: 200px;
-}
-
 .div_map {
   position: relative;
 }
@@ -532,25 +519,8 @@ export default {
   top: 5px;
   left: 5px;
 }
-
-.div_btn {
-  display: flex;
-  justify-content: flex-end;
-}
-.el-tabs {
-  margin: 0 20px;
-}
-.el-upload__tip {
-  color: rgb(155, 155, 155);
-  margin: 0;
-}
-.form {
-  margin-top: 30px;
-}
 </style>
 
-<style lang=scss>
-.el-dialog__body {
-  padding: 0 10px 20px !important;
-}
+<style lang="scss" scoped >
+@import "@/assets/scss/modules/visual/communityManageForm.scss";
 </style>