Merge branch 'master' of http://git.elinkit.com.cn:7070/r/epmet-oper-gov

3 years ago · b5d7127ca3
43 changed files with 440 additions and 266 deletions
--- a/src/assets/scss/modules/management/detail-main.scss
+++ b/src/assets/scss/modules/management/detail-main.scss
@ -17,7 +17,7 @@
 }

 .div-btn{
-  margin-top:50px;
+  margin-top:30px;
  // margin-bottom:20px;
  display: flex;
  justify-content: center;
--- a/src/views/modules/base/community/buildDetail.vue
+++ b/src/views/modules/base/community/buildDetail.vue
@ -68,7 +68,11 @@
      </div>

    </div>
+    <div class="div-btn">
+      <el-button size="small"
+                 @click="handleCancle">关 闭</el-button>

+    </div>
  </div>
 </template>

@ -120,6 +124,11 @@ export default {
  },

  methods: {
+    handleCancle () {
+      this.diaDestroy()
+      this.$emit('diaDetailClose')
+
+    },
    diaDestroy () {
      if (map) {
        map.destroy()
--- a/src/views/modules/base/community/buildTable.vue
+++ b/src/views/modules/base/community/buildTable.vue
@ -14,7 +14,8 @@
                   size="small"
                   @click="handleExportModule('building')">下载楼栋模板</el-button>

-        <el-upload :headers="$getElUploadHeaders()"  style=""
+        <el-upload :headers="$getElUploadHeaders()"
+                   style=""
                   ref="upload_building"
                   :multiple='false'
                   :show-file-list='false'
@ -31,7 +32,8 @@
                   size="small"
                   @click="handleExportModule('room')">下载房屋模板</el-button>

-        <el-upload :headers="$getElUploadHeaders()"  style=""
+        <el-upload :headers="$getElUploadHeaders()"
+                   style=""
                   ref="upload_room"
                   :multiple='false'
                   :show-file-list='false'
@ -206,7 +208,8 @@
               width="900px"
               class="dialog-h"
               @closed="detailFormCancle">
-      <build-detail ref="ref_form_detail"></build-detail>
+      <build-detail ref="ref_form_detail"
+                    @diaDetailClose="detailFormCancle"></build-detail>
    </el-dialog>

    <baobiao ref="baobiao" />
--- a/src/views/modules/base/community/communityDetail.vue
+++ b/src/views/modules/base/community/communityDetail.vue
@ -61,7 +61,11 @@
      </div>

    </div>
+    <div class="div-btn">
+      <el-button size="small"
+                 @click="handleCancle">关 闭</el-button>

+    </div>
  </div>
 </template>

@ -106,6 +110,11 @@ export default {
  },

  methods: {
+    handleCancle () {
+      this.diaDestroy()
+      this.$emit('diaDetailClose')
+
+    },
    diaDestroy () {
      if (map) {
        map.destroy()
--- a/src/views/modules/base/community/communityTable.vue
+++ b/src/views/modules/base/community/communityTable.vue
@ -26,7 +26,8 @@
                   size="small"
                   @click="handleExportModule('community')">下载小区模板</el-button>

-        <el-upload :headers="$getElUploadHeaders()"  ref="upload_community"
+        <el-upload :headers="$getElUploadHeaders()"
+                   ref="upload_community"
                   style=""
                   :multiple='false'
                   :show-file-list='false'
@ -44,7 +45,8 @@
                   size="small"
                   @click="handleExportModule('building')">下载楼栋模板</el-button>

-        <el-upload :headers="$getElUploadHeaders()"  style=""
+        <el-upload :headers="$getElUploadHeaders()"
+                   style=""
                   ref="upload_building"
                   :multiple='false'
                   :show-file-list='false'
@ -61,7 +63,8 @@
                   size="small"
                   @click="handleExportModule('room')">下载房屋模板</el-button>

-        <el-upload :headers="$getElUploadHeaders()"  style=""
+        <el-upload :headers="$getElUploadHeaders()"
+                   style=""
                   ref="upload_room"
                   :multiple='false'
                   :show-file-list='false'
@ -193,7 +196,8 @@
               top="5vh"
               class="dialog-h"
               @closed="detailFormCancle">
-      <community-detail ref="ref_form_detail"></community-detail>
+      <community-detail ref="ref_form_detail"
+                        @diaDetailClose="detailFormCancle"></community-detail>
    </el-dialog>

    <!-- 修改弹出框 -->
--- a/src/views/modules/base/community/roomDetail.vue
+++ b/src/views/modules/base/community/roomDetail.vue
@ -66,7 +66,11 @@
      </div>

    </div>
+    <div class="div-btn">
+      <el-button size="small"
+                 @click="handleCancle">关 闭</el-button>

+    </div>
  </div>
 </template>

@ -117,7 +121,11 @@ export default {
  },

  methods: {
+    handleCancle () {
+      // this.diaDestroy()
+      this.$emit('diaDetailClose')

+    },
    diaDestroy () {
      if (map) {
        map.destroy()
--- a/src/views/modules/base/community/roomTable.vue
+++ b/src/views/modules/base/community/roomTable.vue
@ -8,7 +8,8 @@
                 @click="handleAdd">新增房屋</el-button>
      <div class="btn_upload"
           v-if="showImportBtn">
-        <el-button :headers="$getElUploadHeaders()" style="float: left"
+        <el-button :headers="$getElUploadHeaders()"
+                   style="float: left"
                   class="diy-button--export"
                   size="small"
                   @click="handleExportModule">下载房屋模板</el-button>
@ -196,7 +197,8 @@
               top="5vh"
               class="dialog-h"
               @closed="detailFormCancle">
-      <room-detail ref="ref_form_detail"></room-detail>
+      <room-detail ref="ref_form_detail"
+                   @diaDetailClose="detailFormCancle"></room-detail>
    </el-dialog>

    <baobiao ref="baobiao" />
--- a/src/views/modules/base/huji/chusheng/cpts/detail.vue
+++ b/src/views/modules/base/huji/chusheng/cpts/detail.vue
@ -71,7 +71,11 @@
      </div>

    </div>
+    <div class="div-btn">
+      <el-button size="small"
+                 @click="handleCancle">关 闭</el-button>

+    </div>
  </div>
 </template>

@ -132,7 +136,11 @@ export default {

  methods: {

+    handleCancle () {
+
+      this.$emit('diaDetailClose')

+    },
    async initForm (row) {

      await this.getInfo(row.id);
--- a/src/views/modules/base/huji/chusheng/index.vue
+++ b/src/views/modules/base/huji/chusheng/index.vue
@ -168,7 +168,8 @@
                   class="diy-button--export"
                   size="small"
                   @click="handleExportModule('room')">下载模板</el-button>
-        <el-upload :headers="$getElUploadHeaders()" v-if="false"
+        <el-upload :headers="$getElUploadHeaders()"
+                   v-if="false"
                   ref="upload"
                   class="upload-btn"
                   action="uploadUlr"
@ -350,7 +351,9 @@
               top="5vh"
               class="dialog-h"
               @closed="detailFormCancle">
-      <detail-form ref="ref_form_detail"></detail-form>
+      <detail-form ref="ref_form_detail"
+                   @diaDetailClose="detailFormCancle"></detail-form>
+
    </el-dialog>
  </div>
 </template>
--- a/src/views/modules/base/huji/immigration/detail.vue
+++ b/src/views/modules/base/huji/immigration/detail.vue
@ -71,7 +71,11 @@
      </div>

    </div>
+    <div class="div-btn">
+      <el-button size="small"
+                 @click="handleCancle">关 闭</el-button>

+    </div>
  </div>
 </template>

@ -99,7 +103,11 @@ export default {
  },

  methods: {
+    handleCancle () {
+
+      this.$emit('diaDetailClose')

+    },
    async initForm (id) {

      await this.getDatail(id)
--- a/src/views/modules/base/huji/immigration/index.vue
+++ b/src/views/modules/base/huji/immigration/index.vue
@ -357,7 +357,8 @@
               class="dialog-h"
               @closed="detailFormCancle">
      <detail-form v-if="detailShow"
-                   ref="ref_form_detail"></detail-form>
+                   ref="ref_form_detail"
+                   @diaDetailClose="detailFormCancle"></detail-form>
    </el-dialog>
  </div>
 </template>
--- a/src/views/modules/communityParty/elegant/detail.vue
+++ b/src/views/modules/communityParty/elegant/detail.vue
@ -43,7 +43,11 @@
      </div>

    </div>
+    <div class="div-btn">
+      <el-button size="small"
+                 @click="handleCancle">关 闭</el-button>

+    </div>
  </div>
 </template>

@ -73,6 +77,11 @@ export default {
  },

  methods: {
+    handleCancle () {
+
+      this.$emit('diaDetailClose')
+
+    },

    async initForm (row) {

--- a/src/views/modules/communityParty/elegant/index.vue
+++ b/src/views/modules/communityParty/elegant/index.vue
@ -290,7 +290,8 @@
               top="5vh"
               class="dialog-h"
               @closed="detailFormCancle">
-      <detail-form ref="ref_form_detail"></detail-form>
+      <detail-form ref="ref_form_detail"
+                   @diaDetailClose="detailFormCancle"></detail-form>
    </el-dialog>

  </div>
--- a/src/views/modules/communityParty/heart/heartDetail.vue
+++ b/src/views/modules/communityParty/heart/heartDetail.vue
@ -171,7 +171,11 @@
      </div>

    </div>
+    <div class="div-btn">
+      <el-button size="small"
+                 @click="handleCancle">关 闭</el-button>

+    </div>
  </div>
 </template>

@ -435,8 +439,8 @@ export default {

    handleCancle () {

-      this.resetData()
-      this.$emit('dialogCancle')
+
+      this.$emit('diaDetailClose')

    },

--- a/src/views/modules/communityParty/heart/heartList.vue
+++ b/src/views/modules/communityParty/heart/heartList.vue
@ -243,7 +243,8 @@
               top="5vh"
               class="dialog-h"
               @closed="detailFormCancle">
-      <heart-detail ref="ref_form_detail"></heart-detail>
+      <heart-detail ref="ref_form_detail"
+                    @diaDetailClose="detailFormCancle"></heart-detail>
    </el-dialog>

    <!-- 活动取消原因 -->
--- a/src/views/modules/communityParty/members/detailForm.vue
+++ b/src/views/modules/communityParty/members/detailForm.vue
@ -1,109 +1,116 @@
 <template>
-  <div class="dialog-h-content scroll-h pd0">
-    <div class="div-tip">本模块主要为添加非本社区居住党员，本社区居住党员建议到居民信息页面添加</div>
-
-    <div v-if="initLoading"
-         class="m-row">
-      <div class="m-row-2">
-        <div class="info-prop">
-          <span class="info-title-2">所属党组织：</span>
-          <span>{{ info.orgName }}</span>
+  <div>
+    <div class="dialog-h-content scroll-h pd0">
+      <div class="div-tip">本模块主要为添加非本社区居住党员，本社区居住党员建议到居民信息页面添加</div>
+
+      <div v-if="initLoading"
+           class="m-row">
+        <div class="m-row-2">
+          <div class="info-prop">
+            <span class="info-title-2">所属党组织：</span>
+            <span>{{ info.orgName }}</span>
+          </div>
+
+          <div class="info-prop">
+            <span class="info-title-2">党员中心户：</span>
+            <span>{{ info.isDyzxh==='1'?'是':'否' }}</span>
+          </div>
        </div>

-        <div class="info-prop">
-          <span class="info-title-2">党员中心户：</span>
-          <span>{{ info.isDyzxh==='1'?'是':'否' }}</span>
-        </div>
-      </div>
-
-      <div class="m-row-2">
+        <div class="m-row-2">

-        <div class="info-prop">
-          <span class="info-title-2">姓名：</span>
-          <span>{{ info.name}}</span>
-        </div>
+          <div class="info-prop">
+            <span class="info-title-2">姓名：</span>
+            <span>{{ info.name}}</span>
+          </div>

-        <div class="info-prop">
-          <span class="info-title-2">免学习：</span>
-          <span>{{info.isMxx==='1'?'是':'否'}}</span>
+          <div class="info-prop">
+            <span class="info-title-2">免学习：</span>
+            <span>{{info.isMxx==='1'?'是':'否'}}</span>
+          </div>
        </div>
-      </div>

-      <div class="m-row-2">
+        <div class="m-row-2">

-        <div class="info-prop">
-          <span class="info-title-2">手机号：</span>
-          <span>{{ info.mobile?info.mobile:'--'}}</span>
-        </div>
-        <div class="info-prop">
-          <span class="info-title-2">职务：</span>
-          <span>{{info.partyZwShow?info.partyZwShow:'--' }}</span>
+          <div class="info-prop">
+            <span class="info-title-2">手机号：</span>
+            <span>{{ info.mobile?info.mobile:'--'}}</span>
+          </div>
+          <div class="info-prop">
+            <span class="info-title-2">职务：</span>
+            <span>{{info.partyZwShow?info.partyZwShow:'--' }}</span>
+          </div>
        </div>
-      </div>

-      <div class="m-row-2">
+        <div class="m-row-2">

-        <div class="info-prop">
-          <span class="info-title-2">身份证：</span>
-          <span>{{ info.idCard?info.idCard:'--' }}</span>
-        </div>
-        <div class="info-prop">
-          <span class="info-title-2">文化程度：</span>
-          <span>{{ info.cultureName?info.cultureName:'--' }}</span>
+          <div class="info-prop">
+            <span class="info-title-2">身份证：</span>
+            <span>{{ info.idCard?info.idCard:'--' }}</span>
+          </div>
+          <div class="info-prop">
+            <span class="info-title-2">文化程度：</span>
+            <span>{{ info.cultureName?info.cultureName:'--' }}</span>
+          </div>
        </div>
-      </div>

-      <div class="m-row-2">
+        <div class="m-row-2">

-        <div class="info-prop">
-          <span class="info-title-2">地址：</span>
-          <span>{{ info.address?info.address:'--' }}</span>
+          <div class="info-prop">
+            <span class="info-title-2">地址：</span>
+            <span>{{ info.address?info.address:'--' }}</span>
+          </div>
+          <div class="info-prop">
+            <span class="info-title-2">入党时间：</span>
+            <span>{{ info.rdsj?info.rdsj:'--' }}</span>
+          </div>
        </div>
-        <div class="info-prop">
-          <span class="info-title-2">入党时间：</span>
-          <span>{{ info.rdsj?info.rdsj:'--' }}</span>
-        </div>
-      </div>

-      <div class="m-row-2">
+        <div class="m-row-2">

-        <div class="info-prop">
-          <span class="info-title-2">流动党员：</span>
-          <span>{{ info.isLd==='1'?'是':'否'}}</span>
-        </div>
-        <div class="info-prop">
-          <span class="info-title-2">流动党员号：</span>
-          <span>{{ info.ldzh?info.ldzh:'--' }}</span>
+          <div class="info-prop">
+            <span class="info-title-2">流动党员：</span>
+            <span>{{ info.isLd==='1'?'是':'否'}}</span>
+          </div>
+          <div class="info-prop">
+            <span class="info-title-2">流动党员号：</span>
+            <span>{{ info.ldzh?info.ldzh:'--' }}</span>
+
+          </div>

        </div>

-      </div>
+        <div class="m-row-2">

-      <div class="m-row-2">
+          <div class="info-prop">
+            <span class="info-title-2">备注：</span>
+            <span>{{ info.remark? info.remark:'--'  }}</span>
+          </div>

-        <div class="info-prop">
-          <span class="info-title-2">备注：</span>
-          <span>{{ info.remark? info.remark:'--'  }}</span>
        </div>
-
      </div>
-    </div>

-    <div class="pdl40">
-      <el-tabs v-model="activesName">
-        <el-tab-pane label="量化积分"
-                     name="first">
-          <pointsDetail :partyId="partymenberid" />
-        </el-tab-pane>
-        <el-tab-pane label="缴费记录"
-                     name="second">
-          <record :partyId="partymenberid"
-                  :disabled="disabled" />
-        </el-tab-pane>
-      </el-tabs>
+      <div class="pdl40">
+        <el-tabs v-model="activesName">
+          <el-tab-pane label="量化积分"
+                       name="first">
+            <pointsDetail :partyId="partymenberid" />
+          </el-tab-pane>
+          <el-tab-pane label="缴费记录"
+                       name="second">
+            <record :partyId="partymenberid"
+                    :disabled="disabled" />
+          </el-tab-pane>
+        </el-tabs>
+
+      </div>

    </div>
+    <div class="div-btn">
+      <el-button size="small"
+                 @click="handleCancle">关 闭</el-button>

+    </div>
  </div>
 </template>

@ -187,7 +194,11 @@ export default {
    // this.$refs['ruleForm'].resetFields()
  },
  methods: {
+    handleCancle () {

+      this.$emit('diaDetailClose')
+
+    },
    async saveRecord (form) {
      const params = {
        ...form,
--- a/src/views/modules/communityParty/members/index.vue
+++ b/src/views/modules/communityParty/members/index.vue
@ -335,7 +335,8 @@
      <detail-form v-if="detailShow"
                   :info="detailInfo"
                   :partyList="optionsG"
-                   :disabled="disabled" />
+                   :disabled="disabled"
+                   @diaDetailClose="handlerCancle" />
    </el-dialog>

  </div>
--- a/src/views/modules/communityParty/orgActivity/activivityList/activivityList.vue
+++ b/src/views/modules/communityParty/orgActivity/activivityList/activivityList.vue
@ -265,7 +265,8 @@
               @closed="detailShow = false">
      <detail-activity ref="ref_add_form"
                       :formType="formType"
-                       :icPartyActId="icPartyActId"></detail-activity>
+                       :icPartyActId="icPartyActId"
+                       @diaDetailClose="detailShow = false"></detail-activity>
    </el-dialog>
    <el-dialog v-if="showSchedule"
               :visible.sync="showSchedule"
--- a/src/views/modules/communityParty/orgActivity/activivityList/detailActivity.vue
+++ b/src/views/modules/communityParty/orgActivity/activivityList/detailActivity.vue
@ -50,7 +50,7 @@
          </div>
          <div class="info-prop">
            <span class="info-title-3">附件：</span>
-            <file-list v-if="formData.attachmentList.length>0"
+            <file-list v-if="formData.attachmentList&&formData.attachmentList.length>0"
                       :fileList="formData.attachmentList"></file-list>
            <span v-else>--</span>

@ -60,7 +60,11 @@
      </div>

    </div>
+    <div class="div-btn">
+      <el-button size="small"
+                 @click="handleCancle">关 闭</el-button>

+    </div>
  </div>
 </template>

@ -275,8 +279,8 @@ export default {

    },
    handleCancle () {
-      this.resetData()
-      this.$emit('handleClose')
+
+      this.$emit('diaDetailClose')

    },

--- a/src/views/modules/communityParty/regionalParty/activitys.vue
+++ b/src/views/modules/communityParty/regionalParty/activitys.vue
@ -245,7 +245,7 @@
      <activitys-detail ref="ref_detail"
                        :serviceList="serviceList"
                        :gridList="gridList"
-                        @diaClose="diaClose"></activitys-detail>
+                        @diaDetailClose="detailClosed"></activitys-detail>
    </el-dialog>

  </div>
--- a/src/views/modules/communityParty/regionalParty/activitysDetail.vue
+++ b/src/views/modules/communityParty/regionalParty/activitysDetail.vue
@ -58,11 +58,11 @@

    </div>

-    <!-- <div class="div-btn">
+    <div class="div-btn">
      <el-button size="small"
                 @click="handleCancle">关 闭</el-button>

-    </div> -->
+    </div>

  </div>
 </template>
@ -94,7 +94,7 @@ export default {

    handleCancle () {
      this.diaDestroy()
-      this.$emit('diaClose')
+      this.$emit('diaDetailClose')

    },

--- a/src/views/modules/communityParty/stas/index.vue
+++ b/src/views/modules/communityParty/stas/index.vue
@ -4,23 +4,24 @@
      <el-form :inline="true"
               :model="form"
               ref="ref_searchform"
-               :label-width="'100px'">
+               :label-width="'110px'">
        <div>
-          <el-form-item prop="mySelectOrg" label-width="130px" label="参加活动党组织">
-            <el-cascader
-                    class="list_item_width_1"
-                    v-model="joinOrgIds"
-                    size="small"
-                    :options="orgList"
-                    placeholder="请选择党组织"
-                    :props="{
+          <el-form-item prop="mySelectOrg"
+                        label-width="130px"
+                        label="参加活动党组织">
+            <el-cascader class="list_item_width_1"
+                         v-model="joinOrgIds"
+                         size="small"
+                         :options="orgList"
+                         placeholder="请选择党组织"
+                         :props="{
                      checkStrictly: true,
                      label: 'partyOrgName',
                      value: 'id',
                      children: 'children'
                    }"
-                    @change="handleChangeOrg"
-                    clearable/>
+                         @change="handleChangeOrg"
+                         clearable />
          </el-form-item>
          <el-form-item label="活动开始时间"
                        prop="serviceTimeArea">
@ -47,10 +48,10 @@
    </div>
    <div class="div_table">
      <div class="div_btn">
-      <el-button style="margin-left:10px"
-                 class="diy-button--reset"
-                 size="small"
-                 @click="handleExport">导出</el-button>
+        <el-button style="margin-left:10px"
+                   class="diy-button--reset"
+                   size="small"
+                   @click="handleExport">导出</el-button>
      </div>
      <el-table class="table"
                :data="tableData"
@ -74,43 +75,37 @@
        <el-table-column prop="dydhNum"
                         header-align="center"
                         align="center"
-                         label="支部党员大会(次)"
-                         >
+                         label="支部党员大会(次)">
        </el-table-column>
        <el-table-column prop="wyhNum"
                         header-align="center"
                         align="center"
                         label="支部委员会(次)"
-                         show-overflow-tooltip
-                         >
+                         show-overflow-tooltip>
        </el-table-column>
        <el-table-column prop="dxzhNum"
                         header-align="center"
                         show-overflow-tooltip
                         align="center"
-                         label="党小组会(次)"
-                         >
+                         label="党小组会(次)">
        </el-table-column>
        <el-table-column prop="dkNum"
                         header-align="center"
                         align="center"
                         show-overflow-tooltip
-                         label="党课(次)"
-                         >
+                         label="党课(次)">
        </el-table-column>
        <el-table-column prop="ztdrNum"
                         header-align="center"
                         align="center"
                         show-overflow-tooltip
-                         label="主题党日(次)"
-                         >
+                         label="主题党日(次)">
        </el-table-column>
        <el-table-column prop="wmfwNum"
                         header-align="center"
                         align="center"
                         show-overflow-tooltip
-                         label="为民服务活动(次)"
-                         >
+                         label="为民服务活动(次)">
        </el-table-column>
      </el-table>
    </div>
@ -168,25 +163,25 @@ export default {
        this.form.joinOrgId = ''
      }
    },
-    getOrgList() {
+    getOrgList () {
      return this.$http
-          .get('/resi/partymember/icPartyOrg/getSearchTreelist', {
-            params: { agencyId: localStorage.getItem('agencyId') }
-          })
-          .then(({ data: res }) => {
-            if (res.code !== 0) {
-              return this.$message.error(res.msg)
-            }else {
-              this.orgList = this.deepArrTOnull(res.data)
-            }
-          }).catch(() => {return this.$message.error("网络错误");})
+        .get('/resi/partymember/icPartyOrg/getSearchTreelist', {
+          params: { agencyId: localStorage.getItem('agencyId') }
+        })
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          } else {
+            this.orgList = this.deepArrTOnull(res.data)
+          }
+        }).catch(() => { return this.$message.error("网络错误"); })
    },
-    deepArrTOnull(arr) {
+    deepArrTOnull (arr) {
      let a = []
      a = arr.map(item => {
        return {
          ...item,
-          children: (item.children.length > 0 && this.deepArrTOnull(item.children) )|| null
+          children: (item.children.length > 0 && this.deepArrTOnull(item.children)) || null
        }
      })
      return a
@ -196,17 +191,17 @@ export default {
      if (Array.isArray(this.serviceTimeArea) && this.serviceTimeArea.length > 0) {
        this.form.startTime = this.serviceTimeArea[0];
        this.form.endTime = this.serviceTimeArea[1];
-      }else {
+      } else {
        this.form.startTime = '';
        this.form.endTime = '';
      }

-      if (this.form.joinOrgId === '' || this.form.joinOrgId === null || this.form.joinOrgId === undefined){
+      if (this.form.joinOrgId === '' || this.form.joinOrgId === null || this.form.joinOrgId === undefined) {
        let a = this.orgList[0]
        this.form.joinOrgId = a.id;
        this.joinOrgIds = this.form.joinOrgId
-      }else {
-        if (Array.isArray(this.joinOrgIds)){
+      } else {
+        if (Array.isArray(this.joinOrgIds)) {
          this.form.joinOrgId = this.joinOrgIds[this.joinOrgIds.length - 1];
        }
      }
--- a/src/views/modules/communityService/fuwujilu/detailForm.vue
+++ b/src/views/modules/communityService/fuwujilu/detailForm.vue
@ -100,15 +100,11 @@

    </div>

-    <!-- <div class="div_btn">
+    <div class="div-btn">
      <el-button size="small"
-                 @click="handleCancle">取 消</el-button>
-      <el-button size="small"
-                 v-if="formType != 'detail'"
-                 type="primary"
-                 :disabled="btnDisable"
-                 @click="handleComfirm">确 定</el-button>
-    </div> -->
+                 @click="handleCancle">关 闭</el-button>
+
+    </div>

    <el-dialog v-if="showPersonList"
               :visible.sync="showPersonList"
@ -318,7 +314,7 @@ export default {

    handleCancle () {
      this.resetData()
-      this.$emit('handleClose')
+      this.$emit('diaDetailClose')

    },

--- a/src/views/modules/communityService/fuwujilu/fuwuList.vue
+++ b/src/views/modules/communityService/fuwujilu/fuwuList.vue
@ -278,7 +278,8 @@
                   :serviceRecordId="serviceRecordId"
                   :serviceOrgName="serviceOrgName"
                   :satisfyArray="satisfyArray"
-                   :statusArray="statusArray">
+                   :statusArray="statusArray"
+                   @diaDetailClose="diaDetailClose">
      </detail-form>
    </el-dialog>
    <el-dialog v-if="showPersonList"
--- a/src/views/modules/communityService/fuwuxiangmu/cpts/detail.vue
+++ b/src/views/modules/communityService/fuwuxiangmu/cpts/detail.vue
@ -42,7 +42,11 @@
      </div>

    </div>
+    <div class="div-btn">
+      <el-button size="small"
+                 @click="handleCancle">关 闭</el-button>

+    </div>
  </div>
 </template>

@ -145,7 +149,7 @@ export default {


    handleCancle () {
-      this.$emit("close");
+      this.$emit("diaDetailClose");
    },
  },
 };
--- a/src/views/modules/communityService/fuwuxiangmu/index.vue
+++ b/src/views/modules/communityService/fuwuxiangmu/index.vue
@ -187,7 +187,8 @@
               class="dialog-h"
               @closed="handleClose">
      <detail-form ref="ref_form_detail"
-                   :formId="formId"></detail-form>
+                   :formId="formId"
+                   @diaDetailClose="handleClose"></detail-form>
    </el-dialog>
  </div>
 </template>
--- a/src/views/modules/communityService/fuwuzuzhi/cpts/detail.vue
+++ b/src/views/modules/communityService/fuwuzuzhi/cpts/detail.vue
@ -53,17 +53,11 @@

    </div>

-    <!-- <div class="div_btn resi-btns">
-      <el-button size="small" @click="handleCancle">取 消</el-button>
-      <el-button
-        v-if="formType != 'watch'"
-        type="primary"
-        size="small"
-        :disabled="btnDisable"
-        @click="handleComfirm"
-        >确 定</el-button
-      >
-    </div> -->
+    <div class="div-btn">
+      <el-button size="small"
+                 @click="handleCancle">关 闭</el-button>
+
+    </div>
  </div>
 </template>

@ -112,6 +106,17 @@ export default {
  },

  methods: {
+    handleCancle () {
+      this.diaDestroy()
+      this.$emit('diaDetailClose')
+
+    },
+
+    diaDestroy () {
+      if (map) {
+        map.destroy()
+      }
+    },
    async initForm () {

      this.startLoading()
@ -258,9 +263,7 @@ export default {
    },


-    handleCancle () {
-      this.$emit("close");
-    },
+
    // 开启加载动画
    startLoading () {
      loading = Loading.service({
--- a/src/views/modules/communityService/fuwuzuzhi/index.vue
+++ b/src/views/modules/communityService/fuwuzuzhi/index.vue
@ -193,7 +193,8 @@
               class="dialog-h"
               @closed="diaDetailClose">
      <detail-form ref="ref_detail"
-                   :formId="formId"></detail-form>
+                   :formId="formId"
+                   @diaDetailClose="diaDetailClose"></detail-form>
    </el-dialog>
  </div>
 </template>
--- a/src/views/modules/communityService/measure/detail.vue
+++ b/src/views/modules/communityService/measure/detail.vue
@ -86,7 +86,11 @@

      </div>
    </div>
+    <div class="div-btn">
+      <el-button size="small"
+                 @click="handleCancle">关 闭</el-button>

+    </div>
  </div>
 </template>

@ -123,6 +127,11 @@ export default {
  },

  methods: {
+    handleCancle () {
+
+      this.$emit('diaDetailClose')
+
+    },
    initForm (row) {
      this.dataForm = JSON.parse(JSON.stringify(row))
      console.log(' this.dataForm', this.dataForm)
--- a/src/views/modules/communityService/measure/index.vue
+++ b/src/views/modules/communityService/measure/index.vue
@ -507,7 +507,8 @@
               class="dialog-h"
               :close-on-click-modal="false"
               :before-close="detailFormCancle">
-      <detail ref="ref_form_detail"></detail>
+      <detail ref="ref_form_detail"
+              @diaDetailClose="detailFormCancle"></detail>
    </el-dialog>
  </div>
 </template>
@ -959,7 +960,7 @@ export default {
    },
    async handleLook (row, type) {
      this.detailShow = true
-      console.log('row',row)
+      console.log('row', row)
      this.$nextTick(() => {
        this.$refs.ref_form_detail.initForm(row)
      })
--- a/src/views/modules/communityService/ninePlaces/inspect/inspect.vue
+++ b/src/views/modules/communityService/ninePlaces/inspect/inspect.vue
@ -253,7 +253,7 @@
                      :gridList="gridList"
                      :resultList="resultList"
                      :placeTypeList="placeTypeList"
-                      @dialogCancle="addFormCancle"></inspect-detail>
+                      @diaDetailClose="diaDetailClose"></inspect-detail>
    </el-dialog>

    <!-- 复查记录弹出框 -->
--- a/src/views/modules/communityService/ninePlaces/inspect/inspectDetail.vue
+++ b/src/views/modules/communityService/ninePlaces/inspect/inspectDetail.vue
@ -1,61 +1,59 @@
 <template>
+  <div>
+    <div class="dialog-h-content scroll-h">
+      <div v-if="initLoading"
+           class="m-row">
+        <div class="m-info">
+          <div class="info-prop">
+            <span class="info-title-4">场所区域：</span>
+            <span>{{ formData.gridName||'--'  }}</span>
+          </div>
+
+          <div class="info-prop">
+            <span class="info-title-4">场所类型：</span>
+            <span>{{ formData.placeOrgName||'--' }}</span>
+          </div>
+
+          <div class="info-prop">
+            <span class="info-title-4">场所名称：</span>
+            <span>{{ formData.ninePlaceName||'--'}}</span>
+          </div>
+
+          <div class="info-prop">
+            <span class="info-title-4">分队名称：</span>
+            <span>{{ formData.placePatrolTeamName||'--'  }}</span>
+          </div>
+          <div class="info-prop">
+            <span class="info-title-4">检查人员：</span>
+            <span>{{ formData.inspectorsNames||'--'  }}</span>
+          </div>
+          <div class="info-prop">
+            <span class="info-title-4">首次巡查时间：</span>
+            <span>{{ formData.firstTime||'--'  }}</span>
+          </div>
+          <div class="info-prop">
+            <span class="info-title-4">隐患明细：</span>
+            <span>{{ formData.detailed||'--'  }}</span>
+          </div>
+          <div class="info-prop">
+            <span class="info-title-4">首次检查结论：</span>
+            <span>{{ formData.firstResult==='0'?'合格':'不合格'  }}</span>
+          </div>
+          <div class="info-prop">
+            <span class="info-title-4">拟复查时间：</span>
+            <span>{{ formData.reviewTime||'--'  }}</span>
+          </div>

-  <div class="dialog-h-content scroll-h">
-    <div v-if="initLoading"
-         class="m-row">
-      <div class="m-info">
-        <div class="info-prop">
-          <span class="info-title-4">场所区域：</span>
-          <span>{{ formData.gridName||'--'  }}</span>
-        </div>
-
-        <div class="info-prop">
-          <span class="info-title-4">场所类型：</span>
-          <span>{{ formData.placeOrgName||'--' }}</span>
-        </div>
-
-        <div class="info-prop">
-          <span class="info-title-4">场所名称：</span>
-          <span>{{ formData.ninePlaceName||'--'}}</span>
-        </div>
-
-        <div class="info-prop">
-          <span class="info-title-4">分队名称：</span>
-          <span>{{ formData.placePatrolTeamName||'--'  }}</span>
-        </div>
-        <div class="info-prop">
-          <span class="info-title-4">检查人员：</span>
-          <span>{{ formData.inspectorsNames||'--'  }}</span>
-        </div>
-        <div class="info-prop">
-          <span class="info-title-4">首次巡查时间：</span>
-          <span>{{ formData.firstTime||'--'  }}</span>
-        </div>
-        <div class="info-prop">
-          <span class="info-title-4">隐患明细：</span>
-          <span>{{ formData.detailed||'--'  }}</span>
-        </div>
-        <div class="info-prop">
-          <span class="info-title-4">首次检查结论：</span>
-          <span>{{ formData.firstResult==='0'?'合格':'不合格'  }}</span>
-        </div>
-        <div class="info-prop">
-          <span class="info-title-4">拟复查时间：</span>
-          <span>{{ formData.reviewTime||'--'  }}</span>
        </div>

      </div>

    </div>
-    <!-- <div class="div_btn">
+    <div class="div-btn">
      <el-button size="small"
-                 @click="handleCancle">取 消</el-button>
-      <el-button size="small"
-                 v-if="formType != 'detail'"
-                 type="primary"
-                 :disabled="btnDisable"
-                 @click="handleComfirm">确 定</el-button>
-    </div> -->
+                 @click="handleCancle">关 闭</el-button>
+
+    </div>
  </div>
 </template>

@ -138,7 +136,7 @@ export default {
    handleCancle () {

      this.resetData()
-      this.$emit('dialogCancle')
+      this.$emit('diaDetailClose')

    },

--- a/src/views/modules/communityService/ninePlaces/places/places.vue
+++ b/src/views/modules/communityService/ninePlaces/places/places.vue
@ -208,7 +208,7 @@
                     :agencyId="agencyId"
                     :scaleList="scaleList"
                     :placeTypeList="placeTypeList"
-                     @dialogCancle="addFormCancle"></places-detail>
+                     @diaDetailClose="diaDetailClose"></places-detail>
    </el-dialog>

  </div>
--- a/src/views/modules/communityService/ninePlaces/places/placesDetail.vue
+++ b/src/views/modules/communityService/ninePlaces/places/placesDetail.vue
@ -40,15 +40,11 @@
      </div>

    </div>
-    <!-- <div class="div_btn">
+    <div class="div-btn">
      <el-button size="small"
-                 @click="handleCancle">取 消</el-button>
-      <el-button size="small"
-                 v-if="formType != 'detail'"
-                 type="primary"
-                 :disabled="btnDisable"
-                 @click="handleComfirm">确 定</el-button>
-    </div> -->
+                 @click="handleCancle">关 闭</el-button>
+
+    </div>
  </div>
 </template>

@ -142,8 +138,8 @@ export default {

    handleCancle () {

-      this.resetData()
-      this.$emit('dialogCancle')
+
+      this.$emit('diaDetailClose')

    },

--- a/src/views/modules/communityService/ninePlaces/team/team.vue
+++ b/src/views/modules/communityService/ninePlaces/team/team.vue
@ -196,7 +196,7 @@
      <team-detail ref="ref_detail"
                   :gridList="gridList"
                   :placeTypeList="placeTypeList"
-                   @dialogCancle="addFormCancle"></team-detail>
+                   @diaDetailClose="diaDetailClose"></team-detail>
    </el-dialog>

  </div>
@ -344,7 +344,7 @@ export default {
      // this.formTitle = '详情'
      this.detailShow = true
      this.$nextTick(() => {
-        this.$refs.ref_detail.initForm( row.teamId, this.agencyId)
+        this.$refs.ref_detail.initForm(row.teamId, this.agencyId)
      })
    },

--- a/src/views/modules/communityService/ninePlaces/team/teamDetail.vue
+++ b/src/views/modules/communityService/ninePlaces/team/teamDetail.vue
@ -51,15 +51,11 @@
      </div>

    </div>
-    <!-- <div class="div_btn">
+    <div class="div-btn">
      <el-button size="small"
-                 @click="handleCancle">取 消</el-button>
-      <el-button size="small"
-                 v-if="formType != 'detail'"
-                 type="primary"
-                 :disabled="btnDisable"
-                 @click="handleComfirm">确 定</el-button>
-    </div> -->
+                 @click="handleCancle">关 闭</el-button>
+
+    </div>
  </div>
 </template>

@ -256,8 +252,7 @@ export default {

    handleCancle () {

-      this.resetData()
-      this.$emit('dialogCancle')
+      this.$emit('diaDetailClose')

    },

--- a/src/views/modules/communityService/worklog/workLog.vue
+++ b/src/views/modules/communityService/worklog/workLog.vue
@ -258,7 +258,7 @@
               class="dialog-h"
               @closed="diaClose">
      <work-log-detail ref="ref_detail"
-                       @diaClose="diaClose"></work-log-detail>
+                       @diaDetailClose="diaClose"></work-log-detail>
    </el-dialog>

  </div>
--- a/src/views/modules/communityService/worklog/workLogDetail.vue
+++ b/src/views/modules/communityService/worklog/workLogDetail.vue
@ -50,7 +50,11 @@
      </div>

    </div>
+    <div class="div-btn">
+      <el-button size="small"
+                 @click="handleCancle">关 闭</el-button>

+    </div>
  </div>
 </template>

@ -74,7 +78,7 @@ export default {
  methods: {
    handleCancle () {

-      this.$emit('diaClose')
+      this.$emit('diaDetailClose')

    },

--- a/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue
+++ b/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue
@ -286,11 +286,36 @@
        </el-form-item>
        <br/>

-        <el-form-item label="合同附件" prop="fileList" label-width="140px">
+        <el-form-item label="合同照片" prop="fileList" label-width="140px">
          <template>
            <upload-image :defaultFileList="dataForm.fileList" :limit="6" @change="onChangeFileList"></upload-image>
          </template>
        </el-form-item>
+
+        <el-form-item label="合同附件" label-width="140px">
+          <template>
+            <el-upload
+              class="upload-demo"
+              multiple
+              :action="uploadUrl"
+              :data="{ customerId: customerId }"
+              :limit="limit"
+              :headers="$getElUploadHeaders()"
+              :on-success="(res, file) => handleFlieSuccess(res, file)"
+              :on-error="(res, file) => handleFlieError(res, file)"
+              :on-remove="(res) => handleFlieRemove(res)"
+              :on-exceed="(res) => handleFlieExceed(res)"
+              :before-upload="(file) => beforeFlieUpload(file)"
+              :on-preview="handlePreview"
+              :file-list="dataForm.docList">
+              <el-button size="small" type="primary">点击上传</el-button>
+              <div slot="tip" class="el-upload__tip">只能上传合同文件</div>
+            </el-upload>
+          </template>
+        </el-form-item>
+
+
+
      </el-form>
    <template slot="footer">
        <div class="resi-btns">
@ -355,7 +380,8 @@ export default {
          idCardImgList: [],
          unit: ''
        }],
-        fileList: []
+        fileList: [],
+        docList: []
      },
      zzmmOptions: [
        { name: '党员', value: '党员' },
@ -391,7 +417,10 @@ export default {
        buildingOptions: [],
        unitOptions: [],
        houseOptions: [],
-        agencyOptions: []
+        agencyOptions: [],
+        uploadUrl: `${window.SITE_CONFIG['apiURL']}/oss/file/uploadqrcodeV2`,
+        customerId: localStorage.getItem("customerId"),
+        limit: 3
    }
  },
  computed: {
@ -537,6 +566,7 @@ export default {
          unit: ''
        }],
        fileList: [],
+        docList: [],
        agencyImgList: []
      }
    },
@ -866,6 +896,43 @@ export default {
        this.editModeGetList()
      }).catch(() => {})
    },
+    handleFlieSuccess(res, file) {
+        if (res.code === 0 && res.msg === "success") {
+            let ob = {
+              fileType: '0',
+              fileUrl: file.response.data.url,
+              name: file.response.data.fileName
+            }
+            this.dataForm.docList.push(ob)
+        } else {
+            this.$message.error(res.msg)
+        }
+    },
+    handleFlieError(res, file) {
+        console.log(res)
+    },
+    handleFlieRemove(res) {
+      // console.log(JSON.stringify(res))
+        const delFile = res.fileUrl
+        this.dataForm.docList.forEach((item, key) => {
+            if (delFile == item.fileUrl) {
+              this.dataForm.docList.splice(key, 1)
+            }
+        })
+    },
+    handleFlieExceed(res) {
+        this.$message({
+          type: "warning",
+          message: `文件数量最多不超过${this.limit}个`,
+        })
+    },
+    beforeFlieUpload(file) {
+        console.log(file)
+    },
+    handlePreview(file) {
+      window.open(file.fileUrl)
+      // console.log(JSON.stringify(file));
+    },
    // 表单提交
    dataFormSubmitHandle: debounce(function () {
      this.$refs['dataForm'].validate((valid) => {
@ -932,7 +999,9 @@ export default {
 }
 </style>
 <style lang="scss" scoped>
-
+    ::v-deep .el-upload-list__item.is-success.focusing .el-icon-close-tip {
+      display: none !important;
+    }
    .div_btn {
        display: flex;
        justify-content: flex-end;
--- a/src/views/modules/plugins/rent/rentcontractinfo-look-or-check.vue
+++ b/src/views/modules/plugins/rent/rentcontractinfo-look-or-check.vue
@ -117,13 +117,17 @@
        </el-form-item>
        <br/>

-        <el-form-item label="合同附件" prop="fileList">
+        <el-form-item label="合同照片" prop="fileList">
            <template>
                <label v-for="(item,index) in dataForm.fileList" :key="index">
                    <img :src="item.fileUrl" @click="imgShow(item.fileUrl)" width="100" height="100" />
                </label>
            </template>
        </el-form-item>
+
+        <el-form-item label="合同附件">
+            <label v-for="(item,index) in dataForm.docList" :key="index" @click="downFile(item.fileUrl)" class="file-l">{{ item.name }}</label>
+        </el-form-item>
        <el-form-item label="审核原因" prop="reason" v-if="dataForm.flag === '1' && dataForm.state === '2'">
            <el-input v-model="dataForm.reason" placeholder="审核原因" disabled></el-input>
        </el-form-item>
@ -184,7 +188,8 @@ export default {
          lesseeHouseAddress: '',
        signDate: '',
        startDate: '',
-        endDate: ''
+        endDate: '',
+        docList: [],
      },
        dataListLoading: false,
        dialogVisible: false,
@ -346,6 +351,9 @@ export default {
              })
          }).catch(() => {})
      },
+    downFile(fileUrl) {
+        window.open(fileUrl)
+    },
    // 表单提交
    dataFormSubmitHandle: debounce(function () {
      this.$refs['dataForm'].validate((valid) => {
@ -376,6 +384,11 @@ export default {
        margin-top: 20px;
        text-align: center;
    }
+    .file-l{
+      margin-right: 10px;
+      color: #3ebef7;
+      cursor: pointer;
+    }
 </style>
 <style lang="scss">
 .rent {
--- a/src/views/modules/plugins/rent/upload-image.vue
+++ b/src/views/modules/plugins/rent/upload-image.vue
@ -9,7 +9,8 @@
            :on-error="(res, file) => handleImgError(res, file)"
            :on-remove="(res) => handleImgRemove(res)"
            :on-exceed="(res) => handleImgExceed(res)"
-            :before-upload="(file) => beforeImgUpload(file)">
+            :before-upload="(file) => beforeImgUpload(file)"
+            accept="image/jpg,image/jpeg,image/png">
            <i slot="default" class="el-icon-plus"></i>
            <div slot="file" slot-scope="{file}">
                <img class="el-upload-list__item-thumbnail" :src="file.url" alt="">
--- a/src/views/modules/shequzhili/csgltc/csglDetail.vue
+++ b/src/views/modules/shequzhili/csgltc/csglDetail.vue
@ -48,11 +48,11 @@

        </div>
      </div>
-      <!-- <div class="div-btn">
+      <div class="div-btn">
        <el-button size="small"
                   @click="handleCancle">关 闭</el-button>

-      </div> -->
+      </div>
    </div>

  </div>
--- a/src/views/modules/shequzhili/ggfwtc/ggfwDetail.vue
+++ b/src/views/modules/shequzhili/ggfwtc/ggfwDetail.vue
@ -51,11 +51,11 @@
      </div>

    </div>
-    <!-- <div class="div_btn">
+    <div class="div-btn">
      <el-button size="small"
-                 @click="handleCancle">取 消</el-button>
+                 @click="handleCancle">关 闭</el-button>

-    </div> -->
+    </div>
  </div>
 </template>