From 188c534f170693aed0dc8d29bbf1028a46fb8cca Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Mon, 29 Apr 2024 18:54:56 +0800
Subject: [PATCH 01/19] =?UTF-8?q?=E5=AE=89=E6=A3=80=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resourceManagement/enterprise/addForm.vue | 426 +++++++++++++++
 .../resourceManagement/enterprise/index.vue   | 489 ++++++++++++++++++
 .../enterprise/patrolRecord.vue               |   0
 3 files changed, 915 insertions(+)
 create mode 100644 src/views/modules/resourceManagement/enterprise/addForm.vue
 create mode 100644 src/views/modules/resourceManagement/enterprise/index.vue
 create mode 100644 src/views/modules/resourceManagement/enterprise/patrolRecord.vue

diff --git a/src/views/modules/resourceManagement/enterprise/addForm.vue b/src/views/modules/resourceManagement/enterprise/addForm.vue
new file mode 100644
index 000000000..2e63f28b8
--- /dev/null
+++ b/src/views/modules/resourceManagement/enterprise/addForm.vue
@@ -0,0 +1,426 @@
+<template>
+	<el-dialog title="提示" :visible.sync="dialogVisible" width="1370px" :before-close="handleCancle">
+		<span slot="title">
+			<span v-if="pageType == 'add'">新增</span>
+			<span v-if="pageType == 'edit'">修改</span>
+			<span v-if="pageType == 'view'">查看</span>
+		</span>
+		<div>
+			<div class="dialog-h-content scroll-h">
+				<el-form :inline="true" :model="formData" ref="form" :rules="dataRule" :label-width="'90px'" v-if="pageType != 'view'">
+					<el-row>
+						<el-col :span="6">
+							<el-form-item label="设备名称" prop="equipmentName">
+								<el-input v-model.trim="formData.equipmentName" :disabled="disabled" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
+							</el-form-item>
+						</el-col>
+						<el-col :span="6">
+							<el-form-item label="设备编号" prop="equipmentNum">
+								<el-input v-model.trim="formData.equipmentNum" :disabled="disabled" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
+							</el-form-item>
+						</el-col>
+						<el-col :span="6">
+							<el-form-item label="负责人" prop="principalName">
+								<el-input v-model.trim="formData.principalName" :disabled="disabled" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
+							</el-form-item>
+						</el-col>
+						<el-col :span="6">
+							<el-form-item label="联系电话" prop="contactNum">
+								<el-input v-model.trim="formData.contactNum" :disabled="disabled" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
+							</el-form-item>
+						</el-col>
+						<el-col :span="18">
+							<el-form-item label="所处位置" prop="location" style="display: block">
+								<el-select
+									v-model.trim="formData.location"
+									:disabled="disabled"
+									filterable
+									remote
+									:reserve-keyword="true"
+									placeholder="请输入关键词"
+									:remote-method="remoteMethod"
+									:loading="loading"
+									@keyup.enter.native="remoteMethod(formData.location)"
+								>
+									<el-option
+										v-for="(item, index) in searchOptions"
+										@click.native="handleClickKey(index)"
+										:key="item.value"
+										:label="item.label"
+										:value="item.value"
+									></el-option>
+								</el-select>
+							</el-form-item>
+						</el-col>
+					</el-row>
+					<div id="app_event" class="div_map"></div>
+				</el-form>
+				<el-form :inline="false" :model="formData" ref="form" :label-width="'90px'" v-if="pageType == 'view'">
+					<el-row>
+						<el-col :span="6">
+							<el-form-item label="设备名称" prop="equipmentName">{{ formData.equipmentName }}</el-form-item>
+						</el-col>
+						<el-col :span="6">
+							<el-form-item label="设备编号" prop="equipmentNum">{{ formData.equipmentNum }}</el-form-item>
+						</el-col>
+						<el-col :span="6">
+							<el-form-item label="负责人" prop="principalName">{{ formData.principalName }}</el-form-item>
+						</el-col>
+						<el-col :span="6">
+							<el-form-item label="联系电话" prop="contactNum">{{ formData.contactNum }}</el-form-item>
+						</el-col>
+						<el-col :span="6">
+							<el-form-item label="场所地址" prop="location" style="display: block">{{ formData.location }}</el-form-item>
+						</el-col>
+					</el-row>
+					<div id="app_event" class="div_map"></div>
+				</el-form>
+			</div>
+			<div class="div_btn" v-if="pageType != 'view'">
+				<el-button size="small" @click="handleCancle">取 消</el-button>
+				<!-- <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>
+		<span slot="footer" class="dialog-footer">
+			<el-button @click="handleCancle" size="small">关 闭</el-button>
+			<!-- <el-button type="primary" @click="handleComfirm">确 定</el-button> -->
+		</span>
+	</el-dialog>
+</template>
+
+<script>
+import { isMobile } from '@/utils/validate';
+import { mapGetters } from 'vuex';
+import { Loading } from 'element-ui'; // 引入Loading服务
+import { requestPost, requestGet } from '@/js/dai/request';
+import daiMap from '@/utils/dai-map';
+import nextTick from 'dai-js/tools/nextTick';
+let loading; // 加载动画
+let map;
+var search;
+var markers;
+var infoWindowList;
+var geocoder; // 新建一个正逆地址解析类
+
+export default {
+	props: {
+		dialogVisible: {
+			type: Boolean,
+			default: ''
+		},
+		defaultData: {
+			type: Object,
+			default: null
+		},
+		pageType: {
+			type: String,
+			default: ''
+		},
+		detailId: {
+			type: String,
+			default: ''
+		},
+		detailData: {
+			type: Object,
+			default: null
+		},
+		disabled: {
+			type: Boolean,
+			default: false
+		}
+	},
+
+	data() {
+		let checkMObile = (rule, value, callback) => {
+			if (value === '') {
+				callback(new Error('请输入联系电话'));
+			} else {
+				if (!isMobile(value)) {
+					callback(new Error('联系电话格式不正确'));
+				}
+				callback();
+			}
+		};
+		return {
+			detailIdcopy:this.detailId,
+			btnDisable: false,
+			user: '',
+			agencyId: '',
+			gridList: [], //所属网格list--场所区域
+			placeTypeList: [], //场所类型
+			resultArray: [{ value: '0', label: '合格' }, { value: '1', label: '不合格' }],
+			equipmentCategoryCodeArray: [],
+			list: {},
+			formData: {
+				equipmentName: '',
+				equipmentCategoryCode: '',
+				principalName: '',
+				location: '',
+				contactNum: ''
+			},
+			dataRule: {
+				equipmentName: [{ required: true, message: '设备名称不能为空', trigger: 'bulr' }],
+				equipmentNum: [{ required: true, message: '设备编号不能为空', trigger: 'bulr' }],
+				principalName: [{ required: true, message: '负责人不能为空', trigger: 'bulr' }],
+				contactNum: [{ required: true, message: '联系电话不能为空', trigger: 'blur' }],
+				location: [{ required: true, message: '所处位置不能为空', trigger: 'blur' }]
+			},
+			//地图
+			loading: false,
+			searchValue: '',
+			searchOptions: []
+		};
+	},
+	watch: {},
+	components: {  },
+	created() {},
+	async mounted() {
+		console.log('detailId', this.detailId);
+		this.user = this.$store.state.user;
+		this.agencyId = this.user.agencyId;
+		this.startLoading();
+		this.loadCategory();
+		// this.loadGrid();
+		// this.loadplaceType();
+		if (this.pageType != 'add') {
+			this.getDetail();
+		} else {
+			this.initMap();
+		}
+		await this.endLoading();
+		this.endLoading();
+	},
+
+	methods: {
+		async loadCategory() {
+			const url = '/sys/dict/data/dictlist';
+
+			let params = {
+				dictType: 'safety_equipment_category'
+			};
+
+			const { data, code, msg } = await requestPost(url, params);
+			if (code === 0) {
+				this.equipmentCategoryCodeArray = data;
+			} else {
+				this.$message.error(msg);
+			}
+		},
+		async loadGrid() {
+			const url = '/gov/org/customergrid/gridoption';
+			let params = {
+				agencyId: this.agencyId,
+				purpose: 'query'
+			};
+			const { data, code, msg } = await requestPost(url, params);
+			if (code === 0) {
+				this.gridList = data;
+			} else {
+				this.$message.error(msg);
+			}
+		},
+		//场所类型
+		async loadplaceType() {
+			const url = '/gov/org/coverage/dict-select-list/enterprise_patrol';
+			let params = {
+				// agencyId: this.agencyId,
+				// purpose: 'query'
+			};
+			const { data, code, msg } = await requestPost(url, params);
+			if (code === 0) {
+				this.placeTypeList = data;
+			} else {
+				this.$message.error(msg);
+			}
+		},
+		async getDetail() {
+			const url = `/actual/base/monitoringEquipment/detail/${this.detailIdcopy}`;
+			const { data, code, msg } = await requestPost(url);
+			if (code === 0) {
+				console.log('详情数据', data);
+				this.formData = { ...data };
+				// this.remoteMethod("青岛");
+				 // this.list = this.searchOptions.map(item => {
+				 //                return { value: item.value, label: item.label };
+				 //            });
+				 //            this.formData.location.push(this.list[0].value);
+				 //            this.remoteMethod(this.list[0].label);//调用远程搜索函数
+				
+				
+					// this.remoteMethod("对对对");
+				this.initMap();
+			
+			} else {
+				this.$message.error(msg);
+			}
+		},
+
+		handleComfirm() {
+			this.save();
+		},
+		async handleAdd() {
+			// this.btnDisable = true;
+			// setTimeout(() => {
+			// 	this.btnDisable = false;
+			// }, 10000);
+			// nextTick(1000);
+			// const form = new Promise((resolve, reject) => {
+			// 	this.$refs['form'].validate(valid => {
+			// 		if (valid) resolve();
+			// 	});
+			// });
+			// const form1 = new Promise((resolve, reject) => {
+			// 	this.$refs['form1'].validate(valid => {
+			// 		if (valid) resolve();
+			// 	});
+			// });
+			// Promise.all([form1, form])
+			// 	.then(() => {
+			// 		this.addFuwu();
+			// 	})
+			// 	.catch(() => {
+			// 		app.util.validateRule(messageObj);
+			// 		this.btnDisable = false;
+			// 	});
+		},
+
+		async save() {
+			console.log('this.formData', this.formData);
+			var url = '';
+			var params = {};
+			if (this.pageType == 'add') {
+				url = '/actual/base/monitoringEquipment/save';
+			} else {
+				url = '/actual/base/monitoringEquipment/update';
+			}
+			params = { ...this.formData };
+			const { data, code, msg } = await requestPost(url, params);
+			if (code === 0) {
+				this.$message.success('操作成功');
+                this.detailIdcopy=data
+				// this.handleCancle();
+			} else if (code >= 8000) {
+				this.$message.error(msg);
+			}
+		},
+		handleCancle() {
+			this.resetData();
+			this.$emit('handleClose');
+		},
+		resetData() {
+			this.$refs.form.resetFields();
+		},
+		// 开启加载动画
+		startLoading() {
+			loading = Loading.service({
+				lock: true, // 是否锁定
+				text: '正在加载……', // 加载中需要显示的文字
+				background: 'rgba(0,0,0,.7)' // 背景颜色
+			});
+		},
+		// 结束加载动画
+		endLoading() {
+			// clearTimeout(timer);
+			if (loading) {
+				loading.close();
+			}
+		}, // 地图初始化函数，本例取名为init，开发者可根据实际情况定义
+		initMap() {
+			let { latitude, longitude } = this.$store.state.user;
+
+			if (this.formData.latitude && this.formData.longitude) {
+				latitude = this.formData.latitude;
+				longitude = this.formData.longitude;
+			}
+			if (!latitude || latitude == '' || latitude == '0') {
+				latitude = 39.9088810666821;
+				longitude = 116.39743841556731;
+			}
+
+			this.$nextTick(() => {
+				map = new daiMap(
+					document.getElementById('app_event'),
+					{ latitude, longitude },
+					{
+						zoom: 16.2, // 设置地图缩放级别
+						pitch: 43.5, // 设置俯仰角
+						rotation: 45 // 设置地图旋转角度
+					}
+				);
+				// 监听地图平移结束
+				map.on('dragend', e => {
+					if (!this.disabled) {
+						this.handleMoveCenter(e);
+					}
+				});
+
+				map.setCenter(latitude, longitude);
+				if (this.formData.latitude) {
+					map.setMarker(latitude, longitude);
+				}
+			});
+		},
+		async handleMoveCenter() {
+			//修改地图中心点
+			const { lat, lng } = map.getCenter();
+			this.formData.latitude = lat;
+			this.formData.longitude = lng;
+			map.setMarker(lat, lng);
+
+			let { msg, data } = await map.getAddress(lat, lng);
+			if (msg == 'success') {
+				this.formData.location = data.address;
+				this.searchValue = data.address;
+				this.searchOptions = [];
+			}
+		},
+		async remoteMethod(query) {
+			console.log("query",query)
+			if (query !== '') {
+				this.loading = true;
+				const { msg, data } = await map.searchNearby(query);
+				this.loading = false;
+				this.resultList = [];
+
+				if (msg == 'success' && data.resultList && data.resultList.length > 0) {
+					if (data.resultList && data.resultList.length > 0) {
+						this.resultList = data.resultList;
+						this.searchOptions = this.resultList.map(item => {
+							return { value: `${item.id}`, label: `${item.address + item.name}` };
+						});
+						console.log("this.searchOptions",this.searchOptions )
+					}
+				} else {
+					this.searchOptions = [
+						{
+							value: '0',
+							label: '未检索到结果'
+						}
+					];
+				}
+			} else {
+				this.searchOptions = [];
+			}
+		},
+		handleClickKey(index) {
+			let selPosition = this.resultList[index];
+			let lonlat = selPosition.lonlat.split(' ');
+			map.setCenter(lonlat[1], lonlat[0]);
+			map.setMarker(lonlat[1], lonlat[0]);
+			this.formData.latitude = lonlat[1];
+			this.formData.longitude = lonlat[0];
+			this.formData.location = selPosition.address + selPosition.name;
+		}
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+@import '@/assets/scss/modules/management/form-main.scss';
+@import '@/assets/scss/modules/management/form.scss';
+@import '@/assets/scss/modules/visual/a_customize.scss';
+.el-dialog__body {
+    padding: 30px 80px;
+}
+</style>
diff --git a/src/views/modules/resourceManagement/enterprise/index.vue b/src/views/modules/resourceManagement/enterprise/index.vue
new file mode 100644
index 000000000..16d010050
--- /dev/null
+++ b/src/views/modules/resourceManagement/enterprise/index.vue
@@ -0,0 +1,489 @@
+<template>
+    <div class="g-main">
+        <div>
+            <div class="m-search">
+                <el-form :inline="true" :model="formData" ref="ref_searchform" :label-width="'105px'">
+                    <div>
+                        <el-form-item label="企业名称" prop="equipmentName">
+                            <el-input v-model.trim="formData.equipmentName" class="u-item-width-normal" size="small"
+                                clearable placeholder="请输入"></el-input>
+                        </el-form-item>
+                        <el-form-item label="规模" prop="equipmentNum">
+                            <el-input v-model.trim="formData.equipmentNum" class="u-item-width-normal" size="small"
+                                clearable placeholder="请输入"></el-input>
+                        </el-form-item>
+
+                        <el-form-item label="负责人" prop="location">
+                            <el-input v-model.trim="formData.location" class="u-item-width-normal" size="small"
+                                clearable placeholder="请输入"></el-input>
+                        </el-form-item>
+                        <el-form-item label="联系人" prop="principalName">
+                            <el-input v-model.trim="formData.principalName" class="u-item-width-normal" size="small"
+                                clearable placeholder="请输入"></el-input>
+                        </el-form-item>
+                        <el-form-item label="九小场所分类" prop="latestInspectTime">
+                            <el-select v-model.trim="formData.location" placeholder="请选择" class="u-item-width-normal"
+                                size="small">
+                                <el-option v-for="item in option" :label="item.label" :value="item.value"
+                                    :key="item.value">
+                                </el-option>
+                            </el-select>
+                        </el-form-item>
+                        <el-form-item label="最新检查时间" prop="latestInspectResult">
+                            <el-date-picker class="u-item-width-normal" size="small"
+                                v-model.trim="formData.latestInspectTime"  type="datetime" format="yyyy-MM-dd HH:mm:ss"
+                                placeholder="选择日期"></el-date-picker>
+                        </el-form-item>
+                        <el-form-item label="最新检查结果" prop="latestInspectResult">
+                            <el-select v-model.trim="formData.latestInspectResult" placeholder="请选择" size="small"
+                                clearable class="u-item-width-normal">
+                                <el-option v-for="item in resultArray" :key="item.value" :label="item.label"
+                                    :value="item.value"></el-option>
+                            </el-select>
+                        </el-form-item>
+
+                        <el-row>
+                            <el-col :span="24" align="right">
+                                <el-button style="margin-left: 30px" size="small" type="primary "
+                                    @click="handleSearch">查询</el-button>
+                                <el-button style="margin-left: 10px" size="small" class="diy-button--white"
+                                    @click="resetSearch">重置</el-button>
+                            </el-col>
+                        </el-row>
+                    </div>
+                </el-form>
+            </div>
+            <div class="m-table">
+                <div class="div_btn">
+                    <el-button size="small" type="primary " @click="handleAdd({}, 'add')">新增</el-button>
+                    <el-button class="diy-button--white" size="small"
+                        @click="handleExportModule('room')">下载模板</el-button>
+                    <el-upload :headers="$getElUploadHeaders()" ref="upload" class="upload-btn" action="uploadUlr"
+                        :limit="1" :accept="'.xls,.xlsx'" :with-credentials="true" :show-file-list="false"
+                        :auto-upload="true" :on-progress="handleProgress" :on-success="handleExcelSuccess"
+                        :before-upload="beforeExcelUpload" :http-request="uploadHttpRequest"
+                        style="display: inline-block;margin:0px 10px">
+                        <el-button size="small" class="diy-button--white" :loading="importLoading">导入</el-button>
+                    </el-upload>
+
+                    <el-button @click="handleExport" class="diy-button--white" size="small">导出</el-button>
+                </div>
+                <el-table :data="tableData" border class="m-table-item" style="width: 100%"
+                    @selection-change="handleSelectionChange" :height="maxTableHeight">
+                    <!-- <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="equipmentName" align="center" label="设备名称"
+                        :show-overflow-tooltip="true"></el-table-column>
+                    <el-table-column prop="equipmentNum" align="center" label="设备编号"></el-table-column>
+
+                    <el-table-column prop="location" label="所处位置" min-width="140" 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 prop="latestInspectTime" align="center" label="最新检查时间"
+                        :show-overflow-tooltip="true"></el-table-column>
+                    <el-table-column prop="latestInspectResultName" align="center" label="最新结果"
+                        :show-overflow-tooltip="true"></el-table-column>
+                    <el-table-column fixed="right" label="操作" align="center" width="250">
+                        <template slot-scope="scope">
+                            <el-button @click="handleAdd(scope.row, 'view')" type="text" size="small">查看</el-button>
+
+                            <el-button v-if="scope.row.latitude && agencyId == scope.row.agencyId"
+                                style="margin-right: 10px" @click="handleAdd(scope.row, 'edit')" size="small"
+                                type="text">
+                                编辑
+                            </el-button>
+                            <el-button style="margin-right: 10px" @click="handleAdd(scope.row, 'edit')" size="small"
+                                type="text">
+                                巡查记录
+                            </el-button>
+                            <el-button @click="handleDel(scope.row)" v-if="agencyId == scope.row.agencyId" type="text"
+                                size="small" class="">删除</el-button>
+                        </template>
+                    </el-table-column>
+                </el-table>
+
+                <div>
+                    <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
+                        :current-page.sync="pageNo" :page-sizes="[20, 50, 100, 200]" :page-size="parseInt(pageSize)"
+                        layout="sizes, prev, pager, next, total" :total="total"></el-pagination>
+                </div>
+            </div>
+        </div>
+        <div>
+            <addForm v-if="dialogVisible" :dialogVisible="dialogVisible" :pageType="pageType" :disabled="disabled"
+                :detailId="detailId" :detailData="detailData" @handleClose="handleClose" @handleOk="handleOk"
+                @dialogOk="handleEditSuccess" />
+        </div>
+    </div>
+</template>
+
+<script>
+import { requestPost } from '@/js/dai/request';
+import nextTick from 'dai-js/tools/nextTick';
+import { mapGetters } from 'vuex';
+import addForm from './addForm.vue';
+import axios from 'axios';
+
+export default {
+    data() {
+        return {
+            dialogVisible: false,
+            importLoading: false,
+            disabled: false,
+            user: '',
+            agencyId: '',
+            formData: {
+                equipmentName: '',
+                equipmentCategoryCode: '',
+                principalName: '',
+                contactNum: '',
+                address: ''
+            },
+            pageType: 'list', // 列表list 新增add  处理dispose 详情info
+            gridList: [], //所属网格list--场所区域
+            placeTypeList: [], //场所类型
+            tableData: [],
+            resultArray: [{ value: '1', label: '合格' }, { value: '0', label: '不合格' }],
+            equipmentCategoryCodeArray: [],
+            pageNo: 1,
+            pageSize: window.localStorage.getItem('pageSize') || 20,
+            total: 1,
+            detailId: '',
+            detailData: {},
+            multipleSelection: [],
+            rowObj: {},
+            option: [
+                {}
+            ]
+        };
+    },
+    components: { addForm },
+    created() { },
+    computed: {
+        maxTableHeight() {
+            return this.$store.state.inIframe ? this.clientHeight - 410 + this.iframeHeigh : this.clientHeight - 410;
+        },
+        ...mapGetters(['clientHeight', 'iframeHeight'])
+    },
+    watch: {},
+    mounted() {
+        this.user = this.$store.state.user;
+        this.agencyId = this.user.agencyId;
+        this.loadGrid();
+        this.loadplaceType();
+        this.loadCategory();
+        this.getTableData();
+    },
+    methods: {
+        handleSelectionChange(val) {
+            this.multipleSelection = [];
+            val.forEach(element => {
+                this.multipleSelection.push(element.icEventId);
+            });
+        },
+        handleSearch(val) {
+            console.log(this.formData);
+            this.pageNo = 1;
+            this.getTableData();
+        },
+        async loadGrid() {
+            const url = '/gov/org/customergrid/gridoption';
+            let params = {
+                agencyId: this.agencyId,
+                purpose: 'query'
+            };
+            const { data, code, msg } = await requestPost(url, params);
+            if (code === 0) {
+                this.gridList = data;
+            } else {
+                this.$message.error(msg);
+            }
+        },
+        //场所类型
+        async loadplaceType() {
+            const url = '/gov/org/coverage/dict-select-list/enterprise_patrol';
+            let params = {
+                // agencyId: this.agencyId,
+                // purpose: 'query'
+            };
+            const { data, code, msg } = await requestPost(url, params);
+            if (code === 0) {
+                this.placeTypeList = data;
+            } else {
+                this.$message.error(msg);
+            }
+        },
+        //设备类型
+        async loadCategory() {
+            const url = '/sys/dict/data/dictlist';
+
+            let params = {
+                dictType: 'safety_equipment_category'
+            };
+
+            const { data, code, msg } = await requestPost(url, params);
+            if (code === 0) {
+                this.equipmentCategoryCodeArray = data;
+            } else {
+                this.$message.error(msg);
+            }
+        },
+        async handleImport() {
+            // 导入
+        },
+        async handleExport() {
+            // 导出
+            const url = '/actual/base/monitoringEquipment/export';
+            const { pageSize, pageNo, formData } = this;
+            axios({
+                url: window.SITE_CONFIG['apiURL'] + url,
+                method: 'post',
+                data: {
+                    pageSize,
+                    pageNo,
+                    ...formData
+                },
+                responseType: 'blob'
+            })
+                .then(res => {
+                    let fileName = window.decodeURI(res.headers['content-disposition'].split(';')[1].split('=')[1]);
+                    console.log('filename', fileName);
+                    let blob = new Blob([res.data], { type: 'application/vnd.ms-excel' });
+                    var url = window.URL.createObjectURL(blob);
+                    var aLink = document.createElement('a');
+                    aLink.style.display = 'none';
+                    aLink.href = url;
+                    aLink.setAttribute('download', fileName);
+                    document.body.appendChild(aLink);
+                    aLink.click();
+                    document.body.removeChild(aLink); //下载完成移除元素
+                    window.URL.revokeObjectURL(url); //释放掉blob对象
+                })
+                .catch(err => {
+                    console.log('获取导出情失败', err);
+                    return this.$message.error('网络错误');
+                });
+        },
+        handleAdd(row, type) {
+            if (row.id) {
+                this.detailId = row.id;
+            }
+            this.pageType = type;
+            if (type == 'view') {
+                this.disabled = true;
+            } else {
+                this.disabled = false;
+            }
+            this.dialogVisible = true;
+        },
+        handleClose() {
+            this.dialogVisible = false;
+            this.pageType = 'list';
+            this.detailId = '';
+            this.getTableData();
+        },
+        handleOk() {
+            this.pageType = 'list';
+            this.detailId = '';
+            this.pageNo = 1;
+            this.getTableData();
+        },
+        handleEditSuccess() {
+            this.handleClose();
+            this.getTableData();
+        },
+        async handleDel(rowData) {
+            let message = '确认删除?';
+            this.$confirm(message, '提示', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning'
+            })
+                .then(() => {
+                    this.del(rowData.id);
+                })
+                .catch(err => { });
+        },
+        async del(id) {
+            const url = `/actual/base/monitoringEquipment/delete`;
+            let idsArr = [id];
+            const { data, code, msg } = await requestPost(url, idsArr);
+            if (code === 0) {
+                this.$message.success('删除成功！');
+                this.getTableData();
+            } else {
+                this.$message.error('操作失败！');
+            }
+        },
+        async getTableData() {
+            const url = '/actual/base/monitoringEquipment/page';
+            // const url = 'http://yapi.elinkservice.cn/mock/330/actual/base/enterprise/list';
+            const { pageSize, pageNo, formData } = this;
+            const { data, code, msg } = await requestPost(url, {
+                pageSize,
+                pageNo,
+                ...formData
+            });
+            if (code === 0) {
+                this.total = data.total || 0;
+                this.tableData = data.list
+                    ? data.list.map(item => {
+                        return item;
+                    })
+                    : [];
+            } else {
+                this.$message.error(msg);
+            }
+        },
+        handleSizeChange(val) {
+            this.pageSize = val;
+            window.localStorage.setItem('pageSize', val);
+            this.getTableData();
+        },
+        handleCurrentChange(val) {
+            this.pageNo = val;
+            this.getTableData();
+        },
+        resetSearch() {
+            this.formData = {
+                equipmentName: '',
+                equipmentCategoryCode: '',
+                principalName: '',
+                contactNum: '',
+                address: ''
+            };
+            this.pageNo = 1;
+            this.getTableData();
+        },
+        async handleExportModule() {
+            let url = '/actual/base/monitoringEquipment/downloadTemplate';
+            let params = {};
+            await this.$http({
+                method: 'POST',
+                url,
+                responseType: 'blob',
+                data: params
+            })
+                .then(res => {
+                    // this.download(res.data, title + '.xls')
+                    if (res.headers['content-disposition']) {
+                        let fileName = window.decodeURI(res.headers['content-disposition'].split(';')[1].split('=')[1]);
+                        console.log('filename', fileName);
+                        let blob = new Blob([res.data], {
+                            type: 'application/vnd.ms-excel'
+                        });
+                        var url = window.URL.createObjectURL(blob);
+                        var aLink = document.createElement('a');
+                        aLink.style.display = 'none';
+                        aLink.href = url;
+                        aLink.setAttribute('download', fileName);
+                        document.body.appendChild(aLink);
+                        aLink.click();
+                        document.body.removeChild(aLink); //下载完成移除元素
+                        window.URL.revokeObjectURL(url); //释放掉blob对象
+                    } else this.$message.error('下载失败');
+                })
+                .catch(err => {
+                    console.log('err', err);
+                    return this.$message.error('网络错误');
+                });
+        },
+        handleExcelSuccess(res, file) {
+            if (res.code === 0 && res.msg === 'success') {
+                console.log('resss---ppp', res);
+            } else {
+                this.$message.error(res.msg);
+            }
+        },
+        handleProgress(event, file, fileList) {
+            console.log('percentage', file.percentage);
+        },
+
+        beforeExcelUpload(file) {
+            console.log('file', file);
+            const isType = file.type === 'application/vnd.ms-excel';
+            const isTypeComputer = file.type === 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet';
+            const fileType = isType || isTypeComputer;
+            const isLt1M = file.size / 1024 / 1024 < 10;
+            if (!fileType) {
+                this.$message.error('上传文件只能是xls/xlsx格式！');
+            }
+
+            if (!isLt1M) {
+                this.$message.error('上传文件大小不能超过 10MB!');
+            }
+            return fileType && isLt1M;
+        },
+
+        async uploadHttpRequest(file) {
+            this.importLoading = true;
+            this.importBtnTitle = '正在上传中...';
+            this.$message({
+                showClose: true,
+                dangerouslyUseHTMLString: true,
+                message: "导入中，请到系统管理-<a id='clickA' style='cursor: pointer;'>导入记录</a>中查看进度",
+                duration: 3000
+            });
+            let than = this;
+            document.getElementById('clickA').addEventListener('click', function () {
+                than.$router.replace('/main/importRecord-index');
+            });
+            const formData = new FormData(); //FormData对象，添加参数只能通过append('key', value)的形式添加
+            formData.append('file', file.file); //添加文件对象
+            formData.append('code', ''); //添加文件对象
+            await this.$http
+                .post('/actual/base/monitoringEquipment/import', formData)
+                .then(res => {
+                    console.log('res-up', res);
+                    if (res.data.code == 0 && res.data.msg == 'success') {
+                        console.log(res.data.data);
+                        const data = res.data.data;
+
+                        this.dataList = [
+                            ...Object.keys(data.option.exist).map(k => {
+                                return {
+                                    index: k,
+                                    srcField: data.option.exist[k],
+                                    exist: true,
+                                    field: data.option.exist[k]
+                                };
+                            }),
+                            ...Object.keys(data.option.notExist).map(k => {
+                                return {
+                                    index: k,
+                                    srcField: data.option.notExist[k],
+                                    exist: false,
+                                    field: ''
+                                };
+                            })
+                        ];
+                        this.importOption = data.option;
+                        this.importCode = data.code;
+                        this.fileData = file;
+                    } else this.$message.error(res.data.msg);
+                })
+                .catch(err => {
+                    console.log('失败', err);
+                    file.onError(); //上传失败的文件会从文件列表中删除
+                    // this.$message.error('导入失败')
+                });
+            this.importLoading = false;
+            this.importBtnTitle = '导入';
+            this.$refs.upload.clearFiles();
+        }
+    }
+};
+</script>
+
+<style lang="scss" scoped>
+@import '@/assets/scss/modules/management/list-main.scss';
+
+.m-search {
+    .u-item-width-normal {
+        width: 200px;
+    }
+}
+</style>
diff --git a/src/views/modules/resourceManagement/enterprise/patrolRecord.vue b/src/views/modules/resourceManagement/enterprise/patrolRecord.vue
new file mode 100644
index 000000000..e69de29bb

From c9d5177233946033e1b1070edd633d82bcf2aecf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E7=B4=A0?= <66666@66.com>
Date: Wed, 8 May 2024 09:36:41 +0800
Subject: [PATCH 02/19] 5.8

---
 .../resourceManagement/enterprise/addForm.vue | 347 +++++++++++++++---
 .../resourceManagement/enterprise/index.vue   |  80 ++--
 2 files changed, 356 insertions(+), 71 deletions(-)

diff --git a/src/views/modules/resourceManagement/enterprise/addForm.vue b/src/views/modules/resourceManagement/enterprise/addForm.vue
index 2e63f28b8..3fadddcc4 100644
--- a/src/views/modules/resourceManagement/enterprise/addForm.vue
+++ b/src/views/modules/resourceManagement/enterprise/addForm.vue
@@ -4,51 +4,72 @@
 			<span v-if="pageType == 'add'">新增</span>
 			<span v-if="pageType == 'edit'">修改</span>
 			<span v-if="pageType == 'view'">查看</span>
+			<span v-if="pageType == 'patrol'">巡查记录</span>
 		</span>
 		<div>
 			<div class="dialog-h-content scroll-h">
-				<el-form :inline="true" :model="formData" ref="form" :rules="dataRule" :label-width="'90px'" v-if="pageType != 'view'">
+				<el-form :inline="true" :model="formData" ref="form" :rules="dataRule" :label-width="'90px'"
+					v-if="pageType != 'view' && pageType != 'patrol'">
 					<el-row>
 						<el-col :span="6">
-							<el-form-item label="设备名称" prop="equipmentName">
-								<el-input v-model.trim="formData.equipmentName" :disabled="disabled" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
+							<!-- <el-form-item label="所属组织" prop="agencyId">
+								<el-input v-model.trim="formData.agencyId" :disabled="disabled"
+									class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
+							</el-form-item> -->
+
+							<el-form-item label="所属组织" prop="agencyId">
+                            <el-cascader class="u-item-width-normal" size="small" ref="myCascader"
+                                v-model.trim="formData.agencyId" :options="orgOptions" :props="orgOptionProps"
+                                :show-all-levels="false" @change="handleChangeAgency" clearable></el-cascader>
+                        </el-form-item>
+
+						</el-col>
+						<el-col :span="6">
+							<el-form-item label="企业名称" prop="name">
+								<el-input v-model.trim="formData.name" :disabled="disabled"
+									class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
+							</el-form-item>
+						</el-col>
+						<el-col :span="6">
+							<el-form-item label="九小场所" prop="nineSmallPlacesFlag">
+								<el-radio-group v-model="formData.nineSmallPlacesFlag" :disabled="disabled" size="small">
+									<el-radio label="是">是</el-radio>
+									<el-radio label="否">否</el-radio>
+								</el-radio-group>
 							</el-form-item>
 						</el-col>
 						<el-col :span="6">
-							<el-form-item label="设备编号" prop="equipmentNum">
-								<el-input v-model.trim="formData.equipmentNum" :disabled="disabled" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
+							<el-form-item label="九小场分类" prop="nineSmallPlacesCategory" style="white-space: nowrap;overflow: hidden;">
+								<el-input v-model.trim="formData.nineSmallPlacesCategory" :disabled="disabled"
+									class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
 							</el-form-item>
 						</el-col>
 						<el-col :span="6">
-							<el-form-item label="负责人" prop="principalName">
-								<el-input v-model.trim="formData.principalName" :disabled="disabled" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
+							<el-form-item label="规模" prop="scale">
+								<el-input v-model.trim="formData.scale" :disabled="disabled"
+									class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
 							</el-form-item>
 						</el-col>
 						<el-col :span="6">
-							<el-form-item label="联系电话" prop="contactNum">
-								<el-input v-model.trim="formData.contactNum" :disabled="disabled" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
+							<el-form-item label="负责人" prop="chargePerson">
+								<el-input v-model.trim="formData.chargePerson" :disabled="disabled"
+									class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
+							</el-form-item>
+						</el-col>
+						<el-col :span="6">
+							<el-form-item label="联系电话" prop="mobile">
+								<el-input v-model.trim="formData.mobile" :disabled="disabled"
+									class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
 							</el-form-item>
 						</el-col>
 						<el-col :span="18">
-							<el-form-item label="所处位置" prop="location" style="display: block">
-								<el-select
-									v-model.trim="formData.location"
-									:disabled="disabled"
-									filterable
-									remote
-									:reserve-keyword="true"
-									placeholder="请输入关键词"
-									:remote-method="remoteMethod"
-									:loading="loading"
-									@keyup.enter.native="remoteMethod(formData.location)"
-								>
-									<el-option
-										v-for="(item, index) in searchOptions"
-										@click.native="handleClickKey(index)"
-										:key="item.value"
-										:label="item.label"
-										:value="item.value"
-									></el-option>
+							<el-form-item label="企业地址" prop="address" style="display: block">
+								<el-select v-model.trim="formData.address" :disabled="disabled" filterable remote
+									:reserve-keyword="true" placeholder="请输入关键词" :remote-method="remoteMethod"
+									:loading="loading" @keyup.enter.native="remoteMethod(formData.location)">
+									<el-option v-for="(item, index) in searchOptions"
+										@click.native="handleClickKey(index)" :key="item.value" :label="item.label"
+										:value="item.value"></el-option>
 								</el-select>
 							</el-form-item>
 						</el-col>
@@ -58,32 +79,157 @@
 				<el-form :inline="false" :model="formData" ref="form" :label-width="'90px'" v-if="pageType == 'view'">
 					<el-row>
 						<el-col :span="6">
-							<el-form-item label="设备名称" prop="equipmentName">{{ formData.equipmentName }}</el-form-item>
+							<el-form-item label="所属组织" prop="equipmentName">{{ formData.equipmentName }}</el-form-item>
+						</el-col>
+						<el-col :span="6">
+							<el-form-item label="企业名称" prop="equipmentNum">{{ formData.equipmentNum }}</el-form-item>
+						</el-col>
+						<el-col :span="6">
+							<el-form-item label="九小场所" prop="principalName">{{ formData.principalName }}</el-form-item>
 						</el-col>
 						<el-col :span="6">
-							<el-form-item label="设备编号" prop="equipmentNum">{{ formData.equipmentNum }}</el-form-item>
+							<el-form-item label="规模" prop="contactNum">{{ formData.contactNum }}</el-form-item>
 						</el-col>
 						<el-col :span="6">
-							<el-form-item label="负责人" prop="principalName">{{ formData.principalName }}</el-form-item>
+							<el-form-item label="负责人" prop="contactNum">{{ formData.contactNum }}</el-form-item>
 						</el-col>
 						<el-col :span="6">
-							<el-form-item label="联系电话" prop="contactNum">{{ formData.contactNum }}</el-form-item>
+							<el-form-item label="联系电话" prop="mobile">{{ formData.mobile }}</el-form-item>
 						</el-col>
 						<el-col :span="6">
-							<el-form-item label="场所地址" prop="location" style="display: block">{{ formData.location }}</el-form-item>
+							<el-form-item label="企业地址" prop="location" style="display: block">{{ formData.location
+								}}</el-form-item>
 						</el-col>
 					</el-row>
 					<div id="app_event" class="div_map"></div>
 				</el-form>
+				<el-form :inline="false" :model="formData" ref="form" :label-width="'90px'" v-if="pageType == 'patrol'"
+					style="margin-left: 50px;">
+					<div class="div_btn">
+						<el-button size="small" type="primary " @click="patrolAddd()">新增</el-button>
+					</div>
+					<el-row v-for="(item, index) in tableData" :key="index" :gutter="20" style="margin-bottom: 20px;">
+						<el-row style="margin-top: 20px;">
+							<el-col :span="24">
+								<el-tag type="primary" effect="plain" class="custom-tag">●</el-tag>{{ item.datereviewTime}}
+							</el-col>
+						</el-row>
+
+						<el-row style="margin-top: 15px;">
+							<el-col :span="6" style="padding-left: 65px;"> <span style="color: #888; ">检查人员:</span> {{
+								item.checkPersons }}</el-col>
+							<el-col :span="6" style="padding-left: 65px;"><span style="color: #888; ">检查结论:</span> {{
+								item.checkResultFlag }}</el-col>
+							<el-col :span="6" style="padding-left: 65px;"><span style="color: #888; ">拟复查时间: </span> {{
+								item.reviewTime }}</el-col>
+						</el-row>
+						<el-row style="margin-top: 15px;">
+							<el-col :span="24" style="padding-left: 65px;"><span style="color: #888; ">隐患明细: </span> {{
+								item.hazardDetails }}</el-col>
+						</el-row>
+						<el-row style="margin-top: 15px;">
+							<el-col :span="24" style="padding-left: 65px;"> <span style="color: #888; ">整改要求: </span>{{
+								item.requirements }}</el-col>
+						</el-row>
+						<el-row style="margin-top: 15px;">
+							<el-col :span="6" style="padding-left: 65px;"><span style="color: #888; ">附件: </span>{{
+								item.attachmentUrl }}</el-col>
+							<el-col :span="6" style="padding-left: 65px;"><span style="color: #888; ">备注: </span>{{
+								item.remark }}</el-col>
+						</el-row>
+					</el-row>
+					<!-- 巡查记录新增 -->
+					<el-form :inline="true" :model="formData" ref="form" :rules="dataRule" :label-width="'90px'"
+						v-if="patrolAdd">
+						<el-row>
+							<el-col :span="16">
+								<el-form-item label="巡查时间" prop="equipmentName">
+									<el-input v-model.trim="formData.equipmentName" :disabled="disabled"
+										class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
+								</el-form-item>
+							</el-col>
+							<el-col :span="16">
+								<el-form-item label="检察人员" prop="equipmentNum">
+									<el-input v-model.trim="formData.equipmentNum" :disabled="disabled"
+										class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
+								</el-form-item>
+							</el-col>
+						</el-row>
+						<el-row>
+							<el-col :span="18">
+								<el-form-item label="检查结论" prop="principalName">
+									<el-input v-model.trim="formData.principalName" :disabled="disabled"
+										class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
+								</el-form-item>
+							</el-col>
+							<el-col :span="18">
+								<el-form-item label="拟复查时间" prop="principalName"
+									style="white-space: nowrap; overflow: hidden;">
+									<el-date-picker class="u-item-width-normal" size="small"
+										v-model.trim="formData.latestInspectTime" type="datetime"
+										format="yyyy-MM-dd HH:mm:ss" placeholder="选择日期"></el-date-picker>
+								</el-form-item>
+							</el-col>
+						</el-row>
+						<el-row>
+							<el-col :span="8">
+								<el-form-item label="已整改隐患" prop="principalName"
+									style="white-space: nowrap;overflow: hidden;">
+									<el-radio-group v-model="formData.latestInspectTime" size="small">
+										<el-col v-for="option in radioOptions" :key="option.value">
+											<el-checkbox :label="option.value">{{ option.label }}</el-checkbox>
+										</el-col>
+									</el-radio-group>
+								</el-form-item>
+							</el-col>
+						</el-row>
+						<el-row>
+							<el-col :span="18" v-for="(item, index) in inputList" :key="index">
+								<el-form-item label="" prop="textarea" class="input-container">
+									<el-input v-model="item.value" rows="3" placeholder="请输入隐患信息"></el-input>
+								</el-form-item>
+								<el-button @click="removeInput(index)" v-if="inputList.length > 1"
+									class="remove-button">
+									<el-icon name="minus"></el-icon>
+								</el-button>
+								<el-button @click="addInput" v-if="index === inputList.length - 1">
+									<el-icon name="plus"></el-icon>
+								</el-button>
+							</el-col>
+						</el-row>
+						<el-row>
+							<el-col :span="6">
+								<!-- <el-form-item label="附件">
+									<template>
+										<upload-image :defaultFileList="fileList" :limit="6"
+											@change="onChangeFileList"></upload-image>
+									</template>
+								</el-form-item> -->
+								<el-form-item label="附件">
+									<upload-image :defaultFileList="fileList" :limit="6" @change="onChangeFileList"
+										v-if="true"></upload-image>
+								</el-form-item>
+							</el-col>
+							<el-col :span="18">
+								<el-form-item label="备注" prop="textarea">
+									<el-input v-model.trim="formData.principalName" :disabled="disabled"
+										class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
+								</el-form-item>
+							</el-col>
+						</el-row>
+					</el-form>
+					<!-- 巡查记录新增end -->
+				</el-form>
 			</div>
-			<div class="div_btn" v-if="pageType != 'view'">
-				<el-button size="small" @click="handleCancle">取 消</el-button>
+			<div class="div_btn" v-if="patrolAdd">
+				<el-button size="small" @click="handleCancle">关闭</el-button>
 				<!-- <el-button size="small" @click="resetData" v-if="pageType != 'view'">重置</el-button> -->
-				<el-button size="small" type="primary" :disabled="btnDisable" @click="handleComfirm">确 定</el-button>
+				<!-- <el-button size="small" type="primary" :disabled="btnDisable" @click="handleComfirm">确 定</el-button> -->
 			</div>
 		</div>
 		<span slot="footer" class="dialog-footer">
-			<el-button @click="handleCancle" size="small">关 闭</el-button>
+			<el-button @click="handleCancle" size="small">取消</el-button>
+			<el-button @click="handleCancle" size="small"  type="primary">确定</el-button>
 			<!-- <el-button type="primary" @click="handleComfirm">确 定</el-button> -->
 		</span>
 	</el-dialog>
@@ -96,6 +242,8 @@ import { Loading } from 'element-ui'; // 引入Loading服务
 import { requestPost, requestGet } from '@/js/dai/request';
 import daiMap from '@/utils/dai-map';
 import nextTick from 'dai-js/tools/nextTick';
+// import UploadImage from '@/views/modules/plugins/rent/rentcontractinfo-add-or-update'
+import UploadImage from '@/views/modules/plugins/rent/upload-image.vue'
 let loading; // 加载动画
 let map;
 var search;
@@ -142,7 +290,47 @@ export default {
 				callback();
 			}
 		};
