Browse Source

政策找人新增,房屋管理展开收起,服务找人展开收起

V1.0
mk 3 years ago
parent
commit
3a59b177f9
  1. 2009
      src/views/modules/base/community/community.vue
  2. 8
      src/views/modules/base/resi.vue
  3. 2
      src/views/modules/communityService/gxxq/index.vue
  4. 29
      src/views/modules/communityService/measure/index.vue
  5. 16
      src/views/modules/communityService/policy/addPolicy.vue
  6. 4
      src/views/modules/communityService/policy/policyList.vue
  7. 4
      src/views/modules/cpts/base2/index.vue
  8. 2
      src/views/modules/shequzhili/tuceng/anquan/anquanxuncha/index.vue
  9. 2
      src/views/modules/shequzhili/tuceng/anquan/yinhuan/index.vue

2009
src/views/modules/base/community/community.vue

File diff suppressed because it is too large

8
src/views/modules/base/resi.vue

@ -639,7 +639,6 @@ export default {
currentPage: 1, currentPage: 1,
pageSize: 20, pageSize: 20,
total: null, total: null,
searchH: 241,
resideathAddObj1: {}, // resideathAddObj1: {}, //
conditions: [], conditions: [],
activeName: "", activeName: "",
@ -714,10 +713,9 @@ export default {
computed: { computed: {
...mapGetters(["clientHeight", "iframeHeight"]), ...mapGetters(["clientHeight", "iframeHeight"]),
tableHeight() { tableHeight() {
const h = return this.$store.state.inIframe
this.clientHeight - this.searchH - 241 + this.iframeHeight; ? this.clientHeight - 450 + this.iframeHeigh
const _h = this.clientHeight - 241 - this.searchH; : this.clientHeight - 450;
return this.$store.state.inIframe ? h : _h;
}, },
}, },

2
src/views/modules/communityService/gxxq/index.vue

@ -304,7 +304,7 @@ export default {
pageSize: 20, pageSize: 20,
tableLoading: true, tableLoading: true,
total: 0, total: 0,
searchH: 115, searchH: 170,
formShow: false, formShow: false,
formTitle: "", formTitle: "",
rowObj: {}, rowObj: {},

29
src/views/modules/communityService/measure/index.vue

@ -1,7 +1,8 @@
<template> <template>
<div v-if="pageLoading" class="g-main"> <div v-if="pageLoading" class="g-main">
<div class="m-search" ref="searchCard"> <div class="m-search" ref="searchCard" style="flex-direction: column;">
<el-form <section :class="boxHeight ? 'm-form-box-height' : 'm-form-box-height-auto'">
<el-form
ref="searchForm" ref="searchForm"
:inline="true" :inline="true"
:model="searchForm" :model="searchForm"
@ -141,6 +142,7 @@
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-form> </el-form>
</section>
<el-row> <el-row>
<el-col :span="24" align="right"> <el-col :span="24" align="right">
<el-button type="primary" size="small" @click="handleSearch" <el-button type="primary" size="small" @click="handleSearch"
@ -152,6 +154,17 @@
@click="resetForm('searchForm')" @click="resetForm('searchForm')"
>重置</el-button >重置</el-button
> >
<el-button
style="margin:0 6px 0 10px"
size="small"
class="div-table-button--blue"
type="text"
@click="boxHeight = !boxHeight"
>{{ boxHeight ? "展开" : "收起"
}}<i
:class="boxHeight ? 'el-icon-arrow-down' : 'el-icon-arrow-up'"
></i
></el-button>
</el-col> </el-col>
</el-row> </el-row>
</div> </div>
@ -266,8 +279,7 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
</div> <div>
<div>
<el-pagination <el-pagination
@size-change="handleSizeChange" @size-change="handleSizeChange"
@current-change="handleCurrentChange" @current-change="handleCurrentChange"
@ -279,6 +291,8 @@
> >
</el-pagination> </el-pagination>
</div> </div>
</div>
<el-dialog <el-dialog
title="需求信息" title="需求信息"
@ -665,6 +679,9 @@ export default {
value: "finished", value: "finished",
}, },
], ],
boxHeight:true,
serviceOptions: [ serviceOptions: [
{ {
label: "志愿者", label: "志愿者",
@ -896,8 +913,8 @@ export default {
computed: { computed: {
...mapGetters(["clientHeight", "iframeHeight"]), ...mapGetters(["clientHeight", "iframeHeight"]),
tableHeight() { tableHeight() {
const h = this.clientHeight - this.searchH - 280 + this.iframeHeigh; const h = this.clientHeight - this.searchH - 450 + this.iframeHeigh;
const _h = this.clientHeight - 280 - this.searchH; const _h = this.clientHeight - 450 - this.searchH;
return this.$store.state.inIframe ? h : _h; return this.$store.state.inIframe ? h : _h;
}, },
}, },

16
src/views/modules/communityService/policy/addPolicy.vue

@ -797,17 +797,25 @@ export default {
async addFuwu() { async addFuwu() {
// //
await this.operationOption(); await this.operationOption();
this.formData.attachmentList = [...this.fileList]; // this.formData.attachmentList = [...this.fileList];
this.fileList.forEach(item=>{
this.formData.attachmentList.push({
name:item.attachmentName,
type:item.attachmentType,
url:item.attachmentUrl,
format:item.attachmentFormat,
duration:0,
})
})
this.formData.assignInfo = this.newFormData; this.formData.assignInfo = this.newFormData;
let url = "/governance/policy/addPolicy"; let url = "/governance/policy/addPolicy";
if (this.formType === "add" || this.formType === "copy") { if (this.formType === "add" || this.formType === "copy") {
url = "/governance/policy/addPolicy"; url = "/governance/policy/addPolicy";
this.formData.policyId = ""; // this.formData.policyId = "";
} else { } else {
url = "/heart/policy/update"; url = "/heart/policy/update";
this.formData.policyId = this.policyId; // this.formData.policyId = this.policyId;
} }
// const url = 'http://yapi.elinkservice.cn/mock/245/heart/icServiceProject/service/initiate' // const url = 'http://yapi.elinkservice.cn/mock/245/heart/icServiceProject/service/initiate'

4
src/views/modules/communityService/policy/policyList.vue

@ -330,8 +330,8 @@ export default {
computed: { computed: {
maxTableHeight() { maxTableHeight() {
return this.$store.state.inIframe return this.$store.state.inIframe
? this.clientHeight - 400 + this.iframeHeigh ? this.clientHeight - 450 + this.iframeHeigh
: this.clientHeight - 400; : this.clientHeight - 450;
}, },
...mapGetters(["clientHeight", "iframeHeight"]), ...mapGetters(["clientHeight", "iframeHeight"]),
}, },

4
src/views/modules/cpts/base2/index.vue

@ -526,9 +526,9 @@ export default {
return this.$store.state.inIframe return this.$store.state.inIframe
? this.clientHeight - ? this.clientHeight -
ref_search_height - ref_search_height -
265 + 280 +
this.iframeHeight this.iframeHeight
: this.clientHeight - ref_search_height - 265; : this.clientHeight - ref_search_height - 280;
}, },
...mapGetters(["clientHeight", "iframeHeight"]), ...mapGetters(["clientHeight", "iframeHeight"]),
}, },

2
src/views/modules/shequzhili/tuceng/anquan/anquanxuncha/index.vue

@ -172,7 +172,7 @@ export default {
created() {}, created() {},
computed: { computed: {
maxTableHeight() { maxTableHeight() {
return this.$store.state.inIframe ? this.clientHeight - 410 + this.iframeHeigh : this.clientHeight - 410; return this.$store.state.inIframe ? this.clientHeight - 450 + this.iframeHeigh : this.clientHeight - 450;
}, },
...mapGetters(['clientHeight', 'iframeHeight']) ...mapGetters(['clientHeight', 'iframeHeight'])
}, },

2
src/views/modules/shequzhili/tuceng/anquan/yinhuan/index.vue

@ -155,7 +155,7 @@ export default {
created() {}, created() {},
computed: { computed: {
maxTableHeight() { maxTableHeight() {
return this.$store.state.inIframe ? this.clientHeight - 410 + this.iframeHeigh : this.clientHeight - 410; return this.$store.state.inIframe ? this.clientHeight - 450 + this.iframeHeigh : this.clientHeight - 450;
}, },
...mapGetters(['clientHeight', 'iframeHeight']) ...mapGetters(['clientHeight', 'iframeHeight'])
}, },

Loading…
Cancel
Save