Merge remote-tracking branch 'origin/dev' into preview

* origin/dev:
  楼栋编辑
  bug

src/assets/scss/modules/management/form.scss

@@ -56,3 +56,8 @@
 		}
 	}
 }
+/deep/.recordBox .m-table-item{
+	margin-top:0px;
+	max-height:200px;
+	overflow: auto;
+}

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

@@ -4,7 +4,7 @@
 
       <el-form ref="ref_form" :inline="true" :model="dataForm" :rules="dataRule" label-width="150px" class="g-edit-form">
         <el-form-item label="所属小区" style="display: block">
-          <span>{{ agencyObj.agencyName }}—{{ agencyObj.gridName }}—{{ agencyObj.label }}</span>
+          <span>{{ dataForm.agencyName }}—{{ agencyObj.gridName }}—{{ agencyObj.label }}</span>
         </el-form-item>
 
         <el-form-item label="楼栋名称" prop="buildingName" style="display: block">

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

@@ -126,7 +126,7 @@
 				<!-- <el-button size="small" @click="resetData" v-if="pageType != 'view'">重置</el-button> -->
 				<el-button size="small" type="primary" :disabled="btnDisable" @click="handleComfirm">保 存</el-button>
 			</div>
-			<div style="margin-top: 30px;"><record v-if="pageType != 'add' && detailId" :formType="pageType" :id="detailId" :info="{ agencyId: agencyId }"></record></div>
+			<div class="recordBox"><record v-if="pageType != 'add' && detailId" :formType="pageType" :id="detailId" :info="{ agencyId: agencyId }"></record></div>
 		</div>
 
 		<span slot="footer" class="dialog-footer">

src/views/modules/shequzhili/tuceng/anquan/shebei/addForm.vue

@@ -82,7 +82,7 @@
 				<!-- <el-button size="small" @click="resetData" v-if="pageType != 'view'">重置</el-button> -->
 				<el-button size="small" type="primary" :disabled="btnDisable" @click="handleComfirm">确 定</el-button>
 			</div>
-			<div style="margin-top: 30px;"><record v-if="pageType != 'add' && detailId" :formType="pageType" :id="detailId" :info="{ agencyId: agencyId }"></record></div>
+			<div class="recordBox"><record v-if="pageType != 'add' && detailId" :formType="pageType" :id="detailId" :info="{ agencyId: agencyId }"></record></div>
 		</div>
 		<span slot="footer" class="dialog-footer">
 			<el-button @click="handleCancle">关 闭</el-button>

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

@@ -161,7 +161,7 @@
 				<!-- <el-button size="small" @click="resetData" v-if="pageType != 'view'">重置</el-button> -->
 				<el-button size="small" type="primary" :disabled="btnDisable" @click="handleComfirm">确 定</el-button>
 			</div>
-			<div style="margin-top: 30px;"><record v-if="pageType != 'add' && detailId" :formType="pageType" :id="detailId" :info="{ agencyId: agencyId }"></record></div>
+			<div class="recordBox"><record v-if="pageType != 'add' && detailId" :formType="pageType" :id="detailId" :info="{ agencyId: agencyId }"></record></div>
 		</div>
 		<span slot="footer" class="dialog-footer">
 			<el-button @click="handleCancle">关 闭</el-button>

src/views/modules/shequzhili/tuceng/gonggongfuwu/addForm.vue

@@ -290,7 +290,7 @@ export default {
 			if (code === 0) {
 				this.$message.success('添加成功');
 				// this.resetData();
-				this.$emit('handleComfirm');
+			this.handleCancle();
 			} else if (code >= 8000) {
 				this.$message.error(msg);
 			}

src/views/modules/shequzhili/tuceng/gonggongfuwu/index.vue

@@ -57,8 +57,8 @@
 					<el-table-column prop="equipmentName" align="center" label="设备名称" :show-overflow-tooltip="true"></el-table-column>
 					<el-table-column prop="equipmentNum" align="center" label="设备编号" :show-overflow-tooltip="true"></el-table-column>
 					<el-table-column prop="equipmentCategoryName" align="center" width="80" label="设备类型"></el-table-column>
-					<el-table-column prop="location" label="所处位置"  align="center" :show-overflow-tooltip="true" />
-					<el-table-column prop="principalName" align="center"label="负责人" :show-overflow-tooltip="true"></el-table-column>
+					<el-table-column prop="location" label="所处位置" align="center" :show-overflow-tooltip="true" />
+					<el-table-column prop="principalName" align="center" label="负责人" :show-overflow-tooltip="true"></el-table-column>
 					<el-table-column prop="contactNum" align="center" :show-overflow-tooltip="true" label="联系电话"></el-table-column>
 					<el-table-column fixed="right" label="操作" align="center" width="200">
 						<template slot-scope="scope">

src/views/modules/shequzhili/tuceng/yingji/changsuo/addForm.vue

@@ -28,7 +28,15 @@
 						</el-col>
 						<el-col :span="6">
 							<el-form-item label="场所规模" prop="capacity">
-								<el-input v-model="formData.capacity" type="number" :disabled="disabled" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
+								<el-input
+									v-model="formData.capacity"
+									type="number"
+									:disabled="disabled"
+									class="u-item-width-normal"
+									size="small"
+									clearable
+									placeholder="请输入"
+								></el-input>
 							</el-form-item>
 						</el-col>
 						<el-col :span="6">
@@ -82,7 +90,7 @@
 				<!-- <el-button size="small" @click="resetData" v-if="pageType != 'view'">重置</el-button> -->
 				<el-button size="small" type="primary" :disabled="btnDisable" @click="handleComfirm">确 定</el-button>
 			</div>
-			<div style="margin-top: 30px;"><record v-if="pageType != 'add' && detailId" :formType="pageType" :id="detailId" :info="{ agencyId: agencyId }"></record></div>
+			<div class="recordBox"><record v-if="pageType != 'add' && detailId" :formType="pageType" :id="detailId" :info="{ agencyId: agencyId }"></record></div>
 		</div>
 		<span slot="footer" class="dialog-footer">
 			<el-button @click="handleCancle">关 闭</el-button>
@@ -218,7 +226,7 @@ export default {
 			const url = '/sys/dict/data/dictlist';
 			let params = {
 				dictType: 'emergency_site_type'
-			
+
 				// purpose: 'query'
 			};
 			const { data, code, msg } = await requestPost(url, params);

src/views/modules/shequzhili/tuceng/yingji/wuzi/addForm.vue

@@ -90,7 +90,7 @@
 				<!-- <el-button size="small" @click="resetData" v-if="pageType != 'view'">重置</el-button> -->
 				<el-button size="small" type="primary" :disabled="btnDisable" @click="handleComfirm">确 定</el-button>
 			</div>
-			<div style="margin-top: 30px;"><record v-if="pageType != 'add' && detailId" :formType="pageType" :id="detailId" :info="{ agencyId: agencyId }"></record></div>
+			<div class="recordBox"><record v-if="pageType != 'add' && detailId" :formType="pageType" :id="detailId" :info="{ agencyId: agencyId }"></record></div>
 		</div>
 		<span slot="footer" class="dialog-footer">
 			<el-button @click="handleCancle">关闭</el-button>