From b4ce9ab70564b320fd6617f228d9c412e3a0ead8 Mon Sep 17 00:00:00 2001
From: tianq <tianq>
Date: Mon, 17 Apr 2023 10:17:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=80=E4=BA=9Bbug=E5=A4=87=E4=B8=AA?=
 =?UTF-8?q?=E4=BB=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tuceng/anquan/anquanxuncha/addForm.vue    |  2 +-
 .../tuceng/anquan/anquanxuncha/record.vue     | 35 +++++++++----------
 .../tuceng/anquan/shebei/addForm.vue          |  2 +-
 .../tuceng/anquan/shebei/record.vue           | 26 ++++++++++----
 .../tuceng/anquan/yinhuan/addForm.vue         |  8 ++---
 .../tuceng/anquan/yinhuan/index.vue           |  2 +-
 .../tuceng/anquan/yinhuan/record.vue          | 31 ++++++++++------
 .../tuceng/gonggongfuwu/addForm.vue           |  2 +-
 .../tuceng/yingji/changsuo/record.vue         | 22 ++++++++----
 .../shequzhili/tuceng/yingji/wuzi/addForm.vue |  2 +-
 .../shequzhili/tuceng/yingji/wuzi/record.vue  | 22 ++++++++----
 .../tuceng/yingji/zizuzhi/addForm.vue         |  4 +--
 12 files changed, 100 insertions(+), 58 deletions(-)

diff --git a/src/views/modules/shequzhili/tuceng/anquan/anquanxuncha/addForm.vue b/src/views/modules/shequzhili/tuceng/anquan/anquanxuncha/addForm.vue
index 476aff40b..68b19735d 100644
--- a/src/views/modules/shequzhili/tuceng/anquan/anquanxuncha/addForm.vue
+++ b/src/views/modules/shequzhili/tuceng/anquan/anquanxuncha/addForm.vue
@@ -130,7 +130,7 @@
 		</div>
 
 		<span slot="footer" class="dialog-footer">
-			<el-button @click="handleCancle">关 闭</el-button>
+			<el-button @click="handleCancle" size="small">关 闭</el-button>
 			<!-- <el-button type="primary" @click="handleComfirm">确 定</el-button> -->
 		</span>
 	</el-dialog>
diff --git a/src/views/modules/shequzhili/tuceng/anquan/anquanxuncha/record.vue b/src/views/modules/shequzhili/tuceng/anquan/anquanxuncha/record.vue
index f6de498d9..88ff73600 100644
--- a/src/views/modules/shequzhili/tuceng/anquan/anquanxuncha/record.vue
+++ b/src/views/modules/shequzhili/tuceng/anquan/anquanxuncha/record.vue
@@ -2,9 +2,9 @@
 	<div class="m-record">
 		<h3>检查记录</h3>
 		<div>
-			<div class="u-table-btn1 mt10" v-if="formType != 'view'">
+			<!-- <div class="u-table-btn1 mt10" v-if="formType != 'view'">
 				<el-button size="small" class="diy-button--blue" :disabled="btnDisabled || disabled" @click="handleAdd">新增</el-button>
-			</div>
+			</div> -->
 			<div class="m-table-item">
 				<el-table :data="tableData" class="resi-table" row-key="id" border style="width: 100%">
 					<el-table-column label="序号" type="index" align="center" width="50"></el-table-column>
@@ -21,7 +21,6 @@
 							<div v-else class="div-content">{{ scope.row.patrolTime }}</div>
 						</template>
 					</el-table-column>
-
 					<el-table-column prop="staffId" label="检查人员" align="center" width="200px">
 						<template slot-scope="scope">
 							<el-select
@@ -53,13 +52,7 @@
 							<div v-else class="div-content">{{ scope.row.result == 1 ? '正常' : '异常' }}</div>
 						</template>
 					</el-table-column>
