Merge branch 'dev-detail-adjust0919'

3 years ago · 8a9e691d43
40 changed files with 350 additions and 259 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,8 +68,12 @@
      </div>

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

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

 <script>
@ -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,8 +61,12 @@
      </div>

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

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

 <script>
@ -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,8 +66,12 @@
      </div>

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

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

 <script>
@ -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,8 +71,12 @@
      </div>

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

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

 <script>
@ -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,8 +71,12 @@
      </div>

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

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

 <script>
@ -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,8 +43,12 @@
      </div>

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

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

 <script>
@ -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,8 +171,12 @@
      </div>

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

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

 <script>
@ -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,4 +1,5 @@
 <template>
+  <div>
    <div class="dialog-h-content scroll-h pd0">
      <div class="div-tip">本模块主要为添加非本社区居住党员，本社区居住党员建议到居民信息页面添加</div>

@ -105,6 +106,12 @@
      </div>

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

 <script>
@ -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,8 +60,12 @@
      </div>

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

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

 <script>
@ -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,11 +4,12 @@
      <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"
+          <el-form-item prop="mySelectOrg"
+                        label-width="130px"
+                        label="参加活动党组织">
+            <el-cascader class="list_item_width_1"
                         v-model="joinOrgIds"
                         size="small"
                         :options="orgList"
@ -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>
--- 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,8 +42,12 @@
      </div>

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

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

 <script>
@ -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,8 +86,12 @@

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

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

 <script>
@ -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>
--- 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,5 +1,5 @@
 <template>
-
+  <div>
    <div class="dialog-h-content scroll-h">
      <div v-if="initLoading"
           class="m-row">
@ -47,15 +47,13 @@
        </div>

      </div>
-    <!-- <div class="div_btn">
-      <el-button size="small"
-                 @click="handleCancle">取 消</el-button>
+
+    </div>
+    <div class="div-btn">
      <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>
--- 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,8 +50,12 @@
      </div>

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

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

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

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

    },

--- 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>