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

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

@@ -49,8 +49,11 @@
       </el-scrollbar>
     </div>
 
-		<div :style="{ height: rowHeight }" class="div_left">
+    <div class="div_left">
-			<div class="m-search hflex">
+      <div class="m-search" style="flex-direction: column;">
+        <section
+          :class="boxHeight ? 'm-form-box-height' : 'm-form-box-height-auto'"
+        >
           <el-form
             :inline="true"
             class="communityHeight"
@@ -233,13 +236,10 @@
             </el-form-item>
 
             <!-- </div> -->
-					<div class="u-search-btn">
+          </el-form>
-						<el-button
+        </section>
-							size="small"
+        <el-row>
-							class="diy-button--white"
+          <el-col :span="24" align="right">
-							@click="resetSearch"
-							>重置</el-button
-						>
             <el-button
               style="margin-left: 10px"
               size="small"
@@ -247,33 +247,25 @@
               @click="handleSearch"
               >查询</el-button
             >
-						<!-- <el-button style="margin-left:15px"
+            <el-button
               size="small"
-                         class="div-table-button--blue communityUnfold"
-                         type="text"
-                         @click="boxHeight = !boxHeight">{{ boxHeight ? '收起' : '展开' }}<i :class="boxHeight ? 'el-icon-arrow-up' : 'el-icon-arrow-down'"></i></el-button> -->
-					</div>
-				</el-form>
-				<!-- <el-row class="flex endpoint">
-          <el-col :span="24">
-            <span></span>
-            <div class="u-search-btn">
-              <el-button size="small"
               class="diy-button--white"
-                         @click="resetSearch">重置</el-button>
+              @click="resetSearch"
-              <el-button style="margin-left:10px"
+              >重置</el-button
-                         size="small"
+            >
-                         class="diy-button--blue"
+            <el-button
-                         @click="handleSearch">查询</el-button>
+              style="margin:0 6px 0 10px"
-              <el-button style="margin-left:15px"
               size="small"
-                         class="div-table-button--blue communityUnfold"
+              class="div-table-button--blue"
               type="text"
-                         @click="boxHeight = !boxHeight">{{ boxHeight ? '收起' : '展开' }}<i :class="boxHeight ? 'el-icon-arrow-up' : 'el-icon-arrow-down'"></i></el-button>
+              @click="boxHeight = !boxHeight"
-
+              >{{ boxHeight ? "展开" : "收起"
-            </div>
+              }}<i
+                :class="boxHeight ? 'el-icon-arrow-down' : 'el-icon-arrow-up'"
+              ></i
+            ></el-button>
           </el-col>
-        </el-row> -->
+        </el-row>
       </div>
 
       <div class="">
@@ -540,9 +532,7 @@ export default {
     async getValiheList() {
       const { user } = this.$store.state;
       if (!this.selGridId) {
-				this.selAgencyId = this.selAgencyId
+        this.selAgencyId = this.selAgencyId ? this.selAgencyId : user.agencyId;
-					? this.selAgencyId
-					: user.agencyId;
       }
 
       const url = "/actual/base/communityQuarters/listQuartersOptions";
@@ -668,10 +658,7 @@ export default {
       this.showRoomTable = true;
 
       this.$nextTick(() => {
-				this.$refs["ref_buildingTable"].loadTable(
+        this.$refs["ref_buildingTable"].loadTable("search", this.selTreeObj);
-					"search",
-					this.selTreeObj
-				);
       });
       // } else {
       //   this.$message.warning('请输入查询条件')
@@ -786,10 +773,7 @@ export default {
       if (obj.level === "building") {
         //点击楼栋
         setTimeout(() => {
-					this.$refs["ref_buildingTable"].loadTable(
+          this.$refs["ref_buildingTable"].loadTable("tree", this.selTreeObj);
-						"tree",
-						this.selTreeObj
-					);
         }, 100);
         this.selAgencyId = "";
         this.selGridId = "";
@@ -810,10 +794,7 @@ export default {
         await this.getBuildList();
         this.vDisabled = true;
       } else {
-				this.$refs["ref_communityTable"].loadTable(
+        this.$refs["ref_communityTable"].loadTable(true, this.selTreeObj);
-					true,
-					this.selTreeObj
-				);
 
         if (obj.level === "grid") {
           this.selAgencyId = "";
@@ -884,9 +865,7 @@ export default {
         //点击楼栋
         let neighborHoodNode = this.$refs.ref_tree.getNode(obj.pid); //所属小区
 
-				let gridNode = this.$refs.ref_tree.getNode(
+        let gridNode = this.$refs.ref_tree.getNode(neighborHoodNode.data.pid); //所属网格
-					neighborHoodNode.data.pid
-				); //所属网格
         let agencyNode = this.$refs.ref_tree.getNode(gridNode.data.pid); //所属社区
         obj.agencyId = agencyNode.data.id;
         obj.agencyName = agencyNode.data.label;

src/views/modules/base/resi.vue

@@ -639,7 +639,6 @@ export default {
 			currentPage: 1,
 			pageSize: 20,
 			total: null,
-			searchH: 241,
 			resideathAddObj1: {}, // 死亡登记子组件
 			conditions: [],
 			activeName: "",
@@ -714,10 +713,9 @@ export default {
 	computed: {
 		...mapGetters(["clientHeight", "iframeHeight"]),
 		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;
 		},
 	},
 

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

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

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

@@ -1,6 +1,7 @@
 <template>
   <div v-if="pageLoading" class="g-main">
-    <div class="m-search" ref="searchCard">
+    <div class="m-search" ref="searchCard" style="flex-direction: column;">
+      <section  :class="boxHeight ? 'm-form-box-height' : 'm-form-box-height-auto'">
         <el-form
         ref="searchForm"
         :inline="true"
@@ -141,6 +142,7 @@
           </el-date-picker>
         </el-form-item>
       </el-form>
+      </section>
       <el-row>
         <el-col :span="24" align="right">
           <el-button type="primary" size="small" @click="handleSearch"
@@ -152,6 +154,17 @@
             @click="resetForm('searchForm')"
             >重置</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-row>
     </div>
@@ -266,7 +279,6 @@
           </template>
         </el-table-column>
       </el-table>
-    </div>
       <div>
       <el-pagination
         @size-change="handleSizeChange"
@@ -279,6 +291,8 @@
       >
       </el-pagination>
     </div>
+    </div>
+  
 
     <el-dialog
       title="需求信息"
@@ -665,6 +679,9 @@ export default {
           value: "finished",
         },
       ],
+
+      boxHeight:true,
+
       serviceOptions: [
         {
           label: "志愿者",
@@ -896,8 +913,8 @@ export default {
   computed: {
     ...mapGetters(["clientHeight", "iframeHeight"]),
     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;
     },
   },

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

@@ -797,17 +797,25 @@ export default {
     async addFuwu() {
       // 处理服务范围数据
       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;
       let url = "/governance/policy/addPolicy";
 
       if (this.formType === "add" || this.formType === "copy") {
         url = "/governance/policy/addPolicy";
-        this.formData.policyId = "";
+        // this.formData.policyId = "";
       } else {
         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'

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

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

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

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

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

@@ -172,7 +172,7 @@ export default {
 	created() {},
 	computed: {
 		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'])
 	},

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

@@ -155,7 +155,7 @@ export default {
 	created() {},
 	computed: {
 		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'])
 	},