elink-star
/
epmet-oper-gov
12
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'dev-detail-adjust0919'

feature/account
jiangyy 3 years ago
parent
ad2004d499 a0619b7c0f
commit
8a9e691d43
40 changed files with 350 additions and 259 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      src/assets/scss/modules/management/detail-main.scss
  2. 9
      src/views/modules/base/community/buildDetail.vue
  3. 9
      src/views/modules/base/community/buildTable.vue
  4. 9
      src/views/modules/base/community/communityDetail.vue
  5. 12
      src/views/modules/base/community/communityTable.vue
  6. 8
      src/views/modules/base/community/roomDetail.vue
  7. 6
      src/views/modules/base/community/roomTable.vue
  8. 8
      src/views/modules/base/huji/chusheng/cpts/detail.vue
  9. 7
      src/views/modules/base/huji/chusheng/index.vue
  10. 8
      src/views/modules/base/huji/immigration/detail.vue
  11. 3
      src/views/modules/base/huji/immigration/index.vue
  12. 9
      src/views/modules/communityParty/elegant/detail.vue
  13. 3
      src/views/modules/communityParty/elegant/index.vue
  14. 8
      src/views/modules/communityParty/heart/heartDetail.vue
  15. 3
      src/views/modules/communityParty/heart/heartList.vue
  16. 167
      src/views/modules/communityParty/members/detailForm.vue
  17. 3
      src/views/modules/communityParty/members/index.vue
  18. 3
      src/views/modules/communityParty/orgActivity/activivityList/activivityList.vue
  19. 10
      src/views/modules/communityParty/orgActivity/activivityList/detailActivity.vue
  20. 2
      src/views/modules/communityParty/regionalParty/activitys.vue
  21. 6
      src/views/modules/communityParty/regionalParty/activitysDetail.vue
  22. 83
      src/views/modules/communityParty/stas/index.vue
  23. 14
      src/views/modules/communityService/fuwujilu/detailForm.vue
  24. 3
      src/views/modules/communityService/fuwujilu/fuwuList.vue
  25. 6
      src/views/modules/communityService/fuwuxiangmu/cpts/detail.vue
  26. 3
      src/views/modules/communityService/fuwuxiangmu/index.vue
  27. 31
      src/views/modules/communityService/fuwuzuzhi/cpts/detail.vue
  28. 3
      src/views/modules/communityService/fuwuzuzhi/index.vue
  29. 9
      src/views/modules/communityService/measure/detail.vue
  30. 5
      src/views/modules/communityService/measure/index.vue
  31. 2
      src/views/modules/communityService/ninePlaces/inspect/inspect.vue
  32. 100
      src/views/modules/communityService/ninePlaces/inspect/inspectDetail.vue
  33. 2
      src/views/modules/communityService/ninePlaces/places/places.vue
  34. 16
      src/views/modules/communityService/ninePlaces/places/placesDetail.vue
  35. 4
      src/views/modules/communityService/ninePlaces/team/team.vue
  36. 15
      src/views/modules/communityService/ninePlaces/team/teamDetail.vue
  37. 2
      src/views/modules/communityService/worklog/workLog.vue
  38. 6
      src/views/modules/communityService/worklog/workLogDetail.vue
  39. 4
      src/views/modules/shequzhili/csgltc/csglDetail.vue
  40. 6
      src/views/modules/shequzhili/ggfwtc/ggfwDetail.vue

2
src/assets/scss/modules/management/detail-main.scss
View File