-
-					<el-table-column
-						prop="detailed"
-						label="隐患明细"
-						align="center"
-						width="200px"
-					>
+					<el-table-column prop="detailed" label="隐患明细" align="center" width="200px">
 						<template slot-scope="scope">
 							<el-input
 								v-if="scope.row.isEdit"
@@ -70,12 +63,9 @@
 								maxlength="500"
 								clearable
 							></el-input>
-							<div v-else class="div-content">
-								{{ scope.row.detailed }}
-							</div>
+							<div v-else class="div-content">{{ scope.row.detailed }}</div>
 						</template>
 					</el-table-column>
-
 					<el-table-column prop="imgList" label="图片列表" align="center">
 						<template slot-scope="scope">
 							<div v-if="scope.row.isEdit">
@@ -108,7 +98,6 @@
 							</div>
 						</template>
 					</el-table-column>
-
 					<el-table-column prop="reviewTime" label="拟复查时间" align="center" width="200px">
 						<template slot-scope="scope">
 							<el-date-picker
@@ -122,7 +111,6 @@
 							<div v-else class="div-content">{{ scope.row.reviewTime }}</div>
 						</template>
 					</el-table-column>
-
 					<el-table-column v-if="!disabled" fixed="right" label="操作" align="center" width="120">
 						<template slot-scope="scope">
 							<template v-if="scope.row.isEdit">
@@ -224,6 +212,11 @@ export default {
 
 	created() {
 		this.getOptionStaff();
+		if (this.id) {
+			this.getList();
+		} else {
+			this.handleAdd();
+		}
 	},
 
 	methods: {
@@ -312,8 +305,13 @@ export default {
 			if (row.result == '0' && row.reviewTime == '') {
 				this.$message.error('拟复查时间不能为空');
 			} else {
-				if (this.btnType == 'add') this.save(row);
-				else this.edit(row);
+				if (this.id) {
+					console.log('有id');
+					if (this.btnType == 'add') this.save(row);
+					else this.edit(row);
+				} else {
+					this.$message.error('请先保存上方信息');
+				}
 			}
 		},
 
@@ -395,6 +393,7 @@ export default {
 						isEdit: false
 					};
 				});
+				this.handleAdd();
 			} else {
 				this.$message.error(msg);
 			}
diff --git a/src/views/modules/shequzhili/tuceng/anquan/shebei/addForm.vue b/src/views/modules/shequzhili/tuceng/anquan/shebei/addForm.vue
index d0d4e7c97..1419ca3b6 100644
--- a/src/views/modules/shequzhili/tuceng/anquan/shebei/addForm.vue
+++ b/src/views/modules/shequzhili/tuceng/anquan/shebei/addForm.vue
@@ -85,7 +85,7 @@
 			<div class="recordBox"><record :disabled="disabled" :formType="pageType" :id="detailId" :info="{ agencyId: agencyId }"></record></div>
 		</div>
 		<span slot="footer" class="dialog-footer">
-			<el-button @click="handleCancle">关 闭</el-button>
+			<el-button @click="handleCancle" size="small">关 闭</el-button>
 			<!-- <el-button type="primary" @click="handleComfirm">确 定</el-button> -->
 		</span>
 	</el-dialog>
diff --git a/src/views/modules/shequzhili/tuceng/anquan/shebei/record.vue b/src/views/modules/shequzhili/tuceng/anquan/shebei/record.vue
index eea83de05..b12843e32 100644
--- a/src/views/modules/shequzhili/tuceng/anquan/shebei/record.vue
+++ b/src/views/modules/shequzhili/tuceng/anquan/shebei/record.vue
@@ -2,9 +2,9 @@
 	<div class="m-record">
 		<h3>检查记录</h3>
 		<div>
-			<div class="u-table-btn1 mt10" v-if="formType != 'view'">
+			<!-- <div class="u-table-btn1 mt10" v-if="formType != 'view'">
 				<el-button size="small" class="diy-button--blue" :disabled="btnDisabled || disabled" @click="handleAdd">新增</el-button>
