From 75bd489f43955635b786333b982d2c18d049dbd6 Mon Sep 17 00:00:00 2001
From: tianq <tianq@hgzp.com.cn>
Date: Fri, 31 Mar 2023 14:36:19 +0800
Subject: [PATCH] bug

---
 src/assets/scss/modules/management/form.scss       |  5 +++++
 .../tuceng/anquan/anquanxuncha/addForm.vue         |  2 +-
 .../shequzhili/tuceng/anquan/shebei/addForm.vue    |  2 +-
 .../shequzhili/tuceng/anquan/yinhuan/addForm.vue   |  2 +-
 .../shequzhili/tuceng/gonggongfuwu/addForm.vue     |  2 +-
 .../shequzhili/tuceng/gonggongfuwu/index.vue       |  4 ++--
 .../shequzhili/tuceng/yingji/changsuo/addForm.vue  | 14 +++++++++++---
 .../shequzhili/tuceng/yingji/wuzi/addForm.vue      |  2 +-
 8 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/src/assets/scss/modules/management/form.scss b/src/assets/scss/modules/management/form.scss
index 9032290c0..18d1ed075 100644
--- a/src/assets/scss/modules/management/form.scss
+++ b/src/assets/scss/modules/management/form.scss
@@ -56,3 +56,8 @@
 		}
 	}
 }
+/deep/.recordBox .m-table-item{
+	margin-top:0px;
+	max-height:200px;
+	overflow: auto;
+}
\ No newline at end of file
diff --git a/src/views/modules/shequzhili/tuceng/anquan/anquanxuncha/addForm.vue b/src/views/modules/shequzhili/tuceng/anquan/anquanxuncha/addForm.vue
index c8136df33..a47fa099c 100644
--- a/src/views/modules/shequzhili/tuceng/anquan/anquanxuncha/addForm.vue
+++ b/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">
diff --git a/src/views/modules/shequzhili/tuceng/anquan/shebei/addForm.vue b/src/views/modules/shequzhili/tuceng/anquan/shebei/addForm.vue
index 9c7f459f7..248e74f72 100644
--- a/src/views/modules/shequzhili/tuceng/anquan/shebei/addForm.vue
+++ b/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>
diff --git a/src/views/modules/shequzhili/tuceng/anquan/yinhuan/addForm.vue b/src/views/modules/shequzhili/tuceng/anquan/yinhuan/addForm.vue
index df22477d7..ad9d3de8b 100644
--- a/src/views/modules/shequzhili/tuceng/anquan/yinhuan/addForm.vue
+++ b/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>
diff --git a/src/views/modules/shequzhili/tuceng/gonggongfuwu/addForm.vue b/src/views/modules/shequzhili/tuceng/gonggongfuwu/addForm.vue
index a1a7ce150..161e5fe4d 100644
--- a/src/views/modules/shequzhili/tuceng/gonggongfuwu/addForm.vue
+++ b/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);
 			}
diff --git a/src/views/modules/shequzhili/tuceng/gonggongfuwu/index.vue b/src/views/modules/shequzhili/tuceng/gonggongfuwu/index.vue
index ff02ecc5d..a6fcfe328 100644
--- a/src/views/modules/shequzhili/tuceng/gonggongfuwu/index.vue
+++ b/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">
diff --git a/src/views/modules/shequzhili/tuceng/yingji/changsuo/addForm.vue b/src/views/modules/shequzhili/tuceng/yingji/changsuo/addForm.vue
index f11759caf..e28fd6cf8 100644
--- a/src/views/modules/shequzhili/tuceng/yingji/changsuo/addForm.vue
+++ b/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);
diff --git a/src/views/modules/shequzhili/tuceng/yingji/wuzi/addForm.vue b/src/views/modules/shequzhili/tuceng/yingji/wuzi/addForm.vue
index f934d1aee..e0130e122 100644
--- a/src/views/modules/shequzhili/tuceng/yingji/wuzi/addForm.vue
+++ b/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>