+		let orgOptionProps = {
+            multiple: false,
+            value: 'agencyId',
+            label: 'agencyName',
+            children: 'subAgencyList',
+            checkStrictly: true
+        }
+
 		return {
+			orgOptions:[],
+			orgOptionProps,
+			inputList: [{ value: '' }],//隐患输入框 
+			fileList:[],
+			patrolAdd: false,
+			radioOptions: [
+				{ label: 'Option 1', value: 'option1' },
+				{ label: 'Option 2', value: 'option2' },
+				{ label: '已整改隐患已整改隐患已整改隐患已整改隐患已整改隐患已整改隐患已整改隐患已整改隐患已整改隐患已整改隐患已整改隐患', value: '已整改隐患已整改隐患已整改隐患已整改隐患已整改隐患已整改隐患已整改隐患已整改隐患' },
+			],
+			tableData: [
+				{
+					datereviewTime: '2019-04-22 09:30',
+					checkPersons: '张三，李四',
+					checkResultFlag: '不合格',
+					reviewTime: '2019-04-22 09:30',
+					issues: ['1、生产配件机械设备到达年间', '2、配件工艺未达标需要年检机械设备、配件'],
+					requirements: ['1、第1条安全一定要过关', '2、第2条，设备需要保养'],
+					attachmentUrl: '123456789.jPg',
+					remark: '请相关负责人尽快处理'
+				},
+				{
+					datereviewTime: '2019-04-22 09:30',
+					checkPersons: '张三，李四',
+					checkResultFlag: '不合格',
+					reviewTime: '2019-04-22 09:30',
+					issues: ['1、生产配件机械设备到达年间', '2、配件工艺未达标需要年检机械设备、配件'],
+					requirements: ['1、第1条安全一定要过关', '2、第2条，设备需要保养'],
+					attachmentUrl: '123456789.jPg',
+					remark: '请相关负责人尽快处理'
+				},
+			],
 			detailIdcopy:this.detailId,
 			btnDisable: false,
 			user: '',
@@ -153,18 +341,24 @@ export default {
 			equipmentCategoryCodeArray: [],
 			list: {},
 			formData: {
-				equipmentName: '',
-				equipmentCategoryCode: '',
-				principalName: '',
-				location: '',
-				contactNum: ''
+				agencyId:'',
+				name:'',
+				address:'',
+				scale:'',
+				chargePerson:'',
+				mobile:'',
+				nineSmallPlacesFlag:'',
+				nineSmallPlacesCategory:''
 			},
 			dataRule: {
-				equipmentName: [{ required: true, message: '设备名称不能为空', trigger: 'bulr' }],
-				equipmentNum: [{ required: true, message: '设备编号不能为空', trigger: 'bulr' }],
-				principalName: [{ required: true, message: '负责人不能为空', trigger: 'bulr' }],
-				contactNum: [{ required: true, message: '联系电话不能为空', trigger: 'blur' }],
-				location: [{ required: true, message: '所处位置不能为空', trigger: 'blur' }]
+				agencyId: [{ required: true, message: '所属组织必选', trigger: 'blur' }],
+				name: [{ required: true, message: '企业名称不能为空', trigger: 'blur' }],
+				address: [{ required: true, message: '企业地址不能为空', trigger: 'blur' }],
+				scale: [{ required: true, message: '规模不能为空', trigger: 'blur' }],
+				chargePerson: [{ required: true, message: '负责人不能为空', trigger: 'blur' }],
+				mobile: [{ required: true, message: '联系电话不能为空', trigger: 'blur' }],
+				nineSmallPlacesCategory: [{ required: true, message: '九小场所类型不能为空', trigger: 'blur' }],
+				nineSmallPlacesFlag: [{ required: true, message: '九小场所类型不能为空', trigger: 'blur' }],
 			},
 			//地图
 			loading: false,
@@ -173,9 +367,10 @@ export default {
 		};
 	},
 	watch: {},
-	components: {  },
+	components: {  UploadImage  },
 	created() {},
 	async mounted() {
+		this.getOrgTreeList();
 		console.log('detailId', this.detailId);
 		this.user = this.$store.state.user;
 		this.agencyId = this.user.agencyId;
@@ -193,6 +388,55 @@ export default {
 	},
 
 	methods: {
+		handleChangeAgency(val) {
+			this.sarr = []
+			const map = new Map();
+			this.getLastItem(
+				this.orgOptions,
+				val,
+				"agencyId"
+			);
+			this.level = this.sarr[this.sarr.length - 1].level
+		},
+		getOrgTreeList() {
+            this.$http
+                .post('/gov/org/customeragency/agencygridtree', {})
+                .then(({ data: res }) => {
+                    if (res.code !== 0) {
+                        return this.$message.error(res.msg)
+                    } else {
+                        console.log('获取组织树成功', res.data)
+                        this.orgOptions = []
+                        this.orgOptions.push(res.data)
+                    }
+                })
+                .catch(() => {
+                    return this.$message.error('网络错误')
+                })
+        },
+		addInput() {
+			this.inputList.push({ value: '' }); // 新增一个输入框，对应一个新的对象
+		},
+		removeInput(index) {
+			this.inputList.splice(index, 1); // 删除对应索引的输入框
+		},
+		onChangeFileList(e, rowIndex = 0) {
+			console.log('onChangeFileList', e)
+			if (e.length > 0) {
+				this.fileList = []
+				e.forEach(item => {
+					let ob = {
+						fileType: '0',
+						fileUrl: item.response.data.url
+					}
+					this.fileList.push(ob)
+				})
+			}
+		},
+
+		patrolAddd(){
+			this.patrolAdd=true
+		},
 		async loadCategory() {
 			const url = '/sys/dict/data/dictlist';
 
@@ -423,4 +667,11 @@ export default {
 .el-dialog__body {
     padding: 30px 80px;
 }
+.div_btn {
+	display: flex;
+}
+.custom-tag {
+  font-size: 16px; /* 设置圆点大小 */
+  border: none; /* 去掉边框 */
+}
 </style>
diff --git a/src/views/modules/resourceManagement/enterprise/index.vue b/src/views/modules/resourceManagement/enterprise/index.vue
index 16d010050..b4add0cdc 100644
--- a/src/views/modules/resourceManagement/enterprise/index.vue
+++ b/src/views/modules/resourceManagement/enterprise/index.vue
@@ -4,38 +4,45 @@
             <div class="m-search">
                 <el-form :inline="true" :model="formData" ref="ref_searchform" :label-width="'105px'">
                     <div>
-                        <el-form-item label="企业名称" prop="equipmentName">
-                            <el-input v-model.trim="formData.equipmentName" class="u-item-width-normal" size="small"
+                        <el-form-item label="企业名称" prop="name">
+                            <el-input v-model.trim="formData.name" class="u-item-width-normal" size="small"
                                 clearable placeholder="请输入"></el-input>
                         </el-form-item>
-                        <el-form-item label="规模" prop="equipmentNum">
-                            <el-input v-model.trim="formData.equipmentNum" class="u-item-width-normal" size="small"
+                        <el-form-item label="规模" prop="scale">
+                            <el-input v-model.trim="formData.scale" class="u-item-width-normal" size="small"
                                 clearable placeholder="请输入"></el-input>
                         </el-form-item>
 
-                        <el-form-item label="负责人" prop="location">
-                            <el-input v-model.trim="formData.location" class="u-item-width-normal" size="small"
+                        <el-form-item label="负责人" prop="chargePerson">
+                            <el-input v-model.trim="formData.chargePerson" class="u-item-width-normal" size="small"
                                 clearable placeholder="请输入"></el-input>
                         </el-form-item>
-                        <el-form-item label="联系人" prop="principalName">
-                            <el-input v-model.trim="formData.principalName" class="u-item-width-normal" size="small"
+                        <el-form-item label="联系人" prop="linkPerson">
+                            <el-input v-model.trim="formData.linkPerson" class="u-item-width-normal" size="small"
                                 clearable placeholder="请输入"></el-input>
                         </el-form-item>
-                        <el-form-item label="九小场所分类" prop="latestInspectTime">
-                            <el-select v-model.trim="formData.location" placeholder="请选择" class="u-item-width-normal"
+                        <el-form-item label="九小场所" prop="nineSmallPlacesFlag">
+                            <el-select v-model.trim="formData.nineSmallPlacesFlag" placeholder="请选择" class="u-item-width-normal"
+                                size="small">
+                                <el-option v-for="item in nineArray" :key="item.value" :label="item.label"
+                                    :value="item.value"></el-option>
+                            </el-select>
+                        </el-form-item>
+                        <el-form-item label="九小场所分类" prop="nineSmallPlacesCategory">
+                            <el-select v-model.trim="formData.nineSmallPlacesCategory" placeholder="请选择" class="u-item-width-normal"
                                 size="small">
                                 <el-option v-for="item in option" :label="item.label" :value="item.value"
                                     :key="item.value">
                                 </el-option>
                             </el-select>
                         </el-form-item>
-                        <el-form-item label="最新检查时间" prop="latestInspectResult">
+                        <el-form-item label="最新检查时间" prop="orderDate">
                             <el-date-picker class="u-item-width-normal" size="small"
-                                v-model.trim="formData.latestInspectTime"  type="datetime" format="yyyy-MM-dd HH:mm:ss"
+                                v-model.trim="formData.orderDate"  type="datetime" format="yyyy-MM-dd HH:mm:ss"
                                 placeholder="选择日期"></el-date-picker>
                         </el-form-item>
-                        <el-form-item label="最新检查结果" prop="latestInspectResult">
-                            <el-select v-model.trim="formData.latestInspectResult" placeholder="请选择" size="small"
+                        <el-form-item label="最新检查结果" prop="checkResultFlag">
+                            <el-select v-model.trim="formData.checkResultFlag" placeholder="请选择" size="small"
                                 clearable class="u-item-width-normal">
                                 <el-option v-for="item in resultArray" :key="item.value" :label="item.label"
                                     :value="item.value"></el-option>
@@ -72,11 +79,11 @@
                     @selection-change="handleSelectionChange" :height="maxTableHeight">
                     <!-- <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="equipmentName" align="center" label="设备名称"
+                    <el-table-column prop="equipmentName" align="center" label="企业名称"
                         :show-overflow-tooltip="true"></el-table-column>
-                    <el-table-column prop="equipmentNum" align="center" label="设备编号"></el-table-column>
+                    <el-table-column prop="equipmentNum" align="center" label="企业地址"></el-table-column>
 
-                    <el-table-column prop="location" label="所处位置" min-width="140" align="center"
+                    <el-table-column prop="location" label="规模" min-width="140" align="center"
                         :show-overflow-tooltip="true" />
                     <el-table-column prop="principalName" align="center" label="负责人"
                         :show-overflow-tooltip="true"></el-table-column>
@@ -95,7 +102,7 @@
                                 type="text">
                                 编辑
                             </el-button>
-                            <el-button style="margin-right: 10px" @click="handleAdd(scope.row, 'edit')" size="small"
+                            <el-button style="margin-right: 10px" @click="handleAdd(scope.row, 'patrol')" size="small"
                                 type="text">
                                 巡查记录
                             </el-button>
@@ -136,17 +143,23 @@ export default {
             user: '',
             agencyId: '',
             formData: {
-                equipmentName: '',
-                equipmentCategoryCode: '',
-                principalName: '',
-                contactNum: '',
-                address: ''
+                orderDate:'',
+                checkResultFlag:'',
+                nineSmallPlacesCategory:'',
+                nineSmallPlacesFlag:'',
+                mobile:'',
+                linkPerson:'',
+                chargePerson:'',
+                scale:'',
+                address:'',
+                name:''
             },
             pageType: 'list', // 列表list 新增add  处理dispose 详情info
             gridList: [], //所属网格list--场所区域
             placeTypeList: [], //场所类型
             tableData: [],
             resultArray: [{ value: '1', label: '合格' }, { value: '0', label: '不合格' }],
+            nineArray: [{ value: '1', label: '是' }, { value: '0', label: '否' }],
             equipmentCategoryCodeArray: [],
             pageNo: 1,
             pageSize: window.localStorage.getItem('pageSize') || 20,
@@ -176,8 +189,29 @@ export default {
         this.loadplaceType();
         this.loadCategory();
         this.getTableData();
+        this.loadTable();
     },
     methods: {
+        async loadTable() {
+            // this.tableLoading = true
+
+            const url = "/actual/base/companyInfo/page"
+            // const url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyactivity/list"
+            let params = {
+                agencyId: this.agencyId,
+                pageSize: this.pageSize,
+                pageNo: this.pageNo,
+                ...this.formData
+            }
+            const { data, code, msg } = await requestPost(url, params)
+            if (code === 0) {
+                console.log('坎坎坷坷喀喀喀喀喀喀',data)
+                this.total = data.total
+                this.tableData = data.list
+            } else {
+                this.$message.error(msg)
+            }
+        },
         handleSelectionChange(val) {
             this.multipleSelection = [];
             val.forEach(element => {

From 81f2a71236862c4e266446b37655d2e3ad277b7d Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Wed, 8 May 2024 15:50:47 +0800
Subject: [PATCH 03/19] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3=E8=81=94=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resourceManagement/enterprise/addForm.vue | 262 ++++++++----------
 .../resourceManagement/enterprise/index.vue   |  64 ++---
 2 files changed, 140 insertions(+), 186 deletions(-)

diff --git a/src/views/modules/resourceManagement/enterprise/addForm.vue b/src/views/modules/resourceManagement/enterprise/addForm.vue
index 3fadddcc4..41e6f64b7 100644
--- a/src/views/modules/resourceManagement/enterprise/addForm.vue
+++ b/src/views/modules/resourceManagement/enterprise/addForm.vue
@@ -21,7 +21,7 @@
                             <el-cascader class="u-item-width-normal" size="small" ref="myCascader"
                                 v-model.trim="formData.agencyId" :options="orgOptions" :props="orgOptionProps"
                                 :show-all-levels="false" @change="handleChangeAgency" clearable></el-cascader>
-                        </el-form-item>
+                        	</el-form-item>
 
 						</el-col>
 						<el-col :span="6">
@@ -30,18 +30,22 @@
 									class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
 							</el-form-item>
 						</el-col>
-						<el-col :span="6">
+						<el-col :span="4.5">
 							<el-form-item label="九小场所" prop="nineSmallPlacesFlag">
 								<el-radio-group v-model="formData.nineSmallPlacesFlag" :disabled="disabled" size="small">
-									<el-radio label="是">是</el-radio>
-									<el-radio label="否">否</el-radio>
+									<el-radio :label="1">是</el-radio>
+									<el-radio :label="0">否</el-radio>
 								</el-radio-group>
 							</el-form-item>
 						</el-col>
-						<el-col :span="6">
-							<el-form-item label="九小场分类" prop="nineSmallPlacesCategory" style="white-space: nowrap;overflow: hidden;">
-								<el-input v-model.trim="formData.nineSmallPlacesCategory" :disabled="disabled"
-									class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
+						<el-col :span="7.5">
+							<el-form-item label="九小场所分类" prop="nineSmallPlacesCategory" label-width="150px">
+									<el-select v-model.trim="formData.nineSmallPlacesCategory" :disabled="disabled" placeholder="请选择" class="u-item-width-normal"
+                                size="small">
+                                <el-option v-for="item in placeTypeList" :label="item.label" :value="item.value"
+                                    :key="item.value">
+                                </el-option>
+                            </el-select>
 							</el-form-item>
 						</el-col>
 						<el-col :span="6">
@@ -76,34 +80,34 @@
 					</el-row>
 					<div id="app_event" class="div_map"></div>
 				</el-form>
-				<el-form :inline="false" :model="formData" ref="form" :label-width="'90px'" v-if="pageType == 'view'">
+				<el-form :inline="false" :model="formData" ref="form1" :label-width="'90px'" v-if="pageType == 'view'">
 					<el-row>
 						<el-col :span="6">
 							<el-form-item label="所属组织" prop="equipmentName">{{ formData.equipmentName }}</el-form-item>
 						</el-col>
 						<el-col :span="6">
-							<el-form-item label="企业名称" prop="equipmentNum">{{ formData.equipmentNum }}</el-form-item>
+							<el-form-item label="企业名称" prop="name">{{ formData.name }}</el-form-item>
 						</el-col>
 						<el-col :span="6">
-							<el-form-item label="九小场所" prop="principalName">{{ formData.principalName }}</el-form-item>
+							<el-form-item label="九小场所分类" prop="nineSmallPlacesCategory">{{ formData.nineSmallPlacesCategory }}</el-form-item>
 						</el-col>
 						<el-col :span="6">
-							<el-form-item label="规模" prop="contactNum">{{ formData.contactNum }}</el-form-item>
+							<el-form-item label="规模" prop="scale">{{ formData.scale }}</el-form-item>
 						</el-col>
 						<el-col :span="6">
-							<el-form-item label="负责人" prop="contactNum">{{ formData.contactNum }}</el-form-item>
+							<el-form-item label="负责人" prop="chargePerson">{{ formData.chargePerson }}</el-form-item>
 						</el-col>
 						<el-col :span="6">
 							<el-form-item label="联系电话" prop="mobile">{{ formData.mobile }}</el-form-item>
 						</el-col>
 						<el-col :span="6">
-							<el-form-item label="企业地址" prop="location" style="display: block">{{ formData.location
+							<el-form-item label="企业地址" prop="address" style="display: block">{{ formData.address
 								}}</el-form-item>
 						</el-col>
 					</el-row>
 					<div id="app_event" class="div_map"></div>
 				</el-form>
-				<el-form :inline="false" :model="formData" ref="form" :label-width="'90px'" v-if="pageType == 'patrol'"
+				<el-form :inline="false" :model="formData" ref="form2" :label-width="'90px'" v-if="pageType == 'patrol'"
 					style="margin-left: 50px;">
 					<div class="div_btn">
 						<el-button size="small" type="primary " @click="patrolAddd()">新增</el-button>
@@ -124,8 +128,10 @@
 								item.reviewTime }}</el-col>
 						</el-row>
 						<el-row style="margin-top: 15px;">
-							<el-col :span="24" style="padding-left: 65px;"><span style="color: #888; ">隐患明细: </span> {{
-								item.hazardDetails }}</el-col>
+							<el-col :span="24" style="padding-left: 65px;"><span style="color: #888; ">隐患明细: </span> <span v-for="(itemC,index) in item.hazardDetails" >{{itemC.hazardDesc}}</span> </el-col>
+						</el-row>
+						<el-row style="margin-top: 15px;">
+							<el-col :span="24" style="padding-left: 65px;"><span style="color: #888; ">隐患明细: </span> <span v-for="(itemC,index) in item.hazardDetails" >{{itemC.hazardDesc}}</span> </el-col>
 						</el-row>
 						<el-row style="margin-top: 15px;">
 							<el-col :span="24" style="padding-left: 65px;"> <span style="color: #888; ">整改要求: </span>{{
@@ -139,41 +145,51 @@
 						</el-row>
 					</el-row>
 					<!-- 巡查记录新增 -->
-					<el-form :inline="true" :model="formData" ref="form" :rules="dataRule" :label-width="'90px'"
+					<el-form :inline="true" :model="formData" ref="form" :rules="dataRule" :label-width="'105px'"
 						v-if="patrolAdd">
 						<el-row>
 							<el-col :span="16">
-								<el-form-item label="巡查时间" prop="equipmentName">
-									<el-input v-model.trim="formData.equipmentName" :disabled="disabled"
-										class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
+								<el-form-item label="巡查时间" prop="checkTime"
+									style="white-space: nowrap; overflow: hidden;">
+									<el-date-picker class="u-item-width-normal" size="small"
+										v-model.trim="formData.checkTime" type="datetime"
+										format="yyyy-MM-dd HH:mm:ss" placeholder="选择日期"></el-date-picker>
 								</el-form-item>
 							</el-col>
 							<el-col :span="16">
-								<el-form-item label="检察人员" prop="equipmentNum">
-									<el-input v-model.trim="formData.equipmentNum" :disabled="disabled"
-										class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
+								<el-form-item label="检查人员" prop="equipmentNum">
+									<el-select v-model.trim="formData.nineSmallPlacesCategory" :disabled="disabled" placeholder="请选择" class="u-item-width-normal"
+                                size="small" multiple>
+                                <el-option v-for="item in stafflist" :label="item.name" :value="item.staffId"
+                                    :key="item.value">
+                                </el-option>
+                            </el-select>
 								</el-form-item>
 							</el-col>
 						</el-row>
 						<el-row>
 							<el-col :span="18">
-								<el-form-item label="检查结论" prop="principalName">
-									<el-input v-model.trim="formData.principalName" :disabled="disabled"
-										class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
+								<el-form-item label="检查结论" prop="checkResultFlag">
+									<el-select v-model.trim="formData.checkResultFlag" :disabled="disabled" placeholder="请选择" class="u-item-width-normal"
+                                size="small">
+                                <el-option v-for="item in resultArray" :label="item.label" :value="item.value"
+                                    :key="item.value">
+                                </el-option>
+                            </el-select>
 								</el-form-item>
 							</el-col>
 							<el-col :span="18">
-								<el-form-item label="拟复查时间" prop="principalName"
+								<el-form-item label="拟复查时间" prop="reviewTime"
 									style="white-space: nowrap; overflow: hidden;">
 									<el-date-picker class="u-item-width-normal" size="small"
-										v-model.trim="formData.latestInspectTime" type="datetime"
+										v-model.trim="formData.reviewTime" type="datetime"
 										format="yyyy-MM-dd HH:mm:ss" placeholder="选择日期"></el-date-picker>
 								</el-form-item>
 							</el-col>
 						</el-row>
 						<el-row>
 							<el-col :span="8">
-								<el-form-item label="已整改隐患" prop="principalName"
+								<el-form-item label="隐患明细" prop="principalName"
 									style="white-space: nowrap;overflow: hidden;">
 									<el-radio-group v-model="formData.latestInspectTime" size="small">
 										<el-col v-for="option in radioOptions" :key="option.value">
@@ -199,20 +215,14 @@
 						</el-row>
 						<el-row>
 							<el-col :span="6">
-								<!-- <el-form-item label="附件">
-									<template>
-										<upload-image :defaultFileList="fileList" :limit="6"
-											@change="onChangeFileList"></upload-image>
-									</template>
-								</el-form-item> -->
 								<el-form-item label="附件">
 									<upload-image :defaultFileList="fileList" :limit="6" @change="onChangeFileList"
 										v-if="true"></upload-image>
 								</el-form-item>
 							</el-col>
 							<el-col :span="18">
-								<el-form-item label="备注" prop="textarea">
-									<el-input v-model.trim="formData.principalName" :disabled="disabled"
+								<el-form-item label="备注" prop="remark">
+									<el-input v-model.trim="formData.remark" :disabled="disabled"
 										class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
 								</el-form-item>
 							</el-col>
@@ -221,16 +231,10 @@
 					<!-- 巡查记录新增end -->
 				</el-form>
 			</div>
-			<div class="div_btn" v-if="patrolAdd">
-				<el-button size="small" @click="handleCancle">关闭</el-button>
-				<!-- <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>
 		<span slot="footer" class="dialog-footer">
 			<el-button @click="handleCancle" size="small">取消</el-button>
-			<el-button @click="handleCancle" size="small"  type="primary">确定</el-button>
-			<!-- <el-button type="primary" @click="handleComfirm">确 定</el-button> -->
+			<el-button @click="handleComfirm" size="small"  type="primary">确定</el-button>
 		</span>
 	</el-dialog>
 </template>
@@ -276,7 +280,8 @@ export default {
 		disabled: {
 			type: Boolean,
 			default: false
-		}
+		},
+		
 	},
 
 	data() {
@@ -315,8 +320,12 @@ export default {
 					checkPersons: '张三，李四',
 					checkResultFlag: '不合格',
 					reviewTime: '2019-04-22 09:30',
-					issues: ['1、生产配件机械设备到达年间', '2、配件工艺未达标需要年检机械设备、配件'],
-					requirements: ['1、第1条安全一定要过关', '2、第2条，设备需要保养'],
+					hazardDetails:[
+						{
+							hazardStatus:0,
+							hazardDesc:'卫生没整好'
+						}
+					],
 					attachmentUrl: '123456789.jPg',
 					remark: '请相关负责人尽快处理'
 				},
@@ -325,21 +334,23 @@ export default {
 					checkPersons: '张三，李四',
 					checkResultFlag: '不合格',
 					reviewTime: '2019-04-22 09:30',
-					issues: ['1、生产配件机械设备到达年间', '2、配件工艺未达标需要年检机械设备、配件'],
-					requirements: ['1、第1条安全一定要过关', '2、第2条，设备需要保养'],
+					hazardDetails:[
+						{
+							hazardStatus:1,
+							hazardDesc:'卫生没整好2'
+						}
+					],
 					attachmentUrl: '123456789.jPg',
 					remark: '请相关负责人尽快处理'
 				},
 			],
-			detailIdcopy:this.detailId,
 			btnDisable: false,
 			user: '',
 			agencyId: '',
 			gridList: [], //所属网格list--场所区域
 			placeTypeList: [], //场所类型
 			resultArray: [{ value: '0', label: '合格' }, { value: '1', label: '不合格' }],
-			equipmentCategoryCodeArray: [],
-			list: {},
+			stafflist: [],
 			formData: {
 				agencyId:'',
 				name:'',
@@ -348,10 +359,10 @@ export default {
 				chargePerson:'',
 				mobile:'',
 				nineSmallPlacesFlag:'',
-				nineSmallPlacesCategory:''
+				nineSmallPlacesCategory:[]
 			},
 			dataRule: {
-				agencyId: [{ required: true, message: '所属组织必选', trigger: 'blur' }],
+				agencyId: [{ required: true, message: '所属组织不能为空', trigger: 'blur' }],
 				name: [{ required: true, message: '企业名称不能为空', trigger: 'blur' }],
 				address: [{ required: true, message: '企业地址不能为空', trigger: 'blur' }],
 				scale: [{ required: true, message: '规模不能为空', trigger: 'blur' }],
@@ -362,7 +373,6 @@ export default {
 			},
 			//地图
 			loading: false,
-			searchValue: '',
 			searchOptions: []
 		};
 	},
@@ -371,32 +381,24 @@ export default {
 	created() {},
 	async mounted() {
 		this.getOrgTreeList();
-		console.log('detailId', this.detailId);
 		this.user = this.$store.state.user;
 		this.agencyId = this.user.agencyId;
 		this.startLoading();
-		this.loadCategory();
-		// this.loadGrid();
-		// this.loadplaceType();
-		if (this.pageType != 'add') {
+		this.loadplaceType()
+		if (this.pageType != 'add' && this.pageType != 'patrol') {
 			this.getDetail();
-		} else {
+		}else if(this.pageType == 'patrol') {
+			this.getCompanyDetail()
+			this.getStafflist()
+		}else {
 			this.initMap();
 		}
 		await this.endLoading();
-		this.endLoading();
 	},
 
 	methods: {
 		handleChangeAgency(val) {
-			this.sarr = []
-			const map = new Map();
-			this.getLastItem(
-				this.orgOptions,
-				val,
-				"agencyId"
-			);
-			this.level = this.sarr[this.sarr.length - 1].level
+			this.formData.agencyId = val.length ? val[val.length - 1] : val[0];
 		},
 		getOrgTreeList() {
             this.$http
@@ -437,33 +439,6 @@ export default {
 		patrolAddd(){
 			this.patrolAdd=true
 		},
-		async loadCategory() {
-			const url = '/sys/dict/data/dictlist';
-
-			let params = {
-				dictType: 'safety_equipment_category'
-			};
-
-			const { data, code, msg } = await requestPost(url, params);
-			if (code === 0) {
-				this.equipmentCategoryCodeArray = data;
-			} else {
-				this.$message.error(msg);
-			}
-		},
-		async loadGrid() {
-			const url = '/gov/org/customergrid/gridoption';
-			let params = {
-				agencyId: this.agencyId,
-				purpose: 'query'
-			};
-			const { data, code, msg } = await requestPost(url, params);
-			if (code === 0) {
-				this.gridList = data;
-			} else {
-				this.$message.error(msg);
-			}
-		},
 		//场所类型
 		async loadplaceType() {
 			const url = '/gov/org/coverage/dict-select-list/enterprise_patrol';
@@ -478,21 +453,35 @@ export default {
 				this.$message.error(msg);
 			}
 		},
+		// 巡查记录
+		async getCompanyDetail(){
+			const url = `/actual/base/companyInfo/showRecord`;
+			const { data, code, msg } = await requestPost(url,{companyId:this.detailId});
+			if (code === 0) {
+				// this.tableData = data;
+			} else {
+				this.$message.error(msg);
+			}
+		},
+		// 获取组织工作人员
+		getStafflist() {
+		let parms = {
+			orgId:  this.$store.state.user.agencyId,
+			orgType: "agency",
+			pageNo: 1,
+			pageSize: 100,
+		};
+		this.$http.post("data/aggregator/org/stafflist", parms).then((resp) => {
+			this.stafflist = resp.data.data.staffList;
+			console.log("stafflist", resp.data);
+		});
+		},
 		async getDetail() {
-			const url = `/actual/base/monitoringEquipment/detail/${this.detailIdcopy}`;
-			const { data, code, msg } = await requestPost(url);
+			const url = `/actual/base/companyInfo/companyDetail`;
+			const { data, code, msg } = await requestPost(url,{companyId:this.detailId});
 			if (code === 0) {
 				console.log('详情数据', data);
 				this.formData = { ...data };
-				// this.remoteMethod("青岛");
-				 // this.list = this.searchOptions.map(item => {
-				 //                return { value: item.value, label: item.label };
-				 //            });
-				 //            this.formData.location.push(this.list[0].value);
-				 //            this.remoteMethod(this.list[0].label);//调用远程搜索函数
-				
-				
-					// this.remoteMethod("对对对");
 				this.initMap();
 			
 			} else {
@@ -501,49 +490,35 @@ export default {
 		},
 
 		handleComfirm() {
-			this.save();
-		},
-		async handleAdd() {
-			// this.btnDisable = true;
-			// setTimeout(() => {
-			// 	this.btnDisable = false;
-			// }, 10000);
-			// nextTick(1000);
-			// const form = new Promise((resolve, reject) => {
-			// 	this.$refs['form'].validate(valid => {
-			// 		if (valid) resolve();
-			// 	});
-			// });
-			// const form1 = new Promise((resolve, reject) => {
-			// 	this.$refs['form1'].validate(valid => {
-			// 		if (valid) resolve();
-			// 	});
-			// });
-			// Promise.all([form1, form])
-			// 	.then(() => {
-			// 		this.addFuwu();
-			// 	})
-			// 	.catch(() => {
-			// 		app.util.validateRule(messageObj);
-			// 		this.btnDisable = false;
-			// 	});
+			if(this.pageType === 'add' || this.pageType === 'edit'){
+				this.$refs['form'].validate(valid => {
+					if (valid){
+						this.save();
+					}
+				});
+			}else if(this.pageType === 'patrol'){
+				this.$refs['form2'].validate(valid => {
+					if (valid){
+						this.save();
+					}
+				});
+			}
+			// this.save();
 		},
-
 		async save() {
 			console.log('this.formData', this.formData);
 			var url = '';
 			var params = {};
 			if (this.pageType == 'add') {
-				url = '/actual/base/monitoringEquipment/save';
-			} else {
-				url = '/actual/base/monitoringEquipment/update';
+				url = '/actual/base/companyInfo/saveCompanyInfo';
+			} else if (this.pageType == 'edit'){
+				url = '/actual/base/companyInfo/updateCompany';
 			}
 			params = { ...this.formData };
 			const { data, code, msg } = await requestPost(url, params);
 			if (code === 0) {
 				this.$message.success('操作成功');
-                this.detailIdcopy=data
-				// this.handleCancle();
+				this.handleCancle();
 			} else if (code >= 8000) {
 				this.$message.error(msg);
 			}
@@ -614,8 +589,7 @@ export default {
 
 			let { msg, data } = await map.getAddress(lat, lng);
 			if (msg == 'success') {
-				this.formData.location = data.address;
-				this.searchValue = data.address;
+				this.formData.address = data.address;
 				this.searchOptions = [];
 			}
 		},
@@ -654,7 +628,7 @@ export default {
 			map.setMarker(lonlat[1], lonlat[0]);
 			this.formData.latitude = lonlat[1];
 			this.formData.longitude = lonlat[0];
-			this.formData.location = selPosition.address + selPosition.name;
+			this.formData.address = selPosition.address + selPosition.name;
 		}
 	}
 };
diff --git a/src/views/modules/resourceManagement/enterprise/index.vue b/src/views/modules/resourceManagement/enterprise/index.vue
index b4add0cdc..d6b6d2a74 100644
--- a/src/views/modules/resourceManagement/enterprise/index.vue
+++ b/src/views/modules/resourceManagement/enterprise/index.vue
@@ -31,7 +31,7 @@
                         <el-form-item label="九小场所分类" prop="nineSmallPlacesCategory">
                             <el-select v-model.trim="formData.nineSmallPlacesCategory" placeholder="请选择" class="u-item-width-normal"
                                 size="small">
-                                <el-option v-for="item in option" :label="item.label" :value="item.value"
+                                <el-option v-for="item in placeTypeList" :label="item.label" :value="item.value"
                                     :key="item.value">
                                 </el-option>
                             </el-select>
@@ -79,25 +79,26 @@
                     @selection-change="handleSelectionChange" :height="maxTableHeight">
                     <!-- <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="equipmentName" align="center" label="企业名称"
+                    <el-table-column prop="name" align="center" label="企业名称"
                         :show-overflow-tooltip="true"></el-table-column>
-                    <el-table-column prop="equipmentNum" align="center" label="企业地址"></el-table-column>
+                    <el-table-column prop="address" align="center" label="企业地址" :show-overflow-tooltip="true">
+                    </el-table-column>
 
-                    <el-table-column prop="location" label="规模" min-width="140" align="center"
+                    <el-table-column prop="scale" label="规模" width="140" align="center"
                         :show-overflow-tooltip="true" />
-                    <el-table-column prop="principalName" align="center" label="负责人"
+                    <el-table-column prop="chargePerson" align="center" label="负责人"
                         :show-overflow-tooltip="true"></el-table-column>
-                    <el-table-column prop="contactNum" align="center" :show-overflow-tooltip="true"
+                    <el-table-column prop="linkPerson" align="center" :show-overflow-tooltip="true"
                         label="联系电话"></el-table-column>
-                    <el-table-column prop="latestInspectTime" align="center" label="最新检查时间"
+                    <el-table-column prop="orderDate" align="center" label="最新检查时间"
                         :show-overflow-tooltip="true"></el-table-column>
-                    <el-table-column prop="latestInspectResultName" align="center" label="最新结果"
+                    <el-table-column prop="checkResultFlag" align="center" label="最新结果"
                         :show-overflow-tooltip="true"></el-table-column>
                     <el-table-column fixed="right" label="操作" align="center" width="250">
                         <template slot-scope="scope">
                             <el-button @click="handleAdd(scope.row, 'view')" type="text" size="small">查看</el-button>
-
-                            <el-button v-if="scope.row.latitude && agencyId == scope.row.agencyId"
+                            <!-- v-if="scope.row.latitude && agencyId == scope.row.agencyId" -->
+                            <el-button 
                                 style="margin-right: 10px" @click="handleAdd(scope.row, 'edit')" size="small"
                                 type="text">
                                 编辑
@@ -106,7 +107,8 @@
                                 type="text">
                                 巡查记录
                             </el-button>
-                            <el-button @click="handleDel(scope.row)" v-if="agencyId == scope.row.agencyId" type="text"
+                            <!-- v-if="agencyId == scope.row.agencyId" -->
+                            <el-button @click="handleDel(scope.row)"  type="text"
                                 size="small" class="">删除</el-button>
                         </template>
                     </el-table-column>
@@ -162,7 +164,7 @@ export default {
             nineArray: [{ value: '1', label: '是' }, { value: '0', label: '否' }],
             equipmentCategoryCodeArray: [],
             pageNo: 1,
-            pageSize: window.localStorage.getItem('pageSize') || 20,
+            pageSize:20,
             total: 1,
             detailId: '',
             detailData: {},
@@ -189,29 +191,8 @@ export default {
         this.loadplaceType();
         this.loadCategory();
         this.getTableData();
-        this.loadTable();
     },
     methods: {
-        async loadTable() {
-            // this.tableLoading = true
-
-            const url = "/actual/base/companyInfo/page"
-            // const url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyactivity/list"
-            let params = {
-                agencyId: this.agencyId,
-                pageSize: this.pageSize,
-                pageNo: this.pageNo,
-                ...this.formData
-            }
-            const { data, code, msg } = await requestPost(url, params)
-            if (code === 0) {
-                console.log('坎坎坷坷喀喀喀喀喀喀',data)
-                this.total = data.total
-                this.tableData = data.list
-            } else {
-                this.$message.error(msg)
-            }
-        },
         handleSelectionChange(val) {
             this.multipleSelection = [];
             val.forEach(element => {
@@ -270,7 +251,7 @@ export default {
         },
         async handleExport() {
             // 导出
-            const url = '/actual/base/monitoringEquipment/export';
+            const url = '/actual/base/companyInfo/export';
             const { pageSize, pageNo, formData } = this;
             axios({
                 url: window.SITE_CONFIG['apiURL'] + url,
@@ -342,9 +323,8 @@ export default {
                 .catch(err => { });
         },
         async del(id) {
-            const url = `/actual/base/monitoringEquipment/delete`;
-            let idsArr = [id];
-            const { data, code, msg } = await requestPost(url, idsArr);
+            const url = `/actual/base/companyInfo/deleteCompany`;
+            const { data, code, msg } = await requestPost(url, {id});
             if (code === 0) {
                 this.$message.success('删除成功！');
                 this.getTableData();
@@ -353,7 +333,7 @@ export default {
             }
         },
         async getTableData() {
-            const url = '/actual/base/monitoringEquipment/page';
+            const url = '/actual/base/companyInfo/page';
             // const url = 'http://yapi.elinkservice.cn/mock/330/actual/base/enterprise/list';
             const { pageSize, pageNo, formData } = this;
             const { data, code, msg } = await requestPost(url, {
@@ -393,10 +373,10 @@ export default {
             this.getTableData();
         },
         async handleExportModule() {
-            let url = '/actual/base/monitoringEquipment/downloadTemplate';
+            let url = '/actual/base/companyInfo/downloadImportTemplate';
             let params = {};
             await this.$http({
-                method: 'POST',
+                method: 'GET',
                 url,
                 responseType: 'blob',
                 data: params
@@ -467,9 +447,9 @@ export default {
             });
             const formData = new FormData(); //FormData对象，添加参数只能通过append('key', value)的形式添加
             formData.append('file', file.file); //添加文件对象
-            formData.append('code', ''); //添加文件对象
+            // formData.append('code', ''); //添加文件对象
             await this.$http
-                .post('/actual/base/monitoringEquipment/import', formData)
+                .post('/actual/base/companyInfo/import', formData)
                 .then(res => {
                     console.log('res-up', res);
                     if (res.data.code == 0 && res.data.msg == 'success') {

From 96c9672eaab480c6c1e930df2bc3a10ce2bd6d3c Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Thu, 9 May 2024 16:02:34 +0800
Subject: [PATCH 04/19] =?UTF-8?q?=E8=AF=A6=E6=83=85=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E8=81=94=E8=B0=83,=E5=B7=A1=E6=9F=A5=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E5=A4=A7=E8=87=B4=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resourceManagement/enterprise/addForm.vue | 220 +++++++++++-------
 .../resourceManagement/enterprise/index.vue   |  28 +--
 2 files changed, 146 insertions(+), 102 deletions(-)

diff --git a/src/views/modules/resourceManagement/enterprise/addForm.vue b/src/views/modules/resourceManagement/enterprise/addForm.vue
index 41e6f64b7..aae03883a 100644
--- a/src/views/modules/resourceManagement/enterprise/addForm.vue
+++ b/src/views/modules/resourceManagement/enterprise/addForm.vue
@@ -7,9 +7,9 @@
 			<span v-if="pageType == 'patrol'">巡查记录</span>
 		</span>
 		<div>
-			<div class="dialog-h-content scroll-h">
+			<div class="dialog-h-content scroll-h div_form">
 				<el-form :inline="true" :model="formData" ref="form" :rules="dataRule" :label-width="'90px'"
-					v-if="pageType != 'view' && pageType != 'patrol'">
+					v-if="pageType != 'patrol'">
 					<el-row>
 						<el-col :span="6">
 							<!-- <el-form-item label="所属组织" prop="agencyId">
@@ -18,7 +18,7 @@
 							</el-form-item> -->
 
 							<el-form-item label="所属组织" prop="agencyId">
-                            <el-cascader class="u-item-width-normal" size="small" ref="myCascader"
+                            <el-cascader class="list_item_width_1" size="small" ref="myCascader" :disabled="disabled"
                                 v-model.trim="formData.agencyId" :options="orgOptions" :props="orgOptionProps"
                                 :show-all-levels="false" @change="handleChangeAgency" clearable></el-cascader>
                         	</el-form-item>
@@ -27,7 +27,7 @@
 						<el-col :span="6">
 							<el-form-item label="企业名称" prop="name">
 								<el-input v-model.trim="formData.name" :disabled="disabled"
-									class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
+									class="list_item_width_1" size="small" clearable placeholder="请输入"></el-input>
 							</el-form-item>
 						</el-col>
 						<el-col :span="4.5">
@@ -40,7 +40,7 @@
 						</el-col>
 						<el-col :span="7.5">
 							<el-form-item label="九小场所分类" prop="nineSmallPlacesCategory" label-width="150px">
-									<el-select v-model.trim="formData.nineSmallPlacesCategory" :disabled="disabled" placeholder="请选择" class="u-item-width-normal"
+									<el-select v-model.trim="formData.nineSmallPlacesCategory" :disabled="disabled" placeholder="请选择" class="list_item_width_1"
                                 size="small">
                                 <el-option v-for="item in placeTypeList" :label="item.label" :value="item.value"
                                     :key="item.value">
@@ -51,19 +51,19 @@
 						<el-col :span="6">
 							<el-form-item label="规模" prop="scale">
 								<el-input v-model.trim="formData.scale" :disabled="disabled"
-									class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
+									class="list_item_width_1" size="small" clearable placeholder="请输入"></el-input>
 							</el-form-item>
 						</el-col>
 						<el-col :span="6">
 							<el-form-item label="负责人" prop="chargePerson">
 								<el-input v-model.trim="formData.chargePerson" :disabled="disabled"
-									class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
+									class="list_item_width_1" size="small" clearable placeholder="请输入"></el-input>
 							</el-form-item>
 						</el-col>
 						<el-col :span="6">
 							<el-form-item label="联系电话" prop="mobile">
 								<el-input v-model.trim="formData.mobile" :disabled="disabled"
-									class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
+									class="list_item_width_1" size="small" clearable placeholder="请输入"></el-input>
 							</el-form-item>
 						</el-col>
 						<el-col :span="18">
@@ -80,33 +80,6 @@
 					</el-row>
 					<div id="app_event" class="div_map"></div>
 				</el-form>
-				<el-form :inline="false" :model="formData" ref="form1" :label-width="'90px'" v-if="pageType == 'view'">
-					<el-row>
-						<el-col :span="6">
-							<el-form-item label="所属组织" prop="equipmentName">{{ formData.equipmentName }}</el-form-item>
-						</el-col>
-						<el-col :span="6">
-							<el-form-item label="企业名称" prop="name">{{ formData.name }}</el-form-item>
-						</el-col>
-						<el-col :span="6">
-							<el-form-item label="九小场所分类" prop="nineSmallPlacesCategory">{{ formData.nineSmallPlacesCategory }}</el-form-item>
-						</el-col>
-						<el-col :span="6">
-							<el-form-item label="规模" prop="scale">{{ formData.scale }}</el-form-item>
-						</el-col>
-						<el-col :span="6">
-							<el-form-item label="负责人" prop="chargePerson">{{ formData.chargePerson }}</el-form-item>
-						</el-col>
-						<el-col :span="6">
-							<el-form-item label="联系电话" prop="mobile">{{ formData.mobile }}</el-form-item>
-						</el-col>
-						<el-col :span="6">
-							<el-form-item label="企业地址" prop="address" style="display: block">{{ formData.address
-								}}</el-form-item>
-						</el-col>
-					</el-row>
-					<div id="app_event" class="div_map"></div>
-				</el-form>
 				<el-form :inline="false" :model="formData" ref="form2" :label-width="'90px'" v-if="pageType == 'patrol'"
 					style="margin-left: 50px;">
 					<div class="div_btn">
@@ -115,7 +88,7 @@
 					<el-row v-for="(item, index) in tableData" :key="index" :gutter="20" style="margin-bottom: 20px;">
 						<el-row style="margin-top: 20px;">
 							<el-col :span="24">
-								<el-tag type="primary" effect="plain" class="custom-tag">●</el-tag>{{ item.datereviewTime}}
+								<el-tag type="primary" effect="plain" class="custom-tag">●</el-tag>{{item.checkTime}}
 							</el-col>
 						</el-row>
 
@@ -128,14 +101,20 @@
 								item.reviewTime }}</el-col>
 						</el-row>
 						<el-row style="margin-top: 15px;">
-							<el-col :span="24" style="padding-left: 65px;"><span style="color: #888; ">隐患明细: </span> <span v-for="(itemC,index) in item.hazardDetails" >{{itemC.hazardDesc}}</span> </el-col>
+							<el-col :span="24" style="padding-left: 65px;"><span style="color: #888; ">{{item.hazardDetails.findIndex(item=>item.hazardStatus === 2) === -1?'已整改隐患':'隐患明细'}}: </span>
+								 <p style="margin-left: 60px;" v-for="(itemC,index) in item.hazardDetails.filter(item=>item.hazardStatus ==1)" >{{index+1}}.{{itemC.hazardDesc}}</p> 
+							</el-col>
 						</el-row>
-						<el-row style="margin-top: 15px;">
-							<el-col :span="24" style="padding-left: 65px;"><span style="color: #888; ">隐患明细: </span> <span v-for="(itemC,index) in item.hazardDetails" >{{itemC.hazardDesc}}</span> </el-col>
+						<el-row style="margin-top: 15px;" v-if="item.hazardDetails.findIndex(item=>item.hazardStatus === 2) === -1">
+							<el-col :span="24" style="padding-left: 65px;"><span style="color: #888; ">未整改隐患: </span>
+								 <p style="margin-left: 60px;" v-for="(itemC,index) in item.hazardDetails.filter(item=>item.hazardStatus == 0)" >{{index+1}}.{{itemC.hazardDesc}}</p> 
+							</el-col>
 						</el-row>
-						<el-row style="margin-top: 15px;">
-							<el-col :span="24" style="padding-left: 65px;"> <span style="color: #888; ">整改要求: </span>{{
-								item.requirements }}</el-col>
+						<el-row style="margin-top: 15px;" v-else>
+							<el-col :span="24" style="padding-left: 65px;"><span style="color: #888; ">整改要求: </span>
+								 <p style="margin-left: 60px;">{{index+1}}.{{item.hazardDetails.find(item=>item.hazardStatus == 2).hazardDesc}}</p> 
+							</el-col>
+							
 						</el-row>
 						<el-row style="margin-top: 15px;">
 							<el-col :span="6" style="padding-left: 65px;"><span style="color: #888; ">附件: </span>{{
@@ -145,20 +124,19 @@
 						</el-row>
 					</el-row>
 					<!-- 巡查记录新增 -->
-					<el-form :inline="true" :model="formData" ref="form" :rules="dataRule" :label-width="'105px'"
+					<el-form :inline="true" :model="patrolForm" ref="form3" :rules="patrolRule" :label-width="'105px'"
 						v-if="patrolAdd">
 						<el-row>
 							<el-col :span="16">
-								<el-form-item label="巡查时间" prop="checkTime"
-									style="white-space: nowrap; overflow: hidden;">
-									<el-date-picker class="u-item-width-normal" size="small"
-										v-model.trim="formData.checkTime" type="datetime"
+								<el-form-item label="巡查时间" prop="checkTime">
+									<el-date-picker class="list_item_width_1" size="small"
+										v-model.trim="patrolForm.checkTime" type="datetime"
 										format="yyyy-MM-dd HH:mm:ss" placeholder="选择日期"></el-date-picker>
 								</el-form-item>
 							</el-col>
 							<el-col :span="16">
-								<el-form-item label="检查人员" prop="equipmentNum">
-									<el-select v-model.trim="formData.nineSmallPlacesCategory" :disabled="disabled" placeholder="请选择" class="u-item-width-normal"
+								<el-form-item label="检查人员" prop="checkPersonsIdList">
+									<el-select v-model.trim="patrolForm.checkPersonsIdList" :disabled="disabled" placeholder="请选择" class="list_item_width_1"
                                 size="small" multiple>
                                 <el-option v-for="item in stafflist" :label="item.name" :value="item.staffId"
                                     :key="item.value">
@@ -170,7 +148,7 @@
 						<el-row>
 							<el-col :span="18">
 								<el-form-item label="检查结论" prop="checkResultFlag">
-									<el-select v-model.trim="formData.checkResultFlag" :disabled="disabled" placeholder="请选择" class="u-item-width-normal"
+									<el-select v-model.trim="patrolForm.checkResultFlag" :disabled="disabled" placeholder="请选择" class="list_item_width_1"
                                 size="small">
                                 <el-option v-for="item in resultArray" :label="item.label" :value="item.value"
                                     :key="item.value">
@@ -179,30 +157,28 @@
 								</el-form-item>
 							</el-col>
 							<el-col :span="18">
-								<el-form-item label="拟复查时间" prop="reviewTime"
-									style="white-space: nowrap; overflow: hidden;">
-									<el-date-picker class="u-item-width-normal" size="small"
-										v-model.trim="formData.reviewTime" type="datetime"
+								<el-form-item label="拟复查时间" prop="reviewTime">
+									<el-date-picker class="list_item_width_1" size="small"
+										v-model.trim="patrolForm.reviewTime" type="datetime"
 										format="yyyy-MM-dd HH:mm:ss" placeholder="选择日期"></el-date-picker>
 								</el-form-item>
 							</el-col>
 						</el-row>
-						<el-row>
+						<el-row v-if="checkResultFlag !== 1">
 							<el-col :span="8">
-								<el-form-item label="隐患明细" prop="principalName"
-									style="white-space: nowrap;overflow: hidden;">
-									<el-radio-group v-model="formData.latestInspectTime" size="small">
-										<el-col v-for="option in radioOptions" :key="option.value">
+								<el-form-item label="隐患明细" prop="principalName" style="white-space: nowrap;overflow: hidden;">
+									<el-radio-group v-model="hazardDetails" size="small">
+										<el-col v-for="option in checkboxOptions" :key="option.value">
 											<el-checkbox :label="option.value">{{ option.label }}</el-checkbox>
 										</el-col>
 									</el-radio-group>
 								</el-form-item>
 							</el-col>
 						</el-row>
-						<el-row>
-							<el-col :span="18" v-for="(item, index) in inputList" :key="index">
+						<el-row >
+							<el-col :span="18" v-for="(item, index) in inputList" :key="index" style="margin-left: 100px;">
 								<el-form-item label="" prop="textarea" class="input-container">
-									<el-input v-model="item.value" rows="3" placeholder="请输入隐患信息"></el-input>
+									<el-input v-model="item.value" rows="3" placeholder="请输入隐患信息" size="small" class="list_item_width_1"></el-input>
 								</el-form-item>
 								<el-button @click="removeInput(index)" v-if="inputList.length > 1"
 									class="remove-button">
@@ -213,17 +189,24 @@
 								</el-button>
 							</el-col>
 						</el-row>
+						<el-row v-if="checkResultFlag === 1">
+							<el-col :span="8">
+								<el-form-item label="整改意见" prop="principalName" style="white-space: nowrap;overflow: hidden;">
+									<el-input v-model="patrolForm.rectificationOpinion" rows="3" size="small" placeholder="请输入整改意见" ></el-input>
+								</el-form-item>
+							</el-col>
+						</el-row>
 						<el-row>
 							<el-col :span="6">
 								<el-form-item label="附件">
-									<upload-image :defaultFileList="fileList" :limit="6" @change="onChangeFileList"
+									<upload-image :defaultFileList="fileList" :limit="1" @change="onChangeFileList"
 										v-if="true"></upload-image>
 								</el-form-item>
 							</el-col>
 							<el-col :span="18">
 								<el-form-item label="备注" prop="remark">
-									<el-input v-model.trim="formData.remark" :disabled="disabled"
-										class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
+									<el-input v-model.trim="patrolForm.remark" :disabled="disabled"
+										class="list_item_width_1" size="small" clearable placeholder="请输入"></el-input>
 								</el-form-item>
 							</el-col>
 						</el-row>
@@ -273,15 +256,14 @@ export default {
 			type: String,
 			default: ''
 		},
-		detailData: {
-			type: Object,
-			default: null
-		},
 		disabled: {
 			type: Boolean,
 			default: false
 		},
-		
+		checkResultFlag:{
+			type:Number,
+			default:0
+		}
 	},
 
 	data() {
@@ -309,28 +291,68 @@ export default {
 			inputList: [{ value: '' }],//隐患输入框 
 			fileList:[],
 			patrolAdd: false,
-			radioOptions: [
+			checkboxOptions: [
 				{ label: 'Option 1', value: 'option1' },
 				{ label: 'Option 2', value: 'option2' },
-				{ label: '已整改隐患已整改隐患已整改隐患已整改隐患已整改隐患已整改隐患已整改隐患已整改隐患已整改隐患已整改隐患已整改隐患', value: '已整改隐患已整改隐患已整改隐患已整改隐患已整改隐患已整改隐患已整改隐患已整改隐患' },
+				{ label: '已整改患', value: '已整改隐患' },
 			],
+			hazardDetails:[],
+
 			tableData: [
 				{
-					datereviewTime: '2019-04-22 09:30',
+					checkTime: '2019-04-22 09:30',
 					checkPersons: '张三，李四',
 					checkResultFlag: '不合格',
 					reviewTime: '2019-04-22 09:30',
 					hazardDetails:[
-						{
-							hazardStatus:0,
-							hazardDesc:'卫生没整好'
-						}
+					{
+						"id": "hd1111",
+						"customerId": "45687aa479955f9d06204d415238f7cc",
+						"companyId": "c1111",
+						"recordId": "r1111",
+						"hazardStatus": 0,
+						"hazardDesc": "小马哥请原谅我",
+						"delFlag": null,
+						"revision": 0,
+						"createdBy": "zxc",
+						"createdTime": "2024-05-03 16:26:37",
+						"updatedBy": "zxc",
+						"updatedTime": "2024-05-03 16:26:49"
+					},
+					{
+						"id": "hd1112",
+						"customerId": "45687aa479955f9d06204d415238f7cc",
+						"companyId": "c1111",
+						"recordId": "r1111",
+						"hazardStatus": 1,
+						"hazardDesc": "小马哥喝一点酒太亢奋",
+						"delFlag": null,
+						"revision": 2,
+						"createdBy": "zxc",
+						"createdTime": "2024-05-03 16:26:37",
+						"updatedBy": "zxc",
+						"updatedTime": "2024-05-03 16:26:49"
+					},
+					{
+						"id": "hd1113",
+						"customerId": "45687aa479955f9d06204d415238f7cc",
+						"companyId": "c1111",
+						"recordId": "r1111",
+						"hazardStatus": 2,
+						"hazardDesc": "我不想这样做，但是找不到更好的原因了，抱歉小马哥",
+						"delFlag": null,
+						"revision": 0,
+						"createdBy": "zxc",
+						"createdTime": "2024-05-03 16:26:37",
+						"updatedBy": "zxc",
+						"updatedTime": "2024-05-03 16:26:49"
+					}
 					],
 					attachmentUrl: '123456789.jPg',
 					remark: '请相关负责人尽快处理'
 				},
 				{
-					datereviewTime: '2019-04-22 09:30',
+					checkTime: '2019-04-22 09:30',
 					checkPersons: '张三，李四',
 					checkResultFlag: '不合格',
 					reviewTime: '2019-04-22 09:30',
@@ -369,7 +391,23 @@ export default {
 				chargePerson: [{ required: true, message: '负责人不能为空', trigger: 'blur' }],
 				mobile: [{ required: true, message: '联系电话不能为空', trigger: 'blur' }],
 				nineSmallPlacesCategory: [{ required: true, message: '九小场所类型不能为空', trigger: 'blur' }],
-				nineSmallPlacesFlag: [{ required: true, message: '九小场所类型不能为空', trigger: 'blur' }],
+				nineSmallPlacesFlag: [{ required: true, message: '九小场所不能为空', trigger: 'blur' }],
+			},
+			patrolForm:{
+				companyId:null,
+				checkTime:null,
+				checkPersonsIdList:null,
+				checkResultFlag:null,
+				reviewTime:null,
+				hazardDetails:null,
+				attachmentUrl:null,
+				remark:null,
+			},
+			patrolRule:{
+				checkTime: [{ required: true, message: '巡查时间不能为空', trigger: 'blur' }],
+				checkPersonsIdList: [{ required: true, message: '检查人员不能为空', trigger: 'blur' }],
+				checkResultFlag: [{ required: true, message: '检查结论不能为空', trigger: 'blur' }],
+				reviewTime: [{ required: true, message: '拟复查时间不能为空', trigger: 'blur' }],
 			},
 			//地图
 			loading: false,
@@ -428,8 +466,9 @@ export default {
 				this.fileList = []
 				e.forEach(item => {
 					let ob = {
-						fileType: '0',
-						fileUrl: item.response.data.url
+						fileType: item.raw.type,
+						fileUrl: item.response.data.url,
+						fileName:item.response.data.fileName
 					}
 					this.fileList.push(ob)
 				})
@@ -477,8 +516,8 @@ export default {
 		});
 		},
 		async getDetail() {
-			const url = `/actual/base/companyInfo/companyDetail`;
-			const { data, code, msg } = await requestPost(url,{companyId:this.detailId});
+			const url = `/actual/base/companyInfo/companyDetail/${this.detailId}`;
+			const { data, code, msg } = await requestPost(url);
 			if (code === 0) {
 				console.log('详情数据', data);
 				this.formData = { ...data };
@@ -497,7 +536,7 @@ export default {
 					}
 				});
 			}else if(this.pageType === 'patrol'){
-				this.$refs['form2'].validate(valid => {
+				this.$refs['form3'].validate(valid => {
 					if (valid){
 						this.save();
 					}
@@ -511,10 +550,17 @@ export default {
 			var params = {};
 			if (this.pageType == 'add') {
 				url = '/actual/base/companyInfo/saveCompanyInfo';
+				params = { ...this.formData };
 			} else if (this.pageType == 'edit'){
 				url = '/actual/base/companyInfo/updateCompany';
+				params = { ...this.formData };
+			}else if(this.pageType == 'patrol'){
+				url = '/actual/base/companyInfo/addRecord';
+				params = { ...this.patrolForm };
+				params.companyId = this.detailId;
+				params.attachmentUrl = this.fileList[0];
 			}
-			params = { ...this.formData };
+			
 			const { data, code, msg } = await requestPost(url, params);
 			if (code === 0) {
 				this.$message.success('操作成功');
@@ -523,12 +569,14 @@ export default {
 				this.$message.error(msg);
 			}
 		},
+		
 		handleCancle() {
 			this.resetData();
 			this.$emit('handleClose');
 		},
 		resetData() {
-			this.$refs.form.resetFields();
+			let form = this.pageType === 'add' ||this.pageType === 'edit'||this.pageType === 'view'?'form':this.pageType === 'patrol'?'form2':'form';
+			this.$refs[form].resetFields();
 		},
 		// 开启加载动画
 		startLoading() {
diff --git a/src/views/modules/resourceManagement/enterprise/index.vue b/src/views/modules/resourceManagement/enterprise/index.vue
index d6b6d2a74..dcdd7c023 100644
--- a/src/views/modules/resourceManagement/enterprise/index.vue
+++ b/src/views/modules/resourceManagement/enterprise/index.vue
@@ -76,7 +76,7 @@
                     <el-button @click="handleExport" class="diy-button--white" size="small">导出</el-button>
                 </div>
                 <el-table :data="tableData" border class="m-table-item" style="width: 100%"
-                    @selection-change="handleSelectionChange" :height="maxTableHeight">
+                     :height="maxTableHeight">
                     <!-- <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="name" align="center" label="企业名称"
@@ -88,12 +88,18 @@
                         :show-overflow-tooltip="true" />
                     <el-table-column prop="chargePerson" align="center" label="负责人"
                         :show-overflow-tooltip="true"></el-table-column>
-                    <el-table-column prop="linkPerson" align="center" :show-overflow-tooltip="true"
+                    <el-table-column prop="mobile" align="center" :show-overflow-tooltip="true"
                         label="联系电话"></el-table-column>
                     <el-table-column prop="orderDate" align="center" label="最新检查时间"
                         :show-overflow-tooltip="true"></el-table-column>
                     <el-table-column prop="checkResultFlag" align="center" label="最新结果"
-                        :show-overflow-tooltip="true"></el-table-column>
+                        :show-overflow-tooltip="true">
+                    <template  slot-scope="scope">
+                        <span>
+                            {{scope.row.checkResultFlag=='1'?'合格':'不合格'}}
+                        </span>
+                    </template>
+                    </el-table-column>
                     <el-table-column fixed="right" label="操作" align="center" width="250">
                         <template slot-scope="scope">
                             <el-button @click="handleAdd(scope.row, 'view')" type="text" size="small">查看</el-button>
@@ -123,7 +129,7 @@
         </div>
         <div>
             <addForm v-if="dialogVisible" :dialogVisible="dialogVisible" :pageType="pageType" :disabled="disabled"
-                :detailId="detailId" :detailData="detailData" @handleClose="handleClose" @handleOk="handleOk"
+                :detailId="detailId" :checkResultFlag="checkResultFlag"  @handleClose="handleClose" @handleOk="handleOk"
                 @dialogOk="handleEditSuccess" />
         </div>
     </div>
@@ -167,12 +173,7 @@ export default {
             pageSize:20,
             total: 1,
             detailId: '',
-            detailData: {},
-            multipleSelection: [],
-            rowObj: {},
-            option: [
-                {}
-            ]
+            checkResultFlag:false
         };
     },
     components: { addForm },
@@ -193,12 +194,6 @@ export default {
         this.getTableData();
     },
     methods: {
-        handleSelectionChange(val) {
-            this.multipleSelection = [];
-            val.forEach(element => {
-                this.multipleSelection.push(element.icEventId);
-            });
-        },
         handleSearch(val) {
             console.log(this.formData);
             this.pageNo = 1;
@@ -285,6 +280,7 @@ export default {
         handleAdd(row, type) {
             if (row.id) {
                 this.detailId = row.id;
+                this.checkResultFlag = row.checkResultFlag;
             }
             this.pageType = type;
             if (type == 'view') {

From 98ac470d2346d8bccb573891b6b4045b3f367b95 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Fri, 10 May 2024 14:01:09 +0800
Subject: [PATCH 05/19] =?UTF-8?q?=E5=9C=BA=E6=89=80=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=9B=B4=E6=8D=A2,=E5=B7=A1=E6=9F=A5?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95=E8=81=94=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resourceManagement/enterprise/addForm.vue | 178 ++++++++++--------
 .../resourceManagement/enterprise/index.vue   |  26 ++-
 2 files changed, 109 insertions(+), 95 deletions(-)

diff --git a/src/views/modules/resourceManagement/enterprise/addForm.vue b/src/views/modules/resourceManagement/enterprise/addForm.vue
index aae03883a..50563444a 100644
--- a/src/views/modules/resourceManagement/enterprise/addForm.vue
+++ b/src/views/modules/resourceManagement/enterprise/addForm.vue
@@ -85,7 +85,7 @@
 					<div class="div_btn">
 						<el-button size="small" type="primary " @click="patrolAddd()">新增</el-button>
 					</div>
-					<el-row v-for="(item, index) in tableData" :key="index" :gutter="20" style="margin-bottom: 20px;">
+					<el-row v-for="(item, index) in tableData" :key="index" :gutter="20" style="margin-bottom: 20px;" v-if="tableData">
 						<el-row style="margin-top: 20px;">
 							<el-col :span="24">
 								<el-tag type="primary" effect="plain" class="custom-tag">●</el-tag>{{item.checkTime}}
@@ -96,18 +96,24 @@
 							<el-col :span="6" style="padding-left: 65px;"> <span style="color: #888; ">检查人员:</span> {{
 								item.checkPersons }}</el-col>
 							<el-col :span="6" style="padding-left: 65px;"><span style="color: #888; ">检查结论:</span> {{
-								item.checkResultFlag }}</el-col>
+								item.checkResultFlag === 1?'合格':'不合格' }}</el-col>
 							<el-col :span="6" style="padding-left: 65px;"><span style="color: #888; ">拟复查时间: </span> {{
-								item.reviewTime }}</el-col>
+								item.reviewTime || '--' }}</el-col>
 						</el-row>
 						<el-row style="margin-top: 15px;">
-							<el-col :span="24" style="padding-left: 65px;"><span style="color: #888; ">{{item.hazardDetails.findIndex(item=>item.hazardStatus === 2) === -1?'已整改隐患':'隐患明细'}}: </span>
-								 <p style="margin-left: 60px;" v-for="(itemC,index) in item.hazardDetails.filter(item=>item.hazardStatus ==1)" >{{index+1}}.{{itemC.hazardDesc}}</p> 
+							<el-col :span="24" style="padding-left: 65px;"><span style="color: #888; ">{{item.flag?'已整改隐患':'隐患明细'}}: </span>
+								<div v-if="item.hazardDetails">
+									<p style="margin-left: 60px;" v-for="(itemC,index) in item.hazardDetails.filter(item=>item.hazardStatus ==1)" >{{index+1}}.{{itemC.hazardDesc}}</p> 
+								</div>
+								<span>--</span>
 							</el-col>
 						</el-row>
-						<el-row style="margin-top: 15px;" v-if="item.hazardDetails.findIndex(item=>item.hazardStatus === 2) === -1">
+						<el-row style="margin-top: 15px;" v-if="item.flag">
 							<el-col :span="24" style="padding-left: 65px;"><span style="color: #888; ">未整改隐患: </span>
-								 <p style="margin-left: 60px;" v-for="(itemC,index) in item.hazardDetails.filter(item=>item.hazardStatus == 0)" >{{index+1}}.{{itemC.hazardDesc}}</p> 
+								<div v-if="item.hazardDetails">
+									<p style="margin-left: 60px;" v-for="(itemC,index) in item.hazardDetails.filter(item=>item.hazardStatus == 0)" >{{index+1}}.{{itemC.hazardDesc}}</p> 
+								</div> 
+								 <span>--</span>
 							</el-col>
 						</el-row>
 						<el-row style="margin-top: 15px;" v-else>
@@ -120,9 +126,12 @@
 							<el-col :span="6" style="padding-left: 65px;"><span style="color: #888; ">附件: </span>{{
 								item.attachmentUrl }}</el-col>
 							<el-col :span="6" style="padding-left: 65px;"><span style="color: #888; ">备注: </span>{{
-								item.remark }}</el-col>
+								item.remark || '--' }}</el-col>
 						</el-row>
 					</el-row>
+					<div style="width:100%;height:300px;display:flex;align-items:center;justify-content: center;" v-if="tableData.length === 0&& !patrolAdd">
+						<span>暂无数据~</span>
+					</div>
 					<!-- 巡查记录新增 -->
 					<el-form :inline="true" :model="patrolForm" ref="form3" :rules="patrolRule" :label-width="'105px'"
 						v-if="patrolAdd">
@@ -299,72 +308,72 @@ export default {
 			hazardDetails:[],
 
 			tableData: [
-				{
-					checkTime: '2019-04-22 09:30',
-					checkPersons: '张三，李四',
-					checkResultFlag: '不合格',
-					reviewTime: '2019-04-22 09:30',
-					hazardDetails:[
-					{
-						"id": "hd1111",
-						"customerId": "45687aa479955f9d06204d415238f7cc",
-						"companyId": "c1111",
-						"recordId": "r1111",
-						"hazardStatus": 0,
-						"hazardDesc": "小马哥请原谅我",
-						"delFlag": null,
-						"revision": 0,
-						"createdBy": "zxc",
-						"createdTime": "2024-05-03 16:26:37",
-						"updatedBy": "zxc",
-						"updatedTime": "2024-05-03 16:26:49"
-					},
-					{
-						"id": "hd1112",
-						"customerId": "45687aa479955f9d06204d415238f7cc",
-						"companyId": "c1111",
-						"recordId": "r1111",
-						"hazardStatus": 1,
-						"hazardDesc": "小马哥喝一点酒太亢奋",
-						"delFlag": null,
-						"revision": 2,
-						"createdBy": "zxc",
-						"createdTime": "2024-05-03 16:26:37",
-						"updatedBy": "zxc",
-						"updatedTime": "2024-05-03 16:26:49"
-					},
-					{
-						"id": "hd1113",
-						"customerId": "45687aa479955f9d06204d415238f7cc",
-						"companyId": "c1111",
-						"recordId": "r1111",
-						"hazardStatus": 2,
-						"hazardDesc": "我不想这样做，但是找不到更好的原因了，抱歉小马哥",
-						"delFlag": null,
-						"revision": 0,
-						"createdBy": "zxc",
-						"createdTime": "2024-05-03 16:26:37",
-						"updatedBy": "zxc",
-						"updatedTime": "2024-05-03 16:26:49"
-					}
-					],
-					attachmentUrl: '123456789.jPg',
-					remark: '请相关负责人尽快处理'
-				},
-				{
-					checkTime: '2019-04-22 09:30',
-					checkPersons: '张三，李四',
-					checkResultFlag: '不合格',
-					reviewTime: '2019-04-22 09:30',
-					hazardDetails:[
-						{
-							hazardStatus:1,
-							hazardDesc:'卫生没整好2'
-						}
-					],
-					attachmentUrl: '123456789.jPg',
-					remark: '请相关负责人尽快处理'
-				},
+				// {
+				// 	checkTime: '2019-04-22 09:30',
+				// 	checkPersons: '张三，李四',
+				// 	checkResultFlag: '不合格',
+				// 	reviewTime: '2019-04-22 09:30',
+				// 	hazardDetails:[
+				// 	{
+				// 		"id": "hd1111",
+				// 		"customerId": "45687aa479955f9d06204d415238f7cc",
+				// 		"companyId": "c1111",
+				// 		"recordId": "r1111",
+				// 		"hazardStatus": 0,
+				// 		"hazardDesc": "小马哥请原谅我",
+				// 		"delFlag": null,
+				// 		"revision": 0,
+				// 		"createdBy": "zxc",
+				// 		"createdTime": "2024-05-03 16:26:37",
+				// 		"updatedBy": "zxc",
+				// 		"updatedTime": "2024-05-03 16:26:49"
+				// 	},
+				// 	{
+				// 		"id": "hd1112",
+				// 		"customerId": "45687aa479955f9d06204d415238f7cc",
+				// 		"companyId": "c1111",
+				// 		"recordId": "r1111",
+				// 		"hazardStatus": 1,
+				// 		"hazardDesc": "小马哥喝一点酒太亢奋",
+				// 		"delFlag": null,
+				// 		"revision": 2,
+				// 		"createdBy": "zxc",
+				// 		"createdTime": "2024-05-03 16:26:37",
+				// 		"updatedBy": "zxc",
+				// 		"updatedTime": "2024-05-03 16:26:49"
+				// 	},
+				// 	{
+				// 		"id": "hd1113",
+				// 		"customerId": "45687aa479955f9d06204d415238f7cc",
+				// 		"companyId": "c1111",
+				// 		"recordId": "r1111",
+				// 		"hazardStatus": 2,
+				// 		"hazardDesc": "我不想这样做，但是找不到更好的原因了，抱歉小马哥",
+				// 		"delFlag": null,
+				// 		"revision": 0,
+				// 		"createdBy": "zxc",
+				// 		"createdTime": "2024-05-03 16:26:37",
+				// 		"updatedBy": "zxc",
+				// 		"updatedTime": "2024-05-03 16:26:49"
+				// 	}
+				// 	],
+				// 	attachmentUrl: '123456789.jPg',
+				// 	remark: '请相关负责人尽快处理'
+				// },
+				// {
+				// 	checkTime: '2019-04-22 09:30',
+				// 	checkPersons: '张三，李四',
+				// 	checkResultFlag: '不合格',
+				// 	reviewTime: '2019-04-22 09:30',
+				// 	hazardDetails:[
+				// 		{
+				// 			hazardStatus:1,
+				// 			hazardDesc:'卫生没整好2'
+				// 		}
+				// 	],
+				// 	attachmentUrl: '123456789.jPg',
+				// 	remark: '请相关负责人尽快处理'
+				// },
 			],
 			btnDisable: false,
 			user: '',
@@ -426,6 +435,9 @@ export default {
 		if (this.pageType != 'add' && this.pageType != 'patrol') {
 			this.getDetail();
 		}else if(this.pageType == 'patrol') {
+			if(this.checkResultFlag ===1){
+				delete this.patrolRule.reviewTime
+			}
 			this.getCompanyDetail()
 			this.getStafflist()
 		}else {
@@ -480,10 +492,9 @@ export default {
 		},
 		//场所类型
 		async loadplaceType() {
-			const url = '/gov/org/coverage/dict-select-list/enterprise_patrol';
+			const url = '/sys/dict/data/dictlist';
 			let params = {
-				// agencyId: this.agencyId,
-				// purpose: 'query'
+				dictType: "nine_small_places"
 			};
 			const { data, code, msg } = await requestPost(url, params);
 			if (code === 0) {
@@ -495,9 +506,17 @@ export default {
 		// 巡查记录
 		async getCompanyDetail(){
 			const url = `/actual/base/companyInfo/showRecord`;
-			const { data, code, msg } = await requestPost(url,{companyId:this.detailId});
+			const { data, code, msg } = await requestPost(url,{id:this.detailId});
 			if (code === 0) {
-				// this.tableData = data;
+				data.forEach(item=>{
+					if(!item.hiddenDangeList){
+						item.flag = true;
+					}else{
+						item.flag = item.hazardDetails.findIndex(item=>item.hazardStatus === 2) === -1;
+					}
+				})
+				console.log(data);
+				this.tableData = data;
 			} else {
 				this.$message.error(msg);
 			}
@@ -512,7 +531,6 @@ export default {
 		};
 		this.$http.post("data/aggregator/org/stafflist", parms).then((resp) => {
 			this.stafflist = resp.data.data.staffList;
-			console.log("stafflist", resp.data);
 		});
 		},
 		async getDetail() {
diff --git a/src/views/modules/resourceManagement/enterprise/index.vue b/src/views/modules/resourceManagement/enterprise/index.vue
index dcdd7c023..75a893109 100644
--- a/src/views/modules/resourceManagement/enterprise/index.vue
+++ b/src/views/modules/resourceManagement/enterprise/index.vue
@@ -214,18 +214,17 @@ export default {
         },
         //场所类型
         async loadplaceType() {
-            const url = '/gov/org/coverage/dict-select-list/enterprise_patrol';
-            let params = {
-                // agencyId: this.agencyId,
-                // purpose: 'query'
-            };
-            const { data, code, msg } = await requestPost(url, params);
-            if (code === 0) {
-                this.placeTypeList = data;
-            } else {
-                this.$message.error(msg);
-            }
-        },
+			const url = '/sys/dict/data/dictlist';
+			let params = {
+				dictType: "nine_small_places"
+			};
+			const { data, code, msg } = await requestPost(url, params);
+			if (code === 0) {
+				this.placeTypeList = data;
+			} else {
+				this.$message.error(msg);
+			}
+		},
         //设备类型
         async loadCategory() {
             const url = '/sys/dict/data/dictlist';
@@ -241,9 +240,6 @@ export default {
                 this.$message.error(msg);
             }
         },
-        async handleImport() {
-            // 导入
-        },
         async handleExport() {
             // 导出
             const url = '/actual/base/companyInfo/export';

From 6ba91207deaf938a60dec34f0240a1d3c3896c61 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Fri, 10 May 2024 18:00:39 +0800
Subject: [PATCH 06/19] =?UTF-8?q?=E5=88=A0=E9=99=A4,=E6=96=B0=E5=A2=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resourceManagement/enterprise/addForm.vue | 177 ++++++++----------
 .../resourceManagement/enterprise/index.vue   |   2 +-
 2 files changed, 75 insertions(+), 104 deletions(-)

diff --git a/src/views/modules/resourceManagement/enterprise/addForm.vue b/src/views/modules/resourceManagement/enterprise/addForm.vue
index 50563444a..c005e6219 100644
--- a/src/views/modules/resourceManagement/enterprise/addForm.vue
+++ b/src/views/modules/resourceManagement/enterprise/addForm.vue
@@ -102,29 +102,36 @@
 						</el-row>
 						<el-row style="margin-top: 15px;">
 							<el-col :span="24" style="padding-left: 65px;"><span style="color: #888; ">{{item.flag?'已整改隐患':'隐患明细'}}: </span>
-								<div v-if="item.hazardDetails">
-									<p style="margin-left: 60px;" v-for="(itemC,index) in item.hazardDetails.filter(item=>item.hazardStatus ==1)" >{{index+1}}.{{itemC.hazardDesc}}</p> 
+								<div v-if="item.hiddenDangeList">
+									<p style="margin-left: 60px;" v-for="(itemC,index) in item.hiddenDangeList.filter(item=>item.hazardStatus ==1)" >{{index+1}}.{{itemC.hazardDesc}}</p> 
 								</div>
-								<span>--</span>
+								<span v-else>--</span>
 							</el-col>
 						</el-row>
 						<el-row style="margin-top: 15px;" v-if="item.flag">
 							<el-col :span="24" style="padding-left: 65px;"><span style="color: #888; ">未整改隐患: </span>
-								<div v-if="item.hazardDetails">
-									<p style="margin-left: 60px;" v-for="(itemC,index) in item.hazardDetails.filter(item=>item.hazardStatus == 0)" >{{index+1}}.{{itemC.hazardDesc}}</p> 
+								<div v-if="item.hiddenDangeList">
+									<p style="margin-left: 60px;" v-for="(itemC,index) in item.hiddenDangeList.filter(item=>item.hazardStatus == 0)" >{{index+1}}.{{itemC.hazardDesc}}</p> 
 								</div> 
-								 <span>--</span>
+								 <span v-else>--</span>
 							</el-col>
 						</el-row>
 						<el-row style="margin-top: 15px;" v-else>
 							<el-col :span="24" style="padding-left: 65px;"><span style="color: #888; ">整改要求: </span>
-								 <p style="margin-left: 60px;">{{index+1}}.{{item.hazardDetails.find(item=>item.hazardStatus == 2).hazardDesc}}</p> 
+								 <p style="margin-left: 60px;">{{index+1}}.{{item.hiddenDangeList.find(item=>item.hazardStatus == 2).hazardDesc}}</p> 
 							</el-col>
 							
 						</el-row>
 						<el-row style="margin-top: 15px;">
-							<el-col :span="6" style="padding-left: 65px;"><span style="color: #888; ">附件: </span>{{
-								item.attachmentUrl }}</el-col>
+							<el-col :span="6" style="padding-left: 65px;">
+								<span style="color: #888; ">附件: </span>
+							 <span v-for="(itemI,indexI) in item.attachmentUrls" :key="itemI.fileName" style="margin-right:10px;cursor:pointer" @click="handelCLickImage(itemI.attachmentUrl)">{{
+								itemI.fileName }}
+							</span>
+							<div class="imagePreview" v-if="preViewImageFlag" @click="preViewImageFlag = false">
+									<img :src="preViewImage" alt="">
+							</div>
+							 </el-col>
 							<el-col :span="6" style="padding-left: 65px;"><span style="color: #888; ">备注: </span>{{
 								item.remark || '--' }}</el-col>
 						</el-row>
@@ -140,7 +147,8 @@
 								<el-form-item label="巡查时间" prop="checkTime">
 									<el-date-picker class="list_item_width_1" size="small"
 										v-model.trim="patrolForm.checkTime" type="datetime"
-										format="yyyy-MM-dd HH:mm:ss" placeholder="选择日期"></el-date-picker>
+										value-format="yyyy-MM-dd HH:mm:ss"
+										value="yyyy-MM-dd HH:mm:ss"placeholder="选择日期"></el-date-picker>
 								</el-form-item>
 							</el-col>
 							<el-col :span="16">
@@ -169,25 +177,26 @@
 								<el-form-item label="拟复查时间" prop="reviewTime">
 									<el-date-picker class="list_item_width_1" size="small"
 										v-model.trim="patrolForm.reviewTime" type="datetime"
-										format="yyyy-MM-dd HH:mm:ss" placeholder="选择日期"></el-date-picker>
+										value-format="yyyy-MM-dd HH:mm:ss" 
+										value="yyyy-MM-dd HH:mm:ss"placeholder="选择日期"></el-date-picker>
 								</el-form-item>
 							</el-col>
 						</el-row>
 						<el-row v-if="checkResultFlag !== 1">
 							<el-col :span="8">
-								<el-form-item label="隐患明细" prop="principalName" style="white-space: nowrap;overflow: hidden;">
-									<el-radio-group v-model="hazardDetails" size="small">
+								<el-form-item label="隐患明细" prop="hiddenDange" style="white-space: nowrap;overflow: hidden;">
+									<el-checkbox-group v-model="hiddenDangeArr" size="small" >
 										<el-col v-for="option in checkboxOptions" :key="option.value">
-											<el-checkbox :label="option.value">{{ option.label }}</el-checkbox>
+											<el-checkbox :label="option.value">{{ option.hazardDesc }}</el-checkbox>
 										</el-col>
-									</el-radio-group>
+									</el-checkbox-group>
 								</el-form-item>
 							</el-col>
 						</el-row>
 						<el-row >
 							<el-col :span="18" v-for="(item, index) in inputList" :key="index" style="margin-left: 100px;">
 								<el-form-item label="" prop="textarea" class="input-container">
-									<el-input v-model="item.value" rows="3" placeholder="请输入隐患信息" size="small" class="list_item_width_1"></el-input>
+									<el-input v-model="item.hazardDesc" rows="3" placeholder="请输入隐患信息" size="small" class="list_item_width_1"></el-input>
 								</el-form-item>
 								<el-button @click="removeInput(index)" v-if="inputList.length > 1"
 									class="remove-button">
@@ -198,7 +207,7 @@
 								</el-button>
 							</el-col>
 						</el-row>
-						<el-row v-if="checkResultFlag === 1">
+						<el-row v-if="checkResultFlag === 1 || tableData.length === 0">
 							<el-col :span="8">
 								<el-form-item label="整改意见" prop="principalName" style="white-space: nowrap;overflow: hidden;">
 									<el-input v-model="patrolForm.rectificationOpinion" rows="3" size="small" placeholder="请输入整改意见" ></el-input>
@@ -208,8 +217,7 @@
 						<el-row>
 							<el-col :span="6">
 								<el-form-item label="附件">
-									<upload-image :defaultFileList="fileList" :limit="1" @change="onChangeFileList"
-										v-if="true"></upload-image>
+									<upload-image :defaultFileList="fileList" :limit="3" @change="onChangeFileList"></upload-image>
 								</el-form-item>
 							</el-col>
 							<el-col :span="18">
@@ -297,90 +305,19 @@ export default {
 		return {
 			orgOptions:[],
 			orgOptionProps,
-			inputList: [{ value: '' }],//隐患输入框 
+			inputList: [{ hazardDesc: '',hazardStatus:'0' }],//隐患输入框 
 			fileList:[],
 			patrolAdd: false,
-			checkboxOptions: [
-				{ label: 'Option 1', value: 'option1' },
-				{ label: 'Option 2', value: 'option2' },
-				{ label: '已整改患', value: '已整改隐患' },
-			],
-			hazardDetails:[],
+			checkboxOptions: [],
+			hiddenDangeArr:[],
 
-			tableData: [
-				// {
-				// 	checkTime: '2019-04-22 09:30',
-				// 	checkPersons: '张三，李四',
-				// 	checkResultFlag: '不合格',
-				// 	reviewTime: '2019-04-22 09:30',
-				// 	hazardDetails:[
-				// 	{
-				// 		"id": "hd1111",
-				// 		"customerId": "45687aa479955f9d06204d415238f7cc",
-				// 		"companyId": "c1111",
-				// 		"recordId": "r1111",
-				// 		"hazardStatus": 0,
-				// 		"hazardDesc": "小马哥请原谅我",
-				// 		"delFlag": null,
-				// 		"revision": 0,
-				// 		"createdBy": "zxc",
-				// 		"createdTime": "2024-05-03 16:26:37",
-				// 		"updatedBy": "zxc",
-				// 		"updatedTime": "2024-05-03 16:26:49"
-				// 	},
-				// 	{
-				// 		"id": "hd1112",
-				// 		"customerId": "45687aa479955f9d06204d415238f7cc",
-				// 		"companyId": "c1111",
-				// 		"recordId": "r1111",
-				// 		"hazardStatus": 1,
-				// 		"hazardDesc": "小马哥喝一点酒太亢奋",
-				// 		"delFlag": null,
-				// 		"revision": 2,
-				// 		"createdBy": "zxc",
-				// 		"createdTime": "2024-05-03 16:26:37",
-				// 		"updatedBy": "zxc",
-				// 		"updatedTime": "2024-05-03 16:26:49"
-				// 	},
-				// 	{
-				// 		"id": "hd1113",
-				// 		"customerId": "45687aa479955f9d06204d415238f7cc",
-				// 		"companyId": "c1111",
-				// 		"recordId": "r1111",
-				// 		"hazardStatus": 2,
-				// 		"hazardDesc": "我不想这样做，但是找不到更好的原因了，抱歉小马哥",
-				// 		"delFlag": null,
-				// 		"revision": 0,
-				// 		"createdBy": "zxc",
-				// 		"createdTime": "2024-05-03 16:26:37",
-				// 		"updatedBy": "zxc",
-				// 		"updatedTime": "2024-05-03 16:26:49"
-				// 	}
-				// 	],
-				// 	attachmentUrl: '123456789.jPg',
-				// 	remark: '请相关负责人尽快处理'
-				// },
-				// {
-				// 	checkTime: '2019-04-22 09:30',
-				// 	checkPersons: '张三，李四',
-				// 	checkResultFlag: '不合格',
-				// 	reviewTime: '2019-04-22 09:30',
-				// 	hazardDetails:[
-				// 		{
-				// 			hazardStatus:1,
-				// 			hazardDesc:'卫生没整好2'
-				// 		}
-				// 	],
-				// 	attachmentUrl: '123456789.jPg',
-				// 	remark: '请相关负责人尽快处理'
-				// },
-			],
+			tableData: [],
 			btnDisable: false,
 			user: '',
 			agencyId: '',
 			gridList: [], //所属网格list--场所区域
 			placeTypeList: [], //场所类型
-			resultArray: [{ value: '0', label: '合格' }, { value: '1', label: '不合格' }],
+			resultArray: [{ value: '1', label: '合格' }, { value: '0', label: '不合格' }],
 			stafflist: [],
 			formData: {
 				agencyId:'',
@@ -407,9 +344,9 @@ export default {
 				checkTime:null,
 				checkPersonsIdList:null,
 				checkResultFlag:null,
+				attachmentUrls:[],
 				reviewTime:null,
-				hazardDetails:null,
-				attachmentUrl:null,
+				hiddenDangeList:null,
 				remark:null,
 			},
 			patrolRule:{
@@ -420,7 +357,9 @@ export default {
 			},
 			//地图
 			loading: false,
-			searchOptions: []
+			searchOptions: [],
+			preViewImage:null,
+			preViewImageFlag:false
 		};
 	},
 	watch: {},
@@ -447,6 +386,10 @@ export default {
 	},
 
 	methods: {
+		handelCLickImage(url){
+			this.preViewImageFlag = true;
+			this.preViewImage = url;
+		},
 		handleChangeAgency(val) {
 			this.formData.agencyId = val.length ? val[val.length - 1] : val[0];
 		},
@@ -467,7 +410,7 @@ export default {
                 })
         },
 		addInput() {
-			this.inputList.push({ value: '' }); // 新增一个输入框，对应一个新的对象
+			this.inputList.push({ hazardDesc: '',hazardStatus:'0' }); // 新增一个输入框，对应一个新的对象
 		},
 		removeInput(index) {
 			this.inputList.splice(index, 1); // 删除对应索引的输入框
@@ -480,6 +423,7 @@ export default {
 					let ob = {
 						fileType: item.raw.type,
 						fileUrl: item.response.data.url,
+						attachmentUrl:item.response.data.url,
 						fileName:item.response.data.fileName
 					}
 					this.fileList.push(ob)
@@ -506,16 +450,21 @@ export default {
 		// 巡查记录
 		async getCompanyDetail(){
 			const url = `/actual/base/companyInfo/showRecord`;
-			const { data, code, msg } = await requestPost(url,{id:this.detailId});
+			let  { data, code, msg } = await requestPost(url,{id:this.detailId});
 			if (code === 0) {
 				data.forEach(item=>{
 					if(!item.hiddenDangeList){
 						item.flag = true;
 					}else{
-						item.flag = item.hazardDetails.findIndex(item=>item.hazardStatus === 2) === -1;
+						item.flag = item.hiddenDangeList.findIndex(item=>item.hazardStatus === 2) === -1;
 					}
 				})
-				console.log(data);
+				if(data[0].hiddenDangeList){
+					this.checkboxOptions = data[0].hiddenDangeList.filter(item=>item.hazardStatus === 0).map(item=>({hazardDesc:item.hazardDesc,value:item.id,hazardStatus:0}));
+					this.fileList = data[0].attachmentUrls;
+					console.log(this.fileList);
+				}
+				
 				this.tableData = data;
 			} else {
 				this.$message.error(msg);
@@ -575,8 +524,16 @@ export default {
 			}else if(this.pageType == 'patrol'){
 				url = '/actual/base/companyInfo/addRecord';
 				params = { ...this.patrolForm };
+				for(let i in this.hiddenDangeArr){
+					this.checkboxOptions.forEach(item => {
+						if(item.value == this.hiddenDangeArr[i]){
+							item.hazardStatus = '1';
+						}
+					})
+				}
+				params.hiddenDangeList =[...this.inputList,...this.checkboxOptions] ;
 				params.companyId = this.detailId;
-				params.attachmentUrl = this.fileList[0];
+				params.attachmentUrls = this.fileList;
 			}
 			
 			const { data, code, msg } = await requestPost(url, params);
@@ -714,4 +671,18 @@ export default {
   font-size: 16px; /* 设置圆点大小 */
   border: none; /* 去掉边框 */
 }
+.imagePreview {
+	width:100vw;
+	height:100vh;
+	position: fixed;
+	top: 0;
+	right: 0;
+	bottom: 0;
+	left: 0;
+	z-index:5000;
+	background-color: rgba(12, 12, 12, 0.1);
+	display: flex;
+	align-items: center;
+	justify-content: center;
+}
 </style>
diff --git a/src/views/modules/resourceManagement/enterprise/index.vue b/src/views/modules/resourceManagement/enterprise/index.vue
index 75a893109..0e499bce8 100644
--- a/src/views/modules/resourceManagement/enterprise/index.vue
+++ b/src/views/modules/resourceManagement/enterprise/index.vue
@@ -315,7 +315,7 @@ export default {
                 .catch(err => { });
         },
         async del(id) {
-            const url = `/actual/base/companyInfo/deleteCompany`;
+            const url = `/actual/base/companyInfo/delete`;
             const { data, code, msg } = await requestPost(url, {id});
             if (code === 0) {
                 this.$message.success('删除成功！');

From e099b0876458d2b21bd2aa4d80f78ea2e817dc6b Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Sat, 11 May 2024 10:41:30 +0800
Subject: [PATCH 07/19] =?UTF-8?q?=E8=81=94=E5=BB=BA=E5=8D=95=E4=BD=8D?=
 =?UTF-8?q?=E8=B7=9F=E7=A4=BE=E5=8C=BA=E8=87=AA=E7=BB=84=E7=BB=87=E4=B8=8B?=
 =?UTF-8?q?=E6=8B=89=E6=A1=86,=E6=99=BA=E8=83=BD=E5=AF=BC=E5=85=A5?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E7=B1=BB=E5=9E=8B=E5=8A=A0=E5=85=A5=E5=8F=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/smartImport/cpts/createdTask.vue     |  2 +-
 .../regionalParty/unitsForm.vue               | 34 ++++++----------
 .../tuceng/yingji/zizuzhi/addForm.vue         | 40 ++++++++++++-------
 3 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/src/views/modules/base/smartImport/cpts/createdTask.vue b/src/views/modules/base/smartImport/cpts/createdTask.vue
index 80882d7c5..191bb5e2f 100644
--- a/src/views/modules/base/smartImport/cpts/createdTask.vue
+++ b/src/views/modules/base/smartImport/cpts/createdTask.vue
@@ -280,7 +280,7 @@ export default {
       const url = "/oper/customize/icformitemgroup/list";
       // const url = 'http://yapi.elinkservice.cn/mock/245/gov/org/isServiceProject/service/serviceScopeTree'
       let params = {
-        formCode: "resident_base_info",
+        formCode: "resident_base_info,community_info",
         policyFlag: "1",
       };
 
diff --git a/src/views/modules/communityParty/regionalParty/unitsForm.vue b/src/views/modules/communityParty/regionalParty/unitsForm.vue
index 14a3c20dd..1cf0f4287 100644
--- a/src/views/modules/communityParty/regionalParty/unitsForm.vue
+++ b/src/views/modules/communityParty/regionalParty/unitsForm.vue
@@ -76,26 +76,13 @@
             class="u-item-width-normal"
           ></el-cascader>
         </el-form-item>
-        <!-- <el-form-item
-          label="联系人"
-          prop="contact"
-          label-width="150px"
-          style="display: block"
-        >
-          <el-input
-            class="item_width_1"
-            placeholder="请输入联系人姓名"
-            v-model.trim="formData.contact"
-          >
-          </el-input>
-        </el-form-item> -->
         <el-form-item label="联系人" prop="contact">
           <el-select v-model.trim="formData.contact" class="u-item-width-normal" size="small" clearable
-            placeholder="请选择联系人">
+            placeholder="请选择联系人" @change="handelChangeStaff">
             <el-option v-for="item in dicts.stafflist"
                   :key="item.value"
                   :label="item.name"
-                  :value="item.name"></el-option>
+                  :value="item.staffId"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item
@@ -254,16 +241,19 @@ export default {
   },
 
   methods: {
+    handelChangeStaff(val){
+      if(val){
+        this.formData.contactMobile = this.dicts.stafflist.filter(item=>item.staffId === val)[0].mobile
+      }else{
+        this.formData.contactMobile = ''
+      }
+    },
     getStafflist() {
       let parms = {
-        orgId: this.agencyId,
-        orgType: "agency",
-        pageNo: 1,
-        pageSize: 100,
+        roleKey:'party_unit_director'
       };
-      this.$http.post("data/aggregator/org/stafflist", parms).then((resp) => {
-        this.dicts.stafflist = resp.data.data.staffList;
-        console.log("stafflist", resp.data);
+      this.$http.post("data/aggregator/epmetuser/getRoleUserInfo", parms).then((resp) => {
+        this.dicts.stafflist = resp.data.data;
       });
     },
     async initForm(type, unitId) {
diff --git a/src/views/modules/shequzhili/tuceng/yingji/zizuzhi/addForm.vue b/src/views/modules/shequzhili/tuceng/yingji/zizuzhi/addForm.vue
index 42556b1ab..73102e142 100644
--- a/src/views/modules/shequzhili/tuceng/yingji/zizuzhi/addForm.vue
+++ b/src/views/modules/shequzhili/tuceng/yingji/zizuzhi/addForm.vue
@@ -37,7 +37,13 @@
 
 						<el-col :span="6">
 							<el-form-item label="负责人" prop="principalName">
-								<el-input v-model.trim="formData.principalName" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
+								<el-select v-model.trim="formData.principalName" class="u-item-width-normal" size="small" clearable
+									placeholder="请选择联系人" @change="handelChangeStaff">
+									<el-option v-for="item in stafflist"
+										:key="item.value"
+										:label="item.name"
+										:value="item.name"></el-option>
+								</el-select>
 							</el-form-item>
 						</el-col>
 						<el-col :span="6">
@@ -298,7 +304,8 @@ export default {
 			//地图
 			loading: false,
 			searchValue: '',
-			searchOptions: []
+			searchOptions: [],
+			stafflist:[]
 		};
 	},
 	watch: {},
@@ -312,7 +319,7 @@ export default {
 		this.getVolunteerList();
 		this.loadplaceType();
 		this.getDemandOptions()
-
+		this.getStafflist()
 		// this.loadserviceList();
 		// this.loadGrid();
 		// this.loadplaceType();
@@ -326,18 +333,21 @@ export default {
 	},
 
 	methods: {
-		// async loadserviceList() {
-		// 	const url = '/actual/base/serviceitem/dict-list';
-		// 	const params = {
-		// 		type: 'usable'
-		// 	};
-		// 	const { data, code, msg } = await requestPost(url, params);
-		// 	if (code === 0) {
-		// 		this.serviceList = data;
-		// 	} else {
-		// 		this.$message.error(msg);
-		// 	}
-		// },
+		getStafflist() {
+			let parms = {
+				roleKey:'community_org_director'
+			};
+			this.$http.post("data/aggregator/epmetuser/getRoleUserInfo", parms).then((resp) => {
+				this.stafflist = resp.data.data;
+			});
+		},
+		handelChangeStaff(val){
+			if(val){
+				this.formData.principalPhone = this.stafflist.filter(item=>item.name === val)[0].mobile
+			}else{
+				this.formData.principalPhone = ''
+			}
+		},
 		async getDemandOptions() {
 			this.$http
 				.post("/actual/base/serviceitem/listAllCategory")

From ae8b837a2e93f147feb31c06b5a350b4b012045d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E7=B4=A0?= <66666@66.com>
Date: Sat, 11 May 2024 15:24:57 +0800
Subject: [PATCH 08/19] =?UTF-8?q?15.11.15=EF=BC=9A24?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resourceManagement/enterprise/addForm.vue | 166 +++++++++++-------
 1 file changed, 104 insertions(+), 62 deletions(-)

diff --git a/src/views/modules/resourceManagement/enterprise/addForm.vue b/src/views/modules/resourceManagement/enterprise/addForm.vue
index c005e6219..7f2198cd1 100644
--- a/src/views/modules/resourceManagement/enterprise/addForm.vue
+++ b/src/views/modules/resourceManagement/enterprise/addForm.vue
@@ -18,40 +18,42 @@
 							</el-form-item> -->
 
 							<el-form-item label="所属组织" prop="agencyId">
-                            <el-cascader class="list_item_width_1" size="small" ref="myCascader" :disabled="disabled"
-                                v-model.trim="formData.agencyId" :options="orgOptions" :props="orgOptionProps"
-                                :show-all-levels="false" @change="handleChangeAgency" clearable></el-cascader>
-                        	</el-form-item>
+								<el-cascader class="list_item_width_1" size="small" ref="myCascader"
+									:disabled="disabled" v-model.trim="formData.agencyId" :options="orgOptions"
+									:props="orgOptionProps" :show-all-levels="false" @change="handleChangeAgency"
+									clearable></el-cascader>
+							</el-form-item>
 
 						</el-col>
 						<el-col :span="6">
 							<el-form-item label="企业名称" prop="name">
-								<el-input v-model.trim="formData.name" :disabled="disabled"
-									class="list_item_width_1" size="small" clearable placeholder="请输入"></el-input>
+								<el-input v-model.trim="formData.name" :disabled="disabled" class="list_item_width_1"
+									size="small" clearable placeholder="请输入"></el-input>
 							</el-form-item>
 						</el-col>
 						<el-col :span="4.5">
 							<el-form-item label="九小场所" prop="nineSmallPlacesFlag">
-								<el-radio-group v-model="formData.nineSmallPlacesFlag" :disabled="disabled" size="small">
+								<el-radio-group v-model="formData.nineSmallPlacesFlag" :disabled="disabled"
+									size="small">
 									<el-radio :label="1">是</el-radio>
 									<el-radio :label="0">否</el-radio>
 								</el-radio-group>
 							</el-form-item>
 						</el-col>
-						<el-col :span="7.5">
+						<el-col :span="7.5"  v-if="formData.nineSmallPlacesFlag === 1">
 							<el-form-item label="九小场所分类" prop="nineSmallPlacesCategory" label-width="150px">
-									<el-select v-model.trim="formData.nineSmallPlacesCategory" :disabled="disabled" placeholder="请选择" class="list_item_width_1"
-                                size="small">
-                                <el-option v-for="item in placeTypeList" :label="item.label" :value="item.value"
-                                    :key="item.value">
-                                </el-option>
-                            </el-select>
+								<el-select v-model.trim="formData.nineSmallPlacesCategory" :disabled="disabled"
+									placeholder="请选择" class="list_item_width_1" size="small">
+									<el-option v-for="item in placeTypeList" :label="item.label" :value="item.value"
+										:key="item.value">
+									</el-option>
+								</el-select>
 							</el-form-item>
 						</el-col>
 						<el-col :span="6">
 							<el-form-item label="规模" prop="scale">
-								<el-input v-model.trim="formData.scale" :disabled="disabled"
-									class="list_item_width_1" size="small" clearable placeholder="请输入"></el-input>
+								<el-input v-model.trim="formData.scale" :disabled="disabled" class="list_item_width_1"
+									size="small" clearable placeholder="请输入"></el-input>
 							</el-form-item>
 						</el-col>
 						<el-col :span="6">
@@ -62,8 +64,8 @@
 						</el-col>
 						<el-col :span="6">
 							<el-form-item label="联系电话" prop="mobile">
-								<el-input v-model.trim="formData.mobile" :disabled="disabled"
-									class="list_item_width_1" size="small" clearable placeholder="请输入"></el-input>
+								<el-input v-model.trim="formData.mobile" :disabled="disabled" class="list_item_width_1"
+									size="small" clearable placeholder="请输入"></el-input>
 							</el-form-item>
 						</el-col>
 						<el-col :span="18">
@@ -85,7 +87,8 @@
 					<div class="div_btn">
 						<el-button size="small" type="primary " @click="patrolAddd()">新增</el-button>
 					</div>
-					<el-row v-for="(item, index) in tableData" :key="index" :gutter="20" style="margin-bottom: 20px;" v-if="tableData">
+					<el-row v-for="(item, index) in tableData" :key="index" :gutter="20" style="margin-bottom: 20px;"
+						v-if="tableData">
 						<el-row style="margin-top: 20px;">
 							<el-col :span="24">
 								<el-tag type="primary" effect="plain" class="custom-tag">●</el-tag>{{item.checkTime}}
@@ -101,9 +104,12 @@
 								item.reviewTime || '--' }}</el-col>
 						</el-row>
 						<el-row style="margin-top: 15px;">
-							<el-col :span="24" style="padding-left: 65px;"><span style="color: #888; ">{{item.flag?'已整改隐患':'隐患明细'}}: </span>
+							<el-col :span="24" style="padding-left: 65px;"><span
+									style="color: #888; ">{{item.flag?'已整改隐患':'隐患明细'}}: </span>
 								<div v-if="item.hiddenDangeList">
-									<p style="margin-left: 60px;" v-for="(itemC,index) in item.hiddenDangeList.filter(item=>item.hazardStatus ==1)" >{{index+1}}.{{itemC.hazardDesc}}</p> 
+									<p style="margin-left: 60px;"
+										v-for="(itemC,index) in item.hiddenDangeList.filter(item=>item.hazardStatus ==1)">
+										{{index+1}}.{{itemC.hazardDesc}}</p>
 								</div>
 								<span v-else>--</span>
 							</el-col>
@@ -111,32 +117,39 @@
 						<el-row style="margin-top: 15px;" v-if="item.flag">
 							<el-col :span="24" style="padding-left: 65px;"><span style="color: #888; ">未整改隐患: </span>
 								<div v-if="item.hiddenDangeList">
-									<p style="margin-left: 60px;" v-for="(itemC,index) in item.hiddenDangeList.filter(item=>item.hazardStatus == 0)" >{{index+1}}.{{itemC.hazardDesc}}</p> 
-								</div> 
-								 <span v-else>--</span>
+									<p style="margin-left: 60px;"
+										v-for="(itemC,index) in item.hiddenDangeList.filter(item=>item.hazardStatus == 0)">
+										{{index+1}}.{{itemC.hazardDesc}}</p>
+								</div>
+								<span v-else>--</span>
 							</el-col>
 						</el-row>
 						<el-row style="margin-top: 15px;" v-else>
 							<el-col :span="24" style="padding-left: 65px;"><span style="color: #888; ">整改要求: </span>
-								 <p style="margin-left: 60px;">{{index+1}}.{{item.hiddenDangeList.find(item=>item.hazardStatus == 2).hazardDesc}}</p> 
+								<p style="margin-left: 60px;">
+									{{index+1}}.{{item.hiddenDangeList.find(item=>item.hazardStatus == 2).hazardDesc}}
+								</p>
 							</el-col>
-							
+
 						</el-row>
 						<el-row style="margin-top: 15px;">
 							<el-col :span="6" style="padding-left: 65px;">
 								<span style="color: #888; ">附件: </span>
-							 <span v-for="(itemI,indexI) in item.attachmentUrls" :key="itemI.fileName" style="margin-right:10px;cursor:pointer" @click="handelCLickImage(itemI.attachmentUrl)">{{
-								itemI.fileName }}
-							</span>
-							<div class="imagePreview" v-if="preViewImageFlag" @click="preViewImageFlag = false">
+								<span v-for="(itemI,indexI) in item.attachmentUrls" :key="itemI.fileName"
+									style="margin-right:10px;cursor:pointer"
+									@click="handelCLickImage(itemI.attachmentUrl)">{{
+									itemI.fileName }}
+								</span>
+								<div class="imagePreview" v-if="preViewImageFlag" @click="preViewImageFlag = false">
 									<img :src="preViewImage" alt="">
-							</div>
-							 </el-col>
+								</div>
+							</el-col>
 							<el-col :span="6" style="padding-left: 65px;"><span style="color: #888; ">备注: </span>{{
 								item.remark || '--' }}</el-col>
 						</el-row>
 					</el-row>
-					<div style="width:100%;height:300px;display:flex;align-items:center;justify-content: center;" v-if="tableData.length === 0&& !patrolAdd">
+					<div style="width:100%;height:300px;display:flex;align-items:center;justify-content: center;"
+						v-if="tableData.length === 0&& !patrolAdd">
 						<span>暂无数据~</span>
 					</div>
 					<!-- 巡查记录新增 -->
@@ -147,56 +160,60 @@
 								<el-form-item label="巡查时间" prop="checkTime">
 									<el-date-picker class="list_item_width_1" size="small"
 										v-model.trim="patrolForm.checkTime" type="datetime"
-										value-format="yyyy-MM-dd HH:mm:ss"
-										value="yyyy-MM-dd HH:mm:ss"placeholder="选择日期"></el-date-picker>
+										value-format="yyyy-MM-dd HH:mm:ss" value="yyyy-MM-dd HH:mm:ss"
+										placeholder="选择日期"></el-date-picker>
 								</el-form-item>
 							</el-col>
 							<el-col :span="16">
 								<el-form-item label="检查人员" prop="checkPersonsIdList">
-									<el-select v-model.trim="patrolForm.checkPersonsIdList" :disabled="disabled" placeholder="请选择" class="list_item_width_1"
-                                size="small" multiple>
-                                <el-option v-for="item in stafflist" :label="item.name" :value="item.staffId"
-                                    :key="item.value">
-                                </el-option>
-                            </el-select>
+									<el-select v-model.trim="patrolForm.checkPersonsIdList" :disabled="disabled"
+										placeholder="请选择" class="list_item_width_1" size="small" multiple>
+										<el-option v-for="item in stafflist" :label="item.name" :value="item.staffId"
+											:key="item.value">
+										</el-option>
+									</el-select>
 								</el-form-item>
 							</el-col>
 						</el-row>
 						<el-row>
 							<el-col :span="18">
 								<el-form-item label="检查结论" prop="checkResultFlag">
-									<el-select v-model.trim="patrolForm.checkResultFlag" :disabled="disabled" placeholder="请选择" class="list_item_width_1"
-                                size="small">
-                                <el-option v-for="item in resultArray" :label="item.label" :value="item.value"
-                                    :key="item.value">
-                                </el-option>
-                            </el-select>
+									<el-select v-model.trim="patrolForm.checkResultFlag" :disabled="disabled"
+										placeholder="请选择" class="list_item_width_1" size="small">
+										<el-option v-for="item in resultArray" :label="item.label" :value="item.value"
+											:key="item.value">
+										</el-option>
+									</el-select>
 								</el-form-item>
 							</el-col>
 							<el-col :span="18">
 								<el-form-item label="拟复查时间" prop="reviewTime">
 									<el-date-picker class="list_item_width_1" size="small"
 										v-model.trim="patrolForm.reviewTime" type="datetime"
-										value-format="yyyy-MM-dd HH:mm:ss" 
-										value="yyyy-MM-dd HH:mm:ss"placeholder="选择日期"></el-date-picker>
+										value-format="yyyy-MM-dd HH:mm:ss" value="yyyy-MM-dd HH:mm:ss"
+										placeholder="选择日期"></el-date-picker>
 								</el-form-item>
 							</el-col>
 						</el-row>
 						<el-row v-if="checkResultFlag !== 1">
 							<el-col :span="8">
-								<el-form-item label="隐患明细" prop="hiddenDange" style="white-space: nowrap;overflow: hidden;">
-									<el-checkbox-group v-model="hiddenDangeArr" size="small" >
+								<el-form-item label="隐患明细" prop="hiddenDange"
+									style="white-space: nowrap;overflow: hidden;">
+									<el-checkbox-group v-model="hiddenDangeArr" size="small">
 										<el-col v-for="option in checkboxOptions" :key="option.value">
-											<el-checkbox :label="option.value">{{ option.hazardDesc }}</el-checkbox>
+											<el-checkbox :label="option.value" :checked="true" :disabled="true">{{
+												option.hazardDesc }}</el-checkbox>
 										</el-col>
 									</el-checkbox-group>
 								</el-form-item>
 							</el-col>
 						</el-row>
-						<el-row >
-							<el-col :span="18" v-for="(item, index) in inputList" :key="index" style="margin-left: 100px;">
+						<el-row>
+							<el-col :span="18" v-for="(item, index) in inputList" :key="index"
+								style="margin-left: 100px;">
 								<el-form-item label="" prop="textarea" class="input-container">
-									<el-input v-model="item.hazardDesc" rows="3" placeholder="请输入隐患信息" size="small" class="list_item_width_1"></el-input>
+									<el-input v-model="item.hazardDesc" rows="3" placeholder="请输入隐患信息" size="small"
+										class="list_item_width_1"></el-input>
 								</el-form-item>
 								<el-button @click="removeInput(index)" v-if="inputList.length > 1"
 									class="remove-button">
@@ -209,15 +226,18 @@
 						</el-row>
 						<el-row v-if="checkResultFlag === 1 || tableData.length === 0">
 							<el-col :span="8">
-								<el-form-item label="整改意见" prop="principalName" style="white-space: nowrap;overflow: hidden;">
-									<el-input v-model="patrolForm.rectificationOpinion" rows="3" size="small" placeholder="请输入整改意见" ></el-input>
+								<el-form-item label="整改意见" prop="principalName"
+									style="white-space: nowrap;overflow: hidden;">
+									<el-input v-model="patrolForm.rectificationOpinion" rows="3" size="small"
+										placeholder="请输入整改意见"></el-input>
 								</el-form-item>
 							</el-col>
 						</el-row>
 						<el-row>
 							<el-col :span="6">
 								<el-form-item label="附件">
-									<upload-image :defaultFileList="fileList" :limit="3" @change="onChangeFileList"></upload-image>
+									<upload-image :defaultFileList="fileList" :limit="3"
+										@change="onChangeFileList"></upload-image>
 								</el-form-item>
 							</el-col>
 							<el-col :span="18">
@@ -234,7 +254,7 @@
 		</div>
 		<span slot="footer" class="dialog-footer">
 			<el-button @click="handleCancle" size="small">取消</el-button>
-			<el-button @click="handleComfirm" size="small"  type="primary">确定</el-button>
+			<el-button @click="handleComfirm" size="small" type="primary">确定</el-button>
 		</span>
 	</el-dialog>
 </template>
@@ -410,7 +430,10 @@ export default {
                 })
         },
 		addInput() {
-			this.inputList.push({ hazardDesc: '',hazardStatus:'0' }); // 新增一个输入框，对应一个新的对象
+			if (this.inputList.some(item => item.hazardDesc.trim() === '')) {
+			} else {
+				this.inputList.push({ hazardDesc: '', hazardStatus: '0' });
+			}
 		},
 		removeInput(index) {
 			this.inputList.splice(index, 1); // 删除对应索引的输入框
@@ -527,11 +550,30 @@ export default {
 				for(let i in this.hiddenDangeArr){
 					this.checkboxOptions.forEach(item => {
 						if(item.value == this.hiddenDangeArr[i]){
-							item.hazardStatus = '1';
+							item.hazardStatus = '0';
 						}
 					})
 				}
-				params.hiddenDangeList =[...this.inputList,...this.checkboxOptions] ;
+				for (let i in this.checkboxOptions) {
+					let option = this.checkboxOptions[i];
+					if (this.patrolForm.checkResultFlag === '1') {
+						option.hazardStatus = '1';
+					} else if (this.patrolForm.checkResultFlag === '0') {
+						option.hazardStatus = '0';
+					}
+				}
+				for (let i in this.inputList) {
+					let option = this.inputList[i];
+					if (this.patrolForm.checkResultFlag === '1') {
+						option.hazardStatus = '1';
+					} else if (this.patrolForm.checkResultFlag === '0') {
+						option.hazardStatus = '0';
+					}
+				}
+				params.hiddenDangeList = [
+					...this.inputList.filter(item => item.hazardDesc.trim() !== ''),
+					...this.checkboxOptions
+				];
 				params.companyId = this.detailId;
 				params.attachmentUrls = this.fileList;
 			}

From 720fdcddec62b7382bec65a9ba980a21dc816419 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=98=AF=E5=B0=8F=E7=8E=8B=E5=91=80=5C24601?=
 <819653817@qq.com>
Date: Sat, 11 May 2024 16:05:50 +0800
Subject: [PATCH 09/19] =?UTF-8?q?=E5=90=88=E6=A0=BC=E5=A4=8D=E6=9F=A5?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E4=B8=8D=E7=94=A8=E5=A1=AB=E5=86=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/resourceManagement/enterprise/addForm.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/modules/resourceManagement/enterprise/addForm.vue b/src/views/modules/resourceManagement/enterprise/addForm.vue
index 7f2198cd1..413e1bc2a 100644
--- a/src/views/modules/resourceManagement/enterprise/addForm.vue
+++ b/src/views/modules/resourceManagement/enterprise/addForm.vue
@@ -100,7 +100,7 @@
 								item.checkPersons }}</el-col>
 							<el-col :span="6" style="padding-left: 65px;"><span style="color: #888; ">检查结论:</span> {{
 								item.checkResultFlag === 1?'合格':'不合格' }}</el-col>
-							<el-col :span="6" style="padding-left: 65px;"><span style="color: #888; ">拟复查时间: </span> {{
+							<el-col :span="6" style="padding-left: 65px;"  v-if="item.checkResultFlag !== 1"><span style="color: #888; ">拟复查时间: </span> {{
 								item.reviewTime || '--' }}</el-col>
 						</el-row>
 						<el-row style="margin-top: 15px;">
@@ -201,7 +201,7 @@
 									style="white-space: nowrap;overflow: hidden;">
 									<el-checkbox-group v-model="hiddenDangeArr" size="small">
 										<el-col v-for="option in checkboxOptions" :key="option.value">
-											<el-checkbox :label="option.value" :checked="true" :disabled="true">{{
+											<el-checkbox :label="option.value" >{{
 												option.hazardDesc }}</el-checkbox>
 										</el-col>
 									</el-checkbox-group>

From a2f547342538be0c59c84764cd52bd19079f2b69 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Mon, 13 May 2024 14:17:50 +0800
Subject: [PATCH 10/19] =?UTF-8?q?=E5=85=A5=E5=8F=82=E4=BF=AE=E6=94=B9,?=
 =?UTF-8?q?=E4=B9=9D=E5=B0=8F=E5=9C=BA=E6=89=80=E5=8F=AF=E6=B8=85=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/resourceManagement/enterprise/index.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/modules/resourceManagement/enterprise/index.vue b/src/views/modules/resourceManagement/enterprise/index.vue
index 0e499bce8..e871e9010 100644
--- a/src/views/modules/resourceManagement/enterprise/index.vue
+++ b/src/views/modules/resourceManagement/enterprise/index.vue
@@ -30,7 +30,7 @@
                         </el-form-item>
                         <el-form-item label="九小场所分类" prop="nineSmallPlacesCategory">
                             <el-select v-model.trim="formData.nineSmallPlacesCategory" placeholder="请选择" class="u-item-width-normal"
-                                size="small">
+                                size="small" clearable>
                                 <el-option v-for="item in placeTypeList" :label="item.label" :value="item.value"
                                     :key="item.value">
                                 </el-option>
@@ -38,7 +38,7 @@
                         </el-form-item>
                         <el-form-item label="最新检查时间" prop="orderDate">
                             <el-date-picker class="u-item-width-normal" size="small"
-                                v-model.trim="formData.orderDate"  type="datetime" format="yyyy-MM-dd HH:mm:ss"
+                                v-model.trim="formData.orderDate"  type="datetime" value-format="yyyy-MM-dd HH:mm:ss" value="yyyy-MM-dd HH:mm:ss"
                                 placeholder="选择日期"></el-date-picker>
                         </el-form-item>
                         <el-form-item label="最新检查结果" prop="checkResultFlag">

From 00317165977d2b7adcfda9b88732dcb071f45424 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Mon, 13 May 2024 15:10:02 +0800
Subject: [PATCH 11/19] =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=A3=80=E6=9F=A5?=
 =?UTF-8?q?=E7=BB=93=E6=9E=9C=E6=9C=AA=E6=A3=80=E6=9F=A5=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?--?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/resourceManagement/enterprise/index.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/modules/resourceManagement/enterprise/index.vue b/src/views/modules/resourceManagement/enterprise/index.vue
index e871e9010..f61de4f14 100644
--- a/src/views/modules/resourceManagement/enterprise/index.vue
+++ b/src/views/modules/resourceManagement/enterprise/index.vue
@@ -92,11 +92,11 @@
                         label="联系电话"></el-table-column>
                     <el-table-column prop="orderDate" align="center" label="最新检查时间"
                         :show-overflow-tooltip="true"></el-table-column>
-                    <el-table-column prop="checkResultFlag" align="center" label="最新结果"
+                    <el-table-column prop="checkResultFlag" align="center" label="最新检查结果"
                         :show-overflow-tooltip="true">
                     <template  slot-scope="scope">
                         <span>
-                            {{scope.row.checkResultFlag=='1'?'合格':'不合格'}}
+                            {{scope.row.checkResultFlag=='1'?'合格':scope.row.checkResultFlag=='0'?'不合格':'--'}}
                         </span>
                     </template>
                     </el-table-column>

From 00497536629565d93e306f8ac112365aa5f75082 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Tue, 14 May 2024 10:03:16 +0800
Subject: [PATCH 12/19] =?UTF-8?q?=E4=B9=9D=E5=B0=8F=E5=9C=BA=E6=89=80?=
 =?UTF-8?q?=E5=88=86=E7=B1=BB=E7=B1=BB=E5=9E=8B=E6=94=B9=E6=88=90=E5=AD=97?=
 =?UTF-8?q?=E7=AC=A6=E4=B8=B2=E4=BC=A0=E5=8F=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/resourceManagement/enterprise/addForm.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/modules/resourceManagement/enterprise/addForm.vue b/src/views/modules/resourceManagement/enterprise/addForm.vue
index 413e1bc2a..d3d527f62 100644
--- a/src/views/modules/resourceManagement/enterprise/addForm.vue
+++ b/src/views/modules/resourceManagement/enterprise/addForm.vue
@@ -347,7 +347,7 @@ export default {
 				chargePerson:'',
 				mobile:'',
 				nineSmallPlacesFlag:'',
-				nineSmallPlacesCategory:[]
+				nineSmallPlacesCategory:''
 			},
 			dataRule: {
 				agencyId: [{ required: true, message: '所属组织不能为空', trigger: 'blur' }],

From 290a680837b6a3cdb1d235f274273e02fdbc81bd Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Tue, 14 May 2024 12:45:55 +0800
Subject: [PATCH 13/19] =?UTF-8?q?=E5=B7=B2=E5=AD=98=E5=9C=A8=E9=9A=90?=
 =?UTF-8?q?=E6=82=A3=E9=80=89=E4=B8=AD=E7=8A=B6=E6=80=81=E4=B8=8D=E5=8F=98?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resourceManagement/enterprise/addForm.vue     | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/src/views/modules/resourceManagement/enterprise/addForm.vue b/src/views/modules/resourceManagement/enterprise/addForm.vue
index d3d527f62..b6d81bc53 100644
--- a/src/views/modules/resourceManagement/enterprise/addForm.vue
+++ b/src/views/modules/resourceManagement/enterprise/addForm.vue
@@ -550,18 +550,10 @@ export default {
 				for(let i in this.hiddenDangeArr){
 					this.checkboxOptions.forEach(item => {
 						if(item.value == this.hiddenDangeArr[i]){
-							item.hazardStatus = '0';
+							this.$set(item,'hazardStatus', '1');
 						}
 					})
 				}
-				for (let i in this.checkboxOptions) {
-					let option = this.checkboxOptions[i];
-					if (this.patrolForm.checkResultFlag === '1') {
-						option.hazardStatus = '1';
-					} else if (this.patrolForm.checkResultFlag === '0') {
-						option.hazardStatus = '0';
-					}
-				}
 				for (let i in this.inputList) {
 					let option = this.inputList[i];
 					if (this.patrolForm.checkResultFlag === '1') {
@@ -577,13 +569,12 @@ export default {
 				params.companyId = this.detailId;
 				params.attachmentUrls = this.fileList;
 			}
-			
 			const { data, code, msg } = await requestPost(url, params);
 			if (code === 0) {
 				this.$message.success('操作成功');
 				this.handleCancle();
-			} else if (code >= 8000) {
-				this.$message.error(msg);
+			} else if (code >= 8000) { 
+				this.$message.error(msg); 
 			}
 		},
 		

From 10428e06d5adbc9d0175bd238ca3e6b9b1b816a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=98=AF=E5=B0=8F=E7=8E=8B=E5=91=80=5C24601?=
 <819653817@qq.com>
Date: Tue, 14 May 2024 13:19:41 +0800
Subject: [PATCH 14/19] =?UTF-8?q?level=E5=80=BC=E7=AD=89=E4=BA=8E"district?=
 =?UTF-8?q?",=20"street",=20"community"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resourceManagement/enterprise/addForm.vue | 41 ++++++++++++-------
 1 file changed, 26 insertions(+), 15 deletions(-)

diff --git a/src/views/modules/resourceManagement/enterprise/addForm.vue b/src/views/modules/resourceManagement/enterprise/addForm.vue
index 413e1bc2a..015d05bc4 100644
--- a/src/views/modules/resourceManagement/enterprise/addForm.vue
+++ b/src/views/modules/resourceManagement/enterprise/addForm.vue
@@ -414,21 +414,32 @@ export default {
 			this.formData.agencyId = val.length ? val[val.length - 1] : val[0];
 		},
 		getOrgTreeList() {
-            this.$http
-                .post('/gov/org/customeragency/agencygridtree', {})
-                .then(({ data: res }) => {
-                    if (res.code !== 0) {
-                        return this.$message.error(res.msg)
-                    } else {
-                        console.log('获取组织树成功', res.data)
-                        this.orgOptions = []
-                        this.orgOptions.push(res.data)
-                    }
-                })
-                .catch(() => {
-                    return this.$message.error('网络错误')
-                })
-        },
+				 this.$http
+                .post('/gov/org/customeragency/agencygridtree', {})
+                .then(({ data: res }) => {
+                    if (res.code !== 0) {
+                        return this.$message.error(res.msg)
+                    } else {
+                        console.log('获取组织树成功', res.data)
+                        // this.orgOptions = []
+                        // this.orgOptions.push(res.data)
+                        const filteredData = {
+                            ...res.data,
+                            subAgencyList: res.data.subAgencyList.filter(item => ["district", "street", "community"].includes(item.level))
+                        };
+                        this.orgOptions = []
+                        this.orgOptions.push(filteredData)
+                        filteredData.subAgencyList.forEach(item => {
+                            console.log(item.level);
+                        });
+                        console.log('获取组织树成功111', this.orgOptions)
+                    }
+
+                })
+                .catch(() => {
+                    return this.$message.error('网络错误')
+                })
+        },
 		addInput() {
 			if (this.inputList.some(item => item.hazardDesc.trim() === '')) {
 			} else {

From 46b1c89e390e865dc63b0e9da89d5decde665615 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=98=AF=E5=B0=8F=E7=8E=8B=E5=91=80=5C24601?=
 <819653817@qq.com>
Date: Tue, 14 May 2024 13:45:13 +0800
Subject: [PATCH 15/19] =?UTF-8?q?=E6=8B=BF=E5=88=B0=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=90=8E=E9=80=92=E5=BD=92=E5=A4=84=E7=90=86=E8=BF=99=E4=B8=AA?=
 =?UTF-8?q?=E6=A0=91=E5=BD=A2=E7=BB=93=E6=9E=84,=E5=8F=AA=E6=8B=BFlevel?=
 =?UTF-8?q?=E4=B8=BAdistrict=20=20street=20=20community=E7=9A=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resourceManagement/enterprise/addForm.vue | 58 +++++++++++--------
 1 file changed, 33 insertions(+), 25 deletions(-)

diff --git a/src/views/modules/resourceManagement/enterprise/addForm.vue b/src/views/modules/resourceManagement/enterprise/addForm.vue
index d59f3ce44..9818f69bd 100644
--- a/src/views/modules/resourceManagement/enterprise/addForm.vue
+++ b/src/views/modules/resourceManagement/enterprise/addForm.vue
@@ -414,32 +414,40 @@ export default {
 			this.formData.agencyId = val.length ? val[val.length - 1] : val[0];
 		},
 		getOrgTreeList() {
-				 this.$http
-                .post('/gov/org/customeragency/agencygridtree', {})
-                .then(({ data: res }) => {
-                    if (res.code !== 0) {
-                        return this.$message.error(res.msg)
-                    } else {
-                        console.log('获取组织树成功', res.data)
-                        // this.orgOptions = []
-                        // this.orgOptions.push(res.data)
-                        const filteredData = {
-                            ...res.data,
-                            subAgencyList: res.data.subAgencyList.filter(item => ["district", "street", "community"].includes(item.level))
-                        };
-                        this.orgOptions = []
-                        this.orgOptions.push(filteredData)
-                        filteredData.subAgencyList.forEach(item => {
-                            console.log(item.level);
-                        });
-                        console.log('获取组织树成功111', this.orgOptions)
-                    }
+    this.$http
+        .post('/gov/org/customeragency/agencygridtree', {})
+        .then(({ data: res }) => {
+            if (res.code !== 0) {
+                return this.$message.error(res.msg);
+            } else {
+                console.log('获取组织树成功', res.data);
 
-                })
-                .catch(() => {
-                    return this.$message.error('网络错误')
-                })
-        },
+                // 递归处理树形结构数据，只保留 level 为 "district"、"street" 和 "community" 的节点
+                this.orgOptions = this.filterOrgTree(res.data);
+
+                console.log('获取组织树成功111', this.orgOptions);
+            }
+        })
+        .catch(() => {
+            return this.$message.error('网络错误');
+        });
+},
+
+filterOrgTree(treeData) {
+    const filteredTree = { ...treeData }; // 复制树形结构对象，避免直接修改原始数据
+
+    // 过滤当前节点的子节点
+    if (filteredTree.subAgencyList && filteredTree.subAgencyList.length > 0) {
+        filteredTree.subAgencyList = filteredTree.subAgencyList.filter(node => {
+            return ["district", "street", "community"].includes(node.level); // 只保留 level 为 "district"、"street" 和 "community" 的节点
+        }).map(node => {
+            // 对当前节点的子节点递归调用 filterOrgTree 方法
+            return this.filterOrgTree(node);
+        });
+    }
+
+    return filteredTree;
+},
 		addInput() {
 			if (this.inputList.some(item => item.hazardDesc.trim() === '')) {
 			} else {

From 42fb0e9bae90f09202d4bd5849e37893738e4aa7 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Tue, 14 May 2024 13:55:05 +0800
Subject: [PATCH 16/19] =?UTF-8?q?=E5=A6=82=E6=9E=9C=E6=98=AF=E7=A4=BE?=
 =?UTF-8?q?=E5=8C=BA=E7=BB=99=E5=AE=83=E7=BD=AE=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resourceManagement/enterprise/addForm.vue | 66 +++++++++----------
 1 file changed, 33 insertions(+), 33 deletions(-)

diff --git a/src/views/modules/resourceManagement/enterprise/addForm.vue b/src/views/modules/resourceManagement/enterprise/addForm.vue
index 9818f69bd..7d2afeffd 100644
--- a/src/views/modules/resourceManagement/enterprise/addForm.vue
+++ b/src/views/modules/resourceManagement/enterprise/addForm.vue
@@ -414,40 +414,40 @@ export default {
 			this.formData.agencyId = val.length ? val[val.length - 1] : val[0];
 		},
 		getOrgTreeList() {
-    this.$http
-        .post('/gov/org/customeragency/agencygridtree', {})
-        .then(({ data: res }) => {
-            if (res.code !== 0) {
-                return this.$message.error(res.msg);
-            } else {
-                console.log('获取组织树成功', res.data);
-
-                // 递归处理树形结构数据，只保留 level 为 "district"、"street" 和 "community" 的节点
-                this.orgOptions = this.filterOrgTree(res.data);
-
-                console.log('获取组织树成功111', this.orgOptions);
-            }
-        })
-        .catch(() => {
-            return this.$message.error('网络错误');
-        });
-},
-
-filterOrgTree(treeData) {
-    const filteredTree = { ...treeData }; // 复制树形结构对象，避免直接修改原始数据
-
-    // 过滤当前节点的子节点
-    if (filteredTree.subAgencyList && filteredTree.subAgencyList.length > 0) {
-        filteredTree.subAgencyList = filteredTree.subAgencyList.filter(node => {
-            return ["district", "street", "community"].includes(node.level); // 只保留 level 为 "district"、"street" 和 "community" 的节点
-        }).map(node => {
-            // 对当前节点的子节点递归调用 filterOrgTree 方法
-            return this.filterOrgTree(node);
-        });
-    }
+			this.$http
+				.post('/gov/org/customeragency/agencygridtree', {})
+				.then(({ data: res }) => {
+					if (res.code !== 0) {
+						return this.$message.error(res.msg);
+					} else {
+						// 递归处理树形结构数据，只保留 level 为 "district"、"street" 和 "community" 的节点
+						this.orgOptions = this.filterOrgTree(res.data);
+						console.log('获取组织树成功111', this.orgOptions);
+					}
+				})
+				.catch(() => {
+					return this.$message.error('网络错误');
+				});
+		},
+		filterOrgTree(treeData) {
+			const filteredTree = { ...treeData }; // 复制树形结构对象，避免直接修改原始数据
+			// 过滤当前节点的子节点
+			if (filteredTree.subAgencyList && filteredTree.subAgencyList.length > 0) {
+				filteredTree.subAgencyList = filteredTree.subAgencyList.map(node => {
+				// 对当前节点的子节点递归调用 filterOrgTree 方法
+				const filteredNode = this.filterOrgTree(node);
+				if (filteredNode.level === 'community') {
+					filteredNode.subAgencyList = null;
+				}
+				return filteredNode;
+				}).filter(node => {
+				// 只保留 level 为 "district"、"street" 和 "community" 的节点
+				return ["district", "street", "community"].includes(node.level);
+				});
+			}
 
-    return filteredTree;
-},
+			return filteredTree;
+		},
 		addInput() {
 			if (this.inputList.some(item => item.hazardDesc.trim() === '')) {
 			} else {

From 92a14a3cba619fb52347ecac8f059be9382fc28c Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Tue, 14 May 2024 17:13:51 +0800
Subject: [PATCH 17/19] bug#1156

---
 .../resourceManagement/enterprise/addForm.vue | 227 ++++++++++--------
 1 file changed, 132 insertions(+), 95 deletions(-)

diff --git a/src/views/modules/resourceManagement/enterprise/addForm.vue b/src/views/modules/resourceManagement/enterprise/addForm.vue
index 7d2afeffd..93cebadbd 100644
--- a/src/views/modules/resourceManagement/enterprise/addForm.vue
+++ b/src/views/modules/resourceManagement/enterprise/addForm.vue
@@ -87,71 +87,6 @@
 					<div class="div_btn">
 						<el-button size="small" type="primary " @click="patrolAddd()">新增</el-button>
 					</div>
-					<el-row v-for="(item, index) in tableData" :key="index" :gutter="20" style="margin-bottom: 20px;"
-						v-if="tableData">
-						<el-row style="margin-top: 20px;">
-							<el-col :span="24">
-								<el-tag type="primary" effect="plain" class="custom-tag">●</el-tag>{{item.checkTime}}
-							</el-col>
-						</el-row>
-
-						<el-row style="margin-top: 15px;">
-							<el-col :span="6" style="padding-left: 65px;"> <span style="color: #888; ">检查人员:</span> {{
-								item.checkPersons }}</el-col>
-							<el-col :span="6" style="padding-left: 65px;"><span style="color: #888; ">检查结论:</span> {{
-								item.checkResultFlag === 1?'合格':'不合格' }}</el-col>
-							<el-col :span="6" style="padding-left: 65px;"  v-if="item.checkResultFlag !== 1"><span style="color: #888; ">拟复查时间: </span> {{
-								item.reviewTime || '--' }}</el-col>
-						</el-row>
-						<el-row style="margin-top: 15px;">
-							<el-col :span="24" style="padding-left: 65px;"><span
-									style="color: #888; ">{{item.flag?'已整改隐患':'隐患明细'}}: </span>
-								<div v-if="item.hiddenDangeList">
-									<p style="margin-left: 60px;"
-										v-for="(itemC,index) in item.hiddenDangeList.filter(item=>item.hazardStatus ==1)">
-										{{index+1}}.{{itemC.hazardDesc}}</p>
-								</div>
-								<span v-else>--</span>
-							</el-col>
-						</el-row>
-						<el-row style="margin-top: 15px;" v-if="item.flag">
-							<el-col :span="24" style="padding-left: 65px;"><span style="color: #888; ">未整改隐患: </span>
-								<div v-if="item.hiddenDangeList">
-									<p style="margin-left: 60px;"
-										v-for="(itemC,index) in item.hiddenDangeList.filter(item=>item.hazardStatus == 0)">
-										{{index+1}}.{{itemC.hazardDesc}}</p>
-								</div>
-								<span v-else>--</span>
-							</el-col>
-						</el-row>
-						<el-row style="margin-top: 15px;" v-else>
-							<el-col :span="24" style="padding-left: 65px;"><span style="color: #888; ">整改要求: </span>
-								<p style="margin-left: 60px;">
-									{{index+1}}.{{item.hiddenDangeList.find(item=>item.hazardStatus == 2).hazardDesc}}
-								</p>
-							</el-col>
-
-						</el-row>
-						<el-row style="margin-top: 15px;">
-							<el-col :span="6" style="padding-left: 65px;">
-								<span style="color: #888; ">附件: </span>
-								<span v-for="(itemI,indexI) in item.attachmentUrls" :key="itemI.fileName"
-									style="margin-right:10px;cursor:pointer"
-									@click="handelCLickImage(itemI.attachmentUrl)">{{
-									itemI.fileName }}
-								</span>
-								<div class="imagePreview" v-if="preViewImageFlag" @click="preViewImageFlag = false">
-									<img :src="preViewImage" alt="">
-								</div>
-							</el-col>
-							<el-col :span="6" style="padding-left: 65px;"><span style="color: #888; ">备注: </span>{{
-								item.remark || '--' }}</el-col>
-						</el-row>
-					</el-row>
-					<div style="width:100%;height:300px;display:flex;align-items:center;justify-content: center;"
-						v-if="tableData.length === 0&& !patrolAdd">
-						<span>暂无数据~</span>
-					</div>
 					<!-- 巡查记录新增 -->
 					<el-form :inline="true" :model="patrolForm" ref="form3" :rules="patrolRule" :label-width="'105px'"
 						v-if="patrolAdd">
@@ -179,14 +114,14 @@
 							<el-col :span="18">
 								<el-form-item label="检查结论" prop="checkResultFlag">
 									<el-select v-model.trim="patrolForm.checkResultFlag" :disabled="disabled"
-										placeholder="请选择" class="list_item_width_1" size="small">
+										placeholder="请选择" class="list_item_width_1" size="small" @change="handelChangeCheckResultFlag">
 										<el-option v-for="item in resultArray" :label="item.label" :value="item.value"
 											:key="item.value">
 										</el-option>
 									</el-select>
 								</el-form-item>
 							</el-col>
-							<el-col :span="18">
+							<el-col :span="18" v-if="patrolForm.checkResultFlag === '0'">
 								<el-form-item label="拟复查时间" prop="reviewTime">
 									<el-date-picker class="list_item_width_1" size="small"
 										v-model.trim="patrolForm.reviewTime" type="datetime"
@@ -195,10 +130,9 @@
 								</el-form-item>
 							</el-col>
 						</el-row>
-						<el-row v-if="checkResultFlag !== 1">
+						<el-row v-if="checkResultFlag == 0 && patrolForm.checkResultFlag =='0'">
 							<el-col :span="8">
-								<el-form-item label="隐患明细" prop="hiddenDange"
-									style="white-space: nowrap;overflow: hidden;">
+								<el-form-item :label="`${checkResultFlag == 0?'未更改隐患':'隐患明细'}`" prop="hiddenDange" :class="{ 'inputRequirt': true, 'inputRequirtSave': messageFlag }"  style="white-space: nowrap;overflow: hidden;">
 									<el-checkbox-group v-model="hiddenDangeArr" size="small">
 										<el-col v-for="option in checkboxOptions" :key="option.value">
 											<el-checkbox :label="option.value" >{{
@@ -208,23 +142,24 @@
 								</el-form-item>
 							</el-col>
 						</el-row>
-						<el-row>
-							<el-col :span="18" v-for="(item, index) in inputList" :key="index"
-								style="margin-left: 100px;">
-								<el-form-item label="" prop="textarea" class="input-container">
-									<el-input v-model="item.hazardDesc" rows="3" placeholder="请输入隐患信息" size="small"
+						<el-row v-if="patrolForm.checkResultFlag === '0'">
+							<el-col :span="18" v-for="(item, indexC) in inputList" :key="indexC"
+							:style="{'margin-left': indexC === 0 ? '0px' : '106px'}"
+							>
+								<el-form-item :label="`${indexC === 0 ?'隐患明细':''}`"    class="input-container">
+									<el-input v-model="inputList[indexC].hazardDesc" rows="3" placeholder="请输入隐患信息" size="small"
 										class="list_item_width_1"></el-input>
 								</el-form-item>
-								<el-button @click="removeInput(index)" v-if="inputList.length > 1"
+								<el-button @click="removeInput(indexC)" v-if="inputList.length > 1"
 									class="remove-button">
 									<el-icon name="minus"></el-icon>
 								</el-button>
-								<el-button @click="addInput" v-if="index === inputList.length - 1">
+								<el-button @click="addInput" v-if="indexC === inputList.length - 1">
 									<el-icon name="plus"></el-icon>
 								</el-button>
 							</el-col>
 						</el-row>
-						<el-row v-if="checkResultFlag === 1 || tableData.length === 0">
+						<el-row v-if="(checkResultFlag === 1 || tableData.length === 0) && patrolForm.checkResultFlag === '0'">
 							<el-col :span="8">
 								<el-form-item label="整改意见" prop="principalName"
 									style="white-space: nowrap;overflow: hidden;">
@@ -249,6 +184,72 @@
 						</el-row>
 					</el-form>
 					<!-- 巡查记录新增end -->
+					<el-row v-for="(item, index) in tableData" :key="index" :gutter="20" style="margin-bottom: 20px;"
+						v-if="tableData">
+						<el-row style="margin-top: 20px;">
+							<el-col :span="24">
+								<el-tag type="primary" effect="plain" class="custom-tag">●</el-tag>{{item.checkTime}}
+							</el-col>
+						</el-row>
+
+						<el-row style="margin-top: 15px;">
+							<el-col :span="6" style="padding-left: 65px;"> <span style="color: #888; ">检查人员:</span> {{
+								item.checkPersons }}</el-col>
+							<el-col :span="6" style="padding-left: 65px;"><span style="color: #888; ">检查结论:</span> {{
+								item.checkResultFlag === 1?'合格':'不合格' }}</el-col>
+							<el-col :span="6" style="padding-left: 65px;"  v-if="item.checkResultFlag !== 1"><span style="color: #888; ">拟复查时间: </span> {{
+								item.reviewTime || '--' }}</el-col>
+						</el-row>
+						<el-row style="margin-top: 15px;">
+							<el-col :span="24" style="padding-left: 65px;"><span
+									style="color: #888; ">{{item.flag?'已整改隐患':'隐患明细'}}: </span>
+								<div v-if="item.hiddenDangeList">
+									<p style="margin-left: 60px;"
+										v-for="(itemC,index) in item.hiddenDangeList.filter(item=>item.hazardStatus ==1)">
+										{{index+1}}.{{itemC.hazardDesc}}</p>
+								</div>
+								<span v-else>--</span>
+							</el-col>
+						</el-row>
+						<el-row style="margin-top: 15px;" v-if="item.flag">
+							<el-col :span="24" style="padding-left: 65px;"><span style="color: #888; ">未整改隐患: </span>
+								<div v-if="item.hiddenDangeList">
+									<p style="margin-left: 60px;"
+										v-for="(itemC,index) in item.hiddenDangeList.filter(item=>item.hazardStatus == 0)">
+										{{index+1}}.{{itemC.hazardDesc}}</p>
+								</div>
+								<span v-else>--</span>
+							</el-col>
+						</el-row>
+						<el-row style="margin-top: 15px;" v-else>
+							<el-col :span="24" style="padding-left: 65px;"><span style="color: #888; ">整改要求: </span>
+								<p style="margin-left: 60px;">
+									{{index+1}}.{{item.hiddenDangeList.find(item=>item.hazardStatus == 2).hazardDesc}}
+								</p>
+							</el-col>
+
+						</el-row>
+						<el-row style="margin-top: 15px;">
+							<el-col :span="6" style="padding-left: 65px;">
+								<span style="color: #888; ">附件: </span>
+								<span v-for="(itemI,indexI) in item.attachmentUrls" :key="itemI.fileName"
+									style="margin-right:10px;cursor:pointer"
+									@click="handelCLickImage(itemI.attachmentUrl)">{{
+									itemI.fileName }}
+								</span>
+								<div class="imagePreview" v-if="preViewImageFlag" @click="preViewImageFlag = false">
+									<img :src="preViewImage" alt="">
+								</div>
+							</el-col>
+							<el-col :span="6" style="padding-left: 65px;"><span style="color: #888; ">备注: </span>{{
+								item.remark || '--' }}</el-col>
+						</el-row>
+					</el-row>
+					<div style="width:100%;height:300px;display:flex;align-items:center;justify-content: center;"
+						v-if="tableData.length === 0&& !patrolAdd">
+						<span>暂无数据~</span>
+					</div>
+					
 				</el-form>
 			</div>
 		</div>
@@ -379,7 +380,8 @@ export default {
 			loading: false,
 			searchOptions: [],
 			preViewImage:null,
-			preViewImageFlag:false
+			preViewImageFlag:false,
+			messageFlag:false
 		};
 	},
 	watch: {},
@@ -394,9 +396,6 @@ export default {
 		if (this.pageType != 'add' && this.pageType != 'patrol') {
 			this.getDetail();
 		}else if(this.pageType == 'patrol') {
-			if(this.checkResultFlag ===1){
-				delete this.patrolRule.reviewTime
-			}
 			this.getCompanyDetail()
 			this.getStafflist()
 		}else {
@@ -406,6 +405,15 @@ export default {
 	},
 
 	methods: {
+		handelChangeCheckResultFlag(val){
+			if(val == 1){
+				this.hiddenDangeArr = []
+				delete this.patrolRule.reviewTime
+			}else{
+				this.hiddenDangeArr = this.checkboxOptions.map(item=>item.value)
+				this.$set(this.patrolRule,'reviewTime',[{ required: true, message: '拟复查时间不能为空', trigger: 'blur' }])
+			}
+		},
 		handelCLickImage(url){
 			this.preViewImageFlag = true;
 			this.preViewImage = url;
@@ -547,11 +555,17 @@ export default {
 			}else if(this.pageType === 'patrol'){
 				this.$refs['form3'].validate(valid => {
 					if (valid){
+						if(this.checkboxOptions.length > 0 &&  this.hiddenDangeArr.length === 0){
+							this.messageFlag = true;
+							return
+						}else{
+							this.messageFlag = false;
+						}
 						this.save();
 					}
 				});
 			}
-			// this.save();
+			this.save();
 		},
 		async save() {
 			console.log('this.formData', this.formData);
@@ -566,13 +580,15 @@ export default {
 			}else if(this.pageType == 'patrol'){
 				url = '/actual/base/companyInfo/addRecord';
 				params = { ...this.patrolForm };
-				for(let i in this.hiddenDangeArr){
-					this.checkboxOptions.forEach(item => {
-						if(item.value == this.hiddenDangeArr[i]){
-							this.$set(item,'hazardStatus', '1');
+				console.log(this.hiddenDangeArr);
+				this.checkboxOptions.forEach(item => {
+						if(this.hiddenDangeArr.findIndex(itemC=>itemC === item.value) == -1){
+							item.hazardStatus = '1';
+						}else{
+							item.hazardStatus = '0';
 						}
 					})
-				}
+				
 				for (let i in this.inputList) {
 					let option = this.inputList[i];
 					if (this.patrolForm.checkResultFlag === '1') {
@@ -588,13 +604,14 @@ export default {
 				params.companyId = this.detailId;
 				params.attachmentUrls = this.fileList;
 			}
-			const { data, code, msg } = await requestPost(url, params);
-			if (code === 0) {
-				this.$message.success('操作成功');
-				this.handleCancle();
-			} else if (code >= 8000) { 
-				this.$message.error(msg); 
-			}
+			console.log(params);
+			// const { data, code, msg } = await requestPost(url, params);
+			// if (code === 0) {
+			// 	this.$message.success('操作成功');
+			// 	this.handleCancle();
+			// } else if (code >= 8000) { 
+			// 	this.$message.error(msg); 
+			// }
 		},
 		
 		handleCancle() {
@@ -737,4 +754,24 @@ export default {
 	align-items: center;
 	justify-content: center;
 }
+.inputRequirt {
+	position: relative;
+	min-width: 300px;
+}
+.inputRequirt::after {
+	content: '*';
+	color: #f56c6c;
+	position: absolute;
+	left: 8px;
+	top: 10px;
+}
+.inputRequirtSave::before {
+	content: '请选择未更改隐患';
+	color: #f56c6c;
+	position: absolute;
+	left: 104px;
+	bottom: -1px;
+	width: 300px;
+}
+
 </style>

From 2b51da702866f58054ce6d74d01555cfc20f23fa Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Tue, 14 May 2024 18:05:26 +0800
Subject: [PATCH 18/19] =?UTF-8?q?bug#1159=E4=BF=A1=E6=81=AF=E4=B8=8D?=
 =?UTF-8?q?=E5=AE=8C=E6=95=B4=E6=94=B9=E4=B8=BA=E5=BE=85=E5=AE=8C=E5=96=84?=
 =?UTF-8?q?,=E7=BC=96=E8=BE=91=E5=8A=9F=E8=83=BD=E6=97=A0=E5=9C=B0?=
 =?UTF-8?q?=E5=9B=BE=E5=B1=95=E7=A4=BA=E7=82=B9=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resourceManagement/enterprise/addForm.vue | 11 ++++---
 .../resourceManagement/enterprise/index.vue   | 31 +++++++++++++++----
 2 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/src/views/modules/resourceManagement/enterprise/addForm.vue b/src/views/modules/resourceManagement/enterprise/addForm.vue
index 93cebadbd..322899b2b 100644
--- a/src/views/modules/resourceManagement/enterprise/addForm.vue
+++ b/src/views/modules/resourceManagement/enterprise/addForm.vue
@@ -539,7 +539,9 @@ export default {
 				console.log('详情数据', data);
 				this.formData = { ...data };
 				this.initMap();
-			
+				if(!data.latitude){
+					this.remoteMethod(data.address,true)
+				}
 			} else {
 				this.$message.error(msg);
 			}
@@ -685,8 +687,7 @@ export default {
 				this.searchOptions = [];
 			}
 		},
-		async remoteMethod(query) {
-			console.log("query",query)
+		async remoteMethod(query,flag) {
 			if (query !== '') {
 				this.loading = true;
 				const { msg, data } = await map.searchNearby(query);
@@ -699,7 +700,9 @@ export default {
 						this.searchOptions = this.resultList.map(item => {
 							return { value: `${item.id}`, label: `${item.address + item.name}` };
 						});
-						console.log("this.searchOptions",this.searchOptions )
+						if(flag){
+							this.handleClickKey(0)
+						}
 					}
 				} else {
 					this.searchOptions = [
diff --git a/src/views/modules/resourceManagement/enterprise/index.vue b/src/views/modules/resourceManagement/enterprise/index.vue
index f61de4f14..89c537643 100644
--- a/src/views/modules/resourceManagement/enterprise/index.vue
+++ b/src/views/modules/resourceManagement/enterprise/index.vue
@@ -9,16 +9,19 @@
                                 clearable placeholder="请输入"></el-input>
                         </el-form-item>
                         <el-form-item label="规模" prop="scale">
-                            <el-input v-model.trim="formData.scale" class="u-item-width-normal" size="small"
-                                clearable placeholder="请输入"></el-input>
+                            <el-select v-model.trim="formData.scale" placeholder="请选择" class="u-item-width-normal"
+                                size="small" clearable>
+                                <el-option v-for="item in scaleList" :key="item.value" :label="item.label"
+                                    :value="item.value"></el-option>
+                            </el-select>
                         </el-form-item>
 
                         <el-form-item label="负责人" prop="chargePerson">
                             <el-input v-model.trim="formData.chargePerson" class="u-item-width-normal" size="small"
                                 clearable placeholder="请输入"></el-input>
                         </el-form-item>
-                        <el-form-item label="联系人" prop="linkPerson">
-                            <el-input v-model.trim="formData.linkPerson" class="u-item-width-normal" size="small"
+                        <el-form-item label="联系电话" prop="linkPerson">
+                            <el-input v-model.trim="formData.mobile" class="u-item-width-normal" size="small"
                                 clearable placeholder="请输入"></el-input>
                         </el-form-item>
                         <el-form-item label="九小场所" prop="nineSmallPlacesFlag">
@@ -107,7 +110,7 @@
                             <el-button 
                                 style="margin-right: 10px" @click="handleAdd(scope.row, 'edit')" size="small"
                                 type="text">
-                                编辑
+                                {{scope.row.latitude?'编辑':'待完善'}}
                             </el-button>
                             <el-button style="margin-right: 10px" @click="handleAdd(scope.row, 'patrol')" size="small"
                                 type="text">
@@ -173,7 +176,8 @@ export default {
             pageSize:20,
             total: 1,
             detailId: '',
-            checkResultFlag:false
+            checkResultFlag:false,
+            scaleList:[]
         };
     },
     components: { addForm },
@@ -192,6 +196,7 @@ export default {
         this.loadplaceType();
         this.loadCategory();
         this.getTableData();
+        this.loadScale()
     },
     methods: {
         handleSearch(val) {
@@ -211,6 +216,20 @@ export default {
             } else {
                 this.$message.error(msg);
             }
+        },
+         //获取规模
+        async loadScale () {
+            const url = "/sys/dict/data/dictlist"
+            let params = {
+                dictType: 'scale'
+            }
+            const { data, code, msg } = await requestPost(url, params)
+            if (code === 0) {
+                this.scaleList = data
+
+            } else {
+                this.$message.error(msg)
+            }
         },
         //场所类型
         async loadplaceType() {

From 99dc36655811d9ccf06305d5caa915a232de946d Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Tue, 14 May 2024 18:09:43 +0800
Subject: [PATCH 19/19] =?UTF-8?q?=E5=B0=91=E4=B8=80=E5=9D=A8=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resourceManagement/enterprise/addForm.vue     | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/views/modules/resourceManagement/enterprise/addForm.vue b/src/views/modules/resourceManagement/enterprise/addForm.vue
index 322899b2b..c1717eec9 100644
--- a/src/views/modules/resourceManagement/enterprise/addForm.vue
+++ b/src/views/modules/resourceManagement/enterprise/addForm.vue
@@ -606,14 +606,13 @@ export default {
 				params.companyId = this.detailId;
 				params.attachmentUrls = this.fileList;
 			}
-			console.log(params);
-			// const { data, code, msg } = await requestPost(url, params);
-			// if (code === 0) {
-			// 	this.$message.success('操作成功');
-			// 	this.handleCancle();
-			// } else if (code >= 8000) { 
-			// 	this.$message.error(msg); 
-			// }
+			const { data, code, msg } = await requestPost(url, params);
+			if (code === 0) {
+				this.$message.success('操作成功');
+				this.handleCancle();
+			} else if (code >= 8000) { 
+				this.$message.error(msg); 
+			}
 		},
 		
 		handleCancle() {