人房信息搜索栏统一修改

src/views/modules/base/collect.vue

@@ -59,18 +59,18 @@
             </el-date-picker>
           </el-form-item>
 
-          <div class="u-search-btn">
+        </el-form>
-            <el-button class="diy-button--white"
+          <el-row>
+              <el-col :span="24" align="right">
+                <el-button class="diy-button--white"
                        size="small"
                        @click="resetForm('searchForm')">重置</el-button>
             <el-button style="margin-left:10px"
                        size="small"
                        class="diy-button--blue"
                        @click="handleSearch">查询</el-button>
-
+              </el-col>
-          </div>
+          </el-row>
-
-        </el-form>
       </div>
       <div class="m-table">
         <div class="u-table-btn1">
@@ -421,8 +421,8 @@ export default {
   computed: {
     ...mapGetters(["clientHeight", "iframeHeight"]),
     tableHeight () {
-      const h = this.clientHeight - 360 + this.iframeHeigh;
+      const h = this.clientHeight - 400 + this.iframeHeigh;
-      const _h = this.clientHeight - 360;
+      const _h = this.clientHeight - 400;
       return this.$store.state.inIframe ? h : _h;
     },
     dialogTableHeight () {

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

@@ -176,7 +176,7 @@
 							>下载房屋模板</el-button
 						>
 					</div>
-					<div
+					<!-- <div
 						v-if="
 							showYhymInfo && customerId !== '1535072605621841922'
 						"
@@ -206,7 +206,7 @@
 							@click="createBatchNeiQrUrl"
 							>补全小程序小区码</el-button
 						>
-					</div>
+					</div> -->
 					<div v-if="displayedBaobiaoBtn" class="table-more-btn">
 						<el-button
 							size="small"
@@ -216,7 +216,7 @@
 							>智能填报</el-button
 						>
 					</div>
-					<div
+					<!-- <div
 						v-if="agencyObj.level == 'community'"
 						class="table-more-btn"
 					>
@@ -227,7 +227,7 @@
 							@click="handleDownQr(agencyObj, 'community')"
 							>社区二维码</el-button
 						>
-					</div>
+					</div> -->
 					<el-button
 						size="small"
 						style="float: right"

src/views/modules/base/huji/immigration/index.vue

@@ -155,8 +155,9 @@
             </el-option>
           </el-select>
         </el-form-item> -->
-
+			</el-form>
-				<div class="u-search-btn">
+			<el-row>
+				<el-col :span="24" align="right">
 					<el-button
 						class="diy-button--white"
 						size="small"
@@ -170,8 +171,8 @@
 						@click="handleSearch"
 						>查询</el-button
 					>
-				</div>
+				</el-col>
-			</el-form>
+			</el-row>
 		</div>
 
 		<div class="m-table">
@@ -547,13 +548,16 @@ export default {
 			importLoading: false,
 
 			searchH: 0,
-			tableHeight: 0,
 			changeRecordShow: false,
 		};
 	},
 	computed: {
 		...mapGetters(["clientHeight", "iframeHeight"]),
-
+		tableHeight(){
+			const h = this.clientHeight - 450 + this.iframeHeigh;
+			const _h = this.clientHeight - 450;
+			return this.$store.state.inIframe ? h : _h;
+		},
 		changeVDisabled() {
 			return !this.fmData.villageId;
 		},
@@ -563,6 +567,7 @@ export default {
 		changeDDisabled() {
 			return !this.fmData.unitId;
 		},
+	
 	},
 	watch: {
 		rangeTime: function (val) {
@@ -575,15 +580,6 @@ export default {
 				this.fmData.endTime = "";
 			}
 		},
-		searchH() {
-			const h = this.clientHeight - this.searchH + this.iframeHeight;
-			const _h = this.clientHeight - this.searchH;
-			console.log("computed-searchH---_h", _h);
-
-			this.$nextTick(() => {
-				this.tableHeight = this.$store.state.inIframe ? h : _h;
-			});
-		},
 	},
 	mounted() {
 		this.getGridList();

src/views/modules/plugins/change/changedeath.vue

@@ -69,8 +69,11 @@
           </el-select>
         </el-form-item> -->
 
-        <div class="u-search-btn">
+       
-          <el-button class="diy-button--white" size="small" @click="resetForm"
+      </el-form>
+        <el-row>
+            <el-col :span="24" align="right">
+              <el-button class="diy-button--white" size="small" @click="resetForm"
             >重置</el-button
           >
           <el-button
@@ -80,8 +83,8 @@
             @click="getDataList"
             >查询</el-button
           >
-        </div>
+            </el-col>
-      </el-form>
+        </el-row>
     </div>
     <div class="m-table">
       <div class="u-table-btn1">
@@ -96,6 +99,7 @@
         class="m-table-item"
         v-loading="dataListLoading"
         :data="dataList"
+        :height="tableHeight"
         border
       >
         <!--<el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>-->
@@ -277,7 +281,7 @@ import nextTick from "dai-js/tools/nextTick";
 import resiChangeRecord from "@/views/components/resiChangeRecord.vue";
 import { requestPost } from "@/js/dai/request";
 import resiInfo from "@/views/components/resiInfo.vue";
-
+import { mapGetters } from "vuex";
 export default {
   mixins: [mixinViewModule],
   data() {
@@ -328,6 +332,14 @@ export default {
     resiInfo,
     resiChangeRecord,
   },
+  computed:{
+    ...mapGetters(["clientHeight", "iframeHeight"]),
+    tableHeight(){
+			const h = this.clientHeight - 410 + this.iframeHeigh;
+			const _h = this.clientHeight - 410;
+			return this.$store.state.inIframe ? h : _h;
+		},
+  },
   methods: {
     async handleRecovery(rowData) {
       console.log("11111");

src/views/modules/plugins/change/changerelocation.vue

@@ -441,7 +441,6 @@ export default {
       changeRecordShow: false,
 
       searchH: 0,
-      tableHeight: 0,
     };
   },
   components: {
@@ -451,6 +450,11 @@ export default {
   },
   computed: {
     ...mapGetters(["clientHeight", "iframeHeight"]),
+    tableHeight(){
+			const h = this.clientHeight - 420 + this.iframeHeigh;
+			const _h = this.clientHeight - 420;
+			return this.$store.state.inIframe ? h : _h;
+		},
     changeVDisabled() {
       return !this.dataForm.villageId;
     },
@@ -479,15 +483,6 @@ export default {
         this.dataForm.endTime = "";
       }
     },
-    searchH() {
-      const h = this.clientHeight - this.searchH + this.iframeHeight;
-      const _h = this.clientHeight - this.searchH;
-      console.log("computed-searchH---_h", _h);
-
-      this.$nextTick(() => {
-        this.tableHeight = this.$store.state.inIframe ? h : _h;
-      });
-    },
   },
   methods: {
     async handleRecovery(rowData) {