From ff6f347451a35dcfcdc765d7af73431663a08123 Mon Sep 17 00:00:00 2001
From: shj <1790240199@qq.com>
Date: 星期六, 30 七月 2022 18:42:46 +0800
Subject: [PATCH] 对接

---
 src/components/equipmentDailog/standardDailog.vue    |   84 +++++++---
 src/components/equipmentDailog/maintenanceDailog.vue |   80 +++++++--
 src/components/equipmentDailog/repairDailog.vue      |   93 ++++++++---
 src/components/equipmentDailog/detectDailog.vue      |   96 ++++++++---
 src/components/equipmentDailog/Dailog.vue            |   74 +++++---
 5 files changed, 300 insertions(+), 127 deletions(-)

diff --git a/src/components/equipmentDailog/Dailog.vue b/src/components/equipmentDailog/Dailog.vue
index b80cb5f..d9a3a93 100644
--- a/src/components/equipmentDailog/Dailog.vue
+++ b/src/components/equipmentDailog/Dailog.vue
@@ -232,21 +232,21 @@
 		</el-form>
 		<el-tabs v-model="activeName" class="demo-tabs">
 			<el-tab-pane label="设备保养" name="first">
-				<el-button type="primary" size="default" @click="openMaintenance">新增</el-button>
+				<el-button type="primary" size="default" @click="openMaintenance('新增', '')">新增</el-button>
 				<el-table :data="form.takecareDetailList" style="width: 100%">
 					<el-table-column align="center" prop="takecareMemo" label="保养情况" />
 					<el-table-column align="center" prop="leadingPersonId" label="保养负责人" />
 					<el-table-column align="center" prop="takecareDate" label="保养日期" />
 					<el-table-column align="center" prop="leadingPersonDepartmentId" label="保养负责人单位" />
-					<el-table-column align="center" prop="address" label="操作">
-						<template #default>
-							<el-button link type="primary" size="small">查看</el-button>
+					<el-table-column align="center" label="操作">
+						<template #default="scope">
+							<el-button link type="primary" @click="openMaintenance('查看', scope.row)" size="small">查看</el-button>
 						</template>
 					</el-table-column>
 				</el-table>
 			</el-tab-pane>
 			<el-tab-pane label="设备检测" name="second">
-				<el-button type="primary" size="default" @click="openDetect">新增</el-button>
+				<el-button type="primary" size="default" @click="openDetect('新增', '')">新增</el-button>
 				<el-table :data="form.testDetailList" style="width: 100%">
 					<el-table-column align="center" prop="testPersonId" label="检测人" />
 					<el-table-column align="center" prop="testDate" label="检测日期" />
@@ -255,14 +255,14 @@
 					<el-table-column align="center" prop="testResult" label="检测结果" />
 					<el-table-column align="center" prop="testStatus" label="检测状态" />
 					<el-table-column align="center" label="操作">
-						<template #default>
-							<el-button link type="primary" size="small">查看</el-button>
+						<template #default="scope">
+							<el-button link type="primary" @click="openDetect('查看', scope.row)" size="small">查看</el-button>
 						</template>
 					</el-table-column>
 				</el-table>
 			</el-tab-pane>
 			<el-tab-pane label="设备维修" name="third">
-				<el-button type="primary" size="default" @click="openRepair">新增</el-button>
+				<el-button type="primary" size="default" @click="openRepair('新增', '')">新增</el-button>
 				<el-table :data="form.repaireDetailList" style="width: 100%">
 					<el-table-column align="center" prop="exceptionInfo" label="设施异常项" />
 					<el-table-column align="center" prop="repairStatus" label="维修状态" />
@@ -272,24 +272,25 @@
 					<el-table-column align="center" prop="repairStartDate" label="维修开始日期" />
 					<el-table-column align="center" prop="repairEndDate" label="维修结束日期" />
 					<el-table-column align="center" label="操作">