@ -17,7 +17,7 @@
} }
.div-btn{ .div-btn{
margin-top:50px; margin-top:30px;
// margin-bottom:20px; // margin-bottom:20px;
display: flex; display: flex;
justify-content: center; justify-content: center;

9
src/views/modules/base/community/buildDetail.vue
View File

@ -68,7 +68,11 @@
</div> </div>
</div> </div>
<div class="div-btn">
<el-button size="small"
@click="handleCancle">关 闭</el-button>
</div>
</div> </div>
</template> </template>
@ -120,6 +124,11 @@ export default {
}, },
methods: { methods: {
handleCancle () {
this.diaDestroy()
this.$emit('diaDetailClose')
},
diaDestroy () { diaDestroy () {
if (map) { if (map) {
map.destroy() map.destroy()

9
src/views/modules/base/community/buildTable.vue
View File

@ -14,7 +14,8 @@
size="small" size="small"
@click="handleExportModule('building')">下载楼栋模板</el-button> @click="handleExportModule('building')">下载楼栋模板</el-button>
<el-upload :headers="$getElUploadHeaders()" style="" <el-upload :headers="$getElUploadHeaders()"
style=""
ref="upload_building" ref="upload_building"
:multiple='false' :multiple='false'
:show-file-list='false' :show-file-list='false'
@ -31,7 +32,8 @@
size="small" size="small"
@click="handleExportModule('room')">下载房屋模板</el-button> @click="handleExportModule('room')">下载房屋模板</el-button>
<el-upload :headers="$getElUploadHeaders()" style="" <el-upload :headers="$getElUploadHeaders()"
style=""
ref="upload_room" ref="upload_room"
:multiple='false' :multiple='false'
:show-file-list='false' :show-file-list='false'
@ -206,7 +208,8 @@
width="900px" width="900px"
class="dialog-h" class="dialog-h"
@closed="detailFormCancle"> @closed="detailFormCancle">
<build-detail ref="ref_form_detail"></build-detail> <build-detail ref="ref_form_detail"
@diaDetailClose="detailFormCancle"></build-detail>
</el-dialog> </el-dialog>
<baobiao ref="baobiao" /> <baobiao ref="baobiao" />

9
src/views/modules/base/community/communityDetail.vue
View File

@ -61,7 +61,11 @@
</div> </div>
</div> </div>
<div class="div-btn">
<el-button size="small"
@click="handleCancle">关 闭</el-button>
</div>
</div> </div>
</template> </template>
@ -106,6 +110,11 @@ export default {
}, },
methods: { methods: {
handleCancle () {
this.diaDestroy()
this.$emit('diaDetailClose')
},
diaDestroy () { diaDestroy () {
if (map) { if (map) {
map.destroy() map.destroy()

12
src/views/modules/base/community/communityTable.vue
View File

@ -26,7 +26,8 @@
size="small" size="small"
@click="handleExportModule('community')">下载小区模板</el-button> @click="handleExportModule('community')">下载小区模板</el-button>
<el-upload :headers="$getElUploadHeaders()" ref="upload_community" <el-upload :headers="$getElUploadHeaders()"
ref="upload_community"
style="" style=""
:multiple='false' :multiple='false'
:show-file-list='false' :show-file-list='false'
@ -44,7 +45,8 @@
size="small" size="small"
@click="handleExportModule('building')">下载楼栋模板</el-button> @click="handleExportModule('building')">下载楼栋模板</el-button>
<el-upload :headers="$getElUploadHeaders()" style="" <el-upload :headers="$getElUploadHeaders()"
style=""
ref="upload_building" ref="upload_building"
:multiple='false' :multiple='false'
:show-file-list='false' :show-file-list='false'
@ -61,7 +63,8 @@
size="small" size="small"
@click="handleExportModule('room')">下载房屋模板</el-button> @click="handleExportModule('room')">下载房屋模板</el-button>
<el-upload :headers="$getElUploadHeaders()" style="" <el-upload :headers="$getElUploadHeaders()"
style=""
ref="upload_room" ref="upload_room"
:multiple='false' :multiple='false'
:show-file-list='false' :show-file-list='false'
@ -193,7 +196,8 @@
top="5vh" top="5vh"
class="dialog-h" class="dialog-h"
@closed="detailFormCancle"> @closed="detailFormCancle">
<community-detail ref="ref_form_detail"></community-detail> <community-detail ref="ref_form_detail"
@diaDetailClose="detailFormCancle"></community-detail>
</el-dialog> </el-dialog>
<!-- 修改弹出框 --> <!-- 修改弹出框 -->

8
src/views/modules/base/community/roomDetail.vue
View File

@ -66,7 +66,11 @@
</div> </div>
</div> </div>
<div class="div-btn">
<el-button size="small"
@click="handleCancle">关 闭</el-button>
</div>
</div> </div>
</template> </template>
@ -117,7 +121,11 @@ export default {
}, },
methods: { methods: {
handleCancle () {
// this.diaDestroy()
this.$emit('diaDetailClose')
},
diaDestroy () { diaDestroy () {
if (map) { if (map) {
map.destroy() map.destroy()

6
src/views/modules/base/community/roomTable.vue
View File

@ -8,7 +8,8 @@
@click="handleAdd">新增房屋</el-button> @click="handleAdd">新增房屋</el-button>
<div class="btn_upload" <div class="btn_upload"
v-if="showImportBtn"> v-if="showImportBtn">
<el-button :headers="$getElUploadHeaders()" style="float: left" <el-button :headers="$getElUploadHeaders()"
style="float: left"
class="diy-button--export" class="diy-button--export"
size="small" size="small"
@click="handleExportModule">下载房屋模板</el-button> @click="handleExportModule">下载房屋模板</el-button>
@ -196,7 +197,8 @@
top="5vh" top="5vh"
class="dialog-h" class="dialog-h"
@closed="detailFormCancle"> @closed="detailFormCancle">
<room-detail ref="ref_form_detail"></room-detail> <room-detail ref="ref_form_detail"
@diaDetailClose="detailFormCancle"></room-detail>
</el-dialog> </el-dialog>
<baobiao ref="baobiao" /> <baobiao ref="baobiao" />

8
src/views/modules/base/huji/chusheng/cpts/detail.vue
View File

@ -71,7 +71,11 @@
</div> </div>
</div> </div>
<div class="div-btn">
<el-button size="small"
@click="handleCancle">关 闭</el-button>
</div>
</div> </div>
</template> </template>
@ -132,7 +136,11 @@ export default {
methods: { methods: {
handleCancle () {
this.$emit('diaDetailClose')
},
async initForm (row) { async initForm (row) {
await this.getInfo(row.id); await this.getInfo(row.id);

7
src/views/modules/base/huji/chusheng/index.vue
View File

@ -168,7 +168,8 @@
class="diy-button--export" class="diy-button--export"
size="small" size="small"
@click="handleExportModule('room')">下载模板</el-button> @click="handleExportModule('room')">下载模板</el-button>
<el-upload :headers="$getElUploadHeaders()" v-if="false" <el-upload :headers="$getElUploadHeaders()"
v-if="false"
ref="upload" ref="upload"
class="upload-btn" class="upload-btn"
action="uploadUlr" action="uploadUlr"
@ -350,7 +351,9 @@
top="5vh" top="5vh"
class="dialog-h" class="dialog-h"
@closed="detailFormCancle"> @closed="detailFormCancle">
<detail-form ref="ref_form_detail"></detail-form> <detail-form ref="ref_form_detail"
@diaDetailClose="detailFormCancle"></detail-form>
</el-dialog> </el-dialog>
</div> </div>
</template> </template>

8
src/views/modules/base/huji/immigration/detail.vue
View File

@ -71,7 +71,11 @@
</div> </div>
</div> </div>
<div class="div-btn">
<el-button size="small"
@click="handleCancle">关 闭</el-button>
</div>
</div> </div>
</template> </template>
@ -99,7 +103,11 @@ export default {
}, },
methods: { methods: {
handleCancle () {
this.$emit('diaDetailClose')
},
async initForm (id) { async initForm (id) {
await this.getDatail(id) await this.getDatail(id)

3
src/views/modules/base/huji/immigration/index.vue
View File

@ -357,7 +357,8 @@
class="dialog-h" class="dialog-h"
@closed="detailFormCancle"> @closed="detailFormCancle">
<detail-form v-if="detailShow" <detail-form v-if="detailShow"
ref="ref_form_detail"></detail-form> ref="ref_form_detail"
@diaDetailClose="detailFormCancle"></detail-form>
</el-dialog> </el-dialog>
</div> </div>
</template> </template>

9
src/views/modules/communityParty/elegant/detail.vue
View File

@ -43,7 +43,11 @@
</div> </div>
</div> </div>
<div class="div-btn">
<el-button size="small"
@click="handleCancle">关 闭</el-button>
</div>
</div> </div>
</template> </template>
@ -73,6 +77,11 @@ export default {
}, },
methods: { methods: {
handleCancle () {
this.$emit('diaDetailClose')
},
async initForm (row) { async initForm (row) {

3
src/views/modules/communityParty/elegant/index.vue
View File

@ -290,7 +290,8 @@
top="5vh" top="5vh"
class="dialog-h" class="dialog-h"
@closed="detailFormCancle"> @closed="detailFormCancle">
<detail-form ref="ref_form_detail"></detail-form> <detail-form ref="ref_form_detail"
@diaDetailClose="detailFormCancle"></detail-form>
</el-dialog> </el-dialog>
</div> </div>

8
src/views/modules/communityParty/heart/heartDetail.vue
View File

@ -171,7 +171,11 @@
</div> </div>
</div> </div>
<div class="div-btn">
<el-button size="small"
@click="handleCancle">关 闭</el-button>
</div>
</div> </div>
</template> </template>
@ -435,8 +439,8 @@ export default {
handleCancle () { handleCancle () {
this.resetData()
this.$emit('dialogCancle') this.$emit('diaDetailClose')
}, },

3
src/views/modules/communityParty/heart/heartList.vue
View File

@ -243,7 +243,8 @@
top="5vh" top="5vh"
class="dialog-h" class="dialog-h"
@closed="detailFormCancle"> @closed="detailFormCancle">
<heart-detail ref="ref_form_detail"></heart-detail> <heart-detail ref="ref_form_detail"
@diaDetailClose="detailFormCancle"></heart-detail>
</el-dialog> </el-dialog>
<!-- 活动取消原因 --> <!-- 活动取消原因 -->

167
src/views/modules/communityParty/members/detailForm.vue
View File

@ -1,109 +1,116 @@
<template> <template>
<div class="dialog-h-content scroll-h pd0"> <div>
<div class="div-tip">本模块主要为添加非本社区居住党员，本社区居住党员建议到居民信息页面添加</div> <div class="dialog-h-content scroll-h pd0">
<div class="div-tip">本模块主要为添加非本社区居住党员，本社区居住党员建议到居民信息页面添加</div>
<div v-if="initLoading"
class="m-row"> <div v-if="initLoading"
<div class="m-row-2"> class="m-row">
<div class="info-prop"> <div class="m-row-2">
<span class="info-title-2">所属党组织：</span> <div class="info-prop">
<span>{{ info.orgName }}</span> <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>
<div class="info-prop"> <div class="m-row-2">
<span class="info-title-2">党员中心户：</span>
<span>{{ info.isDyzxh==='1'?'是':'否' }}</span>
</div>
</div>
<div class="m-row-2">
<div class="info-prop"> <div class="info-prop">
<span class="info-title-2">姓名：</span> <span class="info-title-2">姓名：</span>
<span>{{ info.name}}</span> <span>{{ info.name}}</span>
</div> </div>
<div class="info-prop"> <div class="info-prop">
<span class="info-title-2">免学习：</span> <span class="info-title-2">免学习：</span>
<span>{{info.isMxx==='1'?'是':'否'}}</span> <span>{{info.isMxx==='1'?'是':'否'}}</span>
</div>
</div> </div>
</div>
<div class="m-row-2"> <div class="m-row-2">
<div class="info-prop"> <div class="info-prop">
<span class="info-title-2">手机号：</span> <span class="info-title-2">手机号：</span>
<span>{{ info.mobile?info.mobile:'--'}}</span> <span>{{ info.mobile?info.mobile:'--'}}</span>
</div> </div>
<div class="info-prop"> <div class="info-prop">
<span class="info-title-2">职务：</span> <span class="info-title-2">职务：</span>
<span>{{info.partyZwShow?info.partyZwShow:'--' }}</span> <span>{{info.partyZwShow?info.partyZwShow:'--' }}</span>
</div>
</div> </div>
</div>
<div class="m-row-2"> <div class="m-row-2">
<div class="info-prop"> <div class="info-prop">
<span class="info-title-2">身份证：</span> <span class="info-title-2">身份证：</span>
<span>{{ info.idCard?info.idCard:'--' }}</span> <span>{{ info.idCard?info.idCard:'--' }}</span>
</div> </div>
<div class="info-prop"> <div class="info-prop">
<span class="info-title-2">文化程度：</span> <span class="info-title-2">文化程度：</span>
<span>{{ info.cultureName?info.cultureName:'--' }}</span> <span>{{ info.cultureName?info.cultureName:'--' }}</span>
</div>
</div> </div>
</div>
<div class="m-row-2"> <div class="m-row-2">
<div class="info-prop"> <div class="info-prop">
<span class="info-title-2">地址：</span> <span class="info-title-2">地址：</span>
<span>{{ info.address?info.address:'--' }}</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>
<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"> <div class="info-prop">
<span class="info-title-2">流动党员：</span> <span class="info-title-2">流动党员：</span>
<span>{{ info.isLd==='1'?'是':'否'}}</span> <span>{{ info.isLd==='1'?'是':'否'}}</span>
</div> </div>
<div class="info-prop"> <div class="info-prop">
<span class="info-title-2">流动党员号：</span> <span class="info-title-2">流动党员号：</span>
<span>{{ info.ldzh?info.ldzh:'--' }}</span> <span>{{ info.ldzh?info.ldzh:'--' }}</span>
</div>
</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>
</div>
<div class="pdl40"> <div class="pdl40">
<el-tabs v-model="activesName"> <el-tabs v-model="activesName">
<el-tab-pane label="量化积分" <el-tab-pane label="量化积分"
name="first"> name="first">
<pointsDetail :partyId="partymenberid" /> <pointsDetail :partyId="partymenberid" />
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="缴费记录" <el-tab-pane label="缴费记录"
name="second"> name="second">
<record :partyId="partymenberid" <record :partyId="partymenberid"
:disabled="disabled" /> :disabled="disabled" />
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
</div>
</div> </div>
<div class="div-btn">
<el-button size="small"
@click="handleCancle">关 闭</el-button>
</div>
</div> </div>
</template> </template>
@ -187,7 +194,11 @@ export default {
// this.$refs['ruleForm'].resetFields() // this.$refs['ruleForm'].resetFields()
}, },
methods: { methods: {
handleCancle () {
this.$emit('diaDetailClose')
},
async saveRecord (form) { async saveRecord (form) {
const params = { const params = {
...form, ...form,

3
src/views/modules/communityParty/members/index.vue
View File

@ -335,7 +335,8 @@
<detail-form v-if="detailShow" <detail-form v-if="detailShow"
:info="detailInfo" :info="detailInfo"
:partyList="optionsG" :partyList="optionsG"
:disabled="disabled" /> :disabled="disabled"
@diaDetailClose="handlerCancle" />
</el-dialog> </el-dialog>
</div> </div>

3
src/views/modules/communityParty/orgActivity/activivityList/activivityList.vue
View File

@ -265,7 +265,8 @@
@closed="detailShow = false"> @closed="detailShow = false">
<detail-activity ref="ref_add_form" <detail-activity ref="ref_add_form"
:formType="formType" :formType="formType"
:icPartyActId="icPartyActId"></detail-activity> :icPartyActId="icPartyActId"
@diaDetailClose="detailShow = false"></detail-activity>
</el-dialog> </el-dialog>
<el-dialog v-if="showSchedule" <el-dialog v-if="showSchedule"
:visible.sync="showSchedule" :visible.sync="showSchedule"

10
src/views/modules/communityParty/orgActivity/activivityList/detailActivity.vue
View File

@ -50,7 +50,7 @@
</div> </div>
<div class="info-prop"> <div class="info-prop">
<span class="info-title-3">附件：</span> <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> :fileList="formData.attachmentList"></file-list>
<span v-else>--</span> <span v-else>--</span>
@ -60,7 +60,11 @@
</div> </div>
</div> </div>
<div class="div-btn">
<el-button size="small"
@click="handleCancle">关 闭</el-button>
</div>
</div> </div>
</template> </template>
@ -275,8 +279,8 @@ export default {
}, },
handleCancle () { handleCancle () {
this.resetData()
this.$emit('handleClose') this.$emit('diaDetailClose')
}, },

2
src/views/modules/communityParty/regionalParty/activitys.vue
View File

@ -245,7 +245,7 @@
<activitys-detail ref="ref_detail" <activitys-detail ref="ref_detail"
:serviceList="serviceList" :serviceList="serviceList"
:gridList="gridList" :gridList="gridList"
@diaClose="diaClose"></activitys-detail> @diaDetailClose="detailClosed"></activitys-detail>
</el-dialog> </el-dialog>
</div> </div>

6
src/views/modules/communityParty/regionalParty/activitysDetail.vue
View File

@ -58,11 +58,11 @@
</div> </div>
<!-- <div class="div-btn"> <div class="div-btn">
<el-button size="small" <el-button size="small"
@click="handleCancle">关 闭</el-button> @click="handleCancle">关 闭</el-button>
</div> --> </div>
</div> </div>
</template> </template>
@ -94,7 +94,7 @@ export default {
handleCancle () { handleCancle () {
this.diaDestroy() this.diaDestroy()
this.$emit('diaClose') this.$emit('diaDetailClose')
}, },

83
src/views/modules/communityParty/stas/index.vue
View File

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

14
src/views/modules/communityService/fuwujilu/detailForm.vue
View File

@ -100,15 +100,11 @@
</div> </div>
<!-- <div class="div_btn"> <div class="div-btn">
<el-button size="small" <el-button size="small"
@click="handleCancle">取 消</el-button> @click="handleCancle">关 闭</el-button>
<el-button size="small"
v-if="formType != 'detail'" </div>
type="primary"
:disabled="btnDisable"
@click="handleComfirm">确 定</el-button>
</div> -->
<el-dialog v-if="showPersonList" <el-dialog v-if="showPersonList"
:visible.sync="showPersonList" :visible.sync="showPersonList"
@ -318,7 +314,7 @@ export default {
handleCancle () { handleCancle () {
this.resetData() this.resetData()
this.$emit('handleClose') this.$emit('diaDetailClose')
}, },

3
src/views/modules/communityService/fuwujilu/fuwuList.vue
View File

@ -278,7 +278,8 @@
:serviceRecordId="serviceRecordId" :serviceRecordId="serviceRecordId"
:serviceOrgName="serviceOrgName" :serviceOrgName="serviceOrgName"
:satisfyArray="satisfyArray" :satisfyArray="satisfyArray"
:statusArray="statusArray"> :statusArray="statusArray"
@diaDetailClose="diaDetailClose">
</detail-form> </detail-form>
</el-dialog> </el-dialog>
<el-dialog v-if="showPersonList" <el-dialog v-if="showPersonList"

6
src/views/modules/communityService/fuwuxiangmu/cpts/detail.vue
View File

@ -42,7 +42,11 @@
</div> </div>
</div> </div>
<div class="div-btn">
<el-button size="small"
@click="handleCancle">关 闭</el-button>
</div>
</div> </div>
</template> </template>
@ -145,7 +149,7 @@ export default {
handleCancle () { handleCancle () {
this.$emit("close"); this.$emit("diaDetailClose");
}, },
}, },
}; };

3
src/views/modules/communityService/fuwuxiangmu/index.vue
View File

@ -187,7 +187,8 @@
class="dialog-h" class="dialog-h"
@closed="handleClose"> @closed="handleClose">
<detail-form ref="ref_form_detail" <detail-form ref="ref_form_detail"
:formId="formId"></detail-form> :formId="formId"
@diaDetailClose="handleClose"></detail-form>
</el-dialog> </el-dialog>
</div> </div>
</template> </template>

31
src/views/modules/communityService/fuwuzuzhi/cpts/detail.vue
View File

@ -53,17 +53,11 @@
</div> </div>
<!-- <div class="div_btn resi-btns"> <div class="div-btn">
<el-button size="small" @click="handleCancle">取 消</el-button> <el-button size="small"
<el-button @click="handleCancle">关 闭</el-button>
v-if="formType != 'watch'"
type="primary" </div>
size="small"
:disabled="btnDisable"
@click="handleComfirm"
>确 定</el-button
>
</div> -->
</div> </div>
</template> </template>
@ -112,6 +106,17 @@ export default {
}, },
methods: { methods: {
handleCancle () {
this.diaDestroy()
this.$emit('diaDetailClose')
},
diaDestroy () {
if (map) {
map.destroy()
}
},
async initForm () { async initForm () {
this.startLoading() this.startLoading()
@ -258,9 +263,7 @@ export default {
}, },
handleCancle () {
this.$emit("close");
},
// 开启加载动画 // 开启加载动画
startLoading () { startLoading () {
loading = Loading.service({ loading = Loading.service({

3
src/views/modules/communityService/fuwuzuzhi/index.vue
View File

@ -193,7 +193,8 @@
class="dialog-h" class="dialog-h"
@closed="diaDetailClose"> @closed="diaDetailClose">
<detail-form ref="ref_detail" <detail-form ref="ref_detail"
:formId="formId"></detail-form> :formId="formId"
@diaDetailClose="diaDetailClose"></detail-form>
</el-dialog> </el-dialog>
</div> </div>
</template> </template>

9
src/views/modules/communityService/measure/detail.vue
View File

@ -86,7 +86,11 @@
</div> </div>
</div> </div>
<div class="div-btn">
<el-button size="small"
@click="handleCancle">关 闭</el-button>
</div>
</div> </div>
</template> </template>
@ -123,6 +127,11 @@ export default {
}, },
methods: { methods: {
handleCancle () {
this.$emit('diaDetailClose')
},
initForm (row) { initForm (row) {
this.dataForm = JSON.parse(JSON.stringify(row)) this.dataForm = JSON.parse(JSON.stringify(row))
console.log(' this.dataForm', this.dataForm) console.log(' this.dataForm', this.dataForm)

5
src/views/modules/communityService/measure/index.vue
View File

@ -507,7 +507,8 @@
class="dialog-h" class="dialog-h"
:close-on-click-modal="false" :close-on-click-modal="false"
:before-close="detailFormCancle"> :before-close="detailFormCancle">
<detail ref="ref_form_detail"></detail> <detail ref="ref_form_detail"
@diaDetailClose="detailFormCancle"></detail>
</el-dialog> </el-dialog>
</div> </div>
</template> </template>
@ -959,7 +960,7 @@ export default {
}, },
async handleLook (row, type) { async handleLook (row, type) {
this.detailShow = true this.detailShow = true
console.log('row',row) console.log('row', row)
this.$nextTick(() => { this.$nextTick(() => {
this.$refs.ref_form_detail.initForm(row) this.$refs.ref_form_detail.initForm(row)
}) })

2
src/views/modules/communityService/ninePlaces/inspect/inspect.vue
View File

@ -253,7 +253,7 @@
:gridList="gridList" :gridList="gridList"
:resultList="resultList" :resultList="resultList"
:placeTypeList="placeTypeList" :placeTypeList="placeTypeList"
@dialogCancle="addFormCancle"></inspect-detail> @diaDetailClose="diaDetailClose"></inspect-detail>
</el-dialog> </el-dialog>
<!-- 复查记录弹出框 --> <!-- 复查记录弹出框 -->

100
src/views/modules/communityService/ninePlaces/inspect/inspectDetail.vue
View File

@ -1,61 +1,59 @@
<template> <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>
</div> </div>
<!-- <div class="div_btn"> <div class="div-btn">
<el-button size="small" <el-button size="small"
@click="handleCancle">取 消</el-button> @click="handleCancle">关 闭</el-button>
<el-button size="small"
v-if="formType != 'detail'" </div>
type="primary"
:disabled="btnDisable"
@click="handleComfirm">确 定</el-button>
</div> -->
</div> </div>
</template> </template>
@ -138,7 +136,7 @@ export default {
handleCancle () { handleCancle () {
this.resetData() this.resetData()
this.$emit('dialogCancle') this.$emit('diaDetailClose')
}, },

2
src/views/modules/communityService/ninePlaces/places/places.vue
View File

@ -208,7 +208,7 @@
:agencyId="agencyId" :agencyId="agencyId"
:scaleList="scaleList" :scaleList="scaleList"
:placeTypeList="placeTypeList" :placeTypeList="placeTypeList"
@dialogCancle="addFormCancle"></places-detail> @diaDetailClose="diaDetailClose"></places-detail>
</el-dialog> </el-dialog>
</div> </div>

16
src/views/modules/communityService/ninePlaces/places/placesDetail.vue
View File

@ -40,15 +40,11 @@
</div> </div>
</div> </div>
<!-- <div class="div_btn"> <div class="div-btn">
<el-button size="small" <el-button size="small"
@click="handleCancle">取 消</el-button> @click="handleCancle">关 闭</el-button>
<el-button size="small"
v-if="formType != 'detail'" </div>
type="primary"
:disabled="btnDisable"
@click="handleComfirm">确 定</el-button>
</div> -->
</div> </div>
</template> </template>
@ -142,8 +138,8 @@ export default {
handleCancle () { handleCancle () {
this.resetData()
this.$emit('dialogCancle') this.$emit('diaDetailClose')
}, },

4
src/views/modules/communityService/ninePlaces/team/team.vue
View File

@ -196,7 +196,7 @@
<team-detail ref="ref_detail" <team-detail ref="ref_detail"
:gridList="gridList" :gridList="gridList"
:placeTypeList="placeTypeList" :placeTypeList="placeTypeList"
@dialogCancle="addFormCancle"></team-detail> @diaDetailClose="diaDetailClose"></team-detail>
</el-dialog> </el-dialog>
</div> </div>
@ -344,7 +344,7 @@ export default {
// this.formTitle = '详情' // this.formTitle = '详情'
this.detailShow = true this.detailShow = true
this.$nextTick(() => { this.$nextTick(() => {
this.$refs.ref_detail.initForm( row.teamId, this.agencyId) this.$refs.ref_detail.initForm(row.teamId, this.agencyId)
}) })
}, },

15
src/views/modules/communityService/ninePlaces/team/teamDetail.vue
View File

@ -51,15 +51,11 @@
</div> </div>
</div> </div>
<!-- <div class="div_btn"> <div class="div-btn">
<el-button size="small" <el-button size="small"
@click="handleCancle">取 消</el-button> @click="handleCancle">关 闭</el-button>
<el-button size="small"
v-if="formType != 'detail'" </div>
type="primary"
:disabled="btnDisable"
@click="handleComfirm">确 定</el-button>
</div> -->
</div> </div>
</template> </template>
@ -256,8 +252,7 @@ export default {
handleCancle () { handleCancle () {
this.resetData() this.$emit('diaDetailClose')
this.$emit('dialogCancle')
}, },

2
src/views/modules/communityService/worklog/workLog.vue
View File

@ -258,7 +258,7 @@
class="dialog-h" class="dialog-h"
@closed="diaClose"> @closed="diaClose">
<work-log-detail ref="ref_detail" <work-log-detail ref="ref_detail"
@diaClose="diaClose"></work-log-detail> @diaDetailClose="diaClose"></work-log-detail>
</el-dialog> </el-dialog>
</div> </div>

6
src/views/modules/communityService/worklog/workLogDetail.vue
View File

@ -50,7 +50,11 @@
</div> </div>
</div> </div>
<div class="div-btn">
<el-button size="small"
@click="handleCancle">关 闭</el-button>
</div>
</div> </div>
</template> </template>
@ -74,7 +78,7 @@ export default {
methods: { methods: {
handleCancle () { handleCancle () {
this.$emit('diaClose') this.$emit('diaDetailClose')
}, },

4
src/views/modules/shequzhili/csgltc/csglDetail.vue
View File

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

6
src/views/modules/shequzhili/ggfwtc/ggfwDetail.vue
View File

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

Write Preview
Loading…
Cancel
Save