-			</div>
+			</div> -->
 			<div class="m-table-item">
 				<el-table :data="tableData" class="resi-table" row-key="id" border style="width: 100%">
 					<el-table-column label="序号" type="index" align="center" width="50"></el-table-column>
@@ -234,7 +234,11 @@ export default {
 	created() {
 		console.log('id', this.id);
 		this.getOptionStaff();
-		this.getList();
+		if (this.id) {
+			this.getList();
+		} else {
+			this.handleAdd();
+		}
 	},
 
 	methods: {
@@ -327,8 +331,13 @@ export default {
 			if (row.result == '0' && row.reviewTime == '') {
 				this.$message.error('拟复查时间不能为空');
 			} else {
-				if (this.btnType == 'add') this.save(row);
-				else this.edit(row);
+				if (this.id) {
+					console.log('有id');
+					if (this.btnType == 'add') this.save(row);
+					else this.edit(row);
+				} else {
+					this.$message.error('请先保存上方信息');
+				}
 			}
 		},
 
@@ -352,6 +361,7 @@ export default {
 		},
 
 		async save(row) {
+			console.log(row, this.id);
 			const params = {
 				equipmentId: this.id,
 				...row
@@ -370,6 +380,7 @@ export default {
 		},
 
 		async edit(row) {
+			console.log(row, this.id);
 			const params = {
 				...row
 			};
@@ -386,9 +397,9 @@ export default {
 		},
 
 		async del(row) {
-			let arr=[row.id]
+			let arr = [row.id];
 			const url = `/actual/base/safetyEquipmentInspectRecord/delete`;
-			const { data, code, msg } = await requestPost(url,arr);
+			const { data, code, msg } = await requestPost(url, arr);
 
 			if (code === 0) {
 				this.$message.success('删除成功');
@@ -415,6 +426,7 @@ export default {
 						isEdit: false
 					};
 				});
+				this.handleAdd();
 			} else {
 				this.$message.error(msg);
 			}
diff --git a/src/views/modules/shequzhili/tuceng/anquan/yinhuan/addForm.vue b/src/views/modules/shequzhili/tuceng/anquan/yinhuan/addForm.vue
index 3314cd7d7..a2848320f 100644
--- a/src/views/modules/shequzhili/tuceng/anquan/yinhuan/addForm.vue
+++ b/src/views/modules/shequzhili/tuceng/anquan/yinhuan/addForm.vue
@@ -161,10 +161,10 @@
 				<!-- <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 class="recordBox"><record  :disabled="disabled" :formType="pageType" :id="detailId" :info="{ agencyId: agencyId }"></record></div>
+			<div class="recordBox"><record :disabled="disabled" :formType="pageType" :id="detailId" :info="{ agencyId: agencyId }"></record></div>
 		</div>
 		<span slot="footer" class="dialog-footer">
-			<el-button @click="handleCancle">关 闭</el-button>
+			<el-button @click="handleCancle" size="small">关 闭</el-button>
 			<!-- <el-button type="primary" @click="handleComfirm">确 定</el-button> -->
 		</span>
 	</el-dialog>
@@ -249,7 +249,7 @@ export default {
 				dangerContent: [{ required: true, message: '隐患内容不能为空', trigger: 'bulr' }],
 				reportPerson: [{ required: true, message: '上报人不能为空', trigger: 'bulr' }],
 				mobile: [{ required: true, message: '联系电话不能为空', trigger: 'blur' }],
-				// mobile: [{ required: true, validator: checkMObile, trigger: 'blur' }],
+				gridId: [{ required: true, validator: '所属网格不能为空', trigger: 'blur' }],
 				location: [{ required: true, message: '场所地址不能为空', trigger: 'blur' }]
 				// content: [{ required: true, message: '详细说明不能为空', trigger: 'bulr' }, { max: 1000, message: '不能超出1000个字符', trigger: 'blur' }]
 			},
@@ -502,6 +502,6 @@ export default {
 @import '@/assets/scss/modules/management/form.scss';
 @import '@/assets/scss/modules/visual/a_customize.scss';
 .el-dialog__body {
-    padding: 30px 80px;
+	padding: 30px 80px;
 }
 </style>
diff --git a/src/views/modules/shequzhili/tuceng/anquan/yinhuan/index.vue b/src/views/modules/shequzhili/tuceng/anquan/yinhuan/index.vue
index 7f4ffd921..4a9d14b16 100644
--- a/src/views/modules/shequzhili/tuceng/anquan/yinhuan/index.vue
+++ b/src/views/modules/shequzhili/tuceng/anquan/yinhuan/index.vue
@@ -68,7 +68,7 @@
 					<!-- <el-table-column label="" fixed="left" type="selection" align="center" width="50" /> -->
 					<el-table-column label="序号" fixed="left" type="index" align="center" width="50" />
 					<el-table-column prop="gridName" align="center" label="所属网格" :show-overflow-tooltip="true"></el-table-column>
-					<el-table-column prop="location" align="center" width="80" label="隐患位置"></el-table-column>
+					<el-table-column prop="location" align="center"  label="隐患位置"  :show-overflow-tooltip="true"></el-table-column>
 					<el-table-column prop="dangerPlaceName" label="隐患场所" min-width="140" align="center" :show-overflow-tooltip="true" />
 					<el-table-column prop="reportPerson" align="center" width="110" label="上报人" :show-overflow-tooltip="true"></el-table-column>
 					<el-table-column prop="mobile" align="center" :show-overflow-tooltip="true" label="联系电话"></el-table-column>
diff --git a/src/views/modules/shequzhili/tuceng/anquan/yinhuan/record.vue b/src/views/modules/shequzhili/tuceng/anquan/yinhuan/record.vue
index d6e9283ca..50e197fa7 100644
--- a/src/views/modules/shequzhili/tuceng/anquan/yinhuan/record.vue
+++ b/src/views/modules/shequzhili/tuceng/anquan/yinhuan/record.vue
@@ -2,14 +2,14 @@
 	<div class="m-record">
 		<h3>处理记录</h3>
 		<div>
-			<div class="u-table-btn1 mt10" v-if="formType != 'view'">
+			<!-- <div class="u-table-btn1 mt10" v-if="formType != 'view'">
 				<el-button size="small" class="diy-button--blue" :disabled="btnDisabled || disabled" @click="handleAdd">新增</el-button>
-			</div>
+			</div> -->
 			<div class="m-table-item">
 				<el-table :data="tableData" class="resi-table" row-key="id" border style="width: 100%">
 					<el-table-column label="序号" type="index" align="center" width="50"></el-table-column>
 
-					<el-table-column prop="handleTime" label="检查时间" align="center" width="200px">
+					<el-table-column prop="handleTime" label="处理时间" align="center" width="200px">
 						<template slot-scope="scope">
 							<el-date-picker
 								v-if="scope.row.isEdit"
@@ -22,7 +22,7 @@
 							<div v-else class="div-content">{{ scope.row.handleTime }}</div>
 						</template>
 					</el-table-column>
-					<el-table-column prop="handleState" label="处理结果" align="center">
+					<el-table-column prop="handleState" label="处理情况" align="center">
 						<template slot-scope="scope">
 							<el-select v-if="scope.row.isEdit" v-model="scope.row.handleState" placeholder="请选择" class="input-width" size="small" clearable>
 								<el-option v-for="subItem in optionResult" :key="subItem.value" :label="subItem.label" :value="subItem.value"></el-option>
@@ -106,7 +106,7 @@ export default {
 			isEdit: false,
 			tableData: [],
 			tempRow: {},
-			
+
 			optionResult: [
 				{
 					label: '待处理',
@@ -150,7 +150,11 @@ export default {
 	created() {
 		console.log('id', this.id);
 		this.getOptionStaff();
-		this.getList();
+		if (this.id) {
+			this.getList();
+		} else {
+			this.handleAdd();
+		}
 	},
 
 	methods: {
@@ -240,8 +244,14 @@ export default {
 		},
 
 		async handleEdit(row) {
-			if (this.btnType == 'add') this.save(row);
-			else this.edit(row);
+			if (this.id) {
+				console.log('有id');
+				if (this.btnType == 'add') this.save(row);
+				else this.edit(row);
+			} else {
+				this.$message.error('请先保存上方信息');
+			}
+			
 		},
 
 		handleAdd() {
@@ -294,8 +304,8 @@ export default {
 
 		async del(row) {
 			const url = `/actual/base/hiddenDangerRecord/deleteProcess`;
-			let arr=[row.id]
-			const { data, code, msg } = await requestPost(url,arr);
+			let arr = [row.id];
+			const { data, code, msg } = await requestPost(url, arr);
 
 			if (code === 0) {
 				this.$message.success('删除成功');
@@ -322,6 +332,7 @@ export default {
 						isEdit: false
 					};
 				});
+				this.handleAdd();
 			} else {
 				this.$message.error(msg);
 			}
diff --git a/src/views/modules/shequzhili/tuceng/gonggongfuwu/addForm.vue b/src/views/modules/shequzhili/tuceng/gonggongfuwu/addForm.vue
index 466ce47d3..3e12ede43 100644
--- a/src/views/modules/shequzhili/tuceng/gonggongfuwu/addForm.vue
+++ b/src/views/modules/shequzhili/tuceng/gonggongfuwu/addForm.vue
@@ -94,7 +94,7 @@
 			<!-- <div style="margin-top: 30px;"><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>
+			<el-button @click="handleCancle" size="small">关 闭</el-button>
 			<!-- <el-button type="primary" @click="handleComfirm">确 定</el-button> -->
 		</span>
 	</el-dialog>
diff --git a/src/views/modules/shequzhili/tuceng/yingji/changsuo/record.vue b/src/views/modules/shequzhili/tuceng/yingji/changsuo/record.vue
index b4e8ce2a5..f226d91af 100644
--- a/src/views/modules/shequzhili/tuceng/yingji/changsuo/record.vue
+++ b/src/views/modules/shequzhili/tuceng/yingji/changsuo/record.vue
@@ -2,9 +2,9 @@
 	<div class="m-record">
 		<h3>检查记录</h3>
 		<div>
-			<div class="u-table-btn1 mt10" v-if="formType != 'view'">
+			<!-- <div class="u-table-btn1 mt10" v-if="formType != 'view'">
 				<el-button size="small" class="diy-button--blue" :disabled="btnDisabled || disabled" @click="handleAdd">新增</el-button>
-			</div>
+			</div> -->
 			<div class="m-table-item">
 				<el-table :data="tableData" class="resi-table" row-key="id" border style="width: 100%">
 					<el-table-column label="序号" type="index" align="center" width="50"></el-table-column>
@@ -234,7 +234,11 @@ export default {
 	created() {
 		console.log('id', this.id);
 		this.getOptionStaff();
-		this.getList();
+		if (this.id) {
+			this.getList();
+		} else {
+			this.handleAdd();
+		}
 	},
 
 	methods: {
@@ -324,11 +328,16 @@ export default {
 		},
 
 		async handleEdit(row) {
-			if (row.inspectResult == '0' && row.nextInspectTime == '') {
+			if (row.result == '0' && row.reviewTime == '') {
 				this.$message.error('拟复查时间不能为空');
 			} else {
-				if (this.btnType == 'add') this.save(row);
-				else this.edit(row);
+				if (this.id) {
+					console.log('有id');
+					if (this.btnType == 'add') this.save(row);
+					else this.edit(row);
+				} else {
+					this.$message.error('请先保存上方信息');
+				}
 			}
 		},
 
@@ -416,6 +425,7 @@ export default {
 						isEdit: false
 					};
 				});
+				this.handleAdd();
 			} else {
 				this.$message.error(msg);
 			}
diff --git a/src/views/modules/shequzhili/tuceng/yingji/wuzi/addForm.vue b/src/views/modules/shequzhili/tuceng/yingji/wuzi/addForm.vue
index 37ee65f65..0f328b69e 100644
--- a/src/views/modules/shequzhili/tuceng/yingji/wuzi/addForm.vue
+++ b/src/views/modules/shequzhili/tuceng/yingji/wuzi/addForm.vue
@@ -93,7 +93,7 @@
 			<div class="recordBox"><record   :disabled="disabled" :formType="pageType" :id="detailId" :info="{ agencyId: agencyId }"></record></div>
 		</div>
 		<span slot="footer" class="dialog-footer">
-			<el-button @click="handleCancle">关闭</el-button>
+			<el-button @click="handleCancle" size="small">关闭</el-button>
 			<!-- <el-button type="primary" @click="handleComfirm">确 定</el-button> -->
 		</span>
 	</el-dialog>
diff --git a/src/views/modules/shequzhili/tuceng/yingji/wuzi/record.vue b/src/views/modules/shequzhili/tuceng/yingji/wuzi/record.vue
index a8bf02c0a..46d743e77 100644
--- a/src/views/modules/shequzhili/tuceng/yingji/wuzi/record.vue
+++ b/src/views/modules/shequzhili/tuceng/yingji/wuzi/record.vue
@@ -2,9 +2,9 @@
 	<div class="m-record">
 		<h3>检查记录</h3>
 		<div>
-			<div class="u-table-btn1 mt10" v-if="formType != 'view'">
+			<!-- <div class="u-table-btn1 mt10" v-if="formType != 'view'">
 				<el-button size="small" class="diy-button--blue" :disabled="btnDisabled || disabled" @click="handleAdd">新增</el-button>
-			</div>
+			</div> -->
 			<div class="m-table-item">
 				<el-table :data="tableData" class="resi-table" row-key="id" border style="width: 100%">
 					<el-table-column label="序号" type="index" align="center" width="50"></el-table-column>
@@ -234,7 +234,11 @@ export default {
 	created() {
 		console.log('id', this.id);
 		this.getOptionStaff();
-		this.getList();
+		if (this.id) {
+			this.getList();
+		} else {
+			this.handleAdd();
+		}
 	},
 
 	methods: {
@@ -324,11 +328,16 @@ export default {
 		},
 
 		async handleEdit(row) {
-			if (row.inspectResult == '0' && row.nextInspectTime == '') {
+			if (row.result == '0' && row.reviewTime == '') {
 				this.$message.error('拟复查时间不能为空');
 			} else {
-				if (this.btnType == 'add') this.save(row);
-				else this.edit(row);
+				if (this.id) {
+					console.log('有id');
+					if (this.btnType == 'add') this.save(row);
+					else this.edit(row);
+				} else {
+					this.$message.error('请先保存上方信息');
+				}
 			}
 		},
 
@@ -415,6 +424,7 @@ export default {
 						isEdit: false
 					};
 				});
+				this.handleAdd();
 			} else {
 				this.$message.error(msg);
 			}
diff --git a/src/views/modules/shequzhili/tuceng/yingji/zizuzhi/addForm.vue b/src/views/modules/shequzhili/tuceng/yingji/zizuzhi/addForm.vue
index 0f92378c2..27b851c30 100644
--- a/src/views/modules/shequzhili/tuceng/yingji/zizuzhi/addForm.vue
+++ b/src/views/modules/shequzhili/tuceng/yingji/zizuzhi/addForm.vue
@@ -178,8 +178,8 @@
 				<el-button size="small" type="primary" :disabled="btnDisable" @click="handleComfirm">确 定</el-button>
 			</div>
 		</div>
-		<span slot="footer" class="dialog-footer">
-			<el-button @click="handleCancle">关 闭</el-button>
+		<span slot="footer" class="dialog-footer"  v-if="pageType == 'view'">
+			<el-button @click="handleCancle" size="small">关 闭</el-button>
 			<!-- <el-button type="primary" @click="handleComfirm">确 定</el-button> -->
 		</span>
 	</el-dialog>