-						<template #default>
-							<el-button link type="primary" size="small">查看</el-button>
+						<template #default="scope"
+							>
+							<el-button link type="primary" @click="openRepair('查看', scope.row)" size="small">查看</el-button>
 						</template>
 					</el-table-column>
 				</el-table>
 			</el-tab-pane>
 			<el-tab-pane label="检查标准设置" name="fourth">
-				<el-button type="primary" size="default" @click="openStandard">新增</el-button>
+				<el-button type="primary" size="default" @click="openStandard('新增', '')">新增</el-button>
 				<el-table :data="form.checkStandardeDetailList" style="width: 100%">
-					<el-table-column align="center" type="index" label="序号" width="75" />
+					<el-table-column align="center" prop="indexNum" label="序号" width="75" />
 					<el-table-column align="center" prop="checkContent" label="检查内容" />
 					<el-table-column align="center" prop="checkTarget" label="检查指标" />
 					<el-table-column align="center" prop="unit" label="单位" />
 					<el-table-column align="center" prop="checkPart" label="巡检部位" />
 					<el-table-column align="center" prop="rate" label="频次" />
 					<el-table-column align="center" label="操作">
-						<template #default>
-							<el-button link type="primary" size="small">查看</el-button>
+						<template #default="scope">
+							<el-button link type="primary" @click="openStandard('查看', scope.row)" size="small">查看</el-button>
 						</template>
 					</el-table-column>
 				</el-table>
@@ -334,10 +335,10 @@
 	<categoryDailog ref="categoryShow"></categoryDailog>
 	<regionDailog ref="regionShow"></regionDailog>
 	<DailogSearchUser ref="UserShow"></DailogSearchUser>
-	<maintenanceDailog ref="maintenanceShow"></maintenanceDailog>
-	<detectDailog ref="detectShow"></detectDailog>
-	<repairDailog ref="repairShow"></repairDailog>
-	<standardDailog ref="standardShow"></standardDailog>
+	<maintenanceDailog ref="maintenanceShow" @onMain="main"></maintenanceDailog>
+	<detectDailog ref="detectShow" @onDelect="delect"></detectDailog>
+	<repairDailog ref="repairShow" @onRepair="Repair"></repairDailog>
+	<standardDailog ref="standardShow" @onStand="Stand"></standardDailog>
 </template>
 <script lang="ts">
 import { defineComponent, ref, reactive } from 'vue';
@@ -539,9 +540,9 @@
 			Dailogtype.value = type;
 			if (num == 0) {
 				titles.value = `${title}仪表信息`;
-			}else if(num==1){
+			} else if (num == 1) {
 				titles.value = `${title}设备设施`;
-			}else if(num==2){
+			} else if (num == 2) {
 				titles.value = `${title}设备设施`;
 			}
 
@@ -595,20 +596,20 @@
 			UserShow.value.openDailog();
 		};
 		const maintenanceShow = ref();
-		const openMaintenance = () => {
-			maintenanceShow.value.openDailog();
+		const openMaintenance = (title: string, data: any) => {
+			maintenanceShow.value.openDailog(title, data);
 		};
 		const detectShow = ref();
-		const openDetect = () => {
-			detectShow.value.openDailog();
+		const openDetect = (title: string, data: any) => {
+			detectShow.value.openDailog(title, data);
 		};
 		const repairShow = ref();
-		const openRepair = () => {
-			repairShow.value.openDailog();
+		const openRepair = (title: string, data: any) => {
+			repairShow.value.openDailog(title, data);
 		};
 		const standardShow = ref();
-		const openStandard = () => {
-			standardShow.value.openDailog();
+		const openStandard = (title: string, data: any) => {
+			standardShow.value.openDailog(title, data);
 		};
 		// 上传
 		const fileList = ref<UploadUserFile[]>([
@@ -640,6 +641,19 @@
 				() => false
 			);
 		};
+		// 回传
+		const main = (val: any) => {
+			form.value.takecareDetailList.push(val);
+		};
+		const delect = (val: any) => {
+			form.value.testDetailList.push(val);
+		};
+		const Repair= (val:any)=>{
+			form.value.repaireDetailList.push(val);
+		}
+		const Stand=(val:any)=>{
+			form.value.checkStandardeDetailList.push(val);
+		}
 		//全屏
 		const full = ref(false);
 		const toggleFullscreen = () => {
@@ -650,6 +664,10 @@
 			}
 		};
 		return {
+			main,
+			delect,
+			Repair,
+			Stand,
 			resetForm,
 			submitForm,
 			titles,
diff --git a/src/components/equipmentDailog/detectDailog.vue b/src/components/equipmentDailog/detectDailog.vue
index f61e776..6bb0615 100644
--- a/src/components/equipmentDailog/detectDailog.vue
+++ b/src/components/equipmentDailog/detectDailog.vue
@@ -1,59 +1,61 @@
 <template>
-	<el-dialog v-model="dialogVisible" :fullscreen="full" title="新建设备检测" width="50%" draggable>
+	<el-dialog v-model="dialogVisible" :fullscreen="full" :title="titles" width="50%" draggable>
 		<el-button @click="toggleFullscreen" size="small" class="pot" :icon="FullScreen"></el-button>
-		<el-form :model="form" label-width="120px">
+		<el-form :model="form" :disabled="disabled" label-width="120px">
 			<el-row>
 				<el-col :span="11">
 					<el-form-item label="检测人" size="default">
-						<el-input v-model="form.name" placeholder="请填写检测人" />
+							<el-input v-model="form.testPersonId">
+							<template #append> <el-button :icon="Search" @click="openUser" /> </template
+						></el-input>
 					</el-form-item>
 				</el-col>
 				<el-col :span="11" :offset="2">
 					<el-form-item label="检测日期" size="default">
-						<el-date-picker v-model="form.date1" type="date" placeholder="选择日期时间" style="width: 100%" />
+						<el-date-picker v-model="form.testDate" format="YYYY-MM-DD HH:mm:ss" type="datetime" placeholder="选择日期时间" style="width: 100%" />
 					</el-form-item>
 				</el-col>
 			</el-row>
 			<el-row>
 				<el-col :span="11">
 					<el-form-item label="检测人单位" size="default">
-						<el-select v-model="form.region" placeholder="请选择" style="width: 100%">
-							<el-option label="Zone one" value="shanghai" />
-							<el-option label="Zone two" value="beijing" />
+						<el-select v-model="form.testPersonDepartmentId" placeholder="请选择" style="width: 100%">
+							<el-option label="xxx单位1" value="1" />
+							<el-option label="xxx单位2" value="2" />
 						</el-select>
 					</el-form-item>
 				</el-col>
 				<el-col :span="11" :offset="2">
 					<el-form-item label="检测内容" size="default">
-						<el-input v-model="form.name" placeholder="请填写检测内容" />
+						<el-input v-model="form.testMemo" placeholder="请填写检测内容" />
 					</el-form-item>
 				</el-col>
 			</el-row>
 			<el-row>
 				<el-col :span="11">
 					<el-form-item label="检测结果" size="default">
-						<el-select v-model="form.region" placeholder="请选择" style="width: 100%">
-							<el-option label="Zone one" value="shanghai" />
-							<el-option label="Zone two" value="beijing" />
+						<el-select v-model="form.testResult" placeholder="请选择" style="width: 100%">
+							<el-option label="成功" value="1" />
+							<el-option label="失败" value="2" />
 						</el-select>
 					</el-form-item>
 				</el-col>
 				<el-col :span="11" :offset="2">
 					<el-form-item label="检测状态" size="default">
-						<el-input v-model="form.name" placeholder="请填写检测状态" />
+						<el-input v-model="form.testStatus" placeholder="请填写检测状态" />
 					</el-form-item>
 				</el-col>
 			</el-row>
 		</el-form>
 		<template #footer>
 			<span class="dialog-footer">
-				<el-button type="primary" @click="dialogVisible = false" size="default">继续添加</el-button>
-				<el-button @click="dialogVisible = false" size="default">关闭</el-button>
-				<el-button type="primary" @click="dialogVisible = false" size="default">确定</el-button>
+				<!-- <el-button type="primary" @click="dialogVisible = false" size="default">继续添加</el-button> -->
+				<el-button @click="resetForm" size="default">关闭</el-button>
+				<el-button type="primary" @click="submitForm" size="default">确定</el-button>
 			</span>
 		</template>
 	</el-dialog>
-	<DailogSearchUser ref="Show"></DailogSearchUser>
+	<DailogSearchUser ref="Show" @SearchUser="User"></DailogSearchUser>
 </template>
 <script lang="ts">
 import { defineComponent, ref, reactive } from 'vue';
@@ -61,26 +63,61 @@
 import DailogSearchUser from '/@/components/DailogSearchUser/index.vue';
 export default defineComponent({
 	components: { DailogSearchUser },
-	setup() {
-		const form = reactive({
-			name: '',
-			region: '',
-			date1: '',
-			date2: '',
-			delivery: false,
-			type: [],
-			resource: '',
-			desc: '',
+	setup(props, { emit }) {
+		const form = ref({
+			testPersonId: '',
+			testDate: '',
+			testPersonDepartmentId: '',
+			testMemo: '',
+			testResult: '',
+			testStatus: '',
 		});
 		// 开启弹窗
+		const titles = ref();
+		const disabled = ref(false);
 		const dialogVisible = ref(false);
-		const openDailog = () => {
+		const openDailog = (title: string, data: any) => {
 			dialogVisible.value = true;
+			titles.value = `${title}设备检测`;
+			if (title == '查看') {
+				disabled.value = true;
+				form.value = data;
+			} else {
+				disabled.value = false;
+			}
 		};
 		// 开启用户弹窗
 		const Show = ref();
 		const openUser = () => {
 			Show.value.openDailog();
+		};
+		const User = (val: any) => {
+			form.value.testPersonId = val.uid;
+		};
+		// 提交
+		const submitForm = () => {
+			dialogVisible.value = false;
+			emit('onDelect', form.value);
+			form.value = {
+				testPersonId: '',
+				testDate: '',
+				testPersonDepartmentId: '',
+				testMemo: '',
+				testResult: '',
+				testStatus: '',
+			};
+		};
+		//   取消
+		const resetForm = () => {
+			dialogVisible.value = false;
+			form.value = {
+				testPersonId: '',
+				testDate: '',
+				testPersonDepartmentId: '',
+				testMemo: '',
+				testResult: '',
+				testStatus: '',
+			};
 		};
 		//全屏
 		const full = ref(false);
@@ -93,8 +130,13 @@
 		};
 		return {
 			form,
+			titles,
+			User,
+			disabled,
 			dialogVisible,
 			openDailog,
+			submitForm,
+			resetForm,
 			Show,
 			openUser,
 			Search,
diff --git a/src/components/equipmentDailog/maintenanceDailog.vue b/src/components/equipmentDailog/maintenanceDailog.vue
index dc21796..2a6c90d 100644
--- a/src/components/equipmentDailog/maintenanceDailog.vue
+++ b/src/components/equipmentDailog/maintenanceDailog.vue
@@ -1,16 +1,16 @@
 <template>
-	<el-dialog :fullscreen="full" v-model="dialogVisible" title="新建仪器仪表" width="50%" draggable>
+	<el-dialog :fullscreen="full" v-model="dialogVisible" :title="titles" width="50%" draggable>
 		<el-button @click="toggleFullscreen" size="small" class="pot" :icon="FullScreen"></el-button>
-		<el-form :model="form" label-width="120px">
+		<el-form :model="form" :disabled="disabled" label-width="120px">
 			<el-row>
 				<el-col :span="11">
 					<el-form-item label="保养情况" size="default">
-						<el-input v-model="form.name" />
+						<el-input v-model="form.takecareMemo" />
 					</el-form-item>
 				</el-col>
 				<el-col :span="11" :offset="2">
 					<el-form-item label="保养负责人" size="default">
-						<el-input v-model="form.name">
+						<el-input v-model="form.leadingPersonId">
 							<template #append> <el-button :icon="Search" @click="openUser" /> </template
 						></el-input>
 					</el-form-item>
@@ -19,14 +19,14 @@
 			<el-row>
 				<el-col :span="11">
 					<el-form-item label="保养日期" size="default">
-						<el-date-picker v-model="form.date1" type="date" style="width: 100%" />
+						<el-date-picker v-model="form.takecareDate" format="YYYY-MM-DD HH:mm:ss" type="datetime" style="width: 100%" />
 					</el-form-item>
 				</el-col>
 				<el-col :span="11" :offset="2">
 					<el-form-item label="保养负责人单位" size="default">
-						<el-select v-model="form.region" style="width: 100%">
-							<el-option label="Zone one" value="shanghai" />
-							<el-option label="Zone two" value="beijing" />
+						<el-select v-model="form.leadingPersonDepartmentId" style="width: 100%">
+							<el-option label="xxx单位1" value="1" />
+							<el-option label="xxx单位2" value="2" />
 						</el-select>
 					</el-form-item>
 				</el-col>
@@ -34,13 +34,13 @@
 		</el-form>
 		<template #footer>
 			<span class="dialog-footer">
-				<el-button type="primary" @click="dialogVisible = false" size="default">继续添加</el-button>
-				<el-button @click="dialogVisible = false" size="default">关闭</el-button>
-				<el-button type="primary" @click="dialogVisible = false" size="default">确定</el-button>
+				<!-- <el-button type="primary" @click="dialogVisible = false" size="default">继续添加</el-button> -->
+				<el-button @click="resetForm" size="default">关闭</el-button>
+				<el-button type="primary" @click="submitForm" size="default">确定</el-button>
 			</span>
 		</template>
 	</el-dialog>
-	<DailogSearchUser ref="Show"></DailogSearchUser>
+	<DailogSearchUser ref="Show" @SearchUser="User"></DailogSearchUser>
 </template>
 <script lang="ts">
 import { defineComponent, ref, reactive } from 'vue';
@@ -48,26 +48,55 @@
 import DailogSearchUser from '/@/components/DailogSearchUser/index.vue';
 export default defineComponent({
 	components: { DailogSearchUser },
-	setup() {
-		const form = reactive({
-			name: '',
-			region: '',
-			date1: '',
-			date2: '',
-			delivery: false,
-			type: [],
-			resource: '',
-			desc: '',
+	setup(props, { emit }) {
+		const form = ref({
+			takecareMemo: '',
+			leadingPersonId: '',
+			takecareDate: '',
+			leadingPersonDepartmentId: '',
 		});
 		// 开启弹窗
+	 	const titles=ref()
+		const disabled=ref(false)
 		const dialogVisible = ref(false);
-		const openDailog = () => {
+		const openDailog = (title:string,data:any) => {
 			dialogVisible.value = true;
+			titles.value=`${title}仪器仪表`
+			if(title=='查看'){
+				disabled.value=true
+				form.value=data
+			}else{
+				disabled.value=false
+			}
 		};
 		// 开启用户弹窗
 		const Show = ref();
 		const openUser = () => {
 			Show.value.openDailog();
+		};
+		const User = (val: any) => {
+			form.value.leadingPersonId = val.uid;
+		};
+		// 提交
+		const submitForm = () => {
+			dialogVisible.value = false;
+			emit('onMain', form.value);
+			form.value = {
+				takecareMemo: '',
+				leadingPersonId: '',
+				takecareDate: '',
+				leadingPersonDepartmentId: '',
+			};
+		};
+		//   取消
+		const resetForm = () => {
+			dialogVisible.value = false;
+				form.value = {
+				takecareMemo: '',
+				leadingPersonId: '',
+				takecareDate: '',
+				leadingPersonDepartmentId: '',
+			};
 		};
 		//全屏
 		const full = ref(false);
@@ -79,7 +108,12 @@
 			}
 		};
 		return {
+			disabled,
+			titles,
+			submitForm,
+			resetForm,
 			form,
+			User,
 			dialogVisible,
 			openDailog,
 			Show,
diff --git a/src/components/equipmentDailog/repairDailog.vue b/src/components/equipmentDailog/repairDailog.vue
index 175892f..edc6513 100644
--- a/src/components/equipmentDailog/repairDailog.vue
+++ b/src/components/equipmentDailog/repairDailog.vue
@@ -1,18 +1,18 @@
 <template>
-	<el-dialog v-model="dialogVisible" :fullscreen="full" title="新建设备维修" width="50%" draggable>
+	<el-dialog v-model="dialogVisible" :fullscreen="full" :title="titles" width="50%" draggable>
 		<el-button @click="toggleFullscreen" size="small" class="pot" :icon="FullScreen"></el-button>
-		<el-form :model="form" label-width="120px">
+		<el-form :model="form" :disabled="disabled" label-width="120px">
 			<el-row>
 				<el-col :span="11">
 					<el-form-item label="设施异常项" size="default">
-						<el-input v-model="form.name" placeholder="请填写设施异常项" />
+						<el-input v-model="form.exceptionInfo" placeholder="请填写设施异常项" />
 					</el-form-item>
 				</el-col>
 				<el-col :span="11" :offset="2">
 					<el-form-item label="维修状态" size="default">
-						<el-select v-model="form.region" placeholder="请选择" style="width: 100%">
-							<el-option label="Zone one" value="shanghai" />
-							<el-option label="Zone two" value="beijing" />
+						<el-select v-model="form.repairStatus" placeholder="请选择" style="width: 100%">
+							<el-option label="维修中" value="1" />
+							<el-option label="已修好" value="2" />
 						</el-select>
 					</el-form-item>
 				</el-col>
@@ -20,12 +20,12 @@
 			<el-row>
 				<el-col :span="11">
 					<el-form-item label="维修情况" size="default">
-						<el-input v-model="form.name" placeholder="请填写维修情况" />
+						<el-input v-model="form.repairMemo" placeholder="请填写维修情况" />
 					</el-form-item>
 				</el-col>
 				<el-col :span="11" :offset="2">
 					<el-form-item label="维修负责人" size="default">
-						<el-input v-model="form.name" placeholder="请选择">
+						<el-input v-model="form.repairPersonId" placeholder="请选择">
 							<template #append> <el-button :icon="Search" @click="openUser" /> </template
 						></el-input>
 					</el-form-item>
@@ -34,22 +34,22 @@
 			<el-row>
 				<el-col :span="11">
 					<el-form-item label="维修负责人单位" size="default">
-						<el-select v-model="form.region" placeholder="请选择" style="width: 100%">
-							<el-option label="Zone one" value="shanghai" />
-							<el-option label="Zone two" value="beijing" />
+						<el-select v-model="form.repairPersonDepartmentId" placeholder="请选择" style="width: 100%">
+							<el-option label="xxxxx单位" value="1" />
+							<el-option label="xxx单位" value="2" />
 						</el-select>
 					</el-form-item>
 				</el-col>
 				<el-col :span="11" :offset="2">
 					<el-form-item label="维修开始日期" size="default">
-						<el-date-picker v-model="form.date1" type="date" placeholder="选择日期时间" style="width: 100%" />
+						<el-date-picker v-model="form.repairStartDate" type="date" placeholder="选择日期时间" style="width: 100%" />
 					</el-form-item>
 				</el-col>
 			</el-row>
 			<el-row>
 				<el-col :span="11">
 					<el-form-item label="维修结束日期" size="default">
-						<el-date-picker v-model="form.date1" type="date" placeholder="选择日期时间" style="width: 100%" />
+						<el-date-picker v-model="form.repairEndDate" type="date" placeholder="选择日期时间" style="width: 100%" />
 					</el-form-item>
 				</el-col>
 			</el-row>
@@ -62,7 +62,7 @@
 			</span>
 		</template>
 	</el-dialog>
-	<DailogSearchUser ref="Show"></DailogSearchUser>
+	<DailogSearchUser ref="Show" @SearchUser="User"></DailogSearchUser>
 </template>
 <script lang="ts">
 import { defineComponent, ref, reactive } from 'vue';
@@ -70,26 +70,64 @@
 import DailogSearchUser from '/@/components/DailogSearchUser/index.vue';
 export default defineComponent({
 	components: { DailogSearchUser },
-	setup() {
-		const form = reactive({
-			name: '',
-			region: '',
-			date1: '',
-			date2: '',
-			delivery: false,
-			type: [],
-			resource: '',
-			desc: '',
+	setup(props, { emit }) {
+		const form = ref({
+			exceptionInfo: '',
+			repairStatus: '',
+			repairMemo: '',
+			repairPersonId: '',
+			repairPersonDepartmentId: false,
+			repairStartDate: '',
+			repairEndDate: '',
 		});
 		// 开启弹窗
+		const titles = ref();
+		const disabled = ref(false);
 		const dialogVisible = ref(false);
-		const openDailog = () => {
+		const openDailog = (title: string, data: any) => {
 			dialogVisible.value = true;
+			titles.value = `${title}设备维修`;
+			if (title == '查看') {
+				disabled.value = true;
+				form.value = data;
+			} else {
+				disabled.value = false;
+			}
 		};
 		// 开启用户弹窗
 		const Show = ref();
 		const openUser = () => {
 			Show.value.openDailog();
+		};
+		const User = (val: any) => {
+			form.value.repairPersonId = val.uid;
+		};
+		// 提交
+		const submitForm = () => {
+			dialogVisible.value = false;
+			emit('onRepair', form.value);
+			form.value = {
+				exceptionInfo: '',
+				repairStatus: '',
+				repairMemo: '',
+				repairPersonId: '',
+				repairPersonDepartmentId: false,
+				repairStartDate: '',
+				repairEndDate: '',
+			};
+		};
+		//  取消
+		const resetForm = () => {
+			dialogVisible.value = false;
+			form.value = {
+				exceptionInfo: '',
+				repairStatus: '',
+				repairMemo: '',
+				repairPersonId: '',
+				repairPersonDepartmentId: false,
+				repairStartDate: '',
+				repairEndDate: '',
+			};
 		};
 		//全屏
 		const full = ref(false);
@@ -102,10 +140,15 @@
 		};
 		return {
 			form,
+			titles,
+			disabled,
 			dialogVisible,
 			openDailog,
 			Show,
+			User,
 			openUser,
+			submitForm,
+			resetForm,
 			Search,
 			full,
 			toggleFullscreen,
diff --git a/src/components/equipmentDailog/standardDailog.vue b/src/components/equipmentDailog/standardDailog.vue
index fb7aae1..c3b4e7c 100644
--- a/src/components/equipmentDailog/standardDailog.vue
+++ b/src/components/equipmentDailog/standardDailog.vue
@@ -1,53 +1,53 @@
 <template>
-	<el-dialog v-model="dialogVisible" :fullscreen="full" title="新建检查标准设置" width="50%" draggable>
-		<el-button @click="toggleFullscreen" size="small" class="pot" :icon="FullScreen"></el-button>
-		<el-form :model="form" label-width="120px">
+	<el-dialog v-model="dialogVisible" :fullscreen="full" :title="titles" width="50%" draggable>
+		<el-button @click="toggleFullscreen" size="small"  class="pot" :icon="FullScreen"></el-button>
+		<el-form :model="form" label-width="120px" :disabled="disabled">
 			<el-row>
 				<el-col :span="11">
 					<el-form-item label="序号" size="default">
-						<el-input v-model="form.name" placeholder="请填写序号" />
+						<el-input v-model="form.indexNum" placeholder="请填写序号" />
 					</el-form-item>
 				</el-col>
 				<el-col :span="11" :offset="2" size="default">
 					<el-form-item label="检查内容">
-						<el-input v-model="form.name" placeholder="请填写检查内容" />
+						<el-input v-model="form.checkContent" placeholder="请填写检查内容" />
 					</el-form-item>
 				</el-col>
 			</el-row>
 			<el-row>
 				<el-col :span="11">
 					<el-form-item label="检查指标" size="default">
-						<el-input v-model="form.name" placeholder="请填写检查指标" />
+						<el-input v-model="form.checkTarget" placeholder="请填写检查指标" />
 					</el-form-item>
 				</el-col>
 				<el-col :span="11" :offset="2">
 					<el-form-item label="单位" size="default">
-						<el-input v-model="form.name" placeholder="请填写单位" />
+						<el-input v-model="form.unit" placeholder="请填写单位" />
 					</el-form-item>
 				</el-col>
 			</el-row>
 			<el-row>
 				<el-col :span="11">
 					<el-form-item label="巡检部位" size="default">
-						<el-input v-model="form.name" placeholder="请填写巡检部位" />
+						<el-input v-model="form.checkPart" placeholder="请填写巡检部位" />
 					</el-form-item>
 				</el-col>
 				<el-col :span="11" :offset="2">
 					<el-form-item label="频次" size="default">
-						<el-input v-model="form.name" placeholder="请填写频次" />
+						<el-input v-model="form.rate" placeholder="请填写频次" />
 					</el-form-item>
 				</el-col>
 			</el-row>
 		</el-form>
 		<template #footer>
 			<span class="dialog-footer">
-				<el-button type="primary" @click="dialogVisible = false" size="default">继续添加</el-button>
-				<el-button @click="dialogVisible = false" size="default">关闭</el-button>
-				<el-button type="primary" @click="dialogVisible = false" size="default">确定</el-button>
+				<!-- <el-button type="primary" @click="dialogVisible = false" size="default">继续添加</el-button> -->
+				<el-button @click="resetForm" size="default">关闭</el-button>
+				<el-button type="primary" @click="submitForm" size="default">确定</el-button>
 			</span>
 		</template>
 	</el-dialog>
-	<DailogSearchUser ref="Show"></DailogSearchUser>
+	<!-- <DailogSearchUser ref="Show"></DailogSearchUser> -->
 </template>
 <script lang="ts">
 import { defineComponent, ref, reactive } from 'vue';
@@ -55,26 +55,58 @@
 import DailogSearchUser from '/@/components/DailogSearchUser/index.vue';
 export default defineComponent({
 	components: { DailogSearchUser },
-	setup() {
-		const form = reactive({
-			name: '',
-			region: '',
-			date1: '',
-			date2: '',
-			delivery: false,
-			type: [],
-			resource: '',
-			desc: '',
+	setup(props, { emit }) {
+		const form = ref({
+			indexNum: '',
+			checkContent: '',
+			checkTarget: '',
+			unit: '',
+			checkPart: false,
+			rate: '',
 		});
 		// 开启弹窗
+		const titles = ref();
+		const disabled = ref(false);
 		const dialogVisible = ref(false);
-		const openDailog = () => {
+		const openDailog = (title: string, data: any) => {
 			dialogVisible.value = true;
+			titles.value = `${title}检查标准设置`;
+			if (title == '查看') {
+				disabled.value = true;
+				form.value = data;
+			} else {
+				disabled.value = false;
+			}
 		};
 		// 开启用户弹窗
 		const Show = ref();
 		const openUser = () => {
 			Show.value.openDailog();
+		};
+		// 提交
+		const submitForm = () => {
+			dialogVisible.value = false;
+			emit('onStand', form.value);
+			form.value = {
+				indexNum: '',
+				checkContent: '',
+				checkTarget: '',
+				unit: '',
+				checkPart: false,
+				rate: '',
+			};
+		};
+		//   取消
+		const resetForm = () => {
+			dialogVisible.value = false;
+			form.value = {
+				indexNum: '',
+				checkContent: '',
+				checkTarget: '',
+				unit: '',
+				checkPart: false,
+				rate: '',
+			};
 		};
 		//全屏
 		const full = ref(false);
@@ -87,8 +119,12 @@
 		};
 		return {
 			form,
+			titles,
+			disabled,
 			dialogVisible,
 			openDailog,
+			submitForm,
+			resetForm,
 			Show,
 			openUser,
 			Search,

--
Gitblit v1.9.2