From 4a68467d88baa1cfe7e377be51983190964bcbb4 Mon Sep 17 00:00:00 2001
From: lb <liubin_9396@163.com>
Date: Thu, 1 Feb 2024 16:19:42 +0800
Subject: [PATCH 01/40] =?UTF-8?q?update=20=E5=AE=89=E5=85=A8=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/specialEquipment/basic/Safety.vue   |  46 +-
 .../components/BasicDrawer.vue                | 544 ++++++++++++++++++
 .../components/EquipmentDrawer.vue            |  45 +-
 .../components/EquipmentInfoForm.vue          | 256 ++++++---
 .../components/dialogInDrawer.vue             | 170 ++++++
 yarn.lock                                     | 398 ++++++-------
 6 files changed, 1102 insertions(+), 357 deletions(-)
 create mode 100644 src/views/specialEquipment/components/BasicDrawer.vue
 create mode 100644 src/views/specialEquipment/components/dialogInDrawer.vue

diff --git a/src/views/specialEquipment/basic/Safety.vue b/src/views/specialEquipment/basic/Safety.vue
index b91767fb..d31773af 100644
--- a/src/views/specialEquipment/basic/Safety.vue
+++ b/src/views/specialEquipment/basic/Safety.vue
@@ -55,11 +55,11 @@
 				:has-files="true"
 				:disabled="editMode === 'detail'"
 				:rows="computedRows" />
-			<!-- :has-files="['files', 'files2']" -->
 		</base-dialog>
+		<!-- :has-files="['files', 'files2']" -->
 
 		<!-- 设备 详情 - 编辑 -->
-		<!-- <EquipmentDrawer
+		<EquipmentDrawer
 			v-if="editVisible"
 			ref="drawer"
 			:mode="editMode"
@@ -108,7 +108,7 @@
 			]"
 			@refreshDataList="getList"
 			@cancel="cancelEdit"
-			@destroy="cancelEdit" /> -->
+			@destroy="cancelEdit" />
 	</div>
 </template>
 
@@ -116,7 +116,6 @@
 import moment from 'moment';
 import basicPageMixin from '@/mixins/lb/basicPageMixin';
 import EquipmentDrawer from '../components/EquipmentDrawer';
-
 import {
 	createEquipment,
 	updateEquipment,
@@ -127,12 +126,14 @@ import {
 } from '@/api/base/equipment';
 import Editor from '@/components/Editor';
 import AssetsUpload from '../components/AssetsUpload.vue';
+import BasicDrawer from '../components/BasicDrawer.vue';
 
 export default {
 	name: 'SpecialEquipmentForSafety',
 	components: {
 		Editor,
 		EquipmentDrawer,
+		BasicDrawer,
 	},
 	mixins: [basicPageMixin],
 	data() {
@@ -386,26 +387,35 @@ export default {
 			this.editMode = 'add';
 		},
 		/** 修改按钮操作 */
+		// handleUpdate(row) {
+		// 	this.reset();
+		// 	this.showUploadComponents = false;
+		// 	this.editMode = 'edit';
+		// 	const id = row.id;
+		// 	getEquipment(id).then((response) => {
+		// 		this.form = response.data;
+		// 		this.open = true;
+		// 		this.title = '修改设备';
+		// 	});
+		// },
 		handleUpdate(row) {
 			this.reset();
+			this.form.id = row.id;
 			this.showUploadComponents = false;
 			this.editMode = 'edit';
-			const id = row.id;
-			getEquipment(id).then((response) => {
-				this.form = response.data;
-				this.open = true;
-				this.title = '修改设备';
+			this.editVisible = true;
+			this.$nextTick(() => {
+				this.$refs['drawer'].init();
 			});
 		},
-		handleDetail(row) {
-			this.reset();
-			this.showUploadComponents = false;
-			const id = row.id;
-			this.editMode = 'detail';
-			getEquipment(id).then((response) => {
-				this.form = response.data;
-				this.open = true;
-				this.title = '查看详情';
+		handleDetail(row, mode = 'detail') {
+			const { id } = row;
+			this.form.id = id;
+			// 打开抽屉
+			this.editMode = mode;
+			this.editVisible = true;
+			this.$nextTick(() => {
+				this.$refs['drawer'].init();
 			});
 		},
 		/** 提交按钮 */
diff --git a/src/views/specialEquipment/components/BasicDrawer.vue b/src/views/specialEquipment/components/BasicDrawer.vue
new file mode 100644
index 00000000..624a4161
--- /dev/null
+++ b/src/views/specialEquipment/components/BasicDrawer.vue
@@ -0,0 +1,544 @@
+<!-- 
+    filename: EquipmentDrawer.vue
+    author: liubin
+    date: 2023-08-22 14:38:56
+    description: 
+-->
+
+<template>
+	<el-drawer
+		:visible="visible"
+		:show-close="false"
+		:wrapper-closable="false"
+		class="drawer"
+		custom-class="mes-drawer"
+		:size="size || '50%'"
+		@closed="$emit('destroy')">
+		<SmallTitle slot="title">
+			{{
+				mode.includes('detail')
+					? '详情'
+					: mode.includes('edit')
+					? '编辑'
+					: '新增'
+			}}
+		</SmallTitle>
+
+		<div class="drawer-body flex">
+			<div class="drawer-body__content">
+				<section v-for="(section, index) in sections" :key="section.key">
+					<SmallTitle v-if="index != 0">{{ section.name }}</SmallTitle>
+
+					<div
+						class="form-part"
+						v-if="section.key == 'base'"
+						style="border-bottom: 1px solid #dfdfdf; margin-bottom: 24px">
+						<el-skeleton v-if="!showForm" animated />
+						<!-- <BaseInfoForm
+							key="drawer-dialog-form"
+							v-if="showForm"
+							ref="form"
+							:disabled="mode.includes('detail')"
+							:dataForm="form"
+							:rows="formRows" /> -->
+
+						<!-- if  -->
+						<el-row v-if="mode.includes('detail')" style="margin-bottom: 24px">
+							<el-col :span="8">
+								<div
+									class="title"
+									style="font-weight: 700; font-size: 16px; margin: 8px 0">
+									设备分组名称
+								</div>
+								<div class="value" style="font-size: 14px">{{ form.name }}</div>
+							</el-col>
+							<el-col :span="8">
+								<div
+									class="title"
+									style="font-weight: 700; font-size: 16px; margin: 8px 0">
+									设备分组编码
+								</div>
+								<div class="value" style="font-size: 14px">
+									{{ form.code }}
+								</div>
+							</el-col>
+						</el-row>
+						<!-- else  -->
+						<el-row v-else style="margin-bottom: 24px" :gutter="20">
+							<el-form ref="form" :model="form">
+								<el-col :span="8">
+									<el-form-item
+										class="title"
+										label="设备分组名称"
+										style="font-size: 16px; margin: 8px 0">
+										<el-input
+											v-model="form.name"
+											placeholder="请输入设备分组名称"></el-input>
+									</el-form-item>
+								</el-col>
+								<el-col :span="8">
+									<el-form-item
+										class="title"
+										label="设备分组编码"
+										style="font-size: 16px; margin: 8px 0">
+										<el-input
+											v-model="form.code"
+											placeholder="请输入设备分组编码"></el-input>
+									</el-form-item>
+								</el-col>
+							</el-form>
+						</el-row>
+					</div>
+
+					<div
+						v-if="section.key == 'attrs'"
+						style="position: relative; margin-top: 12px">
+						<div
+							v-if="!mode.includes('detail')"
+							style="position: absolute; top: -40px; right: 0">
+							<el-button @click="handleAddAttr" type="text">
+								<i class="el-icon-plus"></i>
+								添加报警
+							</el-button>
+						</div>
+						<base-table
+							v-loading="attrListLoading"
+							:table-props="section.props"
+							:page="attrQuery?.params.pageNo || 1"
+							:limit="attrQuery?.params.pageSize || 10"
+							:table-data="list"
+							@emitFun="handleEmitFun">
+							<!-- :add-button-show="mode.includes('detail') ? null : '添加属性'"
+							@emitButtonClick="handleAddAttr" -->
+							<method-btn
+								v-if="section.tableBtn && !mode.includes('detail')"
+								slot="handleBtn"
+								label="操作"
+								:method-list="tableBtn"
+								@clickBtn="handleTableBtnClick" />
+						</base-table>
+
+						<!-- 分页组件 -->
+						<pagination
+							v-show="total > 0"
+							:total="total"
+							:page.sync="attrQuery.params.pageNo"
+							:limit.sync="attrQuery.params.pageSize"
+							@pagination="getAttrList" />
+					</div>
+				</section>
+			</div>
+
+			<div class="drawer-body__footer">
+				<el-button style="" @click="handleCancel">返回</el-button>
+				<el-button
+					type="primary"
+					v-if="!mode.includes('detail')"
+					@click="handleSave">
+					保存
+				</el-button>
+			</div>
+		</div>
+
+		<!-- 属性对话框 -->
+		<base-dialog
+			v-if="sections[1].allowAdd"
+			:dialogTitle="attrTitle"
+			:dialogVisible="attrFormVisible"
+			width="45%"
+			:append-to-body="true"
+			custom-class="baseDialog"
+			@close="closeAttrForm"
+			@cancel="closeAttrForm"
+			@confirm="submitAttrForm">
+			<DialogForm
+				v-if="attrFormVisible"
+				ref="attrForm"
+				v-model="attrForm"
+				:rows="attrRows" />
+			<!-- :disabled="mode.includes('detail')" -->
+		</base-dialog>
+	</el-drawer>
+</template>
+
+<script>
+import BaseInfoForm from '@/components/DialogForm';
+import DialogForm from './dialogInDrawer';
+
+const SmallTitle = {
+	name: 'SmallTitle',
+	props: ['size'],
+	data() {
+		return {};
+	},
+	methods: {},
+	render: function (h) {
+		return h(
+			'span',
+			{
+				class: 'small-title',
+				style: {
+					fontSize: '18px',
+					lineHeight:
+						this.size == 'lg' ? '24px' : this.size == 'sm' ? '18px' : '20px',
+					fontWeight: 500,
+					fontFamily: '微软雅黑, Microsoft YaHei, Arial, Helvetica, sans-serif',
+				},
+			},
+			this.$slots.default
+		);
+	},
+};
+
+export default {
+	components: { SmallTitle, DialogForm, BaseInfoForm },
+	props: ['sections', 'defaultMode', 'dataId', 'size'], // dataId 作为一个通用的存放id的字段
+	data() {
+		return {
+			mode: '',
+			visible: false,
+			showForm: false,
+			total: 0,
+			form: {},
+			list: [],
+			attrTitle: '',
+			attrForm: {
+				id: null,
+				equipmentGroupId: '',
+				code: '',
+				type: '',
+				grade: '',
+				alarmCode: '',
+				alarmContent: '',
+				plcParamName: '',
+			},
+			attrFormVisible: false,
+			attrRows: [
+				[
+					{
+						input: true,
+						label: '报警编码', // 自动生成
+						prop: 'code',
+						url: '/base/equipment-group-alarm/getCode',
+						rules: [
+							{ required: true, message: '报警编码不能为空', trigger: 'blur' },
+						],
+					},
+					{
+						select: true,
+						label: '报警级别', // 字典
+						prop: 'grade',
+						options: this.getDictDatas(this.DICT_TYPE.EQU_ALARM_LEVEL),
+					},
+				],
+				[
+					{
+						input: true,
+						label: '参数列名', // 在实时数据库的列名
+						prop: 'plcParamName',
+						rules: [
+							{ required: true, message: '参数列名不能为空', trigger: 'blur' },
+						],
+					},
+					{
+						input: true,
+						label: '报警内容',
+						prop: 'alarmContent',
+						rules: [
+							{ required: true, message: '报警内容不能为空', trigger: 'blur' },
+						],
+					},
+				],
+				[
+					{
+						select: true,
+						label: '报警类型', // 固定选项
+						prop: 'type',
+						options: [
+							{ label: '布尔型', value: 2 },
+							{ label: '字符型', value: 1 },
+						],
+						rules: [
+							{ required: true, message: '报警类型不能为空', trigger: 'blur' },
+						],
+					},
+					{
+						input: true,
+						label: '设备报警编码', // 对应到设备实际的报警编码
+						prop: 'alarmCode',
+					},
+				],
+			],
+			attrQuery: {
+				params: {
+					pageNo: 1,
+					pageSize: 10,
+				},
+			}, // 属性列表的请求
+			infoQuery: null, // 基本信息的请求
+			attrFormSubmitting: false,
+			attrListLoading: false,
+		};
+	},
+	computed: {
+		formRows() {
+			return this.sections[0].rows.map((row) => {
+				return row.map((col) => {
+					return {
+						...col,
+						bind: {
+							// 详情 模式下，禁用各种输入
+							// disabled: this.mode == 'detail',
+							disabled: true,
+						},
+					};
+				});
+			});
+		},
+		tableBtn() {
+			return this.mode == 'detail' ? [] : this.sections[1].tableBtn;
+		},
+	},
+	mounted() {
+		this.mode = this.defaultMode || 'detail';
+		for (const section of this.sections) {
+			// 请求具体信息
+			if ('url' in section) {
+				const query = {
+					url: section.url,
+					method: section.method || 'get',
+					params: section.queryParams || null,
+					data: section.data || null,
+				};
+				// debugger;
+				this.$axios(query).then(({ data }) => {
+					if (section.key == 'base') {
+						this.form = data;
+						this.showForm = true;
+						this.infoQuery = query;
+					} else if (section.key == 'attrs') {
+						this.attrQuery = query;
+						this.list = data.list;
+						this.total = data.total;
+					}
+				});
+			}
+		}
+	},
+	methods: {
+		handleTableBtnClick({ type, data }) {
+			switch (type) {
+				case 'edit':
+					this.handleEditAttr(data.id);
+					break;
+				case 'delete':
+					this.handleDeleteAttr(data.id);
+					break;
+			}
+		},
+
+		handleEmitFun(val) {
+			console.log('handleEmitFun', val);
+		},
+
+		init() {
+			this.visible = true;
+		},
+
+		async getAttrList() {
+			this.attrListLoading = true;
+			const res = await this.$axios(this.attrQuery);
+			if (res.code == 0) {
+				this.list = res.data.list;
+				this.total = res.data.total;
+			}
+			this.attrListLoading = false;
+		},
+
+		// 保存表单
+		handleSave() {
+			this.$refs['form'][0].validate(async (valid) => {
+				if (valid) {
+					const isEdit = !this.mode.includes('detail');
+					await this.$axios({
+						url: this.sections[0][isEdit ? 'urlUpdate' : 'urlCreate'],
+						method: isEdit ? 'put' : 'post',
+						data: this.form,
+					});
+					this.$modal.msgSuccess(`${isEdit ? '更新' : '创建'}成功`);
+					this.visible = false;
+					this.$emit('refreshDataList');
+				}
+			});
+		},
+
+		handleCancel() {
+			this.visible = false;
+		},
+
+		// 开启编辑
+		toggleEdit() {
+			this.mode = 'edit';
+		},
+
+		// 新增属性
+		handleAddAttr() {
+			if (!this.dataId) return this.$message.error('请先创建设备分组信息');
+			this.attrForm = {
+				id: null,
+				equipmentGroupId: this.dataId,
+				code: '',
+				type: '',
+				grade: '',
+				alarmCode: '',
+				alarmContent: '',
+				plcParamName: '',
+			};
+			this.attrTitle = '添加设备分组报警';
+			this.attrFormVisible = true;
+		},
+
+		// 编辑属性
+		async handleEditAttr(attrId) {
+			const res = await this.$axios({
+				url: this.sections[1].urlDetail,
+				method: 'get',
+				params: { id: attrId },
+			});
+			if (res.code == 0) {
+				this.attrForm = res.data;
+				this.attrTitle = '编辑设备分组报警';
+				this.attrFormVisible = true;
+			}
+		},
+
+		// 删除属性
+		handleDeleteAttr(attrId) {
+			this.$confirm('确定删除该分组报警?', '提示', {
+				confirmButtonText: '确定',
+				cancelButtonText: '取消',
+				type: 'warning',
+			})
+				.then(async () => {
+					const res = await this.$axios({
+						url: this.sections[1].urlDelete,
+						method: 'delete',
+						params: { id: attrId },
+					});
+					if (res.code == 0) {
+						this.$message({
+							message: '删除成功',
+							type: 'success',
+							duration: 1500,
+							onClose: () => {
+								this.getAttrList();
+							},
+						});
+					}
+				})
+				.catch(() => {});
+		},
+
+		// 提交属性表
+		submitAttrForm() {
+			this.$refs['attrForm'].validate(async (valid) => {
+				if (!valid) {
+					return;
+				}
+				const isEdit = this.attrForm.id != null;
+				this.attrFormSubmitting = true;
+				const res = await this.$axios({
+					url: isEdit ? this.sections[1].urlUpdate : this.sections[1].urlCreate,
+					method: isEdit ? 'put' : 'post',
+					data: this.attrForm,
+				});
+
+				if (res.code == 0) {
+					this.closeAttrForm();
+					this.$message({
+						message: `${isEdit ? '更新' : '创建'}成功`,
+						type: 'success',
+						duration: 1500,
+						onClose: () => {
+							this.getAttrList();
+						},
+					});
+				}
+				this.attrFormSubmitting = false;
+			});
+		},
+
+		closeAttrForm() {
+			this.attrFormVisible = false;
+		},
+
+		handleClick(raw) {
+			if (raw.type === 'delete') {
+				this.$confirm(`确定删除该报警?`, '提示', {
+					confirmButtonText: '确定',
+					cancelButtonText: '取消',
+					type: 'warning',
+				})
+					.then(() => {
+						deleteProductAttr(raw.data.id).then(({ data }) => {
+							this.$message({
+								message: '操作成功',
+								type: 'success',
+								duration: 1500,
+								onClose: () => {
+									this.getList();
+								},
+							});
+						});
+					})
+					.catch(() => {});
+			} else {
+				this.addNew(raw.data.id);
+			}
+		},
+	},
+};
+</script>
+
+<style scoped>
+.drawer >>> .el-drawer {
+	border-radius: 8px 0 0 8px;
+}
+
+.drawer >>> .el-drawer__header {
+	margin: 0;
+	padding: 32px 32px 24px;
+	border-bottom: 1px solid #dcdfe6;
+	margin-bottom: 0px;
+}
+
+.small-title::before {
+	content: '';
+	display: inline-block;
+	vertical-align: top;
+	width: 4px;
+	height: 22px;
+	border-radius: 1px;
+	margin-right: 8px;
+	background-color: #0b58ff;
+}
+
+.drawer-body {
+	display: flex;
+	flex-direction: column;
+	height: 100%;
+}
+
+.drawer-body__content {
+	flex: 1;
+	/* background: #eee; */
+	padding: 20px 30px;
+	overflow-y: auto;
+}
+
+.drawer-body__footer {
+	display: flex;
+	justify-content: flex-end;
+	padding: 18px;
+}
+</style>
diff --git a/src/views/specialEquipment/components/EquipmentDrawer.vue b/src/views/specialEquipment/components/EquipmentDrawer.vue
index 3c58a5c9..d258bd70 100644
--- a/src/views/specialEquipment/components/EquipmentDrawer.vue
+++ b/src/views/specialEquipment/components/EquipmentDrawer.vue
@@ -242,50 +242,6 @@ export default {
 				this.$axios(query).then(({ data }) => {
 					if (section.key == 'base') {
 						this.form = data;
-						// this.form = {
-						// 	code: 'gj',
-						// 	name: '下片机',
-						// 	enName: 'unload',
-						// 	abbr: '',
-						// 	equipmentTypeId: 21084,
-						// 	remark: '备注',
-						// 	id: '1712367395052384257',
-						// 	createTime: 1697095176000,
-						// 	enterTime: 0,
-						// 	productionTime: 0,
-						// 	files: [
-						// 		{
-						// 			fileName: '测试.xlsx',
-						// 			fileUrl: 'https://nimg.ws.126.net/?url=http%3A%2F%2Fdingyue.ws.126.net%2F2022%2F0108%2F0f0c6f30j00r5cle9000sc000hs00gtc.jpg&thumbnail=660x2147483647&quality=80&type=jpg',
-						// 			fileType: 1
-						// 		},
-						// 		{
-						// 			fileName: '测试2.xlsx',
-						// 			fileUrl: 'https://nimg.ws.126.net/?url=http%3A%2F%2Fdingyue.ws.126.net%2F2022%2F0415%2F2cd23619j00racb96000kc000hs00hsc.jpg&thumbnail=660x2147483647&quality=80&type=jpg',
-						// 			fileType: 1
-						// 		},
-						// 		{
-						// 			fileName: '测试3.xlsx',
-						// 			fileUrl: 'https://gimg2.baidu.com/image_search/src=http%3A%2F%2Fsafe-img.xhscdn.com%2Fbw1%2F1fea91a0-d088-409e-b145-e0e61254b28b%3FimageView2%2F2%2Fw%2F1080%2Fformat%2Fjpg&refer=http%3A%2F%2Fsafe-img.xhscdn.com&app=2002&size=f9999,10000&q=a80&n=0&g=0n&fmt=auto?sec=1700031689&t=2e0fe7d1de7f54adff3007efe133d67c',
-						// 			fileType: 1
-						// 		},
-						// 		{
-						// 			fileName: '测试4.xlsx',
-						// 			fileUrl: 'https://pics5.baidu.com/feed/b7003af33a87e950cdfb4b4546eed044faf2b40d.jpeg?token=1d7484cfe4b014dd201f8c8725cab945',
-						// 			fileType: 2
-						// 		},
-						// 		{
-						// 			fileName: '测试5.xlsx',
-						// 			fileUrl: 'https://gimg2.baidu.com/image_search/src=http%3A%2F%2Fsafe-img.xhscdn.com%2Fbw1%2Fe3500876-9c46-4b70-8d37-4799520cdd13%3FimageView2%2F2%2Fw%2F1080%2Fformat%2Fjpg&refer=http%3A%2F%2Fsafe-img.xhscdn.com&app=2002&size=f9999,10000&q=a80&n=0&g=0n&fmt=auto?sec=1700031689&t=4abc1df930e62730e5361a7d3765e0f2',
-						// 			fileType: 2
-						// 		},
-						// 	],
-						// 	tvalue: 0,
-						// 	processingTime: 0,
-						// 	manufacturer: '',
-						// 	spec: '',
-						// 	description: '描述',
-						// };
 						this.showForm = true;
 						this.infoQuery = query;
 					} else if (section.key == 'attrs') {
@@ -323,6 +279,7 @@ export default {
 				}
 
 				this.btnLoading = false;
+				this.$emit('refreshDataList')
 				this.handleCancel();
 			});
 		},
diff --git a/src/views/specialEquipment/components/EquipmentInfoForm.vue b/src/views/specialEquipment/components/EquipmentInfoForm.vue
index 926c850a..c1b642c1 100644
--- a/src/views/specialEquipment/components/EquipmentInfoForm.vue
+++ b/src/views/specialEquipment/components/EquipmentInfoForm.vue
@@ -6,141 +6,242 @@
 -->
 
 <template>
-	<el-form class="equipment-info-form" ref="form" :model="form" label-width="200px" label-position="top"
+	<el-form
+		class="equipment-info-form"
+		ref="form"
+		:model="form"
+		label-width="200px"
+		label-position="top"
 		v-loading="formLoading">
 		<el-row :gutter="20">
-			<el-col :span="8">
-				<el-form-item label="设备名称" prop="name" :rules="[{ required: true, message: '设备名称不能为空', trigger: 'blur' }]">
-					<el-input v-model="form.name" :disabled="disabled" placeholder="请输入设备名称"></el-input>
+			<el-col :span="12">
+				<el-form-item
+					label="设备名称"
+					prop="name"
+					:rules="[
+						{ required: true, message: '设备名称不能为空', trigger: 'blur' },
+					]">
+					<el-input
+						v-model="form.name"
+						:disabled="disabled"
+						placeholder="请输入设备名称"></el-input>
 				</el-form-item>
 			</el-col>
-			<el-col :span="8">
+			<el-col :span="12">
 				<el-form-item label="设备编码" prop="code" :rules="[]">
-					<el-input v-model="form.code" :disabled="disabled" placeholder="请输入设备编码"></el-input>
+					<el-input
+						v-model="form.code"
+						:disabled="disabled"
+						placeholder="请输入设备编码"></el-input>
 				</el-form-item>
 			</el-col>
-			<el-col :span="8">
+			<!-- <el-col :span="8">
 				<el-form-item label="英文名称" prop="enName" :rules="[]">
-					<el-input v-model="form.enName" :disabled="disabled" placeholder="请输入英文名称"></el-input>
+					<el-input
+						v-model="form.enName"
+						:disabled="disabled"
+						placeholder="请输入英文名称"></el-input>
 				</el-form-item>
-			</el-col>
+			</el-col> -->
 		</el-row>
 		<el-row :gutter="20">
-			<el-col :span="8">
-				<el-form-item label="缩写" prop="abbr" :rules="[]">
-					<el-input v-model="form.abbr" :disabled="disabled" placeholder="请输入名称缩写"></el-input>
+			<el-col :span="12">
+				<el-form-item label="所在区域" prop="location">
+					<el-input
+						v-model="form.location"
+						:disabled="disabled"
+						placeholder="请输入所在区域"></el-input>
 				</el-form-item>
 			</el-col>
-			<el-col :span="8">
-				<el-form-item label="设备类型" prop="equipmentTypeId"
-					:rules="[{ required: true, message: '设备类型不能为空', trigger: 'blur' }]">
-					<el-select v-model="form.equipmentTypeId" :disabled="disabled" filterable placeholder="请选择设备类型">
-						<el-option v-for="eqType in eqTypeList" :key="eqType.id" :label="eqType.name"
-							:value="eqType.id"></el-option>
+			<el-col :span="12">
+				<el-form-item label="负责人" prop="responsiblePeopleId">
+					<el-select
+						v-model="form.responsiblePeopleId"
+						:disabled="disabled"
+						placeholder="请输入负责人">
+						<el-option
+							v-for="rp in rpList"
+							:key="rp.id"
+							:label="rp.name"
+							:value="rp.id"></el-option>
 					</el-select>
 				</el-form-item>
 			</el-col>
-
-			<el-col :span="8">
-				<el-form-item label="预计生产时间(min/天)" prop="workTime" :rules="[
-					{ required: true, message: '预计生产时间不能为空', trigger: 'blur' },
-					{
-						type: 'number',
-						message: '请输入正确的数字值',
-						trigger: 'blur',
-						transform: (val) => Number(val),
-					},
-				]">
-					<el-input v-model="form.workTime" :disabled="disabled" placeholder="请输入预计生产时间"></el-input>
+			<!-- <el-col :span="8">
+				<el-form-item label="缩写" prop="abbr" :rules="[]">
+					<el-input
+						v-model="form.abbr"
+						:disabled="disabled"
+						placeholder="请输入名称缩写"></el-input>
 				</el-form-item>
 			</el-col>
+			<el-col :span="8">
+				<el-form-item
+					label="设备类型"
+					prop="equipmentTypeId"
+					:rules="[
+						{ required: true, message: '设备类型不能为空', trigger: 'blur' },
+					]">
+					<el-select
+						v-model="form.equipmentTypeId"
+						:disabled="disabled"
+						filterable
+						placeholder="请选择设备类型">
+						<el-option
+							v-for="eqType in rpList"
+							:key="eqType.id"
+							:label="eqType.name"
+							:value="eqType.id"></el-option>
+					</el-select>
+				</el-form-item>
+			</el-col> -->
 
+			<!-- <el-col :span="8">
+				<el-form-item
+					label="预计生产时间(min/天)"
+					prop="workTime"
+					:rules="[
+						{
+							required: true,
+							message: '预计生产时间不能为空',
+							trigger: 'blur',
+						},
+						{
+							type: 'number',
+							message: '请输入正确的数字值',
+							trigger: 'blur',
+							transform: (val) => Number(val),
+						},
+					]">
+					<el-input
+						v-model="form.workTime"
+						:disabled="disabled"
+						placeholder="请输入预计生产时间"></el-input>
+				</el-form-item>
+			</el-col> -->
 		</el-row>
 		<el-row :gutter="20">
-			<el-col :span="8">
+			<!-- <el-col :span="8">
 				<el-form-item label="生产日期" prop="productionTime" :rules="[]">
-					<el-date-picker v-model="form.enterTime" :disabled="disabled" type="datetime" placeholder="请选择生产日期"
+					<el-date-picker
+						v-model="form.enterTime"
+						:disabled="disabled"
+						type="datetime"
+						placeholder="请选择生产日期"
 						value-format="timestamp"></el-date-picker>
 				</el-form-item>
 			</el-col>
 			<el-col :span="8">
 				<el-form-item label="进场日期" prop="enterTime" :rules="[]">
-					<el-date-picker v-model="form.enterTime" :disabled="disabled" type="datetime" placeholder="请选择进场日期"
+					<el-date-picker
+						v-model="form.enterTime"
+						:disabled="disabled"
+						type="datetime"
+						placeholder="请选择进场日期"
 						value-format="timestamp"></el-date-picker>
 				</el-form-item>
 			</el-col>
 			<el-col :span="8">
-				<el-form-item label="设备TT值" prop="tvalue" :rules="[
-					{ required: true, message: '设备TT值不能为空', trigger: 'blur' },
-					{
-						type: 'number',
-						message: '请输入正确的数字值',
-						trigger: 'blur',
-						transform: (val) => Number(val),
-					},
-				]">
-					<el-input v-model="form.tvalue" :disabled="disabled" placeholder="请输入设备TT值"></el-input>
+				<el-form-item
+					label="设备TT值"
+					prop="tvalue"
+					:rules="[
+						{ required: true, message: '设备TT值不能为空', trigger: 'blur' },
+						{
+							type: 'number',
+							message: '请输入正确的数字值',
+							trigger: 'blur',
+							transform: (val) => Number(val),
+						},
+					]">
+					<el-input
+						v-model="form.tvalue"
+						:disabled="disabled"
+						placeholder="请输入设备TT值"></el-input>
 				</el-form-item>
-			</el-col>
+			</el-col> -->
 		</el-row>
 		<el-row :gutter="20">
-			<el-col :span="8">
-				<el-form-item label="产品加工时间(s)" prop="processingTime" :rules="[
-					{ required: true, message: '产品加工时间不能为空', trigger: 'blur' },
-					{
-						type: 'number',
-						message: '请输入正确的数字值',
-						trigger: 'blur',
-						transform: (val) => Number(val),
-					},
-				]">
-					<el-input v-model="form.processingTime" :disabled="disabled" placeholder="请输入产品加工时间"></el-input>
+			<!-- <el-col :span="8">
+				<el-form-item
+					label="产品加工时间(s)"
+					prop="processingTime"
+					:rules="[
+						{
+							required: true,
+							message: '产品加工时间不能为空',
+							trigger: 'blur',
+						},
+						{
+							type: 'number',
+							message: '请输入正确的数字值',
+							trigger: 'blur',
+							transform: (val) => Number(val),
+						},
+					]">
+					<el-input
+						v-model="form.processingTime"
+						:disabled="disabled"
+						placeholder="请输入产品加工时间"></el-input>
 				</el-form-item>
 			</el-col>
 			<el-col :span="8">
 				<el-form-item label="制造商" prop="manufacturer" :rules="[]">
-					<el-input v-model="form.manufacturer" :disabled="disabled" placeholder="请输入制造商"></el-input>
+					<el-input
+						v-model="form.manufacturer"
+						:disabled="disabled"
+						placeholder="请输入制造商"></el-input>
 				</el-form-item>
 			</el-col>
 			<el-col :span="8">
 				<el-form-item label="设备规格" prop="spec" :rules="[]">
-					<el-input v-model="form.spec" :disabled="disabled" placeholder="请输入设备规格"></el-input>
+					<el-input
+						v-model="form.spec"
+						:disabled="disabled"
+						placeholder="请输入设备规格"></el-input>
 				</el-form-item>
-			</el-col>
+			</el-col> -->
 		</el-row>
-		<el-row :gutter="20">
-			<!-- 功能描述  -->
+		<!-- <el-row :gutter="20">
 			<el-col>
 				<el-form-item label="功能描述" prop="description" :rules="[]">
-					<el-input type="textarea" :disabled="disabled" v-model="form.description"
+					<el-input
+						type="textarea"
+						:disabled="disabled"
+						v-model="form.description"
 						placeholder="请填写功能描述"></el-input>
 				</el-form-item>
 			</el-col>
-		</el-row>
-		<el-row :gutter="20">
-			<!-- 功能描述  -->
+		</el-row> -->
+		<!-- <el-row :gutter="20">
 			<el-col>
 				<el-form-item label="备注" prop="remark" :rules="[]">
-					<el-input v-model="form.remark" :disabled="disabled" placeholder="请输入备注"></el-input>
+					<el-input
+						v-model="form.remark"
+						:disabled="disabled"
+						placeholder="请输入备注"></el-input>
 				</el-form-item>
 			</el-col>
-		</el-row>
+		</el-row> -->
 		<el-row :gutter="20">
 			<!-- 上传资料  -->
 			<el-col>
-				<el-form-item label="上传资料" prop="assets" :rules="[]">
+				<el-form-item label="上传图片" prop="assets" :rules="[]">
 					<AssetsUpload v-model="form.assets" :disabled="disabled" />
 				</el-form-item>
 			</el-col>
 		</el-row>
-		<el-row :gutter="20">
-			<!-- 上传图片  -->
+		<!-- 上传图片  -->
+		<!-- <el-row :gutter="20">
 			<el-col>
 				<el-form-item label="上传图片" prop="pics" :rules="[]">
-					<AssetsUpload :is-pic-mode="true" v-model="form.pics" :disabled="disabled" />
+					<AssetsUpload
+						:is-pic-mode="true"
+						v-model="form.pics"
+						:disabled="disabled" />
 				</el-form-item>
 			</el-col>
-		</el-row>
+		</el-row> -->
 	</el-form>
 </template>
 
@@ -196,7 +297,7 @@ export default {
 				assets: [],
 				pics: [],
 			},
-			eqTypeList: [],
+			rpList: [],
 			dataLoaded: false,
 		};
 	},
@@ -226,26 +327,25 @@ export default {
 	},
 
 	mounted() {
-		this.getEqTypeList();
+		this.getRpList();
 	},
 
 	methods: {
 		updateForm() {
-			console.log('update form ==> ');
 			this.form.files = [...this.form.assets, ...this.form.pics];
 			delete this.form.assets;
 			delete this.form.pics;
 			this.$emit('update', this.form);
 		},
 
-		async getEqTypeList() {
+		async getRpList() {
 			this.formLoading = true;
 			const { code, data } = await this.$axios(
-				'/base/core-equipment-type/page?pageNo=1&pageSize=100'
+				'/base/core-worker/listAll'
 			);
 			// debugger;
 			if (code == 0) {
-				this.eqTypeList = data.list;
+				this.rpList = data;
 			}
 			this.formLoading = false;
 		},
@@ -263,7 +363,7 @@ export default {
 			return response.data;
 		},
 		// 上传成功的特殊处理
-		beforeUpload() { },
+		beforeUpload() {},
 		// 上传前的验证规则可通过 bind 属性传入
 		handleUploadSuccess(response, file, fileList) {
 			// 保存原始文件名
diff --git a/src/views/specialEquipment/components/dialogInDrawer.vue b/src/views/specialEquipment/components/dialogInDrawer.vue
new file mode 100644
index 00000000..cab8b8fd
--- /dev/null
+++ b/src/views/specialEquipment/components/dialogInDrawer.vue
@@ -0,0 +1,170 @@
+<!-- 
+    filename: dialogForm.vue
+    author: liubin
+    date: 2023-09-11 15:55:13
+    description: DialogForm for equipmentBindSection only
+-->
+
+<template>
+	<el-form
+		ref="form"
+		:model="dataForm"
+		label-width="100px"
+		v-loading="formLoading">
+		<el-row :gutter="20">
+			<el-col :span="12">
+				<el-form-item
+					label="报警编码"
+					prop="code"
+					:rules="[{ required: true, message: '报警编码不能为空', trigger: 'blur' }]">
+					<el-input
+						:disabled="disabled"
+						v-model="dataForm.code"
+						@change="$emit('update', dataForm)"
+						placeholder="请输入报警编码" />
+				</el-form-item>
+			</el-col>
+			<el-col :span="12">
+				<el-form-item
+					label="报警级别"
+					prop="grade"
+					:rules="[{ required: true, message: '报警级别不能为空', trigger: 'blur' }]">
+					<el-select
+						:disabled="disabled"
+						v-model="dataForm.grade"
+						placeholder="请选择报警级别"
+						@change="$emit('update', dataForm)">
+						<el-option
+							v-for="opt in getDictDatas(DICT_TYPE.EQU_ALARM_LEVEL)"
+							:key="opt.value"
+							:label="opt.label"
+							:value="opt.value" />
+					</el-select>
+				</el-form-item>
+			</el-col>
+		</el-row>
+		<el-row :gutter="20">
+			<el-col :span="12">
+				<el-form-item
+					label="参数列名"
+					prop="plcParamName"
+					:rules="[{ required: true, message: '参数列名不能为空', trigger: 'blur' }]">
+					<el-input
+						:disabled="disabled"
+						v-model="dataForm.plcParamName"
+						placeholder="请输入参数列名"
+						@change="$emit('update', dataForm)"></el-input>
+				</el-form-item>
+			</el-col>
+			<el-col :span="12">
+				<el-form-item
+					label="报警内容"
+					prop="alarmContent"
+					:rules="[{ required: true, message: '报警内容不能为空', trigger: 'blur' }]">
+					<el-input
+						:disabled="disabled"
+						v-model="dataForm.alarmContent"
+						placeholder="请输入报警内容"
+						@change="$emit('update', dataForm)"></el-input>
+				</el-form-item>
+			</el-col>
+		</el-row>
+		<el-row :gutter="20">
+			<el-col :span="12">
+				<el-form-item
+					label="报警类型"
+					prop="type"
+					:rules="[{ required: true, message: '报警类型不能为空', trigger: 'blur' }]">
+					<el-select
+						:disabled="disabled"
+						v-model="dataForm.type"
+						placeholder="请选择报警类型"
+						@change="handleTypeChange">
+						<el-option
+							v-for="opt in [
+								{ label: '布尔型', value: 2 },
+								{ label: '字符型', value: 1 },
+							]"
+							:key="opt.value"
+							:label="opt.label"
+							:value="opt.value" />
+					</el-select>
+				</el-form-item>
+			</el-col>
+
+			<el-col :span="12">
+				<el-form-item
+					v-if="+dataForm.type == 1"
+					label="设备报警编码"
+					prop="alarmCode">
+					<el-input
+						:disabled="disabled"
+						v-model="dataForm.alarmCode"
+						@change="$emit('update', dataForm)"
+						placeholder="请输入设备报警编码" />
+				</el-form-item>
+			</el-col>
+		</el-row>
+	</el-form>
+</template>
+
+<script>
+export default {
+	name: 'DialogForm',
+	model: {
+		prop: 'dataForm',
+		event: 'update',
+	},
+	emits: ['update'],
+	components: {},
+	props: {
+		dataForm: {
+			type: Object,
+			default: () => ({}),
+		},
+		disabled: {
+			type: Boolean,
+			default: false,
+		},
+	},
+	data() {
+		return {
+			formLoading: true,
+		};
+	},
+	mounted() {
+		this.getCode('/base/equipment-group-alarm/getCode').then((code) => {
+			this.formLoading = false;
+			this.$emit('update', {
+				...this.dataForm,
+				code,
+			});
+		});
+	},
+	methods: {
+		/** 模拟透传 ref  */
+		validate(cb) {
+			return this.$refs.form.validate(cb);
+		},
+		resetFields(args) {
+			return this.$refs.form.resetFields(args);
+		},
+		async handleTypeChange(id) {
+			// debugger;
+			this.dataForm.alarmCode = '';
+			this.$emit('update', this.dataForm);
+		},
+		async getCode(url) {
+			const response = await this.$axios(url);
+			return response.data;
+		},
+	},
+};
+</script>
+
+<style scoped lang="scss">
+.el-date-editor,
+.el-select {
+	width: 100%;
+}
+</style>
diff --git a/yarn.lock b/yarn.lock
index f16d0367..ae1e5ca4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2046,21 +2046,16 @@
   "resolved" "https://registry.npmmirror.com/acorn-walk/-/acorn-walk-7.2.0.tgz"
   "version" "7.2.0"
 
-"acorn@^6.0.0 || ^7.0.0 || ^8.0.0", "acorn@^6.4.1":
+"acorn@^6.0.0 || ^7.0.0 || ^8.0.0", "acorn@^7.1.1", "acorn@^7.4.0":
+  "integrity" "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A=="
+  "resolved" "https://registry.npmmirror.com/acorn/-/acorn-7.4.1.tgz"
+  "version" "7.4.1"
+
+"acorn@^6.4.1":
   "integrity" "sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ=="
   "resolved" "https://registry.npmmirror.com/acorn/-/acorn-6.4.2.tgz"
   "version" "6.4.2"
 
-"acorn@^7.1.1":
-  "integrity" "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A=="
-  "resolved" "https://registry.npmmirror.com/acorn/-/acorn-7.4.1.tgz"
-  "version" "7.4.1"
-
-"acorn@^7.4.0":
-  "integrity" "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A=="
-  "resolved" "https://registry.npmmirror.com/acorn/-/acorn-7.4.1.tgz"
-  "version" "7.4.1"
-
 "acorn@^8.8.2":
   "integrity" "sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw=="
   "resolved" "https://registry.npmmirror.com/acorn/-/acorn-8.10.0.tgz"
@@ -2081,7 +2076,7 @@
   "resolved" "https://registry.npmmirror.com/adler-32/-/adler-32-1.3.1.tgz"
   "version" "1.3.1"
 
-"aes-decrypter@^4.0.1":
+"aes-decrypter@^4.0.1", "aes-decrypter@4.0.1":
   "integrity" "sha512-H1nh/P9VZXUf17AA5NQfJML88CFjVBDuGkp5zDHa7oEhYN9TTpNLJknRY1ie0iSKWlDf6JRnJKaZVDSQdPy6Cg=="
   "resolved" "https://registry.npmmirror.com/aes-decrypter/-/aes-decrypter-4.0.1.tgz"
   "version" "4.0.1"
@@ -2108,16 +2103,6 @@
     "global" "^4.4.0"
     "pkcs7" "^1.0.4"
 
-"aes-decrypter@4.0.1":
-  "integrity" "sha512-H1nh/P9VZXUf17AA5NQfJML88CFjVBDuGkp5zDHa7oEhYN9TTpNLJknRY1ie0iSKWlDf6JRnJKaZVDSQdPy6Cg=="
-  "resolved" "https://registry.npmmirror.com/aes-decrypter/-/aes-decrypter-4.0.1.tgz"
-  "version" "4.0.1"
-  dependencies:
-    "@babel/runtime" "^7.12.5"
-    "@videojs/vhs-utils" "^3.0.5"
-    "global" "^4.4.0"
-    "pkcs7" "^1.0.4"
-
 "aggregate-error@^3.0.0":
   "integrity" "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA=="
   "resolved" "https://registry.npmmirror.com/aggregate-error/-/aggregate-error-3.1.0.tgz"
@@ -2193,21 +2178,28 @@
   "resolved" "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-2.2.1.tgz"
   "version" "2.2.1"
 
-"ansi-styles@^3.1.0", "ansi-styles@^3.2.0", "ansi-styles@^3.2.1":
+"ansi-styles@^3.1.0":
   "integrity" "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA=="
   "resolved" "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-3.2.1.tgz"
   "version" "3.2.1"
   dependencies:
     "color-convert" "^1.9.0"
 
-"ansi-styles@^4.0.0":
-  "integrity" "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg=="
-  "resolved" "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz"
-  "version" "4.3.0"
+"ansi-styles@^3.2.0":
+  "integrity" "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA=="
+  "resolved" "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-3.2.1.tgz"
+  "version" "3.2.1"
   dependencies:
-    "color-convert" "^2.0.1"
+    "color-convert" "^1.9.0"
 
-"ansi-styles@^4.1.0":
+"ansi-styles@^3.2.1":
+  "integrity" "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA=="
+  "resolved" "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-3.2.1.tgz"
+  "version" "3.2.1"
+  dependencies:
+    "color-convert" "^1.9.0"
+
+"ansi-styles@^4.0.0", "ansi-styles@^4.1.0":
   "integrity" "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg=="
   "resolved" "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz"
   "version" "4.3.0"
@@ -2896,7 +2888,28 @@
   "resolved" "https://registry.npmmirror.com/bytes/-/bytes-3.1.2.tgz"
   "version" "3.1.2"
 
-"cacache@^12.0.2", "cacache@^12.0.3":
+"cacache@^12.0.2":
+  "integrity" "sha512-a0tMB40oefvuInr4Cwb3GerbL9xTj1D5yg0T5xrjGCGyfvbxseIXX7BAO/u/hIXdafzOI5JC3wDwHyf24buOAQ=="
+  "resolved" "https://registry.npmmirror.com/cacache/-/cacache-12.0.4.tgz"
+  "version" "12.0.4"
+  dependencies:
+    "bluebird" "^3.5.5"
+    "chownr" "^1.1.1"
+    "figgy-pudding" "^3.5.1"
+    "glob" "^7.1.4"
+    "graceful-fs" "^4.1.15"
+    "infer-owner" "^1.0.3"
+    "lru-cache" "^5.1.1"
+    "mississippi" "^3.0.0"
+    "mkdirp" "^0.5.1"
+    "move-concurrently" "^1.0.1"
+    "promise-inflight" "^1.0.1"
+    "rimraf" "^2.6.3"
+    "ssri" "^6.0.1"
+    "unique-filename" "^1.1.1"
+    "y18n" "^4.0.0"
+
+"cacache@^12.0.3":
   "integrity" "sha512-a0tMB40oefvuInr4Cwb3GerbL9xTj1D5yg0T5xrjGCGyfvbxseIXX7BAO/u/hIXdafzOI5JC3wDwHyf24buOAQ=="
   "resolved" "https://registry.npmmirror.com/cacache/-/cacache-12.0.4.tgz"
   "version" "12.0.4"
@@ -3389,7 +3402,14 @@
     "map-visit" "^1.0.0"
     "object-visit" "^1.0.0"
 
-"color-convert@^1.9.0", "color-convert@^1.9.3":
+"color-convert@^1.9.0":
+  "integrity" "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg=="
+  "resolved" "https://registry.npmmirror.com/color-convert/-/color-convert-1.9.3.tgz"
+  "version" "1.9.3"
+  dependencies:
+    "color-name" "1.1.3"
+
+"color-convert@^1.9.3":
   "integrity" "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg=="
   "resolved" "https://registry.npmmirror.com/color-convert/-/color-convert-1.9.3.tgz"
   "version" "1.9.3"
@@ -3403,16 +3423,16 @@
   dependencies:
     "color-name" "~1.1.4"
 
-"color-name@^1.0.0", "color-name@1.1.3":
-  "integrity" "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw=="
-  "resolved" "https://registry.npmmirror.com/color-name/-/color-name-1.1.3.tgz"
-  "version" "1.1.3"
-
-"color-name@~1.1.4":
+"color-name@^1.0.0", "color-name@~1.1.4":
   "integrity" "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
   "resolved" "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz"
   "version" "1.1.4"
 
+"color-name@1.1.3":
+  "integrity" "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw=="
+  "resolved" "https://registry.npmmirror.com/color-name/-/color-name-1.1.3.tgz"
+  "version" "1.1.3"
+
 "color-string@^1.6.0":
   "integrity" "sha512-shrVawQFojnZv6xM40anx4CkoDP+fZsw/ZerEMsW/pyzsRbElpsL/DBVW7q3ExxwusdNXI3lXpuhEZkzs8p5Eg=="
   "resolved" "https://registry.npmmirror.com/color-string/-/color-string-1.9.1.tgz"
@@ -3441,7 +3461,22 @@
   dependencies:
     "delayed-stream" "~1.0.0"
 
-"commander@*", "commander@^2.18.0", "commander@^2.19.0", "commander@^2.20.0":
+"commander@*", "commander@2.17.x":
+  "integrity" "sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg=="
+  "resolved" "https://registry.npmmirror.com/commander/-/commander-2.17.1.tgz"
+  "version" "2.17.1"
+
+"commander@^2.18.0":
+  "integrity" "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ=="
+  "resolved" "https://registry.npmmirror.com/commander/-/commander-2.20.3.tgz"
+  "version" "2.20.3"
+
+"commander@^2.19.0":
+  "integrity" "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ=="
+  "resolved" "https://registry.npmmirror.com/commander/-/commander-2.20.3.tgz"
+  "version" "2.20.3"
+
+"commander@^2.20.0":
   "integrity" "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ=="
   "resolved" "https://registry.npmmirror.com/commander/-/commander-2.20.3.tgz"
   "version" "2.20.3"
@@ -3456,11 +3491,6 @@
   "resolved" "https://registry.npmmirror.com/commander/-/commander-2.19.0.tgz"
   "version" "2.19.0"
 
-"commander@2.17.x":
-  "integrity" "sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg=="
-  "resolved" "https://registry.npmmirror.com/commander/-/commander-2.17.1.tgz"
-  "version" "2.17.1"
-
 "commondir@^1.0.1":
   "integrity" "sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg=="
   "resolved" "https://registry.npmmirror.com/commondir/-/commondir-1.0.1.tgz"
@@ -4352,7 +4382,7 @@
   "resolved" "https://registry.npmmirror.com/domready/-/domready-1.0.8.tgz"
   "version" "1.0.8"
 
-"domutils@^1.5.1", "domutils@^1.7.0":
+"domutils@^1.5.1":
   "integrity" "sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg=="
   "resolved" "https://registry.npmmirror.com/domutils/-/domutils-1.7.0.tgz"
   "version" "1.7.0"
@@ -4360,16 +4390,15 @@
     "dom-serializer" "0"
     "domelementtype" "1"
 
-"domutils@^2.5.2":
-  "integrity" "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A=="
-  "resolved" "https://registry.npmmirror.com/domutils/-/domutils-2.8.0.tgz"
-  "version" "2.8.0"
+"domutils@^1.7.0":
+  "integrity" "sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg=="
+  "resolved" "https://registry.npmmirror.com/domutils/-/domutils-1.7.0.tgz"
+  "version" "1.7.0"
   dependencies:
-    "dom-serializer" "^1.0.1"
-    "domelementtype" "^2.2.0"
-    "domhandler" "^4.2.0"
+    "dom-serializer" "0"
+    "domelementtype" "1"
 
-"domutils@^2.8.0":
+"domutils@^2.5.2", "domutils@^2.8.0":
   "integrity" "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A=="
   "resolved" "https://registry.npmmirror.com/domutils/-/domutils-2.8.0.tgz"
   "version" "2.8.0"
@@ -4584,7 +4613,7 @@
   dependencies:
     "stackframe" "^1.3.4"
 
-"es-abstract@^1.17.2", "es-abstract@^1.19.0", "es-abstract@^1.20.4", "es-abstract@^1.21.2":
+"es-abstract@^1.19.0", "es-abstract@^1.20.4", "es-abstract@^1.21.2":
   "integrity" "sha512-ioRRcXMO6OFyRpyzV3kE1IIBd4WG5/kltnzdxSCqoP8CMGs/Li+M1uF5o7lOkZVFjDs+NLesthnF66Pg/0q0Lw=="
   "resolved" "https://registry.npmmirror.com/es-abstract/-/es-abstract-1.22.1.tgz"
   "version" "1.22.1"
@@ -5537,7 +5566,14 @@
     "is-glob" "^3.1.0"
     "path-dirname" "^1.0.0"
 
-"glob-parent@^5.0.0", "glob-parent@~5.1.2":
+"glob-parent@^5.0.0":
+  "integrity" "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow=="
+  "resolved" "https://registry.npmmirror.com/glob-parent/-/glob-parent-5.1.2.tgz"
+  "version" "5.1.2"
+  dependencies:
+    "is-glob" "^4.0.1"
+
+"glob-parent@~5.1.2":
   "integrity" "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow=="
   "resolved" "https://registry.npmmirror.com/glob-parent/-/glob-parent-5.1.2.tgz"
   "version" "5.1.2"
@@ -5740,7 +5776,7 @@
   "resolved" "https://registry.npmmirror.com/has-proto/-/has-proto-1.0.1.tgz"
   "version" "1.0.1"
 
-"has-symbols@^1.0.1", "has-symbols@^1.0.2", "has-symbols@^1.0.3":
+"has-symbols@^1.0.2", "has-symbols@^1.0.3":
   "integrity" "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A=="
   "resolved" "https://registry.npmmirror.com/has-symbols/-/has-symbols-1.0.3.tgz"
   "version" "1.0.3"
@@ -6379,16 +6415,7 @@
     "is-data-descriptor" "^0.1.4"
     "kind-of" "^5.0.0"
 
-"is-descriptor@^1.0.0":
-  "integrity" "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg=="
-  "resolved" "https://registry.npmmirror.com/is-descriptor/-/is-descriptor-1.0.2.tgz"
-  "version" "1.0.2"
-  dependencies:
-    "is-accessor-descriptor" "^1.0.0"
-    "is-data-descriptor" "^1.0.0"
-    "kind-of" "^6.0.2"
-
-"is-descriptor@^1.0.2":
+"is-descriptor@^1.0.0", "is-descriptor@^1.0.2":
   "integrity" "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg=="
   "resolved" "https://registry.npmmirror.com/is-descriptor/-/is-descriptor-1.0.2.tgz"
   "version" "1.0.2"
@@ -6412,6 +6439,11 @@
   "resolved" "https://registry.npmmirror.com/is-extendable/-/is-extendable-0.1.1.tgz"
   "version" "0.1.1"
 
+"is-extendable@^0.1.1":
+  "integrity" "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw=="
+  "resolved" "https://registry.npmmirror.com/is-extendable/-/is-extendable-0.1.1.tgz"
+  "version" "0.1.1"
+
 "is-extendable@^1.0.1":
   "integrity" "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA=="
   "resolved" "https://registry.npmmirror.com/is-extendable/-/is-extendable-1.0.1.tgz"
@@ -6613,7 +6645,7 @@
   dependencies:
     "is-docker" "^2.0.0"
 
-"isarray@^1.0.0", "isarray@~1.0.0", "isarray@1.0.0":
+"isarray@^1.0.0":
   "integrity" "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ=="
   "resolved" "https://registry.npmmirror.com/isarray/-/isarray-1.0.0.tgz"
   "version" "1.0.0"
@@ -6623,6 +6655,16 @@
   "resolved" "https://registry.npmmirror.com/isarray/-/isarray-2.0.5.tgz"
   "version" "2.0.5"
 
+"isarray@~1.0.0":
+  "integrity" "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ=="
+  "resolved" "https://registry.npmmirror.com/isarray/-/isarray-1.0.0.tgz"
+  "version" "1.0.0"
+
+"isarray@1.0.0":
+  "integrity" "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ=="
+  "resolved" "https://registry.npmmirror.com/isarray/-/isarray-1.0.0.tgz"
+  "version" "1.0.0"
+
 "isexe@^2.0.0":
   "integrity" "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw=="
   "resolved" "https://registry.npmmirror.com/isexe/-/isexe-2.0.0.tgz"
@@ -6831,14 +6873,7 @@
   "resolved" "https://registry.npmmirror.com/killable/-/killable-1.0.1.tgz"
   "version" "1.0.1"
 
-"kind-of@^3.0.2":
-  "integrity" "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ=="
-  "resolved" "https://registry.npmmirror.com/kind-of/-/kind-of-3.2.2.tgz"
-  "version" "3.2.2"
-  dependencies:
-    "is-buffer" "^1.1.5"
-
-"kind-of@^3.0.3":
+"kind-of@^3.0.2", "kind-of@^3.0.3":
   "integrity" "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ=="
   "resolved" "https://registry.npmmirror.com/kind-of/-/kind-of-3.2.2.tgz"
   "version" "3.2.2"
@@ -7102,7 +7137,23 @@
   "resolved" "https://registry.npmmirror.com/lower-case/-/lower-case-1.1.4.tgz"
   "version" "1.1.4"
 
-"lru-cache@^4.0.1", "lru-cache@^4.1.2", "lru-cache@^4.1.5":
+"lru-cache@^4.0.1":
+  "integrity" "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g=="
+  "resolved" "https://registry.npmmirror.com/lru-cache/-/lru-cache-4.1.5.tgz"
+  "version" "4.1.5"
+  dependencies:
+    "pseudomap" "^1.0.2"
+    "yallist" "^2.1.2"
+
+"lru-cache@^4.1.2":
+  "integrity" "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g=="
+  "resolved" "https://registry.npmmirror.com/lru-cache/-/lru-cache-4.1.5.tgz"
+  "version" "4.1.5"
+  dependencies:
+    "pseudomap" "^1.0.2"
+    "yallist" "^2.1.2"
+
+"lru-cache@^4.1.5":
   "integrity" "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g=="
   "resolved" "https://registry.npmmirror.com/lru-cache/-/lru-cache-4.1.5.tgz"
   "version" "4.1.5"
@@ -7421,18 +7472,7 @@
     "component-query" "^0.0.3"
     "domify" "^1.3.1"
 
-"min-dom@^3.1.0":
-  "integrity" "sha512-v6YCmnDzxk4rRJntWTUiwggLupPw/8ZSRqUq0PDaBwVZEO/wYzCH4SKVBV+KkEvf3u0XaWHly5JEosPtqRATZA=="
-  "resolved" "https://registry.npmmirror.com/min-dom/-/min-dom-3.2.1.tgz"
-  "version" "3.2.1"
-  dependencies:
-    "component-event" "^0.1.4"
-    "domify" "^1.3.1"
-    "indexof" "0.0.1"
-    "matches-selector" "^1.2.0"
-    "min-dash" "^3.8.1"
-
-"min-dom@^3.1.3":
+"min-dom@^3.1.0", "min-dom@^3.1.3":
   "integrity" "sha512-v6YCmnDzxk4rRJntWTUiwggLupPw/8ZSRqUq0PDaBwVZEO/wYzCH4SKVBV+KkEvf3u0XaWHly5JEosPtqRATZA=="
   "resolved" "https://registry.npmmirror.com/min-dom/-/min-dom-3.2.1.tgz"
   "version" "3.2.1"
@@ -7559,38 +7599,22 @@
     "for-in" "^1.0.2"
     "is-extendable" "^1.0.1"
 
-"mkdirp@^0.5.1":
+"mkdirp@^0.5.1", "mkdirp@^0.5.3", "mkdirp@^0.5.6", "mkdirp@~0.5.1":
   "integrity" "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw=="
   "resolved" "https://registry.npmmirror.com/mkdirp/-/mkdirp-0.5.6.tgz"
   "version" "0.5.6"
   dependencies:
     "minimist" "^1.2.6"
 
-"mkdirp@^0.5.3":
-  "integrity" "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw=="
-  "resolved" "https://registry.npmmirror.com/mkdirp/-/mkdirp-0.5.6.tgz"
-  "version" "0.5.6"
-  dependencies:
-    "minimist" "^1.2.6"
-
-"mkdirp@^0.5.6":
-  "integrity" "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw=="
-  "resolved" "https://registry.npmmirror.com/mkdirp/-/mkdirp-0.5.6.tgz"
-  "version" "0.5.6"
-  dependencies:
-    "minimist" "^1.2.6"
-
-"mkdirp@^1.0.3", "mkdirp@^1.0.4":
+"mkdirp@^1.0.3":
   "integrity" "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw=="
   "resolved" "https://registry.npmmirror.com/mkdirp/-/mkdirp-1.0.4.tgz"
   "version" "1.0.4"
 
-"mkdirp@~0.5.1":
-  "integrity" "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw=="
-  "resolved" "https://registry.npmmirror.com/mkdirp/-/mkdirp-0.5.6.tgz"
-  "version" "0.5.6"
-  dependencies:
-    "minimist" "^1.2.6"
+"mkdirp@^1.0.4":
+  "integrity" "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw=="
+  "resolved" "https://registry.npmmirror.com/mkdirp/-/mkdirp-1.0.4.tgz"
+  "version" "1.0.4"
 
 "mockjs@^1.1.0":
   "integrity" "sha512-eQsKcWzIaZzEZ07NuEyO4Nw65g0hdWAyurVol1IPl1gahRwY+svqzfgfey8U8dahLwG44d6/RwEzuK52rSa/JQ=="
@@ -7993,7 +8017,7 @@
     "define-properties" "^1.1.4"
     "es-abstract" "^1.20.4"
 
-"object.getownpropertydescriptors@^2.0.3", "object.getownpropertydescriptors@^2.1.0":
+"object.getownpropertydescriptors@^2.0.3":
   "integrity" "sha512-lq+61g26E/BgHv0ZTFgRvi7NMEPuAxLkFU7rukXjc/AlwH4Am5xXVnIXy3un1bg/JPbXHrixRkK1itUzzPiIjQ=="
   "resolved" "https://registry.npmmirror.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.6.tgz"
   "version" "2.1.6"
@@ -8063,14 +8087,7 @@
   dependencies:
     "mimic-fn" "^1.0.0"
 
-"onetime@^5.1.0":
-  "integrity" "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg=="
-  "resolved" "https://registry.npmmirror.com/onetime/-/onetime-5.1.2.tgz"
-  "version" "5.1.2"
-  dependencies:
-    "mimic-fn" "^2.1.0"
-
-"onetime@^5.1.2":
+"onetime@^5.1.0", "onetime@^5.1.2":
   "integrity" "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg=="
   "resolved" "https://registry.npmmirror.com/onetime/-/onetime-5.1.2.tgz"
   "version" "5.1.2"
@@ -8811,7 +8828,7 @@
     "source-map" "^0.5.6"
     "supports-color" "^3.2.3"
 
-"postcss@^7.0.0":
+"postcss@^7.0.0", "postcss@^7.0.1", "postcss@^7.0.14", "postcss@^7.0.27", "postcss@^7.0.32", "postcss@^7.0.36", "postcss@^7.0.5", "postcss@^7.0.6", "postcss@>4 <9":
   "integrity" "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA=="
   "resolved" "https://registry.npmmirror.com/postcss/-/postcss-7.0.39.tgz"
   "version" "7.0.39"
@@ -8819,63 +8836,16 @@
     "picocolors" "^0.2.1"
     "source-map" "^0.6.1"
 
-"postcss@^7.0.1":
-  "integrity" "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA=="
-  "resolved" "https://registry.npmmirror.com/postcss/-/postcss-7.0.39.tgz"
-  "version" "7.0.39"
+"postcss@^8.1.10":
+  "integrity" "sha512-gY/ACJtJPSmUFPDCHtX78+01fHa64FaU4zaaWfuh1MhGJISufJAH4cun6k/8fwsHYeK4UQmENQK+tRLCFJE8JQ=="
+  "resolved" "https://registry.npmmirror.com/postcss/-/postcss-8.4.27.tgz"
+  "version" "8.4.27"
   dependencies:
-    "picocolors" "^0.2.1"
-    "source-map" "^0.6.1"
+    "nanoid" "^3.3.6"
+    "picocolors" "^1.0.0"
+    "source-map-js" "^1.0.2"
 
-"postcss@^7.0.14":
-  "integrity" "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA=="
-  "resolved" "https://registry.npmmirror.com/postcss/-/postcss-7.0.39.tgz"
-  "version" "7.0.39"
-  dependencies:
-    "picocolors" "^0.2.1"
-    "source-map" "^0.6.1"
-
-"postcss@^7.0.27":
-  "integrity" "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA=="
-  "resolved" "https://registry.npmmirror.com/postcss/-/postcss-7.0.39.tgz"
-  "version" "7.0.39"
-  dependencies:
-    "picocolors" "^0.2.1"
-    "source-map" "^0.6.1"
-
-"postcss@^7.0.32":
-  "integrity" "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA=="
-  "resolved" "https://registry.npmmirror.com/postcss/-/postcss-7.0.39.tgz"
-  "version" "7.0.39"
-  dependencies:
-    "picocolors" "^0.2.1"
-    "source-map" "^0.6.1"
-
-"postcss@^7.0.36":
-  "integrity" "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA=="
-  "resolved" "https://registry.npmmirror.com/postcss/-/postcss-7.0.39.tgz"
-  "version" "7.0.39"
-  dependencies:
-    "picocolors" "^0.2.1"
-    "source-map" "^0.6.1"
-
-"postcss@^7.0.5":
-  "integrity" "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA=="
-  "resolved" "https://registry.npmmirror.com/postcss/-/postcss-7.0.39.tgz"
-  "version" "7.0.39"
-  dependencies:
-    "picocolors" "^0.2.1"
-    "source-map" "^0.6.1"
-
-"postcss@^7.0.6":
-  "integrity" "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA=="
-  "resolved" "https://registry.npmmirror.com/postcss/-/postcss-7.0.39.tgz"
-  "version" "7.0.39"
-  dependencies:
-    "picocolors" "^0.2.1"
-    "source-map" "^0.6.1"
-
-"postcss@^8.1.10", "postcss@^8.4.14", "postcss@>4 <9":
+"postcss@^8.4.14":
   "integrity" "sha512-gY/ACJtJPSmUFPDCHtX78+01fHa64FaU4zaaWfuh1MhGJISufJAH4cun6k/8fwsHYeK4UQmENQK+tRLCFJE8JQ=="
   "resolved" "https://registry.npmmirror.com/postcss/-/postcss-8.4.27.tgz"
   "version" "8.4.27"
@@ -9457,7 +9427,21 @@
   "resolved" "https://registry.npmmirror.com/rgbcolor/-/rgbcolor-1.0.1.tgz"
   "version" "1.0.1"
 
-"rimraf@^2.5.4", "rimraf@^2.6.1", "rimraf@^2.6.3":
+"rimraf@^2.5.4":
+  "integrity" "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w=="
+  "resolved" "https://registry.npmmirror.com/rimraf/-/rimraf-2.7.1.tgz"
+  "version" "2.7.1"
+  dependencies:
+    "glob" "^7.1.3"
+
+"rimraf@^2.6.1":
+  "integrity" "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w=="
+  "resolved" "https://registry.npmmirror.com/rimraf/-/rimraf-2.7.1.tgz"
+  "version" "2.7.1"
+  dependencies:
+    "glob" "^7.1.3"
+
+"rimraf@^2.6.3":
   "integrity" "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w=="
   "resolved" "https://registry.npmmirror.com/rimraf/-/rimraf-2.7.1.tgz"
   "version" "2.7.1"
@@ -9685,32 +9669,17 @@
   dependencies:
     "node-forge" "^0.10.0"
 
-"semver@^5.5.0", "semver@^5.6.0", "semver@2 || 3 || 4 || 5":
+"semver@^5.5.0":
   "integrity" "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g=="
   "resolved" "https://registry.npmmirror.com/semver/-/semver-5.7.2.tgz"
   "version" "5.7.2"
 
-"semver@^6.0.0":
-  "integrity" "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="
-  "resolved" "https://registry.npmmirror.com/semver/-/semver-6.3.1.tgz"
-  "version" "6.3.1"
+"semver@^5.6.0":
+  "integrity" "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g=="
+  "resolved" "https://registry.npmmirror.com/semver/-/semver-5.7.2.tgz"
+  "version" "5.7.2"
 
-"semver@^6.1.0":
-  "integrity" "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="
-  "resolved" "https://registry.npmmirror.com/semver/-/semver-6.3.1.tgz"
-  "version" "6.3.1"
-
-"semver@^6.1.2":
-  "integrity" "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="
-  "resolved" "https://registry.npmmirror.com/semver/-/semver-6.3.1.tgz"
-  "version" "6.3.1"
-
-"semver@^6.3.0":
-  "integrity" "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="
-  "resolved" "https://registry.npmmirror.com/semver/-/semver-6.3.1.tgz"
-  "version" "6.3.1"
-
-"semver@^6.3.1":
+"semver@^6.0.0", "semver@^6.1.0", "semver@^6.1.2", "semver@^6.3.0", "semver@^6.3.1":
   "integrity" "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="
   "resolved" "https://registry.npmmirror.com/semver/-/semver-6.3.1.tgz"
   "version" "6.3.1"
@@ -9736,6 +9705,11 @@
   dependencies:
     "lru-cache" "^6.0.0"
 
+"semver@2 || 3 || 4 || 5":
+  "integrity" "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g=="
+  "resolved" "https://registry.npmmirror.com/semver/-/semver-5.7.2.tgz"
+  "version" "5.7.2"
+
 "send@0.18.0":
   "integrity" "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg=="
   "resolved" "https://registry.npmmirror.com/send/-/send-0.18.0.tgz"
@@ -10413,14 +10387,7 @@
   dependencies:
     "has-flag" "^3.0.0"
 
-"supports-color@^7.0.0":
-  "integrity" "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw=="
-  "resolved" "https://registry.npmmirror.com/supports-color/-/supports-color-7.2.0.tgz"
-  "version" "7.2.0"
-  dependencies:
-    "has-flag" "^4.0.0"
-
-"supports-color@^7.1.0":
+"supports-color@^7.0.0", "supports-color@^7.1.0":
   "integrity" "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw=="
   "resolved" "https://registry.npmmirror.com/supports-color/-/supports-color-7.2.0.tgz"
   "version" "7.2.0"
@@ -11073,17 +11040,7 @@
   "resolved" "https://registry.npmmirror.com/util-deprecate/-/util-deprecate-1.0.2.tgz"
   "version" "1.0.2"
 
-"util.promisify@~1.0.0":
-  "integrity" "sha512-g9JpC/3He3bm38zsLupWryXHoEcS22YHthuPQSJdMy6KNrzIRzWqcsHzD/WUnqe45whVou4VIsPew37DoXWNrA=="
-  "resolved" "https://registry.npmmirror.com/util.promisify/-/util.promisify-1.0.1.tgz"
-  "version" "1.0.1"
-  dependencies:
-    "define-properties" "^1.1.3"
-    "es-abstract" "^1.17.2"
-    "has-symbols" "^1.0.1"
-    "object.getownpropertydescriptors" "^2.1.0"
-
-"util.promisify@1.0.0":
+"util.promisify@~1.0.0", "util.promisify@1.0.0":
   "integrity" "sha512-i+6qA2MPhvoKLuxnJNpXAGhg7HphQOSUq2LKMZD0m15EiskXUkMvKdF4Uui0WYeCUGea+o2cw/ZuwehtfsrNkA=="
   "resolved" "https://registry.npmmirror.com/util.promisify/-/util.promisify-1.0.0.tgz"
   "version" "1.0.0"
@@ -11616,7 +11573,7 @@
     "source-list-map" "^2.0.0"
     "source-map" "~0.6.1"
 
-"webpack@^1.0.0 || ^2.0.0 || ^3.0.0 || ^4.0.0", "webpack@^2.0.0 || ^3.0.0 || ^4.0.0", "webpack@^3.0.0 || ^4.1.0 || ^5.0.0-0", "webpack@^4.0.0", "webpack@^4.0.0 || ^5.0.0", "webpack@^4.36.0 || ^5.0.0", "webpack@^4.4.0", "webpack@>=2", "webpack@>=2.0.0 <5.0.0", "webpack@>=4.0.0":
+"webpack@^1.0.0 || ^2.0.0 || ^3.0.0 || ^4.0.0", "webpack@^2.0.0 || ^3.0.0 || ^4.0.0", "webpack@^3.0.0 || ^4.1.0 || ^5.0.0-0", "webpack@^4.0.0", "webpack@^4.0.0 || ^5.0.0", "webpack@^4.1.0 || ^5.0.0-0", "webpack@^4.36.0 || ^5.0.0", "webpack@^4.4.0", "webpack@>=2", "webpack@>=2.0.0 <5.0.0", "webpack@>=4.0.0":
   "integrity" "sha512-6jJuJjg8znb/xRItk7bkT0+Q7AHCYjjFnvKIWQPkNIOyRqoCGvkOs0ipeQzrqz4l5FtN5ZI/ukEHroeX/o1/5Q=="
   "resolved" "https://registry.npmmirror.com/webpack/-/webpack-4.46.0.tgz"
   "version" "4.46.0"
@@ -11766,7 +11723,14 @@
   dependencies:
     "mkdirp" "^0.5.1"
 
-"ws@^6.0.0", "ws@^6.2.1":
+"ws@^6.0.0":
+  "integrity" "sha512-zmhltoSR8u1cnDsD43TX59mzoMZsLKqUweyYBAIvTngR3shc0W6aOZylZmq/7hqyVxPdi+5Ud2QInblgyE72fw=="
+  "resolved" "https://registry.npmmirror.com/ws/-/ws-6.2.2.tgz"
+  "version" "6.2.2"
+  dependencies:
+    "async-limiter" "~1.0.0"
+
+"ws@^6.2.1":
   "integrity" "sha512-zmhltoSR8u1cnDsD43TX59mzoMZsLKqUweyYBAIvTngR3shc0W6aOZylZmq/7hqyVxPdi+5Ud2QInblgyE72fw=="
   "resolved" "https://registry.npmmirror.com/ws/-/ws-6.2.2.tgz"
   "version" "6.2.2"

From 49afcb76669e0c57f3d478e0e8b1e58ee431db67 Mon Sep 17 00:00:00 2001
From: lb <liubin_9396@163.com>
Date: Fri, 2 Feb 2024 13:15:25 +0800
Subject: [PATCH 02/40] update firefighting

---
 .../specialEquipment/basic/FireFighthing.vue  | 51 ++++++++++++-------
 .../components/EquipmentDrawer copy.vue       |  0
 .../components/EquipmentDrawer.vue            |  5 +-
 .../components/EquipmentInfoForm.vue          | 19 ++++++-
 4 files changed, 54 insertions(+), 21 deletions(-)
 create mode 100644 src/views/specialEquipment/components/EquipmentDrawer copy.vue

diff --git a/src/views/specialEquipment/basic/FireFighthing.vue b/src/views/specialEquipment/basic/FireFighthing.vue
index 2bd3409e..28cc03c4 100644
--- a/src/views/specialEquipment/basic/FireFighthing.vue
+++ b/src/views/specialEquipment/basic/FireFighthing.vue
@@ -59,10 +59,11 @@
 		</base-dialog>
 
 		<!-- 设备 详情 - 编辑 -->
-		<!-- <EquipmentDrawer
+		<EquipmentDrawer
 			v-if="editVisible"
 			ref="drawer"
 			:mode="editMode"
+			:isFireEquipment="true"
 			@update-mode="editMode = $event"
 			:data-id="form.id"
 			:sections="[
@@ -108,7 +109,7 @@
 			]"
 			@refreshDataList="getList"
 			@cancel="cancelEdit"
-			@destroy="cancelEdit" /> -->
+			@destroy="cancelEdit" />
 	</div>
 </template>
 
@@ -403,25 +404,41 @@ export default {
 		/** 修改按钮操作 */
 		handleUpdate(row) {
 			this.reset();
+			this.form.id = row.id;
 			this.showUploadComponents = false;
 			this.editMode = 'edit';
-			const id = row.id;
-			getEquipment(id).then((response) => {
-				this.form = response.data;
-				this.open = true;
-				this.title = '修改设备';
+			this.editVisible = true;
+			this.$nextTick(() => {
+				this.$refs['drawer'].init();
 			});
+			// this.reset();
+			// this.showUploadComponents = false;
+			// this.editMode = 'edit';
+			// const id = row.id;
+			// getEquipment(id).then((response) => {
+			// 	this.form = response.data;
+			// 	this.open = true;
+			// 	this.title = '修改设备';
+			// });
 		},
-		handleDetail(row) {
-			this.reset();
-			this.showUploadComponents = false;
-			const id = row.id;
-			this.editMode = 'detail';
-			getEquipment(id).then((response) => {
-				this.form = response.data;
-				this.open = true;
-				this.title = '查看详情';
-			});
+		handleDetail(row, mode='detail') {
+			const {id} = row;
+			this.form.id = id;
+			// 打开抽屉
+			this.editMode = mode;
+			this.editVisible = true;
+			this.$nextTick(() => {
+				this.$refs['drawer'].init();
+			})
+			// this.reset();
+			// this.showUploadComponents = false;
+			// const id = row.id;
+			// this.editMode = 'detail';
+			// getEquipment(id).then((response) => {
+			// 	this.form = response.data;
+			// 	this.open = true;
+			// 	this.title = '查看详情';
+			// });
 		},
 		/** 提交按钮 */
 		submitForm() {
diff --git a/src/views/specialEquipment/components/EquipmentDrawer copy.vue b/src/views/specialEquipment/components/EquipmentDrawer copy.vue
new file mode 100644
index 00000000..e69de29b
diff --git a/src/views/specialEquipment/components/EquipmentDrawer.vue b/src/views/specialEquipment/components/EquipmentDrawer.vue
index d258bd70..6c1439fa 100644
--- a/src/views/specialEquipment/components/EquipmentDrawer.vue
+++ b/src/views/specialEquipment/components/EquipmentDrawer.vue
@@ -37,6 +37,7 @@
 						<EquipmentInfoForm
 							key="drawer-dialog-form"
 							v-if="showForm"
+							:isFireEquipment="isFireEquipment"
 							:disabled="mode.includes('detail')"
 							:sync-filelist="syncFileListFlag"
 							v-model="form" />
@@ -149,7 +150,7 @@ const SmallTitle = {
 
 export default {
 	components: { SmallTitle, DialogForm, EquipmentInfoForm },
-	props: ['sections', 'mode', 'dataId'], // dataId 作为一个通用的存放id的字段
+	props: ['sections', 'mode', 'dataId', 'isFireEquipment'], // dataId 作为一个通用的存放id的字段
 	data() {
 		return {
 			visible: false,
@@ -279,7 +280,7 @@ export default {
 				}
 
 				this.btnLoading = false;
-				this.$emit('refreshDataList')
+				this.$emit('refreshDataList');
 				this.handleCancel();
 			});
 		},
diff --git a/src/views/specialEquipment/components/EquipmentInfoForm.vue b/src/views/specialEquipment/components/EquipmentInfoForm.vue
index c1b642c1..c670b036 100644
--- a/src/views/specialEquipment/components/EquipmentInfoForm.vue
+++ b/src/views/specialEquipment/components/EquipmentInfoForm.vue
@@ -121,6 +121,16 @@
 			</el-col> -->
 		</el-row>
 		<el-row :gutter="20">
+			<el-col v-if="isFireEquipment" :span="12">
+				<el-form-item label="有效期至" prop="dueDate" :rules="[]">
+					<el-date-picker
+						v-model="form.dueDate"
+						:disabled="disabled"
+						type="datetime"
+						placeholder="请选择生产日期"
+						value-format="timestamp"></el-date-picker>
+				</el-form-item>
+			</el-col>
 			<!-- <el-col :span="8">
 				<el-form-item label="生产日期" prop="productionTime" :rules="[]">
 					<el-date-picker
@@ -130,8 +140,8 @@
 						placeholder="请选择生产日期"
 						value-format="timestamp"></el-date-picker>
 				</el-form-item>
-			</el-col>
-			<el-col :span="8">
+			</el-col> -->
+			<!-- <el-col :span="8">
 				<el-form-item label="进场日期" prop="enterTime" :rules="[]">
 					<el-date-picker
 						v-model="form.enterTime"
@@ -274,6 +284,10 @@ export default {
 			default: null,
 			required: false,
 		},
+		isFireEquipment: {
+			type: Boolean,
+			default: false
+		}
 	},
 
 	data() {
@@ -296,6 +310,7 @@ export default {
 				description: '',
 				assets: [],
 				pics: [],
+				dueDate: ''
 			},
 			rpList: [],
 			dataLoaded: false,

From 3a3e33db0e13d7a8ec7cb47b36b3a379ad2aa1ef Mon Sep 17 00:00:00 2001
From: lb <liubin_9396@163.com>
Date: Fri, 2 Feb 2024 13:20:33 +0800
Subject: [PATCH 03/40] update special equipment management

---
 src/views/specialEquipment/basic/Manage.vue | 50 ++++++++++++++-------
 1 file changed, 33 insertions(+), 17 deletions(-)

diff --git a/src/views/specialEquipment/basic/Manage.vue b/src/views/specialEquipment/basic/Manage.vue
index 4661cf8b..f59afc3f 100644
--- a/src/views/specialEquipment/basic/Manage.vue
+++ b/src/views/specialEquipment/basic/Manage.vue
@@ -59,7 +59,7 @@
 		</base-dialog>
 
 		<!-- 设备 详情 - 编辑 -->
-		<!-- <EquipmentDrawer
+		<EquipmentDrawer
 			v-if="editVisible"
 			ref="drawer"
 			:mode="editMode"
@@ -108,7 +108,7 @@
 			]"
 			@refreshDataList="getList"
 			@cancel="cancelEdit"
-			@destroy="cancelEdit" /> -->
+			@destroy="cancelEdit" />
 	</div>
 </template>
 
@@ -388,25 +388,41 @@ export default {
 		/** 修改按钮操作 */
 		handleUpdate(row) {
 			this.reset();
+			this.form.id = row.id;
 			this.showUploadComponents = false;
 			this.editMode = 'edit';
-			const id = row.id;
-			getEquipment(id).then((response) => {
-				this.form = response.data;
-				this.open = true;
-				this.title = '修改设备';
+			this.editVisible = true;
+			this.$nextTick(() => {
+				this.$refs['drawer'].init();
 			});
+			// this.reset();
+			// this.showUploadComponents = false;
+			// this.editMode = 'edit';
+			// const id = row.id;
+			// getEquipment(id).then((response) => {
+			// 	this.form = response.data;
+			// 	this.open = true;
+			// 	this.title = '修改设备';
+			// });
 		},
-		handleDetail(row) {
-			this.reset();
-			this.showUploadComponents = false;
-			const id = row.id;
-			this.editMode = 'detail';
-			getEquipment(id).then((response) => {
-				this.form = response.data;
-				this.open = true;
-				this.title = '查看详情';
-			});
+		handleDetail(row, mode='detail') {
+			const {id} = row;
+			this.form.id = id;
+			// 打开抽屉
+			this.editMode = mode;
+			this.editVisible = true;
+			this.$nextTick(() => {
+				this.$refs['drawer'].init();
+			})
+			// this.reset();
+			// this.showUploadComponents = false;
+			// const id = row.id;
+			// this.editMode = 'detail';
+			// getEquipment(id).then((response) => {
+			// 	this.form = response.data;
+			// 	this.open = true;
+			// 	this.title = '查看详情';
+			// });
 		},
 		/** 提交按钮 */
 		submitForm() {

From da5596766c33f5f0defcc69afd4e069aefae289a Mon Sep 17 00:00:00 2001
From: lb <liubin_9396@163.com>
Date: Fri, 2 Feb 2024 16:56:45 +0800
Subject: [PATCH 04/40] =?UTF-8?q?Update=20=E4=BF=9D=E5=85=BB=E8=AE=A1?=
 =?UTF-8?q?=E5=88=92=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.dev                                      |   3 +-
 src/mixins/lb/basicPageMixin.js               |   2 +
 .../maintain/PlanConfig--add.vue              | 248 ++++++++++++++----
 .../specialEquipment/maintain/PlanConfig.vue  | 171 +++++++-----
 4 files changed, 314 insertions(+), 110 deletions(-)

diff --git a/.env.dev b/.env.dev
index 90ad311e..924e1dab 100644
--- a/.env.dev
+++ b/.env.dev
@@ -14,7 +14,8 @@ VUE_APP_TITLE = MES系统
 # 芋道管理系统/开发环境
 # VUE_APP_BASE_API = 'http://100.64.0.26:48082'
 # VUE_APP_BASE_API = 'http://10.70.2.2:8080'
-VUE_APP_BASE_API = 'http://192.168.0.33:48082'
+VUE_APP_BASE_API = 'http://192.168.1.47:48082'
+# VUE_APP_BASE_API = 'http://192.168.0.33:48082'
 # VUE_APP_BASE_API = 'http://192.168.4.173:48080'
 # VUE_APP_BASE_API = 'http://192.168.2.173:48080'
 # VUE_APP_BASE_API = 'http://192.168.1.49:48082'
diff --git a/src/mixins/lb/basicPageMixin.js b/src/mixins/lb/basicPageMixin.js
index 3fe2557f..ca1ed6e6 100644
--- a/src/mixins/lb/basicPageMixin.js
+++ b/src/mixins/lb/basicPageMixin.js
@@ -106,6 +106,8 @@ export default {
 				case 'detail':
 					this.handleDetail(data);
 					break;
+				default:
+					this.handleTableActions({data, type});
 			}
 		},
 		// 处理搜索栏按钮
diff --git a/src/views/specialEquipment/maintain/PlanConfig--add.vue b/src/views/specialEquipment/maintain/PlanConfig--add.vue
index d4c993d5..34f9f437 100644
--- a/src/views/specialEquipment/maintain/PlanConfig--add.vue
+++ b/src/views/specialEquipment/maintain/PlanConfig--add.vue
@@ -15,34 +15,55 @@
 		<el-row :gutter="20">
 			<el-col :span="12">
 				<el-form-item
-					label="计划名称"
+					label="保养计划名称"
 					prop="name"
 					:rules="[
-						{ required: true, message: '请输入计划名称', trigger: 'blur' },
+						{ required: true, message: '请输入保养计划名称', trigger: 'blur' },
 					]">
 					<el-input
 						v-model="form.name"
 						@change="$emit('update', form)"
-						:placeholder="`请输入计划名称`"
+						:placeholder="`请输入保养计划名称`"
 						:disabled="disabled" />
 				</el-form-item>
 			</el-col>
+
 			<el-col :span="12">
 				<el-form-item
-					label="计划编号"
+					label="保养计划编号"
 					prop="code"
 					:rules="[
-						{ required: true, message: '请输入计划编号', trigger: 'blur' },
+						{ required: true, message: '请输入保养计划编号', trigger: 'blur' },
 					]">
 					<el-input
 						v-model="form.code"
 						@change="$emit('update', form)"
-						:placeholder="`请输入计划编号`"
+						:placeholder="`请输入保养计划编号`"
 						:disabled="disabled" />
 				</el-form-item>
 			</el-col>
+
 			<el-col :span="12">
 				<el-form-item
+					label="部门"
+					prop="departmentId"
+					:rules="[{ required: true, message: '请选择部门', trigger: 'blur' }]">
+					<el-select
+						v-model="form.departmentId"
+						:placeholder="`请选择部门`"
+						:disabled="disabled"
+						clearable
+						filterable
+						@change="$emit('update', form)">
+						<el-option
+							v-for="opt in departmentOptions"
+							:key="opt.value"
+							:label="opt.label"
+							:value="opt.value" />
+					</el-select>
+				</el-form-item>
+
+				<!-- <el-form-item
 					label="设备大类"
 					prop="equipmentCategory"
 					:rules="[
@@ -59,10 +80,29 @@
 							:label="opt.label"
 							:value="opt.value" />
 					</el-select>
-				</el-form-item>
+				</el-form-item> -->
 			</el-col>
+
 			<el-col :span="12">
 				<el-form-item
+					label="产线"
+					prop="lineId"
+					:rules="[{ required: true, message: '请选择产线', trigger: 'blur' }]">
+					<el-select
+						v-model="form.lineId"
+						:placeholder="`请选择产线`"
+						:disabled="disabled"
+						clearable
+						filterable
+						@change="$emit('update', form)">
+						<el-option
+							v-for="opt in lineOptions"
+							:key="opt.value"
+							:label="opt.label"
+							:value="opt.value" />
+					</el-select>
+				</el-form-item>
+				<!-- <el-form-item
 					label="设备"
 					prop="equipmentId"
 					:rules="[{ required: true, message: '请选择设备', trigger: 'blur' }]">
@@ -77,42 +117,9 @@
 							:label="opt.label"
 							:value="opt.value" />
 					</el-select>
-				</el-form-item>
-			</el-col>
-			<el-col :span="12">
-				<el-form-item label="保养类型" prop="maintainType">
-					<el-select
-						v-model="form.maintainType"
-						:placeholder="`请选择保养类型`"
-						:disabled="disabled"
-						@change="$emit('update', form)">
-						<el-option
-							v-for="opt in getDictDatas(DICT_TYPE.MAINTAIN_TYPE)"
-							:key="opt.value"
-							:label="opt.label"
-							:value="+opt.value" />
-					</el-select>
-				</el-form-item>
-			</el-col>
-			<el-col :span="12">
-				<el-form-item
-					label="保养时长(h)"
-					prop="maintainDuration"
-					:rules="[
-						{
-							type: 'number',
-							message: '请输入正确的数字',
-							trigger: 'blur',
-							transform: (val) => Number(val),
-						},
-					]">
-					<el-input
-						v-model="form.maintainDuration"
-						@change="$emit('update', form)"
-						:placeholder="`请输入保养时长`"
-						:disabled="disabled" />
-				</el-form-item>
+				</el-form-item> -->
 			</el-col>
+
 			<el-col :span="12">
 				<el-form-item
 					label="保养频率(天/次)"
@@ -133,6 +140,100 @@
 						:disabled="disabled" />
 				</el-form-item>
 			</el-col>
+
+			<el-col :span="12">
+				<el-form-item
+					label="确认时限(h)"
+					prop="confirmTimeLimit"
+					:rules="[
+						{ required: true, message: '请输入确认时限', trigger: 'blur' },
+						{
+							type: 'number',
+							message: '请输入正确的数字',
+							trigger: 'blur',
+							transform: (val) => Number(val),
+						},
+					]">
+					<el-input
+						v-model="form.confirmTimeLimit"
+						@change="$emit('update', form)"
+						:placeholder="`请输入确认时限(小时)`"
+						:disabled="disabled" />
+				</el-form-item>
+			</el-col>
+
+			<!-- <el-col :span="12">
+				<el-form-item label="保养类型" prop="maintainType">
+					<el-select
+						v-model="form.maintainType"
+						:placeholder="`请选择保养类型`"
+						:disabled="disabled"
+						@change="$emit('update', form)">
+						<el-option
+							v-for="opt in getDictDatas(DICT_TYPE.MAINTAIN_TYPE)"
+							:key="opt.value"
+							:label="opt.label"
+							:value="+opt.value" />
+					</el-select>
+				</el-form-item>
+			</el-col> -->
+
+			<el-col :span="12">
+				<el-form-item
+					label="保养时长(h)"
+					prop="maintainDuration"
+					:rules="[
+						{
+							type: 'number',
+							message: '请输入正确的数字',
+							trigger: 'blur',
+							transform: (val) => Number(val),
+						},
+					]">
+					<el-input
+						v-model="form.maintainDuration"
+						@change="$emit('update', form)"
+						:placeholder="`请输入保养时长(小时)`"
+						:disabled="disabled" />
+				</el-form-item>
+			</el-col>
+
+			<el-col :span="12">
+				<el-form-item label="首次保养时间" prop="firstMaintenanceTime">
+					<el-date-picker
+						v-model="form.firstMaintenanceTime"
+						type="datetime"
+						:disabled="edit"
+						:placeholder="`请选择首次保养时间`"
+						@change="$emit('update', form)"
+						value-format="timestamp"></el-date-picker>
+				</el-form-item>
+			</el-col>
+
+			<el-col :span="12">
+				<el-form-item
+					label="计划保养人员"
+					prop="maintainer"
+					:rules="[
+						{ required: true, message: '请选择计划保养人员', trigger: 'blur' },
+					]">
+					<el-select
+						v-model="form.maintainer"
+						:placeholder="`请选择计划保养人员`"
+						:disabled="disabled"
+						multiple
+						clearable
+						filterable
+						@change="$emit('update', form)">
+						<el-option
+							v-for="opt in maintainerOptions"
+							:key="opt.value"
+							:label="opt.label"
+							:value="opt.value" />
+					</el-select>
+				</el-form-item>
+			</el-col>
+
 			<el-col :span="24">
 				<el-form-item label="备注" prop="remark">
 					<el-input
@@ -168,6 +269,10 @@ export default {
 			type: Boolean,
 			default: false,
 		},
+		edit: {
+			type: Boolean,
+			default: false,
+		},
 		hasFiles: {
 			type: Boolean | Array,
 			default: false,
@@ -185,20 +290,21 @@ export default {
 		return {
 			form: {},
 			formLoading: true,
-			dataLoaded: false,
-			equipmentList: [],
-			equipmentOptions: [],
 			equipmentTypeOptions: [
 				{ label: '安全设备', value: 1 },
 				{ label: '消防设备', value: 2 },
 				{ label: '特种设备', value: 3 },
 			],
+			lineList: [],
+			maintainerList: [],
+			departmentList: []
 		};
 	},
 	watch: {
 		dataForm: {
 			handler(val) {
 				this.form = JSON.parse(JSON.stringify(val));
+				if (typeof val.maintainer == 'string') this.form.maintainer = val.maintainer.split(',')
 				if (this.form.equipmentCategory != null) {
 					setTimeout(() => {
 						this.equipmentOptions = this.equipmentList
@@ -224,8 +330,33 @@ export default {
 		},
 	},
 	mounted() {
-		this.getEquipmentList();
-		this.getCode('/base/equipment-maintain-plan/getCode');
+		!this.edit && this.getCode('/base/equipment-maintain-plan/getCode');
+		this.getList('maintainer');
+		this.getList('department');
+		this.getList('line');
+	},
+	computed: {
+		departmentOptions() {
+			return (this.departmentList || []).map((item) => ({
+				id: item.id,
+				label: item.name,
+				value: item.id,
+			}));
+		},
+		lineOptions() {
+			return (this.lineList || []).map((item) => ({
+				id: item.id,
+				label: item.name,
+				value: item.id,
+			}));
+		},
+		maintainerOptions() {
+			return (this.maintainerList || []).map((item) => ({
+				id: item.id,
+				label: item.name,
+				value: item.name,
+			}));
+		},
 	},
 	methods: {
 		/** 模拟透传 ref  */
@@ -253,6 +384,29 @@ export default {
 			}));
 			this.formLoading = false;
 		},
+		async getList(source = 'department') {
+			const urls = [
+				'/base/core-production-line/listAll',
+				'/base/core-department/listAll',
+				'/base/core-worker/listAll',
+			];
+			let res;
+			switch (source) {
+				case 'department':
+					res = await this.$axios(urls[1]);
+					this.departmentList = res.data || [];
+					break;
+				case 'maintainer':
+					res = await this.$axios(urls[2]);
+					this.maintainerList = res.data || [];
+					break;
+				case 'line':
+					res = await this.$axios(urls[0]);
+					this.lineList = res.data || [];
+					break;
+			}
+			this.formLoading = false;
+		},
 
 		// handlers
 		handleEqTypeChange(type) {
diff --git a/src/views/specialEquipment/maintain/PlanConfig.vue b/src/views/specialEquipment/maintain/PlanConfig.vue
index c4559687..b8b77183 100644
--- a/src/views/specialEquipment/maintain/PlanConfig.vue
+++ b/src/views/specialEquipment/maintain/PlanConfig.vue
@@ -24,7 +24,7 @@
 				v-if="tableBtn.length"
 				slot="handleBtn"
 				label="操作"
-				:width="120"
+				:width="180"
 				:method-list="tableBtn"
 				@clickBtn="handleTableBtnClick" />
 		</base-table>
@@ -44,7 +44,7 @@
 			@close="cancel"
 			@cancel="cancel"
 			@confirm="submitForm">
-			<DialogForm v-if="open" ref="form" v-model="form" :has-files="false" />
+			<DialogForm v-if="open" ref="form" :edit="form.id != null" v-model="form" :has-files="false" />
 		</base-dialog>
 	</div>
 </template>
@@ -64,11 +64,15 @@ export default {
 		const t = new Date();
 		const [y, m, d] = [t.getFullYear(), t.getMonth(), t.getDate()];
 		return {
-			searchBarKeys: ['equipmentName', 'specialType', 'createTime'],
+			searchBarKeys: ['planName'], // 'specialType', 'equipmentName', 'createTime'],
 			tableBtn: [
+				// {
+				// 	type: 'detail',
+				// 	btnName: '保养记录',
+				// },
 				{
-					type: 'detail',
-					btnName: '保养记录',
+					type: 'addContent',
+					btnName: '添加内容',
 				},
 				this.$auth.hasPermi('equipment:plan-config:update')
 					? {
@@ -84,6 +88,23 @@ export default {
 					: undefined,
 			].filter((v) => v),
 			tableProps: [
+				{ prop: 'name', label: '计划名称' },
+				{ prop: 'departmentName', label: '部门' },
+				{ width: 144, prop: 'lineName', label: '产线名' },
+				{ width: 144, prop: 'maintenancePeriod', label: '保养频率(天/次)' },
+				{ width: 144, prop: 'firstMaintenanceTime', label: '首次保养时间' },
+				{ width: 144, prop: 'maintainDuration', label: '保养时长' },
+				{ prop: 'maintainer', label: '计划保养人员' },
+				{
+					width: 144,
+					prop: 'confirmTimeLimit',
+					label: '确认时限',
+					filter: (val) =>
+						val != null && val > 24
+							? `${(val - (val % 24)) / 24}天${val % 24}小时`
+							: `${val}小时`,
+				},
+				{ prop: 'remark', label: '备注' },
 				// {
 				// 	prop: 'createTime',
 				// 	label: '添加时间',
@@ -91,59 +112,64 @@ export default {
 				// 	width: 180,
 				// 	filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'),
 				// },
-				{ prop: 'name', label: '计划名称' },
-				{ prop: 'code', label: '计划编号' },
-				{
-					prop: 'enabled',
-					label: '启用状态',
-					filter: (val) => ['停用', '启用'][val],
-				},
-				{ prop: 'lineName', label: '产线' },
-				{
-					prop: 'equipmentCategory',
-					label: '设备大类',
-					filter: (val) =>
-						val != null ? ['-', '安全', '消防', '特种'][val] : '-',
-				},
-				{ prop: 'equipmentName', label: '设备名称' },
-				{ width: 144, prop: 'maintainDuration', label: '计划保养用时(h)' },
-				{ width: 144, prop: 'maintenancePeriod', label: '保养频率(天/次)' },
-				{
-					prop: 'maintainType',
-					label: '保养类型',
-					filter: publicFormatter('maintain_type'),
-				},
-				{ prop: 'remark', label: '备注' },
+				// { prop: 'code', label: '计划编号' },
+				// {
+				// 	prop: 'enabled',
+				// 	label: '启用状态',
+				// 	filter: (val) => ['停用', '启用'][val],
+				// },
+				// {
+				// 	prop: 'equipmentCategory',
+				// 	label: '设备大类',
+				// 	filter: (val) =>
+				// 		val != null ? ['-', '安全', '消防', '特种'][val] : '-',
+				// },
+				// { prop: 'equipmentName', label: '设备名称' },
+				// { width: 144, prop: 'maintainDuration', label: '计划保养用时(h)' },
+				// {
+				// 	prop: 'maintainType',
+				// 	label: '保养类型',
+				// 	filter: publicFormatter('maintain_type'),
+				// },
 			],
 			searchBarFormConfig: [
-				{
-					type: 'select',
-					label: '设备大类',
-					selectOptions: [
-						{ id: 1, name: '安全设备' },
-						{ id: 2, name: '消防设备' },
-						{ id: 3, name: '特种设备' },
-					],
-					placeholder: '请选择设备大类',
-					param: 'specialType',
-				},
+				// {
+				// 	type: 'select',
+				// 	label: '设备大类',
+				// 	selectOptions: [
+				// 		{ id: 1, name: '安全设备' },
+				// 		{ id: 2, name: '消防设备' },
+				// 		{ id: 3, name: '特种设备' },
+				// 	],
+				// 	placeholder: '请选择设备大类',
+				// 	param: 'specialType',
+				// },
 				{
 					type: 'input',
-					label: '设备名',
-					placeholder: '请输入设备名称',
-					param: 'equipmentName',
-				},
-				{
-					type: 'datePicker',
-					label: '时间段',
-					dateType: 'daterange',
-					format: 'yyyy-MM-dd',
-					valueFormat: 'yyyy-MM-dd HH:mm:ss',
-					rangeSeparator: '-',
-					startPlaceholder: '开始时间',
-					endPlaceholder: '结束时间',
-					param: 'createTime',
+					label: '保养计划名称',
+					placeholder: '请输入保养计划名称',
+					param: 'planName',
+					// selectOptions: [
+					// 	{name: 1, id: 1}
+					// ]
 				},
+				// {
+				// 	type: 'input',
+				// 	label: '设备名',
+				// 	placeholder: '请输入设备名称',
+				// 	param: 'equipmentName',
+				// },
+				// {
+				// 	type: 'datePicker',
+				// 	label: '时间段',
+				// 	dateType: 'daterange',
+				// 	format: 'yyyy-MM-dd',
+				// 	valueFormat: 'yyyy-MM-dd HH:mm:ss',
+				// 	rangeSeparator: '-',
+				// 	startPlaceholder: '开始时间',
+				// 	endPlaceholder: '结束时间',
+				// 	param: 'createTime',
+				// },
 				{
 					type: 'button',
 					btnName: '查询',
@@ -271,9 +297,10 @@ export default {
 			queryParams: {
 				pageNo: 1,
 				pageSize: 10,
-				equipmentName: null,
-				createTime: null,
+				// equipmentName: null,
+				// createTime: null,
 				specialType: null,
+				planName: null,
 			},
 			// 表单参数
 			form: {},
@@ -311,19 +338,33 @@ export default {
 		/** 表单重置 */
 		reset() {
 			this.form = {
+				id: null,
 				code: null,
 				name: null,
-				equipmentId: null,
-				enabled: null,
+				// equipmentId: null,
+				maintainer: null,
+				lineId: null,
+				departmentId: null,
+				// enabled: null,
 				maintenancePeriod: null,
 				maintainDuration: null,
 				maintainType: null,
 				remark: null,
-				enabled: 1,
-				equipmentCategory: null,
+				confirmTimeLimit: null,
+				firstMaintenanceTime: null,
+				speical: false,
+				// equipmentCategory: null,
 			};
 			this.resetForm('form');
 		},
+		handleTableActions({data, type}) {
+			switch(type) {
+				case 'addContent':
+					// 添加内容
+					alert('添加内容...')
+					break;
+			}
+		},
 		/** 搜索按钮操作 */
 		handleQuery() {
 			this.queryParams.pageNo = 1;
@@ -364,7 +405,6 @@ export default {
 			const id = row.id;
 			this.info({ id }).then((response) => {
 				this.form = response.data;
-				debugger;
 				this.open = true;
 				this.title = '修改保养计划';
 			});
@@ -377,7 +417,10 @@ export default {
 				}
 				// 修改的提交
 				if (this.form.id != null) {
-					this.put(this.form).then((response) => {
+					this.put({
+						...this.form,
+						maintainer: this.form.maintainer.join(','),
+					}).then((response) => {
 						this.$modal.msgSuccess('修改成功');
 						this.open = false;
 						this.getList();
@@ -385,7 +428,11 @@ export default {
 					return;
 				}
 				// 添加的提交
-				this.post(this.form).then((response) => {
+				this.post({
+					...this.form,
+					special: true,
+					maintainer: this.form.maintainer.join(','),
+				}).then((response) => {
 					this.$modal.msgSuccess('新增成功');
 					this.open = false;
 					this.getList();

From fd7e295975b7edea55576b738b8aabaa0f019731 Mon Sep 17 00:00:00 2001
From: lb <liubin_9396@163.com>
Date: Sun, 4 Feb 2024 14:33:39 +0800
Subject: [PATCH 05/40] =?UTF-8?q?update=20=E4=BF=9D=E5=85=BB=E8=AE=A1?=
 =?UTF-8?q?=E5=88=92=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../maintain/PlanConfig--addContent.vue       | 461 ++++++++++++++++++
 .../specialEquipment/maintain/PlanConfig.vue  |  26 +-
 2 files changed, 482 insertions(+), 5 deletions(-)
 create mode 100644 src/views/specialEquipment/maintain/PlanConfig--addContent.vue

diff --git a/src/views/specialEquipment/maintain/PlanConfig--addContent.vue b/src/views/specialEquipment/maintain/PlanConfig--addContent.vue
new file mode 100644
index 00000000..5c8c9989
--- /dev/null
+++ b/src/views/specialEquipment/maintain/PlanConfig--addContent.vue
@@ -0,0 +1,461 @@
+<!-- 
+    filename: PlanConfig--addContent.vue
+    author: liubin
+    date: 2024-02-04 09:40:04
+    description: 
+-->
+
+<template>
+	<el-drawer
+		:visible="visible"
+		:show-close="false"
+		:wrapper-closable="false"
+		class="drawer"
+		custom-class="mes-drawer"
+		size="60%"
+		@closed="$emit('destroy')">
+		<SmallTitle slot="title">
+			{{
+				mode.includes('detail')
+					? '详情'
+					: mode.includes('edit')
+					? '编辑'
+					: '新增'
+			}}
+		</SmallTitle>
+
+		<div class="drawer-body flex">
+			<div class="drawer-body__content">
+				<section>
+					<SmallTitle>保养信息</SmallTitle>
+					<div class="form-part" style="margin-bottom: 32px">
+						<el-skeleton v-if="!showForm" animated />
+						<el-form
+							v-else
+							ref="form"
+							:model="form"
+							label-position="top"
+							v-loading="formLoading">
+							<el-row :gutter="20">
+								<el-col :span="8">
+									<el-form-item label="保养计划名称" prop="name">
+										<span>{{ form.name }}</span>
+									</el-form-item>
+								</el-col>
+
+								<el-col :span="8">
+									<el-form-item label="部门" prop="departmentName">
+										<span>{{ form.departmentName }}</span>
+									</el-form-item>
+								</el-col>
+
+								<el-col :span="8">
+									<el-form-item label="产线名" prop="lineName">
+										<span>{{ form.lineName }}</span>
+									</el-form-item>
+								</el-col>
+
+								<el-col :span="8">
+									<el-form-item label="保养频率" prop="maintenancePeriod">
+										<span>{{ form.maintenancePeriod }}</span>
+									</el-form-item>
+								</el-col>
+
+								<el-col :span="8">
+									<el-form-item label="保养时长" prop="maintainDuration">
+										<span>{{ form.maintainDuration }}</span>
+									</el-form-item>
+								</el-col>
+
+								<el-col :span="8">
+									<el-form-item label="计划保养人员" prop="maintainer">
+										<span>{{ form.maintainer }}</span>
+									</el-form-item>
+								</el-col>
+							</el-row>
+						</el-form>
+					</div>
+				</section>
+
+				<section>
+					<SmallTitle>保养详情</SmallTitle>
+					<div style="margin-top: 12px; position: relative">
+						<div
+							v-if="!mode.includes('detail')"
+							style="position: absolute; top: -40px; right: 0">
+							<el-button @click="handleAddDetail" type="text">
+								<i class="el-icon-plus"></i>
+								添加详情
+							</el-button>
+						</div>
+						<base-table
+							v-loading="detailLoading"
+							:table-props="detailTableProps"
+							:page="detailTableQuery.pageNo || 1"
+							:limit="detailTableQuery.pageSize || 10"
+							:table-data="detailList"
+							@emitFun="handleDetailTableAction">
+							<method-btn
+								slot="handleBtn"
+								label="操作"
+								width="100"
+								:method-list="detailTableBtns"
+								@clickBtn="handleDetailTableBtnClicked" />
+						</base-table>
+
+						<!-- 分页组件 -->
+						<pagination
+							v-show="detailTotal > 0"
+							:total="detailTotal"
+							:page.sync="detailTableQuery.pageNo"
+							:limit.sync="detailTableQuery.pageSize"
+							@pagination="refreshDetailList" />
+					</div>
+				</section>
+			</div>
+		</div>
+
+		<div class="drawer-body__footer">
+			<el-button style="" @click="cancel">取消</el-button>
+			<el-button v-if="mode == 'detail'" type="primary" @click="toggleEdit">
+				编辑
+			</el-button>
+			<el-button v-else type="primary" @click="confirm">保存</el-button>
+		</div>
+
+		<!-- 属性对话框 -->
+		<base-dialog
+			dialogTitle="保养详情"
+			:dialogVisible="detailAddVisible"
+			width="35%"
+			:append-to-body="true"
+			custom-class="baseDialog"
+			@close="closeDetailForm"
+			@cancel="closeDetailForm"
+			@confirm="submitDetailForm">
+			<DialogForm
+				v-if="detailAddVisible"
+				ref="detailForm"
+				v-model="detailForm"
+				:rows="detailRows" />
+		</base-dialog>
+	</el-drawer>
+</template>
+
+<script>
+import DialogForm from '@/components/DialogForm';
+
+const SmallTitle = {
+	name: 'SmallTitle',
+	props: ['size'],
+	components: {},
+	data() {
+		return {};
+	},
+	methods: {},
+	render: function (h) {
+		return h(
+			'span',
+			{
+				class: 'small-title',
+				style: {
+					fontSize: '18px',
+					lineHeight:
+						this.size == 'lg' ? '24px' : this.size == 'sm' ? '18px' : '20px',
+					fontWeight: 500,
+					fontFamily: '微软雅黑, Microsoft YaHei, Arial, Helvetica, sans-serif',
+				},
+			},
+			this.$slots.default
+		);
+	},
+};
+
+export default {
+	name: 'PlanConfig--addContent',
+	components: { SmallTitle, DialogForm },
+	props: ['maintainData'],
+	data() {
+		return {
+			visible: false,
+			mode: 'edit',
+			showForm: false,
+			form: {
+				departmentName: null,
+				id: null,
+				lineName: null,
+				maintainDuration: null,
+				maintainer: null,
+				maintenancePeriod: null,
+				name: null,
+			},
+			formLoading: false,
+			equipmentOptions: [],
+			detailList: [],
+			detailAddVisible: false,
+			detailPageProps: ['equipmentName', 'program'],
+			detailForm: {
+				planId: null,
+				equipmentId: null,
+				program: '',
+				maintenanceDes: '',
+				remark: '',
+			},
+			detailRows: [
+				[
+					{
+						select: true,
+						label: '设备',
+						prop: 'equipmentId',
+						options: [],
+						rules: [
+							{ required: true, message: '设备不能为空', trigger: 'blur' },
+						],
+					},
+				],
+				[
+					{
+						input: true,
+						label: '保养项目',
+						prop: 'program',
+						rules: [
+							{ required: true, message: '保养项目不能为空', trigger: 'blur' },
+						],
+					},
+				],
+				[
+					{
+						input: true,
+						label: '保养描述',
+						prop: 'maintenanceDes',
+						rules: [
+							{ required: true, message: '包养描述不能为空', trigger: 'blur' },
+						],
+					},
+				],
+			],
+			detailLoading: false,
+			detailTableProps: [
+				{ prop: 'equipmentName', label: '设备名称' },
+				{ prop: 'program', label: '保养项目' },
+				{ prop: 'remark', label: '备注' },
+			],
+			detailTableQuery: {
+				pageNo: 1,
+				pageSize: 10,
+			},
+			detailTableBtns: [
+				{
+					type: 'edit',
+					btnName: '编辑',
+				},
+				{
+					type: 'delete',
+					btnName: '删除',
+				},
+			],
+			detailTotal: 0,
+			detailList: [],
+			equipmentList: [],
+		};
+	},
+	computed: {},
+	mounted() {
+		this.loadEquipments();
+	},
+	methods: {
+		show({
+			departmentName,
+			id,
+			lineName,
+			maintainDuration,
+			maintainer,
+			maintenancePeriod,
+			name,
+		}) {
+			this.form = Object.assign(
+				{},
+				{
+					departmentName,
+					id,
+					lineName,
+					maintainDuration,
+					maintainer,
+					maintenancePeriod,
+					name,
+				}
+			);
+			this.$nextTick(() => {
+				this.refreshDetailList();
+			});
+			this.visible = true;
+			this.showForm = true;
+		},
+		cancel() {
+			this.visible = false;
+			setTimeout(() => {
+				this.$emit('closed');
+			}, 500);
+		},
+		confirm() {
+			this.cancel();
+		},
+		toggleEdit() {
+			this.mode == 'edit' ? 'detail' : 'edit';
+		},
+		async loadEquipments() {
+			// TODO: 很有可能此处要改成动态刷新/获取/加载设备列表，当总的特殊设备数量大于100的时候...
+			const res = await this.$axios('/base/core-equipment/page', {
+				params: {
+					pageNo: 1,
+					pageSize: 100,
+					special: true,
+				},
+			});
+			this.equipmentList = res.data?.list || [];
+			this.detailRows[0][0].options = (res.data?.list || []).map((item) => ({
+				label: item.name,
+				value: item.id,
+			}));
+		},
+		closeDetailForm() {
+			this.detailAddVisible = false;
+		},
+		async submitDetailForm() {
+			// validation
+			this.$refs.detailForm.validate(async (valid) => {
+				if (!valid) return;
+				const res = await this.$axios[this.detailForm.id ? 'put' : 'post'](
+					`/base/equipment-maintain-plan-det/${
+						this.detailForm.id ? 'update' : 'create'
+					}`,
+					{
+						...this.detailForm,
+						planId: this.form.id,
+					}
+				);
+				if (res.code == 0) {
+					this.detailAddVisible = false;
+					this.$message.success('添加成功');
+					this.refreshDetailList();
+				} else {
+					this.detailAddVisible = false;
+					this.$message.error('出错');
+				}
+			});
+		},
+		async refreshDetailList() {
+			this.detailLoading = true;
+			if (!this.form.id)
+				return this.$message.info('没有找到保养计划相关信息...');
+			const res = await this.$axios('/base/equipment-maintain-plan-det/page', {
+				params: {
+					pageNo: this.detailTableQuery.pageNo,
+					pageSize: this.detailTableQuery.pageSize,
+					planId: this.form.id,
+				},
+			});
+			this.detailList = res.data?.list || [];
+			this.detailTotal = res.data?.total || 0;
+			this.detailLoading = false;
+		},
+		//
+		handleDetailTableAction() {},
+		handleDetailTableBtnClicked({ data, type }) {
+			switch (type) {
+				case 'edit':
+					const { id, equipmentId, planId, program, maintenanceDes, remark } =
+						data;
+					this.detailAddVisible = true;
+					this.$nextTick(() => {
+						this.detailForm = Object.assign(
+							{},
+							{
+								id,
+								equipmentId,
+								planId,
+								program,
+								maintenanceDes,
+								remark,
+							}
+						);
+					});
+					break;
+				case 'delete':
+					if (!data.id) return;
+					this.$confirm('确认移除该详情吗？', '提示', {
+						confirmButtonText: '确 认',
+						cancelButtonText: '取 消',
+					})
+						.then(async () => {
+							const res = await this.$axios.delete(
+								'/base/equipment-maintain-plan-det/delete',
+								{
+									params: {
+										id: data.id,
+									},
+								}
+							);
+							if (res.code == 0) {
+								this.$message.success('删除成功!');
+								this.refreshDetailList();
+							}
+						})
+						.catch(console.error);
+					break;
+				case 'detail':
+					this.handleDetail(data);
+					break;
+				default:
+					this.handleTableActions({ data, type });
+			}
+		},
+		handleAddDetail() {
+			this.detailAddVisible = true;
+		},
+	},
+};
+</script>
+
+<style scoped>
+.drawer >>> .el-drawer {
+	border-radius: 8px 0 0 8px;
+}
+
+.drawer >>> .el-drawer__header {
+	margin: 0;
+	padding: 32px 32px 24px;
+	border-bottom: 1px solid #dcdfe6;
+	margin-bottom: 0px;
+}
+
+.small-title::before {
+	content: '';
+	display: inline-block;
+	vertical-align: top;
+	width: 4px;
+	height: 22px;
+	border-radius: 1px;
+	margin-right: 8px;
+	background-color: #0b58ff;
+}
+
+.drawer-body {
+	display: flex;
+	flex-direction: column;
+	height: calc(100% - 72px);
+}
+
+.drawer-body__content {
+	flex: 1;
+	/* background: #eee; */
+	padding: 20px 30px;
+	overflow-y: auto;
+}
+
+.drawer-body__footer {
+	display: flex;
+	justify-content: flex-end;
+	padding: 18px;
+}
+</style>
diff --git a/src/views/specialEquipment/maintain/PlanConfig.vue b/src/views/specialEquipment/maintain/PlanConfig.vue
index b8b77183..e2daefa0 100644
--- a/src/views/specialEquipment/maintain/PlanConfig.vue
+++ b/src/views/specialEquipment/maintain/PlanConfig.vue
@@ -44,8 +44,18 @@
 			@close="cancel"
 			@cancel="cancel"
 			@confirm="submitForm">
-			<DialogForm v-if="open" ref="form" :edit="form.id != null" v-model="form" :has-files="false" />
+			<DialogForm
+				v-if="open"
+				ref="form"
+				:edit="form.id != null"
+				v-model="form"
+				:has-files="false" />
 		</base-dialog>
+
+		<PlanConfigAddContent
+			v-if="addContentDrawerVisible"
+			ref="planConfigDetailDrawer"
+			@closed="addContentDrawerVisible = false" />
 	</div>
 </template>
 
@@ -55,10 +65,11 @@ import basicPageMixin from '@/mixins/lb/basicPageMixin';
 import { deleteEqMaintainPlan } from '@/api/equipment/base/maintain/record';
 import { publicFormatter } from '@/utils/dict';
 import PlanConfigAdd from './PlanConfig--add.vue';
+import PlanConfigAddContent from './PlanConfig--addContent.vue';
 
 export default {
 	name: 'SpecialEquipmentPlanConfig',
-	components: { DialogForm: PlanConfigAdd },
+	components: { DialogForm: PlanConfigAdd, PlanConfigAddContent },
 	mixins: [basicPageMixin],
 	data() {
 		const t = new Date();
@@ -305,6 +316,8 @@ export default {
 			// 表单参数
 			form: {},
 			basePath: '/base/equipment-maintain-plan',
+			addContentDrawerVisible: false,
+			maintainData: null,
 		};
 	},
 	created() {
@@ -357,11 +370,14 @@ export default {
 			};
 			this.resetForm('form');
 		},
-		handleTableActions({data, type}) {
-			switch(type) {
+		handleTableActions({ data, type }) {
+			switch (type) {
 				case 'addContent':
 					// 添加内容
-					alert('添加内容...')
+					this.addContentDrawerVisible = true;
+					this.$nextTick(() => {
+						this.$refs.planConfigDetailDrawer.show(data);
+					});
 					break;
 			}
 		},

From 71aab2df9a5d5324ae2d8f2de925a9349f736186 Mon Sep 17 00:00:00 2001
From: lb <liubin_9396@163.com>
Date: Sun, 4 Feb 2024 15:43:33 +0800
Subject: [PATCH 06/40] =?UTF-8?q?update=20=E4=BF=9D=E5=85=BB=E7=9B=91?=
 =?UTF-8?q?=E6=8E=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../maintain/Monitor--detail.vue              | 461 ++++++++++++++++++
 .../specialEquipment/maintain/Monitor.vue     | 235 +++++----
 .../maintain/PlanConfig--add.vue              |  12 +-
 3 files changed, 616 insertions(+), 92 deletions(-)
 create mode 100644 src/views/specialEquipment/maintain/Monitor--detail.vue

diff --git a/src/views/specialEquipment/maintain/Monitor--detail.vue b/src/views/specialEquipment/maintain/Monitor--detail.vue
new file mode 100644
index 00000000..704c6ba2
--- /dev/null
+++ b/src/views/specialEquipment/maintain/Monitor--detail.vue
@@ -0,0 +1,461 @@
+<!-- 
+    filename: PlanConfig--addContent.vue
+    author: liubin
+    date: 2024-02-04 09:40:04
+    description: 
+-->
+
+<template>
+	<el-drawer
+		:visible="visible"
+		:show-close="false"
+		:wrapper-closable="false"
+		class="drawer"
+		custom-class="mes-drawer"
+		size="60%"
+		@closed="$emit('destroy')">
+		<SmallTitle slot="title">
+			{{
+				mode.includes('detail')
+					? '详情'
+					: mode.includes('edit')
+					? '编辑'
+					: '新增'
+			}}
+		</SmallTitle>
+
+		<div class="drawer-body flex">
+			<div class="drawer-body__content">
+				<section>
+					<SmallTitle>保养信息</SmallTitle>
+					<div class="form-part" style="margin-bottom: 32px">
+						<el-skeleton v-if="!showForm" animated />
+						<el-form
+							v-else
+							ref="form"
+							:model="form"
+							label-position="top"
+							v-loading="formLoading">
+							<el-row :gutter="20">
+								<el-col :span="8">
+									<el-form-item label="保养计划名称" prop="name">
+										<span>{{ form.name }}</span>
+									</el-form-item>
+								</el-col>
+
+								<el-col :span="8">
+									<el-form-item label="部门" prop="departmentName">
+										<span>{{ form.departmentName }}</span>
+									</el-form-item>
+								</el-col>
+
+								<el-col :span="8">
+									<el-form-item label="产线名" prop="lineName">
+										<span>{{ form.lineName }}</span>
+									</el-form-item>
+								</el-col>
+
+								<el-col :span="8">
+									<el-form-item label="保养频率" prop="maintenancePeriod">
+										<span>{{ form.maintenancePeriod }}</span>
+									</el-form-item>
+								</el-col>
+
+								<el-col :span="8">
+									<el-form-item label="保养时长" prop="maintainDuration">
+										<span>{{ form.maintainDuration }}</span>
+									</el-form-item>
+								</el-col>
+
+								<el-col :span="8">
+									<el-form-item label="计划保养人员" prop="maintainer">
+										<span>{{ form.maintainer }}</span>
+									</el-form-item>
+								</el-col>
+							</el-row>
+						</el-form>
+					</div>
+				</section>
+
+				<section>
+					<SmallTitle>保养详情</SmallTitle>
+					<div style="margin-top: 12px; position: relative">
+						<!-- <div
+							v-if="!mode.includes('detail')"
+							style="position: absolute; top: -40px; right: 0">
+							<el-button @click="handleAddDetail" type="text">
+								<i class="el-icon-plus"></i>
+								添加详情
+							</el-button>
+						</div> -->
+						<base-table
+							v-loading="detailLoading"
+							:table-props="detailTableProps"
+							:page="detailTableQuery.pageNo || 1"
+							:limit="detailTableQuery.pageSize || 10"
+							:table-data="detailList"
+							@emitFun="handleDetailTableAction">
+							<!-- <method-btn
+								slot="handleBtn"
+								label="操作"
+								width="100"
+								:method-list="detailTableBtns"
+								@clickBtn="handleDetailTableBtnClicked" /> -->
+						</base-table>
+
+						<!-- 分页组件 -->
+						<pagination
+							v-show="detailTotal > 0"
+							:total="detailTotal"
+							:page.sync="detailTableQuery.pageNo"
+							:limit.sync="detailTableQuery.pageSize"
+							@pagination="refreshDetailList" />
+					</div>
+				</section>
+			</div>
+		</div>
+
+		<div class="drawer-body__footer">
+			<el-button style="" @click="cancel">取消</el-button>
+			<el-button v-if="mode == 'detail'" type="primary" @click="toggleEdit">
+				编辑
+			</el-button>
+			<el-button v-else type="primary" @click="confirm">保存</el-button>
+		</div>
+
+		<!-- 属性对话框 -->
+		<base-dialog
+			dialogTitle="保养详情"
+			:dialogVisible="detailAddVisible"
+			width="35%"
+			:append-to-body="true"
+			custom-class="baseDialog"
+			@close="closeDetailForm"
+			@cancel="closeDetailForm"
+			@confirm="submitDetailForm">
+			<DialogForm
+				v-if="detailAddVisible"
+				ref="detailForm"
+				v-model="detailForm"
+				:rows="detailRows" />
+		</base-dialog>
+	</el-drawer>
+</template>
+
+<script>
+import DialogForm from '@/components/DialogForm';
+
+const SmallTitle = {
+	name: 'SmallTitle',
+	props: ['size'],
+	components: {},
+	data() {
+		return {};
+	},
+	methods: {},
+	render: function (h) {
+		return h(
+			'span',
+			{
+				class: 'small-title',
+				style: {
+					fontSize: '18px',
+					lineHeight:
+						this.size == 'lg' ? '24px' : this.size == 'sm' ? '18px' : '20px',
+					fontWeight: 500,
+					fontFamily: '微软雅黑, Microsoft YaHei, Arial, Helvetica, sans-serif',
+				},
+			},
+			this.$slots.default
+		);
+	},
+};
+
+export default {
+	name: 'PlanConfig--addContent',
+	components: { SmallTitle, DialogForm },
+	props: ['maintainData'],
+	data() {
+		return {
+			visible: false,
+			mode: 'edit',
+			showForm: false,
+			form: {
+				departmentName: null,
+				id: null,
+				lineName: null,
+				maintainDuration: null,
+				maintainer: null,
+				maintenancePeriod: null,
+				name: null,
+			},
+			formLoading: false,
+			equipmentOptions: [],
+			detailList: [],
+			detailAddVisible: false,
+			detailPageProps: ['equipmentName', 'program'],
+			detailForm: {
+				planId: null,
+				equipmentId: null,
+				program: '',
+				maintenanceDes: '',
+				remark: '',
+			},
+			detailRows: [
+				[
+					{
+						select: true,
+						label: '设备',
+						prop: 'equipmentId',
+						options: [],
+						rules: [
+							{ required: true, message: '设备不能为空', trigger: 'blur' },
+						],
+					},
+				],
+				[
+					{
+						input: true,
+						label: '保养项目',
+						prop: 'program',
+						rules: [
+							{ required: true, message: '保养项目不能为空', trigger: 'blur' },
+						],
+					},
+				],
+				[
+					{
+						input: true,
+						label: '保养描述',
+						prop: 'maintenanceDes',
+						rules: [
+							{ required: true, message: '包养描述不能为空', trigger: 'blur' },
+						],
+					},
+				],
+			],
+			detailLoading: false,
+			detailTableProps: [
+				{ prop: 'equipmentName', label: '设备名称' },
+				{ prop: 'program', label: '保养项目' },
+				{ prop: 'remark', label: '备注' },
+			],
+			detailTableQuery: {
+				pageNo: 1,
+				pageSize: 10,
+			},
+			detailTableBtns: [
+				{
+					type: 'edit',
+					btnName: '编辑',
+				},
+				{
+					type: 'delete',
+					btnName: '删除',
+				},
+			],
+			detailTotal: 0,
+			detailList: [],
+			equipmentList: [],
+		};
+	},
+	computed: {},
+	mounted() {
+		this.loadEquipments();
+	},
+	methods: {
+		show({
+			departmentName,
+			id,
+			lineName,
+			maintainDuration,
+			maintainer,
+			maintenancePeriod,
+			name,
+		}) {
+			this.form = Object.assign(
+				{},
+				{
+					departmentName,
+					id,
+					lineName,
+					maintainDuration,
+					maintainer,
+					maintenancePeriod,
+					name,
+				}
+			);
+			this.$nextTick(() => {
+				this.refreshDetailList();
+			});
+			this.visible = true;
+			this.showForm = true;
+		},
+		cancel() {
+			this.visible = false;
+			setTimeout(() => {
+				this.$emit('closed');
+			}, 500);
+		},
+		confirm() {
+			this.cancel();
+		},
+		toggleEdit() {
+			this.mode == 'edit' ? 'detail' : 'edit';
+		},
+		async loadEquipments() {
+			// TODO: 很有可能此处要改成动态刷新/获取/加载设备列表，当总的特殊设备数量大于100的时候...
+			const res = await this.$axios('/base/core-equipment/page', {
+				params: {
+					pageNo: 1,
+					pageSize: 100,
+					special: true,
+				},
+			});
+			this.equipmentList = res.data?.list || [];
+			this.detailRows[0][0].options = (res.data?.list || []).map((item) => ({
+				label: item.name,
+				value: item.id,
+			}));
+		},
+		closeDetailForm() {
+			this.detailAddVisible = false;
+		},
+		async submitDetailForm() {
+			// validation
+			this.$refs.detailForm.validate(async (valid) => {
+				if (!valid) return;
+				const res = await this.$axios[this.detailForm.id ? 'put' : 'post'](
+					`/base/equipment-maintain-plan-det/${
+						this.detailForm.id ? 'update' : 'create'
+					}`,
+					{
+						...this.detailForm,
+						planId: this.form.id,
+					}
+				);
+				if (res.code == 0) {
+					this.detailAddVisible = false;
+					this.$message.success('添加成功');
+					this.refreshDetailList();
+				} else {
+					this.detailAddVisible = false;
+					this.$message.error('出错');
+				}
+			});
+		},
+		async refreshDetailList() {
+			this.detailLoading = true;
+			if (!this.form.id)
+				return this.$message.info('没有找到保养计划相关信息...');
+			const res = await this.$axios('/base/equipment-maintain-plan-det/page', {
+				params: {
+					pageNo: this.detailTableQuery.pageNo,
+					pageSize: this.detailTableQuery.pageSize,
+					planId: this.form.id,
+				},
+			});
+			this.detailList = res.data?.list || [];
+			this.detailTotal = res.data?.total || 0;
+			this.detailLoading = false;
+		},
+		//
+		handleDetailTableAction() {},
+		handleDetailTableBtnClicked({ data, type }) {
+			switch (type) {
+				case 'edit':
+					const { id, equipmentId, planId, program, maintenanceDes, remark } =
+						data;
+					this.detailAddVisible = true;
+					this.$nextTick(() => {
+						this.detailForm = Object.assign(
+							{},
+							{
+								id,
+								equipmentId,
+								planId,
+								program,
+								maintenanceDes,
+								remark,
+							}
+						);
+					});
+					break;
+				case 'delete':
+					if (!data.id) return;
+					this.$confirm('确认移除该详情吗？', '提示', {
+						confirmButtonText: '确 认',
+						cancelButtonText: '取 消',
+					})
+						.then(async () => {
+							const res = await this.$axios.delete(
+								'/base/equipment-maintain-plan-det/delete',
+								{
+									params: {
+										id: data.id,
+									},
+								}
+							);
+							if (res.code == 0) {
+								this.$message.success('删除成功!');
+								this.refreshDetailList();
+							}
+						})
+						.catch(console.error);
+					break;
+				case 'detail':
+					this.handleDetail(data);
+					break;
+				default:
+					this.handleTableActions({ data, type });
+			}
+		},
+		handleAddDetail() {
+			this.detailAddVisible = true;
+		},
+	},
+};
+</script>
+
+<style scoped>
+.drawer >>> .el-drawer {
+	border-radius: 8px 0 0 8px;
+}
+
+.drawer >>> .el-drawer__header {
+	margin: 0;
+	padding: 32px 32px 24px;
+	border-bottom: 1px solid #dcdfe6;
+	margin-bottom: 0px;
+}
+
+.small-title::before {
+	content: '';
+	display: inline-block;
+	vertical-align: top;
+	width: 4px;
+	height: 22px;
+	border-radius: 1px;
+	margin-right: 8px;
+	background-color: #0b58ff;
+}
+
+.drawer-body {
+	display: flex;
+	flex-direction: column;
+	height: calc(100% - 72px);
+}
+
+.drawer-body__content {
+	flex: 1;
+	/* background: #eee; */
+	padding: 20px 30px;
+	overflow-y: auto;
+}
+
+.drawer-body__footer {
+	display: flex;
+	justify-content: flex-end;
+	padding: 18px;
+}
+</style>
diff --git a/src/views/specialEquipment/maintain/Monitor.vue b/src/views/specialEquipment/maintain/Monitor.vue
index 2223ac45..64b79b93 100644
--- a/src/views/specialEquipment/maintain/Monitor.vue
+++ b/src/views/specialEquipment/maintain/Monitor.vue
@@ -52,6 +52,11 @@
 				:has-files="false"
 				:rows="rows" />
 		</base-dialog>
+
+		<MonitorDetail
+			v-if="monitorDetailVisible"
+			ref="monitorDetailDrawer"
+			@closed="monitorDetailVisible = false" />
 	</div>
 </template>
 
@@ -62,6 +67,8 @@ import basicPageMixin from '@/mixins/lb/basicPageMixin';
 import { exportMaintainMonitorExcel } from '@/api/equipment/base/maintain/record';
 import { parseTime } from '@/utils/ruoyi';
 
+import MonitorDetail from './Monitor--detail.vue';
+
 const remainBox = {
 	name: 'RemainBox',
 	props: ['injectData'],
@@ -120,22 +127,28 @@ const btn = {
 
 export default {
 	name: 'SpecialEquipmentMaintainMonitor',
-	components: {},
+	components: { MonitorDetail },
 	mixins: [basicPageMixin],
 	data() {
 		return {
-			searchBarKeys: ['planId', 'specialType', 'equipmentId'],
+			monitorDetailVisible: false,
+			searchBarKeys: ['planId'],
 			tableProps: [
-				// {
-				// 	prop: 'createTime',
-				// 	label: '添加时间',
-				// 	fixed: true,
-				// 	width: 180,
-				// 	filter: parseTime(createTime),
-				// },
+				{
+					prop: 'code',
+					label: '保养计划单号',
+					minWidth: 118,
+					showOverflowtooltip: true,
+				},
 				{
 					prop: 'name',
-					label: '保养计划',
+					label: '保养计划名称',
+					minWidth: 118,
+					showOverflowtooltip: true,
+				},
+				{
+					prop: 'departmentName',
+					label: '部门',
 					minWidth: 100,
 					showOverflowtooltip: true,
 				},
@@ -146,61 +159,101 @@ export default {
 					showOverflowtooltip: true,
 				},
 				{
-					prop: 'equipmentCategory',
-					label: '设备大类',
-					minWidth: 100,
+					prop: 'lastPlanMaintainTime',
+					label: '上次计划保养时间',
+					filter: parseTime,
+					minWidth: 158,
 					showOverflowtooltip: true,
-					filter: (val) =>
-						val != null ? ['-', '安全设备', '消防设备', '特种设备'][val] : '-',
-				},
-				{
-					prop: 'equipmentName',
-					label: '设备名称',
-					minWidth: 100,
-					showOverflowtooltip: true,
-				},
-				{ prop: 'maintenancePeriod', label: '保养频率' },
-				{
-					prop: 'maintainType',
-					label: '保养类型',
-					showOverflowtooltip: true,
-					filter: publicFormatter(this.DICT_TYPE.MAINTAIN_TYPE),
 				},
 				{
 					prop: 'lastMaintainTime',
-					label: '上次保养时间',
+					label: '上次实际保养时间',
 					filter: parseTime,
-					minWidth: 150,
+					minWidth: 158,
 					showOverflowtooltip: true,
 				},
 				{
-					prop: 'nextMaintainTime',
-					label: '计划下次保养时间',
+					prop: 'nextPlanMaintainTime',
+					label: '下次计划保养时间',
 					filter: parseTime,
-					minWidth: 150,
+					minWidth: 158,
 					showOverflowtooltip: true,
 				},
 				{
-					prop: 'remainDays',
-					label: '距离保养时间(天)',
-					subcomponent: remainBox,
-					minWidth: 150,
-					// showOverflowtooltip: true
-				},
-				{
-					prop: 'opt1',
-					label: '设备保养',
-					name: '操作',
-					subcomponent: btn,
-					width: 100,
+					prop: 'maintainer',
+					label: '计划保养人员',
+					minWidth: 158,
+					showOverflowtooltip: true,
 				},
 				{
 					prop: 'opt2',
-					label: '保养记录',
-					name: '查看详情',
+					label: '保养内容',
+					name: '详情',
 					subcomponent: btn,
 					width: 100,
 				},
+				{
+					prop: 'remainDays',
+					label: '距离下次保养剩余时间(天)',
+					subcomponent: remainBox,
+					minWidth: 210,
+				},
+				// {
+				// 	prop: 'createTime',
+				// 	label: '添加时间',
+				// 	fixed: true,
+				// 	width: 180,
+				// 	filter: parseTime(createTime),
+				// },
+				// {
+				// 	prop: 'equipmentCategory',
+				// 	label: '设备大类',
+				// 	minWidth: 100,
+				// 	showOverflowtooltip: true,
+				// 	filter: (val) =>
+				// 		val != null ? ['-', '安全设备', '消防设备', '特种设备'][val] : '-',
+				// },
+				// {
+				// 	prop: 'equipmentName',
+				// 	label: '设备名称',
+				// 	minWidth: 100,
+				// 	showOverflowtooltip: true,
+				// },
+				// { prop: 'maintenancePeriod', label: '保养频率' },
+				// {
+				// 	prop: 'maintainType',
+				// 	label: '保养类型',
+				// 	showOverflowtooltip: true,
+				// 	filter: publicFormatter(this.DICT_TYPE.MAINTAIN_TYPE),
+				// },
+				// {
+				// 	prop: 'lastMaintainTime',
+				// 	label: '上次保养时间',
+				// 	filter: parseTime,
+				// 	minWidth: 150,
+				// 	showOverflowtooltip: true,
+				// },
+				// {
+				// 	prop: 'remainDays',
+				// 	label: '距离保养时间(天)',
+				// 	subcomponent: remainBox,
+				// 	minWidth: 150,
+				// 	// showOverflowtooltip: true
+				// },
+				// {
+				// 	prop: 'opt1',
+				// 	label: '设备保养',
+				// 	name: '操作',
+				// 	subcomponent: btn,
+				// 	width: 100,
+				// },
+				// {
+				// 	prop: 'opt2',
+				// 	label: '保养记录',
+				// 	name: '查看详情',
+				// 	subcomponent: btn,
+				// 	width: 100,
+				// },
 			],
 			searchBarFormConfig: [
 				{
@@ -210,26 +263,26 @@ export default {
 					param: 'planId',
 					filterable: true,
 				},
-				{
-					type: 'select',
-					label: '设备大类',
-					placeholder: '请选择设备大类',
-					param: 'specialType',
-					onchange: true,
-					selectOptions: [
-						{ id: 1, name: '安全设备' },
-						{ id: 2, name: '消防设备' },
-						{ id: 3, name: '特种设备' },
-					],
-					filterable: true,
-				},
-				{
-					type: 'select',
-					label: '设备名',
-					placeholder: '请选择设备',
-					param: 'equipmentId',
-					filterable: true,
-				},
+				// {
+				// 	type: 'select',
+				// 	label: '设备大类',
+				// 	placeholder: '请选择设备大类',
+				// 	param: 'specialType',
+				// 	onchange: true,
+				// 	selectOptions: [
+				// 		{ id: 1, name: '安全设备' },
+				// 		{ id: 2, name: '消防设备' },
+				// 		{ id: 3, name: '特种设备' },
+				// 	],
+				// 	filterable: true,
+				// },
+				// {
+				// 	type: 'select',
+				// 	label: '设备名',
+				// 	placeholder: '请选择设备',
+				// 	param: 'equipmentId',
+				// 	filterable: true,
+				// },
 				{
 					type: 'button',
 					btnName: '查询',
@@ -255,10 +308,8 @@ export default {
 			queryParams: {
 				pageNo: 1,
 				pageSize: 10,
-				equipmentName: null,
-				createTime: null,
+				planId: null,
 				special: true,
-				specialType: null,
 			},
 			// 表单参数
 			form: {},
@@ -331,28 +382,34 @@ export default {
 			});
 		},
 		handleEmitFun({ action, value }) {
+			console.log('handleEmitFun .... ', action, value);
 			switch (action) {
-				// 查看详情
-				case '设备保养':
-					this.$router.push({
-						path: '/equipment/base/maintain/record',
-						query: {
-							addRecord: 1,
-							row: value,
-						},
-					});
-					break;
-				case '保养记录':
-					const queryData = {
-						equipmentId: value.equipmentId,
-						maintainPlanId: value.id,
-						relatePlan: value.lastMaintainTime ? 1 : 2,
-					};
-					this.$router.push({
-						path: '/equipment/base/maintain/record',
-						query: queryData,
+				case '保养内容':
+					this.monitorDetailVisible = true;
+					this.$nextTick(() => {
+						this.$refs.monitorDetailDrawer.show(value);
 					});
 					break;
+				// case '设备保养':
+				// 	this.$router.push({
+				// 		path: '/equipment/base/maintain/record',
+				// 		query: {
+				// 			addRecord: 1,
+				// 			row: value,
+				// 		},
+				// 	});
+				// 	break;
+				// case '保养记录':
+				// 	const queryData = {
+				// 		equipmentId: value.equipmentId,
+				// 		maintainPlanId: value.id,
+				// 		relatePlan: value.lastMaintainTime ? 1 : 2,
+				// 	};
+				// 	this.$router.push({
+				// 		path: '/equipment/base/maintain/record',
+				// 		query: queryData,
+				// 	});
+				// 	break;
 			}
 		},
 		/** 查询列表 */
diff --git a/src/views/specialEquipment/maintain/PlanConfig--add.vue b/src/views/specialEquipment/maintain/PlanConfig--add.vue
index 34f9f437..0d2e016d 100644
--- a/src/views/specialEquipment/maintain/PlanConfig--add.vue
+++ b/src/views/specialEquipment/maintain/PlanConfig--add.vue
@@ -199,7 +199,12 @@
 			</el-col>
 
 			<el-col :span="12">
-				<el-form-item label="首次保养时间" prop="firstMaintenanceTime">
+				<el-form-item
+					label="首次保养时间"
+					prop="firstMaintenanceTime"
+					:rules="[
+						{ required: true, message: '请选择首次保养时间', trigger: 'blur' },
+					]">
 					<el-date-picker
 						v-model="form.firstMaintenanceTime"
 						type="datetime"
@@ -297,14 +302,15 @@ export default {
 			],
 			lineList: [],
 			maintainerList: [],
-			departmentList: []
+			departmentList: [],
 		};
 	},
 	watch: {
 		dataForm: {
 			handler(val) {
 				this.form = JSON.parse(JSON.stringify(val));
-				if (typeof val.maintainer == 'string') this.form.maintainer = val.maintainer.split(',')
+				if (typeof val.maintainer == 'string')
+					this.form.maintainer = val.maintainer.split(',');
 				if (this.form.equipmentCategory != null) {
 					setTimeout(() => {
 						this.equipmentOptions = this.equipmentList

From d0a4dc527f778046fe6d90997668399094efd536 Mon Sep 17 00:00:00 2001
From: lb <liubin_9396@163.com>
Date: Sun, 4 Feb 2024 16:30:14 +0800
Subject: [PATCH 07/40] =?UTF-8?q?update=20=E4=BF=9D=E5=85=BB=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/mixins/lb/basicPageMixin.js               |   2 +-
 .../maintain/Record--detail.vue               | 421 ++++++++++++++++++
 .../specialEquipment/maintain/Record.vue      | 377 ++++++++++------
 3 files changed, 663 insertions(+), 137 deletions(-)
 create mode 100644 src/views/specialEquipment/maintain/Record--detail.vue

diff --git a/src/mixins/lb/basicPageMixin.js b/src/mixins/lb/basicPageMixin.js
index ca1ed6e6..cfe12de6 100644
--- a/src/mixins/lb/basicPageMixin.js
+++ b/src/mixins/lb/basicPageMixin.js
@@ -138,7 +138,7 @@ export default {
 			}
 		},
 		handleEmitFun(val) {
-			console.log('emit unf', val);
+			console.log('[basicPageMixin handleEmitFun]', val);
 			switch (val.action) {
 				// 查看详情
 				case 'show-detail':
diff --git a/src/views/specialEquipment/maintain/Record--detail.vue b/src/views/specialEquipment/maintain/Record--detail.vue
new file mode 100644
index 00000000..ebfff0f8
--- /dev/null
+++ b/src/views/specialEquipment/maintain/Record--detail.vue
@@ -0,0 +1,421 @@
+<!-- 
+    filename: PlanConfig--addContent.vue
+    author: liubin
+    date: 2024-02-04 09:40:04
+    description: 
+-->
+
+<template>
+	<el-drawer
+		:visible="visible"
+		:show-close="false"
+		:wrapper-closable="false"
+		class="drawer"
+		custom-class="mes-drawer"
+		size="60%"
+		@closed="$emit('destroy')">
+		<SmallTitle slot="title">
+			{{
+				mode.includes('detail')
+					? '详情'
+					: mode.includes('edit')
+					? '编辑'
+					: '新增'
+			}}
+		</SmallTitle>
+
+		<div class="drawer-body flex">
+			<div class="drawer-body__content">
+				<section>
+					<SmallTitle>保养信息</SmallTitle>
+					<div class="form-part" style="margin-bottom: 32px">
+						<el-skeleton v-if="!showForm" animated />
+						<el-form
+							v-else
+							ref="form"
+							:model="form"
+							label-position="top"
+							v-loading="formLoading">
+							<el-row :gutter="20">
+								<el-col :span="12">
+									<el-form-item label="计划保养人员" prop="planMaintainWorker">
+										<span>{{ form.planMaintainWorker }}</span>
+									</el-form-item>
+								</el-col>
+
+								<el-col :span="12">
+									<el-form-item label="实际保养人员" prop="maintainWorker">
+										<span>{{ form.maintainWorker }}</span>
+									</el-form-item>
+								</el-col>
+							</el-row>
+						</el-form>
+					</div>
+				</section>
+
+				<section>
+					<SmallTitle>保养详情</SmallTitle>
+					<div style="margin-top: 12px; position: relative">
+						<!-- <div
+							v-if="!mode.includes('detail')"
+							style="position: absolute; top: -40px; right: 0">
+							<el-button @click="handleAddDetail" type="text">
+								<i class="el-icon-plus"></i>
+								添加详情
+							</el-button>
+						</div> -->
+						<base-table
+							v-loading="detailLoading"
+							:table-props="detailTableProps"
+							:page="detailTableQuery.pageNo || 1"
+							:limit="detailTableQuery.pageSize || 10"
+							:table-data="detailList"
+							@emitFun="handleDetailTableAction">
+							<!-- <method-btn
+								slot="handleBtn"
+								label="操作"
+								width="100"
+								:method-list="detailTableBtns"
+								@clickBtn="handleDetailTableBtnClicked" /> -->
+						</base-table>
+
+						<!-- 分页组件 -->
+						<pagination
+							v-show="detailTotal > 0"
+							:total="detailTotal"
+							:page.sync="detailTableQuery.pageNo"
+							:limit.sync="detailTableQuery.pageSize"
+							@pagination="refreshDetailList" />
+					</div>
+				</section>
+			</div>
+		</div>
+
+		<div class="drawer-body__footer">
+			<el-button style="" @click="cancel">取消</el-button>
+			<el-button v-if="mode == 'detail'" type="primary" @click="toggleEdit">
+				编辑
+			</el-button>
+			<el-button v-else type="primary" @click="confirm">保存</el-button>
+		</div>
+
+		<!-- 属性对话框 -->
+		<base-dialog
+			dialogTitle="保养详情"
+			:dialogVisible="detailAddVisible"
+			width="35%"
+			:append-to-body="true"
+			custom-class="baseDialog"
+			@close="closeDetailForm"
+			@cancel="closeDetailForm"
+			@confirm="submitDetailForm">
+			<DialogForm
+				v-if="detailAddVisible"
+				ref="detailForm"
+				v-model="detailForm"
+				:rows="detailRows" />
+		</base-dialog>
+	</el-drawer>
+</template>
+
+<script>
+import DialogForm from '@/components/DialogForm';
+
+const SmallTitle = {
+	name: 'SmallTitle',
+	props: ['size'],
+	components: {},
+	data() {
+		return {};
+	},
+	methods: {},
+	render: function (h) {
+		return h(
+			'span',
+			{
+				class: 'small-title',
+				style: {
+					fontSize: '18px',
+					lineHeight:
+						this.size == 'lg' ? '24px' : this.size == 'sm' ? '18px' : '20px',
+					fontWeight: 500,
+					fontFamily: '微软雅黑, Microsoft YaHei, Arial, Helvetica, sans-serif',
+				},
+			},
+			this.$slots.default
+		);
+	},
+};
+
+export default {
+	name: 'PlanConfig--addContent',
+	components: { SmallTitle, DialogForm },
+	props: ['maintainData'],
+	data() {
+		return {
+			visible: false,
+			mode: 'edit',
+			showForm: false,
+			form: {
+				id: null,
+				maintainWorker: null,
+				planMaintainWorker: null,
+			},
+			formLoading: false,
+			equipmentOptions: [],
+			detailList: [],
+			detailAddVisible: false,
+			detailPageProps: ['equipmentName', 'program'],
+			detailForm: {
+				planId: null,
+				equipmentId: null,
+				program: '',
+				maintenanceDes: '',
+				remark: '',
+			},
+			detailRows: [
+				[
+					{
+						select: true,
+						label: '设备',
+						prop: 'equipmentId',
+						options: [],
+						rules: [
+							{ required: true, message: '设备不能为空', trigger: 'blur' },
+						],
+					},
+				],
+				[
+					{
+						input: true,
+						label: '保养项目',
+						prop: 'program',
+						rules: [
+							{ required: true, message: '保养项目不能为空', trigger: 'blur' },
+						],
+					},
+				],
+				[
+					{
+						input: true,
+						label: '保养描述',
+						prop: 'maintenanceDes',
+						rules: [
+							{ required: true, message: '包养描述不能为空', trigger: 'blur' },
+						],
+					},
+				],
+			],
+			detailLoading: false,
+			detailTableProps: [
+				{ prop: 'equipmentName', label: '设备名称' },
+				{ prop: 'program', label: '保养项目' },
+				{ prop: 'remark', label: '备注' },
+			],
+			detailTableQuery: {
+				pageNo: 1,
+				pageSize: 10,
+			},
+			detailTableBtns: [
+				{
+					type: 'edit',
+					btnName: '编辑',
+				},
+				{
+					type: 'delete',
+					btnName: '删除',
+				},
+			],
+			detailTotal: 0,
+			detailList: [],
+			equipmentList: [],
+		};
+	},
+	computed: {},
+	mounted() {
+		this.loadEquipments();
+	},
+	methods: {
+		show({ planMaintainWorker, id, maintainWorker }) {
+			this.form = Object.assign(
+				{},
+				{
+					planMaintainWorker,
+					id,
+					maintainWorker,
+				}
+			);
+			this.$nextTick(() => {
+				this.refreshDetailList();
+			});
+			this.visible = true;
+			this.showForm = true;
+		},
+		cancel() {
+			this.visible = false;
+			setTimeout(() => {
+				this.$emit('closed');
+			}, 500);
+		},
+		confirm() {
+			this.cancel();
+		},
+		toggleEdit() {
+			this.mode == 'edit' ? 'detail' : 'edit';
+		},
+		async loadEquipments() {
+			// TODO: 很有可能此处要改成动态刷新/获取/加载设备列表，当总的特殊设备数量大于100的时候...
+			const res = await this.$axios('/base/core-equipment/page', {
+				params: {
+					pageNo: 1,
+					pageSize: 100,
+					special: true,
+				},
+			});
+			this.equipmentList = res.data?.list || [];
+			this.detailRows[0][0].options = (res.data?.list || []).map((item) => ({
+				label: item.name,
+				value: item.id,
+			}));
+		},
+		closeDetailForm() {
+			this.detailAddVisible = false;
+		},
+		async submitDetailForm() {
+			// validation
+			this.$refs.detailForm.validate(async (valid) => {
+				if (!valid) return;
+				const res = await this.$axios[this.detailForm.id ? 'put' : 'post'](
+					`/base/equipment-maintain-plan-det/${
+						this.detailForm.id ? 'update' : 'create'
+					}`,
+					{
+						...this.detailForm,
+						planId: this.form.id,
+					}
+				);
+				if (res.code == 0) {
+					this.detailAddVisible = false;
+					this.$message.success('添加成功');
+					this.refreshDetailList();
+				} else {
+					this.detailAddVisible = false;
+					this.$message.error('出错');
+				}
+			});
+		},
+		async refreshDetailList() {
+			this.detailLoading = true;
+			if (!this.form.id)
+				return this.$message.info('没有找到保养计划相关信息...');
+			const res = await this.$axios('/base/equipment-maintain-plan-det/page', {
+				params: {
+					pageNo: this.detailTableQuery.pageNo,
+					pageSize: this.detailTableQuery.pageSize,
+					planId: this.form.id,
+				},
+			});
+			this.detailList = res.data?.list || [];
+			this.detailTotal = res.data?.total || 0;
+			this.detailLoading = false;
+		},
+		//
+		handleDetailTableAction() {},
+		handleDetailTableBtnClicked({ data, type }) {
+			switch (type) {
+				case 'edit':
+					const { id, equipmentId, planId, program, maintenanceDes, remark } =
+						data;
+					this.detailAddVisible = true;
+					this.$nextTick(() => {
+						this.detailForm = Object.assign(
+							{},
+							{
+								id,
+								equipmentId,
+								planId,
+								program,
+								maintenanceDes,
+								remark,
+							}
+						);
+					});
+					break;
+				case 'delete':
+					if (!data.id) return;
+					this.$confirm('确认移除该详情吗？', '提示', {
+						confirmButtonText: '确 认',
+						cancelButtonText: '取 消',
+					})
+						.then(async () => {
+							const res = await this.$axios.delete(
+								'/base/equipment-maintain-plan-det/delete',
+								{
+									params: {
+										id: data.id,
+									},
+								}
+							);
+							if (res.code == 0) {
+								this.$message.success('删除成功!');
+								this.refreshDetailList();
+							}
+						})
+						.catch(console.error);
+					break;
+				case 'detail':
+					this.handleDetail(data);
+					break;
+				default:
+					this.handleTableActions({ data, type });
+			}
+		},
+		handleAddDetail() {
+			this.detailAddVisible = true;
+		},
+	},
+};
+</script>
+
+<style scoped>
+.drawer >>> .el-drawer {
+	border-radius: 8px 0 0 8px;
+}
+
+.drawer >>> .el-drawer__header {
+	margin: 0;
+	padding: 32px 32px 24px;
+	border-bottom: 1px solid #dcdfe6;
+	margin-bottom: 0px;
+}
+
+.small-title::before {
+	content: '';
+	display: inline-block;
+	vertical-align: top;
+	width: 4px;
+	height: 22px;
+	border-radius: 1px;
+	margin-right: 8px;
+	background-color: #0b58ff;
+}
+
+.drawer-body {
+	display: flex;
+	flex-direction: column;
+	height: calc(100% - 72px);
+}
+
+.drawer-body__content {
+	flex: 1;
+	/* background: #eee; */
+	padding: 20px 30px;
+	overflow-y: auto;
+}
+
+.drawer-body__footer {
+	display: flex;
+	justify-content: flex-end;
+	padding: 18px;
+}
+</style>
diff --git a/src/views/specialEquipment/maintain/Record.vue b/src/views/specialEquipment/maintain/Record.vue
index be4d1309..19dff47f 100644
--- a/src/views/specialEquipment/maintain/Record.vue
+++ b/src/views/specialEquipment/maintain/Record.vue
@@ -11,7 +11,6 @@
 		<SearchBar
 			:formConfigs="searchBarFormConfig"
 			ref="search-bar"
-			:is-fold="true"
 			@select-changed="handleSearchBarChange"
 			@headBtnClick="handleSearchBarBtnClick" />
 
@@ -22,13 +21,13 @@
 			:limit="queryParams.pageSize"
 			:table-data="list"
 			@emitFun="handleEmitFun">
-			<method-btn
+			<!-- <method-btn
 				v-if="tableBtn.length"
 				slot="handleBtn"
 				label="操作"
 				:width="120"
 				:method-list="tableBtn"
-				@clickBtn="handleTableBtnClick" />
+				@clickBtn="handleTableBtnClick" /> -->
 		</base-table>
 
 		<!-- 分页组件 -->
@@ -60,6 +59,11 @@
 				</el-col>
 			</el-row>
 		</base-dialog>
+
+		<RecordDetail
+			v-if="recordDetailVisible"
+			ref="recordDetailDrawer"
+			@closed="recordDetailVisible = false" />
 	</div>
 </template>
 
@@ -72,21 +76,47 @@ import {
 	deleteEqMaintainLog,
 	exportMaintainLogExcel,
 } from '@/api/equipment/base/maintain/record';
+import RecordDetail from './Record--detail.vue';
 
 const timeFilter = (val) => moment(val).format('yyyy-MM-DD HH:mm:ss');
 
+const btn = {
+	name: 'tableBtn',
+	props: ['injectData'],
+	data() {
+		return {};
+	},
+	methods: {
+		handleClick() {
+			this.$emit('emitData', {
+				action: this.injectData.label,
+				value: this.injectData,
+			});
+		},
+	},
+	render: function (h) {
+		return (
+			<el-button type="text" onClick={this.handleClick}>
+				{this.injectData.name}
+			</el-button>
+		);
+	},
+};
+
 export default {
 	name: 'SpecialEquipmentMaintainRecord',
-	components: { DialogForm },
+	components: { DialogForm, RecordDetail },
 	mixins: [basicPageMixin],
 	data() {
 		return {
+			recordDetailVisible: false,
 			searchBarKeys: [
 				'maintainPlanId',
 				'startTime',
-				'relatePlan',
-				'equipmentId',
-				'specialType',
+				'special',
+				// 'relatePlan',
+				// 'equipmentId',
+				// 'specialType',
 			],
 			tableBtn: [
 				this.$auth.hasPermi('equipment:maintain-record:update')
@@ -122,99 +152,146 @@ export default {
 					width: 110,
 					showOverflowtooltip: true,
 				},
+				{
+					prop: 'planName',
+					label: '保养计划名称',
+					width: 110,
+					showOverflowtooltip: true,
+				},
+				{
+					prop: 'departmentName',
+					label: '部门',
+					width: 110,
+					showOverflowtooltip: true,
+				},
+				{
+					prop: 'lineName',
+					label: '产线名',
+					width: 110,
+					showOverflowtooltip: true,
+				},
+				{
+					prop: 'planStartTime',
+					label: '计划开始时间',
+					filter: timeFilter,
+					minWidth: 150,
+					showOverflowtooltip: true,
+				},
+				{
+					prop: 'planEndTime',
+					label: '计划结束时间',
+					filter: timeFilter,
+					minWidth: 150,
+					showOverflowtooltip: true,
+				},
 				{
 					prop: 'startTime',
-					label: '开始时间',
+					label: '实际开始时间',
 					filter: timeFilter,
 					minWidth: 150,
 					showOverflowtooltip: true,
 				},
 				{
 					prop: 'endTime',
-					label: '结束时间',
+					label: '实际结束时间',
 					filter: timeFilter,
 					minWidth: 150,
 					showOverflowtooltip: true,
 				},
 				{
-					prop: 'equipmentCategory',
-					label: '设备大类',
+					prop: 'relatePlan',
+					label: '保养计划类型',
 					minWidth: 100,
 					showOverflowtooltip: true,
 					filter: (val) =>
-						val != null ? ['-', '安全设备', '消防设备', '特种设备'][val] : '-',
+						val != null ? ['-', '计划型', '非计划型'][val] : '-',
 				},
 				{
-					prop: 'equipmentName',
-					label: '设备名称',
-					minWidth: 100,
-					showOverflowtooltip: true,
-				},
-				{
-					prop: 'maintainWorker',
-					label: '保养人员',
-					minWidth: 100,
-					showOverflowtooltip: true,
-				},
-				{
-					prop: 'relatePlan',
-					label: '是否计划保养',
-					width: 120,
-					filter: (v) => (v != null ? ['', '是', '否'][v] : ''),
-				},
-				{
-					prop: 'planName',
-					label: '保养计划名称',
-					minWidth: 120,
-					showOverflowtooltip: true,
-				},
-				{
-					prop: 'maintainDuration',
-					label: '计划保养用时(h)',
-					minWidth: 130,
-					showOverflowtooltip: true,
-				},
-				{ prop: 'timeUsed', label: '实际保养用时(h)', minWidth: 130 },
-				{
-					prop: 'remark',
-					label: '备注',
-					minWidth: 100,
-					showOverflowtooltip: true,
+					prop: '_detail',
+					label: '详情',
+					name: '详情',
+					minWidth: 60,
+					subcomponent: btn,
 				},
+				// {
+				// 	prop: 'equipmentCategory',
+				// 	label: '设备大类',
+				// 	minWidth: 100,
+				// 	showOverflowtooltip: true,
+				// 	filter: (val) =>
+				// 		val != null ? ['-', '安全设备', '消防设备', '特种设备'][val] : '-',
+				// },
+				// {
+				// 	prop: 'equipmentName',
+				// 	label: '设备名称',
+				// 	minWidth: 100,
+				// 	showOverflowtooltip: true,
+				// },
+				// {
+				// 	prop: 'maintainWorker',
+				// 	label: '保养人员',
+				// 	minWidth: 100,
+				// 	showOverflowtooltip: true,
+				// },
+				// {
+				// 	prop: 'relatePlan',
+				// 	label: '是否计划保养',
+				// 	width: 120,
+				// 	filter: (v) => (v != null ? ['', '是', '否'][v] : ''),
+				// },
+				// {
+				// 	prop: 'planName',
+				// 	label: '保养计划名称',
+				// 	minWidth: 120,
+				// 	showOverflowtooltip: true,
+				// },
+				// {
+				// 	prop: 'maintainDuration',
+				// 	label: '计划保养用时(h)',
+				// 	minWidth: 130,
+				// 	showOverflowtooltip: true,
+				// },
+				// { prop: 'timeUsed', label: '实际保养用时(h)', minWidth: 130 },
+				// {
+				// 	prop: 'remark',
+				// 	label: '备注',
+				// 	minWidth: 100,
+				// 	showOverflowtooltip: true,
+				// },
 			],
 			searchBarFormConfig: [
+				// {
+				// 	type: 'select',
+				// 	label: '设备大类',
+				// 	placeholder: '请选择设备大类',
+				// 	param: 'specialType',
+				// 	onchange: true,
+				// 	selectOptions: [
+				// 		{ id: 1, name: '安全设备' },
+				// 		{ id: 2, name: '消防设备' },
+				// 		{ id: 3, name: '特种设备' },
+				// 	],
+				// 	filterable: true,
+				// 	defaultSelect: null
+				// },
+				// {
+				// 	type: 'select',
+				// 	label: '设备',
+				// 	placeholder: '请选择设备',
+				// 	param: 'equipmentId',
+				// 	defaultSelect: null
+				// },
 				{
 					type: 'select',
-					label: '设备大类',
-					placeholder: '请选择设备大类',
-					param: 'specialType',
-					onchange: true,
-					selectOptions: [
-						{ id: 1, name: '安全设备' },
-						{ id: 2, name: '消防设备' },
-						{ id: 3, name: '特种设备' },
-					],
-					filterable: true,
-					defaultSelect: null
-				},
-				{
-					type: 'select',
-					label: '设备',
-					placeholder: '请选择设备',
-					param: 'equipmentId',
-					defaultSelect: null
-				},
-				{
-					type: 'select',
-					label: '计划名称',
-					placeholder: '请选择计划名称',
+					label: '保养计划名称',
+					placeholder: '请选择保养计划名称',
 					param: 'maintainPlanId',
-					defaultSelect: null
+					defaultSelect: null,
 				},
 				// 开始结束时间
 				{
 					type: 'datePicker',
-					label: '保养开始时间',
+					label: '实际开始时间',
 					dateType: 'daterange', // datetimerange
 					format: 'yyyy-MM-dd',
 					valueFormat: 'yyyy-MM-dd HH:mm:ss',
@@ -223,19 +300,19 @@ export default {
 					endPlaceholder: '结束日期',
 					defaultTime: ['00:00:00', '23:59:59'],
 					param: 'startTime',
-					defaultSelect: null
+					defaultSelect: null,
 					// width: 350,
 				},
-				{
-					type: 'select',
-					label: '是否计划保养',
-					selectOptions: [
-						{ name: '是', id: 1 },
-						{ name: '否', id: 2 },
-					],
-					defaultSelect: null,
-					param: 'relatePlan',
-				},
+				// {
+				// 	type: 'select',
+				// 	label: '是否计划保养',
+				// 	selectOptions: [
+				// 		{ name: '是', id: 1 },
+				// 		{ name: '否', id: 2 },
+				// 	],
+				// 	defaultSelect: null,
+				// 	param: 'relatePlan',
+				// },
 				{
 					type: 'button',
 					btnName: '查询',
@@ -254,15 +331,15 @@ export default {
 					plain: true,
 					color: 'primary',
 				},
-				{
-					type: this.$auth.hasPermi('equipment:maintain-record:create')
-						? 'button'
-						: '',
-					btnName: '新增',
-					name: 'add',
-					plain: true,
-					color: 'success',
-				},
+				// {
+				// 	type: this.$auth.hasPermi('equipment:maintain-record:create')
+				// 		? 'button'
+				// 		: '',
+				// 	btnName: '新增',
+				// 	name: 'add',
+				// 	plain: true,
+				// 	color: 'success',
+				// },
 			],
 			rows: [
 				[
@@ -422,12 +499,11 @@ export default {
 				pageNo: 1,
 				pageSize: 10,
 				maintainPlanId: null,
-				maintainPlanId: null,
 				startTime: null,
-				relatePlan: null,
-				equipmentId: null,
+				// relatePlan: null,
+				// equipmentId: null,
 				special: true,
-				specialType: null,
+				// specialType: null,
 			},
 			// 表单参数
 			form: {},
@@ -438,32 +514,47 @@ export default {
 	},
 	created() {
 		this.initSearchBar();
-		if (this.$route.query) {
-			this.queryParams.specialType =
-				this.$route.query?.specialType ?? undefined;
-			this.queryParams.equipmentId =
-				this.$route.query?.equipmentId ?? undefined;
-			this.queryParams.maintainPlanId =
-				this.$route.query?.maintainPlanId ?? undefined;
-			this.queryParams.relatePlan = this.$route.query?.relatePlan ?? undefined;
-			this.queryParams.startTime = this.$route.query?.createTime ?? undefined;
-			this.searchBarFormConfig[0].defaultSelect =
-				this.$route.query.specialType ?? undefined;
-			this.searchBarFormConfig[1].defaultSelect =
-				this.$route.query.equipmentId ?? undefined;
-			this.searchBarFormConfig[2].defaultSelect =
-				this.$route.query.maintainPlanId ?? undefined;
-			this.searchBarFormConfig[3].defaultSelect =
-				this.$route.query?.createTime ?? undefined;
-			this.searchBarFormConfig[4].defaultSelect =
-				Number(this.$route.query.relatePlan) ?? undefined;
-		}
+		// if (this.$route.query) {
+		// 	this.queryParams.specialType =
+		// 		this.$route.query?.specialType ?? undefined;
+		// 	this.queryParams.equipmentId =
+		// 		this.$route.query?.equipmentId ?? undefined;
+		// 	this.queryParams.maintainPlanId =
+		// 		this.$route.query?.maintainPlanId ?? undefined;
+		// 	this.queryParams.relatePlan = this.$route.query?.relatePlan ?? undefined;
+		// 	this.queryParams.startTime = this.$route.query?.createTime ?? undefined;
+		// 	this.searchBarFormConfig[0].defaultSelect =
+		// 		this.$route.query.specialType ?? undefined;
+		// 	this.searchBarFormConfig[1].defaultSelect =
+		// 		this.$route.query.equipmentId ?? undefined;
+		// 	this.searchBarFormConfig[2].defaultSelect =
+		// 		this.$route.query.maintainPlanId ?? undefined;
+		// 	this.searchBarFormConfig[3].defaultSelect =
+		// 		this.$route.query?.createTime ?? undefined;
+		// 	this.searchBarFormConfig[4].defaultSelect =
+		// 		Number(this.$route.query.relatePlan) ?? undefined;
+		// }
 		this.getList();
-		if (this.$route.query.addRecord) {
-			this.handleAdd();
-		}
+		// if (this.$route.query.addRecord) {
+		// 	this.handleAdd();
+		// }
 	},
 	methods: {
+		handleEmitFun({ action, value }) {
+			switch (action) {
+				case '详情':
+					this.recordDetailVisible = true;
+					this.$nextTick(() => {
+						this.$refs.recordDetailDrawer.show({
+							id: value.id,
+							planMaintainWorker: value.planMaintainWorker,
+							maintainWorker: value.maintainWorker,
+						});
+					});
+					break;
+			}
+		},
+
 		handleSearchBarChange({ param, value }) {
 			if ('specialType' === param) {
 				if (!value) {
@@ -475,28 +566,29 @@ export default {
 				);
 			}
 		},
-		setSearchBarEquipmentList(eqList) {
-			this.$set(
-				this.searchBarFormConfig[1],
-				'selectOptions',
-				eqList.map((item) => ({
-					name: item.name,
-					id: item.id,
-				}))
-			);
-		},
+		// setSearchBarEquipmentList(eqList) {
+		// 	this.$set(
+		// 		this.searchBarFormConfig[1],
+		// 		'selectOptions',
+		// 		eqList.map((item) => ({
+		// 			name: item.name,
+		// 			id: item.id,
+		// 		}))
+		// 	);
+		// },
 		initSearchBar() {
-			this.http('/base/core-equipment/listAll', 'get').then(({ data }) => {
-				this.allSpecialEquipments = data.filter((item) => item.special);
-				this.setSearchBarEquipmentList(data.filter((item) => item.special));
-			});
+			// this.http('/base/core-equipment/listAll', 'get').then(({ data }) => {
+			// 	this.allSpecialEquipments = data.filter((item) => item.special);
+			// 	this.setSearchBarEquipmentList(data.filter((item) => item.special));
+			// });
 			this.http('/base/equipment-maintain-plan/page', 'get', {
 				pageNo: 1,
 				pageSize: 100,
 				special: true,
 			}).then(({ data }) => {
 				this.$set(
-					this.searchBarFormConfig[2],
+					this.searchBarFormConfig[0],
+					// this.searchBarFormConfig[2],
 					'selectOptions',
 					(data?.list || []).map((item) => ({
 						name: item.name,
@@ -509,8 +601,21 @@ export default {
 		getList() {
 			this.loading = true;
 			// 执行查询
-			this.recv(this.queryParams).then((response) => {
-				this.list = response.data.list;
+			this.recv({ ...this.queryParams, special: true }).then((response) => {
+				this.list = [
+					{
+						id: 213,
+						maintainOrderNumber: 123,
+						planName: 'hhh',
+						departmentName: 'asdf',
+						lineName: 456,
+						planStartTime: '2024-01-01',
+						planEndTime: '2024-01-01',
+						startTime: '2024-01-01',
+						endTime: '2024-01-01',
+						relatePlan: 1,
+					},
+				]; // response.data.list;
 				this.total = response.data.total;
 				this.loading = false;
 			});

From 372749e3131dc3c84ca68ba96d0fab13df012bc6 Mon Sep 17 00:00:00 2001
From: lb <liubin_9396@163.com>
Date: Sun, 4 Feb 2024 17:00:12 +0800
Subject: [PATCH 08/40] =?UTF-8?q?update=20=E8=AE=BE=E5=A4=87=E7=BB=B4?=
 =?UTF-8?q?=E4=BF=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../maintain/Monitor--detail.vue              |   8 +-
 .../maintain/Record--detail.vue               |   8 +-
 .../specialEquipment/maintain/Repair.vue      | 109 +++++++++++-------
 3 files changed, 77 insertions(+), 48 deletions(-)

diff --git a/src/views/specialEquipment/maintain/Monitor--detail.vue b/src/views/specialEquipment/maintain/Monitor--detail.vue
index 704c6ba2..cfbedc87 100644
--- a/src/views/specialEquipment/maintain/Monitor--detail.vue
+++ b/src/views/specialEquipment/maintain/Monitor--detail.vue
@@ -116,11 +116,11 @@
 		</div>
 
 		<div class="drawer-body__footer">
-			<el-button style="" @click="cancel">取消</el-button>
-			<el-button v-if="mode == 'detail'" type="primary" @click="toggleEdit">
+			<el-button style="" @click="cancel">返回</el-button>
+			<!-- <el-button v-if="mode == 'detail'" type="primary" @click="toggleEdit">
 				编辑
 			</el-button>
-			<el-button v-else type="primary" @click="confirm">保存</el-button>
+			<el-button v-else type="primary" @click="confirm">保存</el-button> -->
 		</div>
 
 		<!-- 属性对话框 -->
@@ -178,7 +178,7 @@ export default {
 	data() {
 		return {
 			visible: false,
-			mode: 'edit',
+			mode: 'detail',
 			showForm: false,
 			form: {
 				departmentName: null,
diff --git a/src/views/specialEquipment/maintain/Record--detail.vue b/src/views/specialEquipment/maintain/Record--detail.vue
index ebfff0f8..8eaee473 100644
--- a/src/views/specialEquipment/maintain/Record--detail.vue
+++ b/src/views/specialEquipment/maintain/Record--detail.vue
@@ -92,11 +92,11 @@
 		</div>
 
 		<div class="drawer-body__footer">
-			<el-button style="" @click="cancel">取消</el-button>
-			<el-button v-if="mode == 'detail'" type="primary" @click="toggleEdit">
+			<el-button style="" @click="cancel">返回</el-button>
+			<!-- <el-button v-if="mode == 'detail'" type="primary" @click="toggleEdit">
 				编辑
 			</el-button>
-			<el-button v-else type="primary" @click="confirm">保存</el-button>
+			<el-button v-else type="primary" @click="confirm">保存</el-button> -->
 		</div>
 
 		<!-- 属性对话框 -->
@@ -154,7 +154,7 @@ export default {
 	data() {
 		return {
 			visible: false,
-			mode: 'edit',
+			mode: 'detail',
 			showForm: false,
 			form: {
 				id: null,
diff --git a/src/views/specialEquipment/maintain/Repair.vue b/src/views/specialEquipment/maintain/Repair.vue
index 4a816667..a946645b 100644
--- a/src/views/specialEquipment/maintain/Repair.vue
+++ b/src/views/specialEquipment/maintain/Repair.vue
@@ -110,72 +110,101 @@ export default {
 					: undefined,
 			].filter((v) => v),
 			tableProps: [
-				{
-					prop: 'createTime',
-					label: '添加时间',
-					fixed: true,
-					width: 150,
-					filter: parseTime,
-				},
+				// {
+				// 	prop: 'createTime',
+				// 	label: '添加时间',
+				// 	fixed: true,
+				// 	width: 150,
+				// 	filter: parseTime,
+				// },
 				{
 					prop: 'repairOrderNumber',
 					label: '设备维修单号',
 					minWidth: 120,
 					showOverflowtooltip: true,
 				},
+				{
+					prop: 'lineName',
+					label: '产线名',
+					minWidth: 120,
+					showOverflowtooltip: true,
+				},
+				{
+					prop: 'sectionName',
+					label: '工段名',
+					minWidth: 120,
+					showOverflowtooltip: true,
+				},
+				{
+					prop: 'equipmentName',
+					label: '设备名称',
+					minWidth: 120,
+					showOverflowtooltip: true,
+				},
+				{
+					prop: 'faultDetail',
+					label: '故障明细',
+					minWidth: 120,
+					showOverflowtooltip: true,
+				},
 				{
 					prop: 'maintenanceStartTime',
-					label: '开始时间',
+					label: '维修开始时间',
 					filter: parseTime,
 					minWidth: 150,
 					showOverflowtooltip: true,
 				},
 				{
 					prop: 'maintenanceFinishTime',
-					label: '结束时间',
+					label: '维修结束时间',
 					filter: parseTime,
 					minWidth: 150,
 					showOverflowtooltip: true,
 				},
 				{
-					prop: 'maintenanceStatus',
-					label: '维修状态',
-					filter: (v) => (v != null ? ['未完成', '完成', '进行中'][v] : ''),
-				},
-				{ prop: 'maintenanceDuration', label: '维修时长(h)', width: 110 },
-				{ prop: 'lineName', label: '产线' },
-				{ prop: 'sectionName', label: '工段' },
-				{
-					prop: 'equipmentName',
-					label: '设备名称',
-					minWidth: 100,
-					showOverflowtooltip: true,
-				},
-				{
-					prop: 'maintenanceDetail',
-					label: '维修明细',
-					subcomponent: htmls,
-					minWidth: 100,
-					showOverflowtooltip: true,
-				},
-				{
-					prop: 'repairman',
-					label: '维修工',
-					minWidth: 100,
-					showOverflowtooltip: true,
-				},
-				{
-					prop: 'repairmanPhone',
-					label: '联系方式',
-					minWidth: 100,
-					showOverflowtooltip: true,
+					prop: 'maintenanceResult',
+					label: '维修结果',
+					filter: (v) => (v != null ? ['成功', '失败'][v] : ''),
 				},
+				{ prop: 'maintenanceDetail', label: '维修描述', width: 110 },
+				{ prop: '_detail', label: '查看详情', width: 110 },
 				{
 					prop: 'remark',
 					label: '备注',
 					minWidth: 120,
 					showOverflowtooltip: true,
 				},
+				// {
+				// 	prop: 'maintenanceStatus',
+				// 	label: '维修状态',
+				// 	filter: (v) => (v != null ? ['未完成', '完成', '进行中'][v] : ''),
+				// },
+				// { prop: 'maintenanceDuration', label: '维修时长(h)', width: 110 },
+				// {
+				// 	prop: 'equipmentName',
+				// 	label: '设备名称',
+				// 	minWidth: 100,
+				// 	showOverflowtooltip: true,
+				// },
+				// {
+				// 	prop: 'maintenanceDetail',
+				// 	label: '维修明细',
+				// 	subcomponent: htmls,
+				// 	minWidth: 100,
+				// 	showOverflowtooltip: true,
+				// },
+				// {
+				// 	prop: 'repairman',
+				// 	label: '维修工',
+				// 	minWidth: 100,
+				// 	showOverflowtooltip: true,
+				// },
+				// {
+				// 	prop: 'repairmanPhone',
+				// 	label: '联系方式',
+				// 	minWidth: 100,
+				// 	showOverflowtooltip: true,
+				// },
 			],
 			searchBarFormConfig: [
 				{

From ae7b13695aa7eb4c1e9bb88e024dc16ee47094d3 Mon Sep 17 00:00:00 2001
From: lb <liubin_9396@163.com>
Date: Mon, 5 Feb 2024 10:59:36 +0800
Subject: [PATCH 09/40] add waitinglist page and its dialogs

---
 .../maintain/WaitingList--add--planned.vue    | 440 +++++++++++
 .../maintain/WaitingList--add--unplanned.vue  | 440 +++++++++++
 .../specialEquipment/maintain/WaitingList.vue | 687 ++++++++++++++++++
 3 files changed, 1567 insertions(+)
 create mode 100644 src/views/specialEquipment/maintain/WaitingList--add--planned.vue
 create mode 100644 src/views/specialEquipment/maintain/WaitingList--add--unplanned.vue
 create mode 100644 src/views/specialEquipment/maintain/WaitingList.vue

diff --git a/src/views/specialEquipment/maintain/WaitingList--add--planned.vue b/src/views/specialEquipment/maintain/WaitingList--add--planned.vue
new file mode 100644
index 00000000..de27440e
--- /dev/null
+++ b/src/views/specialEquipment/maintain/WaitingList--add--planned.vue
@@ -0,0 +1,440 @@
+<!-- 
+    filename: dialogForm.vue
+    author: liubin
+    date: 2023-08-15 10:32:36
+    description: 弹窗的表单组件
+-->
+
+<template>
+	<el-form
+		ref="form"
+		:model="form"
+		:size="size"
+		:label-position="labelPosition"
+		v-loading="formLoading">
+		<el-row :gutter="20">
+			<el-col :span="12">
+				<el-form-item
+					label="保养计划单号"
+					prop="code"
+					:rules="[
+						{ required: true, message: '请输入保养计划单号', trigger: 'blur' },
+					]">
+					<el-input
+						v-model="form.code"
+						@change="$emit('update', form)"
+						:placeholder="`请输入保养计划单号`"
+						:disabled="disabled" />
+				</el-form-item>
+			</el-col>
+
+			<el-col :span="12">
+				<el-form-item
+					label="保养计划名称"
+					prop="name"
+					:rules="[
+						{ required: true, message: '请输入保养计划名称', trigger: 'blur' },
+					]">
+					<el-input
+						v-model="form.name"
+						:placeholder="`请输入保养计划名称`"
+						:disabled="disabled" />
+				</el-form-item>
+			</el-col>
+
+			<el-col :span="12">
+				<el-form-item
+					label="部门"
+					prop="departmentId"
+					:rules="[{ required: true, message: '请选择部门', trigger: 'blur' }]">
+					<el-select
+						v-model="form.departmentId"
+						:placeholder="`请选择部门`"
+						:disabled="disabled"
+						clearable
+						filterable
+						@change="$emit('update', form)">
+						<el-option
+							v-for="opt in departmentOptions"
+							:key="opt.value"
+							:label="opt.label"
+							:value="opt.value" />
+					</el-select>
+				</el-form-item>
+
+				<!-- <el-form-item
+					label="设备大类"
+					prop="equipmentCategory"
+					:rules="[
+						{ required: true, message: '请选择设备大类', trigger: 'blur' },
+					]">
+					<el-select
+						v-model="form.equipmentCategory"
+						:placeholder="`请选择设备大类`"
+						:disabled="disabled"
+						@change="handleEqTypeChange">
+						<el-option
+							v-for="opt in equipmentTypeOptions"
+							:key="opt.value"
+							:label="opt.label"
+							:value="opt.value" />
+					</el-select>
+				</el-form-item> -->
+			</el-col>
+
+			<el-col :span="12">
+				<el-form-item
+					label="产线"
+					prop="lineId"
+					:rules="[{ required: true, message: '请选择产线', trigger: 'blur' }]">
+					<el-select
+						v-model="form.lineId"
+						:placeholder="`请选择产线`"
+						:disabled="disabled"
+						clearable
+						filterable
+						@change="$emit('update', form)">
+						<el-option
+							v-for="opt in lineOptions"
+							:key="opt.value"
+							:label="opt.label"
+							:value="opt.value" />
+					</el-select>
+				</el-form-item>
+				<!-- <el-form-item
+					label="设备"
+					prop="equipmentId"
+					:rules="[{ required: true, message: '请选择设备', trigger: 'blur' }]">
+					<el-select
+						v-model="form.equipmentId"
+						:placeholder="`请选择设备`"
+						:disabled="disabled"
+						@change="$emit('update', form)">
+						<el-option
+							v-for="opt in equipmentOptions"
+							:key="opt.value"
+							:label="opt.label"
+							:value="opt.value" />
+					</el-select>
+				</el-form-item> -->
+			</el-col>
+
+			<el-col :span="12">
+				<el-form-item
+					label="保养频率(天/次)"
+					prop="maintenancePeriod"
+					:rules="[
+						{
+							type: 'number',
+							message: '请输入正确的数字',
+							trigger: 'blur',
+							transform: (val) => Number(val),
+						},
+						{ required: true, message: '保养频率不能为空', trigger: 'blur' },
+					]">
+					<el-input
+						v-model="form.maintenancePeriod"
+						@change="$emit('update', form)"
+						:placeholder="`请输入保养频率`"
+						:disabled="disabled" />
+				</el-form-item>
+			</el-col>
+
+			<el-col :span="12">
+				<el-form-item
+					label="确认时限(h)"
+					prop="confirmTimeLimit"
+					:rules="[
+						{ required: true, message: '请输入确认时限', trigger: 'blur' },
+						{
+							type: 'number',
+							message: '请输入正确的数字',
+							trigger: 'blur',
+							transform: (val) => Number(val),
+						},
+					]">
+					<el-input
+						v-model="form.confirmTimeLimit"
+						@change="$emit('update', form)"
+						:placeholder="`请输入确认时限(小时)`"
+						:disabled="disabled" />
+				</el-form-item>
+			</el-col>
+
+			<!-- <el-col :span="12">
+				<el-form-item label="保养类型" prop="maintainType">
+					<el-select
+						v-model="form.maintainType"
+						:placeholder="`请选择保养类型`"
+						:disabled="disabled"
+						@change="$emit('update', form)">
+						<el-option
+							v-for="opt in getDictDatas(DICT_TYPE.MAINTAIN_TYPE)"
+							:key="opt.value"
+							:label="opt.label"
+							:value="+opt.value" />
+					</el-select>
+				</el-form-item>
+			</el-col> -->
+
+			<el-col :span="12">
+				<el-form-item
+					label="保养时长(h)"
+					prop="maintainDuration"
+					:rules="[
+						{
+							type: 'number',
+							message: '请输入正确的数字',
+							trigger: 'blur',
+							transform: (val) => Number(val),
+						},
+					]">
+					<el-input
+						v-model="form.maintainDuration"
+						@change="$emit('update', form)"
+						:placeholder="`请输入保养时长(小时)`"
+						:disabled="disabled" />
+				</el-form-item>
+			</el-col>
+
+			<el-col :span="12">
+				<el-form-item
+					label="首次保养时间"
+					prop="firstMaintenanceTime"
+					:rules="[
+						{ required: true, message: '请选择首次保养时间', trigger: 'blur' },
+					]">
+					<el-date-picker
+						v-model="form.firstMaintenanceTime"
+						type="datetime"
+						:disabled="edit"
+						:placeholder="`请选择首次保养时间`"
+						@change="$emit('update', form)"
+						value-format="timestamp"></el-date-picker>
+				</el-form-item>
+			</el-col>
+
+			<el-col :span="12">
+				<el-form-item
+					label="计划保养人员"
+					prop="maintainer"
+					:rules="[
+						{ required: true, message: '请选择计划保养人员', trigger: 'blur' },
+					]">
+					<el-select
+						v-model="form.maintainer"
+						:placeholder="`请选择计划保养人员`"
+						:disabled="disabled"
+						multiple
+						clearable
+						filterable
+						@change="$emit('update', form)">
+						<el-option
+							v-for="opt in maintainerOptions"
+							:key="opt.value"
+							:label="opt.label"
+							:value="opt.value" />
+					</el-select>
+				</el-form-item>
+			</el-col>
+
+			<el-col :span="24">
+				<el-form-item label="备注" prop="remark">
+					<el-input
+						v-model="form.remark"
+						@change="$emit('update', form)"
+						:placeholder="`请输入备注`"
+						:disabled="disabled" />
+				</el-form-item>
+			</el-col>
+		</el-row>
+	</el-form>
+</template>
+
+<script>
+export default {
+	name: 'DialogForm',
+	model: {
+		prop: 'dataForm',
+		event: 'update',
+	},
+	emits: ['update'],
+	components: {},
+	props: {
+		rows: {
+			type: Array,
+			default: () => [],
+		},
+		dataForm: {
+			type: Object,
+			default: () => ({}),
+		},
+		disabled: {
+			type: Boolean,
+			default: false,
+		},
+		edit: {
+			type: Boolean,
+			default: false,
+		},
+		hasFiles: {
+			type: Boolean | Array,
+			default: false,
+		},
+		labelPosition: {
+			type: String,
+			default: 'right',
+		},
+		size: {
+			type: String,
+			default: '',
+		},
+	},
+	data() {
+		return {
+			form: {},
+			formLoading: true,
+			equipmentTypeOptions: [
+				{ label: '安全设备', value: 1 },
+				{ label: '消防设备', value: 2 },
+				{ label: '特种设备', value: 3 },
+			],
+			lineList: [],
+			maintainerList: [],
+			departmentList: [],
+		};
+	},
+	watch: {
+		dataForm: {
+			handler(val) {
+				this.form = JSON.parse(JSON.stringify(val));
+				if (typeof val.maintainer == 'string')
+					this.form.maintainer = val.maintainer.split(',');
+				if (this.form.equipmentCategory != null) {
+					setTimeout(() => {
+						this.equipmentOptions = this.equipmentList
+							.filter((item) => item.special)
+							.filter(
+								(item) => item.specialType === this.form.equipmentCategory
+							)
+							.map((item) => ({ label: item.name, value: item.id }));
+					}, 1000);
+				}
+				if (this.hasFiles) {
+					if (typeof this.hasFiles == 'boolean' && this.hasFiles) {
+						this.form.files = this.form.files ?? [];
+					} else if (Array.isArray(this.hasFiles)) {
+						this.hasFiles.forEach((prop) => {
+							this.form[prop] = this.form[prop] ?? [];
+						});
+					}
+				}
+			},
+			deep: true,
+			immediate: true,
+		},
+	},
+	mounted() {
+		!this.edit && this.getCode('/base/equipment-maintain-plan/getCode');
+		this.getList('maintainer');
+		this.getList('department');
+		this.getList('line');
+	},
+	computed: {
+		departmentOptions() {
+			return (this.departmentList || []).map((item) => ({
+				id: item.id,
+				label: item.name,
+				value: item.id,
+			}));
+		},
+		lineOptions() {
+			return (this.lineList || []).map((item) => ({
+				id: item.id,
+				label: item.name,
+				value: item.id,
+			}));
+		},
+		maintainerOptions() {
+			return (this.maintainerList || []).map((item) => ({
+				id: item.id,
+				label: item.name,
+				value: item.name,
+			}));
+		},
+	},
+	methods: {
+		/** 模拟透传 ref  */
+		validate(cb) {
+			return this.$refs.form.validate(cb);
+		},
+		resetFields(args) {
+			return this.$refs.form.resetFields(args);
+		},
+		// getCode
+		async getCode(url) {
+			this.formLoading = true;
+			const response = await this.$axios(url);
+			this.formLoading = false;
+			this.form.code = response.data || '';
+		},
+		// initialize
+		async getEquipmentList() {
+			this.formLoading = true;
+			const response = await this.$axios('/base/core-equipment/listAll');
+			this.equipmentList = response.data || [];
+			this.equipmentOptions = (response.data || []).map((item) => ({
+				label: item.name,
+				value: item.id,
+			}));
+			this.formLoading = false;
+		},
+		async getList(source = 'department') {
+			const urls = [
+				'/base/core-production-line/listAll',
+				'/base/core-department/listAll',
+				'/base/core-worker/listAll',
+			];
+			let res;
+			switch (source) {
+				case 'department':
+					res = await this.$axios(urls[1]);
+					this.departmentList = res.data || [];
+					break;
+				case 'maintainer':
+					res = await this.$axios(urls[2]);
+					this.maintainerList = res.data || [];
+					break;
+				case 'line':
+					res = await this.$axios(urls[0]);
+					this.lineList = res.data || [];
+					break;
+			}
+			this.formLoading = false;
+		},
+
+		// handlers
+		handleEqTypeChange(type) {
+			this.form.equipmentId = null;
+			if (type) {
+				this.equipmentOptions = this.equipmentList
+					.filter((item) => item.special)
+					.filter((item) => item.specialType === type)
+					.map((item) => ({ label: item.name, value: item.id }));
+			} else
+				this.equipmentOptions = this.equipmentList.map((item) => ({
+					label: item.name,
+					value: item.id,
+				}));
+			// this.$emit('update', this.form)
+		},
+	},
+};
+</script>
+
+<style scoped lang="scss">
+.el-date-editor,
+.el-select {
+	width: 100%;
+}
+</style>
diff --git a/src/views/specialEquipment/maintain/WaitingList--add--unplanned.vue b/src/views/specialEquipment/maintain/WaitingList--add--unplanned.vue
new file mode 100644
index 00000000..de27440e
--- /dev/null
+++ b/src/views/specialEquipment/maintain/WaitingList--add--unplanned.vue
@@ -0,0 +1,440 @@
+<!-- 
+    filename: dialogForm.vue
+    author: liubin
+    date: 2023-08-15 10:32:36
+    description: 弹窗的表单组件
+-->
+
+<template>
+	<el-form
+		ref="form"
+		:model="form"
+		:size="size"
+		:label-position="labelPosition"
+		v-loading="formLoading">
+		<el-row :gutter="20">
+			<el-col :span="12">
+				<el-form-item
+					label="保养计划单号"
+					prop="code"
+					:rules="[
+						{ required: true, message: '请输入保养计划单号', trigger: 'blur' },
+					]">
+					<el-input
+						v-model="form.code"
+						@change="$emit('update', form)"
+						:placeholder="`请输入保养计划单号`"
+						:disabled="disabled" />
+				</el-form-item>
+			</el-col>
+
+			<el-col :span="12">
+				<el-form-item
+					label="保养计划名称"
+					prop="name"
+					:rules="[
+						{ required: true, message: '请输入保养计划名称', trigger: 'blur' },
+					]">
+					<el-input
+						v-model="form.name"
+						:placeholder="`请输入保养计划名称`"
+						:disabled="disabled" />
+				</el-form-item>
+			</el-col>
+
+			<el-col :span="12">
+				<el-form-item
+					label="部门"
+					prop="departmentId"
+					:rules="[{ required: true, message: '请选择部门', trigger: 'blur' }]">
+					<el-select
+						v-model="form.departmentId"
+						:placeholder="`请选择部门`"
+						:disabled="disabled"
+						clearable
+						filterable
+						@change="$emit('update', form)">
+						<el-option
+							v-for="opt in departmentOptions"
+							:key="opt.value"
+							:label="opt.label"
+							:value="opt.value" />
+					</el-select>
+				</el-form-item>
+
+				<!-- <el-form-item
+					label="设备大类"
+					prop="equipmentCategory"
+					:rules="[
+						{ required: true, message: '请选择设备大类', trigger: 'blur' },
+					]">
+					<el-select
+						v-model="form.equipmentCategory"
+						:placeholder="`请选择设备大类`"
+						:disabled="disabled"
+						@change="handleEqTypeChange">
+						<el-option
+							v-for="opt in equipmentTypeOptions"
+							:key="opt.value"
+							:label="opt.label"
+							:value="opt.value" />
+					</el-select>
+				</el-form-item> -->
+			</el-col>
+
+			<el-col :span="12">
+				<el-form-item
+					label="产线"
+					prop="lineId"
+					:rules="[{ required: true, message: '请选择产线', trigger: 'blur' }]">
+					<el-select
+						v-model="form.lineId"
+						:placeholder="`请选择产线`"
+						:disabled="disabled"
+						clearable
+						filterable
+						@change="$emit('update', form)">
+						<el-option
+							v-for="opt in lineOptions"
+							:key="opt.value"
+							:label="opt.label"
+							:value="opt.value" />
+					</el-select>
+				</el-form-item>
+				<!-- <el-form-item
+					label="设备"
+					prop="equipmentId"
+					:rules="[{ required: true, message: '请选择设备', trigger: 'blur' }]">
+					<el-select
+						v-model="form.equipmentId"
+						:placeholder="`请选择设备`"
+						:disabled="disabled"
+						@change="$emit('update', form)">
+						<el-option
+							v-for="opt in equipmentOptions"
+							:key="opt.value"
+							:label="opt.label"
+							:value="opt.value" />
+					</el-select>
+				</el-form-item> -->
+			</el-col>
+
+			<el-col :span="12">
+				<el-form-item
+					label="保养频率(天/次)"
+					prop="maintenancePeriod"
+					:rules="[
+						{
+							type: 'number',
+							message: '请输入正确的数字',
+							trigger: 'blur',
+							transform: (val) => Number(val),
+						},
+						{ required: true, message: '保养频率不能为空', trigger: 'blur' },
+					]">
+					<el-input
+						v-model="form.maintenancePeriod"
+						@change="$emit('update', form)"
+						:placeholder="`请输入保养频率`"
+						:disabled="disabled" />
+				</el-form-item>
+			</el-col>
+
+			<el-col :span="12">
+				<el-form-item
+					label="确认时限(h)"
+					prop="confirmTimeLimit"
+					:rules="[
+						{ required: true, message: '请输入确认时限', trigger: 'blur' },
+						{
+							type: 'number',
+							message: '请输入正确的数字',
+							trigger: 'blur',
+							transform: (val) => Number(val),
+						},
+					]">
+					<el-input
+						v-model="form.confirmTimeLimit"
+						@change="$emit('update', form)"
+						:placeholder="`请输入确认时限(小时)`"
+						:disabled="disabled" />
+				</el-form-item>
+			</el-col>
+
+			<!-- <el-col :span="12">
+				<el-form-item label="保养类型" prop="maintainType">
+					<el-select
+						v-model="form.maintainType"
+						:placeholder="`请选择保养类型`"
+						:disabled="disabled"
+						@change="$emit('update', form)">
+						<el-option
+							v-for="opt in getDictDatas(DICT_TYPE.MAINTAIN_TYPE)"
+							:key="opt.value"
+							:label="opt.label"
+							:value="+opt.value" />
+					</el-select>
+				</el-form-item>
+			</el-col> -->
+
+			<el-col :span="12">
+				<el-form-item
+					label="保养时长(h)"
+					prop="maintainDuration"
+					:rules="[
+						{
+							type: 'number',
+							message: '请输入正确的数字',
+							trigger: 'blur',
+							transform: (val) => Number(val),
+						},
+					]">
+					<el-input
+						v-model="form.maintainDuration"
+						@change="$emit('update', form)"
+						:placeholder="`请输入保养时长(小时)`"
+						:disabled="disabled" />
+				</el-form-item>
+			</el-col>
+
+			<el-col :span="12">
+				<el-form-item
+					label="首次保养时间"
+					prop="firstMaintenanceTime"
+					:rules="[
+						{ required: true, message: '请选择首次保养时间', trigger: 'blur' },
+					]">
+					<el-date-picker
+						v-model="form.firstMaintenanceTime"
+						type="datetime"
+						:disabled="edit"
+						:placeholder="`请选择首次保养时间`"
+						@change="$emit('update', form)"
+						value-format="timestamp"></el-date-picker>
+				</el-form-item>
+			</el-col>
+
+			<el-col :span="12">
+				<el-form-item
+					label="计划保养人员"
+					prop="maintainer"
+					:rules="[
+						{ required: true, message: '请选择计划保养人员', trigger: 'blur' },
+					]">
+					<el-select
+						v-model="form.maintainer"
+						:placeholder="`请选择计划保养人员`"
+						:disabled="disabled"
+						multiple
+						clearable
+						filterable
+						@change="$emit('update', form)">
+						<el-option
+							v-for="opt in maintainerOptions"
+							:key="opt.value"
+							:label="opt.label"
+							:value="opt.value" />
+					</el-select>
+				</el-form-item>
+			</el-col>
+
+			<el-col :span="24">
+				<el-form-item label="备注" prop="remark">
+					<el-input
+						v-model="form.remark"
+						@change="$emit('update', form)"
+						:placeholder="`请输入备注`"
+						:disabled="disabled" />
+				</el-form-item>
+			</el-col>
+		</el-row>
+	</el-form>
+</template>
+
+<script>
+export default {
+	name: 'DialogForm',
+	model: {
+		prop: 'dataForm',
+		event: 'update',
+	},
+	emits: ['update'],
+	components: {},
+	props: {
+		rows: {
+			type: Array,
+			default: () => [],
+		},
+		dataForm: {
+			type: Object,
+			default: () => ({}),
+		},
+		disabled: {
+			type: Boolean,
+			default: false,
+		},
+		edit: {
+			type: Boolean,
+			default: false,
+		},
+		hasFiles: {
+			type: Boolean | Array,
+			default: false,
+		},
+		labelPosition: {
+			type: String,
+			default: 'right',
+		},
+		size: {
+			type: String,
+			default: '',
+		},
+	},
+	data() {
+		return {
+			form: {},
+			formLoading: true,
+			equipmentTypeOptions: [
+				{ label: '安全设备', value: 1 },
+				{ label: '消防设备', value: 2 },
+				{ label: '特种设备', value: 3 },
+			],
+			lineList: [],
+			maintainerList: [],
+			departmentList: [],
+		};
+	},
+	watch: {
+		dataForm: {
+			handler(val) {
+				this.form = JSON.parse(JSON.stringify(val));
+				if (typeof val.maintainer == 'string')
+					this.form.maintainer = val.maintainer.split(',');
+				if (this.form.equipmentCategory != null) {
+					setTimeout(() => {
+						this.equipmentOptions = this.equipmentList
+							.filter((item) => item.special)
+							.filter(
+								(item) => item.specialType === this.form.equipmentCategory
+							)
+							.map((item) => ({ label: item.name, value: item.id }));
+					}, 1000);
+				}
+				if (this.hasFiles) {
+					if (typeof this.hasFiles == 'boolean' && this.hasFiles) {
+						this.form.files = this.form.files ?? [];
+					} else if (Array.isArray(this.hasFiles)) {
+						this.hasFiles.forEach((prop) => {
+							this.form[prop] = this.form[prop] ?? [];
+						});
+					}
+				}
+			},
+			deep: true,
+			immediate: true,
+		},
+	},
+	mounted() {
+		!this.edit && this.getCode('/base/equipment-maintain-plan/getCode');
+		this.getList('maintainer');
+		this.getList('department');
+		this.getList('line');
+	},
+	computed: {
+		departmentOptions() {
+			return (this.departmentList || []).map((item) => ({
+				id: item.id,
+				label: item.name,
+				value: item.id,
+			}));
+		},
+		lineOptions() {
+			return (this.lineList || []).map((item) => ({
+				id: item.id,
+				label: item.name,
+				value: item.id,
+			}));
+		},
+		maintainerOptions() {
+			return (this.maintainerList || []).map((item) => ({
+				id: item.id,
+				label: item.name,
+				value: item.name,
+			}));
+		},
+	},
+	methods: {
+		/** 模拟透传 ref  */
+		validate(cb) {
+			return this.$refs.form.validate(cb);
+		},
+		resetFields(args) {
+			return this.$refs.form.resetFields(args);
+		},
+		// getCode
+		async getCode(url) {
+			this.formLoading = true;
+			const response = await this.$axios(url);
+			this.formLoading = false;
+			this.form.code = response.data || '';
+		},
+		// initialize
+		async getEquipmentList() {
+			this.formLoading = true;
+			const response = await this.$axios('/base/core-equipment/listAll');
+			this.equipmentList = response.data || [];
+			this.equipmentOptions = (response.data || []).map((item) => ({
+				label: item.name,
+				value: item.id,
+			}));
+			this.formLoading = false;
+		},
+		async getList(source = 'department') {
+			const urls = [
+				'/base/core-production-line/listAll',
+				'/base/core-department/listAll',
+				'/base/core-worker/listAll',
+			];
+			let res;
+			switch (source) {
+				case 'department':
+					res = await this.$axios(urls[1]);
+					this.departmentList = res.data || [];
+					break;
+				case 'maintainer':
+					res = await this.$axios(urls[2]);
+					this.maintainerList = res.data || [];
+					break;
+				case 'line':
+					res = await this.$axios(urls[0]);
+					this.lineList = res.data || [];
+					break;
+			}
+			this.formLoading = false;
+		},
+
+		// handlers
+		handleEqTypeChange(type) {
+			this.form.equipmentId = null;
+			if (type) {
+				this.equipmentOptions = this.equipmentList
+					.filter((item) => item.special)
+					.filter((item) => item.specialType === type)
+					.map((item) => ({ label: item.name, value: item.id }));
+			} else
+				this.equipmentOptions = this.equipmentList.map((item) => ({
+					label: item.name,
+					value: item.id,
+				}));
+			// this.$emit('update', this.form)
+		},
+	},
+};
+</script>
+
+<style scoped lang="scss">
+.el-date-editor,
+.el-select {
+	width: 100%;
+}
+</style>
diff --git a/src/views/specialEquipment/maintain/WaitingList.vue b/src/views/specialEquipment/maintain/WaitingList.vue
new file mode 100644
index 00000000..d12d47d4
--- /dev/null
+++ b/src/views/specialEquipment/maintain/WaitingList.vue
@@ -0,0 +1,687 @@
+<!-- 
+    filename: MaintainRecord.vue
+    author: liubin
+    date: 2023-12-12 13:54:53
+    description: 
+-->
+
+<template>
+	<div class="app-container SpecialEquipmentMaintainRecord">
+		<!-- 搜索工作栏 -->
+		<SearchBar
+			:formConfigs="searchBarFormConfig"
+			ref="search-bar"
+			@select-changed="handleSearchBarChange"
+			@headBtnClick="handleSearchBarBtnClick" />
+
+		<!-- 列表 -->
+		<base-table
+			:table-props="tableProps"
+			:page="queryParams.pageNo"
+			:limit="queryParams.pageSize"
+			:table-data="list"
+			@selection-change="handleSelectionChange"
+			@emitFun="handleEmitFun">
+			<method-btn
+				v-if="tableBtn.length"
+				slot="handleBtn"
+				label="操作"
+				:width="120"
+				:method-list="tableBtn"
+				@clickBtn="handleTableBtnClick" />
+		</base-table>
+
+		<!-- 分页组件 -->
+		<pagination
+			v-show="total > 0"
+			:total="total"
+			:page.sync="queryParams.pageNo"
+			:limit.sync="queryParams.pageSize"
+			@pagination="getList" />
+
+		<!-- 对话框(添加 / 修改) -->
+		<base-dialog
+			:dialogTitle="title"
+			:dialogVisible="open"
+			width="60%"
+			@close="cancel"
+			@cancel="cancel"
+			@confirm="submitForm">
+			<DialogFormUnplanned
+				v-if="open"
+				ref="form"
+				v-model="form"
+				:disabled="mode == 'detail'" />
+			<el-row v-if="mode === 'detail'" slot="footer" type="flex" justify="end">
+				<el-col :span="12">
+					<el-button size="small" class="btnTextStyle" @click="cancel">
+						关闭
+					</el-button>
+				</el-col>
+			</el-row>
+		</base-dialog>
+
+		<!-- <RecordDetail
+			v-if="recordDetailVisible"
+			ref="recordDetailDrawer"
+			@closed="recordDetailVisible = false" /> -->
+	</div>
+</template>
+
+<script>
+import moment from 'moment';
+import basicPageMixin from '@/mixins/lb/basicPageMixin';
+import DialogFormUnplanned from './WaitingList--add--unplanned.vue';
+import {
+	deleteEqMaintainLog,
+	exportMaintainLogExcel,
+} from '@/api/equipment/base/maintain/record';
+
+const timeFilter = (val) => moment(val).format('yyyy-MM-DD HH:mm:ss');
+
+const btn = {
+	name: 'tableBtn',
+	props: ['injectData'],
+	data() {
+		return {};
+	},
+	methods: {
+		handleClick() {
+			this.$emit('emitData', {
+				action: this.injectData.label,
+				value: this.injectData,
+			});
+		},
+	},
+	render: function (h) {
+		return (
+			<el-button type="text" onClick={this.handleClick}>
+				{this.injectData.name}
+			</el-button>
+		);
+	},
+};
+
+export default {
+	name: 'SpecialEquipmentMaintainRecord',
+	components: { DialogFormUnplanned },
+	mixins: [basicPageMixin],
+	data() {
+		return {
+			recordDetailVisible: false,
+			searchBarKeys: [
+				'maintainPlanId',
+				'startTime',
+				'special',
+				// 'relatePlan',
+				// 'equipmentId',
+				// 'specialType',
+			],
+			tableBtn: [
+				// this.$auth.hasPermi('equipment:maintain-record:update')
+				// 	? {
+				// 			type: 'detail',
+				// 			btnName: '详情',
+				// 	  }
+				// 	: undefined,
+				{
+					type: 'confirm',
+					btnName: '确认',
+				},
+				{
+					type: 'edit',
+					btnName: '编辑',
+				},
+				{
+					type: 'delete',
+					btnName: '删除',
+				},
+			],
+			tableProps: [
+				// {
+				// 	prop: 'createTime',
+				// 	label: '添加时间',
+				// 	fixed: true,
+				// 	width: 150,
+				// 	filter: timeFilter,
+				// },
+				{
+					type: 'selection',
+					prop: '_selection',
+					label: '批量选择',
+					width: 128,
+					selectable: (row, index) => {
+						return index % 2 == 0;
+					},
+					subcomponent: {
+						render: (h, { row, index }) => {
+							return <h1>hello</h1>;
+							// return <el-checkbox v-model={this.$refs.table.selection} />
+						},
+					},
+				},
+				{
+					prop: 'maintainOrderNumber',
+					label: '设备保养单号',
+					width: 110,
+					showOverflowtooltip: true,
+				},
+				{
+					prop: 'planName',
+					label: '保养计划名称',
+					width: 110,
+					showOverflowtooltip: true,
+				},
+				{
+					prop: 'departmentName',
+					label: '部门',
+					width: 110,
+					showOverflowtooltip: true,
+				},
+				{
+					prop: 'lineName',
+					label: '产线名',
+					width: 110,
+					showOverflowtooltip: true,
+				},
+				{
+					prop: 'planStartTime',
+					label: '计划开始时间',
+					filter: timeFilter,
+					minWidth: 150,
+					showOverflowtooltip: true,
+				},
+				{
+					prop: 'planEndTime',
+					label: '计划结束时间',
+					filter: timeFilter,
+					minWidth: 150,
+					showOverflowtooltip: true,
+				},
+				{
+					prop: 'startTime',
+					label: '实际开始时间',
+					filter: timeFilter,
+					minWidth: 150,
+					showOverflowtooltip: true,
+				},
+				{
+					prop: 'endTime',
+					label: '实际结束时间',
+					filter: timeFilter,
+					minWidth: 150,
+					showOverflowtooltip: true,
+				},
+				{
+					prop: 'confirmDueTime',
+					label: '确认截止时间',
+					filter: timeFilter,
+					minWidth: 150,
+					showOverflowtooltip: true,
+				},
+				{
+					prop: 'relatePlan',
+					label: '保养计划类型',
+					minWidth: 150,
+					showOverflowtooltip: true,
+					filter: (val) =>
+						val != null ? ['-', '计划型', '非计划型'][val] : '-',
+				},
+				{
+					prop: '_detail',
+					label: '详情',
+					name: '详情',
+					minWidth: 60,
+					subcomponent: btn,
+				},
+				// {
+				// 	prop: 'equipmentCategory',
+				// 	label: '设备大类',
+				// 	minWidth: 100,
+				// 	showOverflowtooltip: true,
+				// 	filter: (val) =>
+				// 		val != null ? ['-', '安全设备', '消防设备', '特种设备'][val] : '-',
+				// },
+				// {
+				// 	prop: 'equipmentName',
+				// 	label: '设备名称',
+				// 	minWidth: 100,
+				// 	showOverflowtooltip: true,
+				// },
+				// {
+				// 	prop: 'maintainWorker',
+				// 	label: '保养人员',
+				// 	minWidth: 100,
+				// 	showOverflowtooltip: true,
+				// },
+				// {
+				// 	prop: 'relatePlan',
+				// 	label: '是否计划保养',
+				// 	width: 120,
+				// 	filter: (v) => (v != null ? ['', '是', '否'][v] : ''),
+				// },
+				// {
+				// 	prop: 'planName',
+				// 	label: '保养计划名称',
+				// 	minWidth: 120,
+				// 	showOverflowtooltip: true,
+				// },
+				// {
+				// 	prop: 'maintainDuration',
+				// 	label: '计划保养用时(h)',
+				// 	minWidth: 130,
+				// 	showOverflowtooltip: true,
+				// },
+				// { prop: 'timeUsed', label: '实际保养用时(h)', minWidth: 130 },
+				// {
+				// 	prop: 'remark',
+				// 	label: '备注',
+				// 	minWidth: 100,
+				// 	showOverflowtooltip: true,
+				// },
+			],
+			searchBarFormConfig: [
+				// {
+				// 	type: 'select',
+				// 	label: '设备大类',
+				// 	placeholder: '请选择设备大类',
+				// 	param: 'specialType',
+				// 	onchange: true,
+				// 	selectOptions: [
+				// 		{ id: 1, name: '安全设备' },
+				// 		{ id: 2, name: '消防设备' },
+				// 		{ id: 3, name: '特种设备' },
+				// 	],
+				// 	filterable: true,
+				// 	defaultSelect: null
+				// },
+				// {
+				// 	type: 'select',
+				// 	label: '设备',
+				// 	placeholder: '请选择设备',
+				// 	param: 'equipmentId',
+				// 	defaultSelect: null
+				// },
+				{
+					type: 'select',
+					label: '保养计划名称',
+					placeholder: '请选择保养计划名称',
+					param: 'maintainPlanId',
+					defaultSelect: null,
+				},
+				// 开始结束时间
+				{
+					type: 'datePicker',
+					label: '实际开始时间',
+					dateType: 'daterange', // datetimerange
+					format: 'yyyy-MM-dd',
+					valueFormat: 'yyyy-MM-dd HH:mm:ss',
+					rangeSeparator: '-',
+					startPlaceholder: '开始日期',
+					endPlaceholder: '结束日期',
+					defaultTime: ['00:00:00', '23:59:59'],
+					param: 'startTime',
+					defaultSelect: null,
+					// width: 350,
+				},
+				// {
+				// 	type: 'select',
+				// 	label: '是否计划保养',
+				// 	selectOptions: [
+				// 		{ name: '是', id: 1 },
+				// 		{ name: '否', id: 2 },
+				// 	],
+				// 	defaultSelect: null,
+				// 	param: 'relatePlan',
+				// },
+				{
+					type: 'button',
+					btnName: '查询',
+					name: 'search',
+					color: 'primary',
+				},
+				{
+					type: 'separate',
+				},
+				{
+					type: 'button',
+					btnName: '新增',
+					name: 'add',
+					plain: true,
+					color: 'success',
+				},
+				{
+					type: 'button',
+					btnName: '批量确认',
+					name: 'batchConfirm',
+					color: 'primary',
+					plain: true,
+				},
+				{
+					type: this.$auth.hasPermi('equipment:maintain-record:export')
+						? 'button'
+						: '',
+					btnName: '导出',
+					name: 'export',
+					plain: true,
+					color: 'primary',
+				},
+				// {
+				// 	type: this.$auth.hasPermi('equipment:maintain-record:create')
+				// 		? 'button'
+				// 		: '',
+				// 	btnName: '新增',
+				// 	name: 'add',
+				// 	plain: true,
+				// 	color: 'success',
+				// },
+			],
+			// 是否显示弹出层
+			open: false,
+			// 查询参数
+			queryParams: {
+				pageNo: 1,
+				pageSize: 10,
+				maintainPlanId: null,
+				startTime: null,
+				special: true,
+				confirmed: false,
+			},
+			// 表单参数
+			form: {},
+			basePath: '/base/equipment-maintain-log',
+			mode: null,
+			allSpecialEquipments: [],
+		};
+	},
+	created() {
+		this.initSearchBar();
+		// if (this.$route.query) {
+		// 	this.queryParams.specialType =
+		// 		this.$route.query?.specialType ?? undefined;
+		// 	this.queryParams.equipmentId =
+		// 		this.$route.query?.equipmentId ?? undefined;
+		// 	this.queryParams.maintainPlanId =
+		// 		this.$route.query?.maintainPlanId ?? undefined;
+		// 	this.queryParams.relatePlan = this.$route.query?.relatePlan ?? undefined;
+		// 	this.queryParams.startTime = this.$route.query?.createTime ?? undefined;
+		// 	this.searchBarFormConfig[0].defaultSelect =
+		// 		this.$route.query.specialType ?? undefined;
+		// 	this.searchBarFormConfig[1].defaultSelect =
+		// 		this.$route.query.equipmentId ?? undefined;
+		// 	this.searchBarFormConfig[2].defaultSelect =
+		// 		this.$route.query.maintainPlanId ?? undefined;
+		// 	this.searchBarFormConfig[3].defaultSelect =
+		// 		this.$route.query?.createTime ?? undefined;
+		// 	this.searchBarFormConfig[4].defaultSelect =
+		// 		Number(this.$route.query.relatePlan) ?? undefined;
+		// }
+		this.getList();
+		// if (this.$route.query.addRecord) {
+		// 	this.handleAdd();
+		// }
+	},
+	methods: {
+		handleSelectionChange(list) {
+			console.log('handleSelectionChange', list);
+		},
+
+		handleEmitFun({ action, value }) {
+			switch (action) {
+				case '详情':
+					this.recordDetailVisible = true;
+					this.$nextTick(() => {
+						this.$refs.recordDetailDrawer.show({
+							id: value.id,
+							planMaintainWorker: value.planMaintainWorker,
+							maintainWorker: value.maintainWorker,
+						});
+					});
+					break;
+			}
+		},
+
+		handleSearchBarChange({ param, value }) {
+			if ('specialType' === param) {
+				if (!value) {
+					this.setSearchBarEquipmentList(this.allSpecialEquipments);
+					return;
+				}
+				this.setSearchBarEquipmentList(
+					this.allSpecialEquipments.filter((item) => item.specialType == value)
+				);
+			}
+		},
+		// setSearchBarEquipmentList(eqList) {
+		// 	this.$set(
+		// 		this.searchBarFormConfig[1],
+		// 		'selectOptions',
+		// 		eqList.map((item) => ({
+		// 			name: item.name,
+		// 			id: item.id,
+		// 		}))
+		// 	);
+		// },
+		initSearchBar() {
+			// this.http('/base/core-equipment/listAll', 'get').then(({ data }) => {
+			// 	this.allSpecialEquipments = data.filter((item) => item.special);
+			// 	this.setSearchBarEquipmentList(data.filter((item) => item.special));
+			// });
+			this.http('/base/equipment-maintain-plan/page', 'get', {
+				pageNo: 1,
+				pageSize: 100,
+				special: true,
+			}).then(({ data }) => {
+				this.$set(
+					this.searchBarFormConfig[0],
+					// this.searchBarFormConfig[2],
+					'selectOptions',
+					(data?.list || []).map((item) => ({
+						name: item.name,
+						id: item.id,
+					}))
+				);
+			});
+		},
+		/** 查询列表 */
+		getList() {
+			this.loading = true;
+			// 执行查询
+			this.recv({ ...this.queryParams, special: true, confirmed: false }).then(
+				(response) => {
+					this.list =
+						// [
+						// 	{
+						// 		id: 213,
+						// 		maintainOrderNumber: 123,
+						// 		planName: 'hhh',
+						// 		departmentName: 'asdf',
+						// 		lineName: 456,
+						// 		planStartTime: '2024-01-01',
+						// 		planEndTime: '2024-01-01',
+						// 		startTime: '2024-01-01',
+						// 		endTime: '2024-01-01',
+						// 		relatePlan: 1,
+						// 	},
+						// ];
+						response.data.list;
+					this.total = response.data.total;
+					this.loading = false;
+				}
+			);
+		},
+		/** 取消按钮 */
+		cancel() {
+			this.open = false;
+			this.mode = null;
+			this.reset();
+		},
+		/** 表单重置 */
+		reset() {
+			this.form = {
+				id: null,
+				relatePlan: null,
+				maintainPlanId: null,
+				equipmentId: null,
+				maintainWorker: [],
+				maintainOrderNumber: null,
+				startTime: null,
+				endTime: null,
+				timeUsed: null,
+				remark: null,
+				maintenanceDes: null,
+				files: [
+					// {
+					// 	fileName: '',
+					// 	fileType: '',
+					// 	fileUrl: '',
+					// },
+				],
+			};
+			this.resetForm('form');
+		},
+		/** 搜索按钮操作 */
+		handleQuery() {
+			this.queryParams.pageNo = 1;
+			this.getList();
+		},
+		/** 重置按钮操作 */
+		resetQuery() {
+			this.resetForm('queryForm');
+			this.handleQuery();
+		},
+		/** 新增按钮操作 */
+		handleAdd() {
+			this.reset();
+			if (this.$route.query.addRecord) {
+				// 赋值
+				const tempRow = this.$route.query.row;
+				this.form.equipmentId = tempRow.equipmentId;
+				this.form.relatePlan = tempRow.nextMaintainTime ? 1 : 2;
+				this.form.startTime = tempRow.nextMaintainTime;
+				this.form.maintainPlanId = tempRow.id;
+				// await (() => {
+				// 	return new Promise((acpt, rejt) => {
+				// 		this.form.relatePlan =
+				// 			this.$route.query.relatePlan ||
+				// 			(tempRow.nextMaintainTime ? 1 : 2);
+				// 		this.form.startTime = tempRow.nextMaintainTime;
+				// 		acpt();
+				// 	});
+				// })();
+				// this.$nextTick(() => {
+				// 	this.form.maintainPlanId = tempRow.id;
+				// 	this.form.equipmentId = tempRow.equipmentId;
+				// });
+			}
+			if (this.$route.query.isAdd) {
+				// 赋值
+				this.form.equipmentId = this.$route.query.equipmentId;
+				this.form.maintainPlanId = this.$route.query.maintainPlanId;
+			}
+			this.open = true;
+			this.title = '添加待确认保养记录';
+		},
+		/** 修改按钮操作 */
+		handleUpdate(row) {
+			this.reset();
+			const id = row.id;
+			this.info({ id }).then((response) => {
+				this.form = response.data;
+				this.open = true;
+				this.form.maintainWorker = this.form.maintainWorker.split(',');
+				this.title = '修改保养记录';
+			});
+		},
+		/** 提交按钮 */
+		submitForm() {
+			this.$refs['form'].validate((valid) => {
+				if (!valid) {
+					return;
+				}
+				// 修改的提交
+				if (this.form.id != null) {
+					this.put({
+						...this.form,
+						maintainWorker: this.form.maintainWorker.join(','),
+					}).then((response) => {
+						this.$modal.msgSuccess('修改成功');
+						this.open = false;
+						this.getList();
+					});
+					return;
+				}
+				// 添加的提交
+				this.post({
+					...this.form,
+					maintainWorker: this.form.maintainWorker.join(','),
+				}).then((response) => {
+					this.$modal.msgSuccess('新增成功');
+
+					// 跳转至 备品备件 保养
+					const toSparePartsMaintain = () => {
+						this.open = false;
+						// 没有备品备件保养模块。。。
+					};
+
+					this.$confirm('是否有备品备件更换?', '提示', {
+						confirmButtonText: '有',
+						cancelButtonText: '没有',
+					})
+						.then(toSparePartsMaintain)
+						.catch(() => {
+							this.open = false;
+							this.getList();
+						});
+				});
+			});
+		},
+		/** 删除按钮操作 */
+		handleDelete(row) {
+			const id = row.id;
+			this.$modal
+				.confirm('是否确认删除设备名称为"' + row.equipmentName + '"的数据项?')
+				.then(function () {
+					return deleteEqMaintainLog(id);
+				})
+				.then(() => {
+					this.getList();
+					this.$modal.msgSuccess('删除成功');
+				})
+				.catch(() => {});
+		},
+		handleDetail({ id }) {
+			this.reset();
+			this.mode = 'detail';
+			this.info({ id }).then((response) => {
+				this.form = response.data;
+				this.open = true;
+				this.title = '查看保养记录详情';
+			});
+		},
+		/** 导出按钮操作 */
+		handleExport() {
+			// 处理查询参数
+			let params = { ...this.queryParams };
+			params.pageNo = undefined;
+			params.pageSize = undefined;
+			this.$modal
+				.confirm('是否确认导出所有保养记录?')
+				.then(() => {
+					this.exportLoading = true;
+					return exportMaintainLogExcel(params);
+				})
+				.then((response) => {
+					this.$download.excel(response, '设备保养记录.xls');
+					this.exportLoading = false;
+				})
+				.catch(() => {});
+		},
+	},
+};
+</script>
+
+<style scoped lang="scss">
+.SpecialEquipmentMaintainRecord {
+}
+</style>

From 9f82aac93120ade7de5b2225931fc71fc34dd427 Mon Sep 17 00:00:00 2001
From: lb <liubin_9396@163.com>
Date: Mon, 5 Feb 2024 11:17:19 +0800
Subject: [PATCH 10/40] 1

---
 .../maintain/WaitingList--add--planned.vue    | 165 +++++++-----------
 .../maintain/WaitingList--add--unplanned.vue  | 143 ++++-----------
 2 files changed, 100 insertions(+), 208 deletions(-)

diff --git a/src/views/specialEquipment/maintain/WaitingList--add--planned.vue b/src/views/specialEquipment/maintain/WaitingList--add--planned.vue
index de27440e..5b8240cc 100644
--- a/src/views/specialEquipment/maintain/WaitingList--add--planned.vue
+++ b/src/views/specialEquipment/maintain/WaitingList--add--planned.vue
@@ -29,16 +29,11 @@
 			</el-col>
 
 			<el-col :span="12">
-				<el-form-item
-					label="保养计划名称"
-					prop="name"
-					:rules="[
-						{ required: true, message: '请输入保养计划名称', trigger: 'blur' },
-					]">
+				<el-form-item label="保养计划名称" prop="name">
 					<el-input
 						v-model="form.name"
-						:placeholder="`请输入保养计划名称`"
-						:disabled="disabled" />
+						disabled
+						:placeholder="`请输入保养计划名称`" />
 				</el-form-item>
 			</el-col>
 
@@ -101,114 +96,27 @@
 							:value="opt.value" />
 					</el-select>
 				</el-form-item>
-				<!-- <el-form-item
-					label="设备"
-					prop="equipmentId"
-					:rules="[{ required: true, message: '请选择设备', trigger: 'blur' }]">
-					<el-select
-						v-model="form.equipmentId"
-						:placeholder="`请选择设备`"
-						:disabled="disabled"
-						@change="$emit('update', form)">
-						<el-option
-							v-for="opt in equipmentOptions"
-							:key="opt.value"
-							:label="opt.label"
-							:value="opt.value" />
-					</el-select>
-				</el-form-item> -->
 			</el-col>
 
 			<el-col :span="12">
-				<el-form-item
-					label="保养频率(天/次)"
-					prop="maintenancePeriod"
-					:rules="[
-						{
-							type: 'number',
-							message: '请输入正确的数字',
-							trigger: 'blur',
-							transform: (val) => Number(val),
-						},
-						{ required: true, message: '保养频率不能为空', trigger: 'blur' },
-					]">
-					<el-input
-						v-model="form.maintenancePeriod"
-						@change="$emit('update', form)"
-						:placeholder="`请输入保养频率`"
-						:disabled="disabled" />
+				<el-form-item label="计划保养人员" prop="maintainer">
+					<el-input v-model="form.maintainer" disabled />
 				</el-form-item>
 			</el-col>
+ 
 
 			<el-col :span="12">
 				<el-form-item
-					label="确认时限(h)"
-					prop="confirmTimeLimit"
-					:rules="[
-						{ required: true, message: '请输入确认时限', trigger: 'blur' },
-						{
-							type: 'number',
-							message: '请输入正确的数字',
-							trigger: 'blur',
-							transform: (val) => Number(val),
-						},
-					]">
-					<el-input
-						v-model="form.confirmTimeLimit"
-						@change="$emit('update', form)"
-						:placeholder="`请输入确认时限(小时)`"
-						:disabled="disabled" />
-				</el-form-item>
-			</el-col>
-
-			<!-- <el-col :span="12">
-				<el-form-item label="保养类型" prop="maintainType">
-					<el-select
-						v-model="form.maintainType"
-						:placeholder="`请选择保养类型`"
-						:disabled="disabled"
-						@change="$emit('update', form)">
-						<el-option
-							v-for="opt in getDictDatas(DICT_TYPE.MAINTAIN_TYPE)"
-							:key="opt.value"
-							:label="opt.label"
-							:value="+opt.value" />
-					</el-select>
-				</el-form-item>
-			</el-col> -->
-
-			<el-col :span="12">
-				<el-form-item
-					label="保养时长(h)"
-					prop="maintainDuration"
-					:rules="[
-						{
-							type: 'number',
-							message: '请输入正确的数字',
-							trigger: 'blur',
-							transform: (val) => Number(val),
-						},
-					]">
-					<el-input
-						v-model="form.maintainDuration"
-						@change="$emit('update', form)"
-						:placeholder="`请输入保养时长(小时)`"
-						:disabled="disabled" />
-				</el-form-item>
-			</el-col>
-
-			<el-col :span="12">
-				<el-form-item
-					label="首次保养时间"
+					label="计划开始时间"
 					prop="firstMaintenanceTime"
 					:rules="[
-						{ required: true, message: '请选择首次保养时间', trigger: 'blur' },
+						{ required: true, message: '请选择计划开始时间', trigger: 'blur' },
 					]">
 					<el-date-picker
 						v-model="form.firstMaintenanceTime"
 						type="datetime"
 						:disabled="edit"
-						:placeholder="`请选择首次保养时间`"
+						placeholder="请选择计划开始时间"
 						@change="$emit('update', form)"
 						value-format="timestamp"></el-date-picker>
 				</el-form-item>
@@ -216,10 +124,61 @@
 
 			<el-col :span="12">
 				<el-form-item
-					label="计划保养人员"
+					label="计划结束时间"
+					prop="firstMaintenanceTime"
+					:rules="[
+						{ required: true, message: '请选择计划结束时间', trigger: 'blur' },
+					]">
+					<el-date-picker
+						v-model="form.firstMaintenanceTime"
+						type="datetime"
+						:disabled="edit"
+						placeholder="请选择计划结束时间"
+						@change="$emit('update', form)"
+						value-format="timestamp"></el-date-picker>
+				</el-form-item>
+			</el-col>
+
+			<el-col :span="12">
+				<el-form-item
+					label="实际开始时间"
+					prop="firstMaintenanceTime"
+					:rules="[
+						{ required: true, message: '请选择实际开始时间', trigger: 'blur' },
+					]">
+					<el-date-picker
+						v-model="form.firstMaintenanceTime"
+						type="datetime"
+						:disabled="edit"
+						placeholder="请选择实际开始时间"
+						@change="$emit('update', form)"
+						value-format="timestamp"></el-date-picker>
+				</el-form-item>
+			</el-col>
+
+			<el-col :span="12">
+				<el-form-item
+					label="实际结束时间"
+					prop="firstMaintenanceTime"
+					:rules="[
+						{ required: true, message: '请选择实际结束时间', trigger: 'blur' },
+					]">
+					<el-date-picker
+						v-model="form.firstMaintenanceTime"
+						type="datetime"
+						:disabled="edit"
+						placeholder="请选择实际结束时间"
+						@change="$emit('update', form)"
+						value-format="timestamp"></el-date-picker>
+				</el-form-item>
+			</el-col>
+
+			<el-col :span="12">
+				<el-form-item
+					label="实际保养人员"
 					prop="maintainer"
 					:rules="[
-						{ required: true, message: '请选择计划保养人员', trigger: 'blur' },
+						{ required: true, message: '请选择实际保养人员', trigger: 'blur' },
 					]">
 					<el-select
 						v-model="form.maintainer"
diff --git a/src/views/specialEquipment/maintain/WaitingList--add--unplanned.vue b/src/views/specialEquipment/maintain/WaitingList--add--unplanned.vue
index de27440e..9fc63893 100644
--- a/src/views/specialEquipment/maintain/WaitingList--add--unplanned.vue
+++ b/src/views/specialEquipment/maintain/WaitingList--add--unplanned.vue
@@ -29,16 +29,8 @@
 			</el-col>
 
 			<el-col :span="12">
-				<el-form-item
-					label="保养计划名称"
-					prop="name"
-					:rules="[
-						{ required: true, message: '请输入保养计划名称', trigger: 'blur' },
-					]">
-					<el-input
-						v-model="form.name"
-						:placeholder="`请输入保养计划名称`"
-						:disabled="disabled" />
+				<el-form-item label="保养计划名称" prop="name">
+					<span>---</span>
 				</el-form-item>
 			</el-col>
 
@@ -101,114 +93,38 @@
 							:value="opt.value" />
 					</el-select>
 				</el-form-item>
-				<!-- <el-form-item
-					label="设备"
-					prop="equipmentId"
-					:rules="[{ required: true, message: '请选择设备', trigger: 'blur' }]">
-					<el-select
-						v-model="form.equipmentId"
-						:placeholder="`请选择设备`"
-						:disabled="disabled"
-						@change="$emit('update', form)">
-						<el-option
-							v-for="opt in equipmentOptions"
-							:key="opt.value"
-							:label="opt.label"
-							:value="opt.value" />
-					</el-select>
-				</el-form-item> -->
 			</el-col>
 
 			<el-col :span="12">
-				<el-form-item
-					label="保养频率(天/次)"
-					prop="maintenancePeriod"
-					:rules="[
-						{
-							type: 'number',
-							message: '请输入正确的数字',
-							trigger: 'blur',
-							transform: (val) => Number(val),
-						},
-						{ required: true, message: '保养频率不能为空', trigger: 'blur' },
-					]">
-					<el-input
-						v-model="form.maintenancePeriod"
-						@change="$emit('update', form)"
-						:placeholder="`请输入保养频率`"
-						:disabled="disabled" />
+				<el-form-item label="计划保养人员" prop="maintainer">
+					<span>---</span>
+				</el-form-item>
+			</el-col>
+
+			<el-col :span="12">
+				<el-form-item label="计划开始时间" prop="firstMaintenanceTime">
+					<span>---</span>
+				</el-form-item>
+			</el-col>
+
+			<el-col :span="12">
+				<el-form-item label="计划结束时间" prop="firstMaintenanceTime">
+					<span>---</span>
 				</el-form-item>
 			</el-col>
 
 			<el-col :span="12">
 				<el-form-item
-					label="确认时限(h)"
-					prop="confirmTimeLimit"
-					:rules="[
-						{ required: true, message: '请输入确认时限', trigger: 'blur' },
-						{
-							type: 'number',
-							message: '请输入正确的数字',
-							trigger: 'blur',
-							transform: (val) => Number(val),
-						},
-					]">
-					<el-input
-						v-model="form.confirmTimeLimit"
-						@change="$emit('update', form)"
-						:placeholder="`请输入确认时限(小时)`"
-						:disabled="disabled" />
-				</el-form-item>
-			</el-col>
-
-			<!-- <el-col :span="12">
-				<el-form-item label="保养类型" prop="maintainType">
-					<el-select
-						v-model="form.maintainType"
-						:placeholder="`请选择保养类型`"
-						:disabled="disabled"
-						@change="$emit('update', form)">
-						<el-option
-							v-for="opt in getDictDatas(DICT_TYPE.MAINTAIN_TYPE)"
-							:key="opt.value"
-							:label="opt.label"
-							:value="+opt.value" />
-					</el-select>
-				</el-form-item>
-			</el-col> -->
-
-			<el-col :span="12">
-				<el-form-item
-					label="保养时长(h)"
-					prop="maintainDuration"
-					:rules="[
-						{
-							type: 'number',
-							message: '请输入正确的数字',
-							trigger: 'blur',
-							transform: (val) => Number(val),
-						},
-					]">
-					<el-input
-						v-model="form.maintainDuration"
-						@change="$emit('update', form)"
-						:placeholder="`请输入保养时长(小时)`"
-						:disabled="disabled" />
-				</el-form-item>
-			</el-col>
-
-			<el-col :span="12">
-				<el-form-item
-					label="首次保养时间"
+					label="实际开始时间"
 					prop="firstMaintenanceTime"
 					:rules="[
-						{ required: true, message: '请选择首次保养时间', trigger: 'blur' },
+						{ required: true, message: '请选择实际开始时间', trigger: 'blur' },
 					]">
 					<el-date-picker
 						v-model="form.firstMaintenanceTime"
 						type="datetime"
 						:disabled="edit"
-						:placeholder="`请选择首次保养时间`"
+						placeholder="请选择实际开始时间"
 						@change="$emit('update', form)"
 						value-format="timestamp"></el-date-picker>
 				</el-form-item>
@@ -216,10 +132,27 @@
 
 			<el-col :span="12">
 				<el-form-item
-					label="计划保养人员"
+					label="实际结束时间"
+					prop="firstMaintenanceTime"
+					:rules="[
+						{ required: true, message: '请选择实际结束时间', trigger: 'blur' },
+					]">
+					<el-date-picker
+						v-model="form.firstMaintenanceTime"
+						type="datetime"
+						:disabled="edit"
+						placeholder="请选择实际结束时间"
+						@change="$emit('update', form)"
+						value-format="timestamp"></el-date-picker>
+				</el-form-item>
+			</el-col>
+
+			<el-col :span="12">
+				<el-form-item
+					label="实际保养人员"
 					prop="maintainer"
 					:rules="[
-						{ required: true, message: '请选择计划保养人员', trigger: 'blur' },
+						{ required: true, message: '请选择实际保养人员', trigger: 'blur' },
 					]">
 					<el-select
 						v-model="form.maintainer"

From 86996f8dd2d192109274d024448204d0f59d7849 Mon Sep 17 00:00:00 2001
From: lb <liubin_9396@163.com>
Date: Mon, 5 Feb 2024 11:18:14 +0800
Subject: [PATCH 11/40] 1

---
 .../maintain/WaitingList--add--unplanned.vue  |   8 +-
 .../maintain/WaitingList--edit--planned.vue   | 399 ++++++++++++++++++
 .../maintain/WaitingList--edit--unplanned.vue | 373 ++++++++++++++++
 .../specialEquipment/maintain/WaitingList.vue |   5 +-
 4 files changed, 780 insertions(+), 5 deletions(-)
 create mode 100644 src/views/specialEquipment/maintain/WaitingList--edit--planned.vue
 create mode 100644 src/views/specialEquipment/maintain/WaitingList--edit--unplanned.vue

diff --git a/src/views/specialEquipment/maintain/WaitingList--add--unplanned.vue b/src/views/specialEquipment/maintain/WaitingList--add--unplanned.vue
index 9fc63893..fd013986 100644
--- a/src/views/specialEquipment/maintain/WaitingList--add--unplanned.vue
+++ b/src/views/specialEquipment/maintain/WaitingList--add--unplanned.vue
@@ -30,7 +30,7 @@
 
 			<el-col :span="12">
 				<el-form-item label="保养计划名称" prop="name">
-					<span>---</span>
+					<el-input value="---" disabled />
 				</el-form-item>
 			</el-col>
 
@@ -97,19 +97,19 @@
 
 			<el-col :span="12">
 				<el-form-item label="计划保养人员" prop="maintainer">
-					<span>---</span>
+					<el-input value="---" disabled />
 				</el-form-item>
 			</el-col>
 
 			<el-col :span="12">
 				<el-form-item label="计划开始时间" prop="firstMaintenanceTime">
-					<span>---</span>
+					<el-input value="---" disabled />
 				</el-form-item>
 			</el-col>
 
 			<el-col :span="12">
 				<el-form-item label="计划结束时间" prop="firstMaintenanceTime">
-					<span>---</span>
+					<el-input value="---" disabled />
 				</el-form-item>
 			</el-col>
 
diff --git a/src/views/specialEquipment/maintain/WaitingList--edit--planned.vue b/src/views/specialEquipment/maintain/WaitingList--edit--planned.vue
new file mode 100644
index 00000000..5b8240cc
--- /dev/null
+++ b/src/views/specialEquipment/maintain/WaitingList--edit--planned.vue
@@ -0,0 +1,399 @@
+<!-- 
+    filename: dialogForm.vue
+    author: liubin
+    date: 2023-08-15 10:32:36
+    description: 弹窗的表单组件
+-->
+
+<template>
+	<el-form
+		ref="form"
+		:model="form"
+		:size="size"
+		:label-position="labelPosition"
+		v-loading="formLoading">
+		<el-row :gutter="20">
+			<el-col :span="12">
+				<el-form-item
+					label="保养计划单号"
+					prop="code"
+					:rules="[
+						{ required: true, message: '请输入保养计划单号', trigger: 'blur' },
+					]">
+					<el-input
+						v-model="form.code"
+						@change="$emit('update', form)"
+						:placeholder="`请输入保养计划单号`"
+						:disabled="disabled" />
+				</el-form-item>
+			</el-col>
+
+			<el-col :span="12">
+				<el-form-item label="保养计划名称" prop="name">
+					<el-input
+						v-model="form.name"
+						disabled
+						:placeholder="`请输入保养计划名称`" />
+				</el-form-item>
+			</el-col>
+
+			<el-col :span="12">
+				<el-form-item
+					label="部门"
+					prop="departmentId"
+					:rules="[{ required: true, message: '请选择部门', trigger: 'blur' }]">
+					<el-select
+						v-model="form.departmentId"
+						:placeholder="`请选择部门`"
+						:disabled="disabled"
+						clearable
+						filterable
+						@change="$emit('update', form)">
+						<el-option
+							v-for="opt in departmentOptions"
+							:key="opt.value"
+							:label="opt.label"
+							:value="opt.value" />
+					</el-select>
+				</el-form-item>
+
+				<!-- <el-form-item
+					label="设备大类"
+					prop="equipmentCategory"
+					:rules="[
+						{ required: true, message: '请选择设备大类', trigger: 'blur' },
+					]">
+					<el-select
+						v-model="form.equipmentCategory"
+						:placeholder="`请选择设备大类`"
+						:disabled="disabled"
+						@change="handleEqTypeChange">
+						<el-option
+							v-for="opt in equipmentTypeOptions"
+							:key="opt.value"
+							:label="opt.label"
+							:value="opt.value" />
+					</el-select>
+				</el-form-item> -->
+			</el-col>
+
+			<el-col :span="12">
+				<el-form-item
+					label="产线"
+					prop="lineId"
+					:rules="[{ required: true, message: '请选择产线', trigger: 'blur' }]">
+					<el-select
+						v-model="form.lineId"
+						:placeholder="`请选择产线`"
+						:disabled="disabled"
+						clearable
+						filterable
+						@change="$emit('update', form)">
+						<el-option
+							v-for="opt in lineOptions"
+							:key="opt.value"
+							:label="opt.label"
+							:value="opt.value" />
+					</el-select>
+				</el-form-item>
+			</el-col>
+
+			<el-col :span="12">
+				<el-form-item label="计划保养人员" prop="maintainer">
+					<el-input v-model="form.maintainer" disabled />
+				</el-form-item>
+			</el-col>
+ 
+
+			<el-col :span="12">
+				<el-form-item
+					label="计划开始时间"
+					prop="firstMaintenanceTime"
+					:rules="[
+						{ required: true, message: '请选择计划开始时间', trigger: 'blur' },
+					]">
+					<el-date-picker
+						v-model="form.firstMaintenanceTime"
+						type="datetime"
+						:disabled="edit"
+						placeholder="请选择计划开始时间"
+						@change="$emit('update', form)"
+						value-format="timestamp"></el-date-picker>
+				</el-form-item>
+			</el-col>
+
+			<el-col :span="12">
+				<el-form-item
+					label="计划结束时间"
+					prop="firstMaintenanceTime"
+					:rules="[
+						{ required: true, message: '请选择计划结束时间', trigger: 'blur' },
+					]">
+					<el-date-picker
+						v-model="form.firstMaintenanceTime"
+						type="datetime"
+						:disabled="edit"
+						placeholder="请选择计划结束时间"
+						@change="$emit('update', form)"
+						value-format="timestamp"></el-date-picker>
+				</el-form-item>
+			</el-col>
+
+			<el-col :span="12">
+				<el-form-item
+					label="实际开始时间"
+					prop="firstMaintenanceTime"
+					:rules="[
+						{ required: true, message: '请选择实际开始时间', trigger: 'blur' },
+					]">
+					<el-date-picker
+						v-model="form.firstMaintenanceTime"
+						type="datetime"
+						:disabled="edit"
+						placeholder="请选择实际开始时间"
+						@change="$emit('update', form)"
+						value-format="timestamp"></el-date-picker>
+				</el-form-item>
+			</el-col>
+
+			<el-col :span="12">
+				<el-form-item
+					label="实际结束时间"
+					prop="firstMaintenanceTime"
+					:rules="[
+						{ required: true, message: '请选择实际结束时间', trigger: 'blur' },
+					]">
+					<el-date-picker
+						v-model="form.firstMaintenanceTime"
+						type="datetime"
+						:disabled="edit"
+						placeholder="请选择实际结束时间"
+						@change="$emit('update', form)"
+						value-format="timestamp"></el-date-picker>
+				</el-form-item>
+			</el-col>
+
+			<el-col :span="12">
+				<el-form-item
+					label="实际保养人员"
+					prop="maintainer"
+					:rules="[
+						{ required: true, message: '请选择实际保养人员', trigger: 'blur' },
+					]">
+					<el-select
+						v-model="form.maintainer"
+						:placeholder="`请选择计划保养人员`"
+						:disabled="disabled"
+						multiple
+						clearable
+						filterable
+						@change="$emit('update', form)">
+						<el-option
+							v-for="opt in maintainerOptions"
+							:key="opt.value"
+							:label="opt.label"
+							:value="opt.value" />
+					</el-select>
+				</el-form-item>
+			</el-col>
+
+			<el-col :span="24">
+				<el-form-item label="备注" prop="remark">
+					<el-input
+						v-model="form.remark"
+						@change="$emit('update', form)"
+						:placeholder="`请输入备注`"
+						:disabled="disabled" />
+				</el-form-item>
+			</el-col>
+		</el-row>
+	</el-form>
+</template>
+
+<script>
+export default {
+	name: 'DialogForm',
+	model: {
+		prop: 'dataForm',
+		event: 'update',
+	},
+	emits: ['update'],
+	components: {},
+	props: {
+		rows: {
+			type: Array,
+			default: () => [],
+		},
+		dataForm: {
+			type: Object,
+			default: () => ({}),
+		},
+		disabled: {
+			type: Boolean,
+			default: false,
+		},
+		edit: {
+			type: Boolean,
+			default: false,
+		},
+		hasFiles: {
+			type: Boolean | Array,
+			default: false,
+		},
+		labelPosition: {
+			type: String,
+			default: 'right',
+		},
+		size: {
+			type: String,
+			default: '',
+		},
+	},
+	data() {
+		return {
+			form: {},
+			formLoading: true,
+			equipmentTypeOptions: [
+				{ label: '安全设备', value: 1 },
+				{ label: '消防设备', value: 2 },
+				{ label: '特种设备', value: 3 },
+			],
+			lineList: [],
+			maintainerList: [],
+			departmentList: [],
+		};
+	},
+	watch: {
+		dataForm: {
+			handler(val) {
+				this.form = JSON.parse(JSON.stringify(val));
+				if (typeof val.maintainer == 'string')
+					this.form.maintainer = val.maintainer.split(',');
+				if (this.form.equipmentCategory != null) {
+					setTimeout(() => {
+						this.equipmentOptions = this.equipmentList
+							.filter((item) => item.special)
+							.filter(
+								(item) => item.specialType === this.form.equipmentCategory
+							)
+							.map((item) => ({ label: item.name, value: item.id }));
+					}, 1000);
+				}
+				if (this.hasFiles) {
+					if (typeof this.hasFiles == 'boolean' && this.hasFiles) {
+						this.form.files = this.form.files ?? [];
+					} else if (Array.isArray(this.hasFiles)) {
+						this.hasFiles.forEach((prop) => {
+							this.form[prop] = this.form[prop] ?? [];
+						});
+					}
+				}
+			},
+			deep: true,
+			immediate: true,
+		},
+	},
+	mounted() {
+		!this.edit && this.getCode('/base/equipment-maintain-plan/getCode');
+		this.getList('maintainer');
+		this.getList('department');
+		this.getList('line');
+	},
+	computed: {
+		departmentOptions() {
+			return (this.departmentList || []).map((item) => ({
+				id: item.id,
+				label: item.name,
+				value: item.id,
+			}));
+		},
+		lineOptions() {
+			return (this.lineList || []).map((item) => ({
+				id: item.id,
+				label: item.name,
+				value: item.id,
+			}));
+		},
+		maintainerOptions() {
+			return (this.maintainerList || []).map((item) => ({
+				id: item.id,
+				label: item.name,
+				value: item.name,
+			}));
+		},
+	},
+	methods: {
+		/** 模拟透传 ref  */
+		validate(cb) {
+			return this.$refs.form.validate(cb);
+		},
+		resetFields(args) {
+			return this.$refs.form.resetFields(args);
+		},
+		// getCode
+		async getCode(url) {
+			this.formLoading = true;
+			const response = await this.$axios(url);
+			this.formLoading = false;
+			this.form.code = response.data || '';
+		},
+		// initialize
+		async getEquipmentList() {
+			this.formLoading = true;
+			const response = await this.$axios('/base/core-equipment/listAll');
+			this.equipmentList = response.data || [];
+			this.equipmentOptions = (response.data || []).map((item) => ({
+				label: item.name,
+				value: item.id,
+			}));
+			this.formLoading = false;
+		},
+		async getList(source = 'department') {
+			const urls = [
+				'/base/core-production-line/listAll',
+				'/base/core-department/listAll',
+				'/base/core-worker/listAll',
+			];
+			let res;
+			switch (source) {
+				case 'department':
+					res = await this.$axios(urls[1]);
+					this.departmentList = res.data || [];
+					break;
+				case 'maintainer':
+					res = await this.$axios(urls[2]);
+					this.maintainerList = res.data || [];
+					break;
+				case 'line':
+					res = await this.$axios(urls[0]);
+					this.lineList = res.data || [];
+					break;
+			}
+			this.formLoading = false;
+		},
+
+		// handlers
+		handleEqTypeChange(type) {
+			this.form.equipmentId = null;
+			if (type) {
+				this.equipmentOptions = this.equipmentList
+					.filter((item) => item.special)
+					.filter((item) => item.specialType === type)
+					.map((item) => ({ label: item.name, value: item.id }));
+			} else
+				this.equipmentOptions = this.equipmentList.map((item) => ({
+					label: item.name,
+					value: item.id,
+				}));
+			// this.$emit('update', this.form)
+		},
+	},
+};
+</script>
+
+<style scoped lang="scss">
+.el-date-editor,
+.el-select {
+	width: 100%;
+}
+</style>
diff --git a/src/views/specialEquipment/maintain/WaitingList--edit--unplanned.vue b/src/views/specialEquipment/maintain/WaitingList--edit--unplanned.vue
new file mode 100644
index 00000000..9fc63893
--- /dev/null
+++ b/src/views/specialEquipment/maintain/WaitingList--edit--unplanned.vue
@@ -0,0 +1,373 @@
+<!-- 
+    filename: dialogForm.vue
+    author: liubin
+    date: 2023-08-15 10:32:36
+    description: 弹窗的表单组件
+-->
+
+<template>
+	<el-form
+		ref="form"
+		:model="form"
+		:size="size"
+		:label-position="labelPosition"
+		v-loading="formLoading">
+		<el-row :gutter="20">
+			<el-col :span="12">
+				<el-form-item
+					label="保养计划单号"
+					prop="code"
+					:rules="[
+						{ required: true, message: '请输入保养计划单号', trigger: 'blur' },
+					]">
+					<el-input
+						v-model="form.code"
+						@change="$emit('update', form)"
+						:placeholder="`请输入保养计划单号`"
+						:disabled="disabled" />
+				</el-form-item>
+			</el-col>
+
+			<el-col :span="12">
+				<el-form-item label="保养计划名称" prop="name">
+					<span>---</span>
+				</el-form-item>
+			</el-col>
+
+			<el-col :span="12">
+				<el-form-item
+					label="部门"
+					prop="departmentId"
+					:rules="[{ required: true, message: '请选择部门', trigger: 'blur' }]">
+					<el-select
+						v-model="form.departmentId"
+						:placeholder="`请选择部门`"
+						:disabled="disabled"
+						clearable
+						filterable
+						@change="$emit('update', form)">
+						<el-option
+							v-for="opt in departmentOptions"
+							:key="opt.value"
+							:label="opt.label"
+							:value="opt.value" />
+					</el-select>
+				</el-form-item>
+
+				<!-- <el-form-item
+					label="设备大类"
+					prop="equipmentCategory"
+					:rules="[
+						{ required: true, message: '请选择设备大类', trigger: 'blur' },
+					]">
+					<el-select
+						v-model="form.equipmentCategory"
+						:placeholder="`请选择设备大类`"
+						:disabled="disabled"
+						@change="handleEqTypeChange">
+						<el-option
+							v-for="opt in equipmentTypeOptions"
+							:key="opt.value"
+							:label="opt.label"
+							:value="opt.value" />
+					</el-select>
+				</el-form-item> -->
+			</el-col>
+
+			<el-col :span="12">
+				<el-form-item
+					label="产线"
+					prop="lineId"
+					:rules="[{ required: true, message: '请选择产线', trigger: 'blur' }]">
+					<el-select
+						v-model="form.lineId"
+						:placeholder="`请选择产线`"
+						:disabled="disabled"
+						clearable
+						filterable
+						@change="$emit('update', form)">
+						<el-option
+							v-for="opt in lineOptions"
+							:key="opt.value"
+							:label="opt.label"
+							:value="opt.value" />
+					</el-select>
+				</el-form-item>
+			</el-col>
+
+			<el-col :span="12">
+				<el-form-item label="计划保养人员" prop="maintainer">
+					<span>---</span>
+				</el-form-item>
+			</el-col>
+
+			<el-col :span="12">
+				<el-form-item label="计划开始时间" prop="firstMaintenanceTime">
+					<span>---</span>
+				</el-form-item>
+			</el-col>
+
+			<el-col :span="12">
+				<el-form-item label="计划结束时间" prop="firstMaintenanceTime">
+					<span>---</span>
+				</el-form-item>
+			</el-col>
+
+			<el-col :span="12">
+				<el-form-item
+					label="实际开始时间"
+					prop="firstMaintenanceTime"
+					:rules="[
+						{ required: true, message: '请选择实际开始时间', trigger: 'blur' },
+					]">
+					<el-date-picker
+						v-model="form.firstMaintenanceTime"
+						type="datetime"
+						:disabled="edit"
+						placeholder="请选择实际开始时间"
+						@change="$emit('update', form)"
+						value-format="timestamp"></el-date-picker>
+				</el-form-item>
+			</el-col>
+
+			<el-col :span="12">
+				<el-form-item
+					label="实际结束时间"
+					prop="firstMaintenanceTime"
+					:rules="[
+						{ required: true, message: '请选择实际结束时间', trigger: 'blur' },
+					]">
+					<el-date-picker
+						v-model="form.firstMaintenanceTime"
+						type="datetime"
+						:disabled="edit"
+						placeholder="请选择实际结束时间"
+						@change="$emit('update', form)"
+						value-format="timestamp"></el-date-picker>
+				</el-form-item>
+			</el-col>
+
+			<el-col :span="12">
+				<el-form-item
+					label="实际保养人员"
+					prop="maintainer"
+					:rules="[
+						{ required: true, message: '请选择实际保养人员', trigger: 'blur' },
+					]">
+					<el-select
+						v-model="form.maintainer"
+						:placeholder="`请选择计划保养人员`"
+						:disabled="disabled"
+						multiple
+						clearable
+						filterable
+						@change="$emit('update', form)">
+						<el-option
+							v-for="opt in maintainerOptions"
+							:key="opt.value"
+							:label="opt.label"
+							:value="opt.value" />
+					</el-select>
+				</el-form-item>
+			</el-col>
+
+			<el-col :span="24">
+				<el-form-item label="备注" prop="remark">
+					<el-input
+						v-model="form.remark"
+						@change="$emit('update', form)"
+						:placeholder="`请输入备注`"
+						:disabled="disabled" />
+				</el-form-item>
+			</el-col>
+		</el-row>
+	</el-form>
+</template>
+
+<script>
+export default {
+	name: 'DialogForm',
+	model: {
+		prop: 'dataForm',
+		event: 'update',
+	},
+	emits: ['update'],
+	components: {},
+	props: {
+		rows: {
+			type: Array,
+			default: () => [],
+		},
+		dataForm: {
+			type: Object,
+			default: () => ({}),
+		},
+		disabled: {
+			type: Boolean,
+			default: false,
+		},
+		edit: {
+			type: Boolean,
+			default: false,
+		},
+		hasFiles: {
+			type: Boolean | Array,
+			default: false,
+		},
+		labelPosition: {
+			type: String,
+			default: 'right',
+		},
+		size: {
+			type: String,
+			default: '',
+		},
+	},
+	data() {
+		return {
+			form: {},
+			formLoading: true,
+			equipmentTypeOptions: [
+				{ label: '安全设备', value: 1 },
+				{ label: '消防设备', value: 2 },
+				{ label: '特种设备', value: 3 },
+			],
+			lineList: [],
+			maintainerList: [],
+			departmentList: [],
+		};
+	},
+	watch: {
+		dataForm: {
+			handler(val) {
+				this.form = JSON.parse(JSON.stringify(val));
+				if (typeof val.maintainer == 'string')
+					this.form.maintainer = val.maintainer.split(',');
+				if (this.form.equipmentCategory != null) {
+					setTimeout(() => {
+						this.equipmentOptions = this.equipmentList
+							.filter((item) => item.special)
+							.filter(
+								(item) => item.specialType === this.form.equipmentCategory
+							)
+							.map((item) => ({ label: item.name, value: item.id }));
+					}, 1000);
+				}
+				if (this.hasFiles) {
+					if (typeof this.hasFiles == 'boolean' && this.hasFiles) {
+						this.form.files = this.form.files ?? [];
+					} else if (Array.isArray(this.hasFiles)) {
+						this.hasFiles.forEach((prop) => {
+							this.form[prop] = this.form[prop] ?? [];
+						});
+					}
+				}
+			},
+			deep: true,
+			immediate: true,
+		},
+	},
+	mounted() {
+		!this.edit && this.getCode('/base/equipment-maintain-plan/getCode');
+		this.getList('maintainer');
+		this.getList('department');
+		this.getList('line');
+	},
+	computed: {
+		departmentOptions() {
+			return (this.departmentList || []).map((item) => ({
+				id: item.id,
+				label: item.name,
+				value: item.id,
+			}));
+		},
+		lineOptions() {
+			return (this.lineList || []).map((item) => ({
+				id: item.id,
+				label: item.name,
+				value: item.id,
+			}));
+		},
+		maintainerOptions() {
+			return (this.maintainerList || []).map((item) => ({
+				id: item.id,
+				label: item.name,
+				value: item.name,
+			}));
+		},
+	},
+	methods: {
+		/** 模拟透传 ref  */
+		validate(cb) {
+			return this.$refs.form.validate(cb);
+		},
+		resetFields(args) {
+			return this.$refs.form.resetFields(args);
+		},
+		// getCode
+		async getCode(url) {
+			this.formLoading = true;
+			const response = await this.$axios(url);
+			this.formLoading = false;
+			this.form.code = response.data || '';
+		},
+		// initialize
+		async getEquipmentList() {
+			this.formLoading = true;
+			const response = await this.$axios('/base/core-equipment/listAll');
+			this.equipmentList = response.data || [];
+			this.equipmentOptions = (response.data || []).map((item) => ({
+				label: item.name,
+				value: item.id,
+			}));
+			this.formLoading = false;
+		},
+		async getList(source = 'department') {
+			const urls = [
+				'/base/core-production-line/listAll',
+				'/base/core-department/listAll',
+				'/base/core-worker/listAll',
+			];
+			let res;
+			switch (source) {
+				case 'department':
+					res = await this.$axios(urls[1]);
+					this.departmentList = res.data || [];
+					break;
+				case 'maintainer':
+					res = await this.$axios(urls[2]);
+					this.maintainerList = res.data || [];
+					break;
+				case 'line':
+					res = await this.$axios(urls[0]);
+					this.lineList = res.data || [];
+					break;
+			}
+			this.formLoading = false;
+		},
+
+		// handlers
+		handleEqTypeChange(type) {
+			this.form.equipmentId = null;
+			if (type) {
+				this.equipmentOptions = this.equipmentList
+					.filter((item) => item.special)
+					.filter((item) => item.specialType === type)
+					.map((item) => ({ label: item.name, value: item.id }));
+			} else
+				this.equipmentOptions = this.equipmentList.map((item) => ({
+					label: item.name,
+					value: item.id,
+				}));
+			// this.$emit('update', this.form)
+		},
+	},
+};
+</script>
+
+<style scoped lang="scss">
+.el-date-editor,
+.el-select {
+	width: 100%;
+}
+</style>
diff --git a/src/views/specialEquipment/maintain/WaitingList.vue b/src/views/specialEquipment/maintain/WaitingList.vue
index d12d47d4..cc3b17f8 100644
--- a/src/views/specialEquipment/maintain/WaitingList.vue
+++ b/src/views/specialEquipment/maintain/WaitingList.vue
@@ -39,7 +39,7 @@
 			:limit.sync="queryParams.pageSize"
 			@pagination="getList" />
 
-		<!-- 对话框(添加 / 修改) -->
+		<!-- 对话框(添加) -->
 		<base-dialog
 			:dialogTitle="title"
 			:dialogVisible="open"
@@ -61,10 +61,13 @@
 			</el-row>
 		</base-dialog>
 
+		<!-- 编辑 -->
 		<!-- <RecordDetail
 			v-if="recordDetailVisible"
 			ref="recordDetailDrawer"
 			@closed="recordDetailVisible = false" /> -->
+
+		<!-- 详情  -->
 	</div>
 </template>
 

From f67930941fa8fbcedb26c56b803c90da0f47dac4 Mon Sep 17 00:00:00 2001
From: lb <liubin_9396@163.com>
Date: Mon, 5 Feb 2024 16:12:31 +0800
Subject: [PATCH 12/40] before change table

---
 .../maintain/WaitingList--add--unplanned.vue  |  24 +-
 .../specialEquipment/maintain/WaitingList.vue | 243 +++++++++++-------
 2 files changed, 163 insertions(+), 104 deletions(-)

diff --git a/src/views/specialEquipment/maintain/WaitingList--add--unplanned.vue b/src/views/specialEquipment/maintain/WaitingList--add--unplanned.vue
index fd013986..b4d9d4ca 100644
--- a/src/views/specialEquipment/maintain/WaitingList--add--unplanned.vue
+++ b/src/views/specialEquipment/maintain/WaitingList--add--unplanned.vue
@@ -16,12 +16,12 @@
 			<el-col :span="12">
 				<el-form-item
 					label="保养计划单号"
-					prop="code"
+					prop="maintainOrderNumber"
 					:rules="[
 						{ required: true, message: '请输入保养计划单号', trigger: 'blur' },
 					]">
 					<el-input
-						v-model="form.code"
+						v-model="form.maintainOrderNumber"
 						@change="$emit('update', form)"
 						:placeholder="`请输入保养计划单号`"
 						:disabled="disabled" />
@@ -102,13 +102,13 @@
 			</el-col>
 
 			<el-col :span="12">
-				<el-form-item label="计划开始时间" prop="firstMaintenanceTime">
+				<el-form-item label="计划开始时间" prop="planStartTime">
 					<el-input value="---" disabled />
 				</el-form-item>
 			</el-col>
 
 			<el-col :span="12">
-				<el-form-item label="计划结束时间" prop="firstMaintenanceTime">
+				<el-form-item label="计划结束时间" prop="planEndTime">
 					<el-input value="---" disabled />
 				</el-form-item>
 			</el-col>
@@ -116,12 +116,12 @@
 			<el-col :span="12">
 				<el-form-item
 					label="实际开始时间"
-					prop="firstMaintenanceTime"
+					prop="startTime"
 					:rules="[
 						{ required: true, message: '请选择实际开始时间', trigger: 'blur' },
 					]">
 					<el-date-picker
-						v-model="form.firstMaintenanceTime"
+						v-model="form.startTime"
 						type="datetime"
 						:disabled="edit"
 						placeholder="请选择实际开始时间"
@@ -133,12 +133,12 @@
 			<el-col :span="12">
 				<el-form-item
 					label="实际结束时间"
-					prop="firstMaintenanceTime"
+					prop="endTime"
 					:rules="[
 						{ required: true, message: '请选择实际结束时间', trigger: 'blur' },
 					]">
 					<el-date-picker
-						v-model="form.firstMaintenanceTime"
+						v-model="form.endTime"
 						type="datetime"
 						:disabled="edit"
 						placeholder="请选择实际结束时间"
@@ -150,13 +150,13 @@
 			<el-col :span="12">
 				<el-form-item
 					label="实际保养人员"
-					prop="maintainer"
+					prop="maintainWorker"
 					:rules="[
 						{ required: true, message: '请选择实际保养人员', trigger: 'blur' },
 					]">
 					<el-select
-						v-model="form.maintainer"
-						:placeholder="`请选择计划保养人员`"
+						v-model="form.maintainWorker"
+						:placeholder="`请选择实际保养人员`"
 						:disabled="disabled"
 						multiple
 						clearable
@@ -268,7 +268,7 @@ export default {
 		},
 	},
 	mounted() {
-		!this.edit && this.getCode('/base/equipment-maintain-plan/getCode');
+		// !this.edit && this.getCode('/base/equipment-maintain-plan/getCode');
 		this.getList('maintainer');
 		this.getList('department');
 		this.getList('line');
diff --git a/src/views/specialEquipment/maintain/WaitingList.vue b/src/views/specialEquipment/maintain/WaitingList.vue
index cc3b17f8..b7d6d4f4 100644
--- a/src/views/specialEquipment/maintain/WaitingList.vue
+++ b/src/views/specialEquipment/maintain/WaitingList.vue
@@ -120,6 +120,7 @@ export default {
 				// 'equipmentId',
 				// 'specialType',
 			],
+			tobeConfirmedIdList: [],
 			tableBtn: [
 				// this.$auth.hasPermi('equipment:maintain-record:update')
 				// 	? {
@@ -150,16 +151,51 @@ export default {
 				// },
 				{
 					type: 'selection',
-					prop: '_selection',
-					label: '批量选择',
-					width: 128,
-					selectable: (row, index) => {
-						return index % 2 == 0;
-					},
+					// prop: '_selection',
+					// label: '批量选择',
+					width: 48,
 					subcomponent: {
-						render: (h, { row, index }) => {
-							return <h1>hello</h1>;
-							// return <el-checkbox v-model={this.$refs.table.selection} />
+						props: ['injectData'],
+						data() {
+							return {
+								outside: false,
+								selected: false,
+							};
+						},
+						watch: {
+							selected(val) {
+								if (!this.outside) {
+									console.log("emit row-selected...")
+									this.$emit('emitData', {
+										action: 'row-selected',
+										value: {
+											row: this.injectData,
+											selected: val,
+										},
+									});
+								}
+							},
+							injectData: {
+								deep: true,
+								immediate: true,
+								handler: function (val) {
+									this.outside = true;
+									this.selected = !!((val._selection & 0b01) != 0);
+									this.$nextTick(() => {
+										this.outside = false;
+									})
+								},
+							},
+						},
+						render(h) {
+							const enabled = 0b10 & this.injectData._selection;
+							// return this.injectData?._selection ? h('h1', null, 'hello') : h('h1', null, '1');
+							return (
+								<div>
+									<span>{this.selected}</span>
+									<el-checkbox disabled={!enabled} v-model={this.selected} />
+								</div>
+							);
 						},
 					},
 				},
@@ -397,6 +433,15 @@ export default {
 			allSpecialEquipments: [],
 		};
 	},
+	watch: {
+		tobeConfirmedIdList: {
+			handler(val) {
+				if (val.length == this.list.length) {
+					this.$refs['table'].toggleAllSelection();
+				}
+			},
+		},
+	},
 	created() {
 		this.initSearchBar();
 		// if (this.$route.query) {
@@ -426,7 +471,31 @@ export default {
 	},
 	methods: {
 		handleSelectionChange(list) {
-			console.log('handleSelectionChange', list);
+			if (this.tobeConfirmedIdList.length) {
+				this.tobeConfirmedIdList = [];
+				this.list.forEach((item) => {
+					this.handleEmitFun({
+						action: 'row-selected',
+						value: { row: item, selected: false },
+					});
+				});
+				console.log(
+					'清空选择列表',
+					this.list.map((item) => item._selection)
+				);
+			} else {
+				this.tobeConfirmedIdList = list.map((item) => item.id);
+				this.list.forEach((item) => {
+					this.handleEmitFun({
+						action: 'row-selected',
+						value: { row: item, selected: true },
+					});
+				});
+				console.log(
+					'全选',
+					this.list.map((item) => item._selection)
+				);
+			}
 		},
 
 		handleEmitFun({ action, value }) {
@@ -441,6 +510,18 @@ export default {
 						});
 					});
 					break;
+				case 'row-selected':
+					if (value.selected) {
+						this.tobeConfirmedIdList.push(value.row.id);
+						value.row._selection = 0b11;
+					} else {
+						const index = this.tobeConfirmedIdList.indexOf(value.row.id);
+						if (index != -1) {
+							this.tobeConfirmedIdList.splice(index, 1);
+						}
+					}
+					console.log('tobeConfirmedIdList', this.tobeConfirmedIdList);
+					break;
 			}
 		},
 
@@ -455,16 +536,6 @@ export default {
 				);
 			}
 		},
-		// setSearchBarEquipmentList(eqList) {
-		// 	this.$set(
-		// 		this.searchBarFormConfig[1],
-		// 		'selectOptions',
-		// 		eqList.map((item) => ({
-		// 			name: item.name,
-		// 			id: item.id,
-		// 		}))
-		// 	);
-		// },
 		initSearchBar() {
 			// this.http('/base/core-equipment/listAll', 'get').then(({ data }) => {
 			// 	this.allSpecialEquipments = data.filter((item) => item.special);
@@ -490,28 +561,20 @@ export default {
 		getList() {
 			this.loading = true;
 			// 执行查询
-			this.recv({ ...this.queryParams, special: true, confirmed: false }).then(
-				(response) => {
-					this.list =
-						// [
-						// 	{
-						// 		id: 213,
-						// 		maintainOrderNumber: 123,
-						// 		planName: 'hhh',
-						// 		departmentName: 'asdf',
-						// 		lineName: 456,
-						// 		planStartTime: '2024-01-01',
-						// 		planEndTime: '2024-01-01',
-						// 		startTime: '2024-01-01',
-						// 		endTime: '2024-01-01',
-						// 		relatePlan: 1,
-						// 	},
-						// ];
-						response.data.list;
-					this.total = response.data.total;
-					this.loading = false;
-				}
-			);
+			this.recv({
+				...this.queryParams,
+				special: true,
+				relatePlan: 2,
+				confirmed: false,
+			}).then((response) => {
+				this.list = response.data.list.map((item) => ({
+					...item,
+					planName: '---',
+					_selection: 0b10,
+				}));
+				this.total = response.data.total;
+				this.loading = false;
+			});
 		},
 		/** 取消按钮 */
 		cancel() {
@@ -524,22 +587,13 @@ export default {
 			this.form = {
 				id: null,
 				relatePlan: null,
-				maintainPlanId: null,
-				equipmentId: null,
 				maintainWorker: [],
 				maintainOrderNumber: null,
+				departmentId: null,
+				lineId: null,
 				startTime: null,
 				endTime: null,
-				timeUsed: null,
 				remark: null,
-				maintenanceDes: null,
-				files: [
-					// {
-					// 	fileName: '',
-					// 	fileType: '',
-					// 	fileUrl: '',
-					// },
-				],
 			};
 			this.resetForm('form');
 		},
@@ -556,32 +610,32 @@ export default {
 		/** 新增按钮操作 */
 		handleAdd() {
 			this.reset();
-			if (this.$route.query.addRecord) {
-				// 赋值
-				const tempRow = this.$route.query.row;
-				this.form.equipmentId = tempRow.equipmentId;
-				this.form.relatePlan = tempRow.nextMaintainTime ? 1 : 2;
-				this.form.startTime = tempRow.nextMaintainTime;
-				this.form.maintainPlanId = tempRow.id;
-				// await (() => {
-				// 	return new Promise((acpt, rejt) => {
-				// 		this.form.relatePlan =
-				// 			this.$route.query.relatePlan ||
-				// 			(tempRow.nextMaintainTime ? 1 : 2);
-				// 		this.form.startTime = tempRow.nextMaintainTime;
-				// 		acpt();
-				// 	});
-				// })();
-				// this.$nextTick(() => {
-				// 	this.form.maintainPlanId = tempRow.id;
-				// 	this.form.equipmentId = tempRow.equipmentId;
-				// });
-			}
-			if (this.$route.query.isAdd) {
-				// 赋值
-				this.form.equipmentId = this.$route.query.equipmentId;
-				this.form.maintainPlanId = this.$route.query.maintainPlanId;
-			}
+			// if (this.$route.query.addRecord) {
+			// 	// 赋值
+			// 	const tempRow = this.$route.query.row;
+			// 	this.form.equipmentId = tempRow.equipmentId;
+			// 	this.form.relatePlan = tempRow.nextMaintainTime ? 1 : 2;
+			// 	this.form.startTime = tempRow.nextMaintainTime;
+			// 	this.form.maintainPlanId = tempRow.id;
+			// 	// await (() => {
+			// 	// 	return new Promise((acpt, rejt) => {
+			// 	// 		this.form.relatePlan =
+			// 	// 			this.$route.query.relatePlan ||
+			// 	// 			(tempRow.nextMaintainTime ? 1 : 2);
+			// 	// 		this.form.startTime = tempRow.nextMaintainTime;
+			// 	// 		acpt();
+			// 	// 	});
+			// 	// })();
+			// 	// this.$nextTick(() => {
+			// 	// 	this.form.maintainPlanId = tempRow.id;
+			// 	// 	this.form.equipmentId = tempRow.equipmentId;
+			// 	// });
+			// }
+			// if (this.$route.query.isAdd) {
+			// 	// 赋值
+			// 	this.form.equipmentId = this.$route.query.equipmentId;
+			// 	this.form.maintainPlanId = this.$route.query.maintainPlanId;
+			// }
 			this.open = true;
 			this.title = '添加待确认保养记录';
 		},
@@ -607,6 +661,8 @@ export default {
 					this.put({
 						...this.form,
 						maintainWorker: this.form.maintainWorker.join(','),
+						special: true,
+						relatePlan: 2,
 					}).then((response) => {
 						this.$modal.msgSuccess('修改成功');
 						this.open = false;
@@ -618,24 +674,27 @@ export default {
 				this.post({
 					...this.form,
 					maintainWorker: this.form.maintainWorker.join(','),
+					special: true,
+					relatePlan: 2,
 				}).then((response) => {
 					this.$modal.msgSuccess('新增成功');
 
 					// 跳转至 备品备件 保养
-					const toSparePartsMaintain = () => {
-						this.open = false;
-						// 没有备品备件保养模块。。。
-					};
+					// const toSparePartsMaintain = () => {
+					// 	this.open = false;
+					// };
 
-					this.$confirm('是否有备品备件更换?', '提示', {
-						confirmButtonText: '有',
-						cancelButtonText: '没有',
-					})
-						.then(toSparePartsMaintain)
-						.catch(() => {
-							this.open = false;
-							this.getList();
-						});
+					// this.$confirm('是否有备品备件更换?', '提示', {
+					// 	confirmButtonText: '有',
+					// 	cancelButtonText: '没有',
+					// })
+					// 	.then(toSparePartsMaintain)
+					// 	.catch(() => {
+					// 		this.open = false;
+					// 		this.getList();
+					// 	});
+					this.open = false;
+					this.getList();
 				});
 			});
 		},

From 441a0f537126ea1314a452ec7b397f42acd0a1c8 Mon Sep 17 00:00:00 2001
From: lb <liubin_9396@163.com>
Date: Mon, 5 Feb 2024 16:45:23 +0800
Subject: [PATCH 13/40] update new table

---
 .../specialEquipment/maintain/WaitingList.vue |   5 +-
 .../maintain/WaitingListTable.vue             | 229 ++++++++
 .../maintain/iconfont/demo.css                | 539 ++++++++++++++++++
 .../maintain/iconfont/demo_index.html         | 306 ++++++++++
 .../maintain/iconfont/iconfont.css            |  38 ++
 .../maintain/iconfont/iconfont.eot            | Bin 0 -> 2664 bytes
 .../maintain/iconfont/iconfont.js             |   1 +
 .../maintain/iconfont/iconfont.json           |  44 ++
 .../maintain/iconfont/iconfont.svg            |  29 +
 .../maintain/iconfont/iconfont.ttf            | Bin 0 -> 2496 bytes
 .../maintain/iconfont/iconfont.woff           | Bin 0 -> 1544 bytes
 .../maintain/iconfont/iconfont.woff2          | Bin 0 -> 1120 bytes
 12 files changed, 1190 insertions(+), 1 deletion(-)
 create mode 100644 src/views/specialEquipment/maintain/WaitingListTable.vue
 create mode 100644 src/views/specialEquipment/maintain/iconfont/demo.css
 create mode 100644 src/views/specialEquipment/maintain/iconfont/demo_index.html
 create mode 100644 src/views/specialEquipment/maintain/iconfont/iconfont.css
 create mode 100644 src/views/specialEquipment/maintain/iconfont/iconfont.eot
 create mode 100644 src/views/specialEquipment/maintain/iconfont/iconfont.js
 create mode 100644 src/views/specialEquipment/maintain/iconfont/iconfont.json
 create mode 100644 src/views/specialEquipment/maintain/iconfont/iconfont.svg
 create mode 100644 src/views/specialEquipment/maintain/iconfont/iconfont.ttf
 create mode 100644 src/views/specialEquipment/maintain/iconfont/iconfont.woff
 create mode 100644 src/views/specialEquipment/maintain/iconfont/iconfont.woff2

diff --git a/src/views/specialEquipment/maintain/WaitingList.vue b/src/views/specialEquipment/maintain/WaitingList.vue
index b7d6d4f4..2e43e778 100644
--- a/src/views/specialEquipment/maintain/WaitingList.vue
+++ b/src/views/specialEquipment/maintain/WaitingList.vue
@@ -61,6 +61,8 @@
 			</el-row>
 		</base-dialog>
 
+		<WaitingListTable />
+
 		<!-- 编辑 -->
 		<!-- <RecordDetail
 			v-if="recordDetailVisible"
@@ -79,6 +81,7 @@ import {
 	deleteEqMaintainLog,
 	exportMaintainLogExcel,
 } from '@/api/equipment/base/maintain/record';
+import WaitingListTable from './WaitingListTable.vue';
 
 const timeFilter = (val) => moment(val).format('yyyy-MM-DD HH:mm:ss');
 
@@ -107,7 +110,7 @@ const btn = {
 
 export default {
 	name: 'SpecialEquipmentMaintainRecord',
-	components: { DialogFormUnplanned },
+	components: { DialogFormUnplanned, WaitingListTable, WaitingListTable },
 	mixins: [basicPageMixin],
 	data() {
 		return {
diff --git a/src/views/specialEquipment/maintain/WaitingListTable.vue b/src/views/specialEquipment/maintain/WaitingListTable.vue
new file mode 100644
index 00000000..3935a10a
--- /dev/null
+++ b/src/views/specialEquipment/maintain/WaitingListTable.vue
@@ -0,0 +1,229 @@
+<!-- 
+    filename: WaitingListTable.vue
+    author: liubin
+    date: 2024-02-05 16:12:55
+    description: 
+-->
+
+<template>
+	<el-table
+		:data="tableData"
+		:border="false"
+		@selection-change="handleSelectionChange"
+		style="width: 100%"
+		:header-cell-style="{
+			background: '#f2f4f9',
+			color: '#606266',
+		}"
+		class="waiting-list-table">
+		<el-table-column type="selection" :width="50" />
+		<el-table-column prop="_pageIndex" width="80" align="center">
+			<template slot="header">
+				<el-popover placement="bottom-start" width="300" trigger="click">
+					<div class="setting-box" style="max-height: 400px; overflow-y: auto">
+						<el-checkbox
+							v-for="(item, index) in tableProps"
+							:key="'cb' + index"
+							v-model="selectedBox[index]"
+							:label="item.label" />
+					</div>
+					<i slot="reference" class="el-icon-s-tools" />
+				</el-popover>
+			</template>
+		</el-table-column>
+		<el-table-column
+			v-if="selectedBox[0]"
+			width="110"
+			label="设备保养单号"
+			prop="maintainOrderNumber"></el-table-column>
+		<el-table-column
+			v-if="selectedBox[1]"
+			width="110"
+			label="保养计划名称"
+			prop="planName"></el-table-column>
+		<el-table-column
+			v-if="selectedBox[2]"
+			width="110"
+			label="部门"
+			prop="departmentName"></el-table-column>
+		<el-table-column
+			v-if="selectedBox[3]"
+			width="110"
+			label="产线名"
+			prop="lineName"></el-table-column>
+		<el-table-column
+			v-if="selectedBox[4]"
+			width="150"
+			label="计划开始时间"
+			prop="planStartTime">
+			<template slot-scope="scope">
+				{{ scope.row.planStartTime | timeFilter }}
+			</template>
+		</el-table-column>
+		<el-table-column
+			v-if="selectedBox[5]"
+			width="150"
+			label="计划结束时间"
+			prop="planEndTime">
+			<template slot-scope="scope">
+				{{ scope.row.planEndTime | timeFilter }}
+			</template>
+		</el-table-column>
+		<el-table-column
+			v-if="selectedBox[6]"
+			width="150"
+			label="实际开始时间"
+			prop="startTime">
+			<template slot-scope="scope">
+				{{ scope.row.startTime | timeFilter }}
+			</template>
+		</el-table-column>
+		<el-table-column
+			v-if="selectedBox[7]"
+			width="150"
+			label="实际结束时间"
+			prop="endTime">
+			<template slot-scope="scope">
+				{{ scope.row.endTime | timeFilter }}
+			</template>
+		</el-table-column>
+		<el-table-column
+			v-if="selectedBox[8]"
+			width="150"
+			label="确认截止时间"
+			prop="confirmDueTime">
+			<template slot-scope="scope">
+				{{ scope.row.confirmDueTime | timeFilter }}
+			</template>
+		</el-table-column>
+		<el-table-column
+			v-if="selectedBox[9]"
+			width="150"
+			label="保养计划类型"
+			prop="relatePlan">
+			<template slot-scope="scope">
+				{{ scope.row.relatePlan | relatePlanFilter }}
+			</template>
+		</el-table-column>
+		<el-table-column v-if="selectedBox[10]" width="60" label="详情">
+			<template slot-scope="scope">
+				<el-button type="text" @click="handelDetail(scope.row)">详情</el-button>
+			</template>
+		</el-table-column>
+		<!-- btns  -->
+		<el-table-column width="200" label="操作">
+			<template slot-scope="scope">
+				<el-tooltip content="查看详情" placement="top">
+					<el-button
+						type="text"
+						style="margin: 5px 0; padding: 0"
+						@click="handelDetail(scope.row)">
+						<i class="iconfont icon-detail primary-color" />
+					</el-button>
+				</el-tooltip>
+				<!-- line  -->
+				<span style="margin: 0 4px; font-size: 18px; color: #e5e7eb">|</span>
+				<el-tooltip content="编辑" placement="top">
+					<el-button
+						type="text"
+						style="margin: 5px 0; padding: 0"
+						@click="handelDetail(scope.row)">
+						<i class="iconfont icon-edit primary-color" />
+					</el-button>
+				</el-tooltip>
+				<!-- line  -->
+				<span style="margin: 0 4px; font-size: 18px; color: #e5e7eb">|</span>
+				<el-tooltip content="删除" placement="top">
+					<el-button
+						type="text"
+						style="margin: 5px 0; padding: 0"
+						@click="handelDetail(scope.row)">
+						<i class="iconfont icon-delete delete-color" />
+					</el-button>
+				</el-tooltip>
+			</template>
+		</el-table-column>
+	</el-table>
+</template>
+
+<script>
+import moment from 'moment';
+
+export default {
+	name: 'WaitingListTable',
+	components: {},
+	props: {},
+	filters: {
+		timeFilter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'),
+		relatePlanFilter: (val) =>
+			val != null ? ['-', '计划型', '非计划型'][val] : '-',
+	},
+	data() {
+		return {
+			tableData: [],
+			tableProps: [
+				{
+					label: '设备保养单号',
+				},
+				{
+					label: '保养计划名称',
+				},
+				{
+					label: '部门',
+				},
+				{
+					label: '产线名',
+				},
+				{
+					label: '计划开始时间',
+				},
+				{
+					label: '计划结束时间',
+				},
+				{
+					label: '实际开始时间',
+				},
+				{
+					label: '实际结束时间',
+				},
+				{
+					label: '确认截止时间',
+				},
+				{
+					label: '保养计划类型',
+				},
+				{
+					label: '详情',
+				},
+			],
+			selectedBox: [
+				true,
+				true,
+				true,
+				true,
+				true,
+				true,
+				true,
+				true,
+				true,
+				true,
+				true,
+			],
+		};
+	},
+	computed: {},
+	methods: {
+		handleSelectionChange() {},
+	},
+};
+</script>
+
+<style scoped>
+@import './iconfont/iconfont.css';
+.delete-color {
+	color: #ff5454;
+}
+.primary-color {
+	color: #0b58ff;
+}
+</style>
diff --git a/src/views/specialEquipment/maintain/iconfont/demo.css b/src/views/specialEquipment/maintain/iconfont/demo.css
new file mode 100644
index 00000000..a67054a0
--- /dev/null
+++ b/src/views/specialEquipment/maintain/iconfont/demo.css
@@ -0,0 +1,539 @@
+/* Logo 字体 */
+@font-face {
+  font-family: "iconfont logo";
+  src: url('https://at.alicdn.com/t/font_985780_km7mi63cihi.eot?t=1545807318834');
+  src: url('https://at.alicdn.com/t/font_985780_km7mi63cihi.eot?t=1545807318834#iefix') format('embedded-opentype'),
+    url('https://at.alicdn.com/t/font_985780_km7mi63cihi.woff?t=1545807318834') format('woff'),
+    url('https://at.alicdn.com/t/font_985780_km7mi63cihi.ttf?t=1545807318834') format('truetype'),
+    url('https://at.alicdn.com/t/font_985780_km7mi63cihi.svg?t=1545807318834#iconfont') format('svg');
+}
+
+.logo {
+  font-family: "iconfont logo";
+  font-size: 160px;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+/* tabs */
+.nav-tabs {
+  position: relative;
+}
+
+.nav-tabs .nav-more {
+  position: absolute;
+  right: 0;
+  bottom: 0;
+  height: 42px;
+  line-height: 42px;
+  color: #666;
+}
+
+#tabs {
+  border-bottom: 1px solid #eee;
+}
+
+#tabs li {
+  cursor: pointer;
+  width: 100px;
+  height: 40px;
+  line-height: 40px;
+  text-align: center;
+  font-size: 16px;
+  border-bottom: 2px solid transparent;
+  position: relative;
+  z-index: 1;
+  margin-bottom: -1px;
+  color: #666;
+}
+
+
+#tabs .active {
+  border-bottom-color: #f00;
+  color: #222;
+}
+
+.tab-container .content {
+  display: none;
+}
+
+/* 页面布局 */
+.main {
+  padding: 30px 100px;
+  width: 960px;
+  margin: 0 auto;
+}
+
+.main .logo {
+  color: #333;
+  text-align: left;
+  margin-bottom: 30px;
+  line-height: 1;
+  height: 110px;
+  margin-top: -50px;
+  overflow: hidden;
+  *zoom: 1;
+}
+
+.main .logo a {
+  font-size: 160px;
+  color: #333;
+}
+
+.helps {
+  margin-top: 40px;
+}
+
+.helps pre {
+  padding: 20px;
+  margin: 10px 0;
+  border: solid 1px #e7e1cd;
+  background-color: #fffdef;
+  overflow: auto;
+}
+
+.icon_lists {
+  width: 100% !important;
+  overflow: hidden;
+  *zoom: 1;
+}
+
+.icon_lists li {
+  width: 100px;
+  margin-bottom: 10px;
+  margin-right: 20px;
+  text-align: center;
+  list-style: none !important;
+  cursor: default;
+}
+
+.icon_lists li .code-name {
+  line-height: 1.2;
+}
+
+.icon_lists .icon {
+  display: block;
+  height: 100px;
+  line-height: 100px;
+  font-size: 42px;
+  margin: 10px auto;
+  color: #333;
+  -webkit-transition: font-size 0.25s linear, width 0.25s linear;
+  -moz-transition: font-size 0.25s linear, width 0.25s linear;
+  transition: font-size 0.25s linear, width 0.25s linear;
+}
+
+.icon_lists .icon:hover {
+  font-size: 100px;
+}
+
+.icon_lists .svg-icon {
+  /* 通过设置 font-size 来改变图标大小 */
+  width: 1em;
+  /* 图标和文字相邻时，垂直对齐 */
+  vertical-align: -0.15em;
+  /* 通过设置 color 来改变 SVG 的颜色/fill */
+  fill: currentColor;
+  /* path 和 stroke 溢出 viewBox 部分在 IE 下会显示
+      normalize.css 中也包含这行 */
+  overflow: hidden;
+}
+
+.icon_lists li .name,
+.icon_lists li .code-name {
+  color: #666;
+}
+
+/* markdown 样式 */
+.markdown {
+  color: #666;
+  font-size: 14px;
+  line-height: 1.8;
+}
+
+.highlight {
+  line-height: 1.5;
+}
+
+.markdown img {
+  vertical-align: middle;
+  max-width: 100%;
+}
+
+.markdown h1 {
+  color: #404040;
+  font-weight: 500;
+  line-height: 40px;
+  margin-bottom: 24px;
+}
+
+.markdown h2,
+.markdown h3,
+.markdown h4,
+.markdown h5,
+.markdown h6 {
+  color: #404040;
+  margin: 1.6em 0 0.6em 0;
+  font-weight: 500;
+  clear: both;
+}
+
+.markdown h1 {
+  font-size: 28px;
+}
+
+.markdown h2 {
+  font-size: 22px;
+}
+
+.markdown h3 {
+  font-size: 16px;
+}
+
+.markdown h4 {
+  font-size: 14px;
+}
+
+.markdown h5 {
+  font-size: 12px;
+}
+
+.markdown h6 {
+  font-size: 12px;
+}
+
+.markdown hr {
+  height: 1px;
+  border: 0;
+  background: #e9e9e9;
+  margin: 16px 0;
+  clear: both;
+}
+
+.markdown p {
+  margin: 1em 0;
+}
+
+.markdown>p,
+.markdown>blockquote,
+.markdown>.highlight,
+.markdown>ol,
+.markdown>ul {
+  width: 80%;
+}
+
+.markdown ul>li {
+  list-style: circle;
+}
+
+.markdown>ul li,
+.markdown blockquote ul>li {
+  margin-left: 20px;
+  padding-left: 4px;
+}
+
+.markdown>ul li p,
+.markdown>ol li p {
+  margin: 0.6em 0;
+}
+
+.markdown ol>li {
+  list-style: decimal;
+}
+
+.markdown>ol li,
+.markdown blockquote ol>li {
+  margin-left: 20px;
+  padding-left: 4px;
+}
+
+.markdown code {
+  margin: 0 3px;
+  padding: 0 5px;
+  background: #eee;
+  border-radius: 3px;
+}
+
+.markdown strong,
+.markdown b {
+  font-weight: 600;
+}
+
+.markdown>table {
+  border-collapse: collapse;
+  border-spacing: 0px;
+  empty-cells: show;
+  border: 1px solid #e9e9e9;
+  width: 95%;
+  margin-bottom: 24px;
+}
+
+.markdown>table th {
+  white-space: nowrap;
+  color: #333;
+  font-weight: 600;
+}
+
+.markdown>table th,
+.markdown>table td {
+  border: 1px solid #e9e9e9;
+  padding: 8px 16px;
+  text-align: left;
+}
+
+.markdown>table th {
+  background: #F7F7F7;
+}
+
+.markdown blockquote {
+  font-size: 90%;
+  color: #999;
+  border-left: 4px solid #e9e9e9;
+  padding-left: 0.8em;
+  margin: 1em 0;
+}
+
+.markdown blockquote p {
+  margin: 0;
+}
+
+.markdown .anchor {
+  opacity: 0;
+  transition: opacity 0.3s ease;
+  margin-left: 8px;
+}
+
+.markdown .waiting {
+  color: #ccc;
+}
+
+.markdown h1:hover .anchor,
+.markdown h2:hover .anchor,
+.markdown h3:hover .anchor,
+.markdown h4:hover .anchor,
+.markdown h5:hover .anchor,
+.markdown h6:hover .anchor {
+  opacity: 1;
+  display: inline-block;
+}
+
+.markdown>br,
+.markdown>p>br {
+  clear: both;
+}
+
+
+.hljs {
+  display: block;
+  background: white;
+  padding: 0.5em;
+  color: #333333;
+  overflow-x: auto;
+}
+
+.hljs-comment,
+.hljs-meta {
+  color: #969896;
+}
+
+.hljs-string,
+.hljs-variable,
+.hljs-template-variable,
+.hljs-strong,
+.hljs-emphasis,
+.hljs-quote {
+  color: #df5000;
+}
+
+.hljs-keyword,
+.hljs-selector-tag,
+.hljs-type {
+  color: #a71d5d;
+}
+
+.hljs-literal,
+.hljs-symbol,
+.hljs-bullet,
+.hljs-attribute {
+  color: #0086b3;
+}
+
+.hljs-section,
+.hljs-name {
+  color: #63a35c;
+}
+
+.hljs-tag {
+  color: #333333;
+}
+
+.hljs-title,
+.hljs-attr,
+.hljs-selector-id,
+.hljs-selector-class,
+.hljs-selector-attr,
+.hljs-selector-pseudo {
+  color: #795da3;
+}
+
+.hljs-addition {
+  color: #55a532;
+  background-color: #eaffea;
+}
+
+.hljs-deletion {
+  color: #bd2c00;
+  background-color: #ffecec;
+}
+
+.hljs-link {
+  text-decoration: underline;
+}
+
+/* 代码高亮 */
+/* PrismJS 1.15.0
+https://prismjs.com/download.html#themes=prism&languages=markup+css+clike+javascript */
+/**
+ * prism.js default theme for JavaScript, CSS and HTML
+ * Based on dabblet (http://dabblet.com)
+ * @author Lea Verou
+ */
+code[class*="language-"],
+pre[class*="language-"] {
+  color: black;
+  background: none;
+  text-shadow: 0 1px white;
+  font-family: Consolas, Monaco, 'Andale Mono', 'Ubuntu Mono', monospace;
+  text-align: left;
+  white-space: pre;
+  word-spacing: normal;
+  word-break: normal;
+  word-wrap: normal;
+  line-height: 1.5;
+
+  -moz-tab-size: 4;
+  -o-tab-size: 4;
+  tab-size: 4;
+
+  -webkit-hyphens: none;
+  -moz-hyphens: none;
+  -ms-hyphens: none;
+  hyphens: none;
+}
+
+pre[class*="language-"]::-moz-selection,
+pre[class*="language-"] ::-moz-selection,
+code[class*="language-"]::-moz-selection,
+code[class*="language-"] ::-moz-selection {
+  text-shadow: none;
+  background: #b3d4fc;
+}
+
+pre[class*="language-"]::selection,
+pre[class*="language-"] ::selection,
+code[class*="language-"]::selection,
+code[class*="language-"] ::selection {
+  text-shadow: none;
+  background: #b3d4fc;
+}
+
+@media print {
+
+  code[class*="language-"],
+  pre[class*="language-"] {
+    text-shadow: none;
+  }
+}
+
+/* Code blocks */
+pre[class*="language-"] {
+  padding: 1em;
+  margin: .5em 0;
+  overflow: auto;
+}
+
+:not(pre)>code[class*="language-"],
+pre[class*="language-"] {
+  background: #f5f2f0;
+}
+
+/* Inline code */
+:not(pre)>code[class*="language-"] {
+  padding: .1em;
+  border-radius: .3em;
+  white-space: normal;
+}
+
+.token.comment,
+.token.prolog,
+.token.doctype,
+.token.cdata {
+  color: slategray;
+}
+
+.token.punctuation {
+  color: #999;
+}
+
+.namespace {
+  opacity: .7;
+}
+
+.token.property,
+.token.tag,
+.token.boolean,
+.token.number,
+.token.constant,
+.token.symbol,
+.token.deleted {
+  color: #905;
+}
+
+.token.selector,
+.token.attr-name,
+.token.string,
+.token.char,
+.token.builtin,
+.token.inserted {
+  color: #690;
+}
+
+.token.operator,
+.token.entity,
+.token.url,
+.language-css .token.string,
+.style .token.string {
+  color: #9a6e3a;
+  background: hsla(0, 0%, 100%, .5);
+}
+
+.token.atrule,
+.token.attr-value,
+.token.keyword {
+  color: #07a;
+}
+
+.token.function,
+.token.class-name {
+  color: #DD4A68;
+}
+
+.token.regex,
+.token.important,
+.token.variable {
+  color: #e90;
+}
+
+.token.important,
+.token.bold {
+  font-weight: bold;
+}
+
+.token.italic {
+  font-style: italic;
+}
+
+.token.entity {
+  cursor: help;
+}
diff --git a/src/views/specialEquipment/maintain/iconfont/demo_index.html b/src/views/specialEquipment/maintain/iconfont/demo_index.html
new file mode 100644
index 00000000..348d9b91
--- /dev/null
+++ b/src/views/specialEquipment/maintain/iconfont/demo_index.html
@@ -0,0 +1,306 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="utf-8"/>
+  <title>iconfont Demo</title>
+  <link rel="shortcut icon" href="//img.alicdn.com/imgextra/i4/O1CN01Z5paLz1O0zuCC7osS_!!6000000001644-55-tps-83-82.svg" type="image/x-icon"/>
+  <link rel="icon" type="image/svg+xml" href="//img.alicdn.com/imgextra/i4/O1CN01Z5paLz1O0zuCC7osS_!!6000000001644-55-tps-83-82.svg"/>
+  <link rel="stylesheet" href="https://g.alicdn.com/thx/cube/1.3.2/cube.min.css">
+  <link rel="stylesheet" href="demo.css">
+  <link rel="stylesheet" href="iconfont.css">
+  <script src="iconfont.js"></script>
+  <!-- jQuery -->
+  <script src="https://a1.alicdn.com/oss/uploads/2018/12/26/7bfddb60-08e8-11e9-9b04-53e73bb6408b.js"></script>
+  <!-- 代码高亮 -->
+  <script src="https://a1.alicdn.com/oss/uploads/2018/12/26/a3f714d0-08e6-11e9-8a15-ebf944d7534c.js"></script>
+  <style>
+    .main .logo {
+      margin-top: 0;
+      height: auto;
+    }
+
+    .main .logo a {
+      display: flex;
+      align-items: center;
+    }
+
+    .main .logo .sub-title {
+      margin-left: 0.5em;
+      font-size: 22px;
+      color: #fff;
+      background: linear-gradient(-45deg, #3967FF, #B500FE);
+      -webkit-background-clip: text;
+      -webkit-text-fill-color: transparent;
+    }
+  </style>
+</head>
+<body>
+  <div class="main">
+    <h1 class="logo"><a href="https://www.iconfont.cn/" title="iconfont 首页" target="_blank">
+      <img width="200" src="https://img.alicdn.com/imgextra/i3/O1CN01Mn65HV1FfSEzR6DKv_!!6000000000514-55-tps-228-59.svg">
+      
+    </a></h1>
+    <div class="nav-tabs">
+      <ul id="tabs" class="dib-box">
+        <li class="dib active"><span>Unicode</span></li>
+        <li class="dib"><span>Font class</span></li>
+        <li class="dib"><span>Symbol</span></li>
+      </ul>
+      
+      <a href="https://www.iconfont.cn/manage/index?manage_type=myprojects&projectId=3821755" target="_blank" class="nav-more">查看项目</a>
+      
+    </div>
+    <div class="tab-container">
+      <div class="content unicode" style="display: block;">
+          <ul class="icon_lists dib-box">
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe604;</span>
+                <div class="name">downward</div>
+                <div class="code-name">&amp;#xe604;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe605;</span>
+                <div class="name">upward</div>
+                <div class="code-name">&amp;#xe605;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe601;</span>
+                <div class="name">detail</div>
+                <div class="code-name">&amp;#xe601;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe602;</span>
+                <div class="name">edit</div>
+                <div class="code-name">&amp;#xe602;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe603;</span>
+                <div class="name">delete</div>
+                <div class="code-name">&amp;#xe603;</div>
+              </li>
+          
+          </ul>
+          <div class="article markdown">
+          <h2 id="unicode-">Unicode 引用</h2>
+          <hr>
+
+          <p>Unicode 是字体在网页端最原始的应用方式，特点是：</p>
+          <ul>
+            <li>支持按字体的方式去动态调整图标大小，颜色等等。</li>
+            <li>默认情况下不支持多色，直接添加多色图标会自动去色。</li>
+          </ul>
+          <blockquote>
+            <p>注意：新版 iconfont 支持两种方式引用多色图标：SVG symbol 引用方式和彩色字体图标模式。（使用彩色字体图标需要在「编辑项目」中开启「彩色」选项后并重新生成。）</p>
+          </blockquote>
+          <p>Unicode 使用步骤如下：</p>
+          <h3 id="-font-face">第一步：拷贝项目下面生成的 <code>@font-face</code></h3>
+<pre><code class="language-css"
+>@font-face {
+  font-family: 'iconfont';
+  src: url('iconfont.eot?t=1689233106339'); /* IE9 */
+  src: url('iconfont.eot?t=1689233106339#iefix') format('embedded-opentype'), /* IE6-IE8 */
+       url('data:application/x-font-woff2;charset=utf-8;base64,d09GMgABAAAAAARgAAsAAAAACcAAAAQUAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHFQGYACDKAqGSIUsATYCJAMYCw4ABCAFhGcHVBtUCMiuMG7hiaIkox1FaBhxvd1fpwAN4YKo1v7tWTr8hBRkBQgO7yqKUJKPUKzDjkixjn7/q0vlANCkEHCJtsMvx2eQn04h5rHEE8593TK2y1SC5nbvNG5gqgZBNEWTqFUQLGVFNnVu1TjyMm3SafEsC3y0myW12KdEh2x+deP/zzHTJeG3AVBm4lrnAxpQN0US7s3ijuSE6Jbh1UGv08cgQEivMg5z6m49Qj77TVxDEZww6gXicNkviSbkxgswNeGCj+CgMw1yFRpAnUNegSv+8+UfU/igsBpjnRV3rRV9+Su8Fk1Agv6CW4eAeyvAAhronJlI1tcrVnIMHZ0cCcsUTrRTnQ0CP50B4KfgEub9Lw80BougQBwGI8bYJU4LPwUbBw0/HXAw8NORUM90wsT9JeIMFACux9QckHyQ9FDYTobcGi+FLSjwMxDe3L5s+w9THFYeEs8H303FWMnZ1JuBWFgNPh3bd5wOvJmKI9aTqXeD8eJ66HnfnV1dJPE8cy4EgqT+s/SbdSWbp9Pn24NbZ1MnGw7CDbvT6+lL1CXVh++hcH56umDT9vOviL/grQ6srHjE57uLHdQn+dtO9x2v94WN6+eXm0HWlZOzta3tUDp1JWjymsiD8r0ViWGkC+n4GeH5aODSM+9COnilpdfdZsRIvMerLmS0uICTplrOnb99LT3NkJNeajPfpDznblq6bXH8efBjlPIUxhQcX+U0qEdt4bjxy6rMdOkbEn0/3mlvrXZL60ysxdwcn/qKLJ/82pnzGS61z5rBeGmrxf33ZXN/IBWUvb8KSvnttbwwq+YTkweZHue0M0+c0ssZGY/Rs+aVF8+3GaW07CkvLC/KcBvP8c2uGpsdm0THlazwlPE22Kdi9ZK4Hdsmtw9eHVQwPjG0p33Q7tGMJ6TUJ2VK1MMw6ftI6qPPtruCvEPmLZqiHcj1Aw3Rup/sdzj+lt/w3f5TrAHgx++nD7A+8xaD4CL8m60Q+KWYO7CgUY3gTFl+OwUBHKteh00BoWmGDIYm301frAJwKAg+BTEoPCpA41OPNNh2sET0g8NnCkI61M6PKKBzREwANBtGIOS6BEU2D0CT6xvSYP+Apdg/cOT6DyErI68W0RzbqhmYOFixuRNLFqoRi839Zh+A2KqYWJH1CTC7hM04My0j664HDVgXY+xtYhbnBBNGVVzH7geKQrHOqA0sPK2Fc70oPZ2UPSTNQlVUjQEmHLDCzDphEgtKQ9zCPP16DwBRK4UJAyKfyBg7jaeaxzKlyQAg6xkaKO9M2tu1EWXhOEL3IxhKhdWpMqCYDgrTy7vZAAsuTUsLm65IOlWIQBlp47PUS9wAhBgHOFGixYgVJx7+dtqutZuY1eXTvXYncJOkOF1Wicd+CnBACA==') format('woff2'),
+       url('iconfont.woff?t=1689233106339') format('woff'),
+       url('iconfont.ttf?t=1689233106339') format('truetype'),
+       url('iconfont.svg?t=1689233106339#iconfont') format('svg');
+}
+</code></pre>
+          <h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
+<pre><code class="language-css"
+>.iconfont {
+  font-family: "iconfont" !important;
+  font-size: 16px;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+</code></pre>
+          <h3 id="-">第三步：挑选相应图标并获取字体编码，应用于页面</h3>
+<pre>
+<code class="language-html"
+>&lt;span class="iconfont"&gt;&amp;#x33;&lt;/span&gt;
+</code></pre>
+          <blockquote>
+            <p>"iconfont" 是你项目下的 font-family。可以通过编辑项目查看，默认是 "iconfont"。</p>
+          </blockquote>
+          </div>
+      </div>
+      <div class="content font-class">
+        <ul class="icon_lists dib-box">
+          
+          <li class="dib">
+            <span class="icon iconfont icon-downward"></span>
+            <div class="name">
+              downward
+            </div>
+            <div class="code-name">.icon-downward
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-upward"></span>
+            <div class="name">
+              upward
+            </div>
+            <div class="code-name">.icon-upward
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-detail"></span>
+            <div class="name">
+              detail
+            </div>
+            <div class="code-name">.icon-detail
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-edit"></span>
+            <div class="name">
+              edit
+            </div>
+            <div class="code-name">.icon-edit
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-delete"></span>
+            <div class="name">
+              delete
+            </div>
+            <div class="code-name">.icon-delete
+            </div>
+          </li>
+          
+        </ul>
+        <div class="article markdown">
+        <h2 id="font-class-">font-class 引用</h2>
+        <hr>
+
+        <p>font-class 是 Unicode 使用方式的一种变种，主要是解决 Unicode 书写不直观，语意不明确的问题。</p>
+        <p>与 Unicode 使用方式相比，具有如下特点：</p>
+        <ul>
+          <li>相比于 Unicode 语意明确，书写更直观。可以很容易分辨这个 icon 是什么。</li>
+          <li>因为使用 class 来定义图标，所以当要替换图标时，只需要修改 class 里面的 Unicode 引用。</li>
+        </ul>
+        <p>使用步骤如下：</p>
+        <h3 id="-fontclass-">第一步：引入项目下面生成的 fontclass 代码：</h3>
+<pre><code class="language-html">&lt;link rel="stylesheet" href="./iconfont.css"&gt;
+</code></pre>
+        <h3 id="-">第二步：挑选相应图标并获取类名，应用于页面：</h3>
+<pre><code class="language-html">&lt;span class="iconfont icon-xxx"&gt;&lt;/span&gt;
+</code></pre>
+        <blockquote>
+          <p>"
+            iconfont" 是你项目下的 font-family。可以通过编辑项目查看，默认是 "iconfont"。</p>
+        </blockquote>
+      </div>
+      </div>
+      <div class="content symbol">
+          <ul class="icon_lists dib-box">
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-downward"></use>
+                </svg>
+                <div class="name">downward</div>
+                <div class="code-name">#icon-downward</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-upward"></use>
+                </svg>
+                <div class="name">upward</div>
+                <div class="code-name">#icon-upward</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-detail"></use>
+                </svg>
+                <div class="name">detail</div>
+                <div class="code-name">#icon-detail</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-edit"></use>
+                </svg>
+                <div class="name">edit</div>
+                <div class="code-name">#icon-edit</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-delete"></use>
+                </svg>
+                <div class="name">delete</div>
+                <div class="code-name">#icon-delete</div>
+            </li>
+          
+          </ul>
+          <div class="article markdown">
+          <h2 id="symbol-">Symbol 引用</h2>
+          <hr>
+
+          <p>这是一种全新的使用方式，应该说这才是未来的主流，也是平台目前推荐的用法。相关介绍可以参考这篇<a href="">文章</a>
+            这种用法其实是做了一个 SVG 的集合，与另外两种相比具有如下特点：</p>
+          <ul>
+            <li>支持多色图标了，不再受单色限制。</li>
+            <li>通过一些技巧，支持像字体那样，通过 <code>font-size</code>, <code>color</code> 来调整样式。</li>
+            <li>兼容性较差，支持 IE9+，及现代浏览器。</li>
+            <li>浏览器渲染 SVG 的性能一般，还不如 png。</li>
+          </ul>
+          <p>使用步骤如下：</p>
+          <h3 id="-symbol-">第一步：引入项目下面生成的 symbol 代码：</h3>
+<pre><code class="language-html">&lt;script src="./iconfont.js"&gt;&lt;/script&gt;
+</code></pre>
+          <h3 id="-css-">第二步：加入通用 CSS 代码（引入一次就行）：</h3>
+<pre><code class="language-html">&lt;style&gt;
+.icon {
+  width: 1em;
+  height: 1em;
+  vertical-align: -0.15em;
+  fill: currentColor;
+  overflow: hidden;
+}
+&lt;/style&gt;
+</code></pre>
+          <h3 id="-">第三步：挑选相应图标并获取类名，应用于页面：</h3>
+<pre><code class="language-html">&lt;svg class="icon" aria-hidden="true"&gt;
+  &lt;use xlink:href="#icon-xxx"&gt;&lt;/use&gt;
+&lt;/svg&gt;
+</code></pre>
+          </div>
+      </div>
+
+    </div>
+  </div>
+  <script>
+  $(document).ready(function () {
+      $('.tab-container .content:first').show()
+
+      $('#tabs li').click(function (e) {
+        var tabContent = $('.tab-container .content')
+        var index = $(this).index()
+
+        if ($(this).hasClass('active')) {
+          return
+        } else {
+          $('#tabs li').removeClass('active')
+          $(this).addClass('active')
+
+          tabContent.hide().eq(index).fadeIn()
+        }
+      })
+    })
+  </script>
+</body>
+</html>
diff --git a/src/views/specialEquipment/maintain/iconfont/iconfont.css b/src/views/specialEquipment/maintain/iconfont/iconfont.css
new file mode 100644
index 00000000..da3d1f0f
--- /dev/null
+++ b/src/views/specialEquipment/maintain/iconfont/iconfont.css
@@ -0,0 +1,38 @@
+@font-face {
+  font-family: "iconfont"; /* Project id 3821755 */
+  src: url('iconfont.eot?t=1689233106339'); /* IE9 */
+  src: url('iconfont.eot?t=1689233106339#iefix') format('embedded-opentype'), /* IE6-IE8 */
+       url('data:application/x-font-woff2;charset=utf-8;base64,d09GMgABAAAAAARgAAsAAAAACcAAAAQUAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHFQGYACDKAqGSIUsATYCJAMYCw4ABCAFhGcHVBtUCMiuMG7hiaIkox1FaBhxvd1fpwAN4YKo1v7tWTr8hBRkBQgO7yqKUJKPUKzDjkixjn7/q0vlANCkEHCJtsMvx2eQn04h5rHEE8593TK2y1SC5nbvNG5gqgZBNEWTqFUQLGVFNnVu1TjyMm3SafEsC3y0myW12KdEh2x+deP/zzHTJeG3AVBm4lrnAxpQN0US7s3ijuSE6Jbh1UGv08cgQEivMg5z6m49Qj77TVxDEZww6gXicNkviSbkxgswNeGCj+CgMw1yFRpAnUNegSv+8+UfU/igsBpjnRV3rRV9+Su8Fk1Agv6CW4eAeyvAAhronJlI1tcrVnIMHZ0cCcsUTrRTnQ0CP50B4KfgEub9Lw80BougQBwGI8bYJU4LPwUbBw0/HXAw8NORUM90wsT9JeIMFACux9QckHyQ9FDYTobcGi+FLSjwMxDe3L5s+w9THFYeEs8H303FWMnZ1JuBWFgNPh3bd5wOvJmKI9aTqXeD8eJ66HnfnV1dJPE8cy4EgqT+s/SbdSWbp9Pn24NbZ1MnGw7CDbvT6+lL1CXVh++hcH56umDT9vOviL/grQ6srHjE57uLHdQn+dtO9x2v94WN6+eXm0HWlZOzta3tUDp1JWjymsiD8r0ViWGkC+n4GeH5aODSM+9COnilpdfdZsRIvMerLmS0uICTplrOnb99LT3NkJNeajPfpDznblq6bXH8efBjlPIUxhQcX+U0qEdt4bjxy6rMdOkbEn0/3mlvrXZL60ysxdwcn/qKLJ/82pnzGS61z5rBeGmrxf33ZXN/IBWUvb8KSvnttbwwq+YTkweZHue0M0+c0ssZGY/Rs+aVF8+3GaW07CkvLC/KcBvP8c2uGpsdm0THlazwlPE22Kdi9ZK4Hdsmtw9eHVQwPjG0p33Q7tGMJ6TUJ2VK1MMw6ftI6qPPtruCvEPmLZqiHcj1Aw3Rup/sdzj+lt/w3f5TrAHgx++nD7A+8xaD4CL8m60Q+KWYO7CgUY3gTFl+OwUBHKteh00BoWmGDIYm301frAJwKAg+BTEoPCpA41OPNNh2sET0g8NnCkI61M6PKKBzREwANBtGIOS6BEU2D0CT6xvSYP+Apdg/cOT6DyErI68W0RzbqhmYOFixuRNLFqoRi839Zh+A2KqYWJH1CTC7hM04My0j664HDVgXY+xtYhbnBBNGVVzH7geKQrHOqA0sPK2Fc70oPZ2UPSTNQlVUjQEmHLDCzDphEgtKQ9zCPP16DwBRK4UJAyKfyBg7jaeaxzKlyQAg6xkaKO9M2tu1EWXhOEL3IxhKhdWpMqCYDgrTy7vZAAsuTUsLm65IOlWIQBlp47PUS9wAhBgHOFGixYgVJx7+dtqutZuY1eXTvXYncJOkOF1Wicd+CnBACA==') format('woff2'),
+       url('iconfont.woff?t=1689233106339') format('woff'),
+       url('iconfont.ttf?t=1689233106339') format('truetype'),
+       url('iconfont.svg?t=1689233106339#iconfont') format('svg');
+}
+
+.iconfont {
+  font-family: "iconfont" !important;
+  font-size: 16px;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+.icon-downward:before {
+  content: "\e604";
+}
+
+.icon-upward:before {
+  content: "\e605";
+}
+
+.icon-detail:before {
+  content: "\e601";
+}
+
+.icon-edit:before {
+  content: "\e602";
+}
+
+.icon-delete:before {
+  content: "\e603";
+}
+
diff --git a/src/views/specialEquipment/maintain/iconfont/iconfont.eot b/src/views/specialEquipment/maintain/iconfont/iconfont.eot
new file mode 100644
index 0000000000000000000000000000000000000000..e746725cb7ee14836d415117d59484c396fcf152
GIT binary patch
literal 2664
zcmd^B-ES0C6hCKXcG_*Xv)vCDx`jI3cGslf7S>@4WLpvtiV0EVqr`+nmfdN)bicA4
zzKk(dh{j+7A>aeyL81>DeDIaT59C2&LgI_X7gI@0788vRBtDqfslPir>&m9YKft>?
z=l;&`oO|xQ=g!BO?IODEC1R3DG>JU21HfEjf%ffh=q>5cP?vVp&bQbm>ZJnZs6u6$
zcBBP^MhD2G89GTt%2EwXgr>mMXdd3eSEtRCq)o7_HXgK?w3`-4rcILv5AW13#9srs
z73`sx4vwZWk-dx1--CWESISl&ZmS#EjRNlDnc~^$H^wHf6Um?B+B<7z^TXdhx&hw@
zxYDyAI+o;jfMKWM*^+f;Eda*;2C=qS$z`SY`3%N>3SBE@&r~^rO%e+?y__wXy&q;i
zBkI6>(oD57Z@v6e^a_!;2>T(ic6niCfsVqACKly@mQWoA?D^V`rC0r#Kd8Im`(W|N
z0pZr@R~8kLH$d%lkE;<$r6Z&|!NehU;YYOM=nZ=p5<5ZC^LzFkBCVLU$`logaGF@j
zzcCjJGg-uMjAYn^mBFwxhvTmhUm_3o`mS^j){Bjvf29;-Wa}P+?Xk9hdUu{~*SYR-
z@<H;Cv;c?4vmp-6nY6tJjX7}#5N&L@@KJZ{6j%{uBYNx}yh0<650*+)_pBfvbrur3
z2rNT-fRQn7<PPNjxcQvD?{hPNJl93uL{5?KI<h1#k-56i#Tf`6p^I!fIR+NzBm9UG
z^djBk5&j5RL?QX6^d<#~;+!@Tu?{aMVrqB|N7h8r(z84lN*E#gj(sO=#6vvi^#v1`
z_;PPj@3pV;T(6$&wacA~+IUVxtaBokmm^^{_KcU+Si%_N^jJEwdMv4Gmqjq1v#*L^
zeAx+xWjSXrUzF~XpPr^s%FqjVH4zWS)b$*WJU5t1kF$}G|3l~S0H-F{NODZ$z!Meu
z?d5M|MUkcL3fdF!U%zP4^-=AKLi*YxZ<Rfcuzy}1OA&w6?~e`$VSm3m7ALi`DBr{z
zMZ6z~jdUvVR3NNLLxZuTv?X9nNZ9`XhcyPHNw5ttm<ef%Ji!Cp!5Sx}^q5=-^@sbC
z<NER=eLUGG5O4GPz4+UAL&NL*(PUK81kk+wVfNbB)Igxeqo{mA3xzcM_vR=`6Ugfi
z`n~>j!=dFz7$|`BdKU-#yX=JykKzji#F^nvTX`VgkO#>}eK@ymbQt$mEP+)wcA*Zn
zl!(ehTZ{xYfkPd_ednC3k%${<Y$vjw2XWr5p^mi`NP5K=46Y3Zzw8MF`T`u}@2(he
z`+nTG0-{G&AeX-i_;|z@u&?u5_OZADzo3sl@C5;k%Yc&z;j?cE*~0v1CT<w<44m-K
z2xDgXun}i5Q;)sV@&3XYxhsy(8R4E^YCKKAAzaRr1=$I$fhFpoeizH&V=h*JM_lZ|
zmo(*K75uo1yJ!RLc5yc%R>fOYL3Mzq`J9UxALvh9EaAg`%f&MIyDnCMe{it}pZbR`
zR>3d3xQnK^$Hm>0;M}g7nYGNke*COn$W_YIm9o|B512D2i`iOJZT3@UZN5+`>zk9C
zn$)COHfzl=^QUG~mNl(U*D57_58|1{VnwgkDksdGm7KM#>h{r5F^}Mrxk`z4p&~I+
zp;(Z4(&;#zg>0{9+V#h4n|5ovzIxr$?lp-Ol${ExeKqrR3YAm}YqU^d>9}gBph`e{
z+<MDIl~n}Rae%^h0&#NiPSUJ1s!H4Oz>NM=pEdoHPTf{&zQIK$v3gTkVwn~8u*x0O
gnXjBKpU&3u>dC6p<xMMFC@N;YV5xbtXj&%G-_l}syZ`_I

literal 0
HcmV?d00001

diff --git a/src/views/specialEquipment/maintain/iconfont/iconfont.js b/src/views/specialEquipment/maintain/iconfont/iconfont.js
new file mode 100644
index 00000000..1520f0ab
--- /dev/null
+++ b/src/views/specialEquipment/maintain/iconfont/iconfont.js
@@ -0,0 +1 @@
+window._iconfont_svg_string_3821755='<svg><symbol id="icon-downward" viewBox="0 0 1024 1024"><path d="M556.942222 751.900444l363.064889-401.806222c24.860444-21.617778 24.860444-56.263111 0-77.880889a68.437333 68.437333 0 0 0-44.942222-16.156444c-16.896 0-33.052444 5.859556-44.885333 16.156444L512 635.050667l-318.236444-362.951111a68.437333 68.437333 0 0 0-44.942223-16.099556c-16.896 0-33.109333 5.802667-44.942222 16.156444-24.746667 21.617778-24.746667 56.206222 0 77.824l363.121778 401.749334c5.973333 5.290667 13.141333 9.443556 21.048889 12.231111 23.722667 8.305778 51.029333 3.527111 68.892444-12.060445z" fill="#0B58FF" ></path></symbol><symbol id="icon-upward" viewBox="0 0 1024 1024"><path d="M556.942222 272.099556l363.064889 401.806222c24.860444 21.617778 24.860444 56.263111 0 77.880889a68.437333 68.437333 0 0 1-44.942222 16.156444c-16.896 0-33.052444-5.859556-44.885333-16.156444L512 388.949333l-318.236444 362.951111a68.437333 68.437333 0 0 1-44.942223 16.099556c-16.896 0-33.109333-5.802667-44.942222-16.156444-24.746667-21.617778-24.746667-56.206222 0-77.824L467.057778 272.270222c5.973333-5.290667 13.141333-9.443556 21.048889-12.231111 23.722667-8.305778 51.029333-3.527111 68.892444 12.060445z" fill="#0B58FF" ></path></symbol><symbol id="icon-detail" viewBox="0 0 1024 1024"><path d="M902.428444 190.748444H332.401778a7.964444 7.964444 0 0 0-7.793778 8.021334v56.206222a7.964444 7.964444 0 0 0 7.793778 8.078222h570.026666A7.964444 7.964444 0 0 0 910.222222 254.976v-56.206222a7.964444 7.964444 0 0 0-7.793778-8.021334z m0 285.127112H332.401778a7.964444 7.964444 0 0 0-7.793778 7.964444v56.32a7.964444 7.964444 0 0 0 7.793778 7.964444h570.026666a7.964444 7.964444 0 0 0 7.793778-7.964444v-56.32a7.964444 7.964444 0 0 0-7.793778-7.964444z m0 285.070222H332.401778a7.964444 7.964444 0 0 0-7.793778 8.078222v56.206222a7.964444 7.964444 0 0 0 7.793778 8.021334h570.026666a7.964444 7.964444 0 0 0 7.793778-8.021334v-56.206222a7.964444 7.964444 0 0 0-7.793778-8.078222zM113.777778 226.872889c0 20.081778 10.410667 38.684444 27.306666 48.696889a53.361778 53.361778 0 0 0 54.670223 0 56.547556 56.547556 0 0 0 27.306666-48.696889 56.547556 56.547556 0 0 0-27.306666-48.696889 53.361778 53.361778 0 0 0-54.613334 0A56.547556 56.547556 0 0 0 113.777778 226.872889zM113.777778 512c0 20.081778 10.410667 38.684444 27.306666 48.696889a53.361778 53.361778 0 0 0 54.670223 0A56.547556 56.547556 0 0 0 223.061333 512a56.547556 56.547556 0 0 0-27.306666-48.696889 53.361778 53.361778 0 0 0-54.613334 0A56.547556 56.547556 0 0 0 113.777778 512z m0 285.127111c0 20.081778 10.410667 38.684444 27.306666 48.696889a53.361778 53.361778 0 0 0 54.670223 0 56.547556 56.547556 0 0 0 27.306666-48.696889 56.547556 56.547556 0 0 0-27.306666-48.696889 53.361778 53.361778 0 0 0-54.613334 0 56.547556 56.547556 0 0 0-27.363555 48.696889z" fill="#0B58FF" ></path></symbol><symbol id="icon-edit" viewBox="0 0 1024 1024"><path d="M873.016889 500.736a32.824889 32.824889 0 0 1 65.649778 0v273.806222a164.124444 164.124444 0 0 1-164.124445 164.124445h-525.084444A164.124444 164.124444 0 0 1 85.333333 774.542222v-525.084444A164.124444 164.124444 0 0 1 249.457778 85.333333h312.32a32.824889 32.824889 0 1 1 0 65.649778h-312.32a98.417778 98.417778 0 0 0-98.474667 98.417778v525.141333c0 54.385778 44.088889 98.474667 98.417778 98.474667h525.141333a98.417778 98.417778 0 0 0 98.474667-98.417778V500.679111z m-14.222222-362.097778a32.824889 32.824889 0 0 1 48.014222 44.771556L548.750222 567.466667a32.824889 32.824889 0 1 1-48.014222-44.771556l358.115556-384.056889z" fill="#0B58FF" ></path></symbol><symbol id="icon-delete" viewBox="0 0 1024 1024"><path d="M601.024 749.76a29.632 29.632 0 0 1-29.696-29.696V392.96a29.632 29.632 0 1 1 59.456 0v326.848a29.76 29.76 0 0 1-29.76 29.888z m-178.24 0a29.632 29.632 0 0 1-29.696-29.696V392.96a29.632 29.632 0 1 1 59.392 0v326.848a29.76 29.76 0 0 1-29.696 29.888z m475.52-505.216h-148.544v-59.456c0-49.152-39.616-89.088-88.512-89.088H363.392c-49.216 0-89.152 39.936-89.152 89.088v59.456H125.696a29.632 29.632 0 1 0 0 59.392h772.608a29.632 29.632 0 1 0 0-59.392z m-564.608-59.456c0-16.256 13.44-29.696 29.696-29.696h297.856c16.32 0 29.056 13.12 29.056 29.696v59.456H333.696v-59.456zM720 928h-416a89.152 89.152 0 0 1-89.088-89.088V392.768a29.632 29.632 0 1 1 59.456 0v446.08c0 16.512 13.44 29.76 29.696 29.76h416.064a29.632 29.632 0 0 0 29.696-29.696V393.856a29.632 29.632 0 1 1 59.456 0v445.056A89.536 89.536 0 0 1 720 928z" fill="#FF5454" ></path></symbol></svg>',function(a){var t=(t=document.getElementsByTagName("script"))[t.length-1],e=t.getAttribute("data-injectcss"),t=t.getAttribute("data-disable-injectsvg");if(!t){var n,i,o,c,l,d=function(t,e){e.parentNode.insertBefore(t,e)};if(e&&!a.__iconfont__svg__cssinject__){a.__iconfont__svg__cssinject__=!0;try{document.write("<style>.svgfont {display: inline-block;width: 1em;height: 1em;fill: currentColor;vertical-align: -0.1em;font-size:16px;}</style>")}catch(t){console&&console.log(t)}}n=function(){var t,e=document.createElement("div");e.innerHTML=a._iconfont_svg_string_3821755,(e=e.getElementsByTagName("svg")[0])&&(e.setAttribute("aria-hidden","true"),e.style.position="absolute",e.style.width=0,e.style.height=0,e.style.overflow="hidden",e=e,(t=document.body).firstChild?d(e,t.firstChild):t.appendChild(e))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(n,0):(i=function(){document.removeEventListener("DOMContentLoaded",i,!1),n()},document.addEventListener("DOMContentLoaded",i,!1)):document.attachEvent&&(o=n,c=a.document,l=!1,v(),c.onreadystatechange=function(){"complete"==c.readyState&&(c.onreadystatechange=null,s())})}function s(){l||(l=!0,o())}function v(){try{c.documentElement.doScroll("left")}catch(t){return void setTimeout(v,50)}s()}}(window);
\ No newline at end of file
diff --git a/src/views/specialEquipment/maintain/iconfont/iconfont.json b/src/views/specialEquipment/maintain/iconfont/iconfont.json
new file mode 100644
index 00000000..fd0f1b78
--- /dev/null
+++ b/src/views/specialEquipment/maintain/iconfont/iconfont.json
@@ -0,0 +1,44 @@
+{
+  "id": "3821755",
+  "name": "component",
+  "font_family": "iconfont",
+  "css_prefix_text": "icon-",
+  "description": "封装的组件中的icon",
+  "glyphs": [
+    {
+      "icon_id": "36426261",
+      "name": "downward",
+      "font_class": "downward",
+      "unicode": "e604",
+      "unicode_decimal": 58884
+    },
+    {
+      "icon_id": "36426301",
+      "name": "upward",
+      "font_class": "upward",
+      "unicode": "e605",
+      "unicode_decimal": 58885
+    },
+    {
+      "icon_id": "33347867",
+      "name": "detail",
+      "font_class": "detail",
+      "unicode": "e601",
+      "unicode_decimal": 58881
+    },
+    {
+      "icon_id": "33347918",
+      "name": "edit",
+      "font_class": "edit",
+      "unicode": "e602",
+      "unicode_decimal": 58882
+    },
+    {
+      "icon_id": "33347930",
+      "name": "delete",
+      "font_class": "delete",
+      "unicode": "e603",
+      "unicode_decimal": 58883
+    }
+  ]
+}
diff --git a/src/views/specialEquipment/maintain/iconfont/iconfont.svg b/src/views/specialEquipment/maintain/iconfont/iconfont.svg
new file mode 100644
index 00000000..647e5515
--- /dev/null
+++ b/src/views/specialEquipment/maintain/iconfont/iconfont.svg
@@ -0,0 +1,29 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
+<svg xmlns="http://www.w3.org/2000/svg">
+  <metadata>Created by iconfont</metadata>
+  <defs>
+  <font id="iconfont" horiz-adv-x="1024">
+    <font-face
+      font-family="iconfont"
+      font-weight="400"
+      font-stretch="normal"
+      units-per-em="1024"
+      ascent="896"
+      descent="-128"
+    />
+      <missing-glyph />
+      
+      <glyph glyph-name="downward" unicode="&#58884;" d="M556.942222 144.099556l363.064889 401.806222c24.860444 21.617778 24.860444 56.263111 0 77.880889a68.437333 68.437333 0 0 1-44.942222 16.156444c-16.896 0-33.052444-5.859556-44.885333-16.156444L512 260.949333l-318.236444 362.951111a68.437333 68.437333 0 0 1-44.942223 16.099556c-16.896 0-33.109333-5.802667-44.942222-16.156444-24.746667-21.617778-24.746667-56.206222 0-77.824l363.121778-401.749334c5.973333-5.290667 13.141333-9.443556 21.048889-12.231111 23.722667-8.305778 51.029333-3.527111 68.892444 12.060445z"  horiz-adv-x="1024" />
+      
+      <glyph glyph-name="upward" unicode="&#58885;" d="M556.942222 623.900444l363.064889-401.806222c24.860444-21.617778 24.860444-56.263111 0-77.880889a68.437333 68.437333 0 0 0-44.942222-16.156444c-16.896 0-33.052444 5.859556-44.885333 16.156444L512 507.050667l-318.236444-362.951111a68.437333 68.437333 0 0 0-44.942223-16.099556c-16.896 0-33.109333 5.802667-44.942222 16.156444-24.746667 21.617778-24.746667 56.206222 0 77.824L467.057778 623.729778c5.973333 5.290667 13.141333 9.443556 21.048889 12.231111 23.722667 8.305778 51.029333 3.527111 68.892444-12.060445z"  horiz-adv-x="1024" />
+      
+      <glyph glyph-name="detail" unicode="&#58881;" d="M902.428444 705.251556H332.401778a7.964444 7.964444 0 0 1-7.793778-8.021334v-56.206222a7.964444 7.964444 0 0 1 7.793778-8.078222h570.026666A7.964444 7.964444 0 0 1 910.222222 641.024v56.206222a7.964444 7.964444 0 0 1-7.793778 8.021334z m0-285.127112H332.401778a7.964444 7.964444 0 0 1-7.793778-7.964444v-56.32a7.964444 7.964444 0 0 1 7.793778-7.964444h570.026666a7.964444 7.964444 0 0 1 7.793778 7.964444v56.32a7.964444 7.964444 0 0 1-7.793778 7.964444z m0-285.070222H332.401778a7.964444 7.964444 0 0 1-7.793778-8.078222v-56.206222a7.964444 7.964444 0 0 1 7.793778-8.021334h570.026666a7.964444 7.964444 0 0 1 7.793778 8.021334v56.206222a7.964444 7.964444 0 0 1-7.793778 8.078222zM113.777778 669.127111c0-20.081778 10.410667-38.684444 27.306666-48.696889a53.361778 53.361778 0 0 1 54.670223 0 56.547556 56.547556 0 0 1 27.306666 48.696889 56.547556 56.547556 0 0 1-27.306666 48.696889 53.361778 53.361778 0 0 1-54.613334 0A56.547556 56.547556 0 0 1 113.777778 669.127111zM113.777778 384c0-20.081778 10.410667-38.684444 27.306666-48.696889a53.361778 53.361778 0 0 1 54.670223 0A56.547556 56.547556 0 0 1 223.061333 384a56.547556 56.547556 0 0 1-27.306666 48.696889 53.361778 53.361778 0 0 1-54.613334 0A56.547556 56.547556 0 0 1 113.777778 384z m0-285.127111c0-20.081778 10.410667-38.684444 27.306666-48.696889a53.361778 53.361778 0 0 1 54.670223 0 56.547556 56.547556 0 0 1 27.306666 48.696889 56.547556 56.547556 0 0 1-27.306666 48.696889 53.361778 53.361778 0 0 1-54.613334 0 56.547556 56.547556 0 0 1-27.363555-48.696889z"  horiz-adv-x="1024" />
+      
+      <glyph glyph-name="edit" unicode="&#58882;" d="M873.016889 395.264a32.824889 32.824889 0 0 0 65.649778 0v-273.806222a164.124444 164.124444 0 0 0-164.124445-164.124445h-525.084444A164.124444 164.124444 0 0 0 85.333333 121.457778v525.084444A164.124444 164.124444 0 0 0 249.457778 810.666667h312.32a32.824889 32.824889 0 1 0 0-65.649778h-312.32a98.417778 98.417778 0 0 1-98.474667-98.417778v-525.141333c0-54.385778 44.088889-98.474667 98.417778-98.474667h525.141333a98.417778 98.417778 0 0 1 98.474667 98.417778V395.320889z m-14.222222 362.097778a32.824889 32.824889 0 0 0 48.014222-44.771556L548.750222 328.533333a32.824889 32.824889 0 1 0-48.014222 44.771556l358.115556 384.056889z"  horiz-adv-x="1024" />
+      
+      <glyph glyph-name="delete" unicode="&#58883;" d="M601.024 146.24a29.632 29.632 0 0 0-29.696 29.696V503.04a29.632 29.632 0 1 0 59.456 0v-326.848a29.76 29.76 0 0 0-29.76-29.888z m-178.24 0a29.632 29.632 0 0 0-29.696 29.696V503.04a29.632 29.632 0 1 0 59.392 0v-326.848a29.76 29.76 0 0 0-29.696-29.888z m475.52 505.216h-148.544v59.456c0 49.152-39.616 89.088-88.512 89.088H363.392c-49.216 0-89.152-39.936-89.152-89.088v-59.456H125.696a29.632 29.632 0 1 1 0-59.392h772.608a29.632 29.632 0 1 1 0 59.392z m-564.608 59.456c0 16.256 13.44 29.696 29.696 29.696h297.856c16.32 0 29.056-13.12 29.056-29.696v-59.456H333.696v59.456zM720-32h-416a89.152 89.152 0 0 0-89.088 89.088V503.232a29.632 29.632 0 1 0 59.456 0v-446.08c0-16.512 13.44-29.76 29.696-29.76h416.064a29.632 29.632 0 0 1 29.696 29.696V502.144a29.632 29.632 0 1 0 59.456 0v-445.056A89.536 89.536 0 0 0 720-32z"  horiz-adv-x="1024" />
+      
+    </font>
+  </defs>
+</svg>
diff --git a/src/views/specialEquipment/maintain/iconfont/iconfont.ttf b/src/views/specialEquipment/maintain/iconfont/iconfont.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..014c3da9b180f6bb81e952964e168afc3e36648e
GIT binary patch
literal 2496
zcmd^B+iM(E82`SR+1YHenay6@Hk&q1HrW-@I%(JGrY)NYtxYNvFTJD)1-spyB-`wb
z&GaTB(TXA!T1x9f>4QZdl=|Rn!D}BZLctePU!)d<t)Tc&@If#We`j{qNSfjw;K`ov
z{J!h?&i9>}2{93M(E`b|W%9tGUHZAyD@42<(u2<*7|G<~dl$jK3;t-KlCR(2(KLx9
z1+tH3%4eou8=bsLB!7mvch<@mhrWGq4Yv0%v$GKR@5*ljLr+7q75nsh0Qmj}vc6m^
z<fZrcG<-h+uT}D=>l~*7^ukQ9<||gu2f0s){Mb*Lsn_Q17k^4zA_|nDKS;=3URYkB
zBT!?Aq+GB<R96D&n~kUMz8uQ^L0v7|dy9wn3$xa`yr_`832X;Rp0kLg(qT+7gtQZX
zM9YH35c*EqLgOSoGqLX=Y300KrG!Yr9YX(a%;nNd9`ReA44u$2B<$|t+AG8t$cOFT
zk#0kKzP0kNlwo*E<dY#?W4tiEr$}Elx#@H3LGq8Z05cJDWr(J^o336V#-6wVM4MYC
ze8lsef>cD=j1{McT%lpt2B{J?eaomvlLZAY0?VL2U{s7-wS(|~Jc91o_jwgSotvU=
zqNb>K6IBvZRIVv_(F0*4cu`Ha#=xRK!j33S&(Uoj<`02I6q2t?uTz95#aT0*^anVd
zRAcKnzAm1Xp5(b`+Kf6kotrT;73H}=Fp|E&7kdo7$GOaNJ-X53R67*4^_+-UXGN?4
z$75>pi2$p~v^mPz(QJI}SW?}oieNnFTo%Fjq8kipxxJUqOLr(lkJAX{=vkUV$^%Jt
zBgf)T4P>%oY^LS^;5pXMnQ=A^PHG%}BqP7I^o^`2vb0mdcm)3I7cH?dp*@mFU;E_k
zvd<;X&ue2T9!i8liGD$x@7KnnQ_G9;b-Yo;`+?ZZX5x>9W12KLkTj%iVRKx<`TIGh
zF(jG<T|YxIE^U*?xu5;4u_0wg<x;dS)@zLEOAquhqgNo_5eNnFb8bb4HiQyJLed1#
z0(~(KI9JqgxZ9_wd`^o-HRt!Xm!t_42t`7H(1xMt(gQdOAidhjk-ko6!S7Ro;jri#
zZrbua`I<aHLFz@{cF-Z*tz;Tmw@#rBt}t<x2e+AN90E-p#JzL-YNk_W7RQNi<N@@1
z#nsiW1d?6~Mk4DYkuSQ#;odMu_`6GH%DIy=FG0{PE1*kXhJ!pD3_Dl(4d-aegk2=a
z?*}6Q=0(6sga|q}1YN=WXD(%$sT_>(%L!#}>5!RXu~WCR%eDU8_1vAp=ZtXY@3x*M
z;3%g1WPx^oYhj7})aPLt@}!3q;9(E@@FmT7ScQDd!=1E=_IS7p5$ocussyl4n$CKd
zsfRxHutXZ&@URT|Ee|WeKX}+jak}qe74jtychVGhd$^0zT-e>P^0rmfkDbv=g<5sG
zR<+yferx7LIp1ir?RCm(%$I6aeXFshEt<5dR-+we{^U%?wx{*!My;YxAf8n&*YtX$
zcHAo1#;k4EcaDsReT3X7)GD-_8e~zPY|tX<bd1h`mhh>sQI)1$YCpv9hxH7dpfWrg
z4{29>Pr<rD^RN>!b=pb>9>3LAld!6~maDUwr<2$%gB)#Sq+>P^sRA_N<!2$2GO&&Y
z3f*zUDZtvGS=XyhJMqAb{BxeRz2Tm-(td-B{~OjGDoZT0!ai2nPaVbDsp_eGqo|&!
WyGzls^QE$46-%~Sw91xk5&aGMEM&(3

literal 0
HcmV?d00001

diff --git a/src/views/specialEquipment/maintain/iconfont/iconfont.woff b/src/views/specialEquipment/maintain/iconfont/iconfont.woff
new file mode 100644
index 0000000000000000000000000000000000000000..d25f753466da76a548c74047d88b3f133cf332c5
GIT binary patch
literal 1544
zcmY*Y2T+qq6y86f1PCQyp{aNVMCsj7q^U#{5d;+*DFnhvi4ZVBX=)P6p^2g+iXg>1
zf+vQ~9SR|g0)pI76flYbJQ9j1AOj-G{qf4oy_s*{`@Z>h-_GpYv;KSb00_XLgaT^v
ztRnoI%j^G#&!J#103Z~sy1)oB$~I2&KV)SKYr9}B2f=k6{slRjNQ1Qun4f}knG`o}
z9}&e2hie%C2yFn6_!K9fd@6+)2G=XF&kBYkwqve{3X1?Jn8Vx<23C0($)QHm8L)<j
zxdsefU3iI#CChzB|IsuMHy}ndkpcHrpu*Zl7)H=KK#n0sQ(z6g3*-U!j?gM`70_bi
z=>RCU!=9Zmf&$*^=Q8rigfId@Lb4_Z$b`5v^D0D1=U(#;GM7XkrU9<2?QNT_c5b|M
z<WuCc%CtxgqwtFv2w>u(hzIh$L?R(yD10Uq_IJ?P>FGtAyzH97tx4}dmaV|nj-Uud
zR%}Bn7uf71Q(~6h3WdV+90+e~U2IB10MaZvoRR;Y+oGQ4fl}bObaN`T$=jNeLsn~x
z)Q+;T)haq7aympmgHmp^Az6m(dmGZ{a&DNhge&lg<h^ohZfMf;BaIYV%&*j8qSy8;
zM(wtDI>&Q571XBqUeVJEV*%hhvI5<%^m%CA8A>obANMjuEZx#=jO`x68=+MVINp0z
zO|{%5Tp2Z>RL4E-f@UTgvF43K24eDy;+nJugs*;sekMC>)EQf4eVXojEu&|0;yGiS
z=@Sd3U)UtzNRXvR%gp)CH;oe;(tGv<3DkC|+pd*)C+n8m3;AQqL-F}9<`10wFjh0%
zF_pBKOA*tG7Y3;~T~=b;OHY@MeywaG#$tf9_^ATZ${%(j?J#>{>MQwU5W}D;S&C3G
zA`38WlBm`yi>nX)DS)!#j$=np`yc%CCMwrV=Udn}-tl!2M=Y||t}JR|>PeN_gB;an
zk(sgVLnki#(ct`O9rTrgQ&##YHFK9pN3{1-BZ5DbB<QKWoHD@~;2nrHp$6XRL71pF
z(_YtA3_hyVRc0aL52HW7xvS?mcP1j`wVqVHl_s7wbY4CrsGWGi?7FmB6v>v!*4O3M
zW>LltVHCVpUGqpH>$Z8fHt}oK@iu!Zs<D}!67T0;cG&!g?^p<H=37ql_(@ukXH#^m
z#^VRrlH;pl(Tv5__NT)hl*hd_8y`3JI$gh4Zlql+*q36pr}LrO=0x$r*S@CJ3KNQV
z@s+~Gpz<q$wLUEUdX)6Ty=>_Te(30y<gLN|(#EA{3z=nlJqFm3NhhWChN(G$_j)l7
zJ$iX_)TWX^`_%G@)09PV)t97li4{{P+gd&o-)A0--uU6mx!D!RP`!o_T@Ojii;qSM
zUst!QA*&s^oh?EIZAD=Jqbm1bzkGhRT15ciag_(H6+plTjfjQMA`%FMmJ1L>1$ywW
zl7|U60J@;<Q0afY2xOEpNsE9WSsH~AmNduh0KhCjN#Ey_=N2RK&|(#~a20Y*eM{{l
z4{tNo?pVpi^AFzr<*st|xKG`{F)MsO&hIi;=N)Q-8lQz{4tgVZKYBG3JKU7Fp##ha
zIGnjgspU|sarITR24M;9`tmh_f6BUwqRax?o#p#9q!mLari%PjqagLkudK5~&H5#+
z3W-voD0nhdwDa@v2Db7FYJk70>SR4z!MaUljtD3Deen)relWGSy>y0gd4Z(k|DNyK
z;~1J3lyI>-Kz|}gOul`-QHER3Z@;xmoq2z3u&nD=t;R_K-Eyj4%#(Riwb6tk8x}d=
zo5<cUrn(s&xNA2(;`7ZJMaPVg$khaYSzSASQyj|@LGM1X<@a6@)7kH`Md(yO0^Ka8
z^VTK%++)x8lBz~EU0*-oU+PDiXP2XsYkn)%Nj=!bU4aI##U7ErB`FP9Dov;5@G^OM
zJQnXdFNb$0eT#9k>qFN{Q`UnTu>W4^4Q%+hp!Dak8(;{>H|C?!KxrR(0D!*$z)yo)

literal 0
HcmV?d00001

diff --git a/src/views/specialEquipment/maintain/iconfont/iconfont.woff2 b/src/views/specialEquipment/maintain/iconfont/iconfont.woff2
new file mode 100644
index 0000000000000000000000000000000000000000..28c928058ba5d5c7f7bb8fb6318699bc2d478764
GIT binary patch
literal 1120
zcmV-m1fTnNPew8T0RR9100dwF3jhEB013bV00a~O0RR9100000000000000000000
z0000SR0d!GgD47yNQEo`HUcCA7z+*n1Rw>3X9rXpR0znfFmB<Aq9mgoMQ9jtz1?4@
z01e@SsMh}NSvvfL6l4Vm4(}?8P?C>Otiz5-v5tQKt4rko(4-J>iMGQp$7hhAP9f&8
z#1qba-7>bzRD$Mq?=)^;ss=$cMU$vi5G-XyHg#^*IPx-W(rNK53w*SjCAHY6M2BpC
zb>sifG1DdCw*gRQ;#%he8c;Vy67J37j^u>smf_VwuhYjMKuE7L4s+^mJwiVFO<Y3}
zoG|JI;&9n7i6-R63otd|f{);!GYxVT8bF;xUV$tA^W`5?_@J;FW1SUutrdOwE4&s>
zK!W~)TZe#qE5HI8=$x5I*4Hamats}v90|)5PP9{<4FW%%0pO?L66XCc4>Sggpg<f3
zBgWVzP76N;8wU+P9dI!4(~(fmbi%~_CE^Se0ItW>9FTmF^ibGNhTIx2g)J!XGZ5a~
zzHIvsQyf+v63++UO~qKr+0>hXSXd1{9ou)D4!oI)Bi56tcZ2cbdgyuIon2id@jP=b
z1cIdgv-F#FC7Y+y=i7r@XHzE|4#Ew))9dL=)Fsu2@1byhdb(iK_VcfZzu>J7tgLv%
z=evs?)F=7dPWK(J_l1q?=a-v7)|Hd9wXN+?I&~#z@|wtl^1T&_VWbP`_!;5(XyDQ_
z??O6wrKQ*1X2eLm$Ez-6w77tirdrOOzkMw|&5)B`YBS%YJm+p&x@~d%dGKSD@)X7t
z9AD)$s7Gz#xbe%X%yj7+5`913X>YA|OY2Om#oQd9`id-{{MwoG87{TYn!$K!tHu5I
zWpjTZ6_mZd3QGCywY)H^<`a_#nI7k~Gf$k-%NZGu(X-~27tgmDrL^oRFDx(0a2wC@
z&8`}o9h*eQm8|fT@iy3}V)c@^9or_i4_+NqFg`J~r+v`w(Tpdg)F)+1)Wb08`$+1e
z&$hdQyhG+KnxY-Z^#cvjx}WTKIR2L3@ZJ7XtO4N1@23y2KJylX;3E8+tq}O7m^-kb
zQH|hCS$;bO0UWDdhfM*YX@(4jCf`k8tO9T-2tEZdC_E}a<5Q0`*mkf)^n=4^3PL*6
z&W|Xdb3{x4G#f@B<hle!HV;6P>l@Nw|A3{~KXByw4<RcfuNKi9+o~CuI9Rc{6H6AV
z5sS_JW*>mqs+d@j^$9S$gv~fJEhFo$2Mt&kW9)5W7Uu*LMpazL?gxrOvCgOsEIh4+
zbG;}%os>N!%|caFjR7Vcu)@qbVG;{UL)^kV{dx}oQ7eTB10tWu7(0!pn#VGw$p9eh
z85$_>OxoME5oO^xLiZyWN`=*_GN70a3e(HG*#HYJO-l=#u1Gpnh(H-><FnLD+yI0a
m2RKop#fTLr9{zUPuC<$()#cN@b|-L?q&QtxiN}5la6kxx^#`8-

literal 0
HcmV?d00001


From 2ee2b2bfc7008c1242cc516f1193937bfb5b9660 Mon Sep 17 00:00:00 2001
From: juzi <819872918@qq.com>
Date: Tue, 6 Feb 2024 14:11:35 +0800
Subject: [PATCH 14/40] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/base/orderGroup.js                    |  54 +++
 src/api/base/orderManage.js                   |   9 +
 .../base/orderGroup/components/bindOrder.vue  | 304 ++++++++++++
 .../orderGroup/components/orderGroupAdd.vue   | 196 ++++++++
 src/views/order/base/orderGroup/index.vue     | 437 ++++++++++++++++++
 .../base/orderGroup/orderGroupDetailData.vue  | 376 +++++++++++++++
 .../orderManage/components/addWorkOrder.vue   |  16 +-
 .../base/orderManage/components/orderAdd.vue  | 137 +-----
 src/views/order/base/orderManage/index.vue    | 147 +++---
 .../base/orderManage/orderDetailData.vue      |  66 ++-
 .../orderCompletionMonitoring/index.vue       | 189 +++++---
 11 files changed, 1643 insertions(+), 288 deletions(-)
 create mode 100644 src/api/base/orderGroup.js
 create mode 100644 src/views/order/base/orderGroup/components/bindOrder.vue
 create mode 100644 src/views/order/base/orderGroup/components/orderGroupAdd.vue
 create mode 100644 src/views/order/base/orderGroup/index.vue
 create mode 100644 src/views/order/base/orderGroup/orderGroupDetailData.vue

diff --git a/src/api/base/orderGroup.js b/src/api/base/orderGroup.js
new file mode 100644
index 00000000..692fe74b
--- /dev/null
+++ b/src/api/base/orderGroup.js
@@ -0,0 +1,54 @@
+import request from '@/utils/request'
+// 获得集团订单分页
+export function getOrderGroupPage(query) {
+  return request({
+    url: '/base/order-group/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 获得集团订单
+export function getOrderGroup(query) {
+  return request({
+    url: '/base/order-group/get',
+    method: 'get',
+    params: query
+  })
+}
+
+// 更新集团订单
+export function updateOrderGroup(data) {
+  return request({
+    url: '/base/order-group/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 创建集团订单
+export function createOrderGroup(data) {
+  return request({
+    url: '/base/order-group/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改集团订单状态，结束-终止-作废用
+export function groupOrderStatusSet(data) {
+  return request({
+    url: '/base/order-group/groupOrderStatusSet',
+    method: 'put',
+    data: data
+  })
+}
+
+// 获得集团订单详情
+export function orderGroupDetail(query) {
+  return request({
+    url: '/base/order-group/getDetail',
+    method: 'get',
+    params: query
+  })
+}
\ No newline at end of file
diff --git a/src/api/base/orderManage.js b/src/api/base/orderManage.js
index 9933c9b7..bd415ce0 100644
--- a/src/api/base/orderManage.js
+++ b/src/api/base/orderManage.js
@@ -86,6 +86,15 @@ export function orderDelete(query) {
   })
 }
 
+// 修改订单状态，结束-终止-作废用
+export function orderStatusSet(data) {
+  return request({
+    url: '/base/order/orderStatusSet',
+    method: 'put',
+    data: data
+  })
+}
+
 // 下发订单，绑定的穿工单id，新建不传
 export function orderIssue(data) {
   return request({
diff --git a/src/views/order/base/orderGroup/components/bindOrder.vue b/src/views/order/base/orderGroup/components/bindOrder.vue
new file mode 100644
index 00000000..612cd94a
--- /dev/null
+++ b/src/views/order/base/orderGroup/components/bindOrder.vue
@@ -0,0 +1,304 @@
+<template>
+  <el-form ref="addWorkOrder" :rules="rules" label-width="130px" :model="form" label-position='top'>
+    <el-row :gutter="20">
+      <el-col :span='6'>
+        <el-form-item label="工单名称" prop="name" v-if='!isBind'>
+          <el-input v-model="form.name"></el-input>
+        </el-form-item>
+        <el-form-item label="工单名称" prop="workOrderId"  v-if='isBind'>
+          <el-select v-model="form.workOrderId" placeholder="请选择" style="width: 100%;" filterable @change="getWorkOrderMsg">
+            <el-option
+              v-for="item in workOrderList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+      </el-col>
+      <el-col :span='6'>
+        <el-form-item label="工单编码" prop="code">
+          <el-input v-model="form.code" disabled></el-input>
+        </el-form-item>
+      </el-col>
+      <el-col :span='6'>
+        <el-form-item label="产品名称" prop="planProductId">
+          <el-select v-model="form.planProductId" placeholder="请选择" disabled  style="width: 100%;">
+            <el-option
+              v-for="item in productList"
+              :key="item.id"
+              :label="item.name+' | '+item.specifications"
+              :value="item.id">
+              <span style="float: left">{{ item.name }}</span>
+              <span style="float: right; color: #8492a6; font-size: 13px">{{ item.specifications }}</span>
+            </el-option>
+          </el-select>
+        </el-form-item>
+      </el-col>
+      <el-col :span='6'>
+        <el-form-item label="计划开始时间">
+          <el-date-picker
+            v-model="planStartTime"
+            type="datetime"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            style="width: 100%;"
+            placeholder="选择日期"
+            :disabled="isBind">
+          </el-date-picker>
+        </el-form-item>
+      </el-col>
+    </el-row>
+    <el-row :gutter="20">
+      <el-col :span='6'>
+        <el-form-item label="计划完成时间">
+          <el-date-picker
+            v-model="planFinishTime"
+            type="datetime"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            style="width: 100%;"
+            placeholder="选择日期"
+            :disabled="isBind">
+          </el-date-picker>
+        </el-form-item>
+      </el-col>
+      <el-col :span='6'>
+        <el-form-item label="计划投入数量" prop="planAssignQuantity">
+          <el-input-number v-model="form.planAssignQuantity" :min="0" :max="9999999999999" :disabled="isBind" style="width: 100%;"></el-input-number>
+        </el-form-item>
+      </el-col>
+      <el-col :span='6'>
+        <el-form-item label="计划生产数量" prop="planQuantity">
+          <el-input-number v-model="form.planQuantity" :min="0" :max="9999999999999" :disabled="isBind" style="width: 100%;"></el-input-number>
+        </el-form-item>
+      </el-col>
+      <el-col :span='6'>
+        <el-form-item label="关联工艺" prop="processFlowId">
+          <el-select v-model="form.processFlowId" placeholder="请选择" disabled style="width: 100%;">
+            <el-option
+              v-for="item in processFlowList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+      </el-col>
+    </el-row>
+    <el-row :gutter="20">
+      <el-col :span='6'>
+        <el-form-item label="物料计算方式" prop="materialMethod">
+          <el-select v-model="form.materialMethod" placeholder="请选择" style="width: 100%;" disabled>
+            <el-option label="产品基础BOM" :value="1"></el-option>
+            <el-option label="工艺扩展BOM" :value="2"></el-option>
+          </el-select>
+        </el-form-item>
+      </el-col>
+      <el-col :span='6'>
+        <el-form-item label="优先级" prop="priority">
+          <el-select v-model="form.priority" placeholder="请选择" style="width: 100%;" :disabled="isBind">
+            <el-option
+              v-for="item in getDictDatas(DICT_TYPE.ORDER_PRIORITY)"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value">
+            </el-option>
+          </el-select>
+        </el-form-item>
+      </el-col>
+      <el-col :span='6'>
+        <el-form-item label="工单类型" prop="type">
+          <el-select v-model="form.type" placeholder="请选择" style="width: 100%;" :disabled="isBind">
+            <el-option
+              v-for="item in workOrderTypeList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+      </el-col>
+      <el-col :span='6'>
+        <el-form-item label="关联产线" prop="productLineId">
+          <el-select v-model="form.productLineId" placeholder="请选择" multiple style="width: 100%;" :disabled="isBind">
+            <el-option
+              v-for="item in productLineList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+      </el-col>
+    </el-row>
+    <el-row :gutter="20">
+      <el-col :span='6'>
+        <el-form-item label="负责人" prop="workers">
+          <el-input v-model="form.workers" :disabled="isBind"></el-input>
+        </el-form-item>
+      </el-col>
+      <el-col :span='6'>
+        <el-form-item label="计划分配订单量" prop="planAssignmentQuantity">
+          <el-input-number v-model="form.planAssignmentQuantity" :min="0" :max="9999999999999" style="width: 100%;"></el-input-number>
+        </el-form-item>
+      </el-col>
+    </el-row>
+  </el-form>
+</template>
+<script>
+import { getProductAll } from '@/api/base/product'
+import { getProcessFlowList, getWorkOrderCode, orderIssue, workOrderList, getWorkOrderById } from '@/api/base/orderManage'
+import { getLineAll } from '@/api/base/productionLine'
+import moment from 'moment'
+export default {
+  name: 'bindOrder',
+  data() {
+    return {
+      form: {
+        workOrderId: '',
+        orderId: '',
+        name: '',
+        code: '',
+        planProductId: '',
+        planStartTime: '',
+        planFinishTime: '',
+        planAssignQuantity: 0,
+        planQuantity: 0,
+        processFlowId: '',
+        materialMethod: 1,
+        priority: '',
+        productLineId: [],
+        type: '',
+        workers: '',
+        planAssignmentQuantity: ''
+      },
+      rules: {
+        name: [{ required: true, message: "工单名称不能为空", trigger: "blur" }],
+        planProductId: [{ required: true, message: "产品名称不能为空", trigger: "change" }],
+        planAssignQuantity: [{ required: true, message: "计划投入数量不能为空", trigger: "blur" }],
+        planQuantity: [{ required: true, message: "计划生产数量不能为空", trigger: "blur" }],
+        productLineId: [{ required: true, message: "产线不能为空", trigger: "change" }],
+        planAssignmentQuantity: [{ required: true, message: "计划分配订单量不能为空", trigger: "blur" }]
+      },
+      productList: [],
+      processFlowList: [],
+      productLineList: [],
+      workOrderTypeList: [
+        {id: 1,name:'标准工单'},
+        {id: 2, name:'特殊工单'}
+      ],
+      planStartTime: '',
+      planFinishTime: '',
+      isBind: false,
+      workOrderList: []
+    }
+  },
+  methods: {
+    init(data, param) {
+      this.form.orderId = data.id
+      this.getList()
+      if (param === 'add') {
+        this.isBind = false
+        getWorkOrderCode().then(res => {
+          this.form.code = res.data || ''
+        })
+        this.form.planProductId = data.planProductId
+        this.form.processFlowId = data.processFlowId
+        this.form.materialMethod = data.materialMethod
+      }else{//绑定
+        this.isBind = true
+      }
+    },
+    getList() {
+      // 产品
+      getProductAll().then(res => {
+        this.productList = res.data || []
+      })
+      // 产线
+      getLineAll().then(res => {
+        this.productLineList = res.data || []
+      })
+      // 工艺
+      getProcessFlowList().then(res => {
+        this.processFlowList = res.data || []
+      })
+      // 工单list
+      workOrderList({
+        status: 1
+      }).then(res => {
+        this.workOrderList = res.data || []
+      })
+    },
+    addWorkOrderSubmit() {
+      this.$refs['addWorkOrder'].validate((valid) => {
+        if (valid) {
+          if (this.isBind) {
+            //绑定工单
+            orderIssue({
+              workOrderId: this.form.workOrderId,
+              orderId: this.form.orderId,
+              planAssignmentQuantity: this.form.planAssignmentQuantity
+             }).then((res) => {
+              if (res.code === 0) {
+                this.$modal.msgSuccess("操作成功")
+                this.$emit('addWorkOrderSubmit')
+              }
+            })
+          } else {
+            // 新增工单
+            let _this = this
+            _this.form.planStartTime = _this.planStartTime ? new Date(_this.planStartTime).valueOf() : ''
+            _this.form.planFinishTime = _this.planFinishTime ? new Date(_this.planFinishTime).valueOf() : ''
+            orderIssue({ ..._this.form }).then(res => {
+              if (res.code === 0) {
+                _this.$modal.msgSuccess("操作成功")
+                let name = this.form.name
+                _this.$emit('addWorkOrderSubmit')
+                // 询问是否添加预使用主原料
+                _this.$modal.confirm('是否添加预使用主原料信息?').then(function() {
+                    _this.$router.push({
+                      path: '/core/core-work-order?workOrderName='+encodeURI(name)
+                    })
+                  })
+              }
+            })
+          }
+        } else {
+          return false
+        }
+      })
+    },
+    formClear() {
+      this.$refs.addWorkOrder.resetFields()
+      this.form.materialMethod = 1
+      this.form.planAssignQuantity = 0
+      this.form.planQuantity = 0
+      this.planFinishTime = ''
+      this.planStartTime = ''
+      this.form.planFinishTime = ''
+      this.form.planStartTime = ''
+      this.isBind = false
+    },
+    // 绑定工单，选择工单时获取工单信息
+    getWorkOrderMsg() {
+      if (this.form.workOrderId) {
+        getWorkOrderById({id:this.form.workOrderId}).then(res => {
+          if (res.code === 0) {
+            this.form.code = res.data.code
+            this.form.planProductId = res.data.planProductId
+            this.planStartTime = res.data.planStartTime ? moment.unix(res.data.planStartTime).format('YYYY-MM-DD HH:mm:ss') : null
+            this.planFinishTime = res.data.planFinishTime ? moment.unix(res.data.planFinishTime).format('YYYY-MM-DD HH:mm:ss') : null
+            this.form.planAssignQuantity = res.data.planAssignQuantity
+            this.form.planQuantity = res.data.planQuantity
+            this.form.processFlowId = res.data.processFlowId
+            this.form.materialMethod = res.data.materialMethod
+            this.form.priority = res.data.priority ? res.data.priority + '' : ''
+            this.form.productLineId = res.data.productLineIds
+            this.form.type = res.data.type
+            this.form.workers = res.data.workers
+          }
+        })
+      }
+    }
+  }
+}
+</script>
\ No newline at end of file
diff --git a/src/views/order/base/orderGroup/components/orderGroupAdd.vue b/src/views/order/base/orderGroup/components/orderGroupAdd.vue
new file mode 100644
index 00000000..1cf82535
--- /dev/null
+++ b/src/views/order/base/orderGroup/components/orderGroupAdd.vue
@@ -0,0 +1,196 @@
+<template>
+  <el-form ref="orderAddForm" :rules="rules" label-width="130px" :model="form" label-position='top'>
+    <el-row :gutter="20">
+      <el-col :span='6'>
+        <el-form-item label="订单名称" prop="name">
+          <el-input v-model="form.name"></el-input>
+        </el-form-item>
+      </el-col>
+      <el-col :span='6'>
+        <el-form-item label="订单编码" prop="code">
+          <el-input v-model="form.code"></el-input>
+        </el-form-item>
+      </el-col>
+      <el-col :span='6'>
+        <el-form-item label="产品名称" prop="planProductId">
+          <el-select v-model="form.planProductId" placeholder="请选择" style="width: 100%;" filterable @change="getSpecifications">
+            <el-option
+              v-for="item in productList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+      </el-col>
+      <el-col :span='6'>
+        <el-form-item label="产品规格" prop="specifications">
+          <el-input v-model="form.specifications" disabled></el-input>
+        </el-form-item>
+      </el-col>
+    </el-row>
+    <el-row :gutter="20">
+      <el-col :span='6'>
+        <el-form-item label="客户" prop="customerId">
+          <el-select v-model="form.customerId" placeholder="请选择" style="width: 100%;" clearable filterable>
+            <el-option
+              v-for="item in customerList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+      </el-col>
+      <el-col :span='6'>
+        <el-form-item label="计划加工数量" prop="planQuantity">
+          <el-input-number v-model="form.planQuantity" :min="0" :max="9999999999999" style="width: 100%;"></el-input-number>
+        </el-form-item>
+      </el-col>
+    <el-col :span='6'>
+        <el-form-item label="交货时间" prop="finishProduceTime">
+          <el-date-picker
+            v-model="form.finishProduceTime"
+            type="datetime"
+            style="width: 100%;"
+            value-format="timestamp"
+            placeholder="选择日期">
+          </el-date-picker>
+        </el-form-item>
+      </el-col>
+      <el-col :span='6'>
+        <el-form-item label="包装要求" prop="packReq">
+          <el-select v-model="form.packReq" placeholder="请选择" style="width: 100%;" clearable>
+            <el-option
+              v-for="item in getDictDatas(DICT_TYPE.PACK_SPEC)"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value">
+            </el-option>
+          </el-select>
+        </el-form-item>
+      </el-col>
+    </el-row>
+    <el-row :gutter="20">
+      <el-col :span='24'>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark"></el-input>
+        </el-form-item>
+      </el-col>
+    </el-row>
+  </el-form>
+</template>
+<script>
+import { getOrderCode } from '@/api/base/orderManage'
+import { getOrderGroup, updateOrderGroup, createOrderGroup } from '@/api/base/orderGroup'
+import { getProductAll } from '@/api/base/product'
+import { getCustomerList } from '@/api/base/customer'
+export default {
+  name: 'OrderGroupAdd',
+  data() {
+    return {
+      form: {
+        id: '',
+        name: '',
+        code: '',
+        planProductId: '',
+        specifications: '',
+        customerId: '',
+        planQuantity: '',
+        finishProduceTime: '',
+        packReq:'',
+        remark: ''
+      },
+      rules: {
+        name: [{ required: true, message: "订单名称不能为空", trigger: "blur" }],
+        code: [{ required: true, message: "订单编码不能为空", trigger: "blur" }],
+        planProductId: [{ required: true, message: "产品名称不能为空", trigger: "change" }],
+        planQuantity: [{ required: true, message: "计划加工数量不能为空", trigger: "blur" }],
+        finishProduceTime: [{ required: true, message: "交货时间不能为空", trigger: "change" }]
+      },
+      productList: [],
+      customerList: [],
+      isEdit: false //是否是编辑
+    }
+  },
+  methods: {
+    init(id) {
+      this.getList()
+      if (id) {
+        this.isEdit = true
+        this.form.id = id
+        getOrderGroup({id: this.form.id}).then(res => {
+          if (res.code === 0) {
+            this.form.name = res.data.name
+            this.form.code = res.data.code
+            this.form.planProductId = res.data.planProductId
+            this.getSpecifications(this.form.planProductId)
+            this.form.customerId = res.data.customerId
+            this.form.planQuantity = res.data.planQuantity
+            this.form.finishProduceTime = res.data.finishProduceTime ? res.data.finishProduceTime : null
+            this.form.packReq = res.data.packReq ? res.data.packReq+'' : ''
+            this.form.remark = res.data.remark
+          }
+        })
+      } else {
+        this.isEdit = false
+        this.form.id = ''
+        // 订单号
+        getOrderCode().then(res => {
+          this.form.code = res.data || ''
+        })
+      }
+    },
+    getList() {
+      // 产品
+      getProductAll().then(res => {
+        this.productList = res.data || []
+      })
+      // 客户
+      getCustomerList().then(res => {
+        this.customerList = res.data || []
+      })
+    },
+    // 获取产品规格
+    getSpecifications(val) {
+      console.log(val)
+      for (let i of this.productList) {
+        if (i.id === val) {
+          this.form.specifications =  i.specifications
+          return
+        }
+      }
+      this.form.specifications = ''
+    },
+    submitForm() {
+      this.$refs['orderAddForm'].validate((valid) => {
+        if (valid) {
+          if (this.isEdit) {
+            //编辑
+            updateOrderGroup({ ...this.form }).then((res) => {
+              if (res.code === 0) {
+                this.$modal.msgSuccess("操作成功");
+                this.$emit('successSubmit')
+              }
+            })
+          } else {
+            createOrderGroup({ ...this.form }).then((res) => {
+              if (res.code === 0) {
+                this.$modal.msgSuccess("操作成功");
+                this.$emit('successSubmit')
+              }
+            })
+          }
+        } else {
+          return false
+        }
+      })
+    },
+    formClear() {
+      this.$refs.orderAddForm.resetFields()
+      this.form.planQuantity = 0
+      this.isEdit = false
+    }
+  }
+}
+</script>
\ No newline at end of file
diff --git a/src/views/order/base/orderGroup/index.vue b/src/views/order/base/orderGroup/index.vue
new file mode 100644
index 00000000..2bbde83b
--- /dev/null
+++ b/src/views/order/base/orderGroup/index.vue
@@ -0,0 +1,437 @@
+<template>
+  <div class="app-container">
+    <!-- 搜索工作栏 -->
+    <search-bar
+      :formConfigs="formConfig"
+      ref="searchBarForm"
+      @headBtnClick="buttonClick"
+    />
+    <!-- 列表 -->
+    <base-table
+      :page="queryParams.pageNo"
+      :limit="queryParams.pageSize"
+      :table-props="tableProps"
+      :table-data="list"
+      :max-height="tableH"
+    >
+      <method-btn
+        v-if="tableBtn.length"
+        slot="handleBtn"
+        :width="240"
+        label="操作"
+        :method-list="tableBtn"
+        @clickBtn="handleClick"
+      />
+    </base-table>
+    <pagination
+      :page.sync="queryParams.pageNo"
+      :limit.sync="queryParams.pageSize"
+      :total="total"
+      @pagination="getList"
+    />
+    <!-- 新增&编辑 -->
+    <base-dialog
+      :dialogTitle="addOrEditTitle"
+      :dialogVisible="centervisible"
+      @cancel="handleCancel"
+      @confirm="handleConfirm"
+      :before-close="handleCancel"
+      width='60%'
+    >
+      <order-group-add ref="orderGroupAdd" @successSubmit="successSubmit" />
+    </base-dialog>
+    <!-- 查看详情 -->
+    <!-- 新增工单 -->
+    <base-dialog
+      :dialogTitle="workIssueTitle"
+      :dialogVisible="addWorkOrdervisible"
+      @cancel="addWorkOrderCancel"
+      @confirm="addWorkOrderConfirm"
+      :before-close="addWorkOrderCancel"
+      width='70%'
+    >
+      <add-work-order ref="bindOrder" @addWorkOrderSubmit="addWorkOrderSubmit" />
+    </base-dialog>
+  </div>
+</template>
+<script>
+import { parseTime } from '@/utils/ruoyi'
+import { getOrderGroupPage, groupOrderStatusSet } from '@/api/base/orderGroup'
+import { orderDelete, customerList, orderFinish } from '@/api/base/orderManage'
+import OrderGroupAdd from './components/orderGroupAdd'
+import BindOrder from './components/bindOrder'
+import { publicFormatter } from '@/utils/dict'
+const tableProps = [
+  {
+    prop: 'createTime',
+    label: '添加时间',
+    filter: parseTime,
+    minWidth: 160
+  },
+  {
+    prop: 'name',
+    label: '订单名称',
+    minWidth: 120,
+    showOverflowtooltip: true
+  },
+  {
+    prop: 'code',
+    label: '订单编码',
+    minWidth: 180
+  },
+  {
+    prop: 'customerId',
+    label: '客户',
+    showOverflowtooltip: true
+  },
+  {
+    prop: 'status',
+    label: '订单状态',
+    filter: publicFormatter('order_status')
+  },{
+    prop: 'specifications',
+    label: '产品规格',
+    showOverflowtooltip: true
+  },
+  {
+    prop: 'unit',
+    label: '单位',
+    filter: publicFormatter('unit_dict')
+  },
+  {
+    prop: 'planQuantity',
+    label: '计划加工量',
+    width: 100
+  },
+  {
+    prop: 'actualquantity',
+    label: '实际加工量',
+    width: 100
+  },
+  {
+    prop: 'finishProduceTime',
+    label: '交货时间',
+    filter: parseTime,
+    minWidth: 160
+  },
+  {
+    prop: 'productName2',
+    label: '包装要求',
+    showOverflowtooltip: true
+  },
+  {
+    prop: 'orderIdNum',
+    label: '订单数量'
+  }  
+]
+export default {
+  name: 'OrderGroup',
+  data() {
+    return {
+      formConfig: [
+        {
+          type: 'input',
+          label: '订单名称',
+          placeholder: '订单名称',
+          param: 'name'
+        },
+        {
+          type: 'select',
+          label: '状态',
+          selectOptions: this.getDictDatas(this.DICT_TYPE.ORDER_STATUS),
+          labelField: 'label',
+          valueField: 'value',
+          param: 'status'
+        },
+        {
+          type: 'datePicker',
+          label: '时间段',
+          dateType: 'daterange',
+          format: 'yyyy-MM-dd',
+          valueFormat: "yyyy-MM-dd",
+          rangeSeparator: '-',
+          startPlaceholder: '开始时间',
+          endPlaceholder: '结束时间',
+          param: 'timeVal',
+          defaultSelect: [],
+          width: 250
+        },
+        {
+          type: 'button',
+          btnName: '查询',
+          name: 'search',
+          color: 'primary'
+        },
+        {
+          type: this.$auth.hasPermi('base:order-manage:create') ? 'separate' : '',
+        },
+        {
+          type: this.$auth.hasPermi('base:order-manage:create') ? 'button' : '',
+          btnName: '新增',
+          name: 'add',
+          color: 'success',
+          plain: true
+        }
+      ],
+      // 查询参数
+      queryParams: {
+        pageNo: 1,
+        pageSize: 20,
+        name: null,
+        status: null,
+        lastIssuedTime: []
+      },
+      total: 0,
+      tableProps,
+      list: [],
+      tableH: this.tableHeight(260),
+      tableBtn: [
+      this.$auth.hasPermi('base:order-manage:bindWorkOrder')
+          ? {
+              type: 'bind',
+              btnName: '绑定',
+              showTip: '绑定工单',
+              // showParam: {
+              //   type: '|',
+              //   data: [
+              //     {
+              //       type: 'equal',
+              //       name: 'status',
+              //       value: 1
+              //     },
+              //     {
+              //       type: 'equal',
+              //       name: 'status',
+              //       value: 2
+              //     },
+              //     {
+              //       type: 'equal',
+              //       name: 'status',
+              //       value: 3
+              //     }
+              //   ]
+              // }
+            }
+          : undefined,
+      this.$auth.hasPermi('base:order-manage:bindWorkOrder')
+          ? {
+              type: 'complete',
+              btnName: '完成',
+              showTip: '完成订单',
+              // showParam: {
+              //   type: '|',
+              //   data: [
+              //     {
+              //       type: 'equal',
+              //       name: 'status',
+              //       value: 2
+              //     },
+              //     {
+              //       type: 'equal',
+              //       name: 'status',
+              //       value: 3
+              //     }
+              //   ]
+              // }
+            }
+          : undefined,
+          this.$auth.hasPermi('base:order-manage:bindWorkOrder')
+          ? {
+              type: 'termination',
+              btnName: '终止',
+              showTip: '终止',
+              // showParam: {
+              //   type: '|',
+              //   data: [
+              //     {
+              //       type: 'equal',
+              //       name: 'status',
+              //       value: 2
+              //     },
+              //     {
+              //       type: 'equal',
+              //       name: 'status',
+              //       value: 3
+              //     }
+              //   ]
+              // }
+            }
+          : undefined,
+          this.$auth.hasPermi('base:order-manage:bindWorkOrder')
+          ? {
+              type: 'cancel',
+              btnName: '作废',
+              showTip: '作废',
+              // showParam: {
+              //   type: '|',
+              //   data: [
+              //     {
+              //       type: 'equal',
+              //       name: 'status',
+              //       value: 2
+              //     },
+              //     {
+              //       type: 'equal',
+              //       name: 'status',
+              //       value: 3
+              //     }
+              //   ]
+              // }
+            }
+          : undefined,
+      this.$auth.hasPermi('base:order-manage:detail')
+          ? {
+              type: 'detail',
+              btnName: '详情'
+            }
+          : undefined,
+        this.$auth.hasPermi('base:order-manage:edit')
+          ? {
+              type: 'edit',
+              btnName: '编辑',
+              // showParam: {
+              //   type: '&',
+              //   data: [
+              //     {
+              //       type: 'equal',
+              //       name: 'triggerOrigin',
+              //       value: 1
+              //     },
+              //     {
+              //       type: 'equal',
+              //       name: 'status',
+              //       value: 1
+              //     }
+              //   ]
+              // }
+            }
+          : undefined
+      ].filter((v) => v),
+      addOrEditTitle: '',
+      centervisible: false,
+      priorityList: this.getDictDatas(this.DICT_TYPE.ORDER_PRIORITY),
+      workIssueTitle: '',
+      addWorkOrdervisible: false,
+      orderDetailVisible: false
+    }
+  },
+  components: { OrderGroupAdd, BindOrder },
+  created() {
+    window.addEventListener('resize', () => {
+      this.tableH = this.tableHeight(260)
+    })
+    this.getList()
+  },
+  methods: {
+    getList() {
+      getOrderGroupPage({...this.queryParams}).then(res => {
+        let arr = res.data.list || []
+        this.total = res.data.total || 0
+        if (arr.length > 0) {
+          customerList().then(result => {
+            let tempData = result.data || []
+            if (tempData.length > 0) {
+              arr.map(item => {
+                for (let i of tempData) {
+                  if (item.customerId === i.id) {
+                    item.customerId = i.name
+                  }
+                }
+                item.price = item.price?.toFixed(2)
+              })
+              this.list = arr
+            }
+          })
+        }else {
+          this.list = arr
+        }
+      })
+    },
+    buttonClick(val) {
+      console.log(val)
+      if (val.btnName === 'search') {
+        this.queryParams.name = val.name
+        this.queryParams.status = val.status
+        if (val.timeVal && val.timeVal.length > 0) {
+          this.queryParams.lastIssuedTime[0] = val.timeVal[0] + ' 00:00:00'
+          this.queryParams.lastIssuedTime[1] = val.timeVal[1] + ' 23:59:59'
+        } else {
+          this.queryParams.lastIssuedTime = []
+        }
+        this.getList()
+      } else {
+        this.addOrEditTitle = '新增'
+        this.centervisible = true
+        this.$nextTick(() => {
+          this.$refs.orderGroupAdd.init()
+        })
+      }
+    },
+    handleClick(val) {
+      console.log(val)
+      switch (val.type) {
+        case 'edit':
+          this.addOrEditTitle = '编辑'
+          this.centervisible = true
+          this.$nextTick(() => {
+            this.$refs.orderGroupAdd.init(val.data.id)
+          })
+          break
+        case 'cancel':
+          this.handleEditStatus(val.data, '作废', '6')
+          break
+        case 'detail':
+          this.$router.push({path: '/order/base/order-group/order-group-detail-data?orderGroupId='+ val.data.id})
+          break
+        case 'termination':
+          this.handleEditStatus(val.data, '终止', '5')
+          break
+        case 'bind':
+          this.workIssueTitle = '绑定工单'
+          this.addWorkOrdervisible = true
+          this.$nextTick(() => {
+            this.$refs.bindOrder.init(val.data, 'bind')
+          })
+          break
+        case 'complete':
+          this.handleEditStatus(val.data, '完成', '4')
+          break
+        default:
+      }
+    },
+    // 完成,终止，作废
+    handleEditStatus(val, tip, status) {
+      this.$modal.confirm('是否确认'+tip+'"' + val.name + '"?').then(function() {
+          return groupOrderStatusSet({ id: val.id, status: status})
+        }).then(() => {
+          this.getList();
+          this.$modal.msgSuccess("操作成功");
+        }).catch(() => {});
+    },
+    handleCancel() {
+      this.$refs.orderGroupAdd.formClear()
+      this.centervisible = false
+      this.addOrEditTitle = ''
+    },
+    handleConfirm() {
+      this.$refs.orderGroupAdd.submitForm()
+    },
+    successSubmit() {
+      this.handleCancel()
+      this.getList()
+    },
+    // 下发新增
+    addWorkOrderCancel() {
+      this.$refs.bindOrder.formClear()
+      this.addWorkOrdervisible = false
+    },
+    addWorkOrderConfirm() {
+      this.$refs.bindOrder.addWorkOrderSubmit()
+    },
+    addWorkOrderSubmit() {
+      this.addWorkOrderCancel()
+      this.getList()
+    }
+  }
+}
+</script>
\ No newline at end of file
diff --git a/src/views/order/base/orderGroup/orderGroupDetailData.vue b/src/views/order/base/orderGroup/orderGroupDetailData.vue
new file mode 100644
index 00000000..6d67d36e
--- /dev/null
+++ b/src/views/order/base/orderGroup/orderGroupDetailData.vue
@@ -0,0 +1,376 @@
+<template>
+  <div class="orderGroupDetailData">
+    <div class="box1">
+      <div class="boxTitle">
+        <span class="blueTitle"></span>
+        <span>集团编码: {{orderGroupMsg.code}}</span>
+      </div>
+      <el-button type="primary" plain size="small" style="float: right;" @click="returnOrderManage"><svg-icon icon-class="return"/> 返回</el-button>
+      <div style="padding-left: 14px;">
+        <el-row>
+          <el-col :span='4'>
+            <div class="blodTip">订单名称</div>
+            <div class="lightTip">{{orderGroupMsg.name}}</div>
+          </el-col>
+          <el-col :span='4'>
+            <div class="blodTip">产品名称</div>
+            <div class="lightTip">{{orderGroupMsg.productName}}</div>
+          </el-col>
+          <el-col :span='4'>
+            <div class="blodTip">产品规格</div>
+            <div class="lightTip">{{orderGroupMsg.specifications}}</div>
+          </el-col>
+          <el-col :span='4'>
+            <div class="blodTip">客户</div>
+            <div class="lightTip">{{orderGroupMsg.customerName}}</div>
+          </el-col>
+          <el-col :span='4'>
+            <div class="blodTip">包装要求</div>
+            <div class="lightTip">接口没有该字段</div>
+          </el-col>
+          <el-col :span='4'>
+            <div class="blodTip">交货时间</div>
+            <div class="lightTip">需要确认时哪个字段</div>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span='4'>
+            <div class="blodTip">创建时间</div>
+            <div class="lightTip">{{ parseTime(orderGroupMsg.triggerTime) }}</div>
+          </el-col>
+          <el-col :span='4'>
+            <div class="blodTip">计划开始时间</div>
+            <div class="lightTip">{{ parseTime(orderGroupMsg.planStartTime) }}</div>
+          </el-col>
+          <el-col :span='4'>
+            <div class="blodTip">计划完成时间</div>
+            <div class="lightTip">{{ parseTime(orderGroupMsg.planFinishTime) }}</div>
+          </el-col>
+          <el-col :span='4'>
+            <div class="blodTip">计划加工数量</div>
+            <div class="lightTip">{{orderGroupMsg.planQuantity}}</div>
+          </el-col>
+          <el-col :span='4'>
+            <div class="blodTip">加工平方数(平方米)</div>
+            <div class="lightTip">接口没有该字段</div>
+          </el-col>
+          <el-col :span='4'>
+            <div class="blodTip">状态</div>
+            <div class="lightTip">{{getDictDataLabel(DICT_TYPE.ORDER_STATUS, orderGroupMsg.status)}}</div>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span='4'>
+            <div class="blodTip">实际开始时间</div>
+            <div class="lightTip">{{ parseTime(orderGroupMsg.startProduceTime) }}</div>
+          </el-col>
+          <el-col :span='4'>
+            <div class="blodTip">实际完成时间</div>
+            <div class="lightTip">{{ parseTime(orderGroupMsg.finishProduceTime) }}</div>
+          </el-col>
+          <el-col :span='4'>
+            <div class="blodTip">实际生产数量</div>
+            <div class="lightTip">{{orderGroupMsg.actualquantity	}}</div>
+          </el-col>
+          <el-col :span='4'>
+            <div class="blodTip">完成比%</div>
+            <div class="lightTip">{{orderGroupMsg.completeRate}}</div>
+          </el-col>
+          <el-col :span='4'>
+            <div class="blodTip">废片数量</div>
+            <div class="lightTip">接口未看到该字段</div>
+          </el-col>
+        </el-row>
+      </div>
+    </div>
+    <div class="box2">
+      <div class="boxTitle">
+        <span class="blueTitle"></span>
+        <span>厂务订单编码: 64656563453543</span>
+      </div>
+      <div style="padding-left: 14px;">
+        <el-row>
+          <el-col :span='4'>
+            <div class="blodTip">订单名称</div>
+            <div class="lightTip">测试订单1</div>
+          </el-col>
+          <el-col :span='4'>
+            <div class="blodTip">产品名称</div>
+            <div class="lightTip">测试产品</div>
+          </el-col>
+          <el-col :span='4'>
+            <div class="blodTip">产品规格</div>
+            <div class="lightTip">测试产品规格</div>
+          </el-col>
+          <el-col :span='4'>
+            <div class="blodTip">创建时间</div>
+            <div class="lightTip">{{ parseTime(orderGroupMsg.createTime) }}</div>
+          </el-col>
+          <el-col :span='4'>
+            <div class="blodTip">计划开始时间</div>
+            <div class="lightTip">{{ parseTime(orderGroupMsg.planStartTime) }}</div>
+          </el-col>
+          <el-col :span='4'>
+            <div class="blodTip">计划完成时间</div>
+            <div class="lightTip">{{ parseTime(orderGroupMsg.planFinishTime) }}</div>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span='4'>
+            <div class="blodTip">计划加工数量</div>
+            <div class="lightTip">{{orderGroupMsg.planQuantity}}</div>
+          </el-col>
+          <el-col :span='4'>
+            <div class="blodTip">加工平方数(平方米)</div>
+            <div class="lightTip">{{orderGroupMsg.planArea}}</div>
+          </el-col>
+          <el-col :span='4'>
+            <div class="blodTip">预计用时</div>
+            <div class="lightTip">10</div>
+          </el-col>
+          <el-col :span='4'>
+            <div class="blodTip">状态</div>
+            <div class="lightTip">{{getDictDataLabel(DICT_TYPE.ORDER_STATUS, orderGroupMsg.status)}}</div>
+          </el-col>
+          <el-col :span='4'>
+            <div class="blodTip">实际开始时间</div>
+            <div class="lightTip">{{ parseTime(orderGroupMsg.startProduceTime) }}</div>
+          </el-col>
+          <el-col :span='4'>
+            <div class="blodTip">实际完成时间</div>
+            <div class="lightTip">{{ parseTime(orderGroupMsg.finishProduceTime) }}</div>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span='4'>
+            <div class="blodTip">实际生产数量</div>
+            <div class="lightTip">{{orderGroupMsg.actualQuantity	}}</div>
+          </el-col>
+          <el-col :span='4'>
+            <div class="blodTip">完成比%</div>
+            <div class="lightTip">{{orderGroupMsg.completeProp}}</div>
+          </el-col>
+          <el-col :span='4'>
+            <div class="blodTip">废片数量</div>
+            <div class="lightTip">100</div>
+          </el-col>
+        </el-row>
+      </div>
+      <!-- 列表 -->
+      <div class="boxTitle">
+        <span class="blueTitle"></span>
+        <span>工单信息</span>
+      </div>
+      <base-table
+        :page="queryParams.pageNo"
+        :limit="queryParams.pageSize"
+        :table-props="tableProps"
+        :table-data="list"
+        :max-height="tableH"
+      />
+    </div>
+  </div>
+</template>
+<script>
+import { parseTime } from '@/utils/ruoyi'
+import { publicFormatter } from '@/utils/dict'
+import { getProcessFlowList } from '@/api/base/orderManage'
+import { orderGroupDetail } from '@/api/base/orderGroup'
+const tableProps = [
+  {
+    prop: 'issueTime',
+    label: '下发时间',
+    filter: parseTime,
+    minWidth: 160
+  },
+  {
+    prop: 'name',
+    label: '工单名',
+    minWidth: 100,
+    showOverflowtooltip: true
+  },
+  {
+    prop: 'code',
+    label: '工单编码',
+    minWidth: 150
+  },
+  {
+    prop: 'code1',
+    label: '负责车间',
+    minWidth: 150
+  },
+  {
+    prop: 'planAssignmentQuantity',
+    label: '计划加工量',
+    width: 100
+  },
+  {
+    prop: 'actualQuantity',
+    label: '实际加工量',
+    width: 100
+  },
+  {
+    prop: 'actualArea',
+    label: '加工平方数',
+    width: 100
+  },
+  {
+    prop: 'status',
+    label: '状态',
+    filter: publicFormatter('work_order_status')
+  },
+  {
+    prop: 'startProduceTime',
+    label: '开始时间',
+    filter: parseTime,
+    minWidth: 160
+  },
+  {
+    prop: 'finishProduceTime',
+    label: '结束时间',
+    filter: parseTime,
+    minWidth: 160
+  },
+  {
+    prop: 'productLineNames',
+    label: '关联产线',
+    filter: (val) => val ? val.join(',') : '',
+    showOverflowtooltip: true
+  },
+  {
+    prop: 'workers',
+    label: '负责人'
+  },
+  {
+    prop: 'remark',
+    label: '备注'
+  }
+]
+import { bomUseNum } from '@/api/base/orderManage'
+export default {
+  name: 'orderGroupDetailData',
+  data() {
+    return {
+      orderGroupId: '',
+      tableProps,
+      list: [{remark: 111},{remark: 111},{remark: 111}],
+      tableH: this.tableHeight(510) / 2,
+      // 查询参数
+      queryParams: {
+        pageNo: 1,
+        pageSize: 500
+      },
+      orderGroupMsg: {},
+      processFlowName: ''
+    }
+  },
+  mounted() {
+    window.addEventListener('resize', () => {
+      this.tableH = this.tableHeight(510) / 2
+    })
+    this.orderGroupId = location.href.split('?')[1].split('=')[1]
+    this.getMsg()
+  },
+  watch: {
+    $route: 'initData'
+  },
+  methods: {
+    initData(to) {
+      if (to.name === 'orderGroupDetailData') {
+        this.orderGroupId = location.href.split('?')[1].split('=')[1]
+        this.getMsg()
+      }
+    },
+    getMsg() {
+      orderGroupDetail({
+        id: this.orderGroupId
+      }).then(res => {
+        this.orderGroupMsg = res.data
+        // this.list = res.data.coreWorkOrderRespVOS
+        // bomUseNum({
+        //   productId: this.orderGroupMsg.planProductId
+        // }).then(res2 => {
+        //   if (res2.data && res2.data.length > 0) {
+        //     let arr = res2.data
+        //     arr.map(item => {
+        //       if (item) {
+        //         let a = item.num * this.orderGroupMsg.remainingQuantity
+        //         item.num = !isNaN(parseFloat(a)) && isFinite(a) ? a : ''
+        //       }
+        //     })
+        //     this.list2 = arr
+        //   }else {
+        //     this.list2 = []
+        //   }
+        // })
+        // 工艺
+        getProcessFlowList().then(res => {
+          let arr = res.data || []
+          if (arr.length > 0) {
+            arr.map(item => {
+              if (item.id === this.orderGroupMsg.processFlowId) {
+                this.processFlowName = item.name
+              }
+            })
+          }
+        })
+      })
+    },
+    // 返回
+    returnOrderManage() {
+      this.$router.push({path: '/order/base/order-group'})
+    }
+  }
+}
+</script>
+<style lang='scss' scoped>
+.orderGroupDetailData {
+  height: calc(100vh - 120px - 8px);
+  background-color: rgb(242, 244, 249);
+  overflow: auto;
+  .box1, .box2 {
+    background-color: #fff;
+    border-radius: 9px;
+    .blodTip {
+      height: 16px;
+      font-size: 14px;
+      font-weight: 600;
+      color: rgba(0,0,0,0.85);
+      margin-bottom: 8px;
+    }
+    .lightTip {
+      height: 16px;
+      font-size: 14px;
+      font-weight: 400;
+      color: rgba(102,102,102,0.75);
+      margin-bottom: 12px;
+    }
+  }
+  .box2 {
+    height: 415px;
+    padding: 12px 16px 0;
+    margin: 8px 0;
+  }
+  .box1 {
+    height: 215px;
+    padding: 16px 16px 0 16px;
+  }
+  .boxTitle {
+    display: inline-block;
+    font-size: 16px;
+    font-weight: 400;
+    color: #000000;
+    margin:0 10px 20px 0;
+  }
+  .blueTitle {
+    content: '';
+    display: inline-block;
+    width: 4px;
+    height: 18px;
+    background-color: #0B58FF;
+    border-radius: 1px;
+    margin-right: 8px;
+    vertical-align: bottom;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/views/order/base/orderManage/components/addWorkOrder.vue b/src/views/order/base/orderManage/components/addWorkOrder.vue
index 45f2a62e..d2a9465e 100644
--- a/src/views/order/base/orderManage/components/addWorkOrder.vue
+++ b/src/views/order/base/orderManage/components/addWorkOrder.vue
@@ -117,6 +117,20 @@
           </el-select>
         </el-form-item>
       </el-col>
+      <el-col :span='6'>
+        <el-form-item label="优先级" prop="priority">
+          <el-select v-model="form.priority" placeholder="请选择" style="width: 100%;" :disabled="isBind">
+            <el-option
+              v-for="item in getDictDatas(DICT_TYPE.WORK_SHOP)"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value">
+            </el-option>
+          </el-select>
+        </el-form-item>
+      </el-col>
+    </el-row>
+    <el-row :gutter="20">
       <el-col :span='6'>
         <el-form-item label="关联产线" prop="productLineId">
           <el-select v-model="form.productLineId" placeholder="请选择" multiple style="width: 100%;" :disabled="isBind">
@@ -129,8 +143,6 @@
           </el-select>
         </el-form-item>
       </el-col>
-    </el-row>
-    <el-row :gutter="20">
       <el-col :span='6'>
         <el-form-item label="负责人" prop="workers">
           <el-input v-model="form.workers" :disabled="isBind"></el-input>
diff --git a/src/views/order/base/orderManage/components/orderAdd.vue b/src/views/order/base/orderManage/components/orderAdd.vue
index df871a9e..e027839c 100644
--- a/src/views/order/base/orderManage/components/orderAdd.vue
+++ b/src/views/order/base/orderManage/components/orderAdd.vue
@@ -16,39 +16,6 @@
           <el-input-number v-model="form.planQuantity" :min="0" :max="9999999999999" style="width: 100%;"></el-input-number>
         </el-form-item>
       </el-col>
-      <el-col :span='6'>
-        <el-form-item label="产品名称" prop="planProductId">
-          <el-select v-model="form.planProductId" placeholder="请选择" style="width: 100%;" filterable>
-            <el-option
-              v-for="item in productList"
-              :key="item.id"
-              :label="item.name+' | '+(item.specifications || '')"
-              :value="item.id">
-              <span style="float: left">{{ item.name }}</span>
-              <span style="float: right; color: #8492a6; font-size: 13px">{{ item.specifications }}</span>
-            </el-option>
-          </el-select>
-        </el-form-item>
-      </el-col>
-    </el-row>
-    <el-row :gutter="20">
-      <el-col :span='6'>
-        <el-form-item label="单价" prop="price">
-          <el-input-number v-model="form.price" :min="0" :max="9999999999999" :precision='2' style="width: 100%;"></el-input-number>
-        </el-form-item>
-      </el-col>
-      <el-col :span='6'>
-        <el-form-item label="客户" prop="customerId">
-          <el-select v-model="form.customerId" placeholder="请选择" style="width: 100%;" clearable filterable>
-            <el-option
-              v-for="item in customerList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id">
-            </el-option>
-          </el-select>
-        </el-form-item>
-      </el-col>
       <el-col :span='6'>
         <el-form-item label="优先级" prop="priority">
           <el-select v-model="form.priority" placeholder="请选择" style="width: 100%;" clearable>
@@ -61,43 +28,25 @@
           </el-select>
         </el-form-item>
       </el-col>
-      <el-col :span='6'>
-        <el-form-item label="包装规格" prop="packSpec">
-          <el-select v-model="form.packSpec" placeholder="请选择" style="width: 100%;" clearable>
-            <el-option
-              v-for="item in getDictDatas(DICT_TYPE.PACK_SPEC)"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value">
-            </el-option>
-          </el-select>
-        </el-form-item>
-      </el-col>
     </el-row>
     <el-row :gutter="20">
       <el-col :span='6'>
-        <el-form-item label="负责人" prop="workers">
-          <el-input v-model="form.workers"></el-input>
-        </el-form-item>
-      </el-col>
-      <el-col :span='6'>
-        <el-form-item label="关联工艺" prop="processFlowId">
-          <el-select v-model="form.processFlowId" placeholder="请选择" style="width: 100%;" clearable filterable @change="processFlowIdChange">
+        <el-form-item label="产品名称" prop="planProductId">
+          <el-select v-model="form.planProductId" placeholder="请选择" style="width: 100%;" filterable @change="getSpecifications">
             <el-option
-              v-for="item in processFlowList"
+              v-for="item in productList"
               :key="item.id"
-              :label="item.name"
+              :label="item.name+' | '+(item.specifications || '')"
               :value="item.id">
+              <span style="float: left">{{ item.name }}</span>
+              <span style="float: right; color: #8492a6; font-size: 13px">{{ item.specifications }}</span>
             </el-option>
           </el-select>
         </el-form-item>
       </el-col>
       <el-col :span='6'>
-        <el-form-item label="物料计算方式" prop="materialMethod">
-          <el-select v-model="form.materialMethod" placeholder="请选择" style="width: 100%;" @change='materialMethodChange'>
-            <el-option label="产品基础BOM" :value="1"></el-option>
-            <el-option label="工艺扩展BOM" :value="2"></el-option>
-          </el-select>
+        <el-form-item label="产品规格" prop="specifications">
+          <el-input v-model="form.specifications"></el-input>
         </el-form-item>
       </el-col>
       <el-col :span='6'>
@@ -112,8 +61,6 @@
           </el-date-picker>
         </el-form-item>
       </el-col>
-    </el-row>
-    <el-row :gutter="20">
       <el-col :span='6'>
         <el-form-item label="订单计划完成时间" prop="planFinishTime">
           <el-date-picker
@@ -126,25 +73,19 @@
           </el-date-picker>
         </el-form-item>
       </el-col>
-      <el-col :span='12'>
+    </el-row>
+    <el-row :gutter="20">
+      <el-col :span='24'>
         <el-form-item label="备注" prop="remark">
           <el-input v-model="form.remark"></el-input>
         </el-form-item>
       </el-col>
     </el-row>
-    <!-- <el-row>
-      <el-col :span='24'>
-        <el-form-item label="描述信息" prop="description">
-          <el-input v-model="form.description"></el-input>
-        </el-form-item>
-      </el-col>
-    </el-row> -->
   </el-form>
 </template>
 <script>
-import { getOrderCode, getOrderById, getProcessFlowList, orderUpdate, orderCreate } from '@/api/base/orderManage'
+import { getOrderCode, getOrderById, orderUpdate, orderCreate } from '@/api/base/orderManage'
 import { getProductAll } from '@/api/base/product'
-import { getCustomerList } from '@/api/base/customer'
 export default {
   name: 'OrderAdd',
   data() {
@@ -155,15 +96,9 @@ export default {
         code: '',
         planQuantity: '',
         planProductId: '',
-        price: '',
-        customerId: '',
         priority: '',
-        packSpec: '',
-        workers: '',
-        processFlowId: '',
-        materialMethod: 1,
+        specifications: '',
         remark: '',
-        // description: '',
         planStartTime: '',
         planFinishTime: ''
       },
@@ -174,8 +109,6 @@ export default {
         planProductId: [{ required: true, message: "产品名称不能为空", trigger: "change" }]
       },
       productList: [],
-      customerList: [],
-      processFlowList: [],
       isEdit: false //是否是编辑
     }
   },
@@ -191,17 +124,11 @@ export default {
             this.form.code = res.data.code
             this.form.planQuantity = res.data.planQuantity
             this.form.planProductId = res.data.planProductId
-            this.form.price = res.data.price
-            this.form.customerId = res.data.customerId
             this.form.priority = res.data.priority ? res.data.priority + '' : ''
             this.form.planStartTime = res.data.planStartTime ? res.data.planStartTime : null
-            this.form.packSpec = res.data.packSpec ? res.data.packSpec+'' : ''
-            this.form.workers = res.data.workers
-            this.form.processFlowId = res.data.processFlowId
-            this.form.materialMethod = res.data.materialMethod
+            this.getSpecifications(this.form.planProductId)
             this.form.planFinishTime = res.data.planFinishTime ? res.data.planFinishTime : null
             this.form.remark = res.data.remark
-            // this.form.description = res.data.description
           }
         })
       } else {
@@ -218,14 +145,17 @@ export default {
       getProductAll().then(res => {
         this.productList = res.data || []
       })
-      // 客户
-      getCustomerList().then(res => {
-        this.customerList = res.data || []
-      })
-      // 工艺
-      getProcessFlowList().then(res => {
-        this.processFlowList = res.data || []
-      })
+    },
+    // 获取产品规格
+    getSpecifications(val) {
+      console.log(val)
+      for (let i of this.productList) {
+        if (i.id === val) {
+          this.form.specifications =  i.specifications
+          return
+        }
+      }
+      this.form.specifications = ''
     },
     timeChange() {
       if (this.form.planStartTime && this.form.planFinishTime) {
@@ -234,20 +164,6 @@ export default {
         }
       }
     },
-    // 工艺变更
-    materialMethodChange(val) {
-      if (val === 2 && !this.form.processFlowId) {
-        this.form.materialMethod = 1
-        this.$modal.msgError("请先选择关联工艺");
-      }
-    },
-    // 工艺变更
-    processFlowIdChange(val) {
-      console.log(val)
-      if (!val) {
-        this.form.materialMethod = 1
-      }
-    },
     submitForm() {
       this.$refs['orderAddForm'].validate((valid) => {
         if (valid) {
@@ -257,7 +173,6 @@ export default {
               return false
             }
           }
-          // console.log(this.form)
           if (this.isEdit) {
             //编辑
             orderUpdate({ ...this.form }).then((res) => {
@@ -283,8 +198,6 @@ export default {
     },
     formClear() {
       this.$refs.orderAddForm.resetFields()
-      this.form.materialMethod = 1
-      this.form.price = 0.00
       this.form.planQuantity = 0
       this.isEdit = false
     }
diff --git a/src/views/order/base/orderManage/index.vue b/src/views/order/base/orderManage/index.vue
index b398b76e..2031bfeb 100644
--- a/src/views/order/base/orderManage/index.vue
+++ b/src/views/order/base/orderManage/index.vue
@@ -17,7 +17,7 @@
       <method-btn
         v-if="tableBtn.length"
         slot="handleBtn"
-        :width="240"
+        :width="290"
         label="操作"
         :method-list="tableBtn"
         @clickBtn="handleClick"
@@ -56,7 +56,7 @@
 </template>
 <script>
 import { parseTime } from '@/utils/ruoyi'
-import { getOrderPage, orderDelete, customerList, orderFinish } from '@/api/base/orderManage'
+import { getOrderPage, orderStatusSet, customerList, orderFinish } from '@/api/base/orderManage'
 import OrderAdd from './components/orderAdd'
 import AddWorkOrder from './components/addWorkOrder'
 import { publicFormatter } from '@/utils/dict'
@@ -187,7 +187,7 @@ export default {
       },
       total: 0,
       tableProps,
-      list: [],
+      list: [{name: '111111'}],
       tableH: this.tableHeight(260),
       tableBtn: [
       this.$auth.hasPermi('base:order-manage:addWorkOrder')
@@ -195,26 +195,26 @@ export default {
               type: 'add',
               btnName: '新增',
               showTip: '新增工单',
-              showParam: {
-                type: '|',
-                data: [
-                  {
-                    type: 'equal',
-                    name: 'status',
-                    value: 1
-                  },
-                  {
-                    type: 'equal',
-                    name: 'status',
-                    value: 2
-                  },
-                  {
-                    type: 'equal',
-                    name: 'status',
-                    value: 3
-                  }
-                ]
-              }
+              // showParam: {
+              //   type: '|',
+              //   data: [
+              //     {
+              //       type: 'equal',
+              //       name: 'status',
+              //       value: 1
+              //     },
+              //     {
+              //       type: 'equal',
+              //       name: 'status',
+              //       value: 2
+              //     },
+              //     {
+              //       type: 'equal',
+              //       name: 'status',
+              //       value: 3
+              //     }
+              //   ]
+              // }
             }
           : undefined,
       this.$auth.hasPermi('base:order-manage:bindWorkOrder')
@@ -222,26 +222,26 @@ export default {
               type: 'bind',
               btnName: '绑定',
               showTip: '绑定工单',
-              showParam: {
-                type: '|',
-                data: [
-                  {
-                    type: 'equal',
-                    name: 'status',
-                    value: 1
-                  },
-                  {
-                    type: 'equal',
-                    name: 'status',
-                    value: 2
-                  },
-                  {
-                    type: 'equal',
-                    name: 'status',
-                    value: 3
-                  }
-                ]
-              }
+              // showParam: {
+              //   type: '|',
+              //   data: [
+              //     {
+              //       type: 'equal',
+              //       name: 'status',
+              //       value: 1
+              //     },
+              //     {
+              //       type: 'equal',
+              //       name: 'status',
+              //       value: 2
+              //     },
+              //     {
+              //       type: 'equal',
+              //       name: 'status',
+              //       value: 3
+              //     }
+              //   ]
+              // }
             }
           : undefined,
       this.$auth.hasPermi('base:order-manage:bindWorkOrder')
@@ -266,6 +266,18 @@ export default {
               }
             }
           : undefined,
+      this.$auth.hasPermi('base:order-manage:detail')
+        ? {
+            type: 'termination',
+            btnName: '终止'
+          }
+        : undefined,
+      this.$auth.hasPermi('base:order-manage:detail')
+        ? {
+            type: 'cancel',
+            btnName: '作废'
+          }
+        : undefined,
       this.$auth.hasPermi('base:order-manage:detail')
           ? {
               type: 'detail',
@@ -292,27 +304,6 @@ export default {
                 ]
               }
             }
-          : undefined,
-        this.$auth.hasPermi('base:order-manage:delete')
-          ? {
-              type: 'delete',
-              btnName: '删除',
-              showParam: {
-                type: '&',
-                data: [
-                  {
-                    type: 'equal',
-                    name: 'triggerOrigin',
-                    value: 1
-                  },
-                  {
-                    type: 'equal',
-                    name: 'status',
-                    value: 1
-                  }
-                ]
-              }
-            }
           : undefined
       ].filter((v) => v),
       addOrEditTitle: '',
@@ -328,7 +319,7 @@ export default {
     window.addEventListener('resize', () => {
       this.tableH = this.tableHeight(260)
     })
-    this.getList()
+    // this.getList()
   },
   methods: {
     getList() {
@@ -385,8 +376,11 @@ export default {
             this.$refs.orderAdd.init(val.data.id)
           })
           break
-        case 'delete':
-          this.handleDelete(val.data)
+        case 'cancel':
+          this.handleEditStatus(val.data, '作废', '6')
+          break
+        case 'termination':
+          this.handleEditStatus(val.data, '终止', '5')
           break
         case 'detail':
           this.$router.push({path: '/order/base/order-manage/order-detail-data?orderId='+ val.data.id})
@@ -406,24 +400,15 @@ export default {
           })
           break
         case 'complete':
-          this.handleComplete(val.data)
+          this.handleEditStatus(val.data, '完成', '4')
           break
         default:
       }
     },
-    // 删除
-    handleDelete(val) {
-      this.$modal.confirm('是否确认删除"' + val.name + '"的数据项?').then(function() {
-          return orderDelete({ id: val.id })
-        }).then(() => {
-          this.getList();
-          this.$modal.msgSuccess("操作成功");
-        }).catch(() => {});
-    },
-    // 完成
-    handleComplete(val) {
-      this.$modal.confirm('是否确认完成订单"' + val.name + '"?').then(function() {
-          return orderFinish({ id: val.id })
+    // 完成,终止，作废
+    handleEditStatus(val, tip, status) {
+      this.$modal.confirm('是否确认'+tip+'"' + val.name + '"?').then(function() {
+        return orderStatusSet({ id: val.id })
         }).then(() => {
           this.getList();
           this.$modal.msgSuccess("操作成功");
diff --git a/src/views/order/base/orderManage/orderDetailData.vue b/src/views/order/base/orderManage/orderDetailData.vue
index d0e22226..033ca638 100644
--- a/src/views/order/base/orderManage/orderDetailData.vue
+++ b/src/views/order/base/orderManage/orderDetailData.vue
@@ -8,90 +8,70 @@
       <el-button type="primary" plain size="small" style="float: right;" @click="returnOrderManage"><svg-icon icon-class="return"/> 返回</el-button>
       <div style="padding-left: 14px;">
         <el-row>
-          <el-col :span='3'>
+          <el-col :span='4'>
             <div class="blodTip">订单名</div>
             <div class="lightTip">{{orderMsg.name}}</div>
           </el-col>
-          <el-col :span='3'>
-            <div class="blodTip">产品信息</div>
+          <el-col :span='4'>
+            <div class="blodTip">产品名称</div>
             <div class="lightTip">{{orderMsg.productName}}</div>
           </el-col>
-          <el-col :span='3'>
+          <el-col :span='4'>
             <div class="blodTip">产品规格</div>
             <div class="lightTip">{{orderMsg.specifications}}</div>
           </el-col>
-          <el-col :span='3'>
-            <div class="blodTip">客户</div>
-            <div class="lightTip">{{orderMsg.customerName}}</div>
-          </el-col>
-          <el-col :span='3'>
-            <div class="blodTip">包装规格</div>
-            <div class="lightTip">{{ getDictDataLabel(DICT_TYPE.PACK_SPEC, orderMsg.packSpec)}}</div>
-          </el-col>
-          <el-col :span='3'>
-            <div class="blodTip">物料计算方式</div>
-            <div class="lightTip">{{orderMsg.materialMethod ? (orderMsg.materialMethod === 1 ? '产品基础' : '工艺扩展') : ''}}</div>
-          </el-col>
-          <el-col :span='3'>
+          <el-col :span='4'>
             <div class="blodTip">创建时间</div>
             <div class="lightTip">{{ parseTime(orderMsg.createTime) }}</div>
           </el-col>
-          <el-col :span='3'>
+          <el-col :span='4'>
             <div class="blodTip">计划开始时间</div>
             <div class="lightTip">{{ parseTime(orderMsg.planStartTime) }}</div>
           </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span='3'>
+          <el-col :span='4'>
             <div class="blodTip">计划完成时间</div>
             <div class="lightTip">{{ parseTime(orderMsg.planFinishTime) }}</div>
           </el-col>
-          <el-col :span='3'>
+        </el-row>
+        <el-row>
+          <el-col :span='4'>
             <div class="blodTip">计划加工数量</div>
             <div class="lightTip">{{orderMsg.planQuantity}}</div>
           </el-col>
-          <el-col :span='3'>
+          <el-col :span='4'>
             <div class="blodTip">加工平方数(平方米)</div>
             <div class="lightTip">{{orderMsg.planArea}}</div>
           </el-col>
-          <el-col :span='3'>
+          <el-col :span='4'>
             <div class="blodTip">预计用时(时)</div>
             <div class="lightTip">{{ orderMsg.expectTime }}</div>
           </el-col>
-          <el-col :span='3'>
+          <el-col :span='4'>
             <div class="blodTip">状态</div>
             <div class="lightTip">{{getDictDataLabel(DICT_TYPE.ORDER_STATUS, orderMsg.status)}}</div>
           </el-col>
-          <el-col :span='3'>
+          <el-col :span='4'>
             <div class="blodTip">实际开始时间</div>
             <div class="lightTip">{{ parseTime(orderMsg.startProduceTime) }}</div>
           </el-col>
-          <el-col :span='3'>
+          <el-col :span='4'>
             <div class="blodTip">实际完成时间</div>
             <div class="lightTip">{{ parseTime(orderMsg.finishProduceTime) }}</div>
           </el-col>
-          <el-col :span='3'>
+        </el-row>
+        <el-row>
+          <el-col :span='4'>
             <div class="blodTip">实际生产数量</div>
             <div class="lightTip">{{orderMsg.actualQuantity	}}</div>
           </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span='3'>
+          <el-col :span='4'>
             <div class="blodTip">完成比%</div>
             <div class="lightTip">{{orderMsg.completeProp}}</div>
           </el-col>
-          <el-col :span='3'>
+          <el-col :span='4'>
             <div class="blodTip">废片数量</div>
             <div class="lightTip">{{orderMsg.nokQuantity}}</div>
           </el-col>
-          <el-col :span='3'>
-            <div class="blodTip">负责人</div>
-            <div class="lightTip">{{orderMsg.workers}}</div>
-          </el-col>
-          <el-col :span='3'>
-            <div class="blodTip">关联工艺</div>
-            <div class="lightTip">{{processFlowName}}</div>
-          </el-col>
         </el-row>
       </div>
     </div>
@@ -147,6 +127,12 @@ const tableProps1 = [
     label: '工单编码',
     minWidth: 150
   },
+  {
+    prop: 'roomNameDict',
+    label: '负责车间',
+    minWidth: 150,
+    filter: publicFormatter('workshop')
+  },
   {
     prop: 'planAssignmentQuantity',
     label: '计划加工量',
diff --git a/src/views/order/monitoring/orderCompletionMonitoring/index.vue b/src/views/order/monitoring/orderCompletionMonitoring/index.vue
index ca3d92ad..694560c0 100644
--- a/src/views/order/monitoring/orderCompletionMonitoring/index.vue
+++ b/src/views/order/monitoring/orderCompletionMonitoring/index.vue
@@ -18,6 +18,8 @@
         :table-props="tableProps"
         :table-data="list"
         :max-height="tableH"
+        row-key="id"
+        :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
       >
         <method-btn
           v-if="tableBtn.length"
@@ -28,6 +30,21 @@
           @clickBtn="handleClick"
         />
       </base-table>
+      <!-- <el-table
+        :data="list"
+        style="width: 100%;margin-bottom: 20px;"
+        row-key="id"
+        border
+        default-expand-all
+        :tree-props="{children: 'children', hasChildren: 'hasChildren'}">
+        <el-table-column
+          v-for='item in tableProps'
+          :key='item.id'
+          :prop="item.prop"
+          :label="item.label"
+          :width="item.minWidth?item.minWidth:120">
+        </el-table-column>
+      </el-table> -->
     </div>
     <!-- 图 -->
     <monitoring-ring-charts ref='monitoringRingCharts' v-else :chart-list='chartList'/>
@@ -226,60 +243,126 @@ export default {
   },
   methods: {
     getPage() {
-      // 表数据
-      orderMonitor({...this.queryParams}).then(res => {
-        this.list = res.data.records || []
-        this.total = res.data.total || 0
-        if (this.list.length > 0) {
-          let orderIdList = []
-          this.list.map(item => {
-            orderIdList.push(item.orderid)
-          })
-          // 图的数据
-          orderAssignmentList({orderIdList:orderIdList}).then(res => {
-            let color = ['#7164FF','#288AFF','#63BDFF','#8EF0AB','#FFCE6A']
-            let tempArr = res.data || {}
-            let tempArr2 = []
-            for (let key in tempArr) {
-              let tempArr3 = []
-              let obj = {}
-              obj.orderName = tempArr[key][0].orderName
-              obj.id = key
-              obj.num = tempArr[key][0].planQuantity
-              let sunNum = 0
-              for (let i = 0; i < tempArr[key].length; i++) {
-                let subObj = {}
-                subObj.value = tempArr[key][i].actualAssignmentQuantity
-                subObj.name = tempArr[key][i].woName
-                if (i < 5) {
-                  subObj.color = color[i]
-                } else {
-                  subObj.color = color[i%5]
-                }
-                sunNum+=tempArr[key][i].actualAssignmentQuantity
-                tempArr3.push(subObj)
-              }
-              tempArr3.push({
-                value: tempArr[key][0].planQuantity - sunNum > 0 ? tempArr[key][0].planQuantity - sunNum : 0,
-                name: '未下发',
-                color: '#F5F5F5'
-              })
-              obj.sunNum = sunNum
-              obj.workOrder = tempArr3
-              tempArr2.push(obj)
-            }
-            this.chartList = tempArr2
-            if (this.activeName === 'barChart' && this.chartList.length > 0) {
-              this.$nextTick(() => {
-                this.$refs.monitoringRingCharts.initChart()
-              })
-            }
-          })
-        }else{
-          // 显示无数据的图片
-          this.chartList = []
+      this.list = [
+        {
+          name: '11111',
+          id: '1',
+          finishProduceTime: '2023-11-11T12:12:12',
+          children:[
+            {name: '1-11111', id: '11',}
+          ]
+        },
+        {
+          name: '2222222',
+          id: '2',
+          finishProduceTime: '2023-11-11T12:12:12',
+          children:[
+            {name: '2-222222', id: '22'}
+          ]
+        },
+        {
+          name: '3333333',
+          id: '3',
+          finishProduceTime: '2023-11-11T12:12:12',
+          children:[
+            {name: '3-333333', id: '33'}
+          ]
+        },
+        {
+          name: '44444',
+          id: '4',
+          finishProduceTime: '2023-11-11T12:12:12',
+          children:[
+            {name: '4-44444', id: '44'}
+          ]
+        },
+        {
+          name: '555555',
+          id: '5',
+          finishProduceTime: '2023-11-11T12:12:12',
+          children:[
+            {name: '5-55555', id: '55'}
+          ]
+        },
+        {
+          name: '6',
+          id: '6',
+          finishProduceTime: '2023-11-11T12:12:12',
+          children:[
+            {name: '6-66666', id: '66'}
+          ]
+        },
+        {
+          name: '7777777',
+          id: '7',
+          finishProduceTime: '2023-11-11T12:12:12',
+          children:[
+            {name: '7-77777', id: '77'}
+          ]
+        },
+        {
+          name: '888888',
+          id: '8',
+          finishProduceTime: '2023-11-11T12:12:12',
+          children:[
+            {name: '8-888888', id: '88'}
+          ]
         }
-      })
+      ]
+      // // 表数据
+      // orderMonitor({...this.queryParams}).then(res => {
+      //   this.list = res.data.records || []
+      //   this.total = res.data.total || 0
+      //   if (this.list.length > 0) {
+      //     let orderIdList = []
+      //     this.list.map(item => {
+      //       orderIdList.push(item.orderid)
+      //     })
+      //     // 图的数据
+      //     orderAssignmentList({orderIdList:orderIdList}).then(res => {
+      //       let color = ['#7164FF','#288AFF','#63BDFF','#8EF0AB','#FFCE6A']
+      //       let tempArr = res.data || {}
+      //       let tempArr2 = []
+      //       for (let key in tempArr) {
+      //         let tempArr3 = []
+      //         let obj = {}
+      //         obj.orderName = tempArr[key][0].orderName
+      //         obj.id = key
+      //         obj.num = tempArr[key][0].planQuantity
+      //         let sunNum = 0
+      //         for (let i = 0; i < tempArr[key].length; i++) {
+      //           let subObj = {}
+      //           subObj.value = tempArr[key][i].actualAssignmentQuantity
+      //           subObj.name = tempArr[key][i].woName
+      //           if (i < 5) {
+      //             subObj.color = color[i]
+      //           } else {
+      //             subObj.color = color[i%5]
+      //           }
+      //           sunNum+=tempArr[key][i].actualAssignmentQuantity
+      //           tempArr3.push(subObj)
+      //         }
+      //         tempArr3.push({
+      //           value: tempArr[key][0].planQuantity - sunNum > 0 ? tempArr[key][0].planQuantity - sunNum : 0,
+      //           name: '未下发',
+      //           color: '#F5F5F5'
+      //         })
+      //         obj.sunNum = sunNum
+      //         obj.workOrder = tempArr3
+      //         tempArr2.push(obj)
+      //       }
+      //       this.chartList = tempArr2
+      //       if (this.activeName === 'barChart' && this.chartList.length > 0) {
+      //         this.$nextTick(() => {
+      //           this.$refs.monitoringRingCharts.initChart()
+      //         })
+      //       }
+      //     })
+      //   }else{
+      //     // 显示无数据的图片
+      //     this.chartList = []
+      //   }
+      // })
     },
     // 查询
     buttonClick(val) {

From ade0f6745efa532d9055d6b849d246d18d389698 Mon Sep 17 00:00:00 2001
From: lb <liubin_9396@163.com>
Date: Mon, 19 Feb 2024 09:41:10 +0800
Subject: [PATCH 15/40] update special equipment basic pages

---
 .../specialEquipment/basic/FireFighthing.vue  |   2 +-
 src/views/specialEquipment/basic/Manage.vue   |   2 +-
 src/views/specialEquipment/basic/Safety.vue   |   4 +-
 .../components/EquipmentDrawer copy.vue       |   0
 .../components/firefightingDrawer.vue         | 508 +++++++++++++++++
 .../components/manageDrawer.vue               | 509 ++++++++++++++++++
 .../components/manageDrawerForm.vue           | 228 ++++++++
 .../components/safetyDrawer.vue               | 509 ++++++++++++++++++
 .../maintain/iconfont/demo_index.html         | 306 -----------
 9 files changed, 1757 insertions(+), 311 deletions(-)
 delete mode 100644 src/views/specialEquipment/components/EquipmentDrawer copy.vue
 create mode 100644 src/views/specialEquipment/components/firefightingDrawer.vue
 create mode 100644 src/views/specialEquipment/components/manageDrawer.vue
 create mode 100644 src/views/specialEquipment/components/manageDrawerForm.vue
 create mode 100644 src/views/specialEquipment/components/safetyDrawer.vue
 delete mode 100644 src/views/specialEquipment/maintain/iconfont/demo_index.html

diff --git a/src/views/specialEquipment/basic/FireFighthing.vue b/src/views/specialEquipment/basic/FireFighthing.vue
index 28cc03c4..e7cf21db 100644
--- a/src/views/specialEquipment/basic/FireFighthing.vue
+++ b/src/views/specialEquipment/basic/FireFighthing.vue
@@ -116,7 +116,7 @@
 <script>
 import moment from 'moment';
 import basicPageMixin from '@/mixins/lb/basicPageMixin';
-import EquipmentDrawer from '../components/EquipmentDrawer';
+import EquipmentDrawer from '../components/firefightingDrawer';
 
 import {
 	createEquipment,
diff --git a/src/views/specialEquipment/basic/Manage.vue b/src/views/specialEquipment/basic/Manage.vue
index f59afc3f..e8788d09 100644
--- a/src/views/specialEquipment/basic/Manage.vue
+++ b/src/views/specialEquipment/basic/Manage.vue
@@ -115,7 +115,7 @@
 <script>
 import moment from 'moment';
 import basicPageMixin from '@/mixins/lb/basicPageMixin';
-import EquipmentDrawer from '../components/EquipmentDrawer';
+import EquipmentDrawer from '../components/manageDrawer';
 
 import {
 	createEquipment,
diff --git a/src/views/specialEquipment/basic/Safety.vue b/src/views/specialEquipment/basic/Safety.vue
index d31773af..cfcdb0f5 100644
--- a/src/views/specialEquipment/basic/Safety.vue
+++ b/src/views/specialEquipment/basic/Safety.vue
@@ -115,7 +115,7 @@
 <script>
 import moment from 'moment';
 import basicPageMixin from '@/mixins/lb/basicPageMixin';
-import EquipmentDrawer from '../components/EquipmentDrawer';
+import EquipmentDrawer from '../components/safetyDrawer';
 import {
 	createEquipment,
 	updateEquipment,
@@ -126,14 +126,12 @@ import {
 } from '@/api/base/equipment';
 import Editor from '@/components/Editor';
 import AssetsUpload from '../components/AssetsUpload.vue';
-import BasicDrawer from '../components/BasicDrawer.vue';
 
 export default {
 	name: 'SpecialEquipmentForSafety',
 	components: {
 		Editor,
 		EquipmentDrawer,
-		BasicDrawer,
 	},
 	mixins: [basicPageMixin],
 	data() {
diff --git a/src/views/specialEquipment/components/EquipmentDrawer copy.vue b/src/views/specialEquipment/components/EquipmentDrawer copy.vue
deleted file mode 100644
index e69de29b..00000000
diff --git a/src/views/specialEquipment/components/firefightingDrawer.vue b/src/views/specialEquipment/components/firefightingDrawer.vue
new file mode 100644
index 00000000..8339b653
--- /dev/null
+++ b/src/views/specialEquipment/components/firefightingDrawer.vue
@@ -0,0 +1,508 @@
+<!-- 
+    filename: Fire Fighting Drawer.vue
+    author: liubin
+    date: 2024-2-19 10:38:56
+    description: 
+-->
+
+<template>
+	<el-drawer
+		:visible="visible"
+		:show-close="false"
+		:wrapper-closable="false"
+		class="drawer"
+		custom-class="mes-drawer"
+		size="60%"
+		@closed="$emit('destroy')">
+		<SmallTitle slot="title">
+			{{
+				mode.includes('detail')
+					? '详情'
+					: mode.includes('edit')
+					? '编辑'
+					: '新增'
+			}}
+		</SmallTitle>
+
+		<div class="drawer-body flex">
+			<div class="drawer-body__content">
+				<section v-for="(section, index) in sections" :key="section.key">
+					<SmallTitle v-if="index != 0">{{ section.name }}</SmallTitle>
+
+					<div
+						class="form-part"
+						v-if="section.key == 'base'"
+						style="margin-bottom: 32px">
+						<el-skeleton v-if="!showForm" animated />
+						<EquipmentInfoForm
+							key="drawer-dialog-form"
+							v-if="showForm"
+							:isFireEquipment="isFireEquipment"
+							:disabled="mode.includes('detail')"
+							:sync-filelist="syncFileListFlag"
+							v-model="form" />
+					</div>
+
+					<div
+						v-if="section.key == 'attrs'"
+						style="margin-top: 12px; position: relative">
+						<div
+							v-if="!mode.includes('detail')"
+							style="position: absolute; top: -40px; right: 0">
+							<el-button @click="handleAddAttr" type="text">
+								<i class="el-icon-plus"></i>
+								添加属性
+							</el-button>
+						</div>
+						<base-table
+							v-loading="attrListLoading"
+							:table-props="section.props"
+							:page="attrQuery?.params.pageNo || 1"
+							:limit="attrQuery?.params.pageSize || 10"
+							:table-data="list"
+							@emitFun="handleEmitFun">
+							<!-- :add-button-show="mode.includes('detail') ? null : '添加属性'"
+							@emitButtonClick="handleAddAttr" -->
+							<method-btn
+								v-if="section.tableBtn"
+								slot="handleBtn"
+								label="操作"
+								:method-list="tableBtn"
+								@clickBtn="handleTableBtnClick" />
+						</base-table>
+
+						<!-- 分页组件 -->
+						<pagination
+							v-show="total > 0"
+							:total="total"
+							:page.sync="attrQuery.params.pageNo"
+							:limit.sync="attrQuery.params.pageSize"
+							@pagination="getAttrList" />
+					</div>
+				</section>
+			</div>
+
+			<div class="drawer-body__footer">
+				<el-button style="" @click="handleCancel">取消</el-button>
+				<el-button v-if="mode == 'detail'" type="primary" @click="toggleEdit">
+					编辑
+				</el-button>
+				<el-button v-else type="primary" @click="handleConfirm">保存</el-button>
+				<!-- sections的第二项必须是 属性列表  -->
+				<!-- <el-button
+						v-if="sections[1].allowAdd"
+						type="primary"
+						@click="handleAddAttr">
+						添加属性
+					</el-button> -->
+			</div>
+		</div>
+
+		<!-- 属性对话框 -->
+		<base-dialog
+			v-if="sections[1].allowAdd"
+			:dialogTitle="attrTitle"
+			:dialogVisible="attrFormVisible"
+			width="35%"
+			:append-to-body="true"
+			custom-class="baseDialog"
+			@close="closeAttrForm"
+			@cancel="closeAttrForm"
+			@confirm="submitAttrForm">
+			<DialogForm
+				v-if="attrFormVisible"
+				ref="attrForm"
+				:dataForm="attrForm"
+				:rows="attrRows" />
+		</base-dialog>
+	</el-drawer>
+</template>
+
+<script>
+import DialogForm from './DialogForm';
+import EquipmentInfoForm from './EquipmentInfoForm.vue';
+
+const SmallTitle = {
+	name: 'SmallTitle',
+	props: ['size'],
+	components: {},
+	data() {
+		return {};
+	},
+	methods: {},
+	render: function (h) {
+		return h(
+			'span',
+			{
+				class: 'small-title',
+				style: {
+					fontSize: '18px',
+					lineHeight:
+						this.size == 'lg' ? '24px' : this.size == 'sm' ? '18px' : '20px',
+					fontWeight: 500,
+					fontFamily: '微软雅黑, Microsoft YaHei, Arial, Helvetica, sans-serif',
+				},
+			},
+			this.$slots.default
+		);
+	},
+};
+
+export default {
+	components: { SmallTitle, DialogForm, EquipmentInfoForm },
+	props: ['sections', 'mode', 'dataId', 'isFireEquipment'], // dataId 作为一个通用的存放id的字段
+	data() {
+		return {
+			visible: false,
+			showForm: false,
+			btnLoading: false,
+			total: 0,
+			form: {},
+			list: [],
+			attrTitle: '',
+			attrForm: {
+				id: null,
+				equipmentId: null,
+				name: '',
+				value: '',
+			},
+			attrFormVisible: false,
+			attrRows: [
+				[
+					{
+						input: true,
+						label: '属性名称',
+						prop: 'name',
+						rules: [
+							{ required: true, message: '属性名称不能为空', trigger: 'blur' },
+						],
+					},
+				],
+				[
+					{
+						input: true,
+						label: '属性值',
+						prop: 'value',
+					},
+				],
+			],
+			attrQuery: {
+				params: {
+					pageNo: 1,
+					pageSize: 10,
+				},
+			}, // 属性列表的请求
+			infoQuery: null, // 基本信息的请求
+			attrFormSubmitting: false,
+			attrListLoading: false,
+			syncFileListFlag: null,
+		};
+	},
+	computed: {
+		formRows() {
+			return this.sections[0].rows.map((row) => {
+				return row.map((col) => {
+					if (col.key == 'eq-pics') {
+						// 重置图片的位置
+						return {
+							...col,
+							bind: {
+								...col.bind,
+							},
+							style: {
+								left: 0,
+								right: 'unset',
+							},
+						};
+					}
+					return {
+						...col,
+						bind: {
+							...col.bind,
+							// 详情 模式下，禁用各种输入
+							disabled: this.mode == 'detail',
+						},
+					};
+				});
+			});
+		},
+		tableBtn() {
+			return this.mode == 'detail' ? [] : this.sections[1].tableBtn;
+		},
+	},
+	mounted() {
+		for (const section of this.sections) {
+			// 请求具体信息
+			if ('url' in section) {
+				const query = {
+					url: section.url,
+					method: section.method || 'get',
+					params: section.queryParams || null,
+					data: section.data || null,
+				};
+				this.$axios(query).then(({ data }) => {
+					if (section.key == 'base') {
+						this.form = data;
+						this.showForm = true;
+						this.infoQuery = query;
+					} else if (section.key == 'attrs') {
+						this.attrQuery = query;
+						this.list = data.list;
+						this.total = data.total;
+					}
+				});
+			}
+		}
+	},
+	methods: {
+		handleTableBtnClick({ type, data }) {
+			switch (type) {
+				case 'edit':
+					this.handleEditAttr(data.id);
+					break;
+				case 'delete':
+					this.handleDeleteAttr(data.id);
+					break;
+			}
+		},
+		async handleConfirm() {
+			this.btnLoading = true;
+			this.syncFileListFlag = Math.random();
+
+			this.$nextTick(async () => {
+				const { code, data } = await this.$axios({
+					url: this.sections[0].urlUpdate,
+					method: 'put',
+					data: this.form,
+				});
+				if (code == 0) {
+					this.$modal.msgSuccess('更新成功');
+				}
+
+				this.btnLoading = false;
+				this.$emit('refreshDataList');
+				this.handleCancel();
+			});
+		},
+
+		handleEmitFun(val) {
+			console.log('handleEmitFun', val);
+		},
+
+		init() {
+			this.visible = true;
+		},
+
+		async getAttrList() {
+			this.attrListLoading = true;
+			const res = await this.$axios(this.attrQuery);
+			if (res.code == 0) {
+				this.list = res.data.list;
+				this.total = res.data.total;
+			}
+			this.attrListLoading = false;
+		},
+
+		// 保存表单
+		handleSave() {
+			this.$refs['form'][0].validate(async (valid) => {
+				if (valid) {
+					const isEdit = this.mode == 'edit';
+					await this.$axios({
+						url: this.sections[0][isEdit ? 'urlUpdate' : 'urlCreate'],
+						method: isEdit ? 'put' : 'post',
+						data: this.form,
+					});
+					this.$modal.msgSuccess(`${isEdit ? '更新' : '创建'}成功`);
+					this.visible = false;
+					this.$emit('refreshDataList');
+				}
+			});
+		},
+
+		handleCancel() {
+			this.visible = false;
+		},
+
+		// 开启编辑
+		toggleEdit() {
+			this.$emit('update-mode', 'edit');
+		},
+
+		// 新增属性
+		handleAddAttr() {
+			if (!this.dataId) return this.$message.error('请先创建设备信息');
+			this.attrForm = {
+				id: null,
+				equipmentId: this.dataId,
+				name: '',
+				value: '',
+			};
+			this.attrTitle = '添加设备属性';
+			this.attrFormVisible = true;
+		},
+
+		// 编辑属性
+		async handleEditAttr(attrId) {
+			const res = await this.$axios({
+				url: this.sections[1].urlDetail,
+				method: 'get',
+				params: { id: attrId },
+			});
+			if (res.code == 0) {
+				this.attrForm = res.data;
+				this.attrTitle = '编辑设备属性';
+				this.attrFormVisible = true;
+			}
+		},
+
+		// 删除属性
+		handleDeleteAttr(attrId) {
+			this.$confirm('确定删除该属性?', '提示', {
+				confirmButtonText: '确定',
+				cancelButtonText: '取消',
+				type: 'warning',
+			})
+				.then(async () => {
+					const res = await this.$axios({
+						url: this.sections[1].urlDelete,
+						method: 'delete',
+						params: { id: attrId },
+					});
+					if (res.code == 0) {
+						this.$message({
+							message: '删除成功',
+							type: 'success',
+							duration: 1500,
+							onClose: () => {
+								this.getAttrList();
+							},
+						});
+					}
+				})
+				.catch(() => {});
+		},
+
+		// 提交属性表
+		submitAttrForm() {
+			this.$refs['attrForm'].validate(async (valid) => {
+				if (!valid) {
+					return;
+				}
+
+				try {
+					const isEdit = this.attrForm.id != null;
+					this.attrFormSubmitting = true;
+					const res = await this.$axios({
+						url: isEdit
+							? this.sections[1].urlUpdate
+							: this.sections[1].urlCreate,
+						method: isEdit ? 'put' : 'post',
+						data: this.attrForm,
+					});
+
+					if (res.code == 0) {
+						this.closeAttrForm();
+						this.$message({
+							message: `${isEdit ? '更新' : '创建'}成功`,
+							type: 'success',
+							duration: 1500,
+							onClose: () => {
+								this.getAttrList();
+							},
+						});
+					}
+					this.attrFormSubmitting = false;
+				} catch (err) {
+					this.$message({
+						message: err,
+						type: 'error',
+						duration: 1500,
+					});
+					this.attrFormSubmitting = false;
+				}
+			});
+		},
+
+		closeAttrForm() {
+			this.attrFormVisible = false;
+		},
+
+		handleClick(raw) {
+			if (raw.type === 'delete') {
+				this.$confirm(
+					`确定对${
+						raw.data.name
+							? '[名称=' + raw.data.name + ']'
+							: '[序号=' + raw.data._pageIndex + ']'
+					}进行删除操作?`,
+					'提示',
+					{
+						confirmButtonText: '确定',
+						cancelButtonText: '取消',
+						type: 'warning',
+					}
+				)
+					.then(() => {
+						deleteProductAttr(raw.data.id).then(({ data }) => {
+							this.$message({
+								message: '操作成功',
+								type: 'success',
+								duration: 1500,
+								onClose: () => {
+									this.getList();
+								},
+							});
+						});
+					})
+					.catch(() => {});
+			} else {
+				this.addNew(raw.data.id);
+			}
+		},
+	},
+};
+</script>
+
+<style scoped>
+.drawer >>> .el-drawer {
+	border-radius: 8px 0 0 8px;
+}
+
+.drawer >>> .el-drawer__header {
+	margin: 0;
+	padding: 32px 32px 24px;
+	border-bottom: 1px solid #dcdfe6;
+	margin-bottom: 0px;
+}
+
+.small-title::before {
+	content: '';
+	display: inline-block;
+	vertical-align: top;
+	width: 4px;
+	height: 22px;
+	border-radius: 1px;
+	margin-right: 8px;
+	background-color: #0b58ff;
+}
+
+.drawer-body {
+	display: flex;
+	flex-direction: column;
+	height: 100%;
+}
+
+.drawer-body__content {
+	flex: 1;
+	/* background: #eee; */
+	padding: 20px 30px;
+	overflow-y: auto;
+}
+
+.drawer-body__footer {
+	display: flex;
+	justify-content: flex-end;
+	padding: 18px;
+}
+</style>
diff --git a/src/views/specialEquipment/components/manageDrawer.vue b/src/views/specialEquipment/components/manageDrawer.vue
new file mode 100644
index 00000000..b43981b0
--- /dev/null
+++ b/src/views/specialEquipment/components/manageDrawer.vue
@@ -0,0 +1,509 @@
+<!-- 
+    filename: Speical Equipment Manage Drawer.vue
+    author: liubin
+    date: 2024-2-19 10:38:56
+    description: 
+-->
+
+
+<template>
+	<el-drawer
+		:visible="visible"
+		:show-close="false"
+		:wrapper-closable="false"
+		class="drawer"
+		custom-class="mes-drawer"
+		size="60%"
+		@closed="$emit('destroy')">
+		<SmallTitle slot="title">
+			{{
+				mode.includes('detail')
+					? '详情'
+					: mode.includes('edit')
+					? '编辑'
+					: '新增'
+			}}
+		</SmallTitle>
+
+		<div class="drawer-body flex">
+			<div class="drawer-body__content">
+				<section v-for="(section, index) in sections" :key="section.key">
+					<SmallTitle v-if="index != 0">{{ section.name }}</SmallTitle>
+
+					<div
+						class="form-part"
+						v-if="section.key == 'base'"
+						style="margin-bottom: 32px">
+						<el-skeleton v-if="!showForm" animated />
+						<EquipmentInfoForm
+							key="drawer-dialog-form"
+							v-if="showForm"
+							:isFireEquipment="isFireEquipment"
+							:disabled="mode.includes('detail')"
+							:sync-filelist="syncFileListFlag"
+							v-model="form" />
+					</div>
+
+					<div
+						v-if="section.key == 'attrs'"
+						style="margin-top: 12px; position: relative">
+						<div
+							v-if="!mode.includes('detail')"
+							style="position: absolute; top: -40px; right: 0">
+							<el-button @click="handleAddAttr" type="text">
+								<i class="el-icon-plus"></i>
+								添加属性
+							</el-button>
+						</div>
+						<base-table
+							v-loading="attrListLoading"
+							:table-props="section.props"
+							:page="attrQuery?.params.pageNo || 1"
+							:limit="attrQuery?.params.pageSize || 10"
+							:table-data="list"
+							@emitFun="handleEmitFun">
+							<!-- :add-button-show="mode.includes('detail') ? null : '添加属性'"
+							@emitButtonClick="handleAddAttr" -->
+							<method-btn
+								v-if="section.tableBtn"
+								slot="handleBtn"
+								label="操作"
+								:method-list="tableBtn"
+								@clickBtn="handleTableBtnClick" />
+						</base-table>
+
+						<!-- 分页组件 -->
+						<pagination
+							v-show="total > 0"
+							:total="total"
+							:page.sync="attrQuery.params.pageNo"
+							:limit.sync="attrQuery.params.pageSize"
+							@pagination="getAttrList" />
+					</div>
+				</section>
+			</div>
+
+			<div class="drawer-body__footer">
+				<el-button style="" @click="handleCancel">取消</el-button>
+				<el-button v-if="mode == 'detail'" type="primary" @click="toggleEdit">
+					编辑
+				</el-button>
+				<el-button v-else type="primary" @click="handleConfirm">保存</el-button>
+				<!-- sections的第二项必须是 属性列表  -->
+				<!-- <el-button
+						v-if="sections[1].allowAdd"
+						type="primary"
+						@click="handleAddAttr">
+						添加属性
+					</el-button> -->
+			</div>
+		</div>
+
+		<!-- 属性对话框 -->
+		<base-dialog
+			v-if="sections[1].allowAdd"
+			:dialogTitle="attrTitle"
+			:dialogVisible="attrFormVisible"
+			width="35%"
+			:append-to-body="true"
+			custom-class="baseDialog"
+			@close="closeAttrForm"
+			@cancel="closeAttrForm"
+			@confirm="submitAttrForm">
+			<DialogForm
+				v-if="attrFormVisible"
+				ref="attrForm"
+				:dataForm="attrForm"
+				:rows="attrRows" />
+		</base-dialog>
+	</el-drawer>
+</template>
+
+<script>
+import DialogForm from './DialogForm';
+import EquipmentInfoForm from './manageDrawerForm.vue';
+
+const SmallTitle = {
+	name: 'SmallTitle',
+	props: ['size'],
+	components: {},
+	data() {
+		return {};
+	},
+	methods: {},
+	render: function (h) {
+		return h(
+			'span',
+			{
+				class: 'small-title',
+				style: {
+					fontSize: '18px',
+					lineHeight:
+						this.size == 'lg' ? '24px' : this.size == 'sm' ? '18px' : '20px',
+					fontWeight: 500,
+					fontFamily: '微软雅黑, Microsoft YaHei, Arial, Helvetica, sans-serif',
+				},
+			},
+			this.$slots.default
+		);
+	},
+};
+
+export default {
+	components: { SmallTitle, DialogForm, EquipmentInfoForm },
+	props: ['sections', 'mode', 'dataId', 'isFireEquipment'], // dataId 作为一个通用的存放id的字段
+	data() {
+		return {
+			visible: false,
+			showForm: false,
+			btnLoading: false,
+			total: 0,
+			form: {},
+			list: [],
+			attrTitle: '',
+			attrForm: {
+				id: null,
+				equipmentId: null,
+				name: '',
+				value: '',
+			},
+			attrFormVisible: false,
+			attrRows: [
+				[
+					{
+						input: true,
+						label: '属性名称',
+						prop: 'name',
+						rules: [
+							{ required: true, message: '属性名称不能为空', trigger: 'blur' },
+						],
+					},
+				],
+				[
+					{
+						input: true,
+						label: '属性值',
+						prop: 'value',
+					},
+				],
+			],
+			attrQuery: {
+				params: {
+					pageNo: 1,
+					pageSize: 10,
+				},
+			}, // 属性列表的请求
+			infoQuery: null, // 基本信息的请求
+			attrFormSubmitting: false,
+			attrListLoading: false,
+			syncFileListFlag: null,
+		};
+	},
+	computed: {
+		formRows() {
+			return this.sections[0].rows.map((row) => {
+				return row.map((col) => {
+					if (col.key == 'eq-pics') {
+						// 重置图片的位置
+						return {
+							...col,
+							bind: {
+								...col.bind,
+							},
+							style: {
+								left: 0,
+								right: 'unset',
+							},
+						};
+					}
+					return {
+						...col,
+						bind: {
+							...col.bind,
+							// 详情 模式下，禁用各种输入
+							disabled: this.mode == 'detail',
+						},
+					};
+				});
+			});
+		},
+		tableBtn() {
+			return this.mode == 'detail' ? [] : this.sections[1].tableBtn;
+		},
+	},
+	mounted() {
+		for (const section of this.sections) {
+			// 请求具体信息
+			if ('url' in section) {
+				const query = {
+					url: section.url,
+					method: section.method || 'get',
+					params: section.queryParams || null,
+					data: section.data || null,
+				};
+				this.$axios(query).then(({ data }) => {
+					if (section.key == 'base') {
+						this.form = data;
+						this.showForm = true;
+						this.infoQuery = query;
+					} else if (section.key == 'attrs') {
+						this.attrQuery = query;
+						this.list = data.list;
+						this.total = data.total;
+					}
+				});
+			}
+		}
+	},
+	methods: {
+		handleTableBtnClick({ type, data }) {
+			switch (type) {
+				case 'edit':
+					this.handleEditAttr(data.id);
+					break;
+				case 'delete':
+					this.handleDeleteAttr(data.id);
+					break;
+			}
+		},
+		async handleConfirm() {
+			this.btnLoading = true;
+			this.syncFileListFlag = Math.random();
+
+			this.$nextTick(async () => {
+				const { code, data } = await this.$axios({
+					url: this.sections[0].urlUpdate,
+					method: 'put',
+					data: this.form,
+				});
+				if (code == 0) {
+					this.$modal.msgSuccess('更新成功');
+				}
+
+				this.btnLoading = false;
+				this.$emit('refreshDataList');
+				this.handleCancel();
+			});
+		},
+
+		handleEmitFun(val) {
+			console.log('handleEmitFun', val);
+		},
+
+		init() {
+			this.visible = true;
+		},
+
+		async getAttrList() {
+			this.attrListLoading = true;
+			const res = await this.$axios(this.attrQuery);
+			if (res.code == 0) {
+				this.list = res.data.list;
+				this.total = res.data.total;
+			}
+			this.attrListLoading = false;
+		},
+
+		// 保存表单
+		handleSave() {
+			this.$refs['form'][0].validate(async (valid) => {
+				if (valid) {
+					const isEdit = this.mode == 'edit';
+					await this.$axios({
+						url: this.sections[0][isEdit ? 'urlUpdate' : 'urlCreate'],
+						method: isEdit ? 'put' : 'post',
+						data: this.form,
+					});
+					this.$modal.msgSuccess(`${isEdit ? '更新' : '创建'}成功`);
+					this.visible = false;
+					this.$emit('refreshDataList');
+				}
+			});
+		},
+
+		handleCancel() {
+			this.visible = false;
+		},
+
+		// 开启编辑
+		toggleEdit() {
+			this.$emit('update-mode', 'edit');
+		},
+
+		// 新增属性
+		handleAddAttr() {
+			if (!this.dataId) return this.$message.error('请先创建设备信息');
+			this.attrForm = {
+				id: null,
+				equipmentId: this.dataId,
+				name: '',
+				value: '',
+			};
+			this.attrTitle = '添加设备属性';
+			this.attrFormVisible = true;
+		},
+
+		// 编辑属性
+		async handleEditAttr(attrId) {
+			const res = await this.$axios({
+				url: this.sections[1].urlDetail,
+				method: 'get',
+				params: { id: attrId },
+			});
+			if (res.code == 0) {
+				this.attrForm = res.data;
+				this.attrTitle = '编辑设备属性';
+				this.attrFormVisible = true;
+			}
+		},
+
+		// 删除属性
+		handleDeleteAttr(attrId) {
+			this.$confirm('确定删除该属性?', '提示', {
+				confirmButtonText: '确定',
+				cancelButtonText: '取消',
+				type: 'warning',
+			})
+				.then(async () => {
+					const res = await this.$axios({
+						url: this.sections[1].urlDelete,
+						method: 'delete',
+						params: { id: attrId },
+					});
+					if (res.code == 0) {
+						this.$message({
+							message: '删除成功',
+							type: 'success',
+							duration: 1500,
+							onClose: () => {
+								this.getAttrList();
+							},
+						});
+					}
+				})
+				.catch(() => {});
+		},
+
+		// 提交属性表
+		submitAttrForm() {
+			this.$refs['attrForm'].validate(async (valid) => {
+				if (!valid) {
+					return;
+				}
+
+				try {
+					const isEdit = this.attrForm.id != null;
+					this.attrFormSubmitting = true;
+					const res = await this.$axios({
+						url: isEdit
+							? this.sections[1].urlUpdate
+							: this.sections[1].urlCreate,
+						method: isEdit ? 'put' : 'post',
+						data: this.attrForm,
+					});
+
+					if (res.code == 0) {
+						this.closeAttrForm();
+						this.$message({
+							message: `${isEdit ? '更新' : '创建'}成功`,
+							type: 'success',
+							duration: 1500,
+							onClose: () => {
+								this.getAttrList();
+							},
+						});
+					}
+					this.attrFormSubmitting = false;
+				} catch (err) {
+					this.$message({
+						message: err,
+						type: 'error',
+						duration: 1500,
+					});
+					this.attrFormSubmitting = false;
+				}
+			});
+		},
+
+		closeAttrForm() {
+			this.attrFormVisible = false;
+		},
+
+		handleClick(raw) {
+			if (raw.type === 'delete') {
+				this.$confirm(
+					`确定对${
+						raw.data.name
+							? '[名称=' + raw.data.name + ']'
+							: '[序号=' + raw.data._pageIndex + ']'
+					}进行删除操作?`,
+					'提示',
+					{
+						confirmButtonText: '确定',
+						cancelButtonText: '取消',
+						type: 'warning',
+					}
+				)
+					.then(() => {
+						deleteProductAttr(raw.data.id).then(({ data }) => {
+							this.$message({
+								message: '操作成功',
+								type: 'success',
+								duration: 1500,
+								onClose: () => {
+									this.getList();
+								},
+							});
+						});
+					})
+					.catch(() => {});
+			} else {
+				this.addNew(raw.data.id);
+			}
+		},
+	},
+};
+</script>
+
+<style scoped>
+.drawer >>> .el-drawer {
+	border-radius: 8px 0 0 8px;
+}
+
+.drawer >>> .el-drawer__header {
+	margin: 0;
+	padding: 32px 32px 24px;
+	border-bottom: 1px solid #dcdfe6;
+	margin-bottom: 0px;
+}
+
+.small-title::before {
+	content: '';
+	display: inline-block;
+	vertical-align: top;
+	width: 4px;
+	height: 22px;
+	border-radius: 1px;
+	margin-right: 8px;
+	background-color: #0b58ff;
+}
+
+.drawer-body {
+	display: flex;
+	flex-direction: column;
+	height: 100%;
+}
+
+.drawer-body__content {
+	flex: 1;
+	/* background: #eee; */
+	padding: 20px 30px;
+	overflow-y: auto;
+}
+
+.drawer-body__footer {
+	display: flex;
+	justify-content: flex-end;
+	padding: 18px;
+}
+</style>
diff --git a/src/views/specialEquipment/components/manageDrawerForm.vue b/src/views/specialEquipment/components/manageDrawerForm.vue
new file mode 100644
index 00000000..13eac654
--- /dev/null
+++ b/src/views/specialEquipment/components/manageDrawerForm.vue
@@ -0,0 +1,228 @@
+<!-- 
+    filename: form.vue
+    author: liubin
+    date: 2023-08-15 10:32:36
+    description:  
+-->
+
+<template>
+	<el-form
+		class="equipment-info-form"
+		ref="form"
+		:model="form"
+		label-width="200px"
+		label-position="top"
+		v-loading="formLoading">
+		<el-row :gutter="20">
+			<el-col :span="12">
+				<el-form-item
+					label="设备名称"
+					prop="name"
+					:rules="[
+						{ required: true, message: '设备名称不能为空', trigger: 'blur' },
+					]">
+					<el-input
+						v-model="form.name"
+						:disabled="disabled"
+						placeholder="请输入设备名称"></el-input>
+				</el-form-item>
+			</el-col>
+			<el-col :span="12">
+				<el-form-item label="设备编码" prop="code" :rules="[]">
+					<el-input
+						v-model="form.code"
+						:disabled="disabled"
+						placeholder="请输入设备编码"></el-input>
+				</el-form-item>
+			</el-col>
+		</el-row>
+		<el-row :gutter="20">
+			<el-col :span="12">
+				<el-form-item label="所在区域" prop="location">
+					<el-input
+						v-model="form.location"
+						:disabled="disabled"
+						placeholder="请输入所在区域"></el-input>
+				</el-form-item>
+			</el-col>
+			<el-col :span="12">
+				<el-form-item label="负责人" prop="responsiblePeopleId">
+					<el-select
+						v-model="form.responsiblePeopleId"
+						:disabled="disabled"
+						placeholder="请输入负责人">
+						<el-option
+							v-for="rp in rpList"
+							:key="rp.id"
+							:label="rp.name"
+							:value="rp.id"></el-option>
+					</el-select>
+				</el-form-item>
+			</el-col>
+		</el-row>
+		<el-row :gutter="20">
+			<el-col :span="24">
+				<el-form-item label="备注" prop="remark" :rules="[]">
+					<el-input
+						v-model="form.remark"
+						:disabled="disabled"
+						placeholder="请输入备注"></el-input>
+				</el-form-item>
+			</el-col>
+		</el-row>
+
+		<el-row :gutter="20">
+			<!-- 上传资料  -->
+			<el-col>
+				<el-form-item label="上传图片" prop="assets" :rules="[]">
+					<AssetsUpload v-model="form.assets" :disabled="disabled" />
+				</el-form-item>
+			</el-col>
+		</el-row>
+	</el-form>
+</template>
+
+<script>
+import AssetsUpload from './AssetsUpload.vue';
+
+export default {
+	name: 'EquipmentInfoForm',
+
+	model: {
+		prop: 'dataForm',
+		event: 'update',
+	},
+
+	emits: ['update'],
+
+	components: { AssetsUpload },
+
+	props: {
+		dataForm: {
+			type: Object,
+			default: () => ({}),
+		},
+		disabled: {
+			type: Boolean,
+			default: false,
+		},
+		syncFilelist: {
+			type: Number,
+			default: null,
+			required: false,
+		},
+		isFireEquipment: {
+			type: Boolean,
+			default: false,
+		},
+	},
+
+	data() {
+		return {
+			formLoading: false,
+			form: {
+				name: '',
+				code: '',
+				enName: '',
+				abbr: '',
+				equipmentTypeId: '',
+				remark: '',
+				productionTime: '',
+				workTime: '',
+				enterTime: '',
+				tvalue: '',
+				processingTime: '',
+				manufacturer: '',
+				spec: '',
+				description: '',
+				assets: [],
+				pics: [],
+				dueDate: '',
+			},
+			rpList: [],
+			dataLoaded: false,
+		};
+	},
+
+	watch: {
+		dataForm: {
+			handler(val) {
+				// debugger;
+				this.form = JSON.parse(JSON.stringify(val));
+				this.form.assets =
+					this.form.files?.filter((item) => item.fileType == '2') || [];
+				this.form.pics =
+					this.form.files?.filter((item) => item.fileType == '1') || [];
+				delete this.form.files;
+			},
+			immediate: true,
+			deep: true,
+		},
+		syncFilelist: {
+			handler(val) {
+				if (val != null) {
+					this.updateForm();
+				}
+			},
+			immediate: true,
+		},
+	},
+
+	mounted() {
+		this.getRpList();
+	},
+
+	methods: {
+		updateForm() {
+			this.form.files = [...this.form.assets, ...this.form.pics];
+			delete this.form.assets;
+			delete this.form.pics;
+			this.$emit('update', this.form);
+		},
+
+		async getRpList() {
+			this.formLoading = true;
+			const { code, data } = await this.$axios('/base/core-worker/listAll');
+			// debugger;
+			if (code == 0) {
+				this.rpList = data;
+			}
+			this.formLoading = false;
+		},
+
+		/** 模拟透传 ref  */
+		validate(cb) {
+			return this.$refs.form.validate(cb);
+		},
+		resetFields(args) {
+			return this.$refs.form.resetFields(args);
+		},
+		// getCode
+		async getCode(url) {
+			const response = await this.$axios(url);
+			return response.data;
+		},
+		// 上传成功的特殊处理
+		beforeUpload() {},
+		// 上传前的验证规则可通过 bind 属性传入
+		handleUploadSuccess(response, file, fileList) {
+			// 保存原始文件名
+			if ('fileNames' in this.form) this.form.fileNames.push(file.name);
+			// 保存完整地址
+			if ('fileUrls' in this.form) this.form.fileUrls.push(response.data);
+			this.$modal.msgSuccess('上传成功');
+		},
+
+		getFileName(fileUrl) {
+			return fileUrl.split('/').pop();
+		},
+	},
+};
+</script>
+
+<style scoped lang="scss">
+.el-date-editor,
+.el-select {
+	width: 100%;
+}
+</style>
diff --git a/src/views/specialEquipment/components/safetyDrawer.vue b/src/views/specialEquipment/components/safetyDrawer.vue
new file mode 100644
index 00000000..55cfb3ce
--- /dev/null
+++ b/src/views/specialEquipment/components/safetyDrawer.vue
@@ -0,0 +1,509 @@
+<!-- 
+    filename: Safety Drawer.vue
+    author: liubin
+    date: 2024-2-19 10:38:56
+    description: 
+-->
+
+
+<template>
+	<el-drawer
+		:visible="visible"
+		:show-close="false"
+		:wrapper-closable="false"
+		class="drawer"
+		custom-class="mes-drawer"
+		size="60%"
+		@closed="$emit('destroy')">
+		<SmallTitle slot="title">
+			{{
+				mode.includes('detail')
+					? '详情'
+					: mode.includes('edit')
+					? '编辑'
+					: '新增'
+			}}
+		</SmallTitle>
+
+		<div class="drawer-body flex">
+			<div class="drawer-body__content">
+				<section v-for="(section, index) in sections" :key="section.key">
+					<SmallTitle v-if="index != 0">{{ section.name }}</SmallTitle>
+
+					<div
+						class="form-part"
+						v-if="section.key == 'base'"
+						style="margin-bottom: 32px">
+						<el-skeleton v-if="!showForm" animated />
+						<EquipmentInfoForm
+							key="drawer-dialog-form"
+							v-if="showForm"
+							:isFireEquipment="isFireEquipment"
+							:disabled="mode.includes('detail')"
+							:sync-filelist="syncFileListFlag"
+							v-model="form" />
+					</div>
+
+					<div
+						v-if="section.key == 'attrs'"
+						style="margin-top: 12px; position: relative">
+						<div
+							v-if="!mode.includes('detail')"
+							style="position: absolute; top: -40px; right: 0">
+							<el-button @click="handleAddAttr" type="text">
+								<i class="el-icon-plus"></i>
+								添加属性
+							</el-button>
+						</div>
+						<base-table
+							v-loading="attrListLoading"
+							:table-props="section.props"
+							:page="attrQuery?.params.pageNo || 1"
+							:limit="attrQuery?.params.pageSize || 10"
+							:table-data="list"
+							@emitFun="handleEmitFun">
+							<!-- :add-button-show="mode.includes('detail') ? null : '添加属性'"
+							@emitButtonClick="handleAddAttr" -->
+							<method-btn
+								v-if="section.tableBtn"
+								slot="handleBtn"
+								label="操作"
+								:method-list="tableBtn"
+								@clickBtn="handleTableBtnClick" />
+						</base-table>
+
+						<!-- 分页组件 -->
+						<pagination
+							v-show="total > 0"
+							:total="total"
+							:page.sync="attrQuery.params.pageNo"
+							:limit.sync="attrQuery.params.pageSize"
+							@pagination="getAttrList" />
+					</div>
+				</section>
+			</div>
+
+			<div class="drawer-body__footer">
+				<el-button style="" @click="handleCancel">取消</el-button>
+				<el-button v-if="mode == 'detail'" type="primary" @click="toggleEdit">
+					编辑
+				</el-button>
+				<el-button v-else type="primary" @click="handleConfirm">保存</el-button>
+				<!-- sections的第二项必须是 属性列表  -->
+				<!-- <el-button
+						v-if="sections[1].allowAdd"
+						type="primary"
+						@click="handleAddAttr">
+						添加属性
+					</el-button> -->
+			</div>
+		</div>
+
+		<!-- 属性对话框 -->
+		<base-dialog
+			v-if="sections[1].allowAdd"
+			:dialogTitle="attrTitle"
+			:dialogVisible="attrFormVisible"
+			width="35%"
+			:append-to-body="true"
+			custom-class="baseDialog"
+			@close="closeAttrForm"
+			@cancel="closeAttrForm"
+			@confirm="submitAttrForm">
+			<DialogForm
+				v-if="attrFormVisible"
+				ref="attrForm"
+				:dataForm="attrForm"
+				:rows="attrRows" />
+		</base-dialog>
+	</el-drawer>
+</template>
+
+<script>
+import DialogForm from './DialogForm';
+import EquipmentInfoForm from './EquipmentInfoForm.vue';
+
+const SmallTitle = {
+	name: 'SmallTitle',
+	props: ['size'],
+	components: {},
+	data() {
+		return {};
+	},
+	methods: {},
+	render: function (h) {
+		return h(
+			'span',
+			{
+				class: 'small-title',
+				style: {
+					fontSize: '18px',
+					lineHeight:
+						this.size == 'lg' ? '24px' : this.size == 'sm' ? '18px' : '20px',
+					fontWeight: 500,
+					fontFamily: '微软雅黑, Microsoft YaHei, Arial, Helvetica, sans-serif',
+				},
+			},
+			this.$slots.default
+		);
+	},
+};
+
+export default {
+	components: { SmallTitle, DialogForm, EquipmentInfoForm },
+	props: ['sections', 'mode', 'dataId', 'isFireEquipment'], // dataId 作为一个通用的存放id的字段
+	data() {
+		return {
+			visible: false,
+			showForm: false,
+			btnLoading: false,
+			total: 0,
+			form: {},
+			list: [],
+			attrTitle: '',
+			attrForm: {
+				id: null,
+				equipmentId: null,
+				name: '',
+				value: '',
+			},
+			attrFormVisible: false,
+			attrRows: [
+				[
+					{
+						input: true,
+						label: '属性名称',
+						prop: 'name',
+						rules: [
+							{ required: true, message: '属性名称不能为空', trigger: 'blur' },
+						],
+					},
+				],
+				[
+					{
+						input: true,
+						label: '属性值',
+						prop: 'value',
+					},
+				],
+			],
+			attrQuery: {
+				params: {
+					pageNo: 1,
+					pageSize: 10,
+				},
+			}, // 属性列表的请求
+			infoQuery: null, // 基本信息的请求
+			attrFormSubmitting: false,
+			attrListLoading: false,
+			syncFileListFlag: null,
+		};
+	},
+	computed: {
+		formRows() {
+			return this.sections[0].rows.map((row) => {
+				return row.map((col) => {
+					if (col.key == 'eq-pics') {
+						// 重置图片的位置
+						return {
+							...col,
+							bind: {
+								...col.bind,
+							},
+							style: {
+								left: 0,
+								right: 'unset',
+							},
+						};
+					}
+					return {
+						...col,
+						bind: {
+							...col.bind,
+							// 详情 模式下，禁用各种输入
+							disabled: this.mode == 'detail',
+						},
+					};
+				});
+			});
+		},
+		tableBtn() {
+			return this.mode == 'detail' ? [] : this.sections[1].tableBtn;
+		},
+	},
+	mounted() {
+		for (const section of this.sections) {
+			// 请求具体信息
+			if ('url' in section) {
+				const query = {
+					url: section.url,
+					method: section.method || 'get',
+					params: section.queryParams || null,
+					data: section.data || null,
+				};
+				this.$axios(query).then(({ data }) => {
+					if (section.key == 'base') {
+						this.form = data;
+						this.showForm = true;
+						this.infoQuery = query;
+					} else if (section.key == 'attrs') {
+						this.attrQuery = query;
+						this.list = data.list;
+						this.total = data.total;
+					}
+				});
+			}
+		}
+	},
+	methods: {
+		handleTableBtnClick({ type, data }) {
+			switch (type) {
+				case 'edit':
+					this.handleEditAttr(data.id);
+					break;
+				case 'delete':
+					this.handleDeleteAttr(data.id);
+					break;
+			}
+		},
+		async handleConfirm() {
+			this.btnLoading = true;
+			this.syncFileListFlag = Math.random();
+
+			this.$nextTick(async () => {
+				const { code, data } = await this.$axios({
+					url: this.sections[0].urlUpdate,
+					method: 'put',
+					data: this.form,
+				});
+				if (code == 0) {
+					this.$modal.msgSuccess('更新成功');
+				}
+
+				this.btnLoading = false;
+				this.$emit('refreshDataList');
+				this.handleCancel();
+			});
+		},
+
+		handleEmitFun(val) {
+			console.log('handleEmitFun', val);
+		},
+
+		init() {
+			this.visible = true;
+		},
+
+		async getAttrList() {
+			this.attrListLoading = true;
+			const res = await this.$axios(this.attrQuery);
+			if (res.code == 0) {
+				this.list = res.data.list;
+				this.total = res.data.total;
+			}
+			this.attrListLoading = false;
+		},
+
+		// 保存表单
+		handleSave() {
+			this.$refs['form'][0].validate(async (valid) => {
+				if (valid) {
+					const isEdit = this.mode == 'edit';
+					await this.$axios({
+						url: this.sections[0][isEdit ? 'urlUpdate' : 'urlCreate'],
+						method: isEdit ? 'put' : 'post',
+						data: this.form,
+					});
+					this.$modal.msgSuccess(`${isEdit ? '更新' : '创建'}成功`);
+					this.visible = false;
+					this.$emit('refreshDataList');
+				}
+			});
+		},
+
+		handleCancel() {
+			this.visible = false;
+		},
+
+		// 开启编辑
+		toggleEdit() {
+			this.$emit('update-mode', 'edit');
+		},
+
+		// 新增属性
+		handleAddAttr() {
+			if (!this.dataId) return this.$message.error('请先创建设备信息');
+			this.attrForm = {
+				id: null,
+				equipmentId: this.dataId,
+				name: '',
+				value: '',
+			};
+			this.attrTitle = '添加设备属性';
+			this.attrFormVisible = true;
+		},
+
+		// 编辑属性
+		async handleEditAttr(attrId) {
+			const res = await this.$axios({
+				url: this.sections[1].urlDetail,
+				method: 'get',
+				params: { id: attrId },
+			});
+			if (res.code == 0) {
+				this.attrForm = res.data;
+				this.attrTitle = '编辑设备属性';
+				this.attrFormVisible = true;
+			}
+		},
+
+		// 删除属性
+		handleDeleteAttr(attrId) {
+			this.$confirm('确定删除该属性?', '提示', {
+				confirmButtonText: '确定',
+				cancelButtonText: '取消',
+				type: 'warning',
+			})
+				.then(async () => {
+					const res = await this.$axios({
+						url: this.sections[1].urlDelete,
+						method: 'delete',
+						params: { id: attrId },
+					});
+					if (res.code == 0) {
+						this.$message({
+							message: '删除成功',
+							type: 'success',
+							duration: 1500,
+							onClose: () => {
+								this.getAttrList();
+							},
+						});
+					}
+				})
+				.catch(() => {});
+		},
+
+		// 提交属性表
+		submitAttrForm() {
+			this.$refs['attrForm'].validate(async (valid) => {
+				if (!valid) {
+					return;
+				}
+
+				try {
+					const isEdit = this.attrForm.id != null;
+					this.attrFormSubmitting = true;
+					const res = await this.$axios({
+						url: isEdit
+							? this.sections[1].urlUpdate
+							: this.sections[1].urlCreate,
+						method: isEdit ? 'put' : 'post',
+						data: this.attrForm,
+					});
+
+					if (res.code == 0) {
+						this.closeAttrForm();
+						this.$message({
+							message: `${isEdit ? '更新' : '创建'}成功`,
+							type: 'success',
+							duration: 1500,
+							onClose: () => {
+								this.getAttrList();
+							},
+						});
+					}
+					this.attrFormSubmitting = false;
+				} catch (err) {
+					this.$message({
+						message: err,
+						type: 'error',
+						duration: 1500,
+					});
+					this.attrFormSubmitting = false;
+				}
+			});
+		},
+
+		closeAttrForm() {
+			this.attrFormVisible = false;
+		},
+
+		handleClick(raw) {
+			if (raw.type === 'delete') {
+				this.$confirm(
+					`确定对${
+						raw.data.name
+							? '[名称=' + raw.data.name + ']'
+							: '[序号=' + raw.data._pageIndex + ']'
+					}进行删除操作?`,
+					'提示',
+					{
+						confirmButtonText: '确定',
+						cancelButtonText: '取消',
+						type: 'warning',
+					}
+				)
+					.then(() => {
+						deleteProductAttr(raw.data.id).then(({ data }) => {
+							this.$message({
+								message: '操作成功',
+								type: 'success',
+								duration: 1500,
+								onClose: () => {
+									this.getList();
+								},
+							});
+						});
+					})
+					.catch(() => {});
+			} else {
+				this.addNew(raw.data.id);
+			}
+		},
+	},
+};
+</script>
+
+<style scoped>
+.drawer >>> .el-drawer {
+	border-radius: 8px 0 0 8px;
+}
+
+.drawer >>> .el-drawer__header {
+	margin: 0;
+	padding: 32px 32px 24px;
+	border-bottom: 1px solid #dcdfe6;
+	margin-bottom: 0px;
+}
+
+.small-title::before {
+	content: '';
+	display: inline-block;
+	vertical-align: top;
+	width: 4px;
+	height: 22px;
+	border-radius: 1px;
+	margin-right: 8px;
+	background-color: #0b58ff;
+}
+
+.drawer-body {
+	display: flex;
+	flex-direction: column;
+	height: 100%;
+}
+
+.drawer-body__content {
+	flex: 1;
+	/* background: #eee; */
+	padding: 20px 30px;
+	overflow-y: auto;
+}
+
+.drawer-body__footer {
+	display: flex;
+	justify-content: flex-end;
+	padding: 18px;
+}
+</style>
diff --git a/src/views/specialEquipment/maintain/iconfont/demo_index.html b/src/views/specialEquipment/maintain/iconfont/demo_index.html
deleted file mode 100644
index 348d9b91..00000000
--- a/src/views/specialEquipment/maintain/iconfont/demo_index.html
+++ /dev/null
@@ -1,306 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <meta charset="utf-8"/>
-  <title>iconfont Demo</title>
-  <link rel="shortcut icon" href="//img.alicdn.com/imgextra/i4/O1CN01Z5paLz1O0zuCC7osS_!!6000000001644-55-tps-83-82.svg" type="image/x-icon"/>
-  <link rel="icon" type="image/svg+xml" href="//img.alicdn.com/imgextra/i4/O1CN01Z5paLz1O0zuCC7osS_!!6000000001644-55-tps-83-82.svg"/>
-  <link rel="stylesheet" href="https://g.alicdn.com/thx/cube/1.3.2/cube.min.css">
-  <link rel="stylesheet" href="demo.css">
-  <link rel="stylesheet" href="iconfont.css">
-  <script src="iconfont.js"></script>
-  <!-- jQuery -->
-  <script src="https://a1.alicdn.com/oss/uploads/2018/12/26/7bfddb60-08e8-11e9-9b04-53e73bb6408b.js"></script>
-  <!-- 代码高亮 -->
-  <script src="https://a1.alicdn.com/oss/uploads/2018/12/26/a3f714d0-08e6-11e9-8a15-ebf944d7534c.js"></script>
-  <style>
-    .main .logo {
-      margin-top: 0;
-      height: auto;
-    }
-
-    .main .logo a {
-      display: flex;
-      align-items: center;
-    }
-
-    .main .logo .sub-title {
-      margin-left: 0.5em;
-      font-size: 22px;
-      color: #fff;
-      background: linear-gradient(-45deg, #3967FF, #B500FE);
-      -webkit-background-clip: text;
-      -webkit-text-fill-color: transparent;
-    }
-  </style>
-</head>
-<body>
-  <div class="main">
-    <h1 class="logo"><a href="https://www.iconfont.cn/" title="iconfont 首页" target="_blank">
-      <img width="200" src="https://img.alicdn.com/imgextra/i3/O1CN01Mn65HV1FfSEzR6DKv_!!6000000000514-55-tps-228-59.svg">
-      
-    </a></h1>
-    <div class="nav-tabs">
-      <ul id="tabs" class="dib-box">
-        <li class="dib active"><span>Unicode</span></li>
-        <li class="dib"><span>Font class</span></li>
-        <li class="dib"><span>Symbol</span></li>
-      </ul>
-      
-      <a href="https://www.iconfont.cn/manage/index?manage_type=myprojects&projectId=3821755" target="_blank" class="nav-more">查看项目</a>
-      
-    </div>
-    <div class="tab-container">
-      <div class="content unicode" style="display: block;">
-          <ul class="icon_lists dib-box">
-          
-            <li class="dib">
-              <span class="icon iconfont">&#xe604;</span>
-                <div class="name">downward</div>
-                <div class="code-name">&amp;#xe604;</div>
-              </li>
-          
-            <li class="dib">
-              <span class="icon iconfont">&#xe605;</span>
-                <div class="name">upward</div>
-                <div class="code-name">&amp;#xe605;</div>
-              </li>
-          
-            <li class="dib">
-              <span class="icon iconfont">&#xe601;</span>
-                <div class="name">detail</div>
-                <div class="code-name">&amp;#xe601;</div>
-              </li>
-          
-            <li class="dib">
-              <span class="icon iconfont">&#xe602;</span>
-                <div class="name">edit</div>
-                <div class="code-name">&amp;#xe602;</div>
-              </li>
-          
-            <li class="dib">
-              <span class="icon iconfont">&#xe603;</span>
-                <div class="name">delete</div>
-                <div class="code-name">&amp;#xe603;</div>
-              </li>
-          
-          </ul>
-          <div class="article markdown">
-          <h2 id="unicode-">Unicode 引用</h2>
-          <hr>
-
-          <p>Unicode 是字体在网页端最原始的应用方式，特点是：</p>
-          <ul>
-            <li>支持按字体的方式去动态调整图标大小，颜色等等。</li>
-            <li>默认情况下不支持多色，直接添加多色图标会自动去色。</li>
-          </ul>
-          <blockquote>
-            <p>注意：新版 iconfont 支持两种方式引用多色图标：SVG symbol 引用方式和彩色字体图标模式。（使用彩色字体图标需要在「编辑项目」中开启「彩色」选项后并重新生成。）</p>
-          </blockquote>
-          <p>Unicode 使用步骤如下：</p>
-          <h3 id="-font-face">第一步：拷贝项目下面生成的 <code>@font-face</code></h3>
-<pre><code class="language-css"
->@font-face {
-  font-family: 'iconfont';
-  src: url('iconfont.eot?t=1689233106339'); /* IE9 */
-  src: url('iconfont.eot?t=1689233106339#iefix') format('embedded-opentype'), /* IE6-IE8 */
-       url('data:application/x-font-woff2;charset=utf-8;base64,d09GMgABAAAAAARgAAsAAAAACcAAAAQUAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHFQGYACDKAqGSIUsATYCJAMYCw4ABCAFhGcHVBtUCMiuMG7hiaIkox1FaBhxvd1fpwAN4YKo1v7tWTr8hBRkBQgO7yqKUJKPUKzDjkixjn7/q0vlANCkEHCJtsMvx2eQn04h5rHEE8593TK2y1SC5nbvNG5gqgZBNEWTqFUQLGVFNnVu1TjyMm3SafEsC3y0myW12KdEh2x+deP/zzHTJeG3AVBm4lrnAxpQN0US7s3ijuSE6Jbh1UGv08cgQEivMg5z6m49Qj77TVxDEZww6gXicNkviSbkxgswNeGCj+CgMw1yFRpAnUNegSv+8+UfU/igsBpjnRV3rRV9+Su8Fk1Agv6CW4eAeyvAAhronJlI1tcrVnIMHZ0cCcsUTrRTnQ0CP50B4KfgEub9Lw80BougQBwGI8bYJU4LPwUbBw0/HXAw8NORUM90wsT9JeIMFACux9QckHyQ9FDYTobcGi+FLSjwMxDe3L5s+w9THFYeEs8H303FWMnZ1JuBWFgNPh3bd5wOvJmKI9aTqXeD8eJ66HnfnV1dJPE8cy4EgqT+s/SbdSWbp9Pn24NbZ1MnGw7CDbvT6+lL1CXVh++hcH56umDT9vOviL/grQ6srHjE57uLHdQn+dtO9x2v94WN6+eXm0HWlZOzta3tUDp1JWjymsiD8r0ViWGkC+n4GeH5aODSM+9COnilpdfdZsRIvMerLmS0uICTplrOnb99LT3NkJNeajPfpDznblq6bXH8efBjlPIUxhQcX+U0qEdt4bjxy6rMdOkbEn0/3mlvrXZL60ysxdwcn/qKLJ/82pnzGS61z5rBeGmrxf33ZXN/IBWUvb8KSvnttbwwq+YTkweZHue0M0+c0ssZGY/Rs+aVF8+3GaW07CkvLC/KcBvP8c2uGpsdm0THlazwlPE22Kdi9ZK4Hdsmtw9eHVQwPjG0p33Q7tGMJ6TUJ2VK1MMw6ftI6qPPtruCvEPmLZqiHcj1Aw3Rup/sdzj+lt/w3f5TrAHgx++nD7A+8xaD4CL8m60Q+KWYO7CgUY3gTFl+OwUBHKteh00BoWmGDIYm301frAJwKAg+BTEoPCpA41OPNNh2sET0g8NnCkI61M6PKKBzREwANBtGIOS6BEU2D0CT6xvSYP+Apdg/cOT6DyErI68W0RzbqhmYOFixuRNLFqoRi839Zh+A2KqYWJH1CTC7hM04My0j664HDVgXY+xtYhbnBBNGVVzH7geKQrHOqA0sPK2Fc70oPZ2UPSTNQlVUjQEmHLDCzDphEgtKQ9zCPP16DwBRK4UJAyKfyBg7jaeaxzKlyQAg6xkaKO9M2tu1EWXhOEL3IxhKhdWpMqCYDgrTy7vZAAsuTUsLm65IOlWIQBlp47PUS9wAhBgHOFGixYgVJx7+dtqutZuY1eXTvXYncJOkOF1Wicd+CnBACA==') format('woff2'),
-       url('iconfont.woff?t=1689233106339') format('woff'),
-       url('iconfont.ttf?t=1689233106339') format('truetype'),
-       url('iconfont.svg?t=1689233106339#iconfont') format('svg');
-}
-</code></pre>
-          <h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
-<pre><code class="language-css"
->.iconfont {
-  font-family: "iconfont" !important;
-  font-size: 16px;
-  font-style: normal;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-}
-</code></pre>
-          <h3 id="-">第三步：挑选相应图标并获取字体编码，应用于页面</h3>
-<pre>
-<code class="language-html"
->&lt;span class="iconfont"&gt;&amp;#x33;&lt;/span&gt;
-</code></pre>
-          <blockquote>
-            <p>"iconfont" 是你项目下的 font-family。可以通过编辑项目查看，默认是 "iconfont"。</p>
-          </blockquote>
-          </div>
-      </div>
-      <div class="content font-class">
-        <ul class="icon_lists dib-box">
-          
-          <li class="dib">
-            <span class="icon iconfont icon-downward"></span>
-            <div class="name">
-              downward
-            </div>
-            <div class="code-name">.icon-downward
-            </div>
-          </li>
-          
-          <li class="dib">
-            <span class="icon iconfont icon-upward"></span>
-            <div class="name">
-              upward
-            </div>
-            <div class="code-name">.icon-upward
-            </div>
-          </li>
-          
-          <li class="dib">
-            <span class="icon iconfont icon-detail"></span>
-            <div class="name">
-              detail
-            </div>
-            <div class="code-name">.icon-detail
-            </div>
-          </li>
-          
-          <li class="dib">
-            <span class="icon iconfont icon-edit"></span>
-            <div class="name">
-              edit
-            </div>
-            <div class="code-name">.icon-edit
-            </div>
-          </li>
-          
-          <li class="dib">
-            <span class="icon iconfont icon-delete"></span>
-            <div class="name">
-              delete
-            </div>
-            <div class="code-name">.icon-delete
-            </div>
-          </li>
-          
-        </ul>
-        <div class="article markdown">
-        <h2 id="font-class-">font-class 引用</h2>
-        <hr>
-
-        <p>font-class 是 Unicode 使用方式的一种变种，主要是解决 Unicode 书写不直观，语意不明确的问题。</p>
-        <p>与 Unicode 使用方式相比，具有如下特点：</p>
-        <ul>
-          <li>相比于 Unicode 语意明确，书写更直观。可以很容易分辨这个 icon 是什么。</li>
-          <li>因为使用 class 来定义图标，所以当要替换图标时，只需要修改 class 里面的 Unicode 引用。</li>
-        </ul>
-        <p>使用步骤如下：</p>
-        <h3 id="-fontclass-">第一步：引入项目下面生成的 fontclass 代码：</h3>
-<pre><code class="language-html">&lt;link rel="stylesheet" href="./iconfont.css"&gt;
-</code></pre>
-        <h3 id="-">第二步：挑选相应图标并获取类名，应用于页面：</h3>
-<pre><code class="language-html">&lt;span class="iconfont icon-xxx"&gt;&lt;/span&gt;
-</code></pre>
-        <blockquote>
-          <p>"
-            iconfont" 是你项目下的 font-family。可以通过编辑项目查看，默认是 "iconfont"。</p>
-        </blockquote>
-      </div>
-      </div>
-      <div class="content symbol">
-          <ul class="icon_lists dib-box">
-          
-            <li class="dib">
-                <svg class="icon svg-icon" aria-hidden="true">
-                  <use xlink:href="#icon-downward"></use>
-                </svg>
-                <div class="name">downward</div>
-                <div class="code-name">#icon-downward</div>
-            </li>
-          
-            <li class="dib">
-                <svg class="icon svg-icon" aria-hidden="true">
-                  <use xlink:href="#icon-upward"></use>
-                </svg>
-                <div class="name">upward</div>
-                <div class="code-name">#icon-upward</div>
-            </li>
-          
-            <li class="dib">
-                <svg class="icon svg-icon" aria-hidden="true">
-                  <use xlink:href="#icon-detail"></use>
-                </svg>
-                <div class="name">detail</div>
-                <div class="code-name">#icon-detail</div>
-            </li>
-          
-            <li class="dib">
-                <svg class="icon svg-icon" aria-hidden="true">
-                  <use xlink:href="#icon-edit"></use>
-                </svg>
-                <div class="name">edit</div>
-                <div class="code-name">#icon-edit</div>
-            </li>
-          
-            <li class="dib">
-                <svg class="icon svg-icon" aria-hidden="true">
-                  <use xlink:href="#icon-delete"></use>
-                </svg>
-                <div class="name">delete</div>
-                <div class="code-name">#icon-delete</div>
-            </li>
-          
-          </ul>
-          <div class="article markdown">
-          <h2 id="symbol-">Symbol 引用</h2>
-          <hr>
-
-          <p>这是一种全新的使用方式，应该说这才是未来的主流，也是平台目前推荐的用法。相关介绍可以参考这篇<a href="">文章</a>
-            这种用法其实是做了一个 SVG 的集合，与另外两种相比具有如下特点：</p>
-          <ul>
-            <li>支持多色图标了，不再受单色限制。</li>
-            <li>通过一些技巧，支持像字体那样，通过 <code>font-size</code>, <code>color</code> 来调整样式。</li>
-            <li>兼容性较差，支持 IE9+，及现代浏览器。</li>
-            <li>浏览器渲染 SVG 的性能一般，还不如 png。</li>
-          </ul>
-          <p>使用步骤如下：</p>
-          <h3 id="-symbol-">第一步：引入项目下面生成的 symbol 代码：</h3>
-<pre><code class="language-html">&lt;script src="./iconfont.js"&gt;&lt;/script&gt;
-</code></pre>
-          <h3 id="-css-">第二步：加入通用 CSS 代码（引入一次就行）：</h3>
-<pre><code class="language-html">&lt;style&gt;
-.icon {
-  width: 1em;
-  height: 1em;
-  vertical-align: -0.15em;
-  fill: currentColor;
-  overflow: hidden;
-}
-&lt;/style&gt;
-</code></pre>
-          <h3 id="-">第三步：挑选相应图标并获取类名，应用于页面：</h3>
-<pre><code class="language-html">&lt;svg class="icon" aria-hidden="true"&gt;
-  &lt;use xlink:href="#icon-xxx"&gt;&lt;/use&gt;
-&lt;/svg&gt;
-</code></pre>
-          </div>
-      </div>
-
-    </div>
-  </div>
-  <script>
-  $(document).ready(function () {
-      $('.tab-container .content:first').show()
-
-      $('#tabs li').click(function (e) {
-        var tabContent = $('.tab-container .content')
-        var index = $(this).index()
-
-        if ($(this).hasClass('active')) {
-          return
-        } else {
-          $('#tabs li').removeClass('active')
-          $(this).addClass('active')
-
-          tabContent.hide().eq(index).fadeIn()
-        }
-      })
-    })
-  </script>
-</body>
-</html>

From 66337f4aca3231b8e6f0ce3963f51a74a123e760 Mon Sep 17 00:00:00 2001
From: lb <liubin_9396@163.com>
Date: Mon, 19 Feb 2024 11:11:09 +0800
Subject: [PATCH 16/40] update waitinglist table

---
 .../maintain/Monitor--detail.vue              |  2 +-
 .../specialEquipment/maintain/Monitor.vue     | 11 +--
 .../specialEquipment/maintain/WaitingList.vue |  6 +-
 .../maintain/WaitingListTable.vue             | 93 ++++++++++++++++---
 4 files changed, 87 insertions(+), 25 deletions(-)

diff --git a/src/views/specialEquipment/maintain/Monitor--detail.vue b/src/views/specialEquipment/maintain/Monitor--detail.vue
index cfbedc87..e39a632d 100644
--- a/src/views/specialEquipment/maintain/Monitor--detail.vue
+++ b/src/views/specialEquipment/maintain/Monitor--detail.vue
@@ -238,7 +238,7 @@ export default {
 			detailTableProps: [
 				{ prop: 'equipmentName', label: '设备名称' },
 				{ prop: 'program', label: '保养项目' },
-				{ prop: 'remark', label: '备注' },
+				{ prop: 'maintenanceDes', label: '保养描述' },
 			],
 			detailTableQuery: {
 				pageNo: 1,
diff --git a/src/views/specialEquipment/maintain/Monitor.vue b/src/views/specialEquipment/maintain/Monitor.vue
index 64b79b93..01472b68 100644
--- a/src/views/specialEquipment/maintain/Monitor.vue
+++ b/src/views/specialEquipment/maintain/Monitor.vue
@@ -361,11 +361,10 @@ export default {
 			);
 		},
 		initSearchBar() {
-			this.$watch('current', {});
-			this.http('/base/core-equipment/listAll', 'get').then(({ data }) => {
-				this.allSpecialEquipments = data.filter((item) => item.special);
-				this.setSearchBarEquipmentList(data.filter((item) => item.special));
-			});
+			// this.http('/base/core-equipment/listAll', 'get').then(({ data }) => {
+			// 	this.allSpecialEquipments = data.filter((item) => item.special);
+			// 	this.setSearchBarEquipmentList(data.filter((item) => item.special));
+			// });
 			this.http('/base/equipment-maintain-plan/page', 'get', {
 				pageNo: 1,
 				pageSize: 100,
@@ -382,7 +381,7 @@ export default {
 			});
 		},
 		handleEmitFun({ action, value }) {
-			console.log('handleEmitFun .... ', action, value);
+			// console.log('handleEmitFun .... ', action, value);
 			switch (action) {
 				case '保养内容':
 					this.monitorDetailVisible = true;
diff --git a/src/views/specialEquipment/maintain/WaitingList.vue b/src/views/specialEquipment/maintain/WaitingList.vue
index 2e43e778..9835ff26 100644
--- a/src/views/specialEquipment/maintain/WaitingList.vue
+++ b/src/views/specialEquipment/maintain/WaitingList.vue
@@ -15,7 +15,7 @@
 			@headBtnClick="handleSearchBarBtnClick" />
 
 		<!-- 列表 -->
-		<base-table
+		<!-- <base-table
 			:table-props="tableProps"
 			:page="queryParams.pageNo"
 			:limit="queryParams.pageSize"
@@ -29,7 +29,8 @@
 				:width="120"
 				:method-list="tableBtn"
 				@clickBtn="handleTableBtnClick" />
-		</base-table>
+		</base-table> -->
+		<WaitingListTable :table-data="list" :page="queryParams.pageNo" :limit="queryParams.pageSize" />
 
 		<!-- 分页组件 -->
 		<pagination
@@ -61,7 +62,6 @@
 			</el-row>
 		</base-dialog>
 
-		<WaitingListTable />
 
 		<!-- 编辑 -->
 		<!-- <RecordDetail
diff --git a/src/views/specialEquipment/maintain/WaitingListTable.vue b/src/views/specialEquipment/maintain/WaitingListTable.vue
index 3935a10a..cf56a36e 100644
--- a/src/views/specialEquipment/maintain/WaitingListTable.vue
+++ b/src/views/specialEquipment/maintain/WaitingListTable.vue
@@ -7,8 +7,8 @@
 
 <template>
 	<el-table
-		:data="tableData"
-		:border="false"
+		:data="tableDataWithIndex"
+		:border="true"
 		@selection-change="handleSelectionChange"
 		style="width: 100%"
 		:header-cell-style="{
@@ -33,22 +33,19 @@
 		</el-table-column>
 		<el-table-column
 			v-if="selectedBox[0]"
-			width="110"
+			width="128"
 			label="设备保养单号"
 			prop="maintainOrderNumber"></el-table-column>
 		<el-table-column
 			v-if="selectedBox[1]"
-			width="110"
 			label="保养计划名称"
 			prop="planName"></el-table-column>
 		<el-table-column
 			v-if="selectedBox[2]"
-			width="110"
 			label="部门"
 			prop="departmentName"></el-table-column>
 		<el-table-column
 			v-if="selectedBox[3]"
-			width="110"
 			label="产线名"
 			prop="lineName"></el-table-column>
 		<el-table-column
@@ -105,14 +102,24 @@
 				{{ scope.row.relatePlan | relatePlanFilter }}
 			</template>
 		</el-table-column>
-		<el-table-column v-if="selectedBox[10]" width="60" label="详情">
+		<!-- <el-table-column v-if="selectedBox[10]" width="60" label="详情">
 			<template slot-scope="scope">
 				<el-button type="text" @click="handelDetail(scope.row)">详情</el-button>
 			</template>
-		</el-table-column>
+		</el-table-column> -->
 		<!-- btns  -->
-		<el-table-column width="200" label="操作">
+		<el-table-column width="188" label="操作">
 			<template slot-scope="scope">
+				<el-tooltip content="确认" placement="top">
+					<el-button
+						type="text"
+						style="margin: 5px 0; padding: 0"
+						@click="handleConfirm(scope.row)">
+						确认
+					</el-button>
+				</el-tooltip>
+				<!-- line  -->
+				<span style="margin: 0 4px; font-size: 18px; color: #e5e7eb">|</span>
 				<el-tooltip content="查看详情" placement="top">
 					<el-button
 						type="text"
@@ -127,7 +134,7 @@
 					<el-button
 						type="text"
 						style="margin: 5px 0; padding: 0"
-						@click="handelDetail(scope.row)">
+						@click="handleEdit(scope.row)">
 						<i class="iconfont icon-edit primary-color" />
 					</el-button>
 				</el-tooltip>
@@ -137,7 +144,7 @@
 					<el-button
 						type="text"
 						style="margin: 5px 0; padding: 0"
-						@click="handelDetail(scope.row)">
+						@click="handleDelete(scope.row)">
 						<i class="iconfont icon-delete delete-color" />
 					</el-button>
 				</el-tooltip>
@@ -152,7 +159,7 @@ import moment from 'moment';
 export default {
 	name: 'WaitingListTable',
 	components: {},
-	props: {},
+	props: ['tableData', 'page', 'limit'],
 	filters: {
 		timeFilter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'),
 		relatePlanFilter: (val) =>
@@ -160,7 +167,6 @@ export default {
 	},
 	data() {
 		return {
-			tableData: [],
 			tableProps: [
 				{
 					label: '设备保养单号',
@@ -209,11 +215,25 @@ export default {
 				true,
 				true,
 			],
+			selectedPlan: []
 		};
 	},
-	computed: {},
+	computed: {
+		tableDataWithIndex() {
+			return this.tableData.map((item, index) => ({
+				...item,
+				_pageIndex: (this.page - 1) * this.limit + index + 1
+			}))
+		}
+	},
 	methods: {
-		handleSelectionChange() {},
+		handleSelectionChange(val) {
+			this.selectedPlan = val;
+		},
+		handleDelete(row) {},
+		handleDetail(row) {},
+		handleEdit(row) {},
+		handleConfirm(row) {},
 	},
 };
 </script>
@@ -226,4 +246,47 @@ export default {
 .primary-color {
 	color: #0b58ff;
 }
+
+.baseTable .show-col-btn {
+	margin-right: 5px;
+	line-height: inherit;
+	cursor: pointer;
+}
+.baseTable .el-icon-refresh {
+	cursor: pointer;
+}
+</style>
+<style>
+.waiting-list-table .el-table__body tr.current-row > td.el-table__cell {
+	background-color: #eaf1fc;
+}
+.waiting-list-table.el-table .el-table__cell {
+	padding: 0;
+	height: 35px;
+}
+.waiting-list-table .addButton {
+	width: 100%;
+	height: 35px;
+	border-top: none;
+	color: #0b58ff;
+	border-color: #ebeef5;
+	border-radius: 0;
+}
+.waiting-list-table .addButton:hover {
+	color: #0b58ff;
+	border-color: #ebeef5;
+	background-color: #fff;
+}
+.waiting-list-table .addButton:focus {
+	border-color: #ebeef5;
+	background-color: #fff;
+}
+
+.el-tooltip__popper.is-dark {
+	background: rgba(0, 0, 0, 0.6) !important;
+}
+.el-tooltip__popper .popper__arrow,
+.el-tooltip__popper .popper__arrow::after {
+	border-top-color: rgba(0, 0, 0, 0.4) !important;
+}
 </style>

From 874e36eb50fcf57b13213b4de783fdf39350b768 Mon Sep 17 00:00:00 2001
From: lb <liubin_9396@163.com>
Date: Mon, 19 Feb 2024 11:27:23 +0800
Subject: [PATCH 17/40] update waiting list

---
 src/mixins/lb/basicPageMixin.js               |  3 ++
 .../specialEquipment/maintain/WaitingList.vue | 29 ++++++++++++++++---
 .../maintain/WaitingListTable.vue             |  8 ++---
 3 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/src/mixins/lb/basicPageMixin.js b/src/mixins/lb/basicPageMixin.js
index cfe12de6..f05f48d1 100644
--- a/src/mixins/lb/basicPageMixin.js
+++ b/src/mixins/lb/basicPageMixin.js
@@ -135,6 +135,9 @@ export default {
 					this.$refs['search-bar'].resetForm();
 					this.resetQuery();
 					break;
+				default:
+					this.searchBarClicked(btn);
+					break;
 			}
 		},
 		handleEmitFun(val) {
diff --git a/src/views/specialEquipment/maintain/WaitingList.vue b/src/views/specialEquipment/maintain/WaitingList.vue
index 9835ff26..817e2cc4 100644
--- a/src/views/specialEquipment/maintain/WaitingList.vue
+++ b/src/views/specialEquipment/maintain/WaitingList.vue
@@ -30,7 +30,11 @@
 				:method-list="tableBtn"
 				@clickBtn="handleTableBtnClick" />
 		</base-table> -->
-		<WaitingListTable :table-data="list" :page="queryParams.pageNo" :limit="queryParams.pageSize" />
+		<WaitingListTable
+			ref="waiting-list-table"
+			:table-data="list"
+			:page="queryParams.pageNo"
+			:limit="queryParams.pageSize" />
 
 		<!-- 分页组件 -->
 		<pagination
@@ -62,7 +66,6 @@
 			</el-row>
 		</base-dialog>
 
-
 		<!-- 编辑 -->
 		<!-- <RecordDetail
 			v-if="recordDetailVisible"
@@ -168,7 +171,7 @@ export default {
 						watch: {
 							selected(val) {
 								if (!this.outside) {
-									console.log("emit row-selected...")
+									console.log('emit row-selected...');
 									this.$emit('emitData', {
 										action: 'row-selected',
 										value: {
@@ -186,7 +189,7 @@ export default {
 									this.selected = !!((val._selection & 0b01) != 0);
 									this.$nextTick(() => {
 										this.outside = false;
-									})
+									});
 								},
 							},
 						},
@@ -473,6 +476,24 @@ export default {
 		// }
 	},
 	methods: {
+		searchBarClicked(btn) {
+			console.log('searchBarClicked', btn);
+			switch (btn.btnName) {
+				case 'batchConfirm':
+					if (this.$refs['waiting-list-table'].selectedPlan.length == 0) {
+						console.log(
+							'selectedPlan',
+							this.$refs['waiting-list-table'].selectedPlan
+						);
+						alert('no data...');
+					};
+					console.log(
+						'selectedPlan',
+						this.$refs['waiting-list-table'].selectedPlan
+					);
+					break;
+			}
+		},
 		handleSelectionChange(list) {
 			if (this.tobeConfirmedIdList.length) {
 				this.tobeConfirmedIdList = [];
diff --git a/src/views/specialEquipment/maintain/WaitingListTable.vue b/src/views/specialEquipment/maintain/WaitingListTable.vue
index cf56a36e..97c3b065 100644
--- a/src/views/specialEquipment/maintain/WaitingListTable.vue
+++ b/src/views/specialEquipment/maintain/WaitingListTable.vue
@@ -215,16 +215,16 @@ export default {
 				true,
 				true,
 			],
-			selectedPlan: []
+			selectedPlan: [],
 		};
 	},
 	computed: {
 		tableDataWithIndex() {
 			return this.tableData.map((item, index) => ({
 				...item,
-				_pageIndex: (this.page - 1) * this.limit + index + 1
-			}))
-		}
+				_pageIndex: (this.page - 1) * this.limit + index + 1,
+			}));
+		},
 	},
 	methods: {
 		handleSelectionChange(val) {

From 8e081342f0c1112b2a4fd42226c644d0e19e1131 Mon Sep 17 00:00:00 2001
From: lb <liubin_9396@163.com>
Date: Mon, 19 Feb 2024 15:29:55 +0800
Subject: [PATCH 18/40] init waitinglist unplanned edit drawer

---
 .../specialEquipment/maintain/WaitingList.vue | 462 +++++++-------
 .../maintain/WaitingListTable.vue             |  28 +-
 .../maintain/WaitingListUnplanned--edit.vue   | 571 ++++++++++++++++++
 3 files changed, 835 insertions(+), 226 deletions(-)
 create mode 100644 src/views/specialEquipment/maintain/WaitingListUnplanned--edit.vue

diff --git a/src/views/specialEquipment/maintain/WaitingList.vue b/src/views/specialEquipment/maintain/WaitingList.vue
index 817e2cc4..0ddc57c8 100644
--- a/src/views/specialEquipment/maintain/WaitingList.vue
+++ b/src/views/specialEquipment/maintain/WaitingList.vue
@@ -34,7 +34,11 @@
 			ref="waiting-list-table"
 			:table-data="list"
 			:page="queryParams.pageNo"
-			:limit="queryParams.pageSize" />
+			:limit="queryParams.pageSize"
+			@edit="handleEdit"
+			@detail="handleDetail"
+			@delete="handleDelete"
+			@confirm="handleConfirm" />
 
 		<!-- 分页组件 -->
 		<pagination
@@ -127,204 +131,204 @@ export default {
 				// 'specialType',
 			],
 			tobeConfirmedIdList: [],
-			tableBtn: [
-				// this.$auth.hasPermi('equipment:maintain-record:update')
-				// 	? {
-				// 			type: 'detail',
-				// 			btnName: '详情',
-				// 	  }
-				// 	: undefined,
-				{
-					type: 'confirm',
-					btnName: '确认',
-				},
-				{
-					type: 'edit',
-					btnName: '编辑',
-				},
-				{
-					type: 'delete',
-					btnName: '删除',
-				},
-			],
-			tableProps: [
-				// {
-				// 	prop: 'createTime',
-				// 	label: '添加时间',
-				// 	fixed: true,
-				// 	width: 150,
-				// 	filter: timeFilter,
-				// },
-				{
-					type: 'selection',
-					// prop: '_selection',
-					// label: '批量选择',
-					width: 48,
-					subcomponent: {
-						props: ['injectData'],
-						data() {
-							return {
-								outside: false,
-								selected: false,
-							};
-						},
-						watch: {
-							selected(val) {
-								if (!this.outside) {
-									console.log('emit row-selected...');
-									this.$emit('emitData', {
-										action: 'row-selected',
-										value: {
-											row: this.injectData,
-											selected: val,
-										},
-									});
-								}
-							},
-							injectData: {
-								deep: true,
-								immediate: true,
-								handler: function (val) {
-									this.outside = true;
-									this.selected = !!((val._selection & 0b01) != 0);
-									this.$nextTick(() => {
-										this.outside = false;
-									});
-								},
-							},
-						},
-						render(h) {
-							const enabled = 0b10 & this.injectData._selection;
-							// return this.injectData?._selection ? h('h1', null, 'hello') : h('h1', null, '1');
-							return (
-								<div>
-									<span>{this.selected}</span>
-									<el-checkbox disabled={!enabled} v-model={this.selected} />
-								</div>
-							);
-						},
-					},
-				},
-				{
-					prop: 'maintainOrderNumber',
-					label: '设备保养单号',
-					width: 110,
-					showOverflowtooltip: true,
-				},
-				{
-					prop: 'planName',
-					label: '保养计划名称',
-					width: 110,
-					showOverflowtooltip: true,
-				},
-				{
-					prop: 'departmentName',
-					label: '部门',
-					width: 110,
-					showOverflowtooltip: true,
-				},
-				{
-					prop: 'lineName',
-					label: '产线名',
-					width: 110,
-					showOverflowtooltip: true,
-				},
-				{
-					prop: 'planStartTime',
-					label: '计划开始时间',
-					filter: timeFilter,
-					minWidth: 150,
-					showOverflowtooltip: true,
-				},
-				{
-					prop: 'planEndTime',
-					label: '计划结束时间',
-					filter: timeFilter,
-					minWidth: 150,
-					showOverflowtooltip: true,
-				},
-				{
-					prop: 'startTime',
-					label: '实际开始时间',
-					filter: timeFilter,
-					minWidth: 150,
-					showOverflowtooltip: true,
-				},
-				{
-					prop: 'endTime',
-					label: '实际结束时间',
-					filter: timeFilter,
-					minWidth: 150,
-					showOverflowtooltip: true,
-				},
-				{
-					prop: 'confirmDueTime',
-					label: '确认截止时间',
-					filter: timeFilter,
-					minWidth: 150,
-					showOverflowtooltip: true,
-				},
-				{
-					prop: 'relatePlan',
-					label: '保养计划类型',
-					minWidth: 150,
-					showOverflowtooltip: true,
-					filter: (val) =>
-						val != null ? ['-', '计划型', '非计划型'][val] : '-',
-				},
-				{
-					prop: '_detail',
-					label: '详情',
-					name: '详情',
-					minWidth: 60,
-					subcomponent: btn,
-				},
-				// {
-				// 	prop: 'equipmentCategory',
-				// 	label: '设备大类',
-				// 	minWidth: 100,
-				// 	showOverflowtooltip: true,
-				// 	filter: (val) =>
-				// 		val != null ? ['-', '安全设备', '消防设备', '特种设备'][val] : '-',
-				// },
-				// {
-				// 	prop: 'equipmentName',
-				// 	label: '设备名称',
-				// 	minWidth: 100,
-				// 	showOverflowtooltip: true,
-				// },
-				// {
-				// 	prop: 'maintainWorker',
-				// 	label: '保养人员',
-				// 	minWidth: 100,
-				// 	showOverflowtooltip: true,
-				// },
-				// {
-				// 	prop: 'relatePlan',
-				// 	label: '是否计划保养',
-				// 	width: 120,
-				// 	filter: (v) => (v != null ? ['', '是', '否'][v] : ''),
-				// },
-				// {
-				// 	prop: 'planName',
-				// 	label: '保养计划名称',
-				// 	minWidth: 120,
-				// 	showOverflowtooltip: true,
-				// },
-				// {
-				// 	prop: 'maintainDuration',
-				// 	label: '计划保养用时(h)',
-				// 	minWidth: 130,
-				// 	showOverflowtooltip: true,
-				// },
-				// { prop: 'timeUsed', label: '实际保养用时(h)', minWidth: 130 },
-				// {
-				// 	prop: 'remark',
-				// 	label: '备注',
-				// 	minWidth: 100,
-				// 	showOverflowtooltip: true,
-				// },
-			],
+			// tableBtn: [
+			// 	// this.$auth.hasPermi('equipment:maintain-record:update')
+			// 	// 	? {
+			// 	// 			type: 'detail',
+			// 	// 			btnName: '详情',
+			// 	// 	  }
+			// 	// 	: undefined,
+			// 	{
+			// 		type: 'confirm',
+			// 		btnName: '确认',
+			// 	},
+			// 	{
+			// 		type: 'edit',
+			// 		btnName: '编辑',
+			// 	},
+			// 	{
+			// 		type: 'delete',
+			// 		btnName: '删除',
+			// 	},
+			// ],
+			// tableProps: [
+			// 	// {
+			// 	// 	prop: 'createTime',
+			// 	// 	label: '添加时间',
+			// 	// 	fixed: true,
+			// 	// 	width: 150,
+			// 	// 	filter: timeFilter,
+			// 	// },
+			// 	{
+			// 		type: 'selection',
+			// 		// prop: '_selection',
+			// 		// label: '批量选择',
+			// 		width: 48,
+			// 		subcomponent: {
+			// 			props: ['injectData'],
+			// 			data() {
+			// 				return {
+			// 					outside: false,
+			// 					selected: false,
+			// 				};
+			// 			},
+			// 			watch: {
+			// 				selected(val) {
+			// 					if (!this.outside) {
+			// 						console.log('emit row-selected...');
+			// 						this.$emit('emitData', {
+			// 							action: 'row-selected',
+			// 							value: {
+			// 								row: this.injectData,
+			// 								selected: val,
+			// 							},
+			// 						});
+			// 					}
+			// 				},
+			// 				injectData: {
+			// 					deep: true,
+			// 					immediate: true,
+			// 					handler: function (val) {
+			// 						this.outside = true;
+			// 						this.selected = !!((val._selection & 0b01) != 0);
+			// 						this.$nextTick(() => {
+			// 							this.outside = false;
+			// 						});
+			// 					},
+			// 				},
+			// 			},
+			// 			render(h) {
+			// 				const enabled = 0b10 & this.injectData._selection;
+			// 				// return this.injectData?._selection ? h('h1', null, 'hello') : h('h1', null, '1');
+			// 				return (
+			// 					<div>
+			// 						<span>{this.selected}</span>
+			// 						<el-checkbox disabled={!enabled} v-model={this.selected} />
+			// 					</div>
+			// 				);
+			// 			},
+			// 		},
+			// 	},
+			// 	{
+			// 		prop: 'maintainOrderNumber',
+			// 		label: '设备保养单号',
+			// 		width: 110,
+			// 		showOverflowtooltip: true,
+			// 	},
+			// 	{
+			// 		prop: 'planName',
+			// 		label: '保养计划名称',
+			// 		width: 110,
+			// 		showOverflowtooltip: true,
+			// 	},
+			// 	{
+			// 		prop: 'departmentName',
+			// 		label: '部门',
+			// 		width: 110,
+			// 		showOverflowtooltip: true,
+			// 	},
+			// 	{
+			// 		prop: 'lineName',
+			// 		label: '产线名',
+			// 		width: 110,
+			// 		showOverflowtooltip: true,
+			// 	},
+			// 	{
+			// 		prop: 'planStartTime',
+			// 		label: '计划开始时间',
+			// 		filter: timeFilter,
+			// 		minWidth: 150,
+			// 		showOverflowtooltip: true,
+			// 	},
+			// 	{
+			// 		prop: 'planEndTime',
+			// 		label: '计划结束时间',
+			// 		filter: timeFilter,
+			// 		minWidth: 150,
+			// 		showOverflowtooltip: true,
+			// 	},
+			// 	{
+			// 		prop: 'startTime',
+			// 		label: '实际开始时间',
+			// 		filter: timeFilter,
+			// 		minWidth: 150,
+			// 		showOverflowtooltip: true,
+			// 	},
+			// 	{
+			// 		prop: 'endTime',
+			// 		label: '实际结束时间',
+			// 		filter: timeFilter,
+			// 		minWidth: 150,
+			// 		showOverflowtooltip: true,
+			// 	},
+			// 	{
+			// 		prop: 'confirmDueTime',
+			// 		label: '确认截止时间',
+			// 		filter: timeFilter,
+			// 		minWidth: 150,
+			// 		showOverflowtooltip: true,
+			// 	},
+			// 	{
+			// 		prop: 'relatePlan',
+			// 		label: '保养计划类型',
+			// 		minWidth: 150,
+			// 		showOverflowtooltip: true,
+			// 		filter: (val) =>
+			// 			val != null ? ['-', '计划型', '非计划型'][val] : '-',
+			// 	},
+			// 	{
+			// 		prop: '_detail',
+			// 		label: '详情',
+			// 		name: '详情',
+			// 		minWidth: 60,
+			// 		subcomponent: btn,
+			// 	},
+			// 	// {
+			// 	// 	prop: 'equipmentCategory',
+			// 	// 	label: '设备大类',
+			// 	// 	minWidth: 100,
+			// 	// 	showOverflowtooltip: true,
+			// 	// 	filter: (val) =>
+			// 	// 		val != null ? ['-', '安全设备', '消防设备', '特种设备'][val] : '-',
+			// 	// },
+			// 	// {
+			// 	// 	prop: 'equipmentName',
+			// 	// 	label: '设备名称',
+			// 	// 	minWidth: 100,
+			// 	// 	showOverflowtooltip: true,
+			// 	// },
+			// 	// {
+			// 	// 	prop: 'maintainWorker',
+			// 	// 	label: '保养人员',
+			// 	// 	minWidth: 100,
+			// 	// 	showOverflowtooltip: true,
+			// 	// },
+			// 	// {
+			// 	// 	prop: 'relatePlan',
+			// 	// 	label: '是否计划保养',
+			// 	// 	width: 120,
+			// 	// 	filter: (v) => (v != null ? ['', '是', '否'][v] : ''),
+			// 	// },
+			// 	// {
+			// 	// 	prop: 'planName',
+			// 	// 	label: '保养计划名称',
+			// 	// 	minWidth: 120,
+			// 	// 	showOverflowtooltip: true,
+			// 	// },
+			// 	// {
+			// 	// 	prop: 'maintainDuration',
+			// 	// 	label: '计划保养用时(h)',
+			// 	// 	minWidth: 130,
+			// 	// 	showOverflowtooltip: true,
+			// 	// },
+			// 	// { prop: 'timeUsed', label: '实际保养用时(h)', minWidth: 130 },
+			// 	// {
+			// 	// 	prop: 'remark',
+			// 	// 	label: '备注',
+			// 	// 	minWidth: 100,
+			// 	// 	showOverflowtooltip: true,
+			// 	// },
+			// ],
 			searchBarFormConfig: [
 				// {
 				// 	type: 'select',
@@ -437,6 +441,8 @@ export default {
 			basePath: '/base/equipment-maintain-log',
 			mode: null,
 			allSpecialEquipments: [],
+			openPlannedDialog: false,
+			openUnplannedDialog: false,
 		};
 	},
 	watch: {
@@ -481,12 +487,8 @@ export default {
 			switch (btn.btnName) {
 				case 'batchConfirm':
 					if (this.$refs['waiting-list-table'].selectedPlan.length == 0) {
-						console.log(
-							'selectedPlan',
-							this.$refs['waiting-list-table'].selectedPlan
-						);
-						alert('no data...');
-					};
+						this.$message.warning('请选择待确认的设备保养记录');
+					}
 					console.log(
 						'selectedPlan',
 						this.$refs['waiting-list-table'].selectedPlan
@@ -617,7 +619,11 @@ export default {
 				lineId: null,
 				startTime: null,
 				endTime: null,
+				planStartTime: null,
+				planEndTime: null,
+				confirmed: null,
 				remark: null,
+				special: false,
 			};
 			this.resetForm('form');
 		},
@@ -664,15 +670,21 @@ export default {
 			this.title = '添加待确认保养记录';
 		},
 		/** 修改按钮操作 */
-		handleUpdate(row) {
+		async handleUpdate(row) {
 			this.reset();
-			const id = row.id;
-			this.info({ id }).then((response) => {
-				this.form = response.data;
-				this.open = true;
-				this.form.maintainWorker = this.form.maintainWorker.split(',');
-				this.title = '修改保养记录';
-			});
+			if (row.relatePlan == 1) {
+				// 计划型
+				const res = await this.info();
+				this.form = res.data;
+				this.form.maintainWorker = res.data.maintainWorker.split(',');
+				this.openPlannedDialog = true;
+			} else {
+				// 非计划型 2
+				const res = await this.info();
+				this.form = res.data;
+				this.form.maintainWorker = res.data.maintainWorker.split(',');
+				this.openUnplannedDialog = true;
+			}
 		},
 		/** 提交按钮 */
 		submitForm() {
@@ -722,13 +734,25 @@ export default {
 				});
 			});
 		},
+		/** 确认 */
+		handleConfirm(row) {
+			console.log('confirm', row);
+		},
+		/** 编辑 */
+		handleEdit(row) {
+			console.log('edit', row);
+		},
 		/** 删除按钮操作 */
 		handleDelete(row) {
+			console.log('delete', row);
+			return;
 			const id = row.id;
 			this.$modal
-				.confirm('是否确认删除设备名称为"' + row.equipmentName + '"的数据项?')
+				.confirm(
+					'是否确认删除设备保养单号为"' + row.maintainOrderNumber + '"的数据项?'
+				)
 				.then(function () {
-					return deleteEqMaintainLog(id);
+					// return deleteEqMaintainLog(id);
 				})
 				.then(() => {
 					this.getList();
@@ -736,13 +760,15 @@ export default {
 				})
 				.catch(() => {});
 		},
-		handleDetail({ id }) {
+		handleDetail(row) {
+			console.log('detail', row);
+			return;
 			this.reset();
 			this.mode = 'detail';
 			this.info({ id }).then((response) => {
 				this.form = response.data;
-				this.open = true;
-				this.title = '查看保养记录详情';
+				// this.open = true;
+				// this.title = '查看保养记录详情';
 			});
 		},
 		/** 导出按钮操作 */
diff --git a/src/views/specialEquipment/maintain/WaitingListTable.vue b/src/views/specialEquipment/maintain/WaitingListTable.vue
index 97c3b065..52262a61 100644
--- a/src/views/specialEquipment/maintain/WaitingListTable.vue
+++ b/src/views/specialEquipment/maintain/WaitingListTable.vue
@@ -16,13 +16,16 @@
 			color: '#606266',
 		}"
 		class="waiting-list-table">
-		<el-table-column type="selection" :width="50" />
+		<el-table-column
+			type="selection"
+			:width="50"
+			:selectable="checkSelectable" />
 		<el-table-column prop="_pageIndex" width="80" align="center">
 			<template slot="header">
 				<el-popover placement="bottom-start" width="300" trigger="click">
 					<div class="setting-box" style="max-height: 400px; overflow-y: auto">
 						<el-checkbox
-							v-for="(item, index) in tableProps"
+							v-for="(item, index) in tablePropsLabelList"
 							:key="'cb' + index"
 							v-model="selectedBox[index]"
 							:label="item.label" />
@@ -114,7 +117,8 @@
 					<el-button
 						type="text"
 						style="margin: 5px 0; padding: 0"
-						@click="handleConfirm(scope.row)">
+						:disabled="!checkSelectable(scope.row)"
+						@click="$emit('confirm', scope.row)">
 						确认
 					</el-button>
 				</el-tooltip>
@@ -124,7 +128,7 @@
 					<el-button
 						type="text"
 						style="margin: 5px 0; padding: 0"
-						@click="handelDetail(scope.row)">
+						@click="$emit('detail', scope.row)">
 						<i class="iconfont icon-detail primary-color" />
 					</el-button>
 				</el-tooltip>
@@ -134,7 +138,7 @@
 					<el-button
 						type="text"
 						style="margin: 5px 0; padding: 0"
-						@click="handleEdit(scope.row)">
+						@click="$emit('edit', scope.row)">
 						<i class="iconfont icon-edit primary-color" />
 					</el-button>
 				</el-tooltip>
@@ -144,7 +148,7 @@
 					<el-button
 						type="text"
 						style="margin: 5px 0; padding: 0"
-						@click="handleDelete(scope.row)">
+						@click="$emit('delete', scope.row)">
 						<i class="iconfont icon-delete delete-color" />
 					</el-button>
 				</el-tooltip>
@@ -161,13 +165,14 @@ export default {
 	components: {},
 	props: ['tableData', 'page', 'limit'],
 	filters: {
-		timeFilter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'),
+		timeFilter: (val) =>
+			val ? moment(val).format('yyyy-MM-DD HH:mm:ss') : '---',
 		relatePlanFilter: (val) =>
 			val != null ? ['-', '计划型', '非计划型'][val] : '-',
 	},
 	data() {
 		return {
-			tableProps: [
+			tablePropsLabelList: [
 				{
 					label: '设备保养单号',
 				},
@@ -227,6 +232,13 @@ export default {
 		},
 	},
 	methods: {
+		checkSelectable(row, index) {
+			return (
+				row.relatePlan == 2 ||
+				(row.relatePlan == 1 &&
+					(!row.confirmDueTime || +row.confirmDueTime >= new Date().getTime()))
+			);
+		},
 		handleSelectionChange(val) {
 			this.selectedPlan = val;
 		},
diff --git a/src/views/specialEquipment/maintain/WaitingListUnplanned--edit.vue b/src/views/specialEquipment/maintain/WaitingListUnplanned--edit.vue
new file mode 100644
index 00000000..3588e1b3
--- /dev/null
+++ b/src/views/specialEquipment/maintain/WaitingListUnplanned--edit.vue
@@ -0,0 +1,571 @@
+<!-- 
+    filename: WaitingListUnplanned--edit.vue
+    author: liubin
+    date: 2023-08-22 14:38:56
+    description: 
+-->
+
+<template>
+	<el-drawer
+		:visible="visible"
+		:show-close="false"
+		:wrapper-closable="false"
+		class="drawer"
+		custom-class="mes-drawer"
+		size="60%"
+		@closed="$emit('destroy')">
+		<SmallTitle slot="title">
+			{{
+				mode.includes('detail')
+					? '详情'
+					: mode.includes('edit')
+					? '编辑'
+					: '新增'
+			}}
+		</SmallTitle>
+
+		<div class="drawer-body flex">
+			<div class="drawer-body__content">
+				<div class="form-part" style="margin-bottom: 32px">
+					<el-skeleton v-if="!showForm" animated />
+					<el-form
+						class="equipment-info-form"
+						ref="form"
+						:model="form"
+						label-width="200px"
+						label-position="top"
+						v-loading="formLoading">
+						<el-row :gutter="20">
+							<el-col :span="12">
+								<el-form-item
+									label="设备名称"
+									prop="name"
+									:rules="[
+										{
+											required: true,
+											message: '设备名称不能为空',
+											trigger: 'blur',
+										},
+									]">
+									<el-input
+										v-model="form.name"
+										:disabled="disabled"
+										placeholder="请输入设备名称"></el-input>
+								</el-form-item>
+							</el-col>
+							<el-col :span="12">
+								<el-form-item label="设备编码" prop="code" :rules="[]">
+									<el-input
+										v-model="form.code"
+										:disabled="disabled"
+										placeholder="请输入设备编码"></el-input>
+								</el-form-item>
+							</el-col>
+						</el-row>
+						<el-row :gutter="20">
+							<el-col :span="12">
+								<el-form-item label="所在区域" prop="location">
+									<el-input
+										v-model="form.location"
+										:disabled="disabled"
+										placeholder="请输入所在区域"></el-input>
+								</el-form-item>
+							</el-col>
+							<el-col :span="12">
+								<el-form-item label="负责人" prop="responsiblePeopleId">
+									<el-select
+										v-model="form.responsiblePeopleId"
+										:disabled="disabled"
+										placeholder="请输入负责人">
+										<el-option
+											v-for="rp in rpList"
+											:key="rp.id"
+											:label="rp.name"
+											:value="rp.id"></el-option>
+									</el-select>
+								</el-form-item>
+							</el-col>
+						</el-row>
+						<el-row :gutter="20">
+							<el-col v-if="isFireEquipment" :span="12">
+								<el-form-item label="有效期至" prop="dueDate" :rules="[]">
+									<el-date-picker
+										v-model="form.dueDate"
+										:disabled="disabled"
+										type="datetime"
+										placeholder="请选择生产日期"
+										value-format="timestamp"></el-date-picker>
+								</el-form-item>
+							</el-col>
+						</el-row>
+						<el-row :gutter="20">
+							<!-- 上传资料  -->
+							<el-col>
+								<el-form-item label="上传图片" prop="assets" :rules="[]">
+									<AssetsUpload v-model="form.assets" :disabled="disabled" />
+								</el-form-item>
+							</el-col>
+						</el-row>
+					</el-form>
+				</div>
+
+				<SmallTitle>保养内容</SmallTitle>
+
+				<div style="margin-top: 12px; position: relative">
+					<div
+						v-if="!mode.includes('detail')"
+						style="position: absolute; top: -40px; right: 0">
+						<el-button @click="handleAddAttr" type="text">
+							<i class="el-icon-plus"></i>
+							添加属性
+						</el-button>
+					</div>
+					<base-table
+						v-loading="attrListLoading"
+						:table-props="section.props"
+						:page="attrQuery?.params.pageNo || 1"
+						:limit="attrQuery?.params.pageSize || 10"
+						:table-data="list"
+						@emitFun="handleEmitFun">
+						<method-btn
+							v-if="section.tableBtn"
+							slot="handleBtn"
+							label="操作"
+							:method-list="tableBtn"
+							@clickBtn="handleTableBtnClick" />
+					</base-table>
+
+					<!-- 分页组件 -->
+					<pagination
+						v-show="total > 0"
+						:total="total"
+						:page.sync="attrQuery.params.pageNo"
+						:limit.sync="attrQuery.params.pageSize"
+						@pagination="getAttrList" />
+				</div>
+			</div>
+
+			<div class="drawer-body__footer">
+				<el-button style="" @click="handleCancel">取消</el-button>
+				<el-button v-if="mode == 'detail'" type="primary" @click="toggleEdit">
+					编辑
+				</el-button>
+				<el-button v-else type="primary" @click="handleConfirm">保存</el-button>
+				<!-- sections的第二项必须是 属性列表  -->
+				<!-- <el-button
+						v-if="sections[1].allowAdd"
+						type="primary"
+						@click="handleAddAttr">
+						添加属性
+					</el-button> -->
+			</div>
+		</div>
+
+		<!-- 属性对话框 -->
+		<base-dialog
+			v-if="sections[1].allowAdd"
+			:dialogTitle="attrTitle"
+			:dialogVisible="attrFormVisible"
+			width="35%"
+			:append-to-body="true"
+			custom-class="baseDialog"
+			@close="closeAttrForm"
+			@cancel="closeAttrForm"
+			@confirm="submitAttrForm">
+			<DialogForm
+				v-if="attrFormVisible"
+				ref="attrForm"
+				:dataForm="attrForm"
+				:rows="attrRows" />
+		</base-dialog>
+	</el-drawer>
+</template>
+
+<script>
+import DialogForm from './DialogForm';
+import EquipmentInfoForm from './EquipmentInfoForm.vue';
+
+const SmallTitle = {
+	name: 'SmallTitle',
+	props: ['size'],
+	components: {},
+	data() {
+		return {};
+	},
+	methods: {},
+	render: function (h) {
+		return h(
+			'span',
+			{
+				class: 'small-title',
+				style: {
+					fontSize: '18px',
+					lineHeight:
+						this.size == 'lg' ? '24px' : this.size == 'sm' ? '18px' : '20px',
+					fontWeight: 500,
+					fontFamily: '微软雅黑, Microsoft YaHei, Arial, Helvetica, sans-serif',
+				},
+			},
+			this.$slots.default
+		);
+	},
+};
+
+export default {
+	components: { SmallTitle, DialogForm, EquipmentInfoForm },
+	props: ['sections', 'mode', 'dataId'], // dataId 作为一个通用的存放id的字段
+	data() {
+		return {
+			visible: false,
+			showForm: false,
+			btnLoading: false,
+			total: 0,
+			form: {},
+			list: [],
+			attrTitle: '',
+			attrForm: {
+				id: null,
+				equipmentId: null,
+				name: '',
+				value: '',
+			},
+			attrFormVisible: false,
+			attrRows: [
+				[
+					{
+						input: true,
+						label: '属性名称',
+						prop: 'name',
+						rules: [
+							{ required: true, message: '属性名称不能为空', trigger: 'blur' },
+						],
+					},
+				],
+				[
+					{
+						input: true,
+						label: '属性值',
+						prop: 'value',
+					},
+				],
+			],
+			attrQuery: {
+				params: {
+					pageNo: 1,
+					pageSize: 10,
+				},
+			}, // 属性列表的请求
+			infoQuery: null, // 基本信息的请求
+			attrFormSubmitting: false,
+			attrListLoading: false,
+			syncFileListFlag: null,
+		};
+	},
+	computed: {
+		formRows() {
+			return this.sections[0].rows.map((row) => {
+				return row.map((col) => {
+					if (col.key == 'eq-pics') {
+						// 重置图片的位置
+						return {
+							...col,
+							bind: {
+								...col.bind,
+							},
+							style: {
+								left: 0,
+								right: 'unset',
+							},
+						};
+					}
+					return {
+						...col,
+						bind: {
+							...col.bind,
+							// 详情 模式下，禁用各种输入
+							disabled: this.mode == 'detail',
+						},
+					};
+				});
+			});
+		},
+		tableBtn() {
+			return this.mode == 'detail' ? [] : this.sections[1].tableBtn;
+		},
+	},
+	mounted() {
+		for (const section of this.sections) {
+			// 请求具体信息
+			if ('url' in section) {
+				const query = {
+					url: section.url,
+					method: section.method || 'get',
+					params: section.queryParams || null,
+					data: section.data || null,
+				};
+				this.$axios(query).then(({ data }) => {
+					if (section.key == 'base') {
+						this.form = data;
+						this.showForm = true;
+						this.infoQuery = query;
+					} else if (section.key == 'attrs') {
+						this.attrQuery = query;
+						this.list = data.list;
+						this.total = data.total;
+					}
+				});
+			}
+		}
+	},
+	methods: {
+		handleTableBtnClick({ type, data }) {
+			switch (type) {
+				case 'edit':
+					this.handleEditAttr(data.id);
+					break;
+				case 'delete':
+					this.handleDeleteAttr(data.id);
+					break;
+			}
+		},
+		async handleConfirm() {
+			this.btnLoading = true;
+			this.syncFileListFlag = Math.random();
+
+			this.$nextTick(async () => {
+				const { code, data } = await this.$axios({
+					url: this.sections[0].urlUpdate,
+					method: 'put',
+					data: this.form,
+				});
+				if (code == 0) {
+					this.$modal.msgSuccess('更新成功');
+				}
+
+				this.btnLoading = false;
+				this.$emit('refreshDataList');
+				this.handleCancel();
+			});
+		},
+
+		handleEmitFun(val) {
+			console.log('handleEmitFun', val);
+		},
+
+		init() {
+			this.visible = true;
+		},
+
+		async getAttrList() {
+			this.attrListLoading = true;
+			const res = await this.$axios(this.attrQuery);
+			if (res.code == 0) {
+				this.list = res.data.list;
+				this.total = res.data.total;
+			}
+			this.attrListLoading = false;
+		},
+
+		// 保存表单
+		handleSave() {
+			this.$refs['form'][0].validate(async (valid) => {
+				if (valid) {
+					const isEdit = this.mode == 'edit';
+					await this.$axios({
+						url: this.sections[0][isEdit ? 'urlUpdate' : 'urlCreate'],
+						method: isEdit ? 'put' : 'post',
+						data: this.form,
+					});
+					this.$modal.msgSuccess(`${isEdit ? '更新' : '创建'}成功`);
+					this.visible = false;
+					this.$emit('refreshDataList');
+				}
+			});
+		},
+
+		handleCancel() {
+			this.visible = false;
+		},
+
+		// 开启编辑
+		toggleEdit() {
+			this.$emit('update-mode', 'edit');
+		},
+
+		// 新增属性
+		handleAddAttr() {
+			if (!this.dataId) return this.$message.error('请先创建设备信息');
+			this.attrForm = {
+				id: null,
+				equipmentId: this.dataId,
+				name: '',
+				value: '',
+			};
+			this.attrTitle = '添加设备属性';
+			this.attrFormVisible = true;
+		},
+
+		// 编辑属性
+		async handleEditAttr(attrId) {
+			const res = await this.$axios({
+				url: this.sections[1].urlDetail,
+				method: 'get',
+				params: { id: attrId },
+			});
+			if (res.code == 0) {
+				this.attrForm = res.data;
+				this.attrTitle = '编辑设备属性';
+				this.attrFormVisible = true;
+			}
+		},
+
+		// 删除属性
+		handleDeleteAttr(attrId) {
+			this.$confirm('确定删除该属性?', '提示', {
+				confirmButtonText: '确定',
+				cancelButtonText: '取消',
+				type: 'warning',
+			})
+				.then(async () => {
+					const res = await this.$axios({
+						url: this.sections[1].urlDelete,
+						method: 'delete',
+						params: { id: attrId },
+					});
+					if (res.code == 0) {
+						this.$message({
+							message: '删除成功',
+							type: 'success',
+							duration: 1500,
+							onClose: () => {
+								this.getAttrList();
+							},
+						});
+					}
+				})
+				.catch(() => {});
+		},
+
+		// 提交属性表
+		submitAttrForm() {
+			this.$refs['attrForm'].validate(async (valid) => {
+				if (!valid) {
+					return;
+				}
+
+				try {
+					const isEdit = this.attrForm.id != null;
+					this.attrFormSubmitting = true;
+					const res = await this.$axios({
+						url: isEdit
+							? this.sections[1].urlUpdate
+							: this.sections[1].urlCreate,
+						method: isEdit ? 'put' : 'post',
+						data: this.attrForm,
+					});
+
+					if (res.code == 0) {
+						this.closeAttrForm();
+						this.$message({
+							message: `${isEdit ? '更新' : '创建'}成功`,
+							type: 'success',
+							duration: 1500,
+							onClose: () => {
+								this.getAttrList();
+							},
+						});
+					}
+					this.attrFormSubmitting = false;
+				} catch (err) {
+					this.$message({
+						message: err,
+						type: 'error',
+						duration: 1500,
+					});
+					this.attrFormSubmitting = false;
+				}
+			});
+		},
+
+		closeAttrForm() {
+			this.attrFormVisible = false;
+		},
+
+		handleClick(raw) {
+			if (raw.type === 'delete') {
+				this.$confirm(
+					`确定对${
+						raw.data.name
+							? '[名称=' + raw.data.name + ']'
+							: '[序号=' + raw.data._pageIndex + ']'
+					}进行删除操作?`,
+					'提示',
+					{
+						confirmButtonText: '确定',
+						cancelButtonText: '取消',
+						type: 'warning',
+					}
+				)
+					.then(() => {
+						deleteProductAttr(raw.data.id).then(({ data }) => {
+							this.$message({
+								message: '操作成功',
+								type: 'success',
+								duration: 1500,
+								onClose: () => {
+									this.getList();
+								},
+							});
+						});
+					})
+					.catch(() => {});
+			} else {
+				this.addNew(raw.data.id);
+			}
+		},
+	},
+};
+</script>
+
+<style scoped>
+.drawer >>> .el-drawer {
+	border-radius: 8px 0 0 8px;
+}
+
+.drawer >>> .el-drawer__header {
+	margin: 0;
+	padding: 32px 32px 24px;
+	border-bottom: 1px solid #dcdfe6;
+	margin-bottom: 0px;
+}
+
+.small-title::before {
+	content: '';
+	display: inline-block;
+	vertical-align: top;
+	width: 4px;
+	height: 22px;
+	border-radius: 1px;
+	margin-right: 8px;
+	background-color: #0b58ff;
+}
+
+.drawer-body {
+	display: flex;
+	flex-direction: column;
+	height: 100%;
+}
+
+.drawer-body__content {
+	flex: 1;
+	/* background: #eee; */
+	padding: 20px 30px;
+	overflow-y: auto;
+}
+
+.drawer-body__footer {
+	display: flex;
+	justify-content: flex-end;
+	padding: 18px;
+}
+</style>

From 564a4a42d2034a06b71dfb0d5db61944fc2db7a1 Mon Sep 17 00:00:00 2001
From: lb <liubin_9396@163.com>
Date: Mon, 19 Feb 2024 16:37:50 +0800
Subject: [PATCH 19/40] update waitinglist unplanned--edit

---
 .../specialEquipment/maintain/WaitingList.vue |  50 +-
 .../maintain/WaitingListUnplanned--edit.vue   | 436 ++++++++++++------
 2 files changed, 312 insertions(+), 174 deletions(-)

diff --git a/src/views/specialEquipment/maintain/WaitingList.vue b/src/views/specialEquipment/maintain/WaitingList.vue
index 0ddc57c8..2a836a57 100644
--- a/src/views/specialEquipment/maintain/WaitingList.vue
+++ b/src/views/specialEquipment/maintain/WaitingList.vue
@@ -71,6 +71,11 @@
 		</base-dialog>
 
 		<!-- 编辑 -->
+		<UnplannedEditDrawer
+			ref="unplanned"
+			v-if="openUnplannedDrawer"
+			@destroy="openUnplannedDrawer = false" />
+
 		<!-- <RecordDetail
 			v-if="recordDetailVisible"
 			ref="recordDetailDrawer"
@@ -84,6 +89,7 @@
 import moment from 'moment';
 import basicPageMixin from '@/mixins/lb/basicPageMixin';
 import DialogFormUnplanned from './WaitingList--add--unplanned.vue';
+import UnplannedEditDrawer from './WaitingListUnplanned--edit.vue';
 import {
 	deleteEqMaintainLog,
 	exportMaintainLogExcel,
@@ -117,7 +123,7 @@ const btn = {
 
 export default {
 	name: 'SpecialEquipmentMaintainRecord',
-	components: { DialogFormUnplanned, WaitingListTable, WaitingListTable },
+	components: { DialogFormUnplanned, WaitingListTable, UnplannedEditDrawer },
 	mixins: [basicPageMixin],
 	data() {
 		return {
@@ -441,8 +447,8 @@ export default {
 			basePath: '/base/equipment-maintain-log',
 			mode: null,
 			allSpecialEquipments: [],
-			openPlannedDialog: false,
-			openUnplannedDialog: false,
+			openPlannedDrawer: false,
+			openUnplannedDrawer: false,
 		};
 	},
 	watch: {
@@ -669,23 +675,7 @@ export default {
 			this.open = true;
 			this.title = '添加待确认保养记录';
 		},
-		/** 修改按钮操作 */
-		async handleUpdate(row) {
-			this.reset();
-			if (row.relatePlan == 1) {
-				// 计划型
-				const res = await this.info();
-				this.form = res.data;
-				this.form.maintainWorker = res.data.maintainWorker.split(',');
-				this.openPlannedDialog = true;
-			} else {
-				// 非计划型 2
-				const res = await this.info();
-				this.form = res.data;
-				this.form.maintainWorker = res.data.maintainWorker.split(',');
-				this.openUnplannedDialog = true;
-			}
-		},
+
 		/** 提交按钮 */
 		submitForm() {
 			this.$refs['form'].validate((valid) => {
@@ -739,8 +729,24 @@ export default {
 			console.log('confirm', row);
 		},
 		/** 编辑 */
-		handleEdit(row) {
-			console.log('edit', row);
+		async handleEdit(row) {
+			this.reset();
+			if (row.relatePlan == 1) {
+				// 计划型
+				const res = await this.info({ id: row.id });
+				this.form = res.data;
+				this.form.maintainWorker = res.data.maintainWorker.split(',');
+				this.openPlannedDrawer = true;
+			} else {
+				// 非计划型 2
+				// const res = await this.info({ id: row.id });
+				// this.form = res.data;
+				// this.form.maintainWorker = res.data.maintainWorker.split(',');
+				this.openUnplannedDrawer = true;
+				this.$nextTick(() => {
+					this.$refs.unplanned.init(row);
+				});
+			}
 		},
 		/** 删除按钮操作 */
 		handleDelete(row) {
diff --git a/src/views/specialEquipment/maintain/WaitingListUnplanned--edit.vue b/src/views/specialEquipment/maintain/WaitingListUnplanned--edit.vue
index 3588e1b3..55ef8135 100644
--- a/src/views/specialEquipment/maintain/WaitingListUnplanned--edit.vue
+++ b/src/views/specialEquipment/maintain/WaitingListUnplanned--edit.vue
@@ -14,20 +14,12 @@
 		custom-class="mes-drawer"
 		size="60%"
 		@closed="$emit('destroy')">
-		<SmallTitle slot="title">
-			{{
-				mode.includes('detail')
-					? '详情'
-					: mode.includes('edit')
-					? '编辑'
-					: '新增'
-			}}
-		</SmallTitle>
+		<SmallTitle slot="title">编辑</SmallTitle>
 
 		<div class="drawer-body flex">
 			<div class="drawer-body__content">
 				<div class="form-part" style="margin-bottom: 32px">
-					<el-skeleton v-if="!showForm" animated />
+					<!-- <el-skeleton v-if="!showForm" animated /> -->
 					<el-form
 						class="equipment-info-form"
 						ref="form"
@@ -36,73 +28,156 @@
 						label-position="top"
 						v-loading="formLoading">
 						<el-row :gutter="20">
-							<el-col :span="12">
+							<el-col :span="8">
 								<el-form-item
-									label="设备名称"
-									prop="name"
+									label="保养计划单号"
+									prop="maintainOrderNumber"
 									:rules="[
 										{
 											required: true,
-											message: '设备名称不能为空',
+											message: '请输入保养计划单号',
 											trigger: 'blur',
 										},
 									]">
 									<el-input
-										v-model="form.name"
-										:disabled="disabled"
-										placeholder="请输入设备名称"></el-input>
+										v-model="form.maintainOrderNumber"
+										:placeholder="`请输入保养计划单号`" />
 								</el-form-item>
 							</el-col>
-							<el-col :span="12">
-								<el-form-item label="设备编码" prop="code" :rules="[]">
-									<el-input
-										v-model="form.code"
-										:disabled="disabled"
-										placeholder="请输入设备编码"></el-input>
+
+							<el-col :span="8">
+								<el-form-item label="保养计划名称" prop="name">
+									<el-input value="---" disabled />
 								</el-form-item>
 							</el-col>
-						</el-row>
-						<el-row :gutter="20">
-							<el-col :span="12">
-								<el-form-item label="所在区域" prop="location">
-									<el-input
-										v-model="form.location"
-										:disabled="disabled"
-										placeholder="请输入所在区域"></el-input>
-								</el-form-item>
-							</el-col>
-							<el-col :span="12">
-								<el-form-item label="负责人" prop="responsiblePeopleId">
+
+							<el-col :span="8">
+								<el-form-item
+									label="部门"
+									prop="departmentId"
+									:rules="[
+										{ required: true, message: '请选择部门', trigger: 'blur' },
+									]">
 									<el-select
-										v-model="form.responsiblePeopleId"
-										:disabled="disabled"
-										placeholder="请输入负责人">
+										v-model="form.departmentId"
+										:placeholder="`请选择部门`"
+										clearable
+										filterable>
 										<el-option
-											v-for="rp in rpList"
-											:key="rp.id"
-											:label="rp.name"
-											:value="rp.id"></el-option>
+											v-for="opt in departmentOptions"
+											:key="opt.value"
+											:label="opt.label"
+											:value="opt.value" />
 									</el-select>
 								</el-form-item>
 							</el-col>
-						</el-row>
-						<el-row :gutter="20">
-							<el-col v-if="isFireEquipment" :span="12">
-								<el-form-item label="有效期至" prop="dueDate" :rules="[]">
+
+							<el-col :span="8">
+								<el-form-item
+									label="产线"
+									prop="lineId"
+									:rules="[
+										{ required: true, message: '请选择产线', trigger: 'blur' },
+									]">
+									<el-select
+										v-model="form.lineId"
+										:placeholder="`请选择产线`"
+										clearable
+										filterable>
+										<el-option
+											v-for="opt in lineOptions"
+											:key="opt.value"
+											:label="opt.label"
+											:value="opt.value" />
+									</el-select>
+								</el-form-item>
+							</el-col>
+
+							<el-col :span="8">
+								<el-form-item label="计划保养人员" prop="maintainer">
+									<el-input value="---" disabled />
+								</el-form-item>
+							</el-col>
+
+							<el-col :span="8">
+								<el-form-item label="计划开始时间" prop="planStartTime">
+									<el-input value="---" disabled />
+								</el-form-item>
+							</el-col>
+
+							<el-col :span="8">
+								<el-form-item label="计划结束时间" prop="planEndTime">
+									<el-input value="---" disabled />
+								</el-form-item>
+							</el-col>
+
+							<el-col :span="8">
+								<el-form-item
+									label="实际开始时间"
+									prop="startTime"
+									:rules="[
+										{
+											required: true,
+											message: '请选择实际开始时间',
+											trigger: 'blur',
+										},
+									]">
 									<el-date-picker
-										v-model="form.dueDate"
-										:disabled="disabled"
+										v-model="form.startTime"
 										type="datetime"
-										placeholder="请选择生产日期"
+										placeholder="请选择实际开始时间"
 										value-format="timestamp"></el-date-picker>
 								</el-form-item>
 							</el-col>
-						</el-row>
-						<el-row :gutter="20">
-							<!-- 上传资料  -->
-							<el-col>
-								<el-form-item label="上传图片" prop="assets" :rules="[]">
-									<AssetsUpload v-model="form.assets" :disabled="disabled" />
+
+							<el-col :span="8">
+								<el-form-item
+									label="实际结束时间"
+									prop="endTime"
+									:rules="[
+										{
+											required: true,
+											message: '请选择实际结束时间',
+											trigger: 'blur',
+										},
+									]">
+									<el-date-picker
+										v-model="form.endTime"
+										type="datetime"
+										placeholder="请选择实际结束时间"
+										value-format="timestamp"></el-date-picker>
+								</el-form-item>
+							</el-col>
+
+							<el-col :span="8">
+								<el-form-item
+									label="实际保养人员"
+									prop="maintainWorker"
+									:rules="[
+										{
+											required: true,
+											message: '请选择实际保养人员',
+											trigger: 'blur',
+										},
+									]">
+									<el-select
+										v-model="form.maintainWorker"
+										:placeholder="`请选择实际保养人员`"
+										multiple
+										clearable
+										filterable>
+										<el-option
+											v-for="opt in maintainerOptions"
+											:key="opt.value"
+											:label="opt.label"
+											:value="opt.value" />
+									</el-select>
+								</el-form-item>
+							</el-col>
+
+							<el-col :span="24">
+								<el-form-item label="备注" prop="remark">
+									<el-input v-model="form.remark" :placeholder="`请输入备注`" />
 								</el-form-item>
 							</el-col>
 						</el-row>
@@ -112,9 +187,12 @@
 				<SmallTitle>保养内容</SmallTitle>
 
 				<div style="margin-top: 12px; position: relative">
-					<div
-						v-if="!mode.includes('detail')"
-						style="position: absolute; top: -40px; right: 0">
+					<SearchBar
+						:formConfigs="searchBarFormConfig"
+						ref="attr-search-bar"
+						@headBtnClick="handleSearchBarBtnClick" />
+
+					<div style="position: absolute; top: -40px; right: 0">
 						<el-button @click="handleAddAttr" type="text">
 							<i class="el-icon-plus"></i>
 							添加属性
@@ -122,13 +200,12 @@
 					</div>
 					<base-table
 						v-loading="attrListLoading"
-						:table-props="section.props"
+						:table-props="attrTableProps"
 						:page="attrQuery?.params.pageNo || 1"
 						:limit="attrQuery?.params.pageSize || 10"
-						:table-data="list"
+						:table-data="attrList"
 						@emitFun="handleEmitFun">
 						<method-btn
-							v-if="section.tableBtn"
 							slot="handleBtn"
 							label="操作"
 							:method-list="tableBtn"
@@ -137,8 +214,8 @@
 
 					<!-- 分页组件 -->
 					<pagination
-						v-show="total > 0"
-						:total="total"
+						v-show="attrTotal > 0"
+						:total="attrTotal"
 						:page.sync="attrQuery.params.pageNo"
 						:limit.sync="attrQuery.params.pageSize"
 						@pagination="getAttrList" />
@@ -147,10 +224,7 @@
 
 			<div class="drawer-body__footer">
 				<el-button style="" @click="handleCancel">取消</el-button>
-				<el-button v-if="mode == 'detail'" type="primary" @click="toggleEdit">
-					编辑
-				</el-button>
-				<el-button v-else type="primary" @click="handleConfirm">保存</el-button>
+				<el-button type="primary" @click="handleConfirm">保存</el-button>
 				<!-- sections的第二项必须是 属性列表  -->
 				<!-- <el-button
 						v-if="sections[1].allowAdd"
@@ -163,7 +237,6 @@
 
 		<!-- 属性对话框 -->
 		<base-dialog
-			v-if="sections[1].allowAdd"
 			:dialogTitle="attrTitle"
 			:dialogVisible="attrFormVisible"
 			width="35%"
@@ -172,19 +245,16 @@
 			@close="closeAttrForm"
 			@cancel="closeAttrForm"
 			@confirm="submitAttrForm">
-			<DialogForm
+			<!-- <DialogForm
 				v-if="attrFormVisible"
 				ref="attrForm"
 				:dataForm="attrForm"
-				:rows="attrRows" />
+				:rows="attrRows" /> -->
 		</base-dialog>
 	</el-drawer>
 </template>
 
 <script>
-import DialogForm from './DialogForm';
-import EquipmentInfoForm from './EquipmentInfoForm.vue';
-
 const SmallTitle = {
 	name: 'SmallTitle',
 	props: ['size'],
@@ -212,16 +282,32 @@ const SmallTitle = {
 };
 
 export default {
-	components: { SmallTitle, DialogForm, EquipmentInfoForm },
-	props: ['sections', 'mode', 'dataId'], // dataId 作为一个通用的存放id的字段
+	components: { SmallTitle },
+	props: ['dataId'], // dataId 作为一个通用的存放id的字段
 	data() {
 		return {
 			visible: false,
-			showForm: false,
 			btnLoading: false,
-			total: 0,
 			form: {},
-			list: [],
+			lineList: [],
+			maintainerList: [],
+			departmentList: [],
+			attrTableProps: [
+				{
+					prop: 'equipmentName',
+					label: '设备名称',
+				},
+				{
+					prop: 'program',
+					label: '保养项目',
+				},
+				{
+					prop: 'maintenanceDes',
+					label: '保养描述',
+				},
+			],
+			attrList: [],
+			attrTotal: 0,
 			attrTitle: '',
 			attrForm: {
 				id: null,
@@ -253,71 +339,68 @@ export default {
 				params: {
 					pageNo: 1,
 					pageSize: 10,
+					equipmentName: null,
 				},
 			}, // 属性列表的请求
-			infoQuery: null, // 基本信息的请求
+			searchBarFormConfig: [
+				{
+					type: 'input',
+					label: '设备',
+					placeholder: '请输入设备名称',
+					param: 'equipmentName',
+				},
+				{
+					type: 'button',
+					btnName: '查询',
+					name: 'search',
+					color: 'primary',
+				},
+			],
 			attrFormSubmitting: false,
 			attrListLoading: false,
-			syncFileListFlag: null,
+			// syncFileListFlag: null,
+			tableBtn: [],
+			row: null,
 		};
 	},
 	computed: {
-		formRows() {
-			return this.sections[0].rows.map((row) => {
-				return row.map((col) => {
-					if (col.key == 'eq-pics') {
-						// 重置图片的位置
-						return {
-							...col,
-							bind: {
-								...col.bind,
-							},
-							style: {
-								left: 0,
-								right: 'unset',
-							},
-						};
-					}
-					return {
-						...col,
-						bind: {
-							...col.bind,
-							// 详情 模式下，禁用各种输入
-							disabled: this.mode == 'detail',
-						},
-					};
-				});
-			});
+		departmentOptions() {
+			return (this.departmentList || []).map((item) => ({
+				id: item.id,
+				label: item.name,
+				value: item.id,
+			}));
 		},
-		tableBtn() {
-			return this.mode == 'detail' ? [] : this.sections[1].tableBtn;
+		lineOptions() {
+			return (this.lineList || []).map((item) => ({
+				id: item.id,
+				label: item.name,
+				value: item.id,
+			}));
+		},
+		maintainerOptions() {
+			return (this.maintainerList || []).map((item) => ({
+				id: item.id,
+				label: item.name,
+				value: item.name,
+			}));
 		},
 	},
 	mounted() {
-		for (const section of this.sections) {
-			// 请求具体信息
-			if ('url' in section) {
-				const query = {
-					url: section.url,
-					method: section.method || 'get',
-					params: section.queryParams || null,
-					data: section.data || null,
-				};
-				this.$axios(query).then(({ data }) => {
-					if (section.key == 'base') {
-						this.form = data;
-						this.showForm = true;
-						this.infoQuery = query;
-					} else if (section.key == 'attrs') {
-						this.attrQuery = query;
-						this.list = data.list;
-						this.total = data.total;
-					}
-				});
-			}
-		}
+		this.getList('maintainer');
+		this.getList('department');
+		this.getList('line');
 	},
 	methods: {
+		handleSearchBarBtnClick(btn) {
+			console.log('btn', btn);
+			switch (btn.btnName) {
+				case 'search':
+					this.attrQuery.params.equipmentName = btn['key'];
+					this.handleQuery();
+					break;
+			}
+		},
 		handleTableBtnClick({ type, data }) {
 			switch (type) {
 				case 'edit':
@@ -330,11 +413,11 @@ export default {
 		},
 		async handleConfirm() {
 			this.btnLoading = true;
-			this.syncFileListFlag = Math.random();
+			// this.syncFileListFlag = Math.random();
 
 			this.$nextTick(async () => {
 				const { code, data } = await this.$axios({
-					url: this.sections[0].urlUpdate,
+					url: '/update', // this.sections[0].urlUpdate,
 					method: 'put',
 					data: this.form,
 				});
@@ -352,28 +435,76 @@ export default {
 			console.log('handleEmitFun', val);
 		},
 
-		init() {
+		init(row) {
 			this.visible = true;
+			this.row = row;
+			this.getInfo(row);
+			this.getAttrList(row);
 		},
 
-		async getAttrList() {
-			this.attrListLoading = true;
-			const res = await this.$axios(this.attrQuery);
+		async getInfo(row) {
+			this.formLoading = true;
+			const res = await this.$axios(
+				'/base/equipment-maintain-log/get?id=' + row.id
+			);
 			if (res.code == 0) {
-				this.list = res.data.list;
-				this.total = res.data.total;
+				this.form = res.data;
+				this.form.maintainWorker = res.data.maintainWorker.split(',');
+				this.formLoading = false;
+			}
+			this.formLoading = false;
+		},
+
+		async getAttrList(row, condition = {}) {
+			if (!row) row = this.row;
+			this.attrListLoading = true;
+			const res = await this.$axios({
+				url: '/base/equipment-maintain-log-det/page',
+				method: 'get',
+				params: {
+					...this.attrQuery.params,
+					logId: row.id,
+					...condition,
+				},
+			});
+			if (res.code == 0) {
+				this.attrList = res.data.list;
+				this.attrTotal = res.data.total;
 			}
 			this.attrListLoading = false;
 		},
 
+		async getList(source = 'department') {
+			const urls = [
+				'/base/core-production-line/listAll',
+				'/base/core-department/listAll',
+				'/base/core-worker/listAll',
+			];
+			let res;
+			switch (source) {
+				case 'department':
+					res = await this.$axios(urls[1]);
+					this.departmentList = res.data || [];
+					break;
+				case 'maintainer':
+					res = await this.$axios(urls[2]);
+					this.maintainerList = res.data || [];
+					break;
+				case 'line':
+					res = await this.$axios(urls[0]);
+					this.lineList = res.data || [];
+					break;
+			}
+			this.formLoading = false;
+		},
+
 		// 保存表单
 		handleSave() {
-			this.$refs['form'][0].validate(async (valid) => {
+			this.$refs.form.validate(async (valid) => {
 				if (valid) {
-					const isEdit = this.mode == 'edit';
 					await this.$axios({
-						url: this.sections[0][isEdit ? 'urlUpdate' : 'urlCreate'],
-						method: isEdit ? 'put' : 'post',
+						url: '/urlupdate', //  this.sections[0][isEdit ? 'urlUpdate' : 'urlCreate'],
+						method: 'post', // isEdit ? 'put' : 'post',
 						data: this.form,
 					});
 					this.$modal.msgSuccess(`${isEdit ? '更新' : '创建'}成功`);
@@ -387,11 +518,6 @@ export default {
 			this.visible = false;
 		},
 
-		// 开启编辑
-		toggleEdit() {
-			this.$emit('update-mode', 'edit');
-		},
-
 		// 新增属性
 		handleAddAttr() {
 			if (!this.dataId) return this.$message.error('请先创建设备信息');
@@ -408,7 +534,7 @@ export default {
 		// 编辑属性
 		async handleEditAttr(attrId) {
 			const res = await this.$axios({
-				url: this.sections[1].urlDetail,
+				url: 'urlpudate', // this.sections[1].urlDetail,
 				method: 'get',
 				params: { id: attrId },
 			});
@@ -428,7 +554,7 @@ export default {
 			})
 				.then(async () => {
 					const res = await this.$axios({
-						url: this.sections[1].urlDelete,
+						url: 'url delete', // this.sections[1].urlDelete,
 						method: 'delete',
 						params: { id: attrId },
 					});
@@ -457,9 +583,10 @@ export default {
 					const isEdit = this.attrForm.id != null;
 					this.attrFormSubmitting = true;
 					const res = await this.$axios({
-						url: isEdit
-							? this.sections[1].urlUpdate
-							: this.sections[1].urlCreate,
+						url: 'url edit',
+						// isEdit
+						// 	? this.sections[1].urlUpdate
+						// 	: this.sections[1].urlCreate,
 						method: isEdit ? 'put' : 'post',
 						data: this.attrForm,
 					});
@@ -532,6 +659,11 @@ export default {
 	border-radius: 8px 0 0 8px;
 }
 
+.drawer >>> .el-date-editor,
+.drawer >>> .el-select {
+	width: 100%;
+}
+
 .drawer >>> .el-drawer__header {
 	margin: 0;
 	padding: 32px 32px 24px;

From 8ca1ef562437d09b7435a366eebf722ac5c61a63 Mon Sep 17 00:00:00 2001
From: lb <liubin_9396@163.com>
Date: Tue, 20 Feb 2024 14:38:55 +0800
Subject: [PATCH 20/40] update maintain

---
 src/components/DialogForm/index.vue           |   3 +-
 .../maintain/Record--detail.vue               |  41 ++---
 .../specialEquipment/maintain/Record.vue      |  69 +--------
 .../specialEquipment/maintain/WaitingList.vue | 143 +++++++++---------
 .../maintain/WaitingListTable.vue             |  27 ++--
 .../maintain/WaitingListUnplanned--edit.vue   |  93 ++++++++----
 6 files changed, 171 insertions(+), 205 deletions(-)

diff --git a/src/components/DialogForm/index.vue b/src/components/DialogForm/index.vue
index ac7e32ac..3d19ec29 100644
--- a/src/components/DialogForm/index.vue
+++ b/src/components/DialogForm/index.vue
@@ -360,8 +360,9 @@ export default {
 							promiseList.push(async () => {
 								const response = await this.$axios(opt.url, {
 									method: opt.method ?? 'get',
+									// data: opt.method == 'post' ? opt.queryParams : null
 								});
-								console.log('[dialogForm:handleOptions:response]', response);
+								// console.log('[dialogForm:handleOptions:response]', response);
 								if (opt.select) {
 									// 处理下拉框选项
 									const list =
diff --git a/src/views/specialEquipment/maintain/Record--detail.vue b/src/views/specialEquipment/maintain/Record--detail.vue
index 8eaee473..9d85a4d1 100644
--- a/src/views/specialEquipment/maintain/Record--detail.vue
+++ b/src/views/specialEquipment/maintain/Record--detail.vue
@@ -27,7 +27,7 @@
 		<div class="drawer-body flex">
 			<div class="drawer-body__content">
 				<section>
-					<SmallTitle>保养信息</SmallTitle>
+					<!-- <SmallTitle>保养信息</SmallTitle> -->
 					<div class="form-part" style="margin-bottom: 32px">
 						<el-skeleton v-if="!showForm" animated />
 						<el-form
@@ -56,14 +56,6 @@
 				<section>
 					<SmallTitle>保养详情</SmallTitle>
 					<div style="margin-top: 12px; position: relative">
-						<!-- <div
-							v-if="!mode.includes('detail')"
-							style="position: absolute; top: -40px; right: 0">
-							<el-button @click="handleAddDetail" type="text">
-								<i class="el-icon-plus"></i>
-								添加详情
-							</el-button>
-						</div> -->
 						<base-table
 							v-loading="detailLoading"
 							:table-props="detailTableProps"
@@ -210,7 +202,8 @@ export default {
 			detailTableProps: [
 				{ prop: 'equipmentName', label: '设备名称' },
 				{ prop: 'program', label: '保养项目' },
-				{ prop: 'remark', label: '备注' },
+				{ prop: 'maintenanceDes', label: '保养描述' },
+				// { prop: 'remark', label: '备注' },
 			],
 			detailTableQuery: {
 				pageNo: 1,
@@ -308,16 +301,24 @@ export default {
 			this.detailLoading = true;
 			if (!this.form.id)
 				return this.$message.info('没有找到保养计划相关信息...');
-			const res = await this.$axios('/base/equipment-maintain-plan-det/page', {
-				params: {
-					pageNo: this.detailTableQuery.pageNo,
-					pageSize: this.detailTableQuery.pageSize,
-					planId: this.form.id,
-				},
-			});
-			this.detailList = res.data?.list || [];
-			this.detailTotal = res.data?.total || 0;
-			this.detailLoading = false;
+
+			try {
+				const res = await this.$axios(
+					'/base/equipment-maintain-plan-det/page',
+					{
+						params: {
+							pageNo: this.detailTableQuery.pageNo,
+							pageSize: this.detailTableQuery.pageSize,
+							planId: this.form.id,
+						},
+					}
+				);
+				this.detailList = res.data?.list || [];
+				this.detailTotal = res.data?.total || 0;
+				this.detailLoading = false;
+			} catch (err) {
+				this.detailLoading = false;
+			}
 		},
 		//
 		handleDetailTableAction() {},
diff --git a/src/views/specialEquipment/maintain/Record.vue b/src/views/specialEquipment/maintain/Record.vue
index 19dff47f..0129b1b1 100644
--- a/src/views/specialEquipment/maintain/Record.vue
+++ b/src/views/specialEquipment/maintain/Record.vue
@@ -157,6 +157,7 @@ export default {
 					label: '保养计划名称',
 					width: 110,
 					showOverflowtooltip: true,
+					filter: (val) => (val != null ? val : '---'),
 				},
 				{
 					prop: 'departmentName',
@@ -514,30 +515,7 @@ export default {
 	},
 	created() {
 		this.initSearchBar();
-		// if (this.$route.query) {
-		// 	this.queryParams.specialType =
-		// 		this.$route.query?.specialType ?? undefined;
-		// 	this.queryParams.equipmentId =
-		// 		this.$route.query?.equipmentId ?? undefined;
-		// 	this.queryParams.maintainPlanId =
-		// 		this.$route.query?.maintainPlanId ?? undefined;
-		// 	this.queryParams.relatePlan = this.$route.query?.relatePlan ?? undefined;
-		// 	this.queryParams.startTime = this.$route.query?.createTime ?? undefined;
-		// 	this.searchBarFormConfig[0].defaultSelect =
-		// 		this.$route.query.specialType ?? undefined;
-		// 	this.searchBarFormConfig[1].defaultSelect =
-		// 		this.$route.query.equipmentId ?? undefined;
-		// 	this.searchBarFormConfig[2].defaultSelect =
-		// 		this.$route.query.maintainPlanId ?? undefined;
-		// 	this.searchBarFormConfig[3].defaultSelect =
-		// 		this.$route.query?.createTime ?? undefined;
-		// 	this.searchBarFormConfig[4].defaultSelect =
-		// 		Number(this.$route.query.relatePlan) ?? undefined;
-		// }
 		this.getList();
-		// if (this.$route.query.addRecord) {
-		// 	this.handleAdd();
-		// }
 	},
 	methods: {
 		handleEmitFun({ action, value }) {
@@ -546,7 +524,7 @@ export default {
 					this.recordDetailVisible = true;
 					this.$nextTick(() => {
 						this.$refs.recordDetailDrawer.show({
-							id: value.id,
+							id: value.maintainPlanId,
 							planMaintainWorker: value.planMaintainWorker,
 							maintainWorker: value.maintainWorker,
 						});
@@ -566,21 +544,7 @@ export default {
 				);
 			}
 		},
-		// setSearchBarEquipmentList(eqList) {
-		// 	this.$set(
-		// 		this.searchBarFormConfig[1],
-		// 		'selectOptions',
-		// 		eqList.map((item) => ({
-		// 			name: item.name,
-		// 			id: item.id,
-		// 		}))
-		// 	);
-		// },
 		initSearchBar() {
-			// this.http('/base/core-equipment/listAll', 'get').then(({ data }) => {
-			// 	this.allSpecialEquipments = data.filter((item) => item.special);
-			// 	this.setSearchBarEquipmentList(data.filter((item) => item.special));
-			// });
 			this.http('/base/equipment-maintain-plan/page', 'get', {
 				pageNo: 1,
 				pageSize: 100,
@@ -588,7 +552,6 @@ export default {
 			}).then(({ data }) => {
 				this.$set(
 					this.searchBarFormConfig[0],
-					// this.searchBarFormConfig[2],
 					'selectOptions',
 					(data?.list || []).map((item) => ({
 						name: item.name,
@@ -602,20 +565,7 @@ export default {
 			this.loading = true;
 			// 执行查询
 			this.recv({ ...this.queryParams, special: true }).then((response) => {
-				this.list = [
-					{
-						id: 213,
-						maintainOrderNumber: 123,
-						planName: 'hhh',
-						departmentName: 'asdf',
-						lineName: 456,
-						planStartTime: '2024-01-01',
-						planEndTime: '2024-01-01',
-						startTime: '2024-01-01',
-						endTime: '2024-01-01',
-						relatePlan: 1,
-					},
-				]; // response.data.list;
+				this.list = response.data.list;
 				this.total = response.data.total;
 				this.loading = false;
 			});
@@ -670,19 +620,6 @@ export default {
 				this.form.relatePlan = tempRow.nextMaintainTime ? 1 : 2;
 				this.form.startTime = tempRow.nextMaintainTime;
 				this.form.maintainPlanId = tempRow.id;
-				// await (() => {
-				// 	return new Promise((acpt, rejt) => {
-				// 		this.form.relatePlan =
-				// 			this.$route.query.relatePlan ||
-				// 			(tempRow.nextMaintainTime ? 1 : 2);
-				// 		this.form.startTime = tempRow.nextMaintainTime;
-				// 		acpt();
-				// 	});
-				// })();
-				// this.$nextTick(() => {
-				// 	this.form.maintainPlanId = tempRow.id;
-				// 	this.form.equipmentId = tempRow.equipmentId;
-				// });
 			}
 			if (this.$route.query.isAdd) {
 				// 赋值
diff --git a/src/views/specialEquipment/maintain/WaitingList.vue b/src/views/specialEquipment/maintain/WaitingList.vue
index 2a836a57..d23031f5 100644
--- a/src/views/specialEquipment/maintain/WaitingList.vue
+++ b/src/views/specialEquipment/maintain/WaitingList.vue
@@ -488,17 +488,25 @@ export default {
 		// }
 	},
 	methods: {
-		searchBarClicked(btn) {
-			console.log('searchBarClicked', btn);
+		/** 批量确认 */
+		async searchBarClicked(btn) {
 			switch (btn.btnName) {
 				case 'batchConfirm':
 					if (this.$refs['waiting-list-table'].selectedPlan.length == 0) {
 						this.$message.warning('请选择待确认的设备保养记录');
+						return;
+					}
+					const res = await this.$axios({
+						url: '/base/equipment-maintain-log/confirm',
+						method: 'put',
+						data: this.$refs['waiting-list-table'].selectedPlan.map(
+							(item) => item.id
+						),
+					});
+					if (res.code == 0) {
+						this.$message.success('确认成功');
+						this.getList();
 					}
-					console.log(
-						'selectedPlan',
-						this.$refs['waiting-list-table'].selectedPlan
-					);
 					break;
 			}
 		},
@@ -599,11 +607,7 @@ export default {
 				relatePlan: 2,
 				confirmed: false,
 			}).then((response) => {
-				this.list = response.data.list.map((item) => ({
-					...item,
-					planName: '---',
-					_selection: 0b10,
-				}));
+				this.list = response.data.list;
 				this.total = response.data.total;
 				this.loading = false;
 			});
@@ -627,7 +631,7 @@ export default {
 				endTime: null,
 				planStartTime: null,
 				planEndTime: null,
-				confirmed: null,
+				confirmed: false,
 				remark: null,
 				special: false,
 			};
@@ -646,36 +650,18 @@ export default {
 		/** 新增按钮操作 */
 		handleAdd() {
 			this.reset();
-			// if (this.$route.query.addRecord) {
-			// 	// 赋值
-			// 	const tempRow = this.$route.query.row;
-			// 	this.form.equipmentId = tempRow.equipmentId;
-			// 	this.form.relatePlan = tempRow.nextMaintainTime ? 1 : 2;
-			// 	this.form.startTime = tempRow.nextMaintainTime;
-			// 	this.form.maintainPlanId = tempRow.id;
-			// 	// await (() => {
-			// 	// 	return new Promise((acpt, rejt) => {
-			// 	// 		this.form.relatePlan =
-			// 	// 			this.$route.query.relatePlan ||
-			// 	// 			(tempRow.nextMaintainTime ? 1 : 2);
-			// 	// 		this.form.startTime = tempRow.nextMaintainTime;
-			// 	// 		acpt();
-			// 	// 	});
-			// 	// })();
-			// 	// this.$nextTick(() => {
-			// 	// 	this.form.maintainPlanId = tempRow.id;
-			// 	// 	this.form.equipmentId = tempRow.equipmentId;
-			// 	// });
-			// }
-			// if (this.$route.query.isAdd) {
-			// 	// 赋值
-			// 	this.form.equipmentId = this.$route.query.equipmentId;
-			// 	this.form.maintainPlanId = this.$route.query.maintainPlanId;
-			// }
 			this.open = true;
 			this.title = '添加待确认保养记录';
 		},
 
+		getConfirmed() {
+			return this.$confirm('是否直接确认保养记录', '提示', {
+				confirmButtonText: '确定',
+				cancelButtonText: '取消',
+				type: 'warning',
+			});
+		},
+
 		/** 提交按钮 */
 		submitForm() {
 			this.$refs['form'].validate((valid) => {
@@ -696,37 +682,48 @@ export default {
 					});
 					return;
 				}
+
 				// 添加的提交
-				this.post({
-					...this.form,
-					maintainWorker: this.form.maintainWorker.join(','),
-					special: true,
-					relatePlan: 2,
-				}).then((response) => {
-					this.$modal.msgSuccess('新增成功');
-
-					// 跳转至 备品备件 保养
-					// const toSparePartsMaintain = () => {
-					// 	this.open = false;
-					// };
-
-					// this.$confirm('是否有备品备件更换?', '提示', {
-					// 	confirmButtonText: '有',
-					// 	cancelButtonText: '没有',
-					// })
-					// 	.then(toSparePartsMaintain)
-					// 	.catch(() => {
-					// 		this.open = false;
-					// 		this.getList();
-					// 	});
-					this.open = false;
-					this.getList();
-				});
+				this.getConfirmed()
+					.then((confirmed) => {
+						this.post({
+							...this.form,
+							maintainWorker: this.form.maintainWorker.join(','),
+							special: true,
+							relatePlan: 2,
+							confirmed: true,
+						}).then((response) => {
+							this.$modal.msgSuccess('新增成功');
+							this.open = false;
+							this.getList();
+						});
+					})
+					.catch((err) => {
+						this.post({
+							...this.form,
+							maintainWorker: this.form.maintainWorker.join(','),
+							special: true,
+							relatePlan: 2,
+							confirmed: false,
+						}).then((response) => {
+							this.$modal.msgSuccess('新增成功');
+							this.open = false;
+							this.getList();
+						});
+					});
 			});
 		},
 		/** 确认 */
-		handleConfirm(row) {
-			console.log('confirm', row);
+		async handleConfirm(row) {
+			const res = await this.$axios({
+				url: '/base/equipment-maintain-log/confirm',
+				method: 'put',
+				data: [row.id],
+			});
+			if (res.code == 0) {
+				this.$message.success('确认成功');
+				this.getList();
+			}
 		},
 		/** 编辑 */
 		async handleEdit(row) {
@@ -738,10 +735,6 @@ export default {
 				this.form.maintainWorker = res.data.maintainWorker.split(',');
 				this.openPlannedDrawer = true;
 			} else {
-				// 非计划型 2
-				// const res = await this.info({ id: row.id });
-				// this.form = res.data;
-				// this.form.maintainWorker = res.data.maintainWorker.split(',');
 				this.openUnplannedDrawer = true;
 				this.$nextTick(() => {
 					this.$refs.unplanned.init(row);
@@ -750,21 +743,21 @@ export default {
 		},
 		/** 删除按钮操作 */
 		handleDelete(row) {
-			console.log('delete', row);
-			return;
-			const id = row.id;
 			this.$modal
 				.confirm(
 					'是否确认删除设备保养单号为"' + row.maintainOrderNumber + '"的数据项?'
 				)
-				.then(function () {
-					// return deleteEqMaintainLog(id);
+				.then(() => {
+					return this.$axios({
+						url: '/base/equipment-maintain-log/delete?id=' + row.id,
+						method: 'delete',
+					});
 				})
 				.then(() => {
 					this.getList();
 					this.$modal.msgSuccess('删除成功');
 				})
-				.catch(() => {});
+				.catch(console.error);
 		},
 		handleDetail(row) {
 			console.log('detail', row);
diff --git a/src/views/specialEquipment/maintain/WaitingListTable.vue b/src/views/specialEquipment/maintain/WaitingListTable.vue
index 52262a61..edad3470 100644
--- a/src/views/specialEquipment/maintain/WaitingListTable.vue
+++ b/src/views/specialEquipment/maintain/WaitingListTable.vue
@@ -39,18 +39,21 @@
 			width="128"
 			label="设备保养单号"
 			prop="maintainOrderNumber"></el-table-column>
-		<el-table-column
-			v-if="selectedBox[1]"
-			label="保养计划名称"
-			prop="planName"></el-table-column>
-		<el-table-column
-			v-if="selectedBox[2]"
-			label="部门"
-			prop="departmentName"></el-table-column>
-		<el-table-column
-			v-if="selectedBox[3]"
-			label="产线名"
-			prop="lineName"></el-table-column>
+		<el-table-column v-if="selectedBox[1]" label="保养计划名称" prop="planName">
+			<template slot-scope="scope">
+				{{ scope.row.planName || '---' }}
+			</template>
+		</el-table-column>
+		<el-table-column v-if="selectedBox[2]" label="部门" prop="departmentName">
+			<template slot-scope="scope">
+				{{ scope.row.departmentName || '---' }}
+			</template>
+		</el-table-column>
+		<el-table-column v-if="selectedBox[3]" label="产线名" prop="lineName">
+			<template slot-scope="scope">
+				{{ scope.row.lineName || '---' }}
+			</template>
+		</el-table-column>
 		<el-table-column
 			v-if="selectedBox[4]"
 			width="150"
diff --git a/src/views/specialEquipment/maintain/WaitingListUnplanned--edit.vue b/src/views/specialEquipment/maintain/WaitingListUnplanned--edit.vue
index 55ef8135..926de9fa 100644
--- a/src/views/specialEquipment/maintain/WaitingListUnplanned--edit.vue
+++ b/src/views/specialEquipment/maintain/WaitingListUnplanned--edit.vue
@@ -191,7 +191,9 @@
 						:formConfigs="searchBarFormConfig"
 						ref="attr-search-bar"
 						@headBtnClick="handleSearchBarBtnClick" />
+				</div>
 
+				<div style="margin-top: 12px; position: relative">
 					<div style="position: absolute; top: -40px; right: 0">
 						<el-button @click="handleAddAttr" type="text">
 							<i class="el-icon-plus"></i>
@@ -245,16 +247,18 @@
 			@close="closeAttrForm"
 			@cancel="closeAttrForm"
 			@confirm="submitAttrForm">
-			<!-- <DialogForm
+			<DialogForm
 				v-if="attrFormVisible"
 				ref="attrForm"
-				:dataForm="attrForm"
-				:rows="attrRows" /> -->
+				v-model="attrForm"
+				:rows="attrRows" />
 		</base-dialog>
 	</el-drawer>
 </template>
 
 <script>
+import DialogForm from '../../../components/DialogForm/index.vue';
+
 const SmallTitle = {
 	name: 'SmallTitle',
 	props: ['size'],
@@ -282,13 +286,14 @@ const SmallTitle = {
 };
 
 export default {
-	components: { SmallTitle },
+	components: { SmallTitle, DialogForm },
 	props: ['dataId'], // dataId 作为一个通用的存放id的字段
 	data() {
 		return {
 			visible: false,
 			btnLoading: false,
 			form: {},
+			formLoading: false,
 			lineList: [],
 			maintainerList: [],
 			departmentList: [],
@@ -311,27 +316,49 @@ export default {
 			attrTitle: '',
 			attrForm: {
 				id: null,
-				equipmentId: null,
-				name: '',
-				value: '',
+				logId: null,
+				program: null,
+				maintenanceDes: null,
+				remark: null,
 			},
 			attrFormVisible: false,
 			attrRows: [
 				[
 					{
-						input: true,
-						label: '属性名称',
-						prop: 'name',
+						select: true,
+						label: '设备名称',
+						prop: 'equipmentId',
+						url: '/base/core-equipment/page?pageNo=1&pageSize=100&special=true',
+						// method: 'post',
+						// queryParams: {
+						// 	pageNo: 1,
+						// 	pageSize: 100,
+						// 	special: true,
+						// },
 						rules: [
-							{ required: true, message: '属性名称不能为空', trigger: 'blur' },
+							{ required: true, message: '设备不能为空', trigger: 'blur' },
 						],
 					},
 				],
 				[
 					{
 						input: true,
-						label: '属性值',
-						prop: 'value',
+						label: '保养项目',
+						prop: 'program',
+					},
+				],
+				[
+					{
+						input: true,
+						label: '保养描述',
+						prop: 'maintenanceDes',
+					},
+				],
+				[
+					{
+						input: true,
+						label: '备注',
+						prop: 'remark',
 					},
 				],
 			],
@@ -396,8 +423,8 @@ export default {
 			console.log('btn', btn);
 			switch (btn.btnName) {
 				case 'search':
-					this.attrQuery.params.equipmentName = btn['key'];
-					this.handleQuery();
+					this.attrQuery.params.equipmentName = btn.equipmentName;
+					this.getAttrList();
 					break;
 			}
 		},
@@ -413,18 +440,18 @@ export default {
 		},
 		async handleConfirm() {
 			this.btnLoading = true;
-			// this.syncFileListFlag = Math.random();
-
 			this.$nextTick(async () => {
 				const { code, data } = await this.$axios({
-					url: '/update', // this.sections[0].urlUpdate,
+					url: '/base/equipment-maintain-log/update',  
 					method: 'put',
-					data: this.form,
+					data: {
+						...this.form,
+						maintainWorker: this.form.maintainWorker.join(',')
+					},
 				});
 				if (code == 0) {
 					this.$modal.msgSuccess('更新成功');
 				}
-
 				this.btnLoading = false;
 				this.$emit('refreshDataList');
 				this.handleCancel();
@@ -518,15 +545,20 @@ export default {
 			this.visible = false;
 		},
 
-		// 新增属性
-		handleAddAttr() {
-			if (!this.dataId) return this.$message.error('请先创建设备信息');
+		resetAttrform() {
 			this.attrForm = {
 				id: null,
-				equipmentId: this.dataId,
-				name: '',
-				value: '',
+				logId: this.row.id,
+				maintenanceDes: '',
+				program: null,
+				remark: null,
 			};
+		},
+
+		// 新增属性
+		handleAddAttr() {
+			if (!this.row.id) return this.$message.error('请先选中保养记录');
+			this.resetAttrform();
 			this.attrTitle = '添加设备属性';
 			this.attrFormVisible = true;
 		},
@@ -534,7 +566,7 @@ export default {
 		// 编辑属性
 		async handleEditAttr(attrId) {
 			const res = await this.$axios({
-				url: 'urlpudate', // this.sections[1].urlDetail,
+				url: '/base/equipment-maintain-log-det/get',
 				method: 'get',
 				params: { id: attrId },
 			});
@@ -583,10 +615,9 @@ export default {
 					const isEdit = this.attrForm.id != null;
 					this.attrFormSubmitting = true;
 					const res = await this.$axios({
-						url: 'url edit',
-						// isEdit
-						// 	? this.sections[1].urlUpdate
-						// 	: this.sections[1].urlCreate,
+						url: isEdit
+							? '/base/equipment-maintain-log-det/update'
+							: '/base/equipment-maintain-log-det/create',
 						method: isEdit ? 'put' : 'post',
 						data: this.attrForm,
 					});

From d5551eabb8466754217d82da5e3fc918c580c649 Mon Sep 17 00:00:00 2001
From: lb <liubin_9396@163.com>
Date: Tue, 20 Feb 2024 15:14:31 +0800
Subject: [PATCH 21/40] =?UTF-8?q?update=20=E4=BF=9D=E5=85=BB=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../specialEquipment/maintain/Record--detail.vue      | 11 +++++++----
 src/views/specialEquipment/maintain/Record.vue        |  2 +-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/views/specialEquipment/maintain/Record--detail.vue b/src/views/specialEquipment/maintain/Record--detail.vue
index 9d85a4d1..aa90e75c 100644
--- a/src/views/specialEquipment/maintain/Record--detail.vue
+++ b/src/views/specialEquipment/maintain/Record--detail.vue
@@ -299,17 +299,20 @@ export default {
 		},
 		async refreshDetailList() {
 			this.detailLoading = true;
-			if (!this.form.id)
-				return this.$message.info('没有找到保养计划相关信息...');
+			if (!this.form.id) {
+				this.$message.info('没有找到保养计划相关信息...');
+				this.detailLoading = false;
+			}
 
 			try {
 				const res = await this.$axios(
-					'/base/equipment-maintain-plan-det/page',
+					'/base/equipment-maintain-log-det/page',
 					{
 						params: {
 							pageNo: this.detailTableQuery.pageNo,
 							pageSize: this.detailTableQuery.pageSize,
-							planId: this.form.id,
+							// planId: this.form.id,
+							logId: this.form.id,
 						},
 					}
 				);
diff --git a/src/views/specialEquipment/maintain/Record.vue b/src/views/specialEquipment/maintain/Record.vue
index 0129b1b1..87f59e7e 100644
--- a/src/views/specialEquipment/maintain/Record.vue
+++ b/src/views/specialEquipment/maintain/Record.vue
@@ -524,7 +524,7 @@ export default {
 					this.recordDetailVisible = true;
 					this.$nextTick(() => {
 						this.$refs.recordDetailDrawer.show({
-							id: value.maintainPlanId,
+							id: value.id,
 							planMaintainWorker: value.planMaintainWorker,
 							maintainWorker: value.maintainWorker,
 						});

From 9f8d60445643ff3ce75c47fdb854169f13e080e5 Mon Sep 17 00:00:00 2001
From: lb <liubin_9396@163.com>
Date: Tue, 20 Feb 2024 15:53:31 +0800
Subject: [PATCH 22/40] =?UTF-8?q?done=20=E4=BF=9D=E5=85=BB=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../specialEquipment/maintain/WaitingList.vue |  47 +-
 .../maintain/WaitingListPlanned--edit.vue     | 758 ++++++++++++++++++
 .../maintain/WaitingListTable.vue             |   2 +-
 3 files changed, 791 insertions(+), 16 deletions(-)
 create mode 100644 src/views/specialEquipment/maintain/WaitingListPlanned--edit.vue

diff --git a/src/views/specialEquipment/maintain/WaitingList.vue b/src/views/specialEquipment/maintain/WaitingList.vue
index d23031f5..e710cace 100644
--- a/src/views/specialEquipment/maintain/WaitingList.vue
+++ b/src/views/specialEquipment/maintain/WaitingList.vue
@@ -74,12 +74,18 @@
 		<UnplannedEditDrawer
 			ref="unplanned"
 			v-if="openUnplannedDrawer"
+			@refreshDataList="getList"
 			@destroy="openUnplannedDrawer = false" />
+		<PlannedEditDrawer
+			ref="planned"
+			v-if="openPlannedDrawer"
+			@refreshDataList="getList"
+			@destroy="openPlannedDrawer = false" />
 
-		<!-- <RecordDetail
+		<RecordDetail
 			v-if="recordDetailVisible"
 			ref="recordDetailDrawer"
-			@closed="recordDetailVisible = false" /> -->
+			@closed="recordDetailVisible = false" />
 
 		<!-- 详情  -->
 	</div>
@@ -90,11 +96,13 @@ import moment from 'moment';
 import basicPageMixin from '@/mixins/lb/basicPageMixin';
 import DialogFormUnplanned from './WaitingList--add--unplanned.vue';
 import UnplannedEditDrawer from './WaitingListUnplanned--edit.vue';
+import PlannedEditDrawer from './WaitingListPlanned--edit.vue';
 import {
 	deleteEqMaintainLog,
 	exportMaintainLogExcel,
 } from '@/api/equipment/base/maintain/record';
 import WaitingListTable from './WaitingListTable.vue';
+import RecordDetail from './Record--detail.vue';
 
 const timeFilter = (val) => moment(val).format('yyyy-MM-DD HH:mm:ss');
 
@@ -123,7 +131,13 @@ const btn = {
 
 export default {
 	name: 'SpecialEquipmentMaintainRecord',
-	components: { DialogFormUnplanned, WaitingListTable, UnplannedEditDrawer },
+	components: {
+		DialogFormUnplanned,
+		WaitingListTable,
+		RecordDetail,
+		UnplannedEditDrawer,
+		PlannedEditDrawer
+	},
 	mixins: [basicPageMixin],
 	data() {
 		return {
@@ -449,6 +463,7 @@ export default {
 			allSpecialEquipments: [],
 			openPlannedDrawer: false,
 			openUnplannedDrawer: false,
+			openPlannedDrawer: false,
 		};
 	},
 	watch: {
@@ -604,7 +619,7 @@ export default {
 			this.recv({
 				...this.queryParams,
 				special: true,
-				relatePlan: 2,
+				// relatePlan: 2,
 				confirmed: false,
 			}).then((response) => {
 				this.list = response.data.list;
@@ -730,10 +745,13 @@ export default {
 			this.reset();
 			if (row.relatePlan == 1) {
 				// 计划型
-				const res = await this.info({ id: row.id });
-				this.form = res.data;
-				this.form.maintainWorker = res.data.maintainWorker.split(',');
+				// const res = await this.info({ id: row.id });
+				// this.form = res.data;
+				// this.form.maintainWorker = res.data.maintainWorker.split(',');
 				this.openPlannedDrawer = true;
+				this.$nextTick(() => {
+					this.$refs.planned.init(row);
+				});
 			} else {
 				this.openUnplannedDrawer = true;
 				this.$nextTick(() => {
@@ -760,14 +778,13 @@ export default {
 				.catch(console.error);
 		},
 		handleDetail(row) {
-			console.log('detail', row);
-			return;
-			this.reset();
-			this.mode = 'detail';
-			this.info({ id }).then((response) => {
-				this.form = response.data;
-				// this.open = true;
-				// this.title = '查看保养记录详情';
+			this.recordDetailVisible = true;
+			this.$nextTick(() => {
+				this.$refs.recordDetailDrawer.show({
+					id: row.id,
+					planMaintainWorker: row.planMaintainWorker,
+					maintainWorker: row.maintainWorker,
+				});
 			});
 		},
 		/** 导出按钮操作 */
diff --git a/src/views/specialEquipment/maintain/WaitingListPlanned--edit.vue b/src/views/specialEquipment/maintain/WaitingListPlanned--edit.vue
new file mode 100644
index 00000000..a5a202fc
--- /dev/null
+++ b/src/views/specialEquipment/maintain/WaitingListPlanned--edit.vue
@@ -0,0 +1,758 @@
+<!-- 
+    filename: WaitingListUnplanned--edit.vue
+    author: liubin
+    date: 2023-08-22 14:38:56
+    description: 
+-->
+
+<template>
+	<el-drawer
+		:visible="visible"
+		:show-close="false"
+		:wrapper-closable="false"
+		class="drawer"
+		custom-class="mes-drawer"
+		size="60%"
+		@closed="$emit('destroy')">
+		<SmallTitle slot="title">编辑</SmallTitle>
+
+		<div class="drawer-body flex">
+			<div class="drawer-body__content">
+				<div class="form-part" style="margin-bottom: 32px">
+					<!-- <el-skeleton v-if="!showForm" animated /> -->
+					<el-form
+						class="equipment-info-form"
+						ref="form"
+						:model="form"
+						label-width="200px"
+						label-position="top"
+						v-loading="formLoading">
+						<el-row :gutter="20">
+							<el-col :span="8">
+								<el-form-item label="保养计划单号" prop="maintainOrderNumber">
+									<!-- :rules="[
+										{
+											required: true,
+											message: '请输入保养计划单号',
+											trigger: 'blur',
+										},
+									]" -->
+									<el-input
+										v-model="form.maintainOrderNumber"
+										disabled
+										:placeholder="`请输入保养计划单号`" />
+								</el-form-item>
+							</el-col>
+
+							<el-col :span="8">
+								<el-form-item label="保养计划名称" prop="planName">
+									<el-input
+										v-model="form.planName"
+										placeholder="请输入保养计划名称"
+										disabled />
+								</el-form-item>
+							</el-col>
+
+							<el-col :span="8">
+								<el-form-item label="部门" prop="departmentId">
+									<!-- :rules="[
+										{ required: true, message: '请选择部门', trigger: 'blur' },
+									]" -->
+									<el-select
+										v-model="form.departmentId"
+										:placeholder="`请选择部门`"
+										clearable
+										disabled
+										filterable>
+										<el-option
+											v-for="opt in departmentOptions"
+											:key="opt.value"
+											:label="opt.label"
+											:value="opt.value" />
+									</el-select>
+								</el-form-item>
+							</el-col>
+
+							<el-col :span="8">
+								<el-form-item label="产线" prop="lineId">
+									<!-- :rules="[
+										{ required: true, message: '请选择产线', trigger: 'blur' },
+									]" -->
+									<el-select
+										v-model="form.lineId"
+										:placeholder="`请选择产线`"
+										disabled
+										clearable
+										filterable>
+										<el-option
+											v-for="opt in lineOptions"
+											:key="opt.value"
+											:label="opt.label"
+											:value="opt.value" />
+									</el-select>
+								</el-form-item>
+							</el-col>
+
+							<el-col :span="8">
+								<el-form-item label="计划保养人员" prop="maintainer">
+									<el-select
+										v-model="form.planMaintainWorker"
+										placeholder="请选择计划保养人员"
+										disabled
+										clearable
+										filterable />
+								</el-form-item>
+							</el-col>
+
+							<el-col :span="8">
+								<el-form-item label="计划开始时间" prop="planStartTime">
+									<el-date-picker
+										v-model="form.planStartTime"
+										type="datetime"
+										disabled
+										placeholder="请选择计划开始时间"
+										value-format="timestamp"></el-date-picker>
+								</el-form-item>
+							</el-col>
+
+							<el-col :span="8">
+								<el-form-item label="计划结束时间" prop="planEndTime">
+									<el-date-picker
+										v-model="form.planEndTime"
+										type="datetime"
+										disabled
+										placeholder="请选择计划结束时间"
+										value-format="timestamp"></el-date-picker>
+								</el-form-item>
+							</el-col>
+
+							<el-col :span="8">
+								<el-form-item
+									label="实际开始时间"
+									prop="startTime"
+									:rules="[
+										{
+											required: true,
+											message: '请选择实际开始时间',
+											trigger: 'blur',
+										},
+									]">
+									<el-date-picker
+										v-model="form.startTime"
+										type="datetime"
+										placeholder="请选择实际开始时间"
+										value-format="timestamp"></el-date-picker>
+								</el-form-item>
+							</el-col>
+
+							<el-col :span="8">
+								<el-form-item
+									label="实际结束时间"
+									prop="endTime"
+									:rules="[
+										{
+											required: true,
+											message: '请选择实际结束时间',
+											trigger: 'blur',
+										},
+									]">
+									<el-date-picker
+										v-model="form.endTime"
+										type="datetime"
+										placeholder="请选择实际结束时间"
+										value-format="timestamp"></el-date-picker>
+								</el-form-item>
+							</el-col>
+
+							<el-col :span="8">
+								<el-form-item
+									label="实际保养人员"
+									prop="maintainWorker"
+									:rules="[
+										{
+											required: true,
+											message: '请选择实际保养人员',
+											trigger: 'blur',
+										},
+									]">
+									<el-select
+										v-model="form.maintainWorker"
+										:placeholder="`请选择实际保养人员`"
+										multiple
+										clearable
+										filterable>
+										<el-option
+											v-for="opt in maintainerOptions"
+											:key="opt.value"
+											:label="opt.label"
+											:value="opt.value" />
+									</el-select>
+								</el-form-item>
+							</el-col>
+
+							<el-col :span="24">
+								<el-form-item label="备注" prop="remark">
+									<el-input v-model="form.remark" :placeholder="`请输入备注`" />
+								</el-form-item>
+							</el-col>
+						</el-row>
+					</el-form>
+				</div>
+
+				<SmallTitle>保养内容</SmallTitle>
+
+				<div style="margin-top: 12px; position: relative">
+					<SearchBar
+						:formConfigs="searchBarFormConfig"
+						ref="attr-search-bar"
+						@headBtnClick="handleSearchBarBtnClick" />
+				</div>
+
+				<div style="margin-top: 12px; position: relative">
+					<div style="position: absolute; top: -40px; right: 0">
+						<el-button @click="handleAddAttr" type="text">
+							<i class="el-icon-plus"></i>
+							添加属性
+						</el-button>
+					</div>
+					<base-table
+						v-loading="attrListLoading"
+						:table-props="attrTableProps"
+						:page="attrQuery?.params.pageNo || 1"
+						:limit="attrQuery?.params.pageSize || 10"
+						:table-data="attrList"
+						@emitFun="handleEmitFun">
+						<method-btn
+							slot="handleBtn"
+							label="操作"
+							:method-list="tableBtn"
+							@clickBtn="handleTableBtnClick" />
+					</base-table>
+
+					<!-- 分页组件 -->
+					<pagination
+						v-show="attrTotal > 0"
+						:total="attrTotal"
+						:page.sync="attrQuery.params.pageNo"
+						:limit.sync="attrQuery.params.pageSize"
+						@pagination="getAttrList" />
+				</div>
+			</div>
+
+			<div class="drawer-body__footer">
+				<el-button style="" @click="handleCancel">取消</el-button>
+				<el-button type="primary" @click="handleConfirm">保存</el-button>
+				<!-- sections的第二项必须是 属性列表  -->
+				<!-- <el-button
+						v-if="sections[1].allowAdd"
+						type="primary"
+						@click="handleAddAttr">
+						添加属性
+					</el-button> -->
+			</div>
+		</div>
+
+		<!-- 属性对话框 -->
+		<base-dialog
+			:dialogTitle="attrTitle"
+			:dialogVisible="attrFormVisible"
+			width="35%"
+			:append-to-body="true"
+			custom-class="baseDialog"
+			@close="closeAttrForm"
+			@cancel="closeAttrForm"
+			@confirm="submitAttrForm">
+			<DialogForm
+				v-if="attrFormVisible"
+				ref="attrForm"
+				v-model="attrForm"
+				:rows="attrRows" />
+		</base-dialog>
+	</el-drawer>
+</template>
+
+<script>
+import DialogForm from '../../../components/DialogForm/index.vue';
+
+const SmallTitle = {
+	name: 'SmallTitle',
+	props: ['size'],
+	components: {},
+	data() {
+		return {};
+	},
+	methods: {},
+	render: function (h) {
+		return h(
+			'span',
+			{
+				class: 'small-title',
+				style: {
+					fontSize: '18px',
+					lineHeight:
+						this.size == 'lg' ? '24px' : this.size == 'sm' ? '18px' : '20px',
+					fontWeight: 500,
+					fontFamily: '微软雅黑, Microsoft YaHei, Arial, Helvetica, sans-serif',
+				},
+			},
+			this.$slots.default
+		);
+	},
+};
+
+export default {
+	components: { SmallTitle, DialogForm },
+	props: ['dataId'], // dataId 作为一个通用的存放id的字段
+	data() {
+		return {
+			visible: false,
+			btnLoading: false,
+			form: {},
+			formLoading: false,
+			lineList: [],
+			maintainerList: [],
+			departmentList: [],
+			attrTableProps: [
+				{
+					prop: 'equipmentName',
+					label: '设备名称',
+				},
+				{
+					prop: 'program',
+					label: '保养项目',
+				},
+				{
+					prop: 'maintenanceDes',
+					label: '保养描述',
+				},
+			],
+			attrList: [],
+			attrTotal: 0,
+			attrTitle: '',
+			attrForm: {
+				id: null,
+				logId: null,
+				program: null,
+				maintenanceDes: null,
+				remark: null,
+			},
+			attrFormVisible: false,
+			attrRows: [
+				[
+					{
+						select: true,
+						label: '设备名称',
+						prop: 'equipmentId',
+						url: '/base/core-equipment/page?pageNo=1&pageSize=100&special=true',
+						// method: 'post',
+						// queryParams: {
+						// 	pageNo: 1,
+						// 	pageSize: 100,
+						// 	special: true,
+						// },
+						rules: [
+							{ required: true, message: '设备不能为空', trigger: 'blur' },
+						],
+					},
+				],
+				[
+					{
+						input: true,
+						label: '保养项目',
+						prop: 'program',
+					},
+				],
+				[
+					{
+						input: true,
+						label: '保养描述',
+						prop: 'maintenanceDes',
+					},
+				],
+				[
+					{
+						input: true,
+						label: '备注',
+						prop: 'remark',
+					},
+				],
+			],
+			attrQuery: {
+				params: {
+					pageNo: 1,
+					pageSize: 10,
+					equipmentName: null,
+				},
+			}, // 属性列表的请求
+			searchBarFormConfig: [
+				{
+					type: 'input',
+					label: '设备',
+					placeholder: '请输入设备名称',
+					param: 'equipmentName',
+				},
+				{
+					type: 'button',
+					btnName: '查询',
+					name: 'search',
+					color: 'primary',
+				},
+			],
+			attrFormSubmitting: false,
+			attrListLoading: false,
+			// syncFileListFlag: null,
+			tableBtn: [
+				{
+					type: 'edit',
+					btnName: '编辑',
+				},
+				{
+					type: 'delete',
+					btnName: '删除',
+				},
+			],
+			row: null,
+		};
+	},
+	computed: {
+		departmentOptions() {
+			return (this.departmentList || []).map((item) => ({
+				id: item.id,
+				label: item.name,
+				value: item.id,
+			}));
+		},
+		lineOptions() {
+			return (this.lineList || []).map((item) => ({
+				id: item.id,
+				label: item.name,
+				value: item.id,
+			}));
+		},
+		maintainerOptions() {
+			return (this.maintainerList || []).map((item) => ({
+				id: item.id,
+				label: item.name,
+				value: item.name,
+			}));
+		},
+	},
+	mounted() {
+		this.getList('maintainer');
+		this.getList('department');
+		this.getList('line');
+	},
+	methods: {
+		handleSearchBarBtnClick(btn) {
+			switch (btn.btnName) {
+				case 'search':
+					this.attrQuery.params.equipmentName = btn.equipmentName;
+					this.getAttrList();
+					break;
+			}
+		},
+		handleTableBtnClick({ type, data }) {
+			switch (type) {
+				case 'edit':
+					this.handleEditAttr(data.id);
+					break;
+				case 'delete':
+					this.handleDeleteAttr(data.id);
+					break;
+			}
+		},
+		async handleConfirm() {
+			this.btnLoading = true;
+			this.$nextTick(async () => {
+				const { code, data } = await this.$axios({
+					url: '/base/equipment-maintain-log/update',
+					method: 'put',
+					data: {
+						...this.form,
+						maintainWorker: this.form.maintainWorker.join(','),
+						planMaintainWorker: this.form.planMaintainWorker?.join(','),
+					},
+				});
+				if (code == 0) {
+					this.$modal.msgSuccess('更新成功');
+				}
+				this.btnLoading = false;
+				this.$emit('refreshDataList');
+				this.handleCancel();
+			});
+		},
+
+		handleEmitFun(val) {
+			console.log('handleEmitFun', val);
+		},
+
+		init(row) {
+			this.visible = true;
+			this.row = row;
+			this.getInfo(row);
+			this.getAttrList(row);
+		},
+
+		async getInfo(row) {
+			this.formLoading = true;
+			const res = await this.$axios(
+				'/base/equipment-maintain-log/get?id=' + row.id
+			);
+			if (res.code == 0) {
+				this.form = res.data;
+				this.form.maintainWorker = res.data.maintainWorker.split(',');
+				this.form.planMaintainWorker = res.data.planMaintainWorker?.split(',');
+				this.formLoading = false;
+			}
+			this.formLoading = false;
+		},
+
+		async getAttrList(row, condition = {}) {
+			if (!row) row = this.row;
+			this.attrListLoading = true;
+			const res = await this.$axios({
+				url: '/base/equipment-maintain-log-det/page',
+				method: 'get',
+				params: {
+					...this.attrQuery.params,
+					logId: row.id,
+					...condition,
+				},
+			});
+			if (res.code == 0) {
+				this.attrList = res.data.list;
+				this.attrTotal = res.data.total;
+			}
+			this.attrListLoading = false;
+		},
+
+		async getList(source = 'department') {
+			const urls = [
+				'/base/core-production-line/listAll',
+				'/base/core-department/listAll',
+				'/base/core-worker/listAll',
+			];
+			let res;
+			switch (source) {
+				case 'department':
+					res = await this.$axios(urls[1]);
+					this.departmentList = res.data || [];
+					break;
+				case 'maintainer':
+					res = await this.$axios(urls[2]);
+					this.maintainerList = res.data || [];
+					break;
+				case 'line':
+					res = await this.$axios(urls[0]);
+					this.lineList = res.data || [];
+					break;
+			}
+			this.formLoading = false;
+		},
+
+		// 保存表单
+		handleSave() {
+			this.$refs.form.validate(async (valid) => {
+				if (valid) {
+					await this.$axios({
+						url: '/urlupdate', //  this.sections[0][isEdit ? 'urlUpdate' : 'urlCreate'],
+						method: 'post', // isEdit ? 'put' : 'post',
+						data: this.form,
+					});
+					this.$modal.msgSuccess(`${isEdit ? '更新' : '创建'}成功`);
+					this.visible = false;
+					this.$emit('refreshDataList');
+				}
+			});
+		},
+
+		handleCancel() {
+			this.visible = false;
+		},
+
+		resetAttrform() {
+			this.attrForm = {
+				id: null,
+				logId: this.row.id,
+				maintenanceDes: '',
+				program: null,
+				remark: null,
+			};
+		},
+
+		// 新增属性
+		handleAddAttr() {
+			if (!this.row.id) return this.$message.error('请先选中保养记录');
+			this.resetAttrform();
+			this.attrTitle = '添加设备属性';
+			this.attrFormVisible = true;
+		},
+
+		// 编辑属性
+		async handleEditAttr(attrId) {
+			const res = await this.$axios({
+				url: '/base/equipment-maintain-log-det/get',
+				method: 'get',
+				params: { id: attrId },
+			});
+			if (res.code == 0) {
+				this.attrForm = res.data;
+				this.attrTitle = '编辑设备属性';
+				this.attrFormVisible = true;
+			}
+		},
+
+		// 删除属性
+		handleDeleteAttr(attrId) {
+			this.$confirm('确定删除该保养内容?', '提示', {
+				confirmButtonText: '确定',
+				cancelButtonText: '取消',
+				type: 'warning',
+			})
+				.then(async () => {
+					const res = await this.$axios({
+						url: '/base/equipment-maintain-log-det/delete?id=' + attrId,
+						method: 'delete',
+					});
+					if (res.code == 0) {
+						this.$message({
+							message: '删除成功',
+							type: 'success',
+							duration: 1500,
+							onClose: () => {
+								this.getAttrList();
+							},
+						});
+					}
+				})
+				.catch(() => {});
+		},
+
+		// 提交属性表
+		submitAttrForm() {
+			this.$refs['attrForm'].validate(async (valid) => {
+				if (!valid) {
+					return;
+				}
+
+				try {
+					const isEdit = this.attrForm.id != null;
+					this.attrFormSubmitting = true;
+					const res = await this.$axios({
+						url: isEdit
+							? '/base/equipment-maintain-log-det/update'
+							: '/base/equipment-maintain-log-det/create',
+						method: isEdit ? 'put' : 'post',
+						data: this.attrForm,
+					});
+
+					if (res.code == 0) {
+						this.closeAttrForm();
+						this.$message({
+							message: `${isEdit ? '更新' : '创建'}成功`,
+							type: 'success',
+							duration: 1500,
+							onClose: () => {
+								this.getAttrList();
+							},
+						});
+					}
+					this.attrFormSubmitting = false;
+				} catch (err) {
+					this.$message({
+						message: err,
+						type: 'error',
+						duration: 1500,
+					});
+					this.attrFormSubmitting = false;
+				}
+			});
+		},
+
+		closeAttrForm() {
+			this.attrFormVisible = false;
+		},
+
+		handleClick(raw) {
+			if (raw.type === 'delete') {
+				this.$confirm(
+					`确定对${
+						raw.data.name
+							? '[名称=' + raw.data.name + ']'
+							: '[序号=' + raw.data._pageIndex + ']'
+					}进行删除操作?`,
+					'提示',
+					{
+						confirmButtonText: '确定',
+						cancelButtonText: '取消',
+						type: 'warning',
+					}
+				)
+					.then(() => {
+						deleteProductAttr(raw.data.id).then(({ data }) => {
+							this.$message({
+								message: '操作成功',
+								type: 'success',
+								duration: 1500,
+								onClose: () => {
+									this.getList();
+								},
+							});
+						});
+					})
+					.catch(() => {});
+			} else {
+				this.addNew(raw.data.id);
+			}
+		},
+	},
+};
+</script>
+
+<style scoped>
+.drawer >>> .el-drawer {
+	border-radius: 8px 0 0 8px;
+}
+
+.drawer >>> .el-date-editor,
+.drawer >>> .el-select {
+	width: 100%;
+}
+
+.drawer >>> .el-drawer__header {
+	margin: 0;
+	padding: 32px 32px 24px;
+	border-bottom: 1px solid #dcdfe6;
+	margin-bottom: 0px;
+}
+
+.small-title::before {
+	content: '';
+	display: inline-block;
+	vertical-align: top;
+	width: 4px;
+	height: 22px;
+	border-radius: 1px;
+	margin-right: 8px;
+	background-color: #0b58ff;
+}
+
+.drawer-body {
+	display: flex;
+	flex-direction: column;
+	height: 100%;
+}
+
+.drawer-body__content {
+	flex: 1;
+	/* background: #eee; */
+	padding: 20px 30px;
+	overflow-y: auto;
+}
+
+.drawer-body__footer {
+	display: flex;
+	justify-content: flex-end;
+	padding: 18px;
+}
+</style>
diff --git a/src/views/specialEquipment/maintain/WaitingListTable.vue b/src/views/specialEquipment/maintain/WaitingListTable.vue
index edad3470..697fbd8e 100644
--- a/src/views/specialEquipment/maintain/WaitingListTable.vue
+++ b/src/views/specialEquipment/maintain/WaitingListTable.vue
@@ -39,7 +39,7 @@
 			width="128"
 			label="设备保养单号"
 			prop="maintainOrderNumber"></el-table-column>
-		<el-table-column v-if="selectedBox[1]" label="保养计划名称" prop="planName">
+		<el-table-column v-if="selectedBox[1]" width="128" label="保养计划名称" prop="planName">
 			<template slot-scope="scope">
 				{{ scope.row.planName || '---' }}
 			</template>

From eb0445f4795a9123f6acf69411e5e9d652aca15d Mon Sep 17 00:00:00 2001
From: lb <liubin_9396@163.com>
Date: Tue, 20 Feb 2024 17:00:56 +0800
Subject: [PATCH 23/40] =?UTF-8?q?update=20=E7=89=B9=E7=A7=8D=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E7=BB=B4=E4=BF=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../specialEquipment/maintain/Repair--add.vue | 269 +++++++++++++++---
 .../specialEquipment/maintain/Repair.vue      |  51 ++--
 2 files changed, 262 insertions(+), 58 deletions(-)

diff --git a/src/views/specialEquipment/maintain/Repair--add.vue b/src/views/specialEquipment/maintain/Repair--add.vue
index 6b65c846..e21849c2 100644
--- a/src/views/specialEquipment/maintain/Repair--add.vue
+++ b/src/views/specialEquipment/maintain/Repair--add.vue
@@ -13,7 +13,7 @@
 		v-loading="formLoading">
 		<el-row :gutter="20">
 			<!-- 维修单号  -->
-			<el-col :span="12">
+			<el-col :span="8">
 				<el-form-item
 					label="维修单号"
 					prop="repairOrderNumber"
@@ -28,39 +28,37 @@
 				</el-form-item>
 			</el-col>
 
-			<!-- 维修工  -->
-			<el-col :span="12">
-				<el-form-item
-					label="维修工"
-					prop="repairman"
-					:rules="[
-						{ required: true, message: '维修工不能为空', trigger: 'blur' },
-					]">
-					<el-input
-						v-model="form.repairman"
-						@change="$emit('update', form)"
-						placeholder="请输入维修工"
-						:disabled="disabled" />
-				</el-form-item>
-			</el-col>
-
-			<!-- 设备大类  -->
-			<el-col :span="12">
-				<el-form-item
-					label="设备大类"
-					prop="equipmentCategory"
-					:rules="[
-						{ required: true, message: '设备大类不能为空', trigger: 'blur' },
-					]">
+			<!-- 产线名  -->
+			<el-col :span="8">
+				<el-form-item label="产线名" prop="lineId">
 					<el-select
-						v-model="form.equipmentCategory"
-						:placeholder="`请选择设备大类`"
+						v-model="formFilters.lineId"
+						:placeholder="`请选择产线`"
 						:disabled="disabled"
 						clearable
 						filterable
 						@change="handleEqTypeChange">
 						<el-option
-							v-for="opt in equipmentTypeOptions"
+							v-for="opt in lineOptions"
+							:key="opt.value"
+							:label="opt.label"
+							:value="opt.value" />
+					</el-select>
+				</el-form-item>
+			</el-col>
+
+			<!-- 工段名  -->
+			<el-col :span="8">
+				<el-form-item label="工段名" prop="sectionId">
+					<el-select
+						v-model="formFilters.sectionId"
+						:placeholder="`请选择工段`"
+						:disabled="disabled"
+						clearable
+						filterable
+						@change="handleEqTypeChange">
+						<el-option
+							v-for="opt in sectionOptions"
 							:key="opt.value"
 							:label="opt.label"
 							:value="opt.value" />
@@ -69,7 +67,7 @@
 			</el-col>
 
 			<!-- 设备名称  -->
-			<el-col :span="12">
+			<el-col :span="8">
 				<el-form-item
 					label="设备名称"
 					prop="equipmentId"
@@ -93,7 +91,7 @@
 			</el-col>
 
 			<!-- 故障发生时间  -->
-			<el-col :span="12">
+			<el-col :span="8">
 				<el-form-item
 					label="故障发生时间"
 					prop="faultTime"
@@ -117,7 +115,7 @@
 			</el-col>
 
 			<!-- 故障级别  -->
-			<el-col :span="12">
+			<el-col :span="8">
 				<el-form-item
 					label="故障级别"
 					prop="faultLevel"
@@ -142,8 +140,98 @@
 				</el-form-item>
 			</el-col>
 
+			<!-- 故障类型 - 数据字典  -->
+			<el-col :span="8">
+				<el-form-item
+					label="故障类型"
+					prop="faultType"
+					:rules="[
+						{
+							required: true,
+							message: '故障类型不能为空',
+							trigger: 'blur',
+						},
+					]">
+					<el-select
+						v-model="form.faultType"
+						placeholder="故障类型"
+						:disabled="disabled"
+						@change="$emit('update', form)">
+						<el-option
+							v-for="opt in getDictDatas(DICT_TYPE.FAULT_LEVEL)"
+							:key="opt.value"
+							:label="opt.label"
+							:value="opt.value" />
+					</el-select>
+				</el-form-item>
+			</el-col>
+
+			<!-- 维修开始时间  -->
+			<el-col :span="8">
+				<el-form-item
+					label="维修开始时间"
+					prop="maintenanceStartTime"
+					:rules="[
+						{
+							required: true,
+							message: '维修开始时间不能为空',
+							trigger: 'blur',
+						},
+					]">
+					<el-date-picker
+						v-model="form.maintenanceStartTime"
+						type="datetime"
+						:disabled="disabled"
+						:placeholder="`请选择维修开始时间`"
+						value-format="timestamp"
+						format="yyyy-MM-dd HH:mm:ss"
+						clearable
+						@change="$emit('update', form)" />
+				</el-form-item>
+			</el-col>
+
+			<!-- 维修结束时间  -->
+			<el-col :span="8">
+				<el-form-item
+					label="维修结束时间"
+					prop="maintenanceFinishTime"
+					:rules="[
+						{
+							required: true,
+							message: '维修结束时间不能为空',
+							trigger: 'blur',
+						},
+					]">
+					<el-date-picker
+						v-model="form.maintenanceFinishTime"
+						type="datetime"
+						:disabled="disabled"
+						:placeholder="`请选择维修结束时间`"
+						value-format="timestamp"
+						format="yyyy-MM-dd HH:mm:ss"
+						clearable
+						@change="$emit('update', form)" />
+				</el-form-item>
+			</el-col>
+
+			<!-- 维修工  -->
+			<el-col :span="8">
+				<el-form-item
+					label="维修工"
+					prop="repairman"
+					:rules="[
+						{ required: true, message: '维修工不能为空', trigger: 'blur' },
+					]">
+					<el-input
+						v-model="form.repairman"
+						@change="$emit('update', form)"
+						placeholder="请输入维修工"
+						:disabled="disabled" />
+				</el-form-item>
+			</el-col>
+
 			<!-- 联系方式  -->
-			<el-col :span="24">
+			<el-col :span="8">
 				<el-form-item
 					label="联系方式"
 					prop="repairmanPhone"
@@ -157,6 +245,117 @@
 						:disabled="disabled" />
 				</el-form-item>
 			</el-col>
+
+			<!-- 维修方式 - 数据字典  -->
+			<el-col :span="8">
+				<el-form-item
+					label="维修方式"
+					prop="repairMode"
+					:rules="[
+						{
+							required: true,
+							message: '维修方式不能为空',
+							trigger: 'blur',
+						},
+					]">
+					<el-select
+						v-model="form.repairMode"
+						placeholder="维修方式"
+						:disabled="disabled"
+						@change="$emit('update', form)">
+						<el-option
+							v-for="opt in getDictDatas(DICT_TYPE.FAULT_LEVEL)"
+							:key="opt.value"
+							:label="opt.label"
+							:value="opt.value" />
+					</el-select>
+				</el-form-item>
+			</el-col>
+
+			<!-- 维修结果 - 数据字典  -->
+			<el-col :span="8">
+				<el-form-item
+					label="维修结果"
+					prop="maintenanceResult"
+					:rules="[
+						{
+							required: true,
+							message: '维修结果不能为空',
+							trigger: 'blur',
+						},
+					]">
+					<el-select
+						v-model="form.maintenanceResult"
+						placeholder="维修结果"
+						:disabled="disabled"
+						@change="$emit('update', form)">
+						<el-option
+							v-for="opt in getDictDatas(DICT_TYPE.FAULT_LEVEL)"
+							:key="opt.value"
+							:label="opt.label"
+							:value="opt.value" />
+					</el-select>
+				</el-form-item>
+			</el-col>
+
+			<!-- 备注  -->
+			<el-col :span="24">
+				<el-form-item label="备注" prop="remark">
+					<el-input
+						v-model="form.remark"
+						@change="$emit('update', form)"
+						placeholder="请输入备注"
+						:disabled="disabled" />
+				</el-form-item>
+			</el-col>
+
+			<!-- 故障明细  -->
+			<el-col :span="24">
+				<el-form-item
+					label="故障明细"
+					prop="faultDetail"
+					:rules="[
+						{
+							required: true,
+							message: '故障明细不能为空',
+							trigger: 'blur',
+						},
+					]"></el-form-item>
+			</el-col>
+
+			<!-- 维修描述  -->
+			<el-col :span="24">
+				<el-form-item label="维修描述" prop="maintenanceDetail"></el-form-item>
+			</el-col>
+
+			<!-- 维修附件  -->
+			<el-col :span="24">
+				<el-form-item label="维修附件" prop="files"></el-form-item>
+			</el-col>
+
+			<!-- 设备大类  -->
+			<!-- <el-col :span="8">
+				<el-form-item
+					label="设备大类"
+					prop="equipmentCategory"
+					:rules="[
+						{ required: true, message: '设备大类不能为空', trigger: 'blur' },
+					]">
+					<el-select
+						v-model="form.equipmentCategory"
+						:placeholder="`请选择设备大类`"
+						:disabled="disabled"
+						clearable
+						filterable
+						@change="handleEqTypeChange">
+						<el-option
+							v-for="opt in equipmentTypeOptions"
+							:key="opt.value"
+							:label="opt.label"
+							:value="opt.value" />
+					</el-select>
+				</el-form-item>
+			</el-col> -->
 		</el-row>
 	</el-form>
 </template>
@@ -189,6 +388,10 @@ export default {
 			allSpeicalEquipments: [],
 			uploadOpen: false,
 			form: {},
+			formFilters: {
+				lineId: null,
+				sectionId: null,
+			},
 			formLoading: true,
 			dataLoaded: false,
 			equipmentList: [],
@@ -200,6 +403,8 @@ export default {
 			],
 			workerOptions: [],
 			planOptions: [],
+			sectionOptions: [],
+			lineOptions: [],
 		};
 	},
 	watch: {
diff --git a/src/views/specialEquipment/maintain/Repair.vue b/src/views/specialEquipment/maintain/Repair.vue
index a946645b..f03fd675 100644
--- a/src/views/specialEquipment/maintain/Repair.vue
+++ b/src/views/specialEquipment/maintain/Repair.vue
@@ -51,7 +51,7 @@
 				v-model="form"
 				:disabled="mode == 'detail'" />
 		</base-dialog>
-		<CustomDialogForm
+		<DetailDrawer
 			v-if="addOrUpdateVisible"
 			ref="addOrUpdate"
 			@refreshDataList="getList"
@@ -61,7 +61,7 @@
 
 <script>
 import basicPageMixin from '@/mixins/lb/basicPageMixin';
-import CustomDialogForm from './CustomDialogForm.vue';
+import DetailDrawer from './CustomDialogForm.vue';
 import {
 	deleteRepair,
 	exportRepairLogExcel,
@@ -72,13 +72,13 @@ import DialogForm from './Repair--add.vue';
 
 export default {
 	name: 'SpecialEquipmentRepair',
-	components: { CustomDialogForm, DialogForm },
+	components: { DetailDrawer, DialogForm },
 	mixins: [basicPageMixin],
 	data() {
 		return {
 			addOrUpdateVisible: false,
 			searchBarKeys: [
-				'maintenanceStatus',
+				'maintenanceResult',
 				'createTime',
 				'equipmentId',
 				'specialType',
@@ -167,7 +167,6 @@ export default {
 					filter: (v) => (v != null ? ['成功', '失败'][v] : ''),
 				},
 				{ prop: 'maintenanceDetail', label: '维修描述', width: 110 },
-				{ prop: '_detail', label: '查看详情', width: 110 },
 				{
 					prop: 'remark',
 					label: '备注',
@@ -207,19 +206,19 @@ export default {
 				// },
 			],
 			searchBarFormConfig: [
-				{
-					type: 'select',
-					label: '设备大类',
-					placeholder: '请选择设备大类',
-					param: 'specialType',
-					onchange: true,
-					selectOptions: [
-						{ id: 1, name: '安全设备' },
-						{ id: 2, name: '消防设备' },
-						{ id: 3, name: '特种设备' },
-					],
-					filterable: true,
-				},
+				// {
+				// 	type: 'select',
+				// 	label: '设备大类',
+				// 	placeholder: '请选择设备大类',
+				// 	param: 'specialType',
+				// 	onchange: true,
+				// 	selectOptions: [
+				// 		{ id: 1, name: '安全设备' },
+				// 		{ id: 2, name: '消防设备' },
+				// 		{ id: 3, name: '特种设备' },
+				// 	],
+				// 	filterable: true,
+				// },
 				{
 					type: 'select',
 					label: '设备',
@@ -229,13 +228,12 @@ export default {
 				},
 				{
 					type: 'select',
-					label: '状态',
-					placeholder: '请选择状态',
-					param: 'maintenanceStatus',
+					label: '维修结果',
+					placeholder: '请选择维修结果',
+					param: 'maintenanceResult',
 					selectOptions: [
-						{ name: '未完成', id: '0' },
-						{ name: '完成', id: '1' },
-						{ name: '进行中', id: '2' },
+						{ name: '成功', id: '0' },
+						{ name: '失败', id: '1' },
 					],
 				},
 				// 时间段
@@ -282,7 +280,8 @@ export default {
 			queryParams: {
 				pageNo: 1,
 				pageSize: 10,
-				maintenanceStatus: null,
+				// maintenanceStatus: null,
+				maintenanceResult: null,
 				createTime: null,
 				equipmentId: null,
 				special: true,
@@ -488,7 +487,7 @@ export default {
 		},
 		setSearchBarEquipmentList(eqList) {
 			this.$set(
-				this.searchBarFormConfig[1],
+				this.searchBarFormConfig[0],
 				'selectOptions',
 				eqList.map((item) => ({
 					name: item.name,

From f8c2889abca36eb32a3eb09018c3e7a45351417b Mon Sep 17 00:00:00 2001
From: lb <liubin_9396@163.com>
Date: Wed, 21 Feb 2024 14:44:15 +0800
Subject: [PATCH 24/40] update repair

---
 src/utils/dict.js                             |   3 +
 .../specialEquipment/maintain/Repair--add.vue | 302 +++++++++++++++---
 .../specialEquipment/maintain/Repair.vue      |  22 +-
 3 files changed, 268 insertions(+), 59 deletions(-)

diff --git a/src/utils/dict.js b/src/utils/dict.js
index 9c500f2e..45fe2b31 100644
--- a/src/utils/dict.js
+++ b/src/utils/dict.js
@@ -107,6 +107,9 @@ export const DICT_TYPE = {
   // ============== EQUIPMENT - 设备模块 =============
   MAINTAIN_TYPE: 'maintain_type',
   FAULT_LEVEL: 'fault-level',
+  FAULT_TYPE: 'fault-type',
+  REPAIR_MODE: 'repair-mode',
+  REPAIR_RESULT: 'repair-result',
 
   // ============== ENVIRONMENTAL - 环保模块 =============
   ENVIRONMENT_CHECK_UNIT: 'environment_check_unit'
diff --git a/src/views/specialEquipment/maintain/Repair--add.vue b/src/views/specialEquipment/maintain/Repair--add.vue
index e21849c2..a233a308 100644
--- a/src/views/specialEquipment/maintain/Repair--add.vue
+++ b/src/views/specialEquipment/maintain/Repair--add.vue
@@ -37,7 +37,7 @@
 						:disabled="disabled"
 						clearable
 						filterable
-						@change="handleEqTypeChange">
+						@change="initSections">
 						<el-option
 							v-for="opt in lineOptions"
 							:key="opt.value"
@@ -158,7 +158,7 @@
 						:disabled="disabled"
 						@change="$emit('update', form)">
 						<el-option
-							v-for="opt in getDictDatas(DICT_TYPE.FAULT_LEVEL)"
+							v-for="opt in getDictDatas(DICT_TYPE.FAULT_TYPE)"
 							:key="opt.value"
 							:label="opt.label"
 							:value="opt.value" />
@@ -222,11 +222,20 @@
 					:rules="[
 						{ required: true, message: '维修工不能为空', trigger: 'blur' },
 					]">
-					<el-input
+					<el-select
 						v-model="form.repairman"
 						@change="$emit('update', form)"
-						placeholder="请输入维修工"
-						:disabled="disabled" />
+						placeholder="请选择维修工"
+						filterable
+						clearable
+						multiple
+						:disabled="disabled">
+						<el-option
+							v-for="opt in workerOptions"
+							:key="opt.value"
+							:label="opt.label"
+							:value="opt.value" />
+					</el-select>
 				</el-form-item>
 			</el-col>
 
@@ -264,7 +273,7 @@
 						:disabled="disabled"
 						@change="$emit('update', form)">
 						<el-option
-							v-for="opt in getDictDatas(DICT_TYPE.FAULT_LEVEL)"
+							v-for="opt in getDictDatas(DICT_TYPE.REPAIR_MODE)"
 							:key="opt.value"
 							:label="opt.label"
 							:value="opt.value" />
@@ -290,7 +299,7 @@
 						:disabled="disabled"
 						@change="$emit('update', form)">
 						<el-option
-							v-for="opt in getDictDatas(DICT_TYPE.FAULT_LEVEL)"
+							v-for="opt in getDictDatas(DICT_TYPE.REPAIR_RESULT)"
 							:key="opt.value"
 							:label="opt.label"
 							:value="opt.value" />
@@ -320,17 +329,73 @@
 							message: '故障明细不能为空',
 							trigger: 'blur',
 						},
-					]"></el-form-item>
+					]">
+					<Editor
+						key="fault-detail"
+						:height="200"
+						v-model="form.faultDetail"
+						@on-change="$emit('update', form)" />
+				</el-form-item>
 			</el-col>
 
 			<!-- 维修描述  -->
 			<el-col :span="24">
-				<el-form-item label="维修描述" prop="maintenanceDetail"></el-form-item>
+				<el-form-item label="维修描述" prop="maintenanceDetail">
+					<Editor
+						key="maintenance-detail"
+						:height="200"
+						v-model="form.maintenanceDetail"
+						@on-change="$emit('update', form)" />
+				</el-form-item>
 			</el-col>
 
 			<!-- 维修附件  -->
 			<el-col :span="24">
-				<el-form-item label="维修附件" prop="files"></el-form-item>
+				<el-form-item label="维修附件" prop="files">
+					<div
+						class="upload-area"
+						:class="uploadOpen ? '' : 'height-48'"
+						ref="uploadArea">
+						<span class="close-icon" :class="uploadOpen ? 'open' : ''">
+							<el-button
+								type="text"
+								icon="el-icon-arrow-right"
+								@click="uploadOpen = !uploadOpen" />
+						</span>
+						<!-- :file-list="uploadedFileList" -->
+						<el-upload
+							class="upload-in-dialog"
+							:action="uploadUrl"
+							:headers="uploadHeaders"
+							:show-file-list="false"
+							icon="el-icon-upload2"
+							:disabled="disabled"
+							:before-upload="beforeUpload"
+							:on-success="
+								(response, file, fileList) => {
+									handleUploadSuccess(response, file, 'files');
+								}
+							">
+							<el-button size="mini" :disabled="disabled || false">
+								<svg-icon
+									icon-class="icon-upload"
+									style="color: inherit"></svg-icon>
+								上传文件
+							</el-button>
+							<div class="el-upload__tip" slot="tip">
+								只能上传jpg/png文件, 大小不超过2MB
+							</div>
+						</el-upload>
+
+						<uploadedFile
+							class="file"
+							v-for="file in form.files"
+							:file="file"
+							:key="file.fileUrl"
+							:disabled="disabled"
+							@delete="!disabled && handleDeleteFile(file, col.prop)" />
+					</div>
+				</el-form-item>
 			</el-col>
 
 			<!-- 设备大类  -->
@@ -361,6 +426,71 @@
 </template>
 
 <script>
+import Editor from '@/components/Editor';
+import { getAccessToken } from '@/utils/auth';
+import tupleImg from '@/assets/images/tuple.png';
+
+const uploadedFile = {
+	name: 'UploadedFile',
+	props: ['file', 'disabled'],
+	data() {
+		return {};
+	},
+	methods: {
+		handleDelete() {
+			this.$emit('delete', this.file);
+		},
+		async handleDownload() {
+			const data = await this.$axios({
+				url: this.file.fileUrl,
+				method: 'get',
+				responseType: 'blob',
+			});
+
+			await this.$message.success('开始下载');
+			// create download link
+			const url = window.URL.createObjectURL(data);
+			const link = document.createElement('a');
+			link.href = url;
+			link.download = this.file.fileName;
+			document.body.appendChild(link);
+			link.click();
+			document.body.removeChild(link);
+		},
+	},
+	mounted() {},
+	render: function (h) {
+		return (
+			<div
+				title={this.file.fileName}
+				onClick={this.handleDownload}
+				style={{
+					background: `url(${tupleImg}) no-repeat`,
+					backgroundSize: '14px',
+					backgroundPosition: '0 55%',
+					paddingLeft: '20px',
+					paddingRight: '24px',
+					textOverflow: 'ellipsis',
+					whiteSpace: 'nowrap',
+					overflow: 'hidden',
+					cursor: 'pointer',
+					display: 'inline-block',
+				}}>
+				{this.file.fileName}
+				{!this.disabled && (
+					<el-button
+						type="text"
+						icon="el-icon-close"
+						style="float: right; position: relative; top: 2px; left: 8px; z-index: 100"
+						class="dialog__upload_component__close"
+						onClick={this.handleDelete}
+					/>
+				)}
+			</div>
+		);
+	},
+};
+
 export default {
 	name: 'DialogForm',
 	model: {
@@ -368,7 +498,7 @@ export default {
 		event: 'update',
 	},
 	emits: ['update'],
-	components: {},
+	components: { Editor, uploadedFile },
 	props: {
 		dataForm: {
 			type: Object,
@@ -385,8 +515,8 @@ export default {
 	},
 	data() {
 		return {
+			isInit: true,
 			allSpeicalEquipments: [],
-			uploadOpen: false,
 			form: {},
 			formFilters: {
 				lineId: null,
@@ -405,6 +535,9 @@ export default {
 			planOptions: [],
 			sectionOptions: [],
 			lineOptions: [],
+			uploadOpen: false,
+			uploadUrl: process.env.VUE_APP_BASE_API + '/admin-api/infra/file/upload', // 上传有关的headers，url都是固定的
+			uploadHeaders: { Authorization: 'Bearer ' + getAccessToken() },
 		};
 	},
 	watch: {
@@ -437,7 +570,6 @@ export default {
 	},
 	mounted() {
 		this.initOptions();
-		// this.getCode('/base/equipment-maintain-plan/getCode');
 	},
 	methods: {
 		/** 模拟透传 ref  */
@@ -447,23 +579,61 @@ export default {
 		resetFields(args) {
 			return this.$refs.form.resetFields(args);
 		},
+
 		// getCode
-		// async getCode(url) {
-		// 	this.formLoading = true;
-		// 	const response = await this.$axios(url);
-		// 	this.formLoading = false;
-		// 	this.form.code = response.data || '';
-		// },
+		async getCode() {
+			const response = await this.$axios('/base/equipment-repair-log/getCode');
+			this.form.repairOrderNumber = response.data || '';
+		},
 
 		// initialize
 		async initOptions() {
-			this.initEquipment();
-			// this.initWorker();
-			// this.initPlan();
+			this.formLoading = true;
+			await this.getCode();
+			await this.initEquipment();
+			await this.initLines();
+			await this.initWorker();
+			await this.initSections();
+			this.formLoading = false;
+			this.isInit = false;
+			this.setInitWorker();
 		},
 
+		/** 设置默认维修工为用户自己 */
+		setInitWorker() {
+			/** 获取用户自身id */
+			const userId = this.$store.getters.userId;
+			this.$nextTick(() => {
+				this.form.repairman = [userId];
+			});
+		},
+
+		/** 获取产线 */
+		async initLines() {
+			const res = await this.$axios('/base/core-production-line/listAll');
+			this.lineOptions = (res.data || []).map((item) => ({
+				label: item.name,
+				value: item.id,
+			}));
+		},
+
+		/** 获取工段 */
+		async initSections(byLineId) {
+			this.formLoading = !this.isInit && true;
+			const res = await this.$axios({
+				url:
+					byLineId && !this.isInit
+						? '/base/core-workshop-section/listByParentId?id=' + byLineId
+						: '/base/core-workshop-section/listAll',
+			});
+			this.sectionOptions = (res.data || []).map((item) => ({
+				label: item.name,
+				value: item.id,
+			}));
+			this.formLoading = !this.isInit && false;
+		},
+		/** 获取设备 */
 		async initEquipment(type = 'special-equipment') {
-			this.formLoading = true;
 			const response = await this.$axios('/base/core-equipment/listAll');
 			this.equipmentList = response.data || [];
 			const equipmentOptions = (response.data || [])
@@ -474,32 +644,55 @@ export default {
 				}));
 			this.equipmentOptions = equipmentOptions;
 			this.allSpeicalEquipments = equipmentOptions;
-			this.formLoading = false;
+		},
+		/** 获取维修工 - 同时从用户表和员工表拉取数据 */
+		async initWorker() {
+			let list = [];
+			/** user */
+			const userList = await this.$axios({
+				url: '/system/user/page',
+				params: {
+					pageNo: 1,
+					pageSize: 100,
+				},
+			});
+			list = list.concat(
+				(userList.data?.list || []).map((item) => ({
+					label: item.username,
+					value: item.id,
+				}))
+			);
+			/** worker */
+			const workerList = await this.$axios({
+				url: '/base/core-worker/listAll',
+			});
+			list = list.concat(
+				(workerList.data || []).map((item) => ({
+					label: item.name,
+					value: item.id,
+				}))
+			);
+			/** setting */
+			this.workerOptions = list;
 		},
 
-		// async initWorker() {
-		// 	this.formLoading = true;
-		// 	const response = await this.$axios({
-		// 		url: '/base/core-worker/listAll',
-		// 	});
-		// 	this.workerOptions = (response.data || []).map((item) => ({
-		// 		label: item.name,
-		// 		value: item.id,
-		// 	}));
-		// 	this.formLoading = false;
-		// },
-		// async initPlan() {
-		// 	this.formLoading = true;
-		// 	const response = await this.$axios({
-		// 		url: '/base/equipment-maintain-plan/page',
-		// 		params: { pageNo: 1, pageSize: 100, speical: true },
-		// 	});
-		// 	this.planOptions = (response.data?.list || []).map((item) => ({
-		// 		label: item.name,
-		// 		value: item.id,
-		// 	}));
-		// 	this.formLoading = false;
-		// },
+		beforeUpload(file) {
+			const checkFileSize = () => {
+				const isLt2M = file.size / 1024 / 1024 < 2;
+				if (!isLt2M) {
+					this.$modal.msgError('上传文件大小不能超过 2MB!');
+				}
+				return isLt2M;
+			};
+			const checkFileType = () => {
+				const isJPG =
+					file.type === 'image/jpeg' ||
+					file.type === 'image/png' ||
+					file.type === 'image/jpg';
+				return isJPG;
+			};
+			return checkFileSize() && checkFileType();
+		},
 
 		// handlers
 		handleEqTypeChange(type) {
@@ -540,19 +733,22 @@ export default {
 		// upload
 		handleFilesOpen() {},
 
-		beforeUpload() {},
-
-		handleUploadSuccess(response, file) {
-			this.$modal.msgSuccess('上传成功');
-			console.log('file', file);
+		handleUploadSuccess(response, file, prop) {
 			this.form.files.push({
 				fileName: file.name,
 				fileUrl: response.data,
+				fileType: prop == 'files' ? 2 : 1,
 			});
+			this.$modal.msgSuccess('上传成功');
 			this.$emit('update', this.form);
 		},
 
-		handleDeleteFile(file) {},
+		handleDeleteFile(file, prop) {
+			this.form.files = this.form.files.filter(
+				(item) => item.fileUrl != file.fileUrl
+			);
+			this.$emit('update', this.form);
+		},
 	},
 };
 </script>
diff --git a/src/views/specialEquipment/maintain/Repair.vue b/src/views/specialEquipment/maintain/Repair.vue
index f03fd675..188db221 100644
--- a/src/views/specialEquipment/maintain/Repair.vue
+++ b/src/views/specialEquipment/maintain/Repair.vue
@@ -164,9 +164,15 @@ export default {
 				{
 					prop: 'maintenanceResult',
 					label: '维修结果',
+					showOverflowtooltip: true,
 					filter: (v) => (v != null ? ['成功', '失败'][v] : ''),
 				},
-				{ prop: 'maintenanceDetail', label: '维修描述', width: 110 },
+				{
+					prop: 'maintenanceDetail',
+					label: '维修描述',
+					showOverflowtooltip: true,
+					width: 110,
+				},
 				{
 					prop: 'remark',
 					label: '备注',
@@ -397,12 +403,13 @@ export default {
 				if (!valid) {
 					return;
 				}
-				// if (this.form.repairman) {
-				// this.form.repairman = this.form.repairman.join(',')
-				// }
+
 				// 修改的提交
 				if (this.form.id != null) {
-					this.put(this.form).then((response) => {
+					this.put({
+						...this.form,
+						repairman: this.form.repairman.join(','),
+					}).then((response) => {
 						this.$modal.msgSuccess('修改成功');
 						this.open = false;
 						this.getList();
@@ -410,7 +417,10 @@ export default {
 					return;
 				}
 				// 添加的提交
-				this.post(this.form).then((response) => {
+				this.post({
+					...this.form,
+					repairman: this.form.repairman.join(','),
+				}).then((response) => {
 					this.$modal.msgSuccess('新增成功');
 					this.open = false;
 					this.getList();

From 5b40c3972cf00f15bf5de691c07adb91273ea5c2 Mon Sep 17 00:00:00 2001
From: lb <liubin_9396@163.com>
Date: Wed, 21 Feb 2024 15:35:12 +0800
Subject: [PATCH 25/40] update repair detail

---
 .../maintain/CustomDialogForm.vue             | 339 ++++++++----------
 .../specialEquipment/maintain/Repair--add.vue |   5 +
 2 files changed, 148 insertions(+), 196 deletions(-)

diff --git a/src/views/specialEquipment/maintain/CustomDialogForm.vue b/src/views/specialEquipment/maintain/CustomDialogForm.vue
index 3078223a..32f87620 100644
--- a/src/views/specialEquipment/maintain/CustomDialogForm.vue
+++ b/src/views/specialEquipment/maintain/CustomDialogForm.vue
@@ -21,37 +21,26 @@
 					label-position="top"
 					v-loading="formLoading">
 					<el-row :gutter="20">
-						<el-col :span="8">
-							<el-form-item label="维修单号" prop="repairOrderNumber">
-								<span>{{ dataForm.repairOrderNumber }}</span>
-							</el-form-item>
-						</el-col>
-						<el-col :span="8">
-							<el-form-item label="设备大类" prop="equipmentCategory">
-								<span>
-									{{
-										['-', '安全设备', '消防设备', '特种设备'][
-											dataForm.equipmentCategory || 0
-										]
-									}}
-								</span>
-							</el-form-item>
-						</el-col>
-						<el-col :span="8">
-							<el-form-item label="设备名称" prop="equipmentName">
-								<span>{{ dataForm.equipmentName }}</span>
-							</el-form-item>
-						</el-col>
-						<el-col :span="8">
-							<el-form-item label="维修工" prop="repairman">
-								<span>{{ dataForm.repairman }}</span>
-							</el-form-item>
-						</el-col>
 						<el-col :span="8">
 							<el-form-item label="故障发生时间" prop="faultTime">
 								<span>{{ parseTime(dataForm.faultTime) }}</span>
 							</el-form-item>
 						</el-col>
+
+						<!-- <el-col :span="8">
+							<el-form-item label="故障级别" prop="faultLevel">
+								<span>
+									{{
+										dataForm.faultLevel
+											? getDictDatas(DICT_TYPE.FAULT_LEVEL).find(
+													(item) => item.value == dataForm.faultLevel
+											  )?.label
+											: '---'
+									}}
+								</span>
+							</el-form-item>
+						</el-col> -->
+
 						<el-col :span="8">
 							<el-form-item label="故障级别" prop="faultLevel">
 								<span>
@@ -59,163 +48,68 @@
 								</span>
 							</el-form-item>
 						</el-col>
+
+						<el-col :span="8">
+							<el-form-item label="故障类型" prop="faultType">
+								<span>
+									{{ getDictDataLabel('fault-type', dataForm.faultType) }}
+								</span>
+							</el-form-item>
+						</el-col>
+
+						<el-col :span="8">
+							<el-form-item label="维修工" prop="repairman">
+								<span>{{ dataForm.repairman }}</span>
+							</el-form-item>
+						</el-col>
+
 						<el-col :span="8">
 							<el-form-item label="联系方式" prop="repairmanPhone">
 								<span>{{ dataForm.repairmanPhone }}</span>
 							</el-form-item>
 						</el-col>
+
+						<el-col :span="8">
+							<el-form-item label="维修方式" prop="repairMode">
+								<span>
+									{{ getDictDataLabel('repair-mode', dataForm.repairMode) }}
+								</span>
+							</el-form-item>
+						</el-col>
+
+						<el-col :span="24">
+							<el-form-item label="维修附件" prop="files">
+								<div v-if="dataForm.files && dataForm.files.length > 0">
+									<uploadedFile
+										class="file"
+										v-for="file in dataForm.files"
+										:file="file"
+										:key="file.fileUrl"
+										:disabled="disabled"
+										@delete="!disabled && handleDeleteFile(file, col.prop)" />
+								</div>
+								<p v-else>暂无附件</p>
+							</el-form-item>
+						</el-col>
+
+						<el-col :span="8">
+							<el-form-item label="创建时间" prop="createTime">
+								<span>{{ parseTime(dataForm.createTime) }}</span>
+							</el-form-item>
+						</el-col>
+
+						<el-col :span="8">
+							<el-form-item label="创建人" prop="creator">
+								<span>{{ dataForm.creator }}</span>
+							</el-form-item>
+						</el-col>
+
+						<el-col :span="24">
+							<el-form-item label="备注" prop="remark">
+								<span>{{ dataForm.remark }}</span>
+							</el-form-item>
+						</el-col>
 					</el-row>
-
-					<el-divider />
-
-					<div
-						v-if="
-							disabled && dataForm.maintenanceStatus === 1
-								? true
-								: !disabled
-								? true
-								: false
-						">
-						<small-title
-							style="margin: 16px 0; padding-left: 8px"
-							:no-padding="true">
-							{{ '设备维修信息' }}
-						</small-title>
-						<el-row :gutter="20">
-							<el-col :span="6">
-								<el-form-item
-									label="维修开始时间"
-									prop="maintenanceStartTime"
-									:rules="[
-										{
-											required: true,
-											message: '维修开始时间不能为空',
-											trigger: 'blur',
-										},
-									]">
-									<el-date-picker
-										v-model="dataForm.maintenanceStartTime"
-										type="datetime"
-										:disabled="disabled"
-										placeholder="请选择维修开始时间"
-										value-format="timestamp" />
-								</el-form-item>
-							</el-col>
-							<el-col :span="6">
-								<el-form-item
-									label="维修结束时间"
-									prop="maintenanceFinishTime"
-									:rules="[
-										{
-											required: true,
-											message: '维修结束时间不能为空',
-											trigger: 'blur',
-										},
-									]">
-									<el-date-picker
-										v-model="dataForm.maintenanceFinishTime"
-										type="datetime"
-										:disabled="disabled"
-										placeholder="请选择维修开始时间"
-										value-format="timestamp" />
-								</el-form-item>
-							</el-col>
-							<el-col :span="6">
-								<el-form-item
-									label="维修方式"
-									prop="repairMode"
-									:rules="[
-										{
-											required: true,
-											message: '维修方式不能为空',
-											trigger: 'blur',
-										},
-									]">
-									<el-select
-										:disabled="disabled"
-										v-model="dataForm.repairMode"
-										placeholder="请选择维修方式">
-										<el-option
-											v-for="opt in getDictDatas('repair-mode')"
-											:key="opt.value"
-											:label="opt.label"
-											:value="opt.value" />
-									</el-select>
-								</el-form-item>
-							</el-col>
-							<el-col :span="6">
-								<el-form-item label="故障类型" prop="faultType">
-									<el-select
-										:disabled="disabled"
-										v-model="dataForm.faultType"
-										placeholder="请选择故障类型">
-										<el-option
-											v-for="opt in getDictDatas('fault-type')"
-											:key="opt.value"
-											:label="opt.label"
-											:value="opt.value" />
-									</el-select>
-								</el-form-item>
-							</el-col>
-						</el-row>
-
-						<el-row :gutter="20">
-							<el-col>
-								<el-form-item
-									label="故障明细"
-									prop="faultDetail"
-									:rules="[
-										{
-											required: true,
-											message: '故障明细不能为空',
-											trigger: 'blur',
-										},
-									]">
-									<!-- // 富文本 -->
-									<editor
-										v-model="dataForm.faultDetail"
-										:read-only="disabled"
-										:min-height="150" />
-								</el-form-item>
-							</el-col>
-						</el-row>
-
-						<el-row :gutter="20">
-							<el-col>
-								<el-form-item label="维修记录" prop="maintenanceDetail">
-									<!-- // 富文本 -->
-									<editor
-										v-model="dataForm.maintenanceDetail"
-										:read-only="disabled"
-										:min-height="150" />
-								</el-form-item>
-							</el-col>
-						</el-row>
-
-						<el-row :gutter="20">
-							<el-col>
-								<el-form-item label="维修附件" prop="file">
-									<FileUpload
-										v-model="file"
-										:limit="1"
-										:f-name="fileName"
-										:disabled="disabled"
-										@name="setFileName" />
-								</el-form-item>
-							</el-col>
-						</el-row>
-
-						<el-row :gutter="20">
-							<el-col>
-								<el-form-item label="备注" prop="remark">
-									<el-input
-										v-model="dataForm.remark"
-										:placeholder="`请输入备注`"
-										:disabled="disabled" />
-								</el-form-item>
-							</el-col>
-						</el-row>
-					</div>
 				</el-form>
 
 				<div v-if="!disabled" class="drawer-body__footer">
@@ -230,11 +124,74 @@
 <script>
 import SmallTitle from './SmallTitle.vue';
 import { getEqRepair, updateEqRepair } from '@/api/equipment/base/repair';
-import Editor from '@/components/Editor';
-import FileUpload from '@/components/FileUpload';
+// import Editor from '@/components/Editor';
+// import FileUpload from '@/components/FileUpload';
 import { getDictDatas } from '@/utils/dict';
 import { parseTime } from '@/utils/ruoyi';
 import { getDictDataLabel } from '@/utils/dict';
+import tupleImg from '@/assets/images/tuple.png';
+
+const uploadedFile = {
+	name: 'UploadedFile',
+	props: ['file', 'disabled'],
+	data() {
+		return {};
+	},
+	methods: {
+		handleDelete() {
+			this.$emit('delete', this.file);
+		},
+		async handleDownload() {
+			const data = await this.$axios({
+				url: this.file.fileUrl,
+				method: 'get',
+				responseType: 'blob',
+			});
+
+			await this.$message.success('开始下载');
+			// create download link
+			const url = window.URL.createObjectURL(data);
+			const link = document.createElement('a');
+			link.href = url;
+			link.download = this.file.fileName;
+			document.body.appendChild(link);
+			link.click();
+			document.body.removeChild(link);
+		},
+	},
+	mounted() {
+	},
+	render: function (h) {
+		return (
+			<div
+				title={this.file.fileName}
+				onClick={this.handleDownload}
+				style={{
+					background: `url(${tupleImg}) no-repeat`,
+					backgroundSize: '14px',
+					backgroundPosition: '0 55%',
+					paddingLeft: '20px',
+					paddingRight: '24px',
+					textOverflow: 'ellipsis',
+					whiteSpace: 'nowrap',
+					overflow: 'hidden',
+					cursor: 'pointer',
+					display: 'inline-block',
+				}}>
+				{this.file.fileName}
+				{!this.disabled && (
+					<el-button
+						type="text"
+						icon="el-icon-close"
+						style="float: right; position: relative; top: 2px; left: 8px; z-index: 100"
+						class="dialog__upload_component__close"
+						onClick={this.handleDelete}
+					/>
+				)}
+			</div>
+		);
+	},
+};
 
 export default {
 	name: 'DialogForm',
@@ -243,7 +200,7 @@ export default {
 		event: 'update',
 	},
 	emits: ['update'],
-	components: { SmallTitle, Editor, FileUpload },
+	components: { SmallTitle, uploadedFile }, //, Editor, FileUpload },
 	props: {
 		// dataForm: {
 		// 	type: Object,
@@ -283,12 +240,8 @@ export default {
 		resetFields(args) {
 			return this.$refs.form.resetFields(args);
 		},
-		initData() {
-			this.file = '';
-			this.fileName = '';
-		},
+
 		init(row, isdetail) {
-			this.initData();
 			this.disabled = isdetail || false;
 			this.dataForm.id = row.id || undefined;
 			this.visible = true;
@@ -301,21 +254,15 @@ export default {
 					getEqRepair(this.dataForm.id).then((response) => {
 						this.formLoading = false;
 						this.dataForm = response.data;
-						debugger;
-						this.dataForm.maintenanceStatus =
-							this.dataForm.maintenanceStatus || 0;
-						if (this.dataForm.files.length > 0) {
-							this.file = this.dataForm.files[0].fileUrl;
-							this.fileName = this.dataForm.files[0].fileName;
-						}
 					});
-				} else {
-					// if (this.urlOptions.isGetCode) {
-					//   this.getCode()
-					// }
 				}
 			});
 		},
+		handleDeleteFile(file, prop) {
+			this.dataForm.files = this.dataForm.files.filter(
+				(item) => item.fileUrl != file.fileUrl
+			);
+		},
 		// 表单提交
 		dataFormSubmit() {
 			this.$refs['form'].validate((valid) => {
diff --git a/src/views/specialEquipment/maintain/Repair--add.vue b/src/views/specialEquipment/maintain/Repair--add.vue
index a233a308..6bbc6ff1 100644
--- a/src/views/specialEquipment/maintain/Repair--add.vue
+++ b/src/views/specialEquipment/maintain/Repair--add.vue
@@ -734,6 +734,11 @@ export default {
 		handleFilesOpen() {},
 
 		handleUploadSuccess(response, file, prop) {
+			console.log('response', response);
+			if (response.code != 0) {
+				this.$modal.msgError('上传失败: ', response.msg || '-');
+				return;
+			}
 			this.form.files.push({
 				fileName: file.name,
 				fileUrl: response.data,

From ed65bd7f301336051538d5a3639f31711079825f Mon Sep 17 00:00:00 2001
From: lb <liubin_9396@163.com>
Date: Wed, 21 Feb 2024 16:39:43 +0800
Subject: [PATCH 26/40] update check record

---
 src/views/specialEquipment/check/Record.vue | 98 +++++++++++++--------
 1 file changed, 62 insertions(+), 36 deletions(-)

diff --git a/src/views/specialEquipment/check/Record.vue b/src/views/specialEquipment/check/Record.vue
index 30407ac9..59657d3c 100644
--- a/src/views/specialEquipment/check/Record.vue
+++ b/src/views/specialEquipment/check/Record.vue
@@ -80,7 +80,7 @@ export default {
 	data() {
 		return {
 			addOrUpdateVisible: false,
-			searchBarKeys: ['equipmentId', 'actualTime', 'specialType'],
+			searchBarKeys: ['name', 'actualCheckTime'],
 			tableBtn: [
 				this.$auth.hasPermi('equipment:check-record:detail')
 					? {
@@ -102,43 +102,69 @@ export default {
 					: undefined,
 			].filter((v) => v),
 			tableProps: [
-				{ prop: 'configName', label: '配置名称' },
-				{ prop: 'equipmentName', label: '设备名称' },
+				{ prop: 'name', label: '巡检单名称' },
+				{ prop: 'department', label: '部门' },
+				{ prop: 'actualCheckTime', label: '巡检时间', filter: parseTime },
+				{ prop: 'groupClass', label: '班次' },
 				{
-					prop: 'origin',
-					label: '数据来源',
-					filter: (val) => ['', '手动', 'PDA'][val],
+					prop: '_detail',
+					label: '巡检内容',
+					subcomponent: {
+						name: 'ViewDetail',
+						props: ['injectData'],
+						data() {
+							return {};
+						},
+						methods: {
+							handleClick() {
+								this.$emit('emitData', {
+									action: this.injectData.label,
+									value: this.injectData,
+								});
+							},
+						},
+						render: function (h) {
+							return (
+								<el-button type="text" onClick={this.handleClick}>
+									详情
+								</el-button>
+							);
+						},
+					},
 				},
-				// { prop: 'sectionName', label: '计划巡检时间' },
-				{ prop: 'actualTime', label: '实际巡检时间', filter: parseTime },
-				// { prop: 'maintenanceDetail', label: '完成状态' },
-				{ prop: 'responsible', label: '巡检人' },
+				{ prop: 'remark', label: '备注' },
 			],
 			searchBarFormConfig: [
+				// {
+				// 	type: 'select',
+				// 	label: '设备大类',
+				// 	placeholder: '请选择设备大类',
+				// 	param: 'specialType',
+				// 	onchange: true,
+				// 	selectOptions: [
+				// 		{ id: 1, name: '安全设备' },
+				// 		{ id: 2, name: '消防设备' },
+				// 		{ id: 3, name: '特种设备' },
+				// 	],
+				// 	filterable: true,
+				// },
+				// {
+				// 	type: 'select',
+				// 	label: '设备',
+				// 	placeholder: '请选择设备',
+				// 	param: 'equipmentId',
+				// 	filterable: true,
+				// },
 				{
-					type: 'select',
-					label: '设备大类',
-					placeholder: '请选择设备大类',
-					param: 'specialType',
-					onchange: true,
-					selectOptions: [
-						{ id: 1, name: '安全设备' },
-						{ id: 2, name: '消防设备' },
-						{ id: 3, name: '特种设备' },
-					],
-					filterable: true,
-				},
-				{
-					type: 'select',
-					label: '设备',
-					placeholder: '请选择设备',
-					param: 'equipmentId',
-					filterable: true,
+					type: 'input',
+					label: '巡检单名称',
+					placeholder: '请输入巡检单名称',
+					param: 'name',
 				},
 				// 开始结束时间
 				{
 					type: 'datePicker',
-					label: '时间段',
+					label: '巡检时间',
 					dateType: 'daterange', // datetimerange
 					format: 'yyyy-MM-dd',
 					valueFormat: 'yyyy-MM-dd HH:mm:ss',
@@ -146,7 +172,7 @@ export default {
 					startPlaceholder: '开始日期',
 					endPlaceholder: '结束日期',
 					defaultTime: ['00:00:00', '23:59:59'],
-					param: 'actualTime',
+					param: 'actualCheckTime',
 					// width: 350,
 				},
 				{
@@ -252,21 +278,20 @@ export default {
 			queryParams: {
 				pageNo: 1,
 				pageSize: 10,
-				maintenanceStatus: null,
-				createTime: null,
-				equipmentId: null,
+				actualTime: null,
+				configId: null,
 				special: true,
 				specialType: null,
 			},
 			// 表单参数
 			form: {},
-			basePath: '/base/equipment-check-log',
+			basePath: '/base/equipment-check-order',
 			mode: null,
 			allSpecialEquipments: [],
 		};
 	},
 	created() {
-		this.initSearchBar();
+		// this.initSearchBar();
 		this.getList();
 	},
 	methods: {
@@ -303,7 +328,8 @@ export default {
 			this.loading = true;
 			// 执行查询
 			this.recv(this.queryParams).then((response) => {
-				this.list = response.data.list;
+				// this.list = response.data.list;
+				this.list = [{}];
 				this.total = response.data.total;
 				this.loading = false;
 			});

From 95a4b336f8af78368dd8071d955f55faee3959e0 Mon Sep 17 00:00:00 2001
From: lb <liubin_9396@163.com>
Date: Wed, 21 Feb 2024 16:55:35 +0800
Subject: [PATCH 27/40] update

---
 src/views/specialEquipment/check/Config.vue | 80 ++++++++++-----------
 1 file changed, 36 insertions(+), 44 deletions(-)

diff --git a/src/views/specialEquipment/check/Config.vue b/src/views/specialEquipment/check/Config.vue
index 1467c77d..a241e7f0 100644
--- a/src/views/specialEquipment/check/Config.vue
+++ b/src/views/specialEquipment/check/Config.vue
@@ -2,7 +2,7 @@
     filename: Content.vue
     author: liubin
     date: 2023-12-12 13:53:22
-    description: 
+    description: 巡检单设置
 -->
 
 <template>
@@ -59,6 +59,7 @@
 import basicPageMixin from '@/mixins/lb/basicPageMixin';
 import addOrUpdata from './add-or-updata.vue';
 import add from './add.vue';
+import { parseTime } from '../../core/mixins/code-filter';
 
 export default {
 	name: 'SpecialEquipmentCheckConfig',
@@ -68,7 +69,7 @@ export default {
 		return {
 			addOrUpdateVisible: false,
 			addOrEditTitle: '',
-			searchBarKeys: ['equipmentId', 'name', 'specialType'],
+			searchBarKeys: ['name'],
 			tableBtn: [
 				this.$auth.hasPermi('equipment:check-setting:addInsp')
 					? {
@@ -99,55 +100,49 @@ export default {
 			tableProps: [
 				{
 					prop: 'name',
-					label: '配置名',
-					width: 110,
+					label: '巡检单名称',
+					width: 100,
 					showOverflowtooltip: true,
 				},
-				{ prop: 'lineName', label: '产线', showOverflowtooltip: true },
 				{
-					prop: 'equipmentCategory',
-					label: '设备大类',
-					filter: (val) =>
-						val != null ? ['-', '安全', '消防', '特种'][val] : '-',
-				},
-				{ prop: 'equipmentName', label: '设备', showOverflowtooltip: true },
-				{
-					prop: 'equipmentCode',
-					label: '设备编码',
-					minWidth: 150,
+					prop: 'code',
+					label: '巡检单编码',
 					showOverflowtooltip: true,
 				},
-				{ prop: 'responsible', label: '负责人' },
-				{ prop: 'remark', label: '描述' },
-				{ prop: 'checkNumber', label: '巡检条数' }, // TODO: 操作 选项，四个，群里询问
+				{
+					prop: 'department',
+					label: '部门',
+					width: 100,
+					showOverflowtooltip: true,
+				},
+				{
+					prop: 'planCheckTime',
+					label: '计划巡检时间',
+					showOverflowtooltip: true,
+					filter: parseTime,
+				},
+				{
+					prop: 'confirmTimeLimit',
+					label: '确认时限',
+					showOverflowtooltip: true,
+				},
+				{ prop: 'groupClass', label: '班次', showOverflowtooltip: true },
+				{ prop: 'creator', label: '创建人', showOverflowtooltip: true },
+				{
+					prop: 'createTime',
+					label: '创建时间',
+					showOverflowtooltip: true,
+					filter: parseTime,
+				},
+				{ prop: 'remark', label: '备注' },
 			],
 			searchBarFormConfig: [
 				{
 					type: 'input',
-					label: '配置名称',
-					placeholder: '请输入配置名称',
+					label: '巡检单名称',
+					placeholder: '请输入巡检单名称',
 					param: 'name',
 				},
-				{
-					type: 'select',
-					label: '设备大类',
-					placeholder: '请选择设备大类',
-					param: 'specialType',
-					onchange: true,
-					selectOptions: [
-						{ id: 1, name: '安全设备' },
-						{ id: 2, name: '消防设备' },
-						{ id: 3, name: '特种设备' },
-					],
-					filterable: true,
-				},
-				{
-					type: 'select',
-					label: '设备名称',
-					placeholder: '请选择设备',
-					param: 'equipmentId',
-					filterable: true,
-				},
 				{
 					type: 'button',
 					btnName: '查询',
@@ -226,14 +221,11 @@ export default {
 			queryParams: {
 				pageNo: 1,
 				pageSize: 10,
-				equipmentId: null,
 				name: null,
-				special: true,
-				specialType: null,
 			},
 			// 表单参数
 			form: {},
-			basePath: '/base/equipment-check-config',
+			basePath: '/base/equipment-check-order',
 			mode: null,
 			allSpecialEquipments: [],
 		};

From ef354732b48e06bc47f0dbae11a4e4e5965e69cf Mon Sep 17 00:00:00 2001
From: lb <liubin_9396@163.com>
Date: Thu, 22 Feb 2024 11:21:59 +0800
Subject: [PATCH 28/40] =?UTF-8?q?update=20=E5=B7=A1=E6=A3=80=E5=8D=95?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/specialEquipment/check/Config.vue |  10 +-
 src/views/specialEquipment/check/add.vue    | 236 ++++++++++++--------
 2 files changed, 153 insertions(+), 93 deletions(-)

diff --git a/src/views/specialEquipment/check/Config.vue b/src/views/specialEquipment/check/Config.vue
index a241e7f0..aa90d951 100644
--- a/src/views/specialEquipment/check/Config.vue
+++ b/src/views/specialEquipment/check/Config.vue
@@ -122,9 +122,14 @@ export default {
 					filter: parseTime,
 				},
 				{
+					width: 144,
 					prop: 'confirmTimeLimit',
 					label: '确认时限',
 					showOverflowtooltip: true,
+					filter: (val) =>
+						val != null && val > 24
+							? `${(val - (val % 24)) / 24}天${val % 24}小时`
+							: `${val}小时`,
 				},
 				{ prop: 'groupClass', label: '班次', showOverflowtooltip: true },
 				{ prop: 'creator', label: '创建人', showOverflowtooltip: true },
@@ -282,10 +287,9 @@ export default {
 		},
 		/** 取消按钮 */
 		cancel() {
-			this.$refs.add.formClear();
+			this.$refs.add.reset();
 			this.open = false;
 			this.title = '';
-			// this.reset();
 		},
 		/** 表单重置 */
 		reset() {
@@ -315,7 +319,7 @@ export default {
 			this.title = '添加巡检设置';
 			this.$nextTick(() => {
 				this.$refs.add.init();
-			});
+			})
 		},
 		/** 修改按钮操作 */
 		handleUpdate(row) {
diff --git a/src/views/specialEquipment/check/add.vue b/src/views/specialEquipment/check/add.vue
index 2a155d4d..07b19559 100644
--- a/src/views/specialEquipment/check/add.vue
+++ b/src/views/specialEquipment/check/add.vue
@@ -7,63 +7,81 @@
 -->
 <template>
 	<el-form
+		ref="form"
 		:model="dataForm"
 		:rules="dataRule"
-		ref="dataForm"
 		@keyup.enter.native="dataFormSubmit()"
-		label-width="80px">
+		label-width="128px"
+		v-loading="formLoading"
+		label-position="top">
 		<el-row :gutter="20">
-			<el-col :span="12">
-				<el-form-item label="配置名称" prop="name">
-					<el-input v-model="dataForm.name" placeholder="请输入配置名称" />
+			<el-col>
+				<el-form-item label="巡检单名称" prop="name">
+					<el-input v-model="dataForm.name" placeholder="请输入巡检单名称" />
 				</el-form-item>
 			</el-col>
-			<el-col :span="12">
-				<el-form-item label="配置编码" prop="code">
-					<el-input v-model="dataForm.code" placeholder="请输入配置编码" />
+			<el-col>
+				<el-form-item label="巡检单编码" prop="code">
+					<el-input v-model="dataForm.code" placeholder="请输入巡检单编码" />
 				</el-form-item>
 			</el-col>
-			<el-col :span="12">
+			<el-col>
 				<el-form-item
-					label="设备大类"
-					prop="equipmentCategory"
-					:rules="[
-						{ required: true, message: '请选择设备大类', trigger: 'blur' },
-					]">
+					label="部门"
+					prop="departmentId"
+					:rules="[{ required: true, message: '请选择部门', trigger: 'blur' }]">
 					<el-select
-						v-model="dataForm.equipmentCategory"
-						:placeholder="`请选择设备大类`"
-						@change="handleEqTypeChange">
+						v-model="dataForm.departmentId"
+						:placeholder="`请选择部门`">
 						<el-option
-							v-for="opt in equipmentTypeOptions"
+							v-for="opt in departmentOptions"
 							:key="opt.value"
 							:label="opt.label"
 							:value="opt.value" />
 					</el-select>
 				</el-form-item>
 			</el-col>
+			<el-col>
+				<el-form-item label="计划巡检时间" prop="planCheckTime">
+					<el-date-picker
+						v-model="dataForm.planCheckTime"
+						type="datetime"
+						:placeholder="`请选择计划巡检时间`"
+						value-format="timestamp" />
+				</el-form-item>
+			</el-col>
 			<el-col :span="12">
-				<el-form-item label="设备名称" prop="equipmentId">
+				<el-form-item label="确认时限 (时)" prop="confirmTimeLimit">
+					<el-input
+						v-model="dataForm.confirmTimeLimit"
+						:placeholder="`请输入确认时限`" />
+					<!-- <el-date-picker
+						v-model="dataForm.confirmTimeLimit"
+						type="datetime"
+						:placeholder="`请选择确认时限`"
+						value-format="timestamp" /> -->
+				</el-form-item>
+			</el-col>
+			<el-col :span="12">
+				<el-form-item label="班次" prop="groupClass">
 					<el-select
-						v-model="dataForm.equipmentId"
+						v-model="dataForm.groupClass"
 						filterable
+						clearable
+						multiple
 						style="width: 100%"
-						placeholder="请选择设备名称"
-						@change="setCode">
+						placeholder="请选择班次">
 						<el-option
-							v-for="d in equipmentOptions"
+							v-for="d in groupOptions"
 							:key="d.value"
 							:label="d.label"
 							:value="d.value" />
 					</el-select>
 				</el-form-item>
 			</el-col>
-			<el-col :span="12">
-				<el-form-item label="设备编码" prop="equipmentCode">
-					<el-input
-						v-model="dataForm.equipmentCode"
-						disabled
-						placeholder="请输入设备编码" />
+			<el-col>
+				<el-form-item label="备注" prop="remark">
+					<el-input v-model="dataForm.remark" placeholder="请输入备注" />
 				</el-form-item>
 			</el-col>
 		</el-row>
@@ -71,89 +89,127 @@
 </template>
 
 <script>
-import basicAdd from '../../core/mixins/basic-add';
-import {
-	getEqCheck,
-	getCode,
-	createCheckConfig,
-	updateCheckConfig,
-} from '@/api/equipment/base/inspection/settings';
-import { getEquipmentAll } from '@/api/base/equipment';
-
 export default {
-	mixins: [basicAdd],
 	data() {
 		return {
-			urlOptions: {
-				isGetCode: true,
-				codeURL: getCode,
-				createURL: createCheckConfig,
-				updateURL: updateCheckConfig,
-				infoURL: getEqCheck,
-			},
+			formLoading: false,
 			dataForm: {
-				id: undefined,
-				code: undefined,
-				name: undefined,
-				equipmentId: undefined,
-				equipmentCode: undefined,
-				equipmentCategory: undefined,
+				id: null,
+				code: null,
+				name: null,
+				departmentId: null,
+				planCheckTime: null,
+				confirmTimeLimit: null,
+				groupClass: null,
+				remark: null,
+				// special: true,
 			},
-			eqList: [],
 			dataRule: {
-				equipmentId: [
-					{ required: true, message: '设备不能为空', trigger: 'blur' },
+				confirmTimeLimit: [
+					{ required: true, message: '确认时限不能为空', trigger: 'blur' },
 				],
 				code: [
-					{ required: true, message: '配置编码不能为空', trigger: 'blur' },
+					{ required: true, message: '巡检单编码不能为空', trigger: 'blur' },
 				],
 				name: [
-					{ required: true, message: '配置名称不能为空', trigger: 'blur' },
+					{ required: true, message: '巡检单名称不能为空', trigger: 'blur' },
+				],
+				planCheckTime: [
+					{ required: true, message: '计划巡检时间不能为空', trigger: 'blur' },
 				],
 			},
 			equipmentOptions: [],
-			equipmentTypeOptions: [
-				{ label: '安全设备', value: 1 },
-				{ label: '消防设备', value: 2 },
-				{ label: '特种设备', value: 3 },
-			],
+			groupOptions: [],
+			departmentOptions: [],
 		};
 	},
 	mounted() {
-		this.getDict();
+		this.initOptions();
 	},
 	methods: {
-		async getDict() {
-			// 设备列表
-			const res = await getEquipmentAll();
-			this.eqList = res.data;
-			this.$nextTick(() => {
-				this.handleEqTypeChange();
-			});
+		reset() {
+			this.dataForm = {
+				id: null,
+				code: null,
+				name: null,
+				departmentId: null,
+				planCheckTime: null,
+				confirmTimeLimit: null,
+				groupClass: null,
+				remark: null,
+				// special: true,
+			};
 		},
-		setCode() {
-			const chooseM = this.eqList.filter((item) => {
-				return item.id === this.dataForm.equipmentId;
-			});
-			this.dataForm.equipmentCode = chooseM[0].code;
-		},
-		// handlers
-		handleEqTypeChange(type) {
-			this.dataForm.equipmentId = null;
-			this.dataForm.equipmentCode = null;
-			if (type) {
-				this.equipmentOptions = this.eqList
-					.filter((item) => item.special)
-					.filter((item) => item.specialType === type)
-					.map((item) => ({ label: item.name, value: item.id }));
-			} else
-				this.equipmentOptions = this.eqList
-					.filter((item) => item.special)
-					.map((item) => ({
+
+		async initOptions() {
+			this.formLoading = true;
+			const urls = [
+				'/base/core-department/listAll',
+				'/base/group-classes/listAll',
+				'/base/equipment-check-order/getCode',
+			];
+			try {
+				const [dpt, grp, code] = await Promise.all(
+					urls.map((url) => this.$axios(url))
+				);
+				if (dpt.code == 0) {
+					this.departmentOptions = dpt.data.map((item) => ({
 						label: item.name,
 						value: item.id,
 					}));
-			// this.$emit('update', this.form)
+				}
+				if (grp.code == 0) {
+					this.groupOptions = grp.data.map((item) => ({
+						label: item.name,
+						value: item.id,
+					}));
+				}
+				if (code.code == 0) {
+					this.dataForm.code = code.data;
+				}
+				this.formLoading = false;
+			} catch (err) {
+				this.formLoading = false;
+				console.error(err);
+			}
+		},
+
+		async init(row) {
+			if (!row || !row.id) {
+				this.dataForm.planCheckTime = new Date().setHours(8, 0, 0, 0);
+				return;
+			}
+			const res = await this.$axios({
+				url: '/base/equipment-check-order/get?id=' + row.id,
+			});
+			if (res.code == 0) {
+				Object.keys(this.dataForm).forEach((key) => {
+					this.dataForm[key] = res.data[key];
+				});
+			}
+		},
+
+		async dataFormSubmit() {
+			let valid = false;
+			try {
+				valid = await this.$refs.form.validate();
+			} catch (err) {}
+			if (!valid) return;
+			const res = await this.$axios({
+				url:
+					'/base/equipment-check-order' +
+					(this.dataForm.id ? '/update' : '/create'),
+				method: this.dataForm.id ? 'put' : 'post',
+				data: {
+					...this.dataForm,
+					special: true,
+					groupClass: this.dataForm.groupClass.join(','),
+				},
+			});
+			if (res.code == 0) {
+				this.$emit('refreshDataList');
+				this.$message.success(this.dataForm.id ? '更新成功' : '创建成功');
+			}
 		},
 	},
 };

From 9ad83f84faa41f811b33b78ffc87930d39fc7cd6 Mon Sep 17 00:00:00 2001
From: lb <liubin_9396@163.com>
Date: Thu, 22 Feb 2024 16:11:30 +0800
Subject: [PATCH 29/40] =?UTF-8?q?update=20=E5=B7=A1=E6=A3=80=E5=8D=95?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/specialEquipment/check/Config.vue   |  76 ++------
 src/views/specialEquipment/check/Record.vue   |   5 +-
 .../specialEquipment/check/add-or-updata.vue  | 113 +++++-------
 src/views/specialEquipment/check/add.vue      |   6 +-
 src/views/specialEquipment/check/attr-add.vue | 162 +++++++++++-------
 5 files changed, 160 insertions(+), 202 deletions(-)

diff --git a/src/views/specialEquipment/check/Config.vue b/src/views/specialEquipment/check/Config.vue
index aa90d951..1ec798e2 100644
--- a/src/views/specialEquipment/check/Config.vue
+++ b/src/views/specialEquipment/check/Config.vue
@@ -84,12 +84,12 @@ export default {
 							btnName: '修改',
 					  }
 					: undefined,
-				this.$auth.hasPermi('equipment:check-setting:update')
-					? {
-							type: 'detail',
-							btnName: '查看详情',
-					  }
-					: undefined,
+				// this.$auth.hasPermi('equipment:check-setting:update')
+				// 	? {
+				// 			type: 'detail',
+				// 			btnName: '查看详情',
+				// 	  }
+				// 	: undefined,
 				this.$auth.hasPermi('equipment:check-setting:delete')
 					? {
 							type: 'delete',
@@ -175,51 +175,6 @@ export default {
 				// 	color: 'warning',
 				// },
 			],
-			rows: [
-				[
-					{
-						input: true,
-						label: '配置名称',
-						prop: 'name',
-						rules: [
-							{ required: true, message: '配置名称不能为空', trigger: 'blur' },
-						],
-					},
-					{
-						input: true,
-						label: '配置编码',
-						prop: 'code',
-						url: '/base/equipment-check-config/getCode',
-						rules: [
-							{ required: true, message: '配置编码不能为空', trigger: 'blur' },
-						],
-					},
-				],
-				[
-					{
-						select: true,
-						label: '设备名称',
-						prop: 'equipmentId',
-						url: '/base/core-equipment/listAll',
-						bind: {
-							filterable: true,
-							clearable: true,
-						},
-						rules: [
-							{
-								required: true,
-								message: '设备名称不能为空',
-								trigger: 'change',
-							},
-						],
-					},
-					{
-						input: true,
-						label: '设备编码', // TODO: 和设备名称联动估计
-						prop: 'equipmentCode',
-					},
-				],
-			],
 			// 是否显示弹出层
 			open: false,
 			// 查询参数
@@ -227,6 +182,7 @@ export default {
 				pageNo: 1,
 				pageSize: 10,
 				name: null,
+				status: 0,
 			},
 			// 表单参数
 			form: {},
@@ -314,26 +270,18 @@ export default {
 		},
 		/** 新增按钮操作 */
 		handleAdd() {
-			// this.reset();
 			this.open = true;
 			this.title = '添加巡检设置';
 			this.$nextTick(() => {
 				this.$refs.add.init();
-			})
+			});
 		},
 		/** 修改按钮操作 */
 		handleUpdate(row) {
-			// this.reset();
-			// const id = row.id;
-			// this.info({ id }).then((response) => {
-			// 	this.form = response.data;
-			// 	this.open = true;
-			// 	this.title = '修改巡检设置';
-			// });
 			this.open = true;
 			this.title = '修改巡检设置';
 			this.$nextTick(() => {
-				this.$refs.add.init(row.id);
+				this.$refs.add.init(row);
 			});
 		},
 		/** 提交按钮 */
@@ -397,11 +345,11 @@ export default {
 				this.$refs.addOrUpdate.init(id, true);
 			});
 		},
-		handleAddDetail({ id }) {
+		handleAddDetail(row) {
 			this.addOrUpdateVisible = true;
-			this.addOrEditTitle = '添加巡检';
+			this.addOrEditTitle = '添加内容';
 			this.$nextTick(() => {
-				this.$refs.addOrUpdate.init(id);
+				this.$refs.addOrUpdate.init(row);
 			});
 		},
 		/** 导出按钮操作 */
diff --git a/src/views/specialEquipment/check/Record.vue b/src/views/specialEquipment/check/Record.vue
index 59657d3c..59de97e6 100644
--- a/src/views/specialEquipment/check/Record.vue
+++ b/src/views/specialEquipment/check/Record.vue
@@ -379,10 +379,7 @@ export default {
 			this.handleQuery();
 		},
 		/** 新增按钮操作 */
-		handleAdd() {
-			// this.reset();
-			// this.open = true;
-			// this.title = '添加维修记录';
+		handleAdd() { 
 			this.addOrUpdateVisible = true;
 			this.$nextTick(() => {
 				this.$refs.addOrUpdate.init();
diff --git a/src/views/specialEquipment/check/add-or-updata.vue b/src/views/specialEquipment/check/add-or-updata.vue
index 8bab0ca7..bdf46a00 100644
--- a/src/views/specialEquipment/check/add-or-updata.vue
+++ b/src/views/specialEquipment/check/add-or-updata.vue
@@ -1,8 +1,8 @@
 <!--
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
- * @LastEditors: DY
- * @LastEditTime: 2023-12-01 11:02:43
+ * @LastEditors: lb
+ * @LastEditTime: 2024-02-22 11:02:43
  * @Description:
 -->
 <template>
@@ -24,7 +24,7 @@
 					@keyup.enter.native="dataFormSubmit()"
 					label-position="top">
 					<el-row :gutter="20">
-						<el-col :span="8">
+						<!-- <el-col :span="8">
 							<el-form-item label="设备大类" prop="equipmentCategory">
 								<span>
 									{{
@@ -34,21 +34,20 @@
 									}}
 								</span>
 							</el-form-item>
-						</el-col>
+						</el-col> -->
 						<el-col :span="8">
-							<el-form-item label="设备名称" prop="equipmentName">
-								{{ dataForm.equipmentName }}
-								<!-- <el-input v-model="dataForm.equipmentName" disabled clearable placeholder="请输入设备名称" /> -->
+							<el-form-item label="巡检单名称" prop="name">
+								{{ dataForm.name }}
 							</el-form-item>
 						</el-col>
 						<el-col :span="8">
-							<el-form-item label="设备编码" prop="equipmentCode">
-								{{ dataForm.equipmentCode }}
-								<!-- <el-input
-									v-model="dataForm.equipmentCode"
-									clearable
-									disabled
-									placeholder="请输入设备编码" /> -->
+							<el-form-item label="部门" prop="department">
+								{{ dataForm.department }}
+							</el-form-item>
+						</el-col>
+						<el-col :span="8">
+							<el-form-item label="巡检时间" prop="planCheckTime">
+								{{ dataForm.planCheckTime | parseTime }}
 							</el-form-item>
 						</el-col>
 					</el-row>
@@ -87,8 +86,8 @@
 						@clickBtn="handleClick" />
 				</base-table>
 				<pagination
-					v-show="listQuery.total > 0"
-					:total="listQuery.total"
+					v-show="checkDetList.total > 0"
+					:total="checkDetList.total"
 					:page.sync="listQuery.pageNo"
 					:limit.sync="listQuery.pageSize"
 					:page-sizes="[5, 10, 15]"
@@ -103,20 +102,17 @@
 		<attr-add
 			v-if="addOrUpdateVisible"
 			ref="addOrUpdate"
-			:config-id="dataForm.id"
+			:orderId="dataForm.id"
+			@closed="addOrUpdateVisible = false"
 			@refreshDataList="getList" />
 	</el-drawer>
 </template>
 
 <script>
-import {
-	getEqCheck,
-	getCheckDetPage,
-	deleteCheckDet,
-} from '@/api/equipment/base/inspection/settings';
 import SmallTitle from './SmallTitle';
 import attrAdd from './attr-add';
 import { DICT_TYPE, getDictDatas } from '@/utils/dict';
+import { parseTime } from '../../core/mixins/code-filter';
 
 const tableBtn = [
 	{
@@ -129,50 +125,35 @@ const tableBtn = [
 	},
 ];
 const tableProps = [
+	{
+		prop: 'equipmentName',
+		label: '设备名称',
+	},
 	{
 		prop: 'program',
-		label: '巡检项目',
-	},
-	{
-		prop: 'content',
-		label: '巡检内容',
-	},
-	{
-		prop: 'code',
-		label: '巡检内容编码',
-	},
-	{
-		prop: 'description',
-		label: '备注',
+		label: '检查项目',
 	},
 ];
 
 export default {
 	components: { SmallTitle, attrAdd },
+	filters: {
+		parseTime,
+	},
 	data() {
 		return {
 			tableBtn,
 			tableProps,
 			addOrUpdateVisible: false,
-			urlOptions: {
-				infoURL: getEqCheck,
-			},
 			listQuery: {
 				pageSize: 10,
 				pageNo: 1,
-				total: 0,
 			},
 			dataForm: {
 				id: undefined,
-				code: undefined,
-				name: '',
-				materialType: undefined,
-				productType: undefined,
-				area: undefined,
-				specifications: undefined,
-				processTime: 0,
-				remark: undefined,
-				unit: undefined,
+				name: undefined,
+				department: undefined,
+				planCheckTime: undefined,
 			},
 			checkDetList: [],
 			visible: false,
@@ -204,7 +185,7 @@ export default {
 	methods: {
 		initData() {
 			this.checkDetList.splice(0);
-			this.listQuery.total = 0;
+			this.checkDetList.total = 0;
 		},
 		handleClick(raw) {
 			if (raw.type === 'delete') {
@@ -231,39 +212,35 @@ export default {
 					})
 					.catch(() => {});
 			} else {
-				this.addNew(raw.data.id);
+				console.log('handle click....', raw);
+				this.addNew(raw.data);
 			}
 		},
-		getList() {
+		async getList() {
 			// 获取巡检项目分页
-			getCheckDetPage({
-				...this.listQuery,
-				configId: this.dataForm.id,
-			}).then((response) => {
-				this.checkDetList = response.data.list;
-				this.listQuery.total = response.data.total;
+			const res = await this.$axios({
+				url: '/base/equipment-check-order-det/page',
+				params: { ...this.listQuery, orderId: this.dataForm.id },
 			});
+			if (res.code == 0) {
+				this.checkDetList = res.data.list;
+				this.checkDetList.total = res.data.total;
+			}
 		},
-		init(id, isdetail) {
+		init(row, isdetail) {
 			this.initData();
 			this.isdetail = isdetail || false;
-			this.dataForm.id = id || undefined;
+			this.dataForm.id = row.id;
 			this.visible = true;
 
 			this.$nextTick(() => {
 				this.$refs['dataForm'].resetFields();
-
 				if (this.dataForm.id) {
-					// 获取设备巡检详情
-					this.urlOptions.infoURL(id).then((response) => {
-						this.dataForm = response.data;
-					});
 					// 获取设备项目列表
+					Object.keys(this.dataForm).forEach((key) => {
+						this.dataForm[key] = row[key];
+					});
 					this.getList();
-				} else {
-					if (this.urlOptions.isGetCode) {
-						this.getCode();
-					}
 				}
 			});
 		},
diff --git a/src/views/specialEquipment/check/add.vue b/src/views/specialEquipment/check/add.vue
index 07b19559..3c41bf49 100644
--- a/src/views/specialEquipment/check/add.vue
+++ b/src/views/specialEquipment/check/add.vue
@@ -75,7 +75,7 @@
 							v-for="d in groupOptions"
 							:key="d.value"
 							:label="d.label"
-							:value="d.value" />
+							:value="d.label" />
 					</el-select>
 				</el-form-item>
 			</el-col>
@@ -185,6 +185,9 @@ export default {
 			if (res.code == 0) {
 				Object.keys(this.dataForm).forEach((key) => {
 					this.dataForm[key] = res.data[key];
+					if (key == 'groupClass') {
+						this.dataForm.groupClass = res.data.groupClass.split(',')
+					}
 				});
 			}
 		},
@@ -203,6 +206,7 @@ export default {
 				data: {
 					...this.dataForm,
 					special: true,
+					status: 0,
 					groupClass: this.dataForm.groupClass.join(','),
 				},
 			});
diff --git a/src/views/specialEquipment/check/attr-add.vue b/src/views/specialEquipment/check/attr-add.vue
index 9913f677..03252fdf 100644
--- a/src/views/specialEquipment/check/attr-add.vue
+++ b/src/views/specialEquipment/check/attr-add.vue
@@ -4,6 +4,7 @@
 		:width="'30%'"
 		:append-to-body="true"
 		:close-on-click-modal="false"
+		@closed="$emit('closed')"
 		class="dialog">
 		<template #title>
 			<slot name="title">
@@ -17,18 +18,33 @@
 			ref="dataForm"
 			:model="dataForm"
 			:rules="dataRule"
-			label-width="60px"
+			label-width="90px"
+			v-loading="formLoading"
 			@keyup.enter.native="dataFormSubmit()">
-			<el-form-item label="巡检" prop="checkId">
-				<el-select v-model="dataForm.checkId" filterable placeholder="请选择巡检" style="width: 100%">
-					<el-option v-for="dict in checkList" :key="dict.id" :label="dict.content"
-						:value="dict.id" />
+			<el-form-item label="设备名称" prop="equipmentId">
+				<el-select
+					v-model="dataForm.equipmentId"
+					filterable
+					clearable
+					placeholder="请选择设备名称"
+					style="width: 100%">
+					<el-option
+						v-for="dict in equipmentOptions"
+						:key="dict.value"
+						:label="dict.label"
+						:value="dict.value" />
 				</el-select>
 			</el-form-item>
-			<el-form-item label="备注" prop="description">
+			<el-form-item label="巡检项目" prop="program">
 				<el-input
-					v-model="dataForm.description"
-					placeholder="请输入备注"
+					v-model="dataForm.program"
+					placeholder="请输入巡检项目"
+					clearable />
+			</el-form-item>
+			<el-form-item label="巡检结果" prop="checkResult">
+				<el-input
+					v-model="dataForm.checkResult"
+					placeholder="请输入巡检结果"
 					clearable />
 			</el-form-item>
 		</el-form>
@@ -41,80 +57,96 @@
 </template>
 
 <script>
-import { getCheckDet, createCheckDet, updateCheckDet, getcheckList } from "@/api/equipment/base/inspection/settings";
-
 export default {
-	props: {
-		configId: {
-			type: String,
-			default: '',
-		},
-	},
+	props: ['orderId'],
 	data() {
 		return {
 			visible: false,
 			dataForm: {
-				id: undefined,
-				checkId: undefined,
-				configId: undefined,
-				description: ''
+				id: null,
+				equipmentId: null,
+				program: null,
+				checkResult: null,
 			},
-			checkList: [],
+			formLoading: false,
+			equipmentOptions: [],
 			dataRule: {
-				checkId: [{ required: true, message: '巡检不能为空', trigger: 'blur' }],
+				equipmentId: [
+					{ required: true, message: '设备不能为空', trigger: 'blur' },
+				],
+				program: [
+					{ required: true, message: '巡检项目不能为空', trigger: 'blur' },
+				],
+				checkResult: [
+					{ required: true, message: '巡检结果不能为空', trigger: 'blur' },
+				],
 			},
 		};
 	},
 	mounted() {
-		this.getDict()
+		this.initOptions();
 	},
 	methods: {
-		async getDict() {
-			const res = await getcheckList()
-			this.checkList = res.data
-		},
-		init(id) {
-			this.dataForm.id = id || '';
-			this.visible = true;
-			this.$nextTick(() => {
-				this.$refs['dataForm'].resetFields();
-				if (this.dataForm.id) {
-					getCheckDet(this.dataForm.id).then((res) => {
-						// const { name, value } = res.data;
-						// this.dataForm.name = name;
-						// this.dataForm.value = value;
-						this.dataForm = res.data
-					});
+		async initOptions() {
+			this.formLoading = true;
+			const urls = [
+				'/base/core-equipment/page?pageNo=1&pageSize=100&special=true',
+			];
+			try {
+				const [eq] = await Promise.all(urls.map((url) => this.$axios(url)));
+				if (eq.code == 0) {
+					this.equipmentOptions = eq.data.list.map((item) => ({
+						label: item.name,
+						value: item.id,
+					}));
 				}
-			});
+				this.formLoading = false;
+			} catch (err) {
+				this.formLoading = false;
+				console.error(err);
+			}
+		},
+		init(row) {
+			this.visible = true;
+			if (row?.id) {
+				this.$nextTick(() => {
+					this.$refs['dataForm'].resetFields();
+					this.formLoading = true;
+					this.$axios({
+						url: '/base/equipment-check-order-det/get?id=' + row.id,
+					}).then((res) => {
+						Object.keys(this.dataForm).forEach((key) => {
+							this.dataForm[key] = res.data[key];
+						});
+						this.formLoading = false;
+					});
+				});
+			}
 		},
 		// 表单提交
-		dataFormSubmit() {
-			this.$refs['dataForm'].validate((valid) => {
-				if (valid) {
-					// 修改的提交
-					if (this.dataForm.id) {
-						updateCheckDet({
-							...this.dataForm,
-							configId: this.configId
-						}).then((response) => {
-							this.$modal.msgSuccess('修改成功');
-							this.visible = false;
-							this.$emit('refreshDataList');
-						});
-						return;
-					}
-					// 添加的提交
-					createCheckDet({
-						...this.dataForm,
-						configId: this.configId,
-					}).then((response) => {
-						this.$modal.msgSuccess('新增成功');
-						this.visible = false;
-						this.$emit('refreshDataList');
-					});
-				}
+		async dataFormSubmit() {
+			let valid = false;
+			try {
+				valid = await this.$refs['dataForm'].validate();
+			} catch (err) {}
+			if (!valid) return;
+
+			const res = await this.$axios({
+				url:
+					'base/equipment-check-order-det' +
+					(this.dataForm.id ? '/update' : '/create'),
+				method: this.dataForm.id ? 'put' : 'post',
+				data: {
+					...this.dataForm,
+					orderId: this.orderId,
+				},
 			});
+
+			if (res.code == 0) {
+				this.$modal.msgSuccess(this.dataForm.id ? '修改成功' : '新增成功');
+				this.$emit('refreshDataList');
+				this.visible = false;
+			}
 		},
 	},
 };

From 1dd7fef1710f6bb9f1afa93a953ba75d666ffa18 Mon Sep 17 00:00:00 2001
From: lb <liubin_9396@163.com>
Date: Thu, 22 Feb 2024 16:19:02 +0800
Subject: [PATCH 30/40] =?UTF-8?q?update=20=E5=B7=A1=E6=A3=80=E5=BE=85?=
 =?UTF-8?q?=E7=A1=AE=E8=AE=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/specialEquipment/check/Content.vue | 284 +++++++++++--------
 1 file changed, 165 insertions(+), 119 deletions(-)

diff --git a/src/views/specialEquipment/check/Content.vue b/src/views/specialEquipment/check/Content.vue
index d83fa097..1ec798e2 100644
--- a/src/views/specialEquipment/check/Content.vue
+++ b/src/views/specialEquipment/check/Content.vue
@@ -2,15 +2,16 @@
     filename: Content.vue
     author: liubin
     date: 2023-12-12 13:53:22
-    description: 
+    description: 巡检单设置
 -->
 
 <template>
-	<div class="app-container SpecialEquipmentCheckContent">
+	<div class="app-container SpecialEquipmentCheckConfig">
 		<!-- 搜索工作栏 -->
 		<SearchBar
 			:formConfigs="searchBarFormConfig"
 			ref="search-bar"
+			@select-changed="handleSearchBarChange"
 			@headBtnClick="handleSearchBarBtnClick" />
 
 		<!-- 列表 -->
@@ -24,7 +25,7 @@
 				v-if="tableBtn.length"
 				slot="handleBtn"
 				label="操作"
-				:width="120"
+				:width="180"
 				:method-list="tableBtn"
 				@clickBtn="handleTableBtnClick" />
 		</base-table>
@@ -43,44 +44,53 @@
 			:dialogVisible="open"
 			@close="cancel"
 			@cancel="cancel"
-			@confirm="submitForm">
-			<DialogForm
-				v-if="open"
-				ref="form"
-				v-model="form"
-				:disabled="mode == 'detail'"
-				:has-files="false"
-				:rows="rows" />
+			@confirm="handleConfirm">
+			<add ref="add" @refreshDataList="successSubmit" />
 		</base-dialog>
+		<!-- 添加巡检，查看详情 -->
+		<addOrUpdata
+			v-if="addOrUpdateVisible"
+			ref="addOrUpdate"
+			@refreshDataList="getList" />
 	</div>
 </template>
 
 <script>
-import moment from 'moment';
 import basicPageMixin from '@/mixins/lb/basicPageMixin';
-import { deleteCheck } from '@/api/equipment/base/inspection/settings';
+import addOrUpdata from './add-or-updata.vue';
+import add from './add.vue';
+import { parseTime } from '../../core/mixins/code-filter';
 
 export default {
-	name: 'SpecialEquipmentCheckContent',
-	components: {},
+	name: 'SpecialEquipmentCheckConfig',
+	components: { addOrUpdata, add },
 	mixins: [basicPageMixin],
 	data() {
 		return {
-			searchBarKeys: ['content'],
+			addOrUpdateVisible: false,
+			addOrEditTitle: '',
+			searchBarKeys: ['name'],
 			tableBtn: [
-				// this.$auth.hasPermi('equipment:check:update')
-				// 	? {
-				// 			type: 'detail',
-				// 			btnName: '详情',
-				// 	  }
-				// 	: undefined,
-				this.$auth.hasPermi('equipment:check:update')
+				this.$auth.hasPermi('equipment:check-setting:addInsp')
+					? {
+							type: 'add',
+							btnName: '添加',
+							showTip: '添加巡检',
+					  }
+					: undefined,
+				this.$auth.hasPermi('equipment:check-setting:update')
 					? {
 							type: 'edit',
 							btnName: '修改',
 					  }
 					: undefined,
-				this.$auth.hasPermi('equipment:check:delete')
+				// this.$auth.hasPermi('equipment:check-setting:update')
+				// 	? {
+				// 			type: 'detail',
+				// 			btnName: '查看详情',
+				// 	  }
+				// 	: undefined,
+				this.$auth.hasPermi('equipment:check-setting:delete')
 					? {
 							type: 'delete',
 							btnName: '删除',
@@ -88,22 +98,55 @@ export default {
 					: undefined,
 			].filter((v) => v),
 			tableProps: [
-				{ prop: 'program', label: '巡检项目', showOverflowtooltip: true },
 				{
-					prop: 'content',
-					label: '巡检内容',
-					minWidth: 150,
+					prop: 'name',
+					label: '巡检单名称',
+					width: 100,
 					showOverflowtooltip: true,
 				},
-				{ prop: 'code', label: '巡检内容编码', showOverflowtooltip: true },
-				{ prop: 'remark', label: '备注', showOverflowtooltip: true },
+				{
+					prop: 'code',
+					label: '巡检单编码',
+					showOverflowtooltip: true,
+				},
+				{
+					prop: 'department',
+					label: '部门',
+					width: 100,
+					showOverflowtooltip: true,
+				},
+				{
+					prop: 'planCheckTime',
+					label: '计划巡检时间',
+					showOverflowtooltip: true,
+					filter: parseTime,
+				},
+				{
+					width: 144,
+					prop: 'confirmTimeLimit',
+					label: '确认时限',
+					showOverflowtooltip: true,
+					filter: (val) =>
+						val != null && val > 24
+							? `${(val - (val % 24)) / 24}天${val % 24}小时`
+							: `${val}小时`,
+				},
+				{ prop: 'groupClass', label: '班次', showOverflowtooltip: true },
+				{ prop: 'creator', label: '创建人', showOverflowtooltip: true },
+				{
+					prop: 'createTime',
+					label: '创建时间',
+					showOverflowtooltip: true,
+					filter: parseTime,
+				},
+				{ prop: 'remark', label: '备注' },
 			],
 			searchBarFormConfig: [
 				{
 					type: 'input',
-					label: '巡检内容',
-					placeholder: '请输入巡检内容',
-					param: 'content',
+					label: '巡检单名称',
+					placeholder: '请输入巡检单名称',
+					param: 'name',
 				},
 				{
 					type: 'button',
@@ -115,14 +158,16 @@ export default {
 					type: 'separate',
 				},
 				{
-					type: this.$auth.hasPermi('equipment:check:create') ? 'button' : '',
+					type: this.$auth.hasPermi('equipment:check-setting:create')
+						? 'button'
+						: '',
 					btnName: '新增',
 					name: 'add',
 					plain: true,
 					color: 'success',
 				},
 				// {
-				// 	type: this.$auth.hasPermi('equipment:check:export')
+				// 	type: this.$auth.hasPermi('equipment:check-setting:export')
 				// 		? 'button'
 				// 		: '',
 				// 	btnName: '导出',
@@ -130,82 +175,62 @@ export default {
 				// 	color: 'warning',
 				// },
 			],
-			rows: [
-				[
-					{
-						input: true,
-						label: '巡检内容编号',
-						prop: 'code',
-						url: '/base/equipment-check/getCode',
-						rules: [
-							{
-								required: true,
-								message: '巡检内容编号不能为空',
-								trigger: 'blur',
-							},
-						],
-					},
-					{
-						input: true,
-						label: '巡检项目',
-						prop: 'program',
-						rules: [
-							{ required: true, message: '巡检项目不能为空', trigger: 'blur' },
-						],
-					},
-				],
-				[
-					{
-						input: true,
-						label: '巡检内容',
-						prop: 'content',
-						rules: [
-							{ required: true, message: '巡检内容不能为空', trigger: 'blur' },
-						],
-					},
-					{
-						input: true,
-						label: '备注',
-						prop: 'remark',
-					},
-				],
-			],
 			// 是否显示弹出层
 			open: false,
 			// 查询参数
 			queryParams: {
 				pageNo: 1,
 				pageSize: 10,
-				content: null,
+				name: null,
+				status: 0,
 			},
 			// 表单参数
-			form: {
-				code: '',
-				program: '',
-				id: undefined,
-				content: '',
-			},
-			basePath: '/base/equipment-check',
+			form: {},
+			basePath: '/base/equipment-check-order',
 			mode: null,
+			allSpecialEquipments: [],
 		};
 	},
 	created() {
-		// this.initSearchBar();
+		this.initSearchBar();
 		this.getList();
 	},
 	methods: {
-		// initSearchBar() {
-		// 	this.http('/base/core-equipment/listAll', 'get').then(({ data }) => {
-		// 		this.$set(
-		// 			this.searchBarFormConfig[0],
-		// 			'selectOptions',
-		// 			data.map((item) => ({
-		// 				name: item.name,
-		// 				id: item.id,
-		// 			}))
-		// 		);
-		// 	});
-		// },
+		handleConfirm() {
+			this.$refs.add.dataFormSubmit();
+		},
+		successSubmit() {
+			this.cancel();
+			this.getList();
+		},
+		initSearchBar() {
+			this.http('/base/core-equipment/listAll', 'get').then(({ data }) => {
+				this.allSpecialEquipments = data.filter((item) => item.special);
+				this.setSearchBarEquipmentList(data.filter((item) => item.special));
+			});
+		},
+		// 设备大类改变
+		handleSearchBarChange({ param, value }) {
+			if ('specialType' === param) {
+				if (!value) {
+					this.setSearchBarEquipmentList(this.allSpecialEquipments);
+					return;
+				}
+				this.setSearchBarEquipmentList(
+					this.allSpecialEquipments.filter((item) => item.specialType == value)
+				);
+			}
+		},
+		setSearchBarEquipmentList(eqList) {
+			this.$set(
+				this.searchBarFormConfig[2],
+				'selectOptions',
+				eqList.map((item) => ({
+					name: item.name,
+					id: item.id,
+				}))
+			);
+		},
 		/** 查询列表 */
 		getList() {
 			this.loading = true;
@@ -218,9 +243,9 @@ export default {
 		},
 		/** 取消按钮 */
 		cancel() {
+			this.$refs.add.reset();
 			this.open = false;
-			this.mode = null;
-			this.reset();
+			this.title = '';
 		},
 		/** 表单重置 */
 		reset() {
@@ -245,18 +270,18 @@ export default {
 		},
 		/** 新增按钮操作 */
 		handleAdd() {
-			// this.reset();
 			this.open = true;
-			this.title = '添加巡检内容';
+			this.title = '添加巡检设置';
+			this.$nextTick(() => {
+				this.$refs.add.init();
+			});
 		},
 		/** 修改按钮操作 */
 		handleUpdate(row) {
-			this.reset();
-			const id = row.id;
-			this.info({ id }).then((response) => {
-				this.form = response.data;
-				this.open = true;
-				this.title = '修改巡检内容';
+			this.open = true;
+			this.title = '修改巡检设置';
+			this.$nextTick(() => {
+				this.$refs.add.init(row);
 			});
 		},
 		/** 提交按钮 */
@@ -286,10 +311,9 @@ export default {
 		handleDelete(row) {
 			const id = row.id;
 			this.$modal
-				.confirm('是否确认删除该巡检项目?')
-				.then(function () {
-					// return this.del({ id });
-					return deleteCheck(id);
+				.confirm('是否确认删除配置名为"' + row.name + '"的数据项?')
+				.then(() => {
+					return this.del({ id });
 				})
 				.then(() => {
 					this.getList();
@@ -297,13 +321,35 @@ export default {
 				})
 				.catch(() => {});
 		},
+		// 处理表格按钮
+		handleTableBtnClick({ data, type }) {
+			switch (type) {
+				case 'edit':
+					this.handleUpdate(data);
+					break;
+				case 'delete':
+					this.handleDelete(data);
+					break;
+				case 'detail':
+					this.handleDetail(data);
+					break;
+				case 'add':
+					this.handleAddDetail(data);
+					break;
+			}
+		},
 		handleDetail({ id }) {
-			this.reset();
-			this.mode = 'detail';
-			this.info({ id }).then((response) => {
-				this.form = response.data;
-				this.open = true;
-				this.title = '修改巡检内容';
+			this.addOrUpdateVisible = true;
+			this.addOrEditTitle = '详情';
+			this.$nextTick(() => {
+				this.$refs.addOrUpdate.init(id, true);
+			});
+		},
+		handleAddDetail(row) {
+			this.addOrUpdateVisible = true;
+			this.addOrEditTitle = '添加内容';
+			this.$nextTick(() => {
+				this.$refs.addOrUpdate.init(row);
 			});
 		},
 		/** 导出按钮操作 */
@@ -313,13 +359,13 @@ export default {
 			params.pageNo = undefined;
 			params.pageSize = undefined;
 			this.$modal
-				.confirm('是否确认导出所有巡检内容?')
+				.confirm('是否确认导出所有巡检设置?')
 				.then(() => {
 					this.exportLoading = true;
 					return exportEquipmentTypeExcel(params);
 				})
 				.then((response) => {
-					this.$download.excel(response, '巡检内容.xls');
+					this.$download.excel(response, '巡检设置.xls');
 					this.exportLoading = false;
 				})
 				.catch(() => {});
@@ -329,6 +375,6 @@ export default {
 </script>
 
 <style scoped lang="scss">
-.SpecialEquipmentCheckContent {
+.SpecialEquipmentCheckConfig {
 }
 </style>

From ca2774ca28b340167446bc0f124fb5d83a6629be Mon Sep 17 00:00:00 2001
From: lb <liubin_9396@163.com>
Date: Thu, 22 Feb 2024 16:23:19 +0800
Subject: [PATCH 31/40] update navbar user dept

---
 src/api/system/user.js                | 7 +++++++
 src/layout/components/NavbarRight.vue | 6 +++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/api/system/user.js b/src/api/system/user.js
index ffa08da0..1d43a1ae 100644
--- a/src/api/system/user.js
+++ b/src/api/system/user.js
@@ -26,6 +26,13 @@ export function getUser(userId) {
   })
 }
 
+export function getUserSimple(userId) {
+  return request({
+    url: '/system/user/getSimple?id=' + praseStrEmpty(userId),
+    method: 'get'
+  })
+}
+
 // 新增用户
 export function addUser(data) {
   return request({
diff --git a/src/layout/components/NavbarRight.vue b/src/layout/components/NavbarRight.vue
index 228cde89..98f97a3b 100644
--- a/src/layout/components/NavbarRight.vue
+++ b/src/layout/components/NavbarRight.vue
@@ -26,7 +26,7 @@
 </template>
 <script>
 import moment from 'moment'
-import { getUser } from "@/api/system/user.js";
+import { getUserSimple } from "@/api/system/user.js";
 import {getPath} from "@/utils/ruoyi";
 export default {
   name: 'navRight',
@@ -67,8 +67,8 @@ export default {
     },
     getUserMsg() {
       let id = this.$store.getters.userId
-      getUser(id).then(res => {
-        this.dept = res.data.dept ? res.data.dept.name : ''
+      getUserSimple(id).then(res => {
+        this.dept = res.data.deptName ? res.data.dept.deptName : '---'
       })
     },
     async logout() {

From 67a76869e112ae20919c32453f800a94123ca281 Mon Sep 17 00:00:00 2001
From: lb <liubin_9396@163.com>
Date: Thu, 22 Feb 2024 16:52:07 +0800
Subject: [PATCH 32/40] =?UTF-8?q?update=20=E5=B7=A1=E6=A3=80=E5=8D=95?=
 =?UTF-8?q?=E5=BE=85=E7=A1=AE=E8=AE=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../check/CheckOrderListTable.vue             | 227 ++++++++
 src/views/specialEquipment/check/Content.vue  | 110 ++--
 .../specialEquipment/check/iconfont/demo.css  | 539 ++++++++++++++++++
 .../check/iconfont/iconfont.css               |  38 ++
 .../check/iconfont/iconfont.eot               | Bin 0 -> 2664 bytes
 .../check/iconfont/iconfont.js                |   1 +
 .../check/iconfont/iconfont.json              |  44 ++
 .../check/iconfont/iconfont.svg               |  29 +
 .../check/iconfont/iconfont.ttf               | Bin 0 -> 2496 bytes
 .../check/iconfont/iconfont.woff              | Bin 0 -> 1544 bytes
 .../check/iconfont/iconfont.woff2             | Bin 0 -> 1120 bytes
 11 files changed, 933 insertions(+), 55 deletions(-)
 create mode 100644 src/views/specialEquipment/check/CheckOrderListTable.vue
 create mode 100644 src/views/specialEquipment/check/iconfont/demo.css
 create mode 100644 src/views/specialEquipment/check/iconfont/iconfont.css
 create mode 100644 src/views/specialEquipment/check/iconfont/iconfont.eot
 create mode 100644 src/views/specialEquipment/check/iconfont/iconfont.js
 create mode 100644 src/views/specialEquipment/check/iconfont/iconfont.json
 create mode 100644 src/views/specialEquipment/check/iconfont/iconfont.svg
 create mode 100644 src/views/specialEquipment/check/iconfont/iconfont.ttf
 create mode 100644 src/views/specialEquipment/check/iconfont/iconfont.woff
 create mode 100644 src/views/specialEquipment/check/iconfont/iconfont.woff2

diff --git a/src/views/specialEquipment/check/CheckOrderListTable.vue b/src/views/specialEquipment/check/CheckOrderListTable.vue
new file mode 100644
index 00000000..96943a31
--- /dev/null
+++ b/src/views/specialEquipment/check/CheckOrderListTable.vue
@@ -0,0 +1,227 @@
+<!-- 
+    filename: WaitingListTable.vue
+    author: liubin
+    date: 2024-02-05 16:12:55
+    description: 
+-->
+
+<template>
+	<el-table
+		:data="tableDataWithIndex"
+		:border="true"
+		@selection-change="handleSelectionChange"
+		style="width: 100%"
+		:header-cell-style="{
+			background: '#f2f4f9',
+			color: '#606266',
+		}"
+		class="waiting-list-table">
+		<el-table-column
+			type="selection"
+			:width="50"
+			:selectable="checkSelectable" />
+		<el-table-column prop="_pageIndex" width="80" align="center">
+			<template slot="header">
+				<el-popover placement="bottom-start" width="300" trigger="click">
+					<div class="setting-box" style="max-height: 400px; overflow-y: auto">
+						<el-checkbox
+							v-for="(item, index) in tablePropsLabelList"
+							:key="'cb' + index"
+							v-model="selectedBox[index]"
+							:label="item.label" />
+					</div>
+					<i slot="reference" class="el-icon-s-tools" />
+				</el-popover>
+			</template>
+		</el-table-column>
+		<el-table-column
+			v-if="selectedBox[0]"
+			label="巡检单名称"
+			prop="name"></el-table-column>
+		<el-table-column v-if="selectedBox[1]" label="部门" prop="planName">
+			<template slot-scope="scope">
+				{{ scope.row.department || '---' }}
+			</template>
+		</el-table-column>
+		<el-table-column
+			v-if="selectedBox[2]"
+			label="巡检时间"
+			prop="planCheckTime">
+			<template slot-scope="scope">
+				{{ scope.row.planCheckTime | timeFilter }}
+			</template>
+		</el-table-column>
+		<el-table-column
+			v-if="selectedBox[3]"
+			label="确认截止时间"
+			prop="confirmDueTime">
+			<template slot-scope="scope">
+				{{ scope.row.confirmDueTime || '---' }}
+			</template>
+		</el-table-column>
+		<el-table-column
+			v-if="selectedBox[4]"
+			width="150"
+			label="备注"
+			prop="remark">
+			<template slot-scope="scope">
+				{{ scope.row.remark }}
+			</template>
+		</el-table-column>
+
+		<el-table-column width="188" label="操作">
+			<template slot-scope="scope">
+				<el-tooltip content="确认" placement="top">
+					<el-button
+						type="text"
+						style="margin: 5px 0; padding: 0"
+						:disabled="!checkSelectable(scope.row)"
+						@click="$emit('confirm', scope.row)">
+						确认
+					</el-button>
+				</el-tooltip>
+				<!-- line  -->
+				<span style="margin: 0 4px; font-size: 18px; color: #e5e7eb">|</span>
+				<el-tooltip content="查看详情" placement="top">
+					<el-button
+						type="text"
+						style="margin: 5px 0; padding: 0"
+						@click="$emit('detail', scope.row)">
+						<i class="iconfont icon-detail primary-color" />
+					</el-button>
+				</el-tooltip>
+				<!-- line  -->
+				<span style="margin: 0 4px; font-size: 18px; color: #e5e7eb">|</span>
+				<el-tooltip content="编辑" placement="top">
+					<el-button
+						type="text"
+						style="margin: 5px 0; padding: 0"
+						@click="$emit('edit', scope.row)">
+						<i class="iconfont icon-edit primary-color" />
+					</el-button>
+				</el-tooltip>
+				<!-- line  -->
+				<span style="margin: 0 4px; font-size: 18px; color: #e5e7eb">|</span>
+				<el-tooltip content="删除" placement="top">
+					<el-button
+						type="text"
+						style="margin: 5px 0; padding: 0"
+						@click="$emit('delete', scope.row)">
+						<i class="iconfont icon-delete delete-color" />
+					</el-button>
+				</el-tooltip>
+			</template>
+		</el-table-column>
+	</el-table>
+</template>
+
+<script>
+import moment from 'moment';
+
+export default {
+	name: 'WaitingListTable',
+	components: {},
+	props: ['tableData', 'page', 'limit'],
+	filters: {
+		timeFilter: (val) =>
+			val ? moment(val).format('yyyy-MM-DD HH:mm:ss') : '---',
+	},
+	data() {
+		return {
+			tablePropsLabelList: [
+				{
+					label: '巡检单名称',
+				},
+				{
+					label: '部门',
+				},
+				{
+					label: '巡检时间',
+				},
+				{
+					label: '确认截止时间',
+				},
+				{
+					label: '备注',
+				},
+			],
+			selectedBox: [true, true, true, true, true],
+			selectedOrder: [],
+		};
+	},
+	computed: {
+		tableDataWithIndex() {
+			return this.tableData.map((item, index) => ({
+				...item,
+				_pageIndex: (this.page - 1) * this.limit + index + 1,
+			}));
+		},
+	},
+	methods: {
+		checkSelectable(row, index) {
+			return true;
+			// return (
+			// 	row.relatePlan == 2 ||
+			// 	(row.relatePlan == 1 &&
+			// 		(!row.confirmDueTime || +row.confirmDueTime >= new Date().getTime()))
+			// );
+		},
+		handleSelectionChange(val) {
+			this.selectedOrder = val;
+		},
+	},
+};
+</script>
+
+<style scoped>
+@import './iconfont/iconfont.css';
+.delete-color {
+	color: #ff5454;
+}
+.primary-color {
+	color: #0b58ff;
+}
+
+.baseTable .show-col-btn {
+	margin-right: 5px;
+	line-height: inherit;
+	cursor: pointer;
+}
+.baseTable .el-icon-refresh {
+	cursor: pointer;
+}
+</style>
+<style>
+.waiting-list-table .el-table__body tr.current-row > td.el-table__cell {
+	background-color: #eaf1fc;
+}
+.waiting-list-table.el-table .el-table__cell {
+	padding: 0;
+	height: 35px;
+}
+.waiting-list-table .addButton {
+	width: 100%;
+	height: 35px;
+	border-top: none;
+	color: #0b58ff;
+	border-color: #ebeef5;
+	border-radius: 0;
+}
+.waiting-list-table .addButton:hover {
+	color: #0b58ff;
+	border-color: #ebeef5;
+	background-color: #fff;
+}
+.waiting-list-table .addButton:focus {
+	border-color: #ebeef5;
+	background-color: #fff;
+}
+
+.el-tooltip__popper.is-dark {
+	background: rgba(0, 0, 0, 0.6) !important;
+}
+.el-tooltip__popper .popper__arrow,
+.el-tooltip__popper .popper__arrow::after {
+	border-top-color: rgba(0, 0, 0, 0.4) !important;
+}
+</style>
diff --git a/src/views/specialEquipment/check/Content.vue b/src/views/specialEquipment/check/Content.vue
index 1ec798e2..992dccd0 100644
--- a/src/views/specialEquipment/check/Content.vue
+++ b/src/views/specialEquipment/check/Content.vue
@@ -15,7 +15,7 @@
 			@headBtnClick="handleSearchBarBtnClick" />
 
 		<!-- 列表 -->
-		<base-table
+		<!-- <base-table
 			:table-props="tableProps"
 			:page="queryParams.pageNo"
 			:limit="queryParams.pageSize"
@@ -28,7 +28,17 @@
 				:width="180"
 				:method-list="tableBtn"
 				@clickBtn="handleTableBtnClick" />
-		</base-table>
+		</base-table> -->
+
+		<CheckOrderListTable
+			ref="check-order-list-table"
+			:table-data="list"
+			:page="queryParams.pageNo"
+			:limit="queryParams.pageSize"
+			@edit="handleEdit"
+			@detail="handleDetail"
+			@delete="handleDelete"
+			@confirm="handleConfirm" />
 
 		<!-- 分页组件 -->
 		<pagination
@@ -44,7 +54,7 @@
 			:dialogVisible="open"
 			@close="cancel"
 			@cancel="cancel"
-			@confirm="handleConfirm">
+			@confirm="handleSubmit">
 			<add ref="add" @refreshDataList="successSubmit" />
 		</base-dialog>
 		<!-- 添加巡检，查看详情 -->
@@ -60,10 +70,11 @@ import basicPageMixin from '@/mixins/lb/basicPageMixin';
 import addOrUpdata from './add-or-updata.vue';
 import add from './add.vue';
 import { parseTime } from '../../core/mixins/code-filter';
+import CheckOrderListTable from './CheckOrderListTable.vue';
 
 export default {
 	name: 'SpecialEquipmentCheckConfig',
-	components: { addOrUpdata, add },
+	components: { addOrUpdata, add, CheckOrderListTable },
 	mixins: [basicPageMixin],
 	data() {
 		return {
@@ -71,25 +82,21 @@ export default {
 			addOrEditTitle: '',
 			searchBarKeys: ['name'],
 			tableBtn: [
-				this.$auth.hasPermi('equipment:check-setting:addInsp')
-					? {
-							type: 'add',
-							btnName: '添加',
-							showTip: '添加巡检',
-					  }
-					: undefined,
+				{
+					type: 'confirm',
+					btnName: '确认',
+					showTip: '确认',
+				},
 				this.$auth.hasPermi('equipment:check-setting:update')
 					? {
 							type: 'edit',
 							btnName: '修改',
 					  }
 					: undefined,
-				// this.$auth.hasPermi('equipment:check-setting:update')
-				// 	? {
-				// 			type: 'detail',
-				// 			btnName: '查看详情',
-				// 	  }
-				// 	: undefined,
+				{
+					type: 'detail',
+					btnName: '巡检内容详情',
+				},
 				this.$auth.hasPermi('equipment:check-setting:delete')
 					? {
 							type: 'delete',
@@ -104,11 +111,6 @@ export default {
 					width: 100,
 					showOverflowtooltip: true,
 				},
-				{
-					prop: 'code',
-					label: '巡检单编码',
-					showOverflowtooltip: true,
-				},
 				{
 					prop: 'department',
 					label: '部门',
@@ -117,27 +119,18 @@ export default {
 				},
 				{
 					prop: 'planCheckTime',
-					label: '计划巡检时间',
+					label: '巡检时间',
 					showOverflowtooltip: true,
 					filter: parseTime,
 				},
 				{
-					width: 144,
-					prop: 'confirmTimeLimit',
-					label: '确认时限',
+					prop: 'confirmDueTime',
+					label: '确认截止时间',
 					showOverflowtooltip: true,
-					filter: (val) =>
-						val != null && val > 24
-							? `${(val - (val % 24)) / 24}天${val % 24}小时`
-							: `${val}小时`,
-				},
-				{ prop: 'groupClass', label: '班次', showOverflowtooltip: true },
-				{ prop: 'creator', label: '创建人', showOverflowtooltip: true },
-				{
-					prop: 'createTime',
-					label: '创建时间',
-					showOverflowtooltip: true,
-					filter: parseTime,
+					// filter: (val) =>
+					// 	val != null && val > 24
+					// 		? `${(val - (val % 24)) / 24}天${val % 24}小时`
+					// 		: `${val}小时`,
 				},
 				{ prop: 'remark', label: '备注' },
 			],
@@ -166,14 +159,20 @@ export default {
 					plain: true,
 					color: 'success',
 				},
-				// {
-				// 	type: this.$auth.hasPermi('equipment:check-setting:export')
-				// 		? 'button'
-				// 		: '',
-				// 	btnName: '导出',
-				// 	name: 'export',
-				// 	color: 'warning',
-				// },
+				{
+					type: 'button',
+					btnName: '导出',
+					name: 'export',
+					plain: true,
+					color: 'warning',
+				},
+				{
+					type: 'button',
+					btnName: '批量确认',
+					name: 'batch-confirm',
+					plain: true,
+					color: 'primary',
+				},
 			],
 			// 是否显示弹出层
 			open: false,
@@ -196,7 +195,7 @@ export default {
 		this.getList();
 	},
 	methods: {
-		handleConfirm() {
+		handleSubmit() {
 			this.$refs.add.dataFormSubmit();
 		},
 		successSubmit() {
@@ -307,11 +306,15 @@ export default {
 				});
 			});
 		},
-		/** 删除按钮操作 */
+		/** 编辑 */
+		handleEdit(row) {},
+		/** 确认巡检单 */
+		handleConfirm(row) {},
+		/** 删除巡检单 */
 		handleDelete(row) {
 			const id = row.id;
 			this.$modal
-				.confirm('是否确认删除配置名为"' + row.name + '"的数据项?')
+				.confirm('是否确认删除巡检单"' + row.name + '"?')
 				.then(() => {
 					return this.del({ id });
 				})
@@ -338,11 +341,11 @@ export default {
 					break;
 			}
 		},
-		handleDetail({ id }) {
+		handleDetail(row) {
 			this.addOrUpdateVisible = true;
 			this.addOrEditTitle = '详情';
 			this.$nextTick(() => {
-				this.$refs.addOrUpdate.init(id, true);
+				this.$refs.addOrUpdate.init(row?.id, true);
 			});
 		},
 		handleAddDetail(row) {
@@ -374,7 +377,4 @@ export default {
 };
 </script>
 
-<style scoped lang="scss">
-.SpecialEquipmentCheckConfig {
-}
-</style>
+ 
\ No newline at end of file
diff --git a/src/views/specialEquipment/check/iconfont/demo.css b/src/views/specialEquipment/check/iconfont/demo.css
new file mode 100644
index 00000000..a67054a0
--- /dev/null
+++ b/src/views/specialEquipment/check/iconfont/demo.css
@@ -0,0 +1,539 @@
+/* Logo 字体 */
+@font-face {
+  font-family: "iconfont logo";
+  src: url('https://at.alicdn.com/t/font_985780_km7mi63cihi.eot?t=1545807318834');
+  src: url('https://at.alicdn.com/t/font_985780_km7mi63cihi.eot?t=1545807318834#iefix') format('embedded-opentype'),
+    url('https://at.alicdn.com/t/font_985780_km7mi63cihi.woff?t=1545807318834') format('woff'),
+    url('https://at.alicdn.com/t/font_985780_km7mi63cihi.ttf?t=1545807318834') format('truetype'),
+    url('https://at.alicdn.com/t/font_985780_km7mi63cihi.svg?t=1545807318834#iconfont') format('svg');
+}
+
+.logo {
+  font-family: "iconfont logo";
+  font-size: 160px;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+/* tabs */
+.nav-tabs {
+  position: relative;
+}
+
+.nav-tabs .nav-more {
+  position: absolute;
+  right: 0;
+  bottom: 0;
+  height: 42px;
+  line-height: 42px;
+  color: #666;
+}
+
+#tabs {
+  border-bottom: 1px solid #eee;
+}
+
+#tabs li {
+  cursor: pointer;
+  width: 100px;
+  height: 40px;
+  line-height: 40px;
+  text-align: center;
+  font-size: 16px;
+  border-bottom: 2px solid transparent;
+  position: relative;
+  z-index: 1;
+  margin-bottom: -1px;
+  color: #666;
+}
+
+
+#tabs .active {
+  border-bottom-color: #f00;
+  color: #222;
+}
+
+.tab-container .content {
+  display: none;
+}
+
+/* 页面布局 */
+.main {
+  padding: 30px 100px;
+  width: 960px;
+  margin: 0 auto;
+}
+
+.main .logo {
+  color: #333;
+  text-align: left;
+  margin-bottom: 30px;
+  line-height: 1;
+  height: 110px;
+  margin-top: -50px;
+  overflow: hidden;
+  *zoom: 1;
+}
+
+.main .logo a {
+  font-size: 160px;
+  color: #333;
+}
+
+.helps {
+  margin-top: 40px;
+}
+
+.helps pre {
+  padding: 20px;
+  margin: 10px 0;
+  border: solid 1px #e7e1cd;
+  background-color: #fffdef;
+  overflow: auto;
+}
+
+.icon_lists {
+  width: 100% !important;
+  overflow: hidden;
+  *zoom: 1;
+}
+
+.icon_lists li {
+  width: 100px;
+  margin-bottom: 10px;
+  margin-right: 20px;
+  text-align: center;
+  list-style: none !important;
+  cursor: default;
+}
+
+.icon_lists li .code-name {
+  line-height: 1.2;
+}
+
+.icon_lists .icon {
+  display: block;
+  height: 100px;
+  line-height: 100px;
+  font-size: 42px;
+  margin: 10px auto;
+  color: #333;
+  -webkit-transition: font-size 0.25s linear, width 0.25s linear;
+  -moz-transition: font-size 0.25s linear, width 0.25s linear;
+  transition: font-size 0.25s linear, width 0.25s linear;
+}
+
+.icon_lists .icon:hover {
+  font-size: 100px;
+}
+
+.icon_lists .svg-icon {
+  /* 通过设置 font-size 来改变图标大小 */
+  width: 1em;
+  /* 图标和文字相邻时，垂直对齐 */
+  vertical-align: -0.15em;
+  /* 通过设置 color 来改变 SVG 的颜色/fill */
+  fill: currentColor;
+  /* path 和 stroke 溢出 viewBox 部分在 IE 下会显示
+      normalize.css 中也包含这行 */
+  overflow: hidden;
+}
+
+.icon_lists li .name,
+.icon_lists li .code-name {
+  color: #666;
+}
+
+/* markdown 样式 */
+.markdown {
+  color: #666;
+  font-size: 14px;
+  line-height: 1.8;
+}
+
+.highlight {
+  line-height: 1.5;
+}
+
+.markdown img {
+  vertical-align: middle;
+  max-width: 100%;
+}
+
+.markdown h1 {
+  color: #404040;
+  font-weight: 500;
+  line-height: 40px;
+  margin-bottom: 24px;
+}
+
+.markdown h2,
+.markdown h3,
+.markdown h4,
+.markdown h5,
+.markdown h6 {
+  color: #404040;
+  margin: 1.6em 0 0.6em 0;
+  font-weight: 500;
+  clear: both;
+}
+
+.markdown h1 {
+  font-size: 28px;
+}
+
+.markdown h2 {
+  font-size: 22px;
+}
+
+.markdown h3 {
+  font-size: 16px;
+}
+
+.markdown h4 {
+  font-size: 14px;
+}
+
+.markdown h5 {
+  font-size: 12px;
+}
+
+.markdown h6 {
+  font-size: 12px;
+}
+
+.markdown hr {
+  height: 1px;
+  border: 0;
+  background: #e9e9e9;
+  margin: 16px 0;
+  clear: both;
+}
+
+.markdown p {
+  margin: 1em 0;
+}
+
+.markdown>p,
+.markdown>blockquote,
+.markdown>.highlight,
+.markdown>ol,
+.markdown>ul {
+  width: 80%;
+}
+
+.markdown ul>li {
+  list-style: circle;
+}
+
+.markdown>ul li,
+.markdown blockquote ul>li {
+  margin-left: 20px;
+  padding-left: 4px;
+}
+
+.markdown>ul li p,
+.markdown>ol li p {
+  margin: 0.6em 0;
+}
+
+.markdown ol>li {
+  list-style: decimal;
+}
+
+.markdown>ol li,
+.markdown blockquote ol>li {
+  margin-left: 20px;
+  padding-left: 4px;
+}
+
+.markdown code {
+  margin: 0 3px;
+  padding: 0 5px;
+  background: #eee;
+  border-radius: 3px;
+}
+
+.markdown strong,
+.markdown b {
+  font-weight: 600;
+}
+
+.markdown>table {
+  border-collapse: collapse;
+  border-spacing: 0px;
+  empty-cells: show;
+  border: 1px solid #e9e9e9;
+  width: 95%;
+  margin-bottom: 24px;
+}
+
+.markdown>table th {
+  white-space: nowrap;
+  color: #333;
+  font-weight: 600;
+}
+
+.markdown>table th,
+.markdown>table td {
+  border: 1px solid #e9e9e9;
+  padding: 8px 16px;
+  text-align: left;
+}
+
+.markdown>table th {
+  background: #F7F7F7;
+}
+
+.markdown blockquote {
+  font-size: 90%;
+  color: #999;
+  border-left: 4px solid #e9e9e9;
+  padding-left: 0.8em;
+  margin: 1em 0;
+}
+
+.markdown blockquote p {
+  margin: 0;
+}
+
+.markdown .anchor {
+  opacity: 0;
+  transition: opacity 0.3s ease;
+  margin-left: 8px;
+}
+
+.markdown .waiting {
+  color: #ccc;
+}
+
+.markdown h1:hover .anchor,
+.markdown h2:hover .anchor,
+.markdown h3:hover .anchor,
+.markdown h4:hover .anchor,
+.markdown h5:hover .anchor,
+.markdown h6:hover .anchor {
+  opacity: 1;
+  display: inline-block;
+}
+
+.markdown>br,
+.markdown>p>br {
+  clear: both;
+}
+
+
+.hljs {
+  display: block;
+  background: white;
+  padding: 0.5em;
+  color: #333333;
+  overflow-x: auto;
+}
+
+.hljs-comment,
+.hljs-meta {
+  color: #969896;
+}
+
+.hljs-string,
+.hljs-variable,
+.hljs-template-variable,
+.hljs-strong,
+.hljs-emphasis,
+.hljs-quote {
+  color: #df5000;
+}
+
+.hljs-keyword,
+.hljs-selector-tag,
+.hljs-type {
+  color: #a71d5d;
+}
+
+.hljs-literal,
+.hljs-symbol,
+.hljs-bullet,
+.hljs-attribute {
+  color: #0086b3;
+}
+
+.hljs-section,
+.hljs-name {
+  color: #63a35c;
+}
+
+.hljs-tag {
+  color: #333333;
+}
+
+.hljs-title,
+.hljs-attr,
+.hljs-selector-id,
+.hljs-selector-class,
+.hljs-selector-attr,
+.hljs-selector-pseudo {
+  color: #795da3;
+}
+
+.hljs-addition {
+  color: #55a532;
+  background-color: #eaffea;
+}
+
+.hljs-deletion {
+  color: #bd2c00;
+  background-color: #ffecec;
+}
+
+.hljs-link {
+  text-decoration: underline;
+}
+
+/* 代码高亮 */
+/* PrismJS 1.15.0
+https://prismjs.com/download.html#themes=prism&languages=markup+css+clike+javascript */
+/**
+ * prism.js default theme for JavaScript, CSS and HTML
+ * Based on dabblet (http://dabblet.com)
+ * @author Lea Verou
+ */
+code[class*="language-"],
+pre[class*="language-"] {
+  color: black;
+  background: none;
+  text-shadow: 0 1px white;
+  font-family: Consolas, Monaco, 'Andale Mono', 'Ubuntu Mono', monospace;
+  text-align: left;
+  white-space: pre;
+  word-spacing: normal;
+  word-break: normal;
+  word-wrap: normal;
+  line-height: 1.5;
+
+  -moz-tab-size: 4;
+  -o-tab-size: 4;
+  tab-size: 4;
+
+  -webkit-hyphens: none;
+  -moz-hyphens: none;
+  -ms-hyphens: none;
+  hyphens: none;
+}
+
+pre[class*="language-"]::-moz-selection,
+pre[class*="language-"] ::-moz-selection,
+code[class*="language-"]::-moz-selection,
+code[class*="language-"] ::-moz-selection {
+  text-shadow: none;
+  background: #b3d4fc;
+}
+
+pre[class*="language-"]::selection,
+pre[class*="language-"] ::selection,
+code[class*="language-"]::selection,
+code[class*="language-"] ::selection {
+  text-shadow: none;
+  background: #b3d4fc;
+}
+
+@media print {
+
+  code[class*="language-"],
+  pre[class*="language-"] {
+    text-shadow: none;
+  }
+}
+
+/* Code blocks */
+pre[class*="language-"] {
+  padding: 1em;
+  margin: .5em 0;
+  overflow: auto;
+}
+
+:not(pre)>code[class*="language-"],
+pre[class*="language-"] {
+  background: #f5f2f0;
+}
+
+/* Inline code */
+:not(pre)>code[class*="language-"] {
+  padding: .1em;
+  border-radius: .3em;
+  white-space: normal;
+}
+
+.token.comment,
+.token.prolog,
+.token.doctype,
+.token.cdata {
+  color: slategray;
+}
+
+.token.punctuation {
+  color: #999;
+}
+
+.namespace {
+  opacity: .7;
+}
+
+.token.property,
+.token.tag,
+.token.boolean,
+.token.number,
+.token.constant,
+.token.symbol,
+.token.deleted {
+  color: #905;
+}
+
+.token.selector,
+.token.attr-name,
+.token.string,
+.token.char,
+.token.builtin,
+.token.inserted {
+  color: #690;
+}
+
+.token.operator,
+.token.entity,
+.token.url,
+.language-css .token.string,
+.style .token.string {
+  color: #9a6e3a;
+  background: hsla(0, 0%, 100%, .5);
+}
+
+.token.atrule,
+.token.attr-value,
+.token.keyword {
+  color: #07a;
+}
+
+.token.function,
+.token.class-name {
+  color: #DD4A68;
+}
+
+.token.regex,
+.token.important,
+.token.variable {
+  color: #e90;
+}
+
+.token.important,
+.token.bold {
+  font-weight: bold;
+}
+
+.token.italic {
+  font-style: italic;
+}
+
+.token.entity {
+  cursor: help;
+}
diff --git a/src/views/specialEquipment/check/iconfont/iconfont.css b/src/views/specialEquipment/check/iconfont/iconfont.css
new file mode 100644
index 00000000..da3d1f0f
--- /dev/null
+++ b/src/views/specialEquipment/check/iconfont/iconfont.css
@@ -0,0 +1,38 @@
+@font-face {
+  font-family: "iconfont"; /* Project id 3821755 */
+  src: url('iconfont.eot?t=1689233106339'); /* IE9 */
+  src: url('iconfont.eot?t=1689233106339#iefix') format('embedded-opentype'), /* IE6-IE8 */
+       url('data:application/x-font-woff2;charset=utf-8;base64,d09GMgABAAAAAARgAAsAAAAACcAAAAQUAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHFQGYACDKAqGSIUsATYCJAMYCw4ABCAFhGcHVBtUCMiuMG7hiaIkox1FaBhxvd1fpwAN4YKo1v7tWTr8hBRkBQgO7yqKUJKPUKzDjkixjn7/q0vlANCkEHCJtsMvx2eQn04h5rHEE8593TK2y1SC5nbvNG5gqgZBNEWTqFUQLGVFNnVu1TjyMm3SafEsC3y0myW12KdEh2x+deP/zzHTJeG3AVBm4lrnAxpQN0US7s3ijuSE6Jbh1UGv08cgQEivMg5z6m49Qj77TVxDEZww6gXicNkviSbkxgswNeGCj+CgMw1yFRpAnUNegSv+8+UfU/igsBpjnRV3rRV9+Su8Fk1Agv6CW4eAeyvAAhronJlI1tcrVnIMHZ0cCcsUTrRTnQ0CP50B4KfgEub9Lw80BougQBwGI8bYJU4LPwUbBw0/HXAw8NORUM90wsT9JeIMFACux9QckHyQ9FDYTobcGi+FLSjwMxDe3L5s+w9THFYeEs8H303FWMnZ1JuBWFgNPh3bd5wOvJmKI9aTqXeD8eJ66HnfnV1dJPE8cy4EgqT+s/SbdSWbp9Pn24NbZ1MnGw7CDbvT6+lL1CXVh++hcH56umDT9vOviL/grQ6srHjE57uLHdQn+dtO9x2v94WN6+eXm0HWlZOzta3tUDp1JWjymsiD8r0ViWGkC+n4GeH5aODSM+9COnilpdfdZsRIvMerLmS0uICTplrOnb99LT3NkJNeajPfpDznblq6bXH8efBjlPIUxhQcX+U0qEdt4bjxy6rMdOkbEn0/3mlvrXZL60ysxdwcn/qKLJ/82pnzGS61z5rBeGmrxf33ZXN/IBWUvb8KSvnttbwwq+YTkweZHue0M0+c0ssZGY/Rs+aVF8+3GaW07CkvLC/KcBvP8c2uGpsdm0THlazwlPE22Kdi9ZK4Hdsmtw9eHVQwPjG0p33Q7tGMJ6TUJ2VK1MMw6ftI6qPPtruCvEPmLZqiHcj1Aw3Rup/sdzj+lt/w3f5TrAHgx++nD7A+8xaD4CL8m60Q+KWYO7CgUY3gTFl+OwUBHKteh00BoWmGDIYm301frAJwKAg+BTEoPCpA41OPNNh2sET0g8NnCkI61M6PKKBzREwANBtGIOS6BEU2D0CT6xvSYP+Apdg/cOT6DyErI68W0RzbqhmYOFixuRNLFqoRi839Zh+A2KqYWJH1CTC7hM04My0j664HDVgXY+xtYhbnBBNGVVzH7geKQrHOqA0sPK2Fc70oPZ2UPSTNQlVUjQEmHLDCzDphEgtKQ9zCPP16DwBRK4UJAyKfyBg7jaeaxzKlyQAg6xkaKO9M2tu1EWXhOEL3IxhKhdWpMqCYDgrTy7vZAAsuTUsLm65IOlWIQBlp47PUS9wAhBgHOFGixYgVJx7+dtqutZuY1eXTvXYncJOkOF1Wicd+CnBACA==') format('woff2'),
+       url('iconfont.woff?t=1689233106339') format('woff'),
+       url('iconfont.ttf?t=1689233106339') format('truetype'),
+       url('iconfont.svg?t=1689233106339#iconfont') format('svg');
+}
+
+.iconfont {
+  font-family: "iconfont" !important;
+  font-size: 16px;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+.icon-downward:before {
+  content: "\e604";
+}
+
+.icon-upward:before {
+  content: "\e605";
+}
+
+.icon-detail:before {
+  content: "\e601";
+}
+
+.icon-edit:before {
+  content: "\e602";
+}
+
+.icon-delete:before {
+  content: "\e603";
+}
+
diff --git a/src/views/specialEquipment/check/iconfont/iconfont.eot b/src/views/specialEquipment/check/iconfont/iconfont.eot
new file mode 100644
index 0000000000000000000000000000000000000000..e746725cb7ee14836d415117d59484c396fcf152
GIT binary patch
literal 2664
zcmd^B-ES0C6hCKXcG_*Xv)vCDx`jI3cGslf7S>@4WLpvtiV0EVqr`+nmfdN)bicA4
zzKk(dh{j+7A>aeyL81>DeDIaT59C2&LgI_X7gI@0788vRBtDqfslPir>&m9YKft>?
z=l;&`oO|xQ=g!BO?IODEC1R3DG>JU21HfEjf%ffh=q>5cP?vVp&bQbm>ZJnZs6u6$
zcBBP^MhD2G89GTt%2EwXgr>mMXdd3eSEtRCq)o7_HXgK?w3`-4rcILv5AW13#9srs
z73`sx4vwZWk-dx1--CWESISl&ZmS#EjRNlDnc~^$H^wHf6Um?B+B<7z^TXdhx&hw@
zxYDyAI+o;jfMKWM*^+f;Eda*;2C=qS$z`SY`3%N>3SBE@&r~^rO%e+?y__wXy&q;i
zBkI6>(oD57Z@v6e^a_!;2>T(ic6niCfsVqACKly@mQWoA?D^V`rC0r#Kd8Im`(W|N
z0pZr@R~8kLH$d%lkE;<$r6Z&|!NehU;YYOM=nZ=p5<5ZC^LzFkBCVLU$`logaGF@j
zzcCjJGg-uMjAYn^mBFwxhvTmhUm_3o`mS^j){Bjvf29;-Wa}P+?Xk9hdUu{~*SYR-
z@<H;Cv;c?4vmp-6nY6tJjX7}#5N&L@@KJZ{6j%{uBYNx}yh0<650*+)_pBfvbrur3
z2rNT-fRQn7<PPNjxcQvD?{hPNJl93uL{5?KI<h1#k-56i#Tf`6p^I!fIR+NzBm9UG
z^djBk5&j5RL?QX6^d<#~;+!@Tu?{aMVrqB|N7h8r(z84lN*E#gj(sO=#6vvi^#v1`
z_;PPj@3pV;T(6$&wacA~+IUVxtaBokmm^^{_KcU+Si%_N^jJEwdMv4Gmqjq1v#*L^
zeAx+xWjSXrUzF~XpPr^s%FqjVH4zWS)b$*WJU5t1kF$}G|3l~S0H-F{NODZ$z!Meu
z?d5M|MUkcL3fdF!U%zP4^-=AKLi*YxZ<Rfcuzy}1OA&w6?~e`$VSm3m7ALi`DBr{z
zMZ6z~jdUvVR3NNLLxZuTv?X9nNZ9`XhcyPHNw5ttm<ef%Ji!Cp!5Sx}^q5=-^@sbC
z<NER=eLUGG5O4GPz4+UAL&NL*(PUK81kk+wVfNbB)Igxeqo{mA3xzcM_vR=`6Ugfi
z`n~>j!=dFz7$|`BdKU-#yX=JykKzji#F^nvTX`VgkO#>}eK@ymbQt$mEP+)wcA*Zn
zl!(ehTZ{xYfkPd_ednC3k%${<Y$vjw2XWr5p^mi`NP5K=46Y3Zzw8MF`T`u}@2(he
z`+nTG0-{G&AeX-i_;|z@u&?u5_OZADzo3sl@C5;k%Yc&z;j?cE*~0v1CT<w<44m-K
z2xDgXun}i5Q;)sV@&3XYxhsy(8R4E^YCKKAAzaRr1=$I$fhFpoeizH&V=h*JM_lZ|
zmo(*K75uo1yJ!RLc5yc%R>fOYL3Mzq`J9UxALvh9EaAg`%f&MIyDnCMe{it}pZbR`
zR>3d3xQnK^$Hm>0;M}g7nYGNke*COn$W_YIm9o|B512D2i`iOJZT3@UZN5+`>zk9C
zn$)COHfzl=^QUG~mNl(U*D57_58|1{VnwgkDksdGm7KM#>h{r5F^}Mrxk`z4p&~I+
zp;(Z4(&;#zg>0{9+V#h4n|5ovzIxr$?lp-Ol${ExeKqrR3YAm}YqU^d>9}gBph`e{
z+<MDIl~n}Rae%^h0&#NiPSUJ1s!H4Oz>NM=pEdoHPTf{&zQIK$v3gTkVwn~8u*x0O
gnXjBKpU&3u>dC6p<xMMFC@N;YV5xbtXj&%G-_l}syZ`_I

literal 0
HcmV?d00001

diff --git a/src/views/specialEquipment/check/iconfont/iconfont.js b/src/views/specialEquipment/check/iconfont/iconfont.js
new file mode 100644
index 00000000..1520f0ab
--- /dev/null
+++ b/src/views/specialEquipment/check/iconfont/iconfont.js
@@ -0,0 +1 @@
+window._iconfont_svg_string_3821755='<svg><symbol id="icon-downward" viewBox="0 0 1024 1024"><path d="M556.942222 751.900444l363.064889-401.806222c24.860444-21.617778 24.860444-56.263111 0-77.880889a68.437333 68.437333 0 0 0-44.942222-16.156444c-16.896 0-33.052444 5.859556-44.885333 16.156444L512 635.050667l-318.236444-362.951111a68.437333 68.437333 0 0 0-44.942223-16.099556c-16.896 0-33.109333 5.802667-44.942222 16.156444-24.746667 21.617778-24.746667 56.206222 0 77.824l363.121778 401.749334c5.973333 5.290667 13.141333 9.443556 21.048889 12.231111 23.722667 8.305778 51.029333 3.527111 68.892444-12.060445z" fill="#0B58FF" ></path></symbol><symbol id="icon-upward" viewBox="0 0 1024 1024"><path d="M556.942222 272.099556l363.064889 401.806222c24.860444 21.617778 24.860444 56.263111 0 77.880889a68.437333 68.437333 0 0 1-44.942222 16.156444c-16.896 0-33.052444-5.859556-44.885333-16.156444L512 388.949333l-318.236444 362.951111a68.437333 68.437333 0 0 1-44.942223 16.099556c-16.896 0-33.109333-5.802667-44.942222-16.156444-24.746667-21.617778-24.746667-56.206222 0-77.824L467.057778 272.270222c5.973333-5.290667 13.141333-9.443556 21.048889-12.231111 23.722667-8.305778 51.029333-3.527111 68.892444 12.060445z" fill="#0B58FF" ></path></symbol><symbol id="icon-detail" viewBox="0 0 1024 1024"><path d="M902.428444 190.748444H332.401778a7.964444 7.964444 0 0 0-7.793778 8.021334v56.206222a7.964444 7.964444 0 0 0 7.793778 8.078222h570.026666A7.964444 7.964444 0 0 0 910.222222 254.976v-56.206222a7.964444 7.964444 0 0 0-7.793778-8.021334z m0 285.127112H332.401778a7.964444 7.964444 0 0 0-7.793778 7.964444v56.32a7.964444 7.964444 0 0 0 7.793778 7.964444h570.026666a7.964444 7.964444 0 0 0 7.793778-7.964444v-56.32a7.964444 7.964444 0 0 0-7.793778-7.964444z m0 285.070222H332.401778a7.964444 7.964444 0 0 0-7.793778 8.078222v56.206222a7.964444 7.964444 0 0 0 7.793778 8.021334h570.026666a7.964444 7.964444 0 0 0 7.793778-8.021334v-56.206222a7.964444 7.964444 0 0 0-7.793778-8.078222zM113.777778 226.872889c0 20.081778 10.410667 38.684444 27.306666 48.696889a53.361778 53.361778 0 0 0 54.670223 0 56.547556 56.547556 0 0 0 27.306666-48.696889 56.547556 56.547556 0 0 0-27.306666-48.696889 53.361778 53.361778 0 0 0-54.613334 0A56.547556 56.547556 0 0 0 113.777778 226.872889zM113.777778 512c0 20.081778 10.410667 38.684444 27.306666 48.696889a53.361778 53.361778 0 0 0 54.670223 0A56.547556 56.547556 0 0 0 223.061333 512a56.547556 56.547556 0 0 0-27.306666-48.696889 53.361778 53.361778 0 0 0-54.613334 0A56.547556 56.547556 0 0 0 113.777778 512z m0 285.127111c0 20.081778 10.410667 38.684444 27.306666 48.696889a53.361778 53.361778 0 0 0 54.670223 0 56.547556 56.547556 0 0 0 27.306666-48.696889 56.547556 56.547556 0 0 0-27.306666-48.696889 53.361778 53.361778 0 0 0-54.613334 0 56.547556 56.547556 0 0 0-27.363555 48.696889z" fill="#0B58FF" ></path></symbol><symbol id="icon-edit" viewBox="0 0 1024 1024"><path d="M873.016889 500.736a32.824889 32.824889 0 0 1 65.649778 0v273.806222a164.124444 164.124444 0 0 1-164.124445 164.124445h-525.084444A164.124444 164.124444 0 0 1 85.333333 774.542222v-525.084444A164.124444 164.124444 0 0 1 249.457778 85.333333h312.32a32.824889 32.824889 0 1 1 0 65.649778h-312.32a98.417778 98.417778 0 0 0-98.474667 98.417778v525.141333c0 54.385778 44.088889 98.474667 98.417778 98.474667h525.141333a98.417778 98.417778 0 0 0 98.474667-98.417778V500.679111z m-14.222222-362.097778a32.824889 32.824889 0 0 1 48.014222 44.771556L548.750222 567.466667a32.824889 32.824889 0 1 1-48.014222-44.771556l358.115556-384.056889z" fill="#0B58FF" ></path></symbol><symbol id="icon-delete" viewBox="0 0 1024 1024"><path d="M601.024 749.76a29.632 29.632 0 0 1-29.696-29.696V392.96a29.632 29.632 0 1 1 59.456 0v326.848a29.76 29.76 0 0 1-29.76 29.888z m-178.24 0a29.632 29.632 0 0 1-29.696-29.696V392.96a29.632 29.632 0 1 1 59.392 0v326.848a29.76 29.76 0 0 1-29.696 29.888z m475.52-505.216h-148.544v-59.456c0-49.152-39.616-89.088-88.512-89.088H363.392c-49.216 0-89.152 39.936-89.152 89.088v59.456H125.696a29.632 29.632 0 1 0 0 59.392h772.608a29.632 29.632 0 1 0 0-59.392z m-564.608-59.456c0-16.256 13.44-29.696 29.696-29.696h297.856c16.32 0 29.056 13.12 29.056 29.696v59.456H333.696v-59.456zM720 928h-416a89.152 89.152 0 0 1-89.088-89.088V392.768a29.632 29.632 0 1 1 59.456 0v446.08c0 16.512 13.44 29.76 29.696 29.76h416.064a29.632 29.632 0 0 0 29.696-29.696V393.856a29.632 29.632 0 1 1 59.456 0v445.056A89.536 89.536 0 0 1 720 928z" fill="#FF5454" ></path></symbol></svg>',function(a){var t=(t=document.getElementsByTagName("script"))[t.length-1],e=t.getAttribute("data-injectcss"),t=t.getAttribute("data-disable-injectsvg");if(!t){var n,i,o,c,l,d=function(t,e){e.parentNode.insertBefore(t,e)};if(e&&!a.__iconfont__svg__cssinject__){a.__iconfont__svg__cssinject__=!0;try{document.write("<style>.svgfont {display: inline-block;width: 1em;height: 1em;fill: currentColor;vertical-align: -0.1em;font-size:16px;}</style>")}catch(t){console&&console.log(t)}}n=function(){var t,e=document.createElement("div");e.innerHTML=a._iconfont_svg_string_3821755,(e=e.getElementsByTagName("svg")[0])&&(e.setAttribute("aria-hidden","true"),e.style.position="absolute",e.style.width=0,e.style.height=0,e.style.overflow="hidden",e=e,(t=document.body).firstChild?d(e,t.firstChild):t.appendChild(e))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(n,0):(i=function(){document.removeEventListener("DOMContentLoaded",i,!1),n()},document.addEventListener("DOMContentLoaded",i,!1)):document.attachEvent&&(o=n,c=a.document,l=!1,v(),c.onreadystatechange=function(){"complete"==c.readyState&&(c.onreadystatechange=null,s())})}function s(){l||(l=!0,o())}function v(){try{c.documentElement.doScroll("left")}catch(t){return void setTimeout(v,50)}s()}}(window);
\ No newline at end of file
diff --git a/src/views/specialEquipment/check/iconfont/iconfont.json b/src/views/specialEquipment/check/iconfont/iconfont.json
new file mode 100644
index 00000000..fd0f1b78
--- /dev/null
+++ b/src/views/specialEquipment/check/iconfont/iconfont.json
@@ -0,0 +1,44 @@
+{
+  "id": "3821755",
+  "name": "component",
+  "font_family": "iconfont",
+  "css_prefix_text": "icon-",
+  "description": "封装的组件中的icon",
+  "glyphs": [
+    {
+      "icon_id": "36426261",
+      "name": "downward",
+      "font_class": "downward",
+      "unicode": "e604",
+      "unicode_decimal": 58884
+    },
+    {
+      "icon_id": "36426301",
+      "name": "upward",
+      "font_class": "upward",
+      "unicode": "e605",
+      "unicode_decimal": 58885
+    },
+    {
+      "icon_id": "33347867",
+      "name": "detail",
+      "font_class": "detail",
+      "unicode": "e601",
+      "unicode_decimal": 58881
+    },
+    {
+      "icon_id": "33347918",
+      "name": "edit",
+      "font_class": "edit",
+      "unicode": "e602",
+      "unicode_decimal": 58882
+    },
+    {
+      "icon_id": "33347930",
+      "name": "delete",
+      "font_class": "delete",
+      "unicode": "e603",
+      "unicode_decimal": 58883
+    }
+  ]
+}
diff --git a/src/views/specialEquipment/check/iconfont/iconfont.svg b/src/views/specialEquipment/check/iconfont/iconfont.svg
new file mode 100644
index 00000000..647e5515
--- /dev/null
+++ b/src/views/specialEquipment/check/iconfont/iconfont.svg
@@ -0,0 +1,29 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
+<svg xmlns="http://www.w3.org/2000/svg">
+  <metadata>Created by iconfont</metadata>
+  <defs>
+  <font id="iconfont" horiz-adv-x="1024">
+    <font-face
+      font-family="iconfont"
+      font-weight="400"
+      font-stretch="normal"
+      units-per-em="1024"
+      ascent="896"
+      descent="-128"
+    />
+      <missing-glyph />
+      
+      <glyph glyph-name="downward" unicode="&#58884;" d="M556.942222 144.099556l363.064889 401.806222c24.860444 21.617778 24.860444 56.263111 0 77.880889a68.437333 68.437333 0 0 1-44.942222 16.156444c-16.896 0-33.052444-5.859556-44.885333-16.156444L512 260.949333l-318.236444 362.951111a68.437333 68.437333 0 0 1-44.942223 16.099556c-16.896 0-33.109333-5.802667-44.942222-16.156444-24.746667-21.617778-24.746667-56.206222 0-77.824l363.121778-401.749334c5.973333-5.290667 13.141333-9.443556 21.048889-12.231111 23.722667-8.305778 51.029333-3.527111 68.892444 12.060445z"  horiz-adv-x="1024" />
+      
+      <glyph glyph-name="upward" unicode="&#58885;" d="M556.942222 623.900444l363.064889-401.806222c24.860444-21.617778 24.860444-56.263111 0-77.880889a68.437333 68.437333 0 0 0-44.942222-16.156444c-16.896 0-33.052444 5.859556-44.885333 16.156444L512 507.050667l-318.236444-362.951111a68.437333 68.437333 0 0 0-44.942223-16.099556c-16.896 0-33.109333 5.802667-44.942222 16.156444-24.746667 21.617778-24.746667 56.206222 0 77.824L467.057778 623.729778c5.973333 5.290667 13.141333 9.443556 21.048889 12.231111 23.722667 8.305778 51.029333 3.527111 68.892444-12.060445z"  horiz-adv-x="1024" />
+      
+      <glyph glyph-name="detail" unicode="&#58881;" d="M902.428444 705.251556H332.401778a7.964444 7.964444 0 0 1-7.793778-8.021334v-56.206222a7.964444 7.964444 0 0 1 7.793778-8.078222h570.026666A7.964444 7.964444 0 0 1 910.222222 641.024v56.206222a7.964444 7.964444 0 0 1-7.793778 8.021334z m0-285.127112H332.401778a7.964444 7.964444 0 0 1-7.793778-7.964444v-56.32a7.964444 7.964444 0 0 1 7.793778-7.964444h570.026666a7.964444 7.964444 0 0 1 7.793778 7.964444v56.32a7.964444 7.964444 0 0 1-7.793778 7.964444z m0-285.070222H332.401778a7.964444 7.964444 0 0 1-7.793778-8.078222v-56.206222a7.964444 7.964444 0 0 1 7.793778-8.021334h570.026666a7.964444 7.964444 0 0 1 7.793778 8.021334v56.206222a7.964444 7.964444 0 0 1-7.793778 8.078222zM113.777778 669.127111c0-20.081778 10.410667-38.684444 27.306666-48.696889a53.361778 53.361778 0 0 1 54.670223 0 56.547556 56.547556 0 0 1 27.306666 48.696889 56.547556 56.547556 0 0 1-27.306666 48.696889 53.361778 53.361778 0 0 1-54.613334 0A56.547556 56.547556 0 0 1 113.777778 669.127111zM113.777778 384c0-20.081778 10.410667-38.684444 27.306666-48.696889a53.361778 53.361778 0 0 1 54.670223 0A56.547556 56.547556 0 0 1 223.061333 384a56.547556 56.547556 0 0 1-27.306666 48.696889 53.361778 53.361778 0 0 1-54.613334 0A56.547556 56.547556 0 0 1 113.777778 384z m0-285.127111c0-20.081778 10.410667-38.684444 27.306666-48.696889a53.361778 53.361778 0 0 1 54.670223 0 56.547556 56.547556 0 0 1 27.306666 48.696889 56.547556 56.547556 0 0 1-27.306666 48.696889 53.361778 53.361778 0 0 1-54.613334 0 56.547556 56.547556 0 0 1-27.363555-48.696889z"  horiz-adv-x="1024" />
+      
+      <glyph glyph-name="edit" unicode="&#58882;" d="M873.016889 395.264a32.824889 32.824889 0 0 0 65.649778 0v-273.806222a164.124444 164.124444 0 0 0-164.124445-164.124445h-525.084444A164.124444 164.124444 0 0 0 85.333333 121.457778v525.084444A164.124444 164.124444 0 0 0 249.457778 810.666667h312.32a32.824889 32.824889 0 1 0 0-65.649778h-312.32a98.417778 98.417778 0 0 1-98.474667-98.417778v-525.141333c0-54.385778 44.088889-98.474667 98.417778-98.474667h525.141333a98.417778 98.417778 0 0 1 98.474667 98.417778V395.320889z m-14.222222 362.097778a32.824889 32.824889 0 0 0 48.014222-44.771556L548.750222 328.533333a32.824889 32.824889 0 1 0-48.014222 44.771556l358.115556 384.056889z"  horiz-adv-x="1024" />
+      
+      <glyph glyph-name="delete" unicode="&#58883;" d="M601.024 146.24a29.632 29.632 0 0 0-29.696 29.696V503.04a29.632 29.632 0 1 0 59.456 0v-326.848a29.76 29.76 0 0 0-29.76-29.888z m-178.24 0a29.632 29.632 0 0 0-29.696 29.696V503.04a29.632 29.632 0 1 0 59.392 0v-326.848a29.76 29.76 0 0 0-29.696-29.888z m475.52 505.216h-148.544v59.456c0 49.152-39.616 89.088-88.512 89.088H363.392c-49.216 0-89.152-39.936-89.152-89.088v-59.456H125.696a29.632 29.632 0 1 1 0-59.392h772.608a29.632 29.632 0 1 1 0 59.392z m-564.608 59.456c0 16.256 13.44 29.696 29.696 29.696h297.856c16.32 0 29.056-13.12 29.056-29.696v-59.456H333.696v59.456zM720-32h-416a89.152 89.152 0 0 0-89.088 89.088V503.232a29.632 29.632 0 1 0 59.456 0v-446.08c0-16.512 13.44-29.76 29.696-29.76h416.064a29.632 29.632 0 0 1 29.696 29.696V502.144a29.632 29.632 0 1 0 59.456 0v-445.056A89.536 89.536 0 0 0 720-32z"  horiz-adv-x="1024" />
+      
+    </font>
+  </defs>
+</svg>
diff --git a/src/views/specialEquipment/check/iconfont/iconfont.ttf b/src/views/specialEquipment/check/iconfont/iconfont.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..014c3da9b180f6bb81e952964e168afc3e36648e
GIT binary patch
literal 2496
zcmd^B+iM(E82`SR+1YHenay6@Hk&q1HrW-@I%(JGrY)NYtxYNvFTJD)1-spyB-`wb
z&GaTB(TXA!T1x9f>4QZdl=|Rn!D}BZLctePU!)d<t)Tc&@If#We`j{qNSfjw;K`ov
z{J!h?&i9>}2{93M(E`b|W%9tGUHZAyD@42<(u2<*7|G<~dl$jK3;t-KlCR(2(KLx9
z1+tH3%4eou8=bsLB!7mvch<@mhrWGq4Yv0%v$GKR@5*ljLr+7q75nsh0Qmj}vc6m^
z<fZrcG<-h+uT}D=>l~*7^ukQ9<||gu2f0s){Mb*Lsn_Q17k^4zA_|nDKS;=3URYkB
zBT!?Aq+GB<R96D&n~kUMz8uQ^L0v7|dy9wn3$xa`yr_`832X;Rp0kLg(qT+7gtQZX
zM9YH35c*EqLgOSoGqLX=Y300KrG!Yr9YX(a%;nNd9`ReA44u$2B<$|t+AG8t$cOFT
zk#0kKzP0kNlwo*E<dY#?W4tiEr$}Elx#@H3LGq8Z05cJDWr(J^o336V#-6wVM4MYC
ze8lsef>cD=j1{McT%lpt2B{J?eaomvlLZAY0?VL2U{s7-wS(|~Jc91o_jwgSotvU=
zqNb>K6IBvZRIVv_(F0*4cu`Ha#=xRK!j33S&(Uoj<`02I6q2t?uTz95#aT0*^anVd
zRAcKnzAm1Xp5(b`+Kf6kotrT;73H}=Fp|E&7kdo7$GOaNJ-X53R67*4^_+-UXGN?4
z$75>pi2$p~v^mPz(QJI}SW?}oieNnFTo%Fjq8kipxxJUqOLr(lkJAX{=vkUV$^%Jt
zBgf)T4P>%oY^LS^;5pXMnQ=A^PHG%}BqP7I^o^`2vb0mdcm)3I7cH?dp*@mFU;E_k
zvd<;X&ue2T9!i8liGD$x@7KnnQ_G9;b-Yo;`+?ZZX5x>9W12KLkTj%iVRKx<`TIGh
zF(jG<T|YxIE^U*?xu5;4u_0wg<x;dS)@zLEOAquhqgNo_5eNnFb8bb4HiQyJLed1#
z0(~(KI9JqgxZ9_wd`^o-HRt!Xm!t_42t`7H(1xMt(gQdOAidhjk-ko6!S7Ro;jri#
zZrbua`I<aHLFz@{cF-Z*tz;Tmw@#rBt}t<x2e+AN90E-p#JzL-YNk_W7RQNi<N@@1
z#nsiW1d?6~Mk4DYkuSQ#;odMu_`6GH%DIy=FG0{PE1*kXhJ!pD3_Dl(4d-aegk2=a
z?*}6Q=0(6sga|q}1YN=WXD(%$sT_>(%L!#}>5!RXu~WCR%eDU8_1vAp=ZtXY@3x*M
z;3%g1WPx^oYhj7})aPLt@}!3q;9(E@@FmT7ScQDd!=1E=_IS7p5$ocussyl4n$CKd
zsfRxHutXZ&@URT|Ee|WeKX}+jak}qe74jtychVGhd$^0zT-e>P^0rmfkDbv=g<5sG
zR<+yferx7LIp1ir?RCm(%$I6aeXFshEt<5dR-+we{^U%?wx{*!My;YxAf8n&*YtX$
zcHAo1#;k4EcaDsReT3X7)GD-_8e~zPY|tX<bd1h`mhh>sQI)1$YCpv9hxH7dpfWrg
z4{29>Pr<rD^RN>!b=pb>9>3LAld!6~maDUwr<2$%gB)#Sq+>P^sRA_N<!2$2GO&&Y
z3f*zUDZtvGS=XyhJMqAb{BxeRz2Tm-(td-B{~OjGDoZT0!ai2nPaVbDsp_eGqo|&!
WyGzls^QE$46-%~Sw91xk5&aGMEM&(3

literal 0
HcmV?d00001

diff --git a/src/views/specialEquipment/check/iconfont/iconfont.woff b/src/views/specialEquipment/check/iconfont/iconfont.woff
new file mode 100644
index 0000000000000000000000000000000000000000..d25f753466da76a548c74047d88b3f133cf332c5
GIT binary patch
literal 1544
zcmY*Y2T+qq6y86f1PCQyp{aNVMCsj7q^U#{5d;+*DFnhvi4ZVBX=)P6p^2g+iXg>1
zf+vQ~9SR|g0)pI76flYbJQ9j1AOj-G{qf4oy_s*{`@Z>h-_GpYv;KSb00_XLgaT^v
ztRnoI%j^G#&!J#103Z~sy1)oB$~I2&KV)SKYr9}B2f=k6{slRjNQ1Qun4f}knG`o}
z9}&e2hie%C2yFn6_!K9fd@6+)2G=XF&kBYkwqve{3X1?Jn8Vx<23C0($)QHm8L)<j
zxdsefU3iI#CChzB|IsuMHy}ndkpcHrpu*Zl7)H=KK#n0sQ(z6g3*-U!j?gM`70_bi
z=>RCU!=9Zmf&$*^=Q8rigfId@Lb4_Z$b`5v^D0D1=U(#;GM7XkrU9<2?QNT_c5b|M
z<WuCc%CtxgqwtFv2w>u(hzIh$L?R(yD10Uq_IJ?P>FGtAyzH97tx4}dmaV|nj-Uud
zR%}Bn7uf71Q(~6h3WdV+90+e~U2IB10MaZvoRR;Y+oGQ4fl}bObaN`T$=jNeLsn~x
z)Q+;T)haq7aympmgHmp^Az6m(dmGZ{a&DNhge&lg<h^ohZfMf;BaIYV%&*j8qSy8;
zM(wtDI>&Q571XBqUeVJEV*%hhvI5<%^m%CA8A>obANMjuEZx#=jO`x68=+MVINp0z
zO|{%5Tp2Z>RL4E-f@UTgvF43K24eDy;+nJugs*;sekMC>)EQf4eVXojEu&|0;yGiS
z=@Sd3U)UtzNRXvR%gp)CH;oe;(tGv<3DkC|+pd*)C+n8m3;AQqL-F}9<`10wFjh0%
zF_pBKOA*tG7Y3;~T~=b;OHY@MeywaG#$tf9_^ATZ${%(j?J#>{>MQwU5W}D;S&C3G
zA`38WlBm`yi>nX)DS)!#j$=np`yc%CCMwrV=Udn}-tl!2M=Y||t}JR|>PeN_gB;an
zk(sgVLnki#(ct`O9rTrgQ&##YHFK9pN3{1-BZ5DbB<QKWoHD@~;2nrHp$6XRL71pF
z(_YtA3_hyVRc0aL52HW7xvS?mcP1j`wVqVHl_s7wbY4CrsGWGi?7FmB6v>v!*4O3M
zW>LltVHCVpUGqpH>$Z8fHt}oK@iu!Zs<D}!67T0;cG&!g?^p<H=37ql_(@ukXH#^m
z#^VRrlH;pl(Tv5__NT)hl*hd_8y`3JI$gh4Zlql+*q36pr}LrO=0x$r*S@CJ3KNQV
z@s+~Gpz<q$wLUEUdX)6Ty=>_Te(30y<gLN|(#EA{3z=nlJqFm3NhhWChN(G$_j)l7
zJ$iX_)TWX^`_%G@)09PV)t97li4{{P+gd&o-)A0--uU6mx!D!RP`!o_T@Ojii;qSM
zUst!QA*&s^oh?EIZAD=Jqbm1bzkGhRT15ciag_(H6+plTjfjQMA`%FMmJ1L>1$ywW
zl7|U60J@;<Q0afY2xOEpNsE9WSsH~AmNduh0KhCjN#Ey_=N2RK&|(#~a20Y*eM{{l
z4{tNo?pVpi^AFzr<*st|xKG`{F)MsO&hIi;=N)Q-8lQz{4tgVZKYBG3JKU7Fp##ha
zIGnjgspU|sarITR24M;9`tmh_f6BUwqRax?o#p#9q!mLari%PjqagLkudK5~&H5#+
z3W-voD0nhdwDa@v2Db7FYJk70>SR4z!MaUljtD3Deen)relWGSy>y0gd4Z(k|DNyK
z;~1J3lyI>-Kz|}gOul`-QHER3Z@;xmoq2z3u&nD=t;R_K-Eyj4%#(Riwb6tk8x}d=
zo5<cUrn(s&xNA2(;`7ZJMaPVg$khaYSzSASQyj|@LGM1X<@a6@)7kH`Md(yO0^Ka8
z^VTK%++)x8lBz~EU0*-oU+PDiXP2XsYkn)%Nj=!bU4aI##U7ErB`FP9Dov;5@G^OM
zJQnXdFNb$0eT#9k>qFN{Q`UnTu>W4^4Q%+hp!Dak8(;{>H|C?!KxrR(0D!*$z)yo)

literal 0
HcmV?d00001

diff --git a/src/views/specialEquipment/check/iconfont/iconfont.woff2 b/src/views/specialEquipment/check/iconfont/iconfont.woff2
new file mode 100644
index 0000000000000000000000000000000000000000..28c928058ba5d5c7f7bb8fb6318699bc2d478764
GIT binary patch
literal 1120
zcmV-m1fTnNPew8T0RR9100dwF3jhEB013bV00a~O0RR9100000000000000000000
z0000SR0d!GgD47yNQEo`HUcCA7z+*n1Rw>3X9rXpR0znfFmB<Aq9mgoMQ9jtz1?4@
z01e@SsMh}NSvvfL6l4Vm4(}?8P?C>Otiz5-v5tQKt4rko(4-J>iMGQp$7hhAP9f&8
z#1qba-7>bzRD$Mq?=)^;ss=$cMU$vi5G-XyHg#^*IPx-W(rNK53w*SjCAHY6M2BpC
zb>sifG1DdCw*gRQ;#%he8c;Vy67J37j^u>smf_VwuhYjMKuE7L4s+^mJwiVFO<Y3}
zoG|JI;&9n7i6-R63otd|f{);!GYxVT8bF;xUV$tA^W`5?_@J;FW1SUutrdOwE4&s>
zK!W~)TZe#qE5HI8=$x5I*4Hamats}v90|)5PP9{<4FW%%0pO?L66XCc4>Sggpg<f3
zBgWVzP76N;8wU+P9dI!4(~(fmbi%~_CE^Se0ItW>9FTmF^ibGNhTIx2g)J!XGZ5a~
zzHIvsQyf+v63++UO~qKr+0>hXSXd1{9ou)D4!oI)Bi56tcZ2cbdgyuIon2id@jP=b
z1cIdgv-F#FC7Y+y=i7r@XHzE|4#Ew))9dL=)Fsu2@1byhdb(iK_VcfZzu>J7tgLv%
z=evs?)F=7dPWK(J_l1q?=a-v7)|Hd9wXN+?I&~#z@|wtl^1T&_VWbP`_!;5(XyDQ_
z??O6wrKQ*1X2eLm$Ez-6w77tirdrOOzkMw|&5)B`YBS%YJm+p&x@~d%dGKSD@)X7t
z9AD)$s7Gz#xbe%X%yj7+5`913X>YA|OY2Om#oQd9`id-{{MwoG87{TYn!$K!tHu5I
zWpjTZ6_mZd3QGCywY)H^<`a_#nI7k~Gf$k-%NZGu(X-~27tgmDrL^oRFDx(0a2wC@
z&8`}o9h*eQm8|fT@iy3}V)c@^9or_i4_+NqFg`J~r+v`w(Tpdg)F)+1)Wb08`$+1e
z&$hdQyhG+KnxY-Z^#cvjx}WTKIR2L3@ZJ7XtO4N1@23y2KJylX;3E8+tq}O7m^-kb
zQH|hCS$;bO0UWDdhfM*YX@(4jCf`k8tO9T-2tEZdC_E}a<5Q0`*mkf)^n=4^3PL*6
z&W|Xdb3{x4G#f@B<hle!HV;6P>l@Nw|A3{~KXByw4<RcfuNKi9+o~CuI9Rc{6H6AV
z5sS_JW*>mqs+d@j^$9S$gv~fJEhFo$2Mt&kW9)5W7Uu*LMpazL?gxrOvCgOsEIh4+
zbG;}%os>N!%|caFjR7Vcu)@qbVG;{UL)^kV{dx}oQ7eTB10tWu7(0!pn#VGw$p9eh
z85$_>OxoME5oO^xLiZyWN`=*_GN70a3e(HG*#HYJO-l=#u1Gpnh(H-><FnLD+yI0a
m2RKop#fTLr9{zUPuC<$()#cN@b|-L?q&QtxiN}5la6kxx^#`8-

literal 0
HcmV?d00001


From 4d1b72fae7e7e1e63ce8f797ea5f016882695dee Mon Sep 17 00:00:00 2001
From: lb <liubin_9396@163.com>
Date: Fri, 23 Feb 2024 09:45:43 +0800
Subject: [PATCH 33/40] =?UTF-8?q?update=20=E5=B7=A1=E6=A3=80=E5=BE=85?=
 =?UTF-8?q?=E7=A1=AE=E8=AE=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../check/CheckOrderListTable.vue             |  17 +-
 .../specialEquipment/check/Content-add.vue    | 180 +++++
 .../specialEquipment/check/Content-edit.vue   | 751 ++++++++++++++++++
 src/views/specialEquipment/check/Content.vue  |   6 +-
 .../specialEquipment/maintain/WaitingList.vue |   2 -
 5 files changed, 948 insertions(+), 8 deletions(-)
 create mode 100644 src/views/specialEquipment/check/Content-add.vue
 create mode 100644 src/views/specialEquipment/check/Content-edit.vue

diff --git a/src/views/specialEquipment/check/CheckOrderListTable.vue b/src/views/specialEquipment/check/CheckOrderListTable.vue
index 96943a31..8d1400e5 100644
--- a/src/views/specialEquipment/check/CheckOrderListTable.vue
+++ b/src/views/specialEquipment/check/CheckOrderListTable.vue
@@ -53,6 +53,14 @@
 		</el-table-column>
 		<el-table-column
 			v-if="selectedBox[3]"
+			label="班次"
+			prop="groupClass">
+			<template slot-scope="scope">
+				{{ scope.row.groupClass || '---' }}
+			</template>
+		</el-table-column>
+		<el-table-column
+			v-if="selectedBox[4]"
 			label="确认截止时间"
 			prop="confirmDueTime">
 			<template slot-scope="scope">
@@ -60,7 +68,7 @@
 			</template>
 		</el-table-column>
 		<el-table-column
-			v-if="selectedBox[4]"
+			v-if="selectedBox[5]"
 			width="150"
 			label="备注"
 			prop="remark">
@@ -119,7 +127,7 @@
 import moment from 'moment';
 
 export default {
-	name: 'WaitingListTable',
+	name: 'CheckOrderListTable',
 	components: {},
 	props: ['tableData', 'page', 'limit'],
 	filters: {
@@ -138,6 +146,9 @@ export default {
 				{
 					label: '巡检时间',
 				},
+				{
+					label: '班次',
+				},
 				{
 					label: '确认截止时间',
 				},
@@ -145,7 +156,7 @@ export default {
 					label: '备注',
 				},
 			],
-			selectedBox: [true, true, true, true, true],
+			selectedBox: [true, true, true, true, true, true],
 			selectedOrder: [],
 		};
 	},
diff --git a/src/views/specialEquipment/check/Content-add.vue b/src/views/specialEquipment/check/Content-add.vue
new file mode 100644
index 00000000..9b3ec346
--- /dev/null
+++ b/src/views/specialEquipment/check/Content-add.vue
@@ -0,0 +1,180 @@
+<!--
+ * @Author: lb
+ * @Date: 2024-2-23 09:16:25
+ * @LastEditors: lb
+ * @LastEditTime: 2024-2-23 09:16:25
+ * @Description: 设备巡检待确认弹窗
+-->
+<template>
+	<el-form
+		ref="form"
+		:model="dataForm"
+		:rules="dataRule"
+		@keyup.enter.native="dataFormSubmit()"
+		label-width="128px"
+		v-loading="formLoading"
+		label-position="top">
+		<el-row :gutter="20">
+			<el-col>
+				<el-form-item label="巡检单名称" prop="name">
+					<el-input v-model="dataForm.name" placeholder="请输入巡检单名称" />
+				</el-form-item>
+			</el-col>
+			<el-col>
+				<el-form-item
+					label="部门"
+					prop="departmentId"
+					:rules="[{ required: true, message: '请选择部门', trigger: 'blur' }]">
+					<el-select
+						v-model="dataForm.departmentId"
+						:placeholder="`请选择部门`">
+						<el-option
+							v-for="opt in departmentOptions"
+							:key="opt.value"
+							:label="opt.label"
+							:value="opt.value" />
+					</el-select>
+				</el-form-item>
+			</el-col>
+			<el-col>
+				<el-form-item label="班次" prop="groupClass">
+					<el-select
+						v-model="dataForm.groupClass"
+						filterable
+						clearable
+						multiple
+						style="width: 100%"
+						placeholder="请选择班次">
+						<el-option
+							v-for="d in groupOptions"
+							:key="d.value"
+							:label="d.label"
+							:value="d.label" />
+					</el-select>
+				</el-form-item>
+			</el-col>
+			<!-- <el-col>
+				<el-form-item label="备注" prop="remark">
+					<el-input v-model="dataForm.remark" placeholder="请输入备注" />
+				</el-form-item>
+			</el-col> -->
+		</el-row>
+	</el-form>
+</template>
+
+<script>
+export default {
+	name: 'ContentAdd',
+	data() {
+		return {
+			formLoading: false,
+			dataForm: {
+				id: null,
+				name: null,
+				departmentId: null,
+				groupClass: null,
+				// special: true,
+			},
+			dataRule: {
+				name: [
+					{ required: true, message: '巡检单名称不能为空', trigger: 'blur' },
+				],
+			},
+			equipmentOptions: [],
+			groupOptions: [],
+			departmentOptions: [],
+		};
+	},
+	mounted() {
+		this.initOptions();
+	},
+	methods: {
+		reset() {
+			this.dataForm = {
+				id: null,
+				name: null,
+				departmentId: null,
+				groupClass: null,
+				// special: true,
+			};
+		},
+
+		async initOptions() {
+			this.formLoading = true;
+			const urls = [
+				'/base/core-department/listAll',
+				'/base/group-classes/listAll',
+			];
+			try {
+				const [dpt, grp] = await Promise.all(
+					urls.map((url) => this.$axios(url))
+				);
+				if (dpt.code == 0) {
+					this.departmentOptions = dpt.data.map((item) => ({
+						label: item.name,
+						value: item.id,
+					}));
+				}
+				if (grp.code == 0) {
+					this.groupOptions = grp.data.map((item) => ({
+						label: item.name,
+						value: item.id,
+					}));
+				}
+				this.formLoading = false;
+			} catch (err) {
+				this.formLoading = false;
+				console.error(err);
+			}
+		},
+
+		async init(row) {
+			if (!row || !row.id) {
+				return;
+			}
+			const res = await this.$axios({
+				url: '/base/equipment-check-order/get?id=' + row.id,
+			});
+			if (res.code == 0) {
+				Object.keys(this.dataForm).forEach((key) => {
+					this.dataForm[key] = res.data[key];
+					if (key == 'groupClass') {
+						this.dataForm.groupClass = res.data.groupClass.split(',');
+					}
+				});
+			}
+		},
+
+		async dataFormSubmit() {
+			let valid = false;
+			try {
+				valid = await this.$refs.form.validate();
+			} catch (err) {}
+			if (!valid) return;
+			const res = await this.$axios({
+				url:
+					'/base/equipment-check-order' +
+					(this.dataForm.id ? '/update' : '/create'),
+				method: this.dataForm.id ? 'put' : 'post',
+				data: {
+					...this.dataForm,
+					special: true,
+					status: 1,
+					groupClass: this.dataForm.groupClass.join(','),
+				},
+			});
+			if (res.code == 0) {
+				this.$emit('refreshDataList');
+				this.$message.success(this.dataForm.id ? '更新成功' : '创建成功');
+			}
+		},
+	},
+};
+</script>
+
+<style scoped lang="scss">
+.el-date-editor,
+.el-select {
+	width: 100%;
+}
+</style>
diff --git a/src/views/specialEquipment/check/Content-edit.vue b/src/views/specialEquipment/check/Content-edit.vue
new file mode 100644
index 00000000..e5a6064a
--- /dev/null
+++ b/src/views/specialEquipment/check/Content-edit.vue
@@ -0,0 +1,751 @@
+<!-- 
+    filename: Content-edit.vue
+    author: liubin
+    date: 2024-2-24 11:38:56
+    description: 
+-->
+
+<template>
+	<el-drawer
+		:visible="visible"
+		:show-close="false"
+		:wrapper-closable="false"
+		class="drawer"
+		custom-class="mes-drawer"
+		size="60%"
+		@closed="$emit('destroy')">
+		<SmallTitle slot="title">编辑</SmallTitle>
+
+		<div class="drawer-body flex">
+			<div class="drawer-body__content">
+				<div class="form-part" style="margin-bottom: 32px">
+					<!-- <el-skeleton v-if="!showForm" animated /> -->
+					<el-form
+						class="equipment-info-form"
+						ref="form"
+						:model="form"
+						label-width="200px"
+						label-position="top"
+						v-loading="formLoading">
+						<el-row :gutter="20">
+							<el-col :span="8">
+								<el-form-item label="保养计划单号" prop="maintainOrderNumber">
+									<!-- :rules="[
+										{
+											required: true,
+											message: '请输入保养计划单号',
+											trigger: 'blur',
+										},
+									]" -->
+									<el-input
+										v-model="form.maintainOrderNumber"
+										disabled
+										:placeholder="`请输入保养计划单号`" />
+								</el-form-item>
+							</el-col>
+
+							<el-col :span="8">
+								<el-form-item label="保养计划名称" prop="planName">
+									<el-input
+										v-model="form.planName"
+										placeholder="请输入保养计划名称"
+										disabled />
+								</el-form-item>
+							</el-col>
+
+							<el-col :span="8">
+								<el-form-item label="部门" prop="departmentId">
+									<!-- :rules="[
+										{ required: true, message: '请选择部门', trigger: 'blur' },
+									]" -->
+									<el-select
+										v-model="form.departmentId"
+										:placeholder="`请选择部门`"
+										clearable
+										disabled
+										filterable>
+										<el-option
+											v-for="opt in departmentOptions"
+											:key="opt.value"
+											:label="opt.label"
+											:value="opt.value" />
+									</el-select>
+								</el-form-item>
+							</el-col>
+
+							<el-col :span="8">
+								<el-form-item label="产线" prop="lineId">
+									<!-- :rules="[
+										{ required: true, message: '请选择产线', trigger: 'blur' },
+									]" -->
+									<el-select
+										v-model="form.lineId"
+										:placeholder="`请选择产线`"
+										disabled
+										clearable
+										filterable>
+										<el-option
+											v-for="opt in lineOptions"
+											:key="opt.value"
+											:label="opt.label"
+											:value="opt.value" />
+									</el-select>
+								</el-form-item>
+							</el-col>
+
+							<el-col :span="8">
+								<el-form-item label="计划保养人员" prop="maintainer">
+									<el-select
+										v-model="form.planMaintainWorker"
+										placeholder="请选择计划保养人员"
+										disabled
+										clearable
+										filterable />
+								</el-form-item>
+							</el-col>
+
+							<el-col :span="8">
+								<el-form-item label="计划开始时间" prop="planStartTime">
+									<el-date-picker
+										v-model="form.planStartTime"
+										type="datetime"
+										disabled
+										placeholder="请选择计划开始时间"
+										value-format="timestamp"></el-date-picker>
+								</el-form-item>
+							</el-col>
+
+							<el-col :span="8">
+								<el-form-item label="计划结束时间" prop="planEndTime">
+									<el-date-picker
+										v-model="form.planEndTime"
+										type="datetime"
+										disabled
+										placeholder="请选择计划结束时间"
+										value-format="timestamp"></el-date-picker>
+								</el-form-item>
+							</el-col>
+
+							<el-col :span="8">
+								<el-form-item
+									label="实际开始时间"
+									prop="startTime"
+									:rules="[
+										{
+											required: true,
+											message: '请选择实际开始时间',
+											trigger: 'blur',
+										},
+									]">
+									<el-date-picker
+										v-model="form.startTime"
+										type="datetime"
+										placeholder="请选择实际开始时间"
+										value-format="timestamp"></el-date-picker>
+								</el-form-item>
+							</el-col>
+
+							<el-col :span="8">
+								<el-form-item
+									label="实际结束时间"
+									prop="endTime"
+									:rules="[
+										{
+											required: true,
+											message: '请选择实际结束时间',
+											trigger: 'blur',
+										},
+									]">
+									<el-date-picker
+										v-model="form.endTime"
+										type="datetime"
+										placeholder="请选择实际结束时间"
+										value-format="timestamp"></el-date-picker>
+								</el-form-item>
+							</el-col>
+
+							<el-col :span="8">
+								<el-form-item
+									label="实际保养人员"
+									prop="maintainWorker"
+									:rules="[
+										{
+											required: true,
+											message: '请选择实际保养人员',
+											trigger: 'blur',
+										},
+									]">
+									<el-select
+										v-model="form.maintainWorker"
+										:placeholder="`请选择实际保养人员`"
+										multiple
+										clearable
+										filterable>
+										<el-option
+											v-for="opt in maintainerOptions"
+											:key="opt.value"
+											:label="opt.label"
+											:value="opt.value" />
+									</el-select>
+								</el-form-item>
+							</el-col>
+
+							<el-col :span="24">
+								<el-form-item label="备注" prop="remark">
+									<el-input v-model="form.remark" :placeholder="`请输入备注`" />
+								</el-form-item>
+							</el-col>
+						</el-row>
+					</el-form>
+				</div>
+
+				<SmallTitle>保养内容</SmallTitle>
+
+				<div style="margin-top: 12px; position: relative">
+					<SearchBar
+						:formConfigs="searchBarFormConfig"
+						ref="attr-search-bar"
+						@headBtnClick="handleSearchBarBtnClick" />
+				</div>
+
+				<div style="margin-top: 12px; position: relative">
+					<div style="position: absolute; top: -40px; right: 0">
+						<el-button @click="handleAddAttr" type="text">
+							<i class="el-icon-plus"></i>
+							添加属性
+						</el-button>
+					</div>
+					<base-table
+						v-loading="attrListLoading"
+						:table-props="attrTableProps"
+						:page="attrQuery?.params.pageNo || 1"
+						:limit="attrQuery?.params.pageSize || 10"
+						:table-data="attrList"
+						@emitFun="handleEmitFun">
+						<method-btn
+							slot="handleBtn"
+							label="操作"
+							:method-list="tableBtn"
+							@clickBtn="handleTableBtnClick" />
+					</base-table>
+
+					<!-- 分页组件 -->
+					<pagination
+						v-show="attrTotal > 0"
+						:total="attrTotal"
+						:page.sync="attrQuery.params.pageNo"
+						:limit.sync="attrQuery.params.pageSize"
+						@pagination="getAttrList" />
+				</div>
+			</div>
+
+			<div class="drawer-body__footer">
+				<el-button style="" @click="handleCancel">取消</el-button>
+				<el-button type="primary" @click="handleConfirm">保存</el-button>
+			</div>
+		</div>
+
+		<!-- 属性对话框 -->
+		<base-dialog
+			:dialogTitle="attrTitle"
+			:dialogVisible="attrFormVisible"
+			width="35%"
+			:append-to-body="true"
+			custom-class="baseDialog"
+			@close="closeAttrForm"
+			@cancel="closeAttrForm"
+			@confirm="submitAttrForm">
+			<DialogForm
+				v-if="attrFormVisible"
+				ref="attrForm"
+				v-model="attrForm"
+				:rows="attrRows" />
+		</base-dialog>
+	</el-drawer>
+</template>
+
+<script>
+import DialogForm from '../../../components/DialogForm/index.vue';
+
+const SmallTitle = {
+	name: 'SmallTitle',
+	props: ['size'],
+	components: {},
+	data() {
+		return {};
+	},
+	methods: {},
+	render: function (h) {
+		return h(
+			'span',
+			{
+				class: 'small-title',
+				style: {
+					fontSize: '18px',
+					lineHeight:
+						this.size == 'lg' ? '24px' : this.size == 'sm' ? '18px' : '20px',
+					fontWeight: 500,
+					fontFamily: '微软雅黑, Microsoft YaHei, Arial, Helvetica, sans-serif',
+				},
+			},
+			this.$slots.default
+		);
+	},
+};
+
+export default {
+	components: { SmallTitle, DialogForm },
+	props: ['dataId'], // dataId 作为一个通用的存放id的字段
+	data() {
+		return {
+			visible: false,
+			btnLoading: false,
+			form: {},
+			formLoading: false,
+			lineList: [],
+			maintainerList: [],
+			departmentList: [],
+			attrTableProps: [
+				{
+					prop: 'equipmentName',
+					label: '设备名称',
+				},
+				{
+					prop: 'program',
+					label: '保养项目',
+				},
+				{
+					prop: 'maintenanceDes',
+					label: '保养描述',
+				},
+			],
+			attrList: [],
+			attrTotal: 0,
+			attrTitle: '',
+			attrForm: {
+				id: null,
+				logId: null,
+				program: null,
+				maintenanceDes: null,
+				remark: null,
+			},
+			attrFormVisible: false,
+			attrRows: [
+				[
+					{
+						select: true,
+						label: '设备名称',
+						prop: 'equipmentId',
+						url: '/base/core-equipment/page?pageNo=1&pageSize=100&special=true',
+						// method: 'post',
+						// queryParams: {
+						// 	pageNo: 1,
+						// 	pageSize: 100,
+						// 	special: true,
+						// },
+						rules: [
+							{ required: true, message: '设备不能为空', trigger: 'blur' },
+						],
+					},
+				],
+				[
+					{
+						input: true,
+						label: '保养项目',
+						prop: 'program',
+					},
+				],
+				[
+					{
+						input: true,
+						label: '保养描述',
+						prop: 'maintenanceDes',
+					},
+				],
+				[
+					{
+						input: true,
+						label: '备注',
+						prop: 'remark',
+					},
+				],
+			],
+			attrQuery: {
+				params: {
+					pageNo: 1,
+					pageSize: 10,
+					equipmentName: null,
+				},
+			}, // 属性列表的请求
+			searchBarFormConfig: [
+				{
+					type: 'input',
+					label: '设备',
+					placeholder: '请输入设备名称',
+					param: 'equipmentName',
+				},
+				{
+					type: 'button',
+					btnName: '查询',
+					name: 'search',
+					color: 'primary',
+				},
+			],
+			attrFormSubmitting: false,
+			attrListLoading: false,
+			// syncFileListFlag: null,
+			tableBtn: [
+				{
+					type: 'edit',
+					btnName: '编辑',
+				},
+				{
+					type: 'delete',
+					btnName: '删除',
+				},
+			],
+			row: null,
+		};
+	},
+	computed: {
+		departmentOptions() {
+			return (this.departmentList || []).map((item) => ({
+				id: item.id,
+				label: item.name,
+				value: item.id,
+			}));
+		},
+		lineOptions() {
+			return (this.lineList || []).map((item) => ({
+				id: item.id,
+				label: item.name,
+				value: item.id,
+			}));
+		},
+		maintainerOptions() {
+			return (this.maintainerList || []).map((item) => ({
+				id: item.id,
+				label: item.name,
+				value: item.name,
+			}));
+		},
+	},
+	mounted() {
+		this.getList('maintainer');
+		this.getList('department');
+		this.getList('line');
+	},
+	methods: {
+		handleSearchBarBtnClick(btn) {
+			switch (btn.btnName) {
+				case 'search':
+					this.attrQuery.params.equipmentName = btn.equipmentName;
+					this.getAttrList();
+					break;
+			}
+		},
+		handleTableBtnClick({ type, data }) {
+			switch (type) {
+				case 'edit':
+					this.handleEditAttr(data.id);
+					break;
+				case 'delete':
+					this.handleDeleteAttr(data.id);
+					break;
+			}
+		},
+		async handleConfirm() {
+			this.btnLoading = true;
+			this.$nextTick(async () => {
+				const { code, data } = await this.$axios({
+					url: '/base/equipment-maintain-log/update',
+					method: 'put',
+					data: {
+						...this.form,
+						maintainWorker: this.form.maintainWorker.join(','),
+						planMaintainWorker: this.form.planMaintainWorker?.join(','),
+					},
+				});
+				if (code == 0) {
+					this.$modal.msgSuccess('更新成功');
+				}
+				this.btnLoading = false;
+				this.$emit('refreshDataList');
+				this.handleCancel();
+			});
+		},
+
+		handleEmitFun(val) {
+			console.log('handleEmitFun', val);
+		},
+
+		init(row) {
+			this.visible = true;
+			this.row = row;
+			this.getInfo(row);
+			this.getAttrList(row);
+		},
+
+		async getInfo(row) {
+			this.formLoading = true;
+			const res = await this.$axios(
+				'/base/equipment-maintain-log/get?id=' + row.id
+			);
+			if (res.code == 0) {
+				this.form = res.data;
+				this.form.maintainWorker = res.data.maintainWorker.split(',');
+				this.form.planMaintainWorker = res.data.planMaintainWorker?.split(',');
+				this.formLoading = false;
+			}
+			this.formLoading = false;
+		},
+
+		async getAttrList(row, condition = {}) {
+			if (!row) row = this.row;
+			this.attrListLoading = true;
+			const res = await this.$axios({
+				url: '/base/equipment-maintain-log-det/page',
+				method: 'get',
+				params: {
+					...this.attrQuery.params,
+					logId: row.id,
+					...condition,
+				},
+			});
+			if (res.code == 0) {
+				this.attrList = res.data.list;
+				this.attrTotal = res.data.total;
+			}
+			this.attrListLoading = false;
+		},
+
+		async getList(source = 'department') {
+			const urls = [
+				'/base/core-production-line/listAll',
+				'/base/core-department/listAll',
+				'/base/core-worker/listAll',
+			];
+			let res;
+			switch (source) {
+				case 'department':
+					res = await this.$axios(urls[1]);
+					this.departmentList = res.data || [];
+					break;
+				case 'maintainer':
+					res = await this.$axios(urls[2]);
+					this.maintainerList = res.data || [];
+					break;
+				case 'line':
+					res = await this.$axios(urls[0]);
+					this.lineList = res.data || [];
+					break;
+			}
+			this.formLoading = false;
+		},
+
+		// 保存表单
+		handleSave() {
+			this.$refs.form.validate(async (valid) => {
+				if (valid) {
+					await this.$axios({
+						url: '/urlupdate', //  this.sections[0][isEdit ? 'urlUpdate' : 'urlCreate'],
+						method: 'post', // isEdit ? 'put' : 'post',
+						data: this.form,
+					});
+					this.$modal.msgSuccess(`${isEdit ? '更新' : '创建'}成功`);
+					this.visible = false;
+					this.$emit('refreshDataList');
+				}
+			});
+		},
+
+		handleCancel() {
+			this.visible = false;
+		},
+
+		resetAttrform() {
+			this.attrForm = {
+				id: null,
+				logId: this.row.id,
+				maintenanceDes: '',
+				program: null,
+				remark: null,
+			};
+		},
+
+		// 新增属性
+		handleAddAttr() {
+			if (!this.row.id) return this.$message.error('请先选中保养记录');
+			this.resetAttrform();
+			this.attrTitle = '添加设备属性';
+			this.attrFormVisible = true;
+		},
+
+		// 编辑属性
+		async handleEditAttr(attrId) {
+			const res = await this.$axios({
+				url: '/base/equipment-maintain-log-det/get',
+				method: 'get',
+				params: { id: attrId },
+			});
+			if (res.code == 0) {
+				this.attrForm = res.data;
+				this.attrTitle = '编辑设备属性';
+				this.attrFormVisible = true;
+			}
+		},
+
+		// 删除属性
+		handleDeleteAttr(attrId) {
+			this.$confirm('确定删除该保养内容?', '提示', {
+				confirmButtonText: '确定',
+				cancelButtonText: '取消',
+				type: 'warning',
+			})
+				.then(async () => {
+					const res = await this.$axios({
+						url: '/base/equipment-maintain-log-det/delete?id=' + attrId,
+						method: 'delete',
+					});
+					if (res.code == 0) {
+						this.$message({
+							message: '删除成功',
+							type: 'success',
+							duration: 1500,
+							onClose: () => {
+								this.getAttrList();
+							},
+						});
+					}
+				})
+				.catch(() => {});
+		},
+
+		// 提交属性表
+		submitAttrForm() {
+			this.$refs['attrForm'].validate(async (valid) => {
+				if (!valid) {
+					return;
+				}
+
+				try {
+					const isEdit = this.attrForm.id != null;
+					this.attrFormSubmitting = true;
+					const res = await this.$axios({
+						url: isEdit
+							? '/base/equipment-maintain-log-det/update'
+							: '/base/equipment-maintain-log-det/create',
+						method: isEdit ? 'put' : 'post',
+						data: this.attrForm,
+					});
+
+					if (res.code == 0) {
+						this.closeAttrForm();
+						this.$message({
+							message: `${isEdit ? '更新' : '创建'}成功`,
+							type: 'success',
+							duration: 1500,
+							onClose: () => {
+								this.getAttrList();
+							},
+						});
+					}
+					this.attrFormSubmitting = false;
+				} catch (err) {
+					this.$message({
+						message: err,
+						type: 'error',
+						duration: 1500,
+					});
+					this.attrFormSubmitting = false;
+				}
+			});
+		},
+
+		closeAttrForm() {
+			this.attrFormVisible = false;
+		},
+
+		handleClick(raw) {
+			if (raw.type === 'delete') {
+				this.$confirm(
+					`确定对${
+						raw.data.name
+							? '[名称=' + raw.data.name + ']'
+							: '[序号=' + raw.data._pageIndex + ']'
+					}进行删除操作?`,
+					'提示',
+					{
+						confirmButtonText: '确定',
+						cancelButtonText: '取消',
+						type: 'warning',
+					}
+				)
+					.then(() => {
+						deleteProductAttr(raw.data.id).then(({ data }) => {
+							this.$message({
+								message: '操作成功',
+								type: 'success',
+								duration: 1500,
+								onClose: () => {
+									this.getList();
+								},
+							});
+						});
+					})
+					.catch(() => {});
+			} else {
+				this.addNew(raw.data.id);
+			}
+		},
+	},
+};
+</script>
+
+<style scoped>
+.drawer >>> .el-drawer {
+	border-radius: 8px 0 0 8px;
+}
+
+.drawer >>> .el-date-editor,
+.drawer >>> .el-select {
+	width: 100%;
+}
+
+.drawer >>> .el-drawer__header {
+	margin: 0;
+	padding: 32px 32px 24px;
+	border-bottom: 1px solid #dcdfe6;
+	margin-bottom: 0px;
+}
+
+.small-title::before {
+	content: '';
+	display: inline-block;
+	vertical-align: top;
+	width: 4px;
+	height: 22px;
+	border-radius: 1px;
+	margin-right: 8px;
+	background-color: #0b58ff;
+}
+
+.drawer-body {
+	display: flex;
+	flex-direction: column;
+	height: 100%;
+}
+
+.drawer-body__content {
+	flex: 1;
+	/* background: #eee; */
+	padding: 20px 30px;
+	overflow-y: auto;
+}
+
+.drawer-body__footer {
+	display: flex;
+	justify-content: flex-end;
+	padding: 18px;
+}
+</style>
diff --git a/src/views/specialEquipment/check/Content.vue b/src/views/specialEquipment/check/Content.vue
index 992dccd0..dc803ad4 100644
--- a/src/views/specialEquipment/check/Content.vue
+++ b/src/views/specialEquipment/check/Content.vue
@@ -68,7 +68,7 @@
 <script>
 import basicPageMixin from '@/mixins/lb/basicPageMixin';
 import addOrUpdata from './add-or-updata.vue';
-import add from './add.vue';
+import add from './Content-add.vue';
 import { parseTime } from '../../core/mixins/code-filter';
 import CheckOrderListTable from './CheckOrderListTable.vue';
 
@@ -181,7 +181,7 @@ export default {
 				pageNo: 1,
 				pageSize: 10,
 				name: null,
-				status: 0,
+				status: 1,
 			},
 			// 表单参数
 			form: {},
@@ -270,7 +270,7 @@ export default {
 		/** 新增按钮操作 */
 		handleAdd() {
 			this.open = true;
-			this.title = '添加巡检设置';
+			this.title = '添加待确认巡检设置';
 			this.$nextTick(() => {
 				this.$refs.add.init();
 			});
diff --git a/src/views/specialEquipment/maintain/WaitingList.vue b/src/views/specialEquipment/maintain/WaitingList.vue
index e710cace..9c72bf40 100644
--- a/src/views/specialEquipment/maintain/WaitingList.vue
+++ b/src/views/specialEquipment/maintain/WaitingList.vue
@@ -86,8 +86,6 @@
 			v-if="recordDetailVisible"
 			ref="recordDetailDrawer"
 			@closed="recordDetailVisible = false" />
-
-		<!-- 详情  -->
 	</div>
 </template>
 

From 99b225e3dc2ced47cfbd927fc875f76196386069 Mon Sep 17 00:00:00 2001
From: lb <liubin_9396@163.com>
Date: Fri, 23 Feb 2024 11:20:04 +0800
Subject: [PATCH 34/40] =?UTF-8?q?update=20=E5=B7=A1=E6=A3=80=E5=BE=85?=
 =?UTF-8?q?=E7=A1=AE=E8=AE=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../specialEquipment/check/Content-add.vue    |   5 +-
 .../specialEquipment/check/Content-edit.vue   | 235 ++++++------------
 src/views/specialEquipment/check/Content.vue  |  20 +-
 3 files changed, 96 insertions(+), 164 deletions(-)

diff --git a/src/views/specialEquipment/check/Content-add.vue b/src/views/specialEquipment/check/Content-add.vue
index 9b3ec346..93eae346 100644
--- a/src/views/specialEquipment/check/Content-add.vue
+++ b/src/views/specialEquipment/check/Content-add.vue
@@ -21,10 +21,7 @@
 				</el-form-item>
 			</el-col>
 			<el-col>
-				<el-form-item
-					label="部门"
-					prop="departmentId"
-					:rules="[{ required: true, message: '请选择部门', trigger: 'blur' }]">
+				<el-form-item label="部门" prop="departmentId">
 					<el-select
 						v-model="dataForm.departmentId"
 						:placeholder="`请选择部门`">
diff --git a/src/views/specialEquipment/check/Content-edit.vue b/src/views/specialEquipment/check/Content-edit.vue
index e5a6064a..17a9db2e 100644
--- a/src/views/specialEquipment/check/Content-edit.vue
+++ b/src/views/specialEquipment/check/Content-edit.vue
@@ -29,41 +29,20 @@
 						v-loading="formLoading">
 						<el-row :gutter="20">
 							<el-col :span="8">
-								<el-form-item label="保养计划单号" prop="maintainOrderNumber">
-									<!-- :rules="[
-										{
-											required: true,
-											message: '请输入保养计划单号',
-											trigger: 'blur',
-										},
-									]" -->
+								<el-form-item label="巡检单名称" prop="name">
 									<el-input
-										v-model="form.maintainOrderNumber"
-										disabled
-										:placeholder="`请输入保养计划单号`" />
-								</el-form-item>
-							</el-col>
-
-							<el-col :span="8">
-								<el-form-item label="保养计划名称" prop="planName">
-									<el-input
-										v-model="form.planName"
-										placeholder="请输入保养计划名称"
-										disabled />
+										v-model="form.name"
+										placeholder="请输入巡检单名称" />
 								</el-form-item>
 							</el-col>
 
 							<el-col :span="8">
 								<el-form-item label="部门" prop="departmentId">
-									<!-- :rules="[
-										{ required: true, message: '请选择部门', trigger: 'blur' },
-									]" -->
 									<el-select
 										v-model="form.departmentId"
-										:placeholder="`请选择部门`"
+										filterable
 										clearable
-										disabled
-										filterable>
+										:placeholder="`请选择部门`">
 										<el-option
 											v-for="opt in departmentOptions"
 											:key="opt.value"
@@ -74,18 +53,42 @@
 							</el-col>
 
 							<el-col :span="8">
-								<el-form-item label="产线" prop="lineId">
-									<!-- :rules="[
-										{ required: true, message: '请选择产线', trigger: 'blur' },
-									]" -->
+								<el-form-item label="班次" prop="groupClass">
 									<el-select
-										v-model="form.lineId"
-										:placeholder="`请选择产线`"
-										disabled
+										v-model="form.groupClass"
+										filterable
+										clearable
+										multiple
+										style="width: 100%"
+										placeholder="请选择班次">
+										<el-option
+											v-for="d in groupOptions"
+											:key="d.value"
+											:label="d.label"
+											:value="d.label" />
+									</el-select>
+								</el-form-item>
+							</el-col>
+
+							<el-col :span="8">
+								<el-form-item
+									label="巡检人"
+									prop="checkPerson"
+									:rules="[
+										{
+											required: true,
+											message: '请选择巡检人',
+											trigger: 'blur',
+										},
+									]">
+									<el-select
+										v-model="form.checkPerson"
+										:placeholder="`请选择巡检人`"
+										multiple
 										clearable
 										filterable>
 										<el-option
-											v-for="opt in lineOptions"
+											v-for="opt in inspectorOptions"
 											:key="opt.value"
 											:label="opt.label"
 											:value="opt.value" />
@@ -94,112 +97,25 @@
 							</el-col>
 
 							<el-col :span="8">
-								<el-form-item label="计划保养人员" prop="maintainer">
-									<el-select
-										v-model="form.planMaintainWorker"
-										placeholder="请选择计划保养人员"
-										disabled
-										clearable
-										filterable />
-								</el-form-item>
-							</el-col>
-
-							<el-col :span="8">
-								<el-form-item label="计划开始时间" prop="planStartTime">
+								<el-form-item label="巡检时间" prop="planStartTime">
 									<el-date-picker
 										v-model="form.planStartTime"
 										type="datetime"
-										disabled
 										placeholder="请选择计划开始时间"
 										value-format="timestamp"></el-date-picker>
 								</el-form-item>
 							</el-col>
 
-							<el-col :span="8">
-								<el-form-item label="计划结束时间" prop="planEndTime">
-									<el-date-picker
-										v-model="form.planEndTime"
-										type="datetime"
-										disabled
-										placeholder="请选择计划结束时间"
-										value-format="timestamp"></el-date-picker>
-								</el-form-item>
-							</el-col>
-
-							<el-col :span="8">
-								<el-form-item
-									label="实际开始时间"
-									prop="startTime"
-									:rules="[
-										{
-											required: true,
-											message: '请选择实际开始时间',
-											trigger: 'blur',
-										},
-									]">
-									<el-date-picker
-										v-model="form.startTime"
-										type="datetime"
-										placeholder="请选择实际开始时间"
-										value-format="timestamp"></el-date-picker>
-								</el-form-item>
-							</el-col>
-
-							<el-col :span="8">
-								<el-form-item
-									label="实际结束时间"
-									prop="endTime"
-									:rules="[
-										{
-											required: true,
-											message: '请选择实际结束时间',
-											trigger: 'blur',
-										},
-									]">
-									<el-date-picker
-										v-model="form.endTime"
-										type="datetime"
-										placeholder="请选择实际结束时间"
-										value-format="timestamp"></el-date-picker>
-								</el-form-item>
-							</el-col>
-
-							<el-col :span="8">
-								<el-form-item
-									label="实际保养人员"
-									prop="maintainWorker"
-									:rules="[
-										{
-											required: true,
-											message: '请选择实际保养人员',
-											trigger: 'blur',
-										},
-									]">
-									<el-select
-										v-model="form.maintainWorker"
-										:placeholder="`请选择实际保养人员`"
-										multiple
-										clearable
-										filterable>
-										<el-option
-											v-for="opt in maintainerOptions"
-											:key="opt.value"
-											:label="opt.label"
-											:value="opt.value" />
-									</el-select>
-								</el-form-item>
-							</el-col>
-
-							<el-col :span="24">
+							<!-- <el-col :span="24">
 								<el-form-item label="备注" prop="remark">
 									<el-input v-model="form.remark" :placeholder="`请输入备注`" />
 								</el-form-item>
-							</el-col>
+							</el-col> -->
 						</el-row>
 					</el-form>
 				</div>
 
-				<SmallTitle>保养内容</SmallTitle>
+				<SmallTitle>巡检内容</SmallTitle>
 
 				<div style="margin-top: 12px; position: relative">
 					<SearchBar
@@ -212,7 +128,7 @@
 					<div style="position: absolute; top: -40px; right: 0">
 						<el-button @click="handleAddAttr" type="text">
 							<i class="el-icon-plus"></i>
-							添加属性
+							添加内容
 						</el-button>
 					</div>
 					<base-table
@@ -302,9 +218,8 @@ export default {
 			btnLoading: false,
 			form: {},
 			formLoading: false,
-			lineList: [],
-			maintainerList: [],
 			departmentList: [],
+			inspectorOptions: [],
 			attrTableProps: [
 				{
 					prop: 'equipmentName',
@@ -312,11 +227,11 @@ export default {
 				},
 				{
 					prop: 'program',
-					label: '保养项目',
+					label: '巡检项目',
 				},
 				{
 					prop: 'maintenanceDes',
-					label: '保养描述',
+					label: '巡检结果',
 				},
 			],
 			attrList: [],
@@ -405,6 +320,7 @@ export default {
 				},
 			],
 			row: null,
+			groupOptions: [],
 		};
 	},
 	computed: {
@@ -415,25 +331,11 @@ export default {
 				value: item.id,
 			}));
 		},
-		lineOptions() {
-			return (this.lineList || []).map((item) => ({
-				id: item.id,
-				label: item.name,
-				value: item.id,
-			}));
-		},
-		maintainerOptions() {
-			return (this.maintainerList || []).map((item) => ({
-				id: item.id,
-				label: item.name,
-				value: item.name,
-			}));
-		},
 	},
 	mounted() {
-		this.getList('maintainer');
 		this.getList('department');
-		this.getList('line');
+		this.getList('groupClass');
+		this.getList('inspector');
 	},
 	methods: {
 		handleSearchBarBtnClick(btn) {
@@ -480,10 +382,11 @@ export default {
 		},
 
 		init(row) {
+			console.log('row', row);
 			this.visible = true;
 			this.row = row;
-			this.getInfo(row);
-			this.getAttrList(row);
+			// this.getInfo(row);
+			// this.getAttrList(row);
 		},
 
 		async getInfo(row) {
@@ -521,22 +424,42 @@ export default {
 
 		async getList(source = 'department') {
 			const urls = [
-				'/base/core-production-line/listAll',
 				'/base/core-department/listAll',
-				'/base/core-worker/listAll',
+				'/base/group-classes/listAll',
 			];
 			let res;
 			switch (source) {
 				case 'department':
-					res = await this.$axios(urls[1]);
+					res = await this.$axios(urls[0]);
 					this.departmentList = res.data || [];
 					break;
-				case 'maintainer':
-					res = await this.$axios(urls[2]);
-					this.maintainerList = res.data || [];
+				case 'inspector':
+					let inspectorList = [];
+					const userlist = await this.$axios({
+						url: '/system/user/page',
+						params: { pageNo: 1, pageSize: 100 },
+					});
+					if (userlist.code == 0) {
+						inspectorList = inspectorList.concat(
+							(userlist.data?.list || []).map((item) => ({
+								label: item.username,
+								value: item.id,
+							}))
+						);
+					}
+					const workerlist = await this.$axios('/base/core-worker/listAll');
+					if (workerlist.code == 0) {
+						inspectorList = inspectorList.concat(
+							workerlist.data.map((item) => ({
+								label: item.name,
+								value: item.id,
+							}))
+						);
+					}
+                    this.inspectorOptions = inspectorList;
 					break;
-				case 'line':
-					res = await this.$axios(urls[0]);
+				case 'groupClass':
+					res = await this.$axios(urls[1]);
 					this.lineList = res.data || [];
 					break;
 			}
diff --git a/src/views/specialEquipment/check/Content.vue b/src/views/specialEquipment/check/Content.vue
index dc803ad4..3c8c66fe 100644
--- a/src/views/specialEquipment/check/Content.vue
+++ b/src/views/specialEquipment/check/Content.vue
@@ -57,11 +57,18 @@
 			@confirm="handleSubmit">
 			<add ref="add" @refreshDataList="successSubmit" />
 		</base-dialog>
+
 		<!-- 添加巡检，查看详情 -->
 		<addOrUpdata
 			v-if="addOrUpdateVisible"
 			ref="addOrUpdate"
 			@refreshDataList="getList" />
+
+		<edit
+			ref="content-edit"
+			v-if="editOpen"
+			@refreshDataList="getList"
+			@destroy="editOpen = false" />
 	</div>
 </template>
 
@@ -71,13 +78,15 @@ import addOrUpdata from './add-or-updata.vue';
 import add from './Content-add.vue';
 import { parseTime } from '../../core/mixins/code-filter';
 import CheckOrderListTable from './CheckOrderListTable.vue';
+import edit from './Content-edit.vue';
 
 export default {
 	name: 'SpecialEquipmentCheckConfig',
-	components: { addOrUpdata, add, CheckOrderListTable },
+	components: { addOrUpdata, add, edit, CheckOrderListTable },
 	mixins: [basicPageMixin],
 	data() {
 		return {
+			editOpen: false,
 			addOrUpdateVisible: false,
 			addOrEditTitle: '',
 			searchBarKeys: ['name'],
@@ -307,7 +316,12 @@ export default {
 			});
 		},
 		/** 编辑 */
-		handleEdit(row) {},
+		handleEdit(row) {
+			this.editOpen = true;
+			this.$nextTick(() => {
+				this.$refs['content-edit'].init(row);
+			});
+		},
 		/** 确认巡检单 */
 		handleConfirm(row) {},
 		/** 删除巡检单 */
@@ -376,5 +390,3 @@ export default {
 	},
 };
 </script>
-
- 
\ No newline at end of file

From f72cd9d68e0f02bdb9b567c127a5368595a57eff Mon Sep 17 00:00:00 2001
From: lb <liubin_9396@163.com>
Date: Fri, 23 Feb 2024 15:11:36 +0800
Subject: [PATCH 35/40] =?UTF-8?q?update=20=E5=BE=85=E7=A1=AE=E8=AE=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../check/CheckOrderListTable.vue             |   2 +-
 .../specialEquipment/check/Content-add.vue    |  18 ++-
 .../specialEquipment/check/Content-edit.vue   |  98 ++++++++--------
 src/views/specialEquipment/check/Content.vue  | 106 +++---------------
 src/views/specialEquipment/check/Record.vue   |   7 +-
 5 files changed, 81 insertions(+), 150 deletions(-)

diff --git a/src/views/specialEquipment/check/CheckOrderListTable.vue b/src/views/specialEquipment/check/CheckOrderListTable.vue
index 8d1400e5..042771ef 100644
--- a/src/views/specialEquipment/check/CheckOrderListTable.vue
+++ b/src/views/specialEquipment/check/CheckOrderListTable.vue
@@ -64,7 +64,7 @@
 			label="确认截止时间"
 			prop="confirmDueTime">
 			<template slot-scope="scope">
-				{{ scope.row.confirmDueTime || '---' }}
+				{{ scope.row.confirmDueTime | timeFilter }}
 			</template>
 		</el-table-column>
 		<el-table-column
diff --git a/src/views/specialEquipment/check/Content-add.vue b/src/views/specialEquipment/check/Content-add.vue
index 93eae346..b245bc9d 100644
--- a/src/views/specialEquipment/check/Content-add.vue
+++ b/src/views/specialEquipment/check/Content-add.vue
@@ -142,12 +142,27 @@ export default {
 			}
 		},
 
+		getConfirmed() {
+			return this.$confirm('是否直接确认保养记录', '提示', {
+				confirmButtonText: '确定',
+				cancelButtonText: '取消',
+				type: 'warning',
+			});
+		},
+
 		async dataFormSubmit() {
 			let valid = false;
 			try {
 				valid = await this.$refs.form.validate();
 			} catch (err) {}
 			if (!valid) return;
+
+			let confirmed = false;
+			try {
+				confirmed = await this.getConfirmed();
+			} catch (err) {
+				confirmed = false;
+			}
 			const res = await this.$axios({
 				url:
 					'/base/equipment-check-order' +
@@ -156,8 +171,9 @@ export default {
 				data: {
 					...this.dataForm,
 					special: true,
-					status: 1,
+					status: confirmed ? 2 : 1,
 					groupClass: this.dataForm.groupClass.join(','),
+					checkPerson: this.$store.getters.userId,
 				},
 			});
 			if (res.code == 0) {
diff --git a/src/views/specialEquipment/check/Content-edit.vue b/src/views/specialEquipment/check/Content-edit.vue
index 17a9db2e..010b46b5 100644
--- a/src/views/specialEquipment/check/Content-edit.vue
+++ b/src/views/specialEquipment/check/Content-edit.vue
@@ -71,16 +71,14 @@
 							</el-col>
 
 							<el-col :span="8">
-								<el-form-item
-									label="巡检人"
-									prop="checkPerson"
-									:rules="[
+								<el-form-item label="巡检人" prop="checkPerson">
+									<!-- :rules="[
 										{
 											required: true,
 											message: '请选择巡检人',
 											trigger: 'blur',
 										},
-									]">
+									]" -->
 									<el-select
 										v-model="form.checkPerson"
 										:placeholder="`请选择巡检人`"
@@ -97,9 +95,9 @@
 							</el-col>
 
 							<el-col :span="8">
-								<el-form-item label="巡检时间" prop="planStartTime">
+								<el-form-item label="巡检时间" prop="planCheckTime">
 									<el-date-picker
-										v-model="form.planStartTime"
+										v-model="form.planCheckTime"
 										type="datetime"
 										placeholder="请选择计划开始时间"
 										value-format="timestamp"></el-date-picker>
@@ -157,7 +155,9 @@
 
 			<div class="drawer-body__footer">
 				<el-button style="" @click="handleCancel">取消</el-button>
-				<el-button type="primary" @click="handleConfirm">保存</el-button>
+				<el-button type="primary" :loading="btnLoading" @click="handleConfirm">
+					保存
+				</el-button>
 			</div>
 		</div>
 
@@ -230,7 +230,7 @@ export default {
 					label: '巡检项目',
 				},
 				{
-					prop: 'maintenanceDes',
+					prop: 'checkResult',
 					label: '巡检结果',
 				},
 			],
@@ -239,10 +239,10 @@ export default {
 			attrTitle: '',
 			attrForm: {
 				id: null,
-				logId: null,
+				orderId: null,
 				program: null,
-				maintenanceDes: null,
-				remark: null,
+				checkResult: null,
+				equipmentId: null,
 			},
 			attrFormVisible: false,
 			attrRows: [
@@ -252,12 +252,6 @@ export default {
 						label: '设备名称',
 						prop: 'equipmentId',
 						url: '/base/core-equipment/page?pageNo=1&pageSize=100&special=true',
-						// method: 'post',
-						// queryParams: {
-						// 	pageNo: 1,
-						// 	pageSize: 100,
-						// 	special: true,
-						// },
 						rules: [
 							{ required: true, message: '设备不能为空', trigger: 'blur' },
 						],
@@ -266,22 +260,21 @@ export default {
 				[
 					{
 						input: true,
-						label: '保养项目',
+						label: '巡检项目',
 						prop: 'program',
+						rules: [
+							{ required: true, message: '巡检项目不能为空', trigger: 'blur' },
+						],
 					},
 				],
 				[
 					{
 						input: true,
-						label: '保养描述',
-						prop: 'maintenanceDes',
-					},
-				],
-				[
-					{
-						input: true,
-						label: '备注',
-						prop: 'remark',
+						label: '巡检结果',
+						prop: 'checkResult',
+						rules: [
+							{ required: true, message: '巡检结果不能为空', trigger: 'blur' },
+						],
 					},
 				],
 			],
@@ -333,6 +326,7 @@ export default {
 		},
 	},
 	mounted() {
+		this.formLoading = true;
 		this.getList('department');
 		this.getList('groupClass');
 		this.getList('inspector');
@@ -360,12 +354,12 @@ export default {
 			this.btnLoading = true;
 			this.$nextTick(async () => {
 				const { code, data } = await this.$axios({
-					url: '/base/equipment-maintain-log/update',
+					url: '/base/equipment-check-order/update',
 					method: 'put',
 					data: {
 						...this.form,
-						maintainWorker: this.form.maintainWorker.join(','),
-						planMaintainWorker: this.form.planMaintainWorker?.join(','),
+						groupClass: this.form.groupClass.join(','),
+						checkPerson: this.form.checkPerson.join(','),
 					},
 				});
 				if (code == 0) {
@@ -385,19 +379,18 @@ export default {
 			console.log('row', row);
 			this.visible = true;
 			this.row = row;
-			// this.getInfo(row);
-			// this.getAttrList(row);
+			this.getInfo(row);
+			this.getAttrList(row);
 		},
 
 		async getInfo(row) {
-			this.formLoading = true;
 			const res = await this.$axios(
-				'/base/equipment-maintain-log/get?id=' + row.id
+				'/base/equipment-check-order/get?id=' + row.id
 			);
 			if (res.code == 0) {
 				this.form = res.data;
-				this.form.maintainWorker = res.data.maintainWorker.split(',');
-				this.form.planMaintainWorker = res.data.planMaintainWorker?.split(',');
+				this.form.groupClass = res.data.groupClass.split(',');
+				this.form.checkPerson = res.data.checkPerson.split(',');
 				this.formLoading = false;
 			}
 			this.formLoading = false;
@@ -407,11 +400,11 @@ export default {
 			if (!row) row = this.row;
 			this.attrListLoading = true;
 			const res = await this.$axios({
-				url: '/base/equipment-maintain-log-det/page',
+				url: '/base/equipment-check-order-det/page',
 				method: 'get',
 				params: {
 					...this.attrQuery.params,
-					logId: row.id,
+					orderId: row.id,
 					...condition,
 				},
 			});
@@ -456,11 +449,14 @@ export default {
 							}))
 						);
 					}
-                    this.inspectorOptions = inspectorList;
+					this.inspectorOptions = inspectorList;
 					break;
 				case 'groupClass':
 					res = await this.$axios(urls[1]);
-					this.lineList = res.data || [];
+					this.groupOptions = (res.data || []).map((item) => ({
+						label: item.name,
+						value: item.id,
+					}));
 					break;
 			}
 			this.formLoading = false;
@@ -489,10 +485,10 @@ export default {
 		resetAttrform() {
 			this.attrForm = {
 				id: null,
-				logId: this.row.id,
-				maintenanceDes: '',
+				orderId: null,
+				equipmentId: null,
 				program: null,
-				remark: null,
+				checkResult: null,
 			};
 		},
 
@@ -507,27 +503,27 @@ export default {
 		// 编辑属性
 		async handleEditAttr(attrId) {
 			const res = await this.$axios({
-				url: '/base/equipment-maintain-log-det/get',
+				url: '/base/equipment-check-order-det/get',
 				method: 'get',
 				params: { id: attrId },
 			});
 			if (res.code == 0) {
 				this.attrForm = res.data;
-				this.attrTitle = '编辑设备属性';
+				this.attrTitle = '编辑巡检单详情';
 				this.attrFormVisible = true;
 			}
 		},
 
 		// 删除属性
 		handleDeleteAttr(attrId) {
-			this.$confirm('确定删除该保养内容?', '提示', {
+			this.$confirm('确定删除该巡检内容?', '提示', {
 				confirmButtonText: '确定',
 				cancelButtonText: '取消',
 				type: 'warning',
 			})
 				.then(async () => {
 					const res = await this.$axios({
-						url: '/base/equipment-maintain-log-det/delete?id=' + attrId,
+						url: '/base/equipment-check-order-det/delete?id=' + attrId,
 						method: 'delete',
 					});
 					if (res.code == 0) {
@@ -556,10 +552,10 @@ export default {
 					this.attrFormSubmitting = true;
 					const res = await this.$axios({
 						url: isEdit
-							? '/base/equipment-maintain-log-det/update'
-							: '/base/equipment-maintain-log-det/create',
+							? '/base/equipment-check-order-det/update'
+							: '/base/equipment-check-order-det/create',
 						method: isEdit ? 'put' : 'post',
-						data: this.attrForm,
+						data: { ...this.attrForm, orderId: this.row.id },
 					});
 
 					if (res.code == 0) {
diff --git a/src/views/specialEquipment/check/Content.vue b/src/views/specialEquipment/check/Content.vue
index 3c8c66fe..43debe1f 100644
--- a/src/views/specialEquipment/check/Content.vue
+++ b/src/views/specialEquipment/check/Content.vue
@@ -11,25 +11,8 @@
 		<SearchBar
 			:formConfigs="searchBarFormConfig"
 			ref="search-bar"
-			@select-changed="handleSearchBarChange"
 			@headBtnClick="handleSearchBarBtnClick" />
 
-		<!-- 列表 -->
-		<!-- <base-table
-			:table-props="tableProps"
-			:page="queryParams.pageNo"
-			:limit="queryParams.pageSize"
-			:table-data="list"
-			@emitFun="handleEmitFun">
-			<method-btn
-				v-if="tableBtn.length"
-				slot="handleBtn"
-				label="操作"
-				:width="180"
-				:method-list="tableBtn"
-				@clickBtn="handleTableBtnClick" />
-		</base-table> -->
-
 		<CheckOrderListTable
 			ref="check-order-list-table"
 			:table-data="list"
@@ -136,6 +119,7 @@ export default {
 					prop: 'confirmDueTime',
 					label: '确认截止时间',
 					showOverflowtooltip: true,
+					filter: parseTime,
 					// filter: (val) =>
 					// 	val != null && val > 24
 					// 		? `${(val - (val % 24)) / 24}天${val % 24}小时`
@@ -207,28 +191,19 @@ export default {
 		handleSubmit() {
 			this.$refs.add.dataFormSubmit();
 		},
+
 		successSubmit() {
 			this.cancel();
 			this.getList();
 		},
+
 		initSearchBar() {
 			this.http('/base/core-equipment/listAll', 'get').then(({ data }) => {
 				this.allSpecialEquipments = data.filter((item) => item.special);
 				this.setSearchBarEquipmentList(data.filter((item) => item.special));
 			});
 		},
-		// 设备大类改变
-		handleSearchBarChange({ param, value }) {
-			if ('specialType' === param) {
-				if (!value) {
-					this.setSearchBarEquipmentList(this.allSpecialEquipments);
-					return;
-				}
-				this.setSearchBarEquipmentList(
-					this.allSpecialEquipments.filter((item) => item.specialType == value)
-				);
-			}
-		},
+
 		setSearchBarEquipmentList(eqList) {
 			this.$set(
 				this.searchBarFormConfig[2],
@@ -239,6 +214,7 @@ export default {
 				}))
 			);
 		},
+
 		/** 查询列表 */
 		getList() {
 			this.loading = true;
@@ -249,33 +225,20 @@ export default {
 				this.loading = false;
 			});
 		},
+
 		/** 取消按钮 */
 		cancel() {
 			this.$refs.add.reset();
 			this.open = false;
 			this.title = '';
 		},
-		/** 表单重置 */
-		reset() {
-			this.form = {
-				id: null,
-				name: null,
-				content: null,
-				program: null,
-				remark: null,
-			};
-			this.resetForm('form');
-		},
+
 		/** 搜索按钮操作 */
 		handleQuery() {
 			this.queryParams.pageNo = 1;
 			this.getList();
 		},
-		/** 重置按钮操作 */
-		resetQuery() {
-			this.resetForm('queryForm');
-			this.handleQuery();
-		},
+
 		/** 新增按钮操作 */
 		handleAdd() {
 			this.open = true;
@@ -284,6 +247,7 @@ export default {
 				this.$refs.add.init();
 			});
 		},
+
 		/** 修改按钮操作 */
 		handleUpdate(row) {
 			this.open = true;
@@ -292,29 +256,7 @@ export default {
 				this.$refs.add.init(row);
 			});
 		},
-		/** 提交按钮 */
-		submitForm() {
-			this.$refs['form'].validate((valid) => {
-				if (!valid) {
-					return;
-				}
-				// 修改的提交
-				if (this.form.id != null) {
-					this.put(this.form).then((response) => {
-						this.$modal.msgSuccess('修改成功');
-						this.open = false;
-						this.getList();
-					});
-					return;
-				}
-				// 添加的提交
-				this.post(this.form).then((response) => {
-					this.$modal.msgSuccess('新增成功');
-					this.open = false;
-					this.getList();
-				});
-			});
-		},
+
 		/** 编辑 */
 		handleEdit(row) {
 			this.editOpen = true;
@@ -322,8 +264,10 @@ export default {
 				this.$refs['content-edit'].init(row);
 			});
 		},
+
 		/** 确认巡检单 */
 		handleConfirm(row) {},
+
 		/** 删除巡检单 */
 		handleDelete(row) {
 			const id = row.id;
@@ -338,23 +282,7 @@ export default {
 				})
 				.catch(() => {});
 		},
-		// 处理表格按钮
-		handleTableBtnClick({ data, type }) {
-			switch (type) {
-				case 'edit':
-					this.handleUpdate(data);
-					break;
-				case 'delete':
-					this.handleDelete(data);
-					break;
-				case 'detail':
-					this.handleDetail(data);
-					break;
-				case 'add':
-					this.handleAddDetail(data);
-					break;
-			}
-		},
+
 		handleDetail(row) {
 			this.addOrUpdateVisible = true;
 			this.addOrEditTitle = '详情';
@@ -362,13 +290,7 @@ export default {
 				this.$refs.addOrUpdate.init(row?.id, true);
 			});
 		},
-		handleAddDetail(row) {
-			this.addOrUpdateVisible = true;
-			this.addOrEditTitle = '添加内容';
-			this.$nextTick(() => {
-				this.$refs.addOrUpdate.init(row);
-			});
-		},
+
 		/** 导出按钮操作 */
 		handleExport() {
 			// 处理查询参数
diff --git a/src/views/specialEquipment/check/Record.vue b/src/views/specialEquipment/check/Record.vue
index 59de97e6..f76dbbe2 100644
--- a/src/views/specialEquipment/check/Record.vue
+++ b/src/views/specialEquipment/check/Record.vue
@@ -278,10 +278,8 @@ export default {
 			queryParams: {
 				pageNo: 1,
 				pageSize: 10,
-				actualTime: null,
-				configId: null,
 				special: true,
-				specialType: null,
+				status: 2,
 			},
 			// 表单参数
 			form: {},
@@ -328,8 +326,7 @@ export default {
 			this.loading = true;
 			// 执行查询
 			this.recv(this.queryParams).then((response) => {
-				// this.list = response.data.list;
-				this.list = [{}];
+				this.list = response.data.list;
 				this.total = response.data.total;
 				this.loading = false;
 			});

From 05b513a86202bd999e3c682620a686a3ce0679fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=98937886381=E2=80=99?= <‘937886381@qq.com’>
Date: Fri, 23 Feb 2024 16:02:55 +0800
Subject: [PATCH 36/40] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.dev                                      |  8 ++---
 .../components/baseContainer/index.vue        | 35 +++++++++++++++----
 .../BomSelector.vue                           | 16 +++++----
 .../qualityInspectionBoxPermissions/index.vue |  2 +-
 .../monitoring/originalGlassRetrace/index.vue | 21 ++++++-----
 5 files changed, 56 insertions(+), 26 deletions(-)

diff --git a/.env.dev b/.env.dev
index 5d443fe7..27afe917 100644
--- a/.env.dev
+++ b/.env.dev
@@ -1,7 +1,7 @@
 ###
  # @Author: Do not edit
  # @Date: 2023-08-29 09:40:39
- # @LastEditTime: 2024-02-21 15:27:58
+ # @LastEditTime: 2024-02-22 09:06:57
  # @LastEditors: zhp
  # @Description:
 ###
@@ -13,8 +13,8 @@ VUE_APP_TITLE = MES系统
 
 # 芋道管理系统/开发环境
 # VUE_APP_BASE_API = 'http://100.64.0.26:48082'
-VUE_APP_BASE_API = 'http://10.70.2.2:8080'
-# VUE_APP_BASE_API = 'http://192.168.0.33:48082'
+# VUE_APP_BASE_API = 'http://10.70.2.2:8080'
+VUE_APP_BASE_API = 'http://192.168.0.33:48082'
 # VUE_APP_BASE_API = 'http://192.168.4.173:48080'
 # VUE_APP_BASE_API = 'http://192.168.2.173:48080'
 # VUE_APP_BASE_API = 'http://192.168.1.49:48082'
@@ -29,7 +29,7 @@ VUE_APP_BASE_API = 'http://10.70.2.2:8080'
 
 # VUE_APP_BASE_API = 'http://192.168.1.78:48082'
 # socket地址
-VUE_APP_Socket_API = 'ws://10.70.2.2:8080'
+VUE_APP_Socket_API = 'ws://192.168.0.30:8888'
 VUE_APP_Socket_Dcs_API = 'ws://10.70.180.10:8081'
 
 # 积木报表指向地址
diff --git a/src/views/OperationalOverview/components/baseContainer/index.vue b/src/views/OperationalOverview/components/baseContainer/index.vue
index 3902a089..5f3faa70 100644
--- a/src/views/OperationalOverview/components/baseContainer/index.vue
+++ b/src/views/OperationalOverview/components/baseContainer/index.vue
@@ -2,7 +2,7 @@
  * @Author: gtz
  * @Date: 2022-01-19 15:58:17
  * @LastEditors: zhp
- * @LastEditTime: 2024-02-20 15:25:02
+ * @LastEditTime: 2024-02-22 10:26:59
  * @Description: file content
  * @FilePath: \mt-bus-fe\src\views\OperationalOverview\components\baseContainer\index.vue
 -->
@@ -157,12 +157,12 @@ export default {
 
 <style lang="scss" scoped>
 
+
 .base-container {
   color: #fff;
   width: 100%;
   // background-color: rgba($color: #061027, $alpha: 0.15);
   position: relative;
-  // filter: blur(.5px);
   opacity: calc(.8);
   // border: 2px solid;
     // background: url('../../../../assets/img/energy.png') no-repeat;
@@ -170,24 +170,45 @@ export default {
       &__small {
           background: url(../../../../assets/img/short.png) no-repeat;
           background-size: 100% 100%;
-          // background-position: 0 0;
+          backdrop-filter: blur(5px);
         }
-
+      // &__small::after {
+      //       content: "";
+      //       position: absolute;
+      //       top: 0;
+      //       left: 0;
+      //       filter: blur(20px);
+      //       z-index: -1;
+      //   }
         &__middle {
           background: url(../../../../assets/img/middle.png) no-repeat;
           background-size: 100% 100%;
-          // background-position: 0 0;
+          backdrop-filter: blur(5px);
         }
 
         &__large {
           background: url(../../../../assets/img/high.png) no-repeat;
           background-size: 100% 100%;
-          // background-position: 0 0;
+          backdrop-filter: blur(5px);
         }
         &__eqStatus {
-          background: url(../../../../assets/img/short.png) no-repeat;
+          background: url(../../../../assets/img/high.png) no-repeat;
           background-size: 100% 100%;
+          backdrop-filter: blur(5px);
         }
+                  	// &::after {
+                  	//   content: " ";
+                  	//   // display: block;
+                  	//   position: absolute;
+                  	//   left: 0;
+                  	//   top: 0;
+                  	//   right: 0;
+                  	//   bottom: 0;
+                  	//   // background: inherit;
+                  	//   /* 设置模糊，不用 filter */
+                  	//   backdrop-filter: blur(5px);
+                  	//   z-index: -1;
+                  	// }
   //   border-radius: 40px 0px 40px 0px;
   // border-image: linear-gradient(360deg, rgba(157, 246, 254, 0.05), rgba(100, 233, 252, 0.9)) 2 2;
   // .line {
diff --git a/src/views/quality/base/basicData/qualityInspectionBoxPermissions/BomSelector.vue b/src/views/quality/base/basicData/qualityInspectionBoxPermissions/BomSelector.vue
index b3327c53..e3ff7445 100644
--- a/src/views/quality/base/basicData/qualityInspectionBoxPermissions/BomSelector.vue
+++ b/src/views/quality/base/basicData/qualityInspectionBoxPermissions/BomSelector.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-01-30 10:53:32
- * @LastEditTime: 2024-02-01 14:47:03
+ * @LastEditTime: 2024-02-23 15:16:35
  * @LastEditors: zhp
  * @Description:
 -->
@@ -203,8 +203,11 @@ export default {
 				// 如果没找到这个
         this.selectedEquipments.push(equipmentId);
         console.log(this.selected.indexOf(equipmentId))
-        this.selected.forEach((ele,index) => {
-          if (ele.equipmentId === equipmentId ) {
+        console.log(equipmentId);
+        this.selected.forEach((ele, index) => {
+          console.log(ele);
+          if (ele.equipmentId === equipmentId) {
+            console.log(22222);
             this.selected[index].children.push({ id: bomId })
           }
         })
@@ -214,11 +217,12 @@ export default {
 				// 	equMaterialBomId: bomId,
 				// });
 				// 强制更新'设备'一栏
-				this.refreshKey = Math.random();
+        this.refreshKey = Math.random();
+        console.log(this.selected)
 				// this.$emit('update', this.selected);
 				return;
       } else {
-        console.log(selected);
+        console.log(selected)
         this.selected.forEach((ele, index) => {
           ele.children.forEach((e, i) => {
             console.log(e)
@@ -228,10 +232,10 @@ export default {
           })
         })
       }
+      console.log(this.selected)
       // this.$emit('getData', this.dataForm)
 			// selectedItem && (selectedItem.equMaterialBomId = selected ? bomId : null);
       // this.currentSelectedMaterialBomId = selected ? bomId : null;
-      console.log(this.selected)
 		},
 
 		// handleValueBomChange(equipmentId, bomId, selected) {
diff --git a/src/views/quality/base/basicData/qualityInspectionBoxPermissions/index.vue b/src/views/quality/base/basicData/qualityInspectionBoxPermissions/index.vue
index 0ab9a741..b553af67 100644
--- a/src/views/quality/base/basicData/qualityInspectionBoxPermissions/index.vue
+++ b/src/views/quality/base/basicData/qualityInspectionBoxPermissions/index.vue
@@ -154,7 +154,7 @@ export default {
       this.urlOptions.getDataListURL(this.listQuery).then(res => {
         this.tableData = res.data.list.map((item) => {
           return {
-            datas: item.strList.toString(),
+            datas: item.strList ? item.strList.toString() : null,
             nickName: item.nickName,
             userName: item.userName,
             userId: item.userId
diff --git a/src/views/quality/monitoring/originalGlassRetrace/index.vue b/src/views/quality/monitoring/originalGlassRetrace/index.vue
index 4f76c8ca..71231acf 100644
--- a/src/views/quality/monitoring/originalGlassRetrace/index.vue
+++ b/src/views/quality/monitoring/originalGlassRetrace/index.vue
@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2023-08-01 14:55:51
  * @LastEditors: zhp
- * @LastEditTime: 2024-02-20 08:46:05
+ * @LastEditTime: 2024-02-23 09:16:24
  * @Description:
 -->
 <template>
@@ -31,6 +31,11 @@ import {
 } from '@/api/quality/rawMaterialTraceability';
 
 const tableProps = [
+
+  {
+    prop: 'orderName',
+    label: '订单名称',
+  },
   {
     prop: 'workOrderName',
     label: '工单名称',
@@ -48,7 +53,7 @@ const tableProps = [
     label: '包装条码',
   },
   {
-    prop: '',
+    prop: 'originalGlassLineName',
     label: '原片产线',
   },
   {
@@ -57,7 +62,7 @@ const tableProps = [
     filter: parseTime
   },
   {
-    prop: 'batch',
+    prop: 'deepProcessingLineName',
     label: '深加工产线',
   },
   {
@@ -70,11 +75,11 @@ const tableProps = [
     label: '深加工下片时间',
     filter: parseTime
   },
-  {
-    prop: 'scrapDetail',
-    label: '详情',
-    filter: parseTime
-  }
+  // {
+  //   prop: 'scrapDetail',
+  //   label: '详情',
+  //   filter: parseTime
+  // }
 ];
 
 export default {

From 81c1f2c5719ef624ae5882db51dbfe07a83817ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=98937886381=E2=80=99?= <‘937886381@qq.com’>
Date: Fri, 23 Feb 2024 16:12:43 +0800
Subject: [PATCH 37/40] xiugaibug

---
 src/views/OperationalOverview/AGVBoard.vue        | 12 ++++++------
 src/views/OperationalOverview/coldBoard.vue       | 12 ++++++------
 src/views/OperationalOverview/processingBoard.vue | 12 ++++++------
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/views/OperationalOverview/AGVBoard.vue b/src/views/OperationalOverview/AGVBoard.vue
index 8657ce89..4ba4aed8 100644
--- a/src/views/OperationalOverview/AGVBoard.vue
+++ b/src/views/OperationalOverview/AGVBoard.vue
@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-07-19 15:18:30
  * @LastEditors: zhp
- * @LastEditTime: 2024-02-18 08:54:06
+ * @LastEditTime: 2024-02-23 16:11:33
  * @Description:
 -->
 <template>
@@ -992,11 +992,11 @@ export default {
       min-height: 10px;
     }
 
-    .el-input__inner {
-      background-color: rgba($color: #31878c, $alpha: 0.29);
-      border: rgba($color: #31878c, $alpha: 0.29);
-      color: aliceblue;
-    }
+    // .el-input__inner {
+    //   background-color: rgba($color: #31878c, $alpha: 0.29);
+    //   border: rgba($color: #31878c, $alpha: 0.29);
+    //   color: aliceblue;
+    // }
 
     .el-divider--vertical {
       height: 174px;
diff --git a/src/views/OperationalOverview/coldBoard.vue b/src/views/OperationalOverview/coldBoard.vue
index 010b9e5a..3d07693d 100644
--- a/src/views/OperationalOverview/coldBoard.vue
+++ b/src/views/OperationalOverview/coldBoard.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-01-29 16:50:26
- * @LastEditTime: 2024-02-20 15:05:31
+ * @LastEditTime: 2024-02-23 16:11:40
  * @LastEditors: zhp
  * @Description:
 -->
@@ -1036,11 +1036,11 @@ background: linear-gradient(to bottom,rgba(60,
     min-height: 10px;
   }
 
-  .el-input__inner {
-    background-color: rgba($color: #31878c, $alpha: 0.29);
-    border: rgba($color: #31878c, $alpha: 0.29);
-    color: aliceblue;
-  }
+  // .el-input__inner {
+  //   background-color: rgba($color: #31878c, $alpha: 0.29);
+  //   border: rgba($color: #31878c, $alpha: 0.29);
+  //   color: aliceblue;
+  // }
 
   .el-divider--vertical {
     height: 174px;
diff --git a/src/views/OperationalOverview/processingBoard.vue b/src/views/OperationalOverview/processingBoard.vue
index 2f4d997a..02d0c829 100644
--- a/src/views/OperationalOverview/processingBoard.vue
+++ b/src/views/OperationalOverview/processingBoard.vue
@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-07-19 15:18:30
  * @LastEditors: zhp
- * @LastEditTime: 2024-02-01 15:35:29
+ * @LastEditTime: 2024-02-23 16:11:48
  * @Description:
 -->
 <template>
@@ -1105,11 +1105,11 @@ export default {
       min-height: 10px;
     }
 
-    .el-input__inner {
-      background-color: rgba($color: #31878c, $alpha: 0.29);
-      border: rgba($color: #31878c, $alpha: 0.29);
-      color: aliceblue;
-    }
+    // .el-input__inner {
+    //   background-color: rgba($color: #31878c, $alpha: 0.29);
+    //   border: rgba($color: #31878c, $alpha: 0.29);
+    //   color: aliceblue;
+    // }
 
     .el-divider--vertical {
       height: 174px;

From 15738642b0c81e56735933d002225cbb2cd274e8 Mon Sep 17 00:00:00 2001
From: lb <liubin_9396@163.com>
Date: Fri, 23 Feb 2024 16:32:01 +0800
Subject: [PATCH 38/40] update

---
 src/views/specialEquipment/check/Config.vue   |  15 +-
 .../specialEquipment/check/Content-edit.vue   |  27 +-
 src/views/specialEquipment/check/Content.vue  |  74 +++-
 src/views/specialEquipment/check/Record.vue   | 344 ++++--------------
 4 files changed, 157 insertions(+), 303 deletions(-)

diff --git a/src/views/specialEquipment/check/Config.vue b/src/views/specialEquipment/check/Config.vue
index 1ec798e2..aef4b49b 100644
--- a/src/views/specialEquipment/check/Config.vue
+++ b/src/views/specialEquipment/check/Config.vue
@@ -354,18 +354,21 @@ export default {
 		},
 		/** 导出按钮操作 */
 		handleExport() {
-			// 处理查询参数
-			let params = { ...this.queryParams };
-			params.pageNo = undefined;
-			params.pageSize = undefined;
 			this.$modal
 				.confirm('是否确认导出所有巡检设置?')
 				.then(() => {
 					this.exportLoading = true;
-					return exportEquipmentTypeExcel(params);
+					return this.$axios({
+						url: '/base/equipment-check-order/export-excel',
+						params: {
+							name: this.queryParams.name,
+							status: 0,
+							special: true,
+						},
+					});
 				})
 				.then((response) => {
-					this.$download.excel(response, '巡检设置.xls');
+					this.$download.excel(response, '巡检单设置.xls');
 					this.exportLoading = false;
 				})
 				.catch(() => {});
diff --git a/src/views/specialEquipment/check/Content-edit.vue b/src/views/specialEquipment/check/Content-edit.vue
index 010b46b5..95082642 100644
--- a/src/views/specialEquipment/check/Content-edit.vue
+++ b/src/views/specialEquipment/check/Content-edit.vue
@@ -32,6 +32,7 @@
 								<el-form-item label="巡检单名称" prop="name">
 									<el-input
 										v-model="form.name"
+										:disabled="disableEdit"
 										placeholder="请输入巡检单名称" />
 								</el-form-item>
 							</el-col>
@@ -42,6 +43,7 @@
 										v-model="form.departmentId"
 										filterable
 										clearable
+										:disabled="disableEdit"
 										:placeholder="`请选择部门`">
 										<el-option
 											v-for="opt in departmentOptions"
@@ -59,6 +61,7 @@
 										filterable
 										clearable
 										multiple
+										:disabled="disableEdit"
 										style="width: 100%"
 										placeholder="请选择班次">
 										<el-option
@@ -84,6 +87,7 @@
 										:placeholder="`请选择巡检人`"
 										multiple
 										clearable
+										:disabled="disableEdit"
 										filterable>
 										<el-option
 											v-for="opt in inspectorOptions"
@@ -99,6 +103,7 @@
 									<el-date-picker
 										v-model="form.planCheckTime"
 										type="datetime"
+										:disabled="disableEdit"
 										placeholder="请选择计划开始时间"
 										value-format="timestamp"></el-date-picker>
 								</el-form-item>
@@ -123,7 +128,9 @@
 				</div>
 
 				<div style="margin-top: 12px; position: relative">
-					<div style="position: absolute; top: -40px; right: 0">
+					<div
+						v-if="!disableEdit"
+						style="position: absolute; top: -40px; right: 0">
 						<el-button @click="handleAddAttr" type="text">
 							<i class="el-icon-plus"></i>
 							添加内容
@@ -139,6 +146,7 @@
 						<method-btn
 							slot="handleBtn"
 							label="操作"
+							v-if="!disableEdit"
 							:method-list="tableBtn"
 							@clickBtn="handleTableBtnClick" />
 					</base-table>
@@ -154,8 +162,14 @@
 			</div>
 
 			<div class="drawer-body__footer">
-				<el-button style="" @click="handleCancel">取消</el-button>
-				<el-button type="primary" :loading="btnLoading" @click="handleConfirm">
+				<el-button style="" @click="handleCancel">
+					{{ disableEdit ? '返回' : '取消' }}
+				</el-button>
+				<el-button
+					v-if="!disableEdit"
+					type="primary"
+					:loading="btnLoading"
+					@click="handleConfirm">
 					保存
 				</el-button>
 			</div>
@@ -314,6 +328,7 @@ export default {
 			],
 			row: null,
 			groupOptions: [],
+			disableEdit: false,
 		};
 	},
 	computed: {
@@ -375,8 +390,8 @@ export default {
 			console.log('handleEmitFun', val);
 		},
 
-		init(row) {
-			console.log('row', row);
+		init(row, detail) {
+			if (detail) this.disableEdit = true;
 			this.visible = true;
 			this.row = row;
 			this.getInfo(row);
@@ -390,7 +405,7 @@ export default {
 			if (res.code == 0) {
 				this.form = res.data;
 				this.form.groupClass = res.data.groupClass.split(',');
-				this.form.checkPerson = res.data.checkPerson.split(',');
+				this.form.checkPerson = res.data.checkPerson?.split(',');
 				this.formLoading = false;
 			}
 			this.formLoading = false;
diff --git a/src/views/specialEquipment/check/Content.vue b/src/views/specialEquipment/check/Content.vue
index 43debe1f..7044619a 100644
--- a/src/views/specialEquipment/check/Content.vue
+++ b/src/views/specialEquipment/check/Content.vue
@@ -233,6 +233,32 @@ export default {
 			this.title = '';
 		},
 
+		/** search bar click */
+		async searchBarClicked(btn) {
+			switch (btn.btnName) {
+				/** 批量确认 */
+				case 'batch-confirm':
+					if (this.$refs['check-order-list-table'].selectedOrder.length == 0) {
+						this.$message.warning('请选择待确认的巡检单');
+						return;
+					}
+					const res = await this.$axios({
+						url:
+							'/base/equipment-check-order/confirm?confirmPerson=' +
+							this.$store.getters.userId,
+						method: 'put',
+						data: this.$refs['check-order-list-table'].selectedOrder.map(
+							(item) => item.id
+						),
+					});
+					if (res.code == 0) {
+						this.$message.success('确认成功');
+						this.getList();
+					}
+					break;
+			}
+		},
+
 		/** 搜索按钮操作 */
 		handleQuery() {
 			this.queryParams.pageNo = 1;
@@ -258,15 +284,35 @@ export default {
 		},
 
 		/** 编辑 */
-		handleEdit(row) {
+		handleEdit(row, detail) {
 			this.editOpen = true;
 			this.$nextTick(() => {
-				this.$refs['content-edit'].init(row);
+				this.$refs['content-edit'].init(row, detail ?? false);
 			});
 		},
 
 		/** 确认巡检单 */
-		handleConfirm(row) {},
+		handleConfirm(row) {
+			const id = row.id;
+			this.$modal
+				.confirm('是否确认巡检单"' + row.name + '"?')
+				.then(() => {
+					return this.$axios({
+						url:
+							'/base/equipment-check-order/confirm?confirmPerson=' +
+							this.$store.getters.userId,
+						// '/base/equipment-check-order/confirm?ids=' + JSON.stringify([id]).replaceAll("\"", ''),
+						method: 'put',
+						data: [id],
+					});
+				})
+				.then((res) => {
+					this.getList();
+					res.code == 0 && this.$modal.msgSuccess('确认成功');
+					res.code != 0 && this.$modal.msgError('确认失败');
+				})
+				.catch(() => {});
+		},
 
 		/** 删除巡检单 */
 		handleDelete(row) {
@@ -284,27 +330,27 @@ export default {
 		},
 
 		handleDetail(row) {
-			this.addOrUpdateVisible = true;
-			this.addOrEditTitle = '详情';
-			this.$nextTick(() => {
-				this.$refs.addOrUpdate.init(row?.id, true);
-			});
+			this.handleEdit(row, true);
 		},
 
 		/** 导出按钮操作 */
 		handleExport() {
-			// 处理查询参数
-			let params = { ...this.queryParams };
-			params.pageNo = undefined;
-			params.pageSize = undefined;
 			this.$modal
 				.confirm('是否确认导出所有巡检设置?')
 				.then(() => {
 					this.exportLoading = true;
-					return exportEquipmentTypeExcel(params);
+					return this.$axios({
+						url: '/base/equipment-check-order/export-excel',
+						// params: {
+						// 	name: this.queryParams.name,
+						// 	status: 1,
+						// 	special: true,
+						// },
+						responseType: 'blob',
+					});
 				})
 				.then((response) => {
-					this.$download.excel(response, '巡检设置.xls');
+					this.$download.excel(response, '巡检单待确认.xls');
 					this.exportLoading = false;
 				})
 				.catch(() => {});
diff --git a/src/views/specialEquipment/check/Record.vue b/src/views/specialEquipment/check/Record.vue
index f76dbbe2..54ed0c51 100644
--- a/src/views/specialEquipment/check/Record.vue
+++ b/src/views/specialEquipment/check/Record.vue
@@ -11,7 +11,6 @@
 		<SearchBar
 			:formConfigs="searchBarFormConfig"
 			ref="search-bar"
-			@select-changed="handleSearchBarChange"
 			@headBtnClick="handleSearchBarBtnClick" />
 
 		<!-- 列表 -->
@@ -25,7 +24,7 @@
 				v-if="tableBtn.length"
 				slot="handleBtn"
 				label="操作"
-				:width="120"
+				:width="70"
 				:method-list="tableBtn"
 				@clickBtn="handleTableBtnClick" />
 		</base-table>
@@ -37,45 +36,16 @@
 			:page.sync="queryParams.pageNo"
 			:limit.sync="queryParams.pageSize"
 			@pagination="getList" />
-
-		<!-- 对话框(添加 / 修改) -->
-		<base-dialog
-			:dialogTitle="title"
-			:dialogVisible="open"
-			@close="cancel"
-			@cancel="cancel"
-			@confirm="submitForm">
-			<DialogForm
-				v-if="open"
-				ref="form"
-				v-model="form"
-				:disabled="mode == 'detail'"
-				:has-files="true"
-				:rows="rows" />
-		</base-dialog>
-
-		<addRecord
-			v-if="addOrUpdateVisible"
-			ref="addOrUpdate"
-			@refreshDataList="getList"
-			@destroy="addOrUpdateVisible = false" />
 	</div>
 </template>
 
 <script>
-import moment from 'moment';
 import basicPageMixin from '@/mixins/lb/basicPageMixin';
-import addRecord from './Record-add.vue';
-import {
-	exportCheckLogExcel,
-	deleteEqCheckLog,
-} from '@/api/equipment/base/inspection/record';
 import { parseTime } from '../../core/mixins/code-filter';
 
-const timeFilter = (val) => moment(val).format('yyyy-MM-DD HH:mm:ss');
 export default {
 	name: 'SpecialEquipmentCheckRecord',
-	components: { addRecord },
+	components: {},
 	mixins: [basicPageMixin],
 	data() {
 		return {
@@ -88,50 +58,50 @@ export default {
 							btnName: '详情',
 					  }
 					: undefined,
-				this.$auth.hasPermi('equipment:check-record:update')
-					? {
-							type: 'edit',
-							btnName: '修改',
-					  }
-					: undefined,
-				this.$auth.hasPermi('equipment:check-record:delete')
-					? {
-							type: 'delete',
-							btnName: '删除',
-					  }
-					: undefined,
+				// this.$auth.hasPermi('equipment:check-record:update')
+				// 	? {
+				// 			type: 'edit',
+				// 			btnName: '修改',
+				// 	  }
+				// 	: undefined,
+				// this.$auth.hasPermi('equipment:check-record:delete')
+				// 	? {
+				// 			type: 'delete',
+				// 			btnName: '删除',
+				// 	  }
+				// 	: undefined,
 			].filter((v) => v),
 			tableProps: [
 				{ prop: 'name', label: '巡检单名称' },
 				{ prop: 'department', label: '部门' },
 				{ prop: 'actualCheckTime', label: '巡检时间', filter: parseTime },
 				{ prop: 'groupClass', label: '班次' },
-				{
-					prop: '_detail',
-					label: '巡检内容',
-					subcomponent: {
-						name: 'ViewDetail',
-						props: ['injectData'],
-						data() {
-							return {};
-						},
-						methods: {
-							handleClick() {
-								this.$emit('emitData', {
-									action: this.injectData.label,
-									value: this.injectData,
-								});
-							},
-						},
-						render: function (h) {
-							return (
-								<el-button type="text" onClick={this.handleClick}>
-									详情
-								</el-button>
-							);
-						},
-					},
-				},
+				// {
+				// 	prop: '_detail',
+				// 	label: '巡检内容',
+				// 	subcomponent: {
+				// 		name: 'ViewDetail',
+				// 		props: ['injectData'],
+				// 		data() {
+				// 			return {};
+				// 		},
+				// 		methods: {
+				// 			handleClick() {
+				// 				this.$emit('emitData', {
+				// 					action: this.injectData.label,
+				// 					value: this.injectData,
+				// 				});
+				// 			},
+				// 		},
+				// 		render: function (h) {
+				// 			return (
+				// 				<el-button type="text" onClick={this.handleClick}>
+				// 					详情
+				// 				</el-button>
+				// 			);
+				// 		},
+				// 	},
+				// },
 				{ prop: 'remark', label: '备注' },
 			],
 			searchBarFormConfig: [
@@ -193,85 +163,16 @@ export default {
 					plain: true,
 					color: 'primary',
 				},
-				{
-					type: this.$auth.hasPermi('equipment:check-record:create')
-						? 'button'
-						: '',
-					btnName: '新增',
-					name: 'add',
-					plain: true,
-				},
-			],
-			rows: [
-				[
-					{
-						input: true,
-						label: '维修单号',
-						prop: 'repairOrderNumber',
-					},
-					{
-						select: true,
-						label: '设备名称',
-						prop: 'equipmentId',
-						url: '/base/core-equipment/listAll',
-						bind: {
-							filterable: true,
-							clearable: true,
-						},
-						rules: [
-							{ required: true, message: '设备名称不能为空', trigger: 'blur' },
-						],
-					},
-				],
-				[
-					{
-						// TODO: 和班组联动
-						select: true,
-						label: '维修工',
-						prop: 'repairman',
-						// url: '/base/core-equipment/listAll',
-						bind: {
-							filterable: true,
-							clearable: true,
-							multiple: true,
-						},
-						rules: [
-							{ required: true, message: '维修工不能为空', trigger: 'blur' },
-						],
-					},
-					{
-						input: true,
-						label: '联系方式',
-						prop: 'repairmanPhone',
-					},
-				],
-				[
-					{
-						datetime: true,
-						label: '故障发生时间',
-						prop: 'faultTime',
-						rules: [
-							{
-								required: true,
-								message: '故障发生时间不能为空',
-								trigger: 'blur',
-							},
-						],
-						bind: {
-							format: 'yyyy-MM-dd HH:mm:ss',
-							'value-format': 'timestamp',
-							// 'value-format': 'yyyy-MM-dd HH:mm:ss',
-							clearable: true,
-						},
-					},
-					{
-						select: true,
-						label: '故障级别',
-						prop: 'faultLevel', // 数据字典
-						options: this.getDictDatas(this.DICT_TYPE.FAULT_LEVEL),
-					},
-				],
+				// {
+				// 	type: this.$auth.hasPermi('equipment:check-record:create')
+				// 		? 'button'
+				// 		: '',
+				// 	btnName: '新增',
+				// 	name: 'add',
+				// 	plain: true,
+				// },
 			],
+
 			// 是否显示弹出层
 			open: false,
 			// 查询参数
@@ -285,42 +186,12 @@ export default {
 			form: {},
 			basePath: '/base/equipment-check-order',
 			mode: null,
-			allSpecialEquipments: [],
 		};
 	},
 	created() {
-		// this.initSearchBar();
 		this.getList();
 	},
 	methods: {
-		initSearchBar() {
-			this.http('/base/core-equipment/listAll', 'get').then(({ data }) => {
-				this.allSpecialEquipments = data.filter((item) => item.special);
-				this.setSearchBarEquipmentList(data.filter((item) => item.special));
-			});
-		},
-		// 设备大类改变
-		handleSearchBarChange({ param, value }) {
-			if ('specialType' === param) {
-				if (!value) {
-					this.setSearchBarEquipmentList(this.allSpecialEquipments);
-					return;
-				}
-				this.setSearchBarEquipmentList(
-					this.allSpecialEquipments.filter((item) => item.specialType == value)
-				);
-			}
-		},
-		setSearchBarEquipmentList(eqList) {
-			this.$set(
-				this.searchBarFormConfig[1],
-				'selectOptions',
-				eqList.map((item) => ({
-					name: item.name,
-					id: item.id,
-				}))
-			);
-		},
 		/** 查询列表 */
 		getList() {
 			this.loading = true;
@@ -335,125 +206,44 @@ export default {
 		cancel() {
 			this.open = false;
 			this.mode = null;
-			this.reset();
-		},
-		/** 表单重置 */
-		reset() {
-			this.form = {
-				id: null,
-				repairOrderNumber: null,
-				equipmentId: null,
-				repairman: null,
-				repairmanPhone: null,
-				faultTime: null,
-				faultLevel: null,
-				maintenanceStartTime: null,
-				maintenanceFinishTime: null,
-				faultType: null,
-				repairMode: null,
-				maintenanceStatus: null,
-				faultDetail: null,
-				maintenanceDetail: null,
-				remark: null,
-				files: [
-					// {
-					// 	fileName: '',
-					// 	fileType: '',
-					// 	fileUrl: '',
-					// },
-				],
-			};
-			this.resetForm('form');
 		},
 		/** 搜索按钮操作 */
 		handleQuery() {
 			this.queryParams.pageNo = 1;
 			this.getList();
 		},
-		/** 重置按钮操作 */
-		resetQuery() {
-			this.resetForm('queryForm');
-			this.handleQuery();
-		},
-		/** 新增按钮操作 */
-		handleAdd() { 
-			this.addOrUpdateVisible = true;
-			this.$nextTick(() => {
-				this.$refs.addOrUpdate.init();
-			});
-		},
-		/** 修改按钮操作 */
-		handleUpdate(row) {
-			// this.reset();
-			// const id = row.id;
-			// this.info({ id }).then((response) => {
-			// 	this.form = response.data;
-			// 	this.open = true;
-			// 	this.title = '修改维修记录';
-			// });
-			this.addOrUpdateVisible = true;
-			this.$nextTick(() => {
-				this.$refs.addOrUpdate.init(row.id);
-			});
-		},
-		/** 提交按钮 */
-		submitForm() {
-			this.$refs['form'].validate((valid) => {
-				if (!valid) {
-					return;
-				}
-				// 修改的提交
-				if (this.form.id != null) {
-					this.put(this.form).then((response) => {
-						this.$modal.msgSuccess('修改成功');
-						this.open = false;
-						this.getList();
-					});
-					return;
-				}
-				// 添加的提交
-				this.post(this.form).then((response) => {
-					this.$modal.msgSuccess('新增成功');
-					this.open = false;
-					this.getList();
-				});
-			});
-		},
-		/** 删除按钮操作 */
-		handleDelete(row) {
-			const id = row.id;
-			this.$modal
-				.confirm(
-					'是否删除设备巡检记录配置名称为"' + row.configName + '"的数据项?'
-				)
-				.then(function () {
-					return deleteEqCheckLog(id);
-				})
-				.then(() => {
-					this.getList();
-					this.$modal.msgSuccess('删除成功');
-				})
-				.catch(() => {});
-		},
+
 		handleDetail({ id }) {
 			this.addOrUpdateVisible = true;
 			this.$nextTick(() => {
 				this.$refs.addOrUpdate.init(id, true);
 			});
 		},
+
 		/** 导出按钮操作 */
 		handleExport() {
-			// 处理查询参数
-			let params = { ...this.queryParams };
-			params.pageNo = undefined;
-			params.pageSize = undefined;
 			this.$modal
 				.confirm('是否确认导出所有设备巡检记录?')
 				.then(() => {
 					this.exportLoading = true;
-					return exportCheckLogExcel(params);
+					return this.$axios({
+						url: '/base/equipment-check-order/export-excel',
+						params: {
+							name: this.queryParams.name,
+							status: 2,
+							special: true,
+						},
+						responseType: 'blob',
+					});
 				})
 				.then((response) => {
+					// const link = document.createElement('a');
+					// link.href = window.URL.createObjectURL(new Blob([response]));
+					// link.download = '设备巡检记录.xls';
+					// document.body.appendChild(link);
+					// link.click();
+					// document.body.removeChild(link);
+					// window.URL.revokeObjectURL(link.href);
 					this.$download.excel(response, '设备巡检记录.xls');
 					this.exportLoading = false;
 				})

From 71fc98b0bb8166c97b4205208143d9026547a6cc Mon Sep 17 00:00:00 2001
From: juzi <819872918@qq.com>
Date: Fri, 23 Feb 2024 17:01:48 +0800
Subject: [PATCH 39/40] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.dev                                      |   4 +-
 src/api/base/orderGroup.js                    |  20 +-
 src/api/base/orderManage.js                   |  35 +-
 .../base/orderGroup/components/bindOrder.vue  | 310 +++++-------------
 .../orderGroup/components/orderGroupAdd.vue   |  15 +-
 src/views/order/base/orderGroup/index.vue     | 254 +++++++-------
 .../base/orderGroup/orderGroupDetailData.vue  | 133 +++-----
 .../orderManage/components/addWorkOrder.vue   | 198 ++++++-----
 .../base/orderManage/components/orderAdd.vue  |  12 +-
 .../base/orderManage/components/topTab.vue    | 108 ++++++
 src/views/order/base/orderManage/index.vue    | 158 +++++----
 .../base/orderManage/orderDetailData.vue      | 120 +++----
 .../components/monitoringRingCharts.vue       |  10 +-
 .../orderCompletionMonitoring/index.vue       | 271 ++++++---------
 14 files changed, 786 insertions(+), 862 deletions(-)
 create mode 100644 src/views/order/base/orderManage/components/topTab.vue

diff --git a/.env.dev b/.env.dev
index 26325c81..f97a7e9b 100644
--- a/.env.dev
+++ b/.env.dev
@@ -14,15 +14,13 @@ VUE_APP_TITLE = MES系统
 # 芋道管理系统/开发环境
 # VUE_APP_BASE_API = 'http://100.64.0.26:48082'
 # VUE_APP_BASE_API = 'http://10.70.2.2:8080'
-VUE_APP_BASE_API = 'http://192.168.0.33:48082'
-# VUE_APP_BASE_API = 'http://192.168.1.20:48080'
 # VUE_APP_BASE_API = 'http://192.168.1.20:48080'
 # VUE_APP_BASE_API = 'http://192.168.2.173:48080'
 # VUE_APP_BASE_API = 'http://192.168.1.49:48082'
 # VUE_APP_BASE_API = 'http://192.168.1.8:48082'
 # VUE_APP_BASE_API = 'http://192.168.4.159:48080'
 # VUE_APP_BASE_API = 'http://192.168.1.104:48082'
-# VUE_APP_BASE_API = 'http://192.168.0.33:48082'
+VUE_APP_BASE_API = 'http://192.168.0.33:48082'
 # VUE_APP_BASE_API = 'http://192.168.1.62:48082'
 # VUE_APP_BASE_API = 'http://192.168.1.78:48082'
 
diff --git a/src/api/base/orderGroup.js b/src/api/base/orderGroup.js
index 692fe74b..5751107f 100644
--- a/src/api/base/orderGroup.js
+++ b/src/api/base/orderGroup.js
@@ -51,4 +51,22 @@ export function orderGroupDetail(query) {
     method: 'get',
     params: query
   })
-}
\ No newline at end of file
+}
+
+// 创建集团订单与厂务订单表关联表 一对多
+export function orderConGroupOrder(data) {
+  return request({
+    url: '/base/order-con-group-order/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 订单监控
+export function orderGroupMonitor(query) {
+  return request({
+    url: '/base/order-group/orderGroupMonitor',
+    method: 'get',
+    params: query
+  })
+}
diff --git a/src/api/base/orderManage.js b/src/api/base/orderManage.js
index bd415ce0..732e13c7 100644
--- a/src/api/base/orderManage.js
+++ b/src/api/base/orderManage.js
@@ -8,6 +8,23 @@ export function orderList(query) {
   })
 }
 
+// 获得订单列表
+export function getOrderList(query) {
+  return request({
+    url: '/base/order/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 获得订单列表
+export function getFreeOrderList() {
+  return request({
+    url: '/base/order/getFreeOrderList',
+    method: 'get'
+  })
+}
+
 // 条件获得工单列表
 export function workOrderList(query) {
   return request({
@@ -113,24 +130,6 @@ export function getWorkOrderById(query) {
   })
 }
 
-// 订单监控
-export function orderMonitor(query) {
-  return request({
-    url: '/base/order/orderMonitor',
-    method: 'get',
-    params: query
-  })
-}
-
-// 获取订单绑定的工单和数量信息，可传订单id列表，map索引为订单id
-export function orderAssignmentList(query) {
-  return request({
-    url: '/base/order/orderAssignmentList',
-    method: 'get',
-    params: query
-  })
-}
-
 // 获得所有客户列表
 export function customerList() {
   return request({
diff --git a/src/views/order/base/orderGroup/components/bindOrder.vue b/src/views/order/base/orderGroup/components/bindOrder.vue
index 612cd94a..1d0eebd3 100644
--- a/src/views/order/base/orderGroup/components/bindOrder.vue
+++ b/src/views/order/base/orderGroup/components/bindOrder.vue
@@ -1,14 +1,11 @@
 <template>
-  <el-form ref="addWorkOrder" :rules="rules" label-width="130px" :model="form" label-position='top'>
+  <el-form ref="bindOrder" :rules="rules" label-width="130px" :model="form">
     <el-row :gutter="20">
-      <el-col :span='6'>
-        <el-form-item label="工单名称" prop="name" v-if='!isBind'>
-          <el-input v-model="form.name"></el-input>
-        </el-form-item>
-        <el-form-item label="工单名称" prop="workOrderId"  v-if='isBind'>
-          <el-select v-model="form.workOrderId" placeholder="请选择" style="width: 100%;" filterable @change="getWorkOrderMsg">
+      <el-col :span='12'>
+        <el-form-item label="厂务订单名称" prop="orderId">
+          <el-select v-model="form.orderId" placeholder="请选择" style="width: 100%;" filterable @change="getOrderMsg">
             <el-option
-              v-for="item in workOrderList"
+              v-for="item in orderList"
               :key="item.id"
               :label="item.name"
               :value="item.id">
@@ -16,86 +13,19 @@
           </el-select>
         </el-form-item>
       </el-col>
-      <el-col :span='6'>
-        <el-form-item label="工单编码" prop="code">
+      <el-col :span='12'>
+        <el-form-item label="订单编码" prop="code">
           <el-input v-model="form.code" disabled></el-input>
         </el-form-item>
       </el-col>
-      <el-col :span='6'>
-        <el-form-item label="产品名称" prop="planProductId">
-          <el-select v-model="form.planProductId" placeholder="请选择" disabled  style="width: 100%;">
-            <el-option
-              v-for="item in productList"
-              :key="item.id"
-              :label="item.name+' | '+item.specifications"
-              :value="item.id">
-              <span style="float: left">{{ item.name }}</span>
-              <span style="float: right; color: #8492a6; font-size: 13px">{{ item.specifications }}</span>
-            </el-option>
-          </el-select>
+      <el-col :span='12'>
+        <el-form-item label="计划加工数量" prop="planQuantity">
+          <el-input-number v-model="form.planQuantity" style="width: 100%;" disabled></el-input-number>
         </el-form-item>
       </el-col>
-      <el-col :span='6'>
-        <el-form-item label="计划开始时间">
-          <el-date-picker
-            v-model="planStartTime"
-            type="datetime"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            style="width: 100%;"
-            placeholder="选择日期"
-            :disabled="isBind">
-          </el-date-picker>
-        </el-form-item>
-      </el-col>
-    </el-row>
-    <el-row :gutter="20">
-      <el-col :span='6'>
-        <el-form-item label="计划完成时间">
-          <el-date-picker
-            v-model="planFinishTime"
-            type="datetime"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            style="width: 100%;"
-            placeholder="选择日期"
-            :disabled="isBind">
-          </el-date-picker>
-        </el-form-item>
-      </el-col>
-      <el-col :span='6'>
-        <el-form-item label="计划投入数量" prop="planAssignQuantity">
-          <el-input-number v-model="form.planAssignQuantity" :min="0" :max="9999999999999" :disabled="isBind" style="width: 100%;"></el-input-number>
-        </el-form-item>
-      </el-col>
-      <el-col :span='6'>
-        <el-form-item label="计划生产数量" prop="planQuantity">
-          <el-input-number v-model="form.planQuantity" :min="0" :max="9999999999999" :disabled="isBind" style="width: 100%;"></el-input-number>
-        </el-form-item>
-      </el-col>
-      <el-col :span='6'>
-        <el-form-item label="关联工艺" prop="processFlowId">
-          <el-select v-model="form.processFlowId" placeholder="请选择" disabled style="width: 100%;">
-            <el-option
-              v-for="item in processFlowList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id">
-            </el-option>
-          </el-select>
-        </el-form-item>
-      </el-col>
-    </el-row>
-    <el-row :gutter="20">
-      <el-col :span='6'>
-        <el-form-item label="物料计算方式" prop="materialMethod">
-          <el-select v-model="form.materialMethod" placeholder="请选择" style="width: 100%;" disabled>
-            <el-option label="产品基础BOM" :value="1"></el-option>
-            <el-option label="工艺扩展BOM" :value="2"></el-option>
-          </el-select>
-        </el-form-item>
-      </el-col>
-      <el-col :span='6'>
+      <el-col :span='12'>
         <el-form-item label="优先级" prop="priority">
-          <el-select v-model="form.priority" placeholder="请选择" style="width: 100%;" :disabled="isBind">
+          <el-select v-model="form.priority" placeholder="请选择" style="width: 100%;" disabled>
             <el-option
               v-for="item in getDictDatas(DICT_TYPE.ORDER_PRIORITY)"
               :key="item.value"
@@ -105,199 +35,121 @@
           </el-select>
         </el-form-item>
       </el-col>
-      <el-col :span='6'>
-        <el-form-item label="工单类型" prop="type">
-          <el-select v-model="form.type" placeholder="请选择" style="width: 100%;" :disabled="isBind">
-            <el-option
-              v-for="item in workOrderTypeList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id">
-            </el-option>
-          </el-select>
+      <el-col :span='12'>
+        <el-form-item label="产品名称" prop="productName">
+          <el-input v-model="form.productName" disabled></el-input>
         </el-form-item>
       </el-col>
-      <el-col :span='6'>
-        <el-form-item label="关联产线" prop="productLineId">
-          <el-select v-model="form.productLineId" placeholder="请选择" multiple style="width: 100%;" :disabled="isBind">
-            <el-option
-              v-for="item in productLineList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id">
-            </el-option>
-          </el-select>
+      <el-col :span='12'>
+        <el-form-item label="产品规格" prop="specifications">
+          <el-input v-model="form.specifications" disabled></el-input>
         </el-form-item>
       </el-col>
-    </el-row>
-    <el-row :gutter="20">
-      <el-col :span='6'>
-        <el-form-item label="负责人" prop="workers">
-          <el-input v-model="form.workers" :disabled="isBind"></el-input>
+      <el-col :span='12'>
+        <el-form-item label="订单计划开始时间" prop="planStartTime">
+          <el-date-picker
+            v-model="form.planStartTime"
+            type="datetime"
+            style="width: 100%;"
+            value-format="timestamp"
+            disabled
+            placeholder="选择日期">
+          </el-date-picker> 
         </el-form-item>
       </el-col>
-      <el-col :span='6'>
-        <el-form-item label="计划分配订单量" prop="planAssignmentQuantity">
-          <el-input-number v-model="form.planAssignmentQuantity" :min="0" :max="9999999999999" style="width: 100%;"></el-input-number>
+      <el-col :span='12'>
+        <el-form-item label="订单计划完成时间" prop="planFinishTime">
+          <el-date-picker
+            v-model="form.planFinishTime"
+            type="datetime"
+            style="width: 100%;"
+            value-format="timestamp"
+            disabled
+            placeholder="选择日期">
+          </el-date-picker>
+        </el-form-item>
+      </el-col>
+      <el-col :span='24'>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" disabled></el-input>
         </el-form-item>
       </el-col>
     </el-row>
   </el-form>
 </template>
 <script>
+import { orderDetail, getFreeOrderList } from '@/api/base/orderManage'
+import { orderConGroupOrder } from '@/api/base/orderGroup'
 import { getProductAll } from '@/api/base/product'
-import { getProcessFlowList, getWorkOrderCode, orderIssue, workOrderList, getWorkOrderById } from '@/api/base/orderManage'
-import { getLineAll } from '@/api/base/productionLine'
-import moment from 'moment'
 export default {
   name: 'bindOrder',
   data() {
     return {
       form: {
-        workOrderId: '',
+        groupOrderId: '',
         orderId: '',
-        name: '',
         code: '',
-        planProductId: '',
-        planStartTime: '',
-        planFinishTime: '',
-        planAssignQuantity: 0,
-        planQuantity: 0,
-        processFlowId: '',
-        materialMethod: 1,
+        planQuantity: '',
         priority: '',
-        productLineId: [],
-        type: '',
-        workers: '',
-        planAssignmentQuantity: ''
+        productName: '',
+        specifications: '',
+        remark: '',
+        planStartTime: '',
+        planFinishTime: ''
       },
       rules: {
-        name: [{ required: true, message: "工单名称不能为空", trigger: "blur" }],
-        planProductId: [{ required: true, message: "产品名称不能为空", trigger: "change" }],
-        planAssignQuantity: [{ required: true, message: "计划投入数量不能为空", trigger: "blur" }],
-        planQuantity: [{ required: true, message: "计划生产数量不能为空", trigger: "blur" }],
-        productLineId: [{ required: true, message: "产线不能为空", trigger: "change" }],
-        planAssignmentQuantity: [{ required: true, message: "计划分配订单量不能为空", trigger: "blur" }]
+        orderId: [{ required: true, message: "厂务订单名称不能为空", trigger: "change" }]
       },
-      productList: [],
-      processFlowList: [],
-      productLineList: [],
-      workOrderTypeList: [
-        {id: 1,name:'标准工单'},
-        {id: 2, name:'特殊工单'}
-      ],
-      planStartTime: '',
-      planFinishTime: '',
-      isBind: false,
-      workOrderList: []
+      orderList: []
     }
   },
   methods: {
-    init(data, param) {
-      this.form.orderId = data.id
+    init(data) {
+      this.form.groupOrderId = data.id
       this.getList()
-      if (param === 'add') {
-        this.isBind = false
-        getWorkOrderCode().then(res => {
-          this.form.code = res.data || ''
-        })
-        this.form.planProductId = data.planProductId
-        this.form.processFlowId = data.processFlowId
-        this.form.materialMethod = data.materialMethod
-      }else{//绑定
-        this.isBind = true
-      }
     },
     getList() {
-      // 产品
-      getProductAll().then(res => {
-        this.productList = res.data || []
-      })
-      // 产线
-      getLineAll().then(res => {
-        this.productLineList = res.data || []
-      })
-      // 工艺
-      getProcessFlowList().then(res => {
-        this.processFlowList = res.data || []
-      })
-      // 工单list
-      workOrderList({
-        status: 1
-      }).then(res => {
-        this.workOrderList = res.data || []
+      // 厂务订单list
+      getFreeOrderList().then(res => {
+        this.orderList = res.data || []
       })
     },
-    addWorkOrderSubmit() {
-      this.$refs['addWorkOrder'].validate((valid) => {
+    bindOrderSubmit() {
+      this.$refs['bindOrder'].validate((valid) => {
         if (valid) {
-          if (this.isBind) {
-            //绑定工单
-            orderIssue({
-              workOrderId: this.form.workOrderId,
-              orderId: this.form.orderId,
-              planAssignmentQuantity: this.form.planAssignmentQuantity
+            //集团订单绑定厂务订单
+            orderConGroupOrder({
+              groupOrderId: this.form.groupOrderId,
+              orderId: this.form.orderId
              }).then((res) => {
               if (res.code === 0) {
                 this.$modal.msgSuccess("操作成功")
-                this.$emit('addWorkOrderSubmit')
+                this.$emit('bindOrderSubmit')
               }
             })
-          } else {
-            // 新增工单
-            let _this = this
-            _this.form.planStartTime = _this.planStartTime ? new Date(_this.planStartTime).valueOf() : ''
-            _this.form.planFinishTime = _this.planFinishTime ? new Date(_this.planFinishTime).valueOf() : ''
-            orderIssue({ ..._this.form }).then(res => {
-              if (res.code === 0) {
-                _this.$modal.msgSuccess("操作成功")
-                let name = this.form.name
-                _this.$emit('addWorkOrderSubmit')
-                // 询问是否添加预使用主原料
-                _this.$modal.confirm('是否添加预使用主原料信息?').then(function() {
-                    _this.$router.push({
-                      path: '/core/core-work-order?workOrderName='+encodeURI(name)
-                    })
-                  })
-              }
-            })
-          }
         } else {
           return false
         }
       })
     },
     formClear() {
-      this.$refs.addWorkOrder.resetFields()
-      this.form.materialMethod = 1
-      this.form.planAssignQuantity = 0
+      this.$refs.bindOrder.resetFields()
       this.form.planQuantity = 0
-      this.planFinishTime = ''
-      this.planStartTime = ''
-      this.form.planFinishTime = ''
-      this.form.planStartTime = ''
-      this.isBind = false
     },
-    // 绑定工单，选择工单时获取工单信息
-    getWorkOrderMsg() {
-      if (this.form.workOrderId) {
-        getWorkOrderById({id:this.form.workOrderId}).then(res => {
-          if (res.code === 0) {
-            this.form.code = res.data.code
-            this.form.planProductId = res.data.planProductId
-            this.planStartTime = res.data.planStartTime ? moment.unix(res.data.planStartTime).format('YYYY-MM-DD HH:mm:ss') : null
-            this.planFinishTime = res.data.planFinishTime ? moment.unix(res.data.planFinishTime).format('YYYY-MM-DD HH:mm:ss') : null
-            this.form.planAssignQuantity = res.data.planAssignQuantity
-            this.form.planQuantity = res.data.planQuantity
-            this.form.processFlowId = res.data.processFlowId
-            this.form.materialMethod = res.data.materialMethod
-            this.form.priority = res.data.priority ? res.data.priority + '' : ''
-            this.form.productLineId = res.data.productLineIds
-            this.form.type = res.data.type
-            this.form.workers = res.data.workers
-          }
-        })
-      }
+    // 选择订单时获取订单信息
+    getOrderMsg(val) {
+      orderDetail({
+        id: val
+      }).then(res => {
+        this.form.code = res.data.code
+        this.form.planQuantity = res.data.planQuantity
+        this.form.productName = res.data.productName
+        this.form.specifications = res.data.specifications
+        this.form.priority = res.data.priority ? res.data.priority + '' : ''
+        this.form.planStartTime = res.data.planStartTime ? res.data.planStartTime : null
+        this.form.planFinishTime = res.data.planFinishTime ? res.data.planFinishTime : null
+        this.form.remark = res.data.remark
+      })
     }
   }
 }
diff --git a/src/views/order/base/orderGroup/components/orderGroupAdd.vue b/src/views/order/base/orderGroup/components/orderGroupAdd.vue
index 1cf82535..1c272dfb 100644
--- a/src/views/order/base/orderGroup/components/orderGroupAdd.vue
+++ b/src/views/order/base/orderGroup/components/orderGroupAdd.vue
@@ -48,9 +48,9 @@
         </el-form-item>
       </el-col>
     <el-col :span='6'>
-        <el-form-item label="交货时间" prop="finishProduceTime">
+        <el-form-item label="交货时间" prop="deliveTime">
           <el-date-picker
-            v-model="form.finishProduceTime"
+            v-model="form.deliveTime"
             type="datetime"
             style="width: 100%;"
             value-format="timestamp"
@@ -97,7 +97,7 @@ export default {
         specifications: '',
         customerId: '',
         planQuantity: '',
-        finishProduceTime: '',
+        deliveTime: '',
         packReq:'',
         remark: ''
       },
@@ -106,7 +106,7 @@ export default {
         code: [{ required: true, message: "订单编码不能为空", trigger: "blur" }],
         planProductId: [{ required: true, message: "产品名称不能为空", trigger: "change" }],
         planQuantity: [{ required: true, message: "计划加工数量不能为空", trigger: "blur" }],
-        finishProduceTime: [{ required: true, message: "交货时间不能为空", trigger: "change" }]
+        deliveTime: [{ required: true, message: "交货时间不能为空", trigger: "change" }]
       },
       productList: [],
       customerList: [],
@@ -124,12 +124,14 @@ export default {
             this.form.name = res.data.name
             this.form.code = res.data.code
             this.form.planProductId = res.data.planProductId
-            this.getSpecifications(this.form.planProductId)
             this.form.customerId = res.data.customerId
             this.form.planQuantity = res.data.planQuantity
-            this.form.finishProduceTime = res.data.finishProduceTime ? res.data.finishProduceTime : null
+            this.form.deliveTime = res.data.deliveTime ? res.data.deliveTime : null
             this.form.packReq = res.data.packReq ? res.data.packReq+'' : ''
             this.form.remark = res.data.remark
+            setTimeout(() => {
+              this.getSpecifications(this.form.planProductId)
+            }, 300);
           }
         })
       } else {
@@ -153,7 +155,6 @@ export default {
     },
     // 获取产品规格
     getSpecifications(val) {
-      console.log(val)
       for (let i of this.productList) {
         if (i.id === val) {
           this.form.specifications =  i.specifications
diff --git a/src/views/order/base/orderGroup/index.vue b/src/views/order/base/orderGroup/index.vue
index 2bbde83b..c14e840b 100644
--- a/src/views/order/base/orderGroup/index.vue
+++ b/src/views/order/base/orderGroup/index.vue
@@ -43,21 +43,21 @@
     <!-- 查看详情 -->
     <!-- 新增工单 -->
     <base-dialog
-      :dialogTitle="workIssueTitle"
-      :dialogVisible="addWorkOrdervisible"
-      @cancel="addWorkOrderCancel"
-      @confirm="addWorkOrderConfirm"
-      :before-close="addWorkOrderCancel"
-      width='70%'
+      dialogTitle="绑定厂务订单"
+      :dialogVisible="bindOrderVisible"
+      @cancel="bindOrderCancel"
+      @confirm="bindOrderConfirm"
+      :before-close="bindOrderCancel"
+      width='60%'
     >
-      <add-work-order ref="bindOrder" @addWorkOrderSubmit="addWorkOrderSubmit" />
+      <bind-order ref="bindOrder" @bindOrderSubmit="bindOrderSubmit" />
     </base-dialog>
   </div>
 </template>
 <script>
 import { parseTime } from '@/utils/ruoyi'
 import { getOrderGroupPage, groupOrderStatusSet } from '@/api/base/orderGroup'
-import { orderDelete, customerList, orderFinish } from '@/api/base/orderManage'
+import { customerList } from '@/api/base/orderManage'
 import OrderGroupAdd from './components/orderGroupAdd'
 import BindOrder from './components/bindOrder'
 import { publicFormatter } from '@/utils/dict'
@@ -71,13 +71,13 @@ const tableProps = [
   {
     prop: 'name',
     label: '订单名称',
-    minWidth: 120,
+    minWidth: 140,
     showOverflowtooltip: true
   },
   {
     prop: 'code',
     label: '订单编码',
-    minWidth: 180
+    minWidth: 150
   },
   {
     prop: 'customerId',
@@ -88,9 +88,17 @@ const tableProps = [
     prop: 'status',
     label: '订单状态',
     filter: publicFormatter('order_status')
-  },{
+  },
+  {
+    prop: 'productName',
+    label: '产品名称',
+    minWidth: 200,
+    showOverflowtooltip: true
+  },
+  {
     prop: 'specifications',
     label: '产品规格',
+    minWidth: 120,
     showOverflowtooltip: true
   },
   {
@@ -109,14 +117,16 @@ const tableProps = [
     width: 100
   },
   {
-    prop: 'finishProduceTime',
+    prop: 'deliveTime',
     label: '交货时间',
     filter: parseTime,
     minWidth: 160
   },
   {
-    prop: 'productName2',
+    prop: 'packReq',
     label: '包装要求',
+    filter: publicFormatter('pack_spec'),
+    minWidth: 120,
     showOverflowtooltip: true
   },
   {
@@ -163,10 +173,10 @@ export default {
           color: 'primary'
         },
         {
-          type: this.$auth.hasPermi('base:order-manage:create') ? 'separate' : '',
+          type: this.$auth.hasPermi('base:order-group:create') ? 'separate' : '',
         },
         {
-          type: this.$auth.hasPermi('base:order-manage:create') ? 'button' : '',
+          type: this.$auth.hasPermi('base:order-group:create') ? 'button' : '',
           btnName: '新增',
           name: 'add',
           color: 'success',
@@ -179,131 +189,104 @@ export default {
         pageSize: 20,
         name: null,
         status: null,
-        lastIssuedTime: []
+        planFinishTime: []
       },
       total: 0,
       tableProps,
       list: [],
       tableH: this.tableHeight(260),
       tableBtn: [
-      this.$auth.hasPermi('base:order-manage:bindWorkOrder')
+      this.$auth.hasPermi('base:order-group:bind')
           ? {
               type: 'bind',
               btnName: '绑定',
-              showTip: '绑定工单',
-              // showParam: {
-              //   type: '|',
-              //   data: [
-              //     {
-              //       type: 'equal',
-              //       name: 'status',
-              //       value: 1
-              //     },
-              //     {
-              //       type: 'equal',
-              //       name: 'status',
-              //       value: 2
-              //     },
-              //     {
-              //       type: 'equal',
-              //       name: 'status',
-              //       value: 3
-              //     }
-              //   ]
-              // }
+              showTip: '厂务订单',
+              showParam: {
+                type: '&',
+                data: [
+                  {
+                    type: 'less',
+                    name: 'status',
+                    value: 3
+                  }
+                ]
+              }
             }
           : undefined,
-      this.$auth.hasPermi('base:order-manage:bindWorkOrder')
+      this.$auth.hasPermi('base:order-group:complete')
           ? {
               type: 'complete',
               btnName: '完成',
               showTip: '完成订单',
-              // showParam: {
-              //   type: '|',
-              //   data: [
-              //     {
-              //       type: 'equal',
-              //       name: 'status',
-              //       value: 2
-              //     },
-              //     {
-              //       type: 'equal',
-              //       name: 'status',
-              //       value: 3
-              //     }
-              //   ]
-              // }
+              showParam: {
+                type: '&',
+                data: [
+                  {
+                    type: 'equal',
+                    name: 'status',
+                    value: 3
+                  }
+                ]
+              }
             }
           : undefined,
-          this.$auth.hasPermi('base:order-manage:bindWorkOrder')
+          this.$auth.hasPermi('base:order-group:termination')
           ? {
               type: 'termination',
               btnName: '终止',
               showTip: '终止',
-              // showParam: {
-              //   type: '|',
-              //   data: [
-              //     {
-              //       type: 'equal',
-              //       name: 'status',
-              //       value: 2
-              //     },
-              //     {
-              //       type: 'equal',
-              //       name: 'status',
-              //       value: 3
-              //     }
-              //   ]
-              // }
+              showParam: {
+                type: '|',
+                data: [
+                  {
+                    type: 'equal',
+                    name: 'status',
+                    value: 2
+                  },
+                  {
+                    type: 'equal',
+                    name: 'status',
+                    value: 3
+                  }
+                ]
+              }
             }
           : undefined,
-          this.$auth.hasPermi('base:order-manage:bindWorkOrder')
+          this.$auth.hasPermi('base:order-group:cancel')
           ? {
               type: 'cancel',
               btnName: '作废',
               showTip: '作废',
-              // showParam: {
-              //   type: '|',
-              //   data: [
-              //     {
-              //       type: 'equal',
-              //       name: 'status',
-              //       value: 2
-              //     },
-              //     {
-              //       type: 'equal',
-              //       name: 'status',
-              //       value: 3
-              //     }
-              //   ]
-              // }
+              showParam: {
+                type: '&',
+                data: [
+                  {
+                    type: 'less',
+                    name: 'status',
+                    value: 2
+                  }
+                ]
+              }
             }
           : undefined,
-      this.$auth.hasPermi('base:order-manage:detail')
-          ? {
-              type: 'detail',
-              btnName: '详情'
-            }
-          : undefined,
-        this.$auth.hasPermi('base:order-manage:edit')
+          {
+            type: 'detail',
+            btnName: '详情'
+          },
+        this.$auth.hasPermi('base:order-group:edit')
           ? {
               type: 'edit',
               btnName: '编辑',
-              // showParam: {
-              //   type: '&',
-              //   data: [
-              //     {
-              //       type: 'equal',
-              //       name: 'triggerOrigin',
-              //       value: 1
-              //     },
-              //     {
-              //       type: 'equal',
-              //       name: 'status',
-              //       value: 1
-              //     }
-              //   ]
-              // }
+              showParam: {
+                type: '&',
+                data: [
+                  {
+                    type: 'less',
+                    name: 'status',
+                    value: 3
+                  }
+                ]
+              }
             }
           : undefined
       ].filter((v) => v),
@@ -311,7 +294,7 @@ export default {
       centervisible: false,
       priorityList: this.getDictDatas(this.DICT_TYPE.ORDER_PRIORITY),
       workIssueTitle: '',
-      addWorkOrdervisible: false,
+      bindOrderVisible: false,
       orderDetailVisible: false
     }
   },
@@ -325,7 +308,7 @@ export default {
   methods: {
     getList() {
       getOrderGroupPage({...this.queryParams}).then(res => {
-        let arr = res.data.list || []
+        let arr = res.data.records || []
         this.total = res.data.total || 0
         if (arr.length > 0) {
           customerList().then(result => {
@@ -337,7 +320,6 @@ export default {
                     item.customerId = i.name
                   }
                 }
-                item.price = item.price?.toFixed(2)
               })
               this.list = arr
             }
@@ -353,10 +335,10 @@ export default {
         this.queryParams.name = val.name
         this.queryParams.status = val.status
         if (val.timeVal && val.timeVal.length > 0) {
-          this.queryParams.lastIssuedTime[0] = val.timeVal[0] + ' 00:00:00'
-          this.queryParams.lastIssuedTime[1] = val.timeVal[1] + ' 23:59:59'
+          this.queryParams.planFinishTime[0] = val.timeVal[0] + ' 00:00:00'
+          this.queryParams.planFinishTime[1] = val.timeVal[1] + ' 23:59:59'
         } else {
-          this.queryParams.lastIssuedTime = []
+          this.queryParams.planFinishTime = []
         }
         this.getList()
       } else {
@@ -388,9 +370,9 @@ export default {
           break
         case 'bind':
           this.workIssueTitle = '绑定工单'
-          this.addWorkOrdervisible = true
+          this.bindOrderVisible = true
           this.$nextTick(() => {
-            this.$refs.bindOrder.init(val.data, 'bind')
+            this.$refs.bindOrder.init(val.data)
           })
           break
         case 'complete':
@@ -401,12 +383,38 @@ export default {
     },
     // 完成,终止，作废
     handleEditStatus(val, tip, status) {
-      this.$modal.confirm('是否确认'+tip+'"' + val.name + '"?').then(function() {
+      console.log(val)
+      if (val.orderIdNum > 0) {// 有下级订单
+        this.$confirm('是否将"'+tip+'"操作同步至下级订单和工单?','确认信息', {
+          type: 'warning',
+          distinguishCancelAndClose: true,
+          confirmButtonText: '同步',
+          cancelButtonText: '不同步'
+        }).then(function() {
+          console.log('同步')
+          groupOrderStatusSet({ id: val.id, status: status, isSync: true}).then(() => {
+            this.getList();
+            this.$modal.msgSuccess("操作成功");
+          })
+        }).catch(action => {
+          if (action === 'cancel') {
+            console.log('不同步')
+            groupOrderStatusSet({ id: val.id, status: status, isSync: false}).then(() => {
+              this.getList();
+              this.$modal.msgSuccess("操作成功");
+            })
+          }else {
+            return console.log('关闭')
+          }
+        })
+      }else{// 无下级订单
+        this.$modal.confirm('是否确认"'+tip+'"集团订单名称为"' + val.name + '"的数据项?').then(function() {
           return groupOrderStatusSet({ id: val.id, status: status})
         }).then(() => {
           this.getList();
           this.$modal.msgSuccess("操作成功");
         }).catch(() => {});
+      }
     },
     handleCancel() {
       this.$refs.orderGroupAdd.formClear()
@@ -421,15 +429,15 @@ export default {
       this.getList()
     },
     // 下发新增
-    addWorkOrderCancel() {
+    bindOrderCancel() {
       this.$refs.bindOrder.formClear()
-      this.addWorkOrdervisible = false
+      this.bindOrderVisible = false
     },
-    addWorkOrderConfirm() {
-      this.$refs.bindOrder.addWorkOrderSubmit()
+    bindOrderConfirm() {
+      this.$refs.bindOrder.bindOrderSubmit()
     },
-    addWorkOrderSubmit() {
-      this.addWorkOrderCancel()
+    bindOrderSubmit() {
+      this.bindOrderCancel()
       this.getList()
     }
   }
diff --git a/src/views/order/base/orderGroup/orderGroupDetailData.vue b/src/views/order/base/orderGroup/orderGroupDetailData.vue
index 6d67d36e..ca0e3132 100644
--- a/src/views/order/base/orderGroup/orderGroupDetailData.vue
+++ b/src/views/order/base/orderGroup/orderGroupDetailData.vue
@@ -10,11 +10,11 @@
         <el-row>
           <el-col :span='4'>
             <div class="blodTip">订单名称</div>
-            <div class="lightTip">{{orderGroupMsg.name}}</div>
+            <div class="lightTip" :title='orderGroupMsg.name'>{{orderGroupMsg.name}}</div>
           </el-col>
           <el-col :span='4'>
             <div class="blodTip">产品名称</div>
-            <div class="lightTip">{{orderGroupMsg.productName}}</div>
+            <div class="lightTip" :title="orderGroupMsg.productName">{{orderGroupMsg.productName}}</div>
           </el-col>
           <el-col :span='4'>
             <div class="blodTip">产品规格</div>
@@ -26,25 +26,17 @@
           </el-col>
           <el-col :span='4'>
             <div class="blodTip">包装要求</div>
-            <div class="lightTip">接口没有该字段</div>
+            <div class="lightTip">{{getDictDataLabel(DICT_TYPE.PACK_SPEC, orderGroupMsg.packReq)}}</div>
           </el-col>
           <el-col :span='4'>
             <div class="blodTip">交货时间</div>
-            <div class="lightTip">需要确认时哪个字段</div>
+            <div class="lightTip">{{ parseTime(orderGroupMsg.deliveTime)}}</div>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span='4'>
             <div class="blodTip">创建时间</div>
-            <div class="lightTip">{{ parseTime(orderGroupMsg.triggerTime) }}</div>
-          </el-col>
-          <el-col :span='4'>
-            <div class="blodTip">计划开始时间</div>
-            <div class="lightTip">{{ parseTime(orderGroupMsg.planStartTime) }}</div>
-          </el-col>
-          <el-col :span='4'>
-            <div class="blodTip">计划完成时间</div>
-            <div class="lightTip">{{ parseTime(orderGroupMsg.planFinishTime) }}</div>
+            <div class="lightTip">{{ parseTime(orderGroupMsg.createTime) }}</div>
           </el-col>
           <el-col :span='4'>
             <div class="blodTip">计划加工数量</div>
@@ -52,14 +44,12 @@
           </el-col>
           <el-col :span='4'>
             <div class="blodTip">加工平方数(平方米)</div>
-            <div class="lightTip">接口没有该字段</div>
+            <div class="lightTip">{{orderGroupMsg.actualArea}}</div>
           </el-col>
           <el-col :span='4'>
             <div class="blodTip">状态</div>
             <div class="lightTip">{{getDictDataLabel(DICT_TYPE.ORDER_STATUS, orderGroupMsg.status)}}</div>
           </el-col>
-        </el-row>
-        <el-row>
           <el-col :span='4'>
             <div class="blodTip">实际开始时间</div>
             <div class="lightTip">{{ parseTime(orderGroupMsg.startProduceTime) }}</div>
@@ -68,9 +58,11 @@
             <div class="blodTip">实际完成时间</div>
             <div class="lightTip">{{ parseTime(orderGroupMsg.finishProduceTime) }}</div>
           </el-col>
+        </el-row>
+        <el-row>
           <el-col :span='4'>
             <div class="blodTip">实际生产数量</div>
-            <div class="lightTip">{{orderGroupMsg.actualquantity	}}</div>
+            <div class="lightTip">{{orderGroupMsg.actualquantity }}</div>
           </el-col>
           <el-col :span='4'>
             <div class="blodTip">完成比%</div>
@@ -78,81 +70,81 @@
           </el-col>
           <el-col :span='4'>
             <div class="blodTip">废片数量</div>
-            <div class="lightTip">接口未看到该字段</div>
+            <div class="lightTip">该字段未绑定</div>
           </el-col>
         </el-row>
       </div>
     </div>
-    <div class="box2">
+    <div class="box2" v-for="(item, index) in orderMsg" :key='index'>
       <div class="boxTitle">
         <span class="blueTitle"></span>
-        <span>厂务订单编码: 64656563453543</span>
+        <span>厂务订单编码: {{item.code}}</span>
       </div>
       <div style="padding-left: 14px;">
         <el-row>
           <el-col :span='4'>
             <div class="blodTip">订单名称</div>
-            <div class="lightTip">测试订单1</div>
+            <div class="lightTip" :title="item.name">{{item.name}}</div>
           </el-col>
           <el-col :span='4'>
             <div class="blodTip">产品名称</div>
-            <div class="lightTip">测试产品</div>
+            <div class="lightTip" :title="item.productName">{{item.productName}}</div>
           </el-col>
           <el-col :span='4'>
             <div class="blodTip">产品规格</div>
-            <div class="lightTip">测试产品规格</div>
+            <div class="lightTip">{{item.specifications}}</div>
           </el-col>
           <el-col :span='4'>
             <div class="blodTip">创建时间</div>
-            <div class="lightTip">{{ parseTime(orderGroupMsg.createTime) }}</div>
+            <div class="lightTip">{{ parseTime(item.createTime) }}</div>
           </el-col>
           <el-col :span='4'>
             <div class="blodTip">计划开始时间</div>
-            <div class="lightTip">{{ parseTime(orderGroupMsg.planStartTime) }}</div>
+            <div class="lightTip">{{ parseTime(item.planStartTime) }}</div>
           </el-col>
           <el-col :span='4'>
             <div class="blodTip">计划完成时间</div>
-            <div class="lightTip">{{ parseTime(orderGroupMsg.planFinishTime) }}</div>
+            <div class="lightTip">{{ parseTime(item.planFinishTime) }}</div>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span='4'>
             <div class="blodTip">计划加工数量</div>
-            <div class="lightTip">{{orderGroupMsg.planQuantity}}</div>
+            <div class="lightTip">{{item.planQuantity}}</div>
           </el-col>
           <el-col :span='4'>
             <div class="blodTip">加工平方数(平方米)</div>
-            <div class="lightTip">{{orderGroupMsg.planArea}}</div>
+            <div class="lightTip">{{item.actualArea}}</div>
           </el-col>
           <el-col :span='4'>
-            <div class="blodTip">预计用时</div>
-            <div class="lightTip">10</div>
+            <div class="blodTip">预计用时(时)</div>
+            <div class="lightTip">{{item.expectTime}}</div>
           </el-col>
           <el-col :span='4'>
             <div class="blodTip">状态</div>
-            <div class="lightTip">{{getDictDataLabel(DICT_TYPE.ORDER_STATUS, orderGroupMsg.status)}}</div>
+            <div class="lightTip">{{getDictDataLabel(DICT_TYPE.ORDER_STATUS, item.status)}}</div>
           </el-col>
           <el-col :span='4'>
             <div class="blodTip">实际开始时间</div>
-            <div class="lightTip">{{ parseTime(orderGroupMsg.startProduceTime) }}</div>
+            <div class="lightTip">{{ parseTime(item.startProduceTime) }}</div>
           </el-col>
           <el-col :span='4'>
             <div class="blodTip">实际完成时间</div>
-            <div class="lightTip">{{ parseTime(orderGroupMsg.finishProduceTime) }}</div>
+            <div class="lightTip">{{ parseTime(item.finishProduceTime) }}</div>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span='4'>
             <div class="blodTip">实际生产数量</div>
-            <div class="lightTip">{{orderGroupMsg.actualQuantity	}}</div>
+            <div class="lightTip">{{item.actualQuantity	}}</div>
           </el-col>
           <el-col :span='4'>
             <div class="blodTip">完成比%</div>
-            <div class="lightTip">{{orderGroupMsg.completeProp}}</div>
+            <div class="lightTip">{{item.completeProp}}</div>
           </el-col>
           <el-col :span='4'>
             <div class="blodTip">废片数量</div>
-            <div class="lightTip">100</div>
+            <div class="lightTip">该字段未绑定</div>
           </el-col>
         </el-row>
       </div>
@@ -165,7 +157,7 @@
         :page="queryParams.pageNo"
         :limit="queryParams.pageSize"
         :table-props="tableProps"
-        :table-data="list"
+        :table-data="item.coreWorkOrderRespVOS || []"
         :max-height="tableH"
       />
     </div>
@@ -174,7 +166,6 @@
 <script>
 import { parseTime } from '@/utils/ruoyi'
 import { publicFormatter } from '@/utils/dict'
-import { getProcessFlowList } from '@/api/base/orderManage'
 import { orderGroupDetail } from '@/api/base/orderGroup'
 const tableProps = [
   {
@@ -186,7 +177,7 @@ const tableProps = [
   {
     prop: 'name',
     label: '工单名',
-    minWidth: 100,
+    minWidth: 150,
     showOverflowtooltip: true
   },
   {
@@ -195,12 +186,13 @@ const tableProps = [
     minWidth: 150
   },
   {
-    prop: 'code1',
+    prop: 'roomNameDict',
     label: '负责车间',
-    minWidth: 150
+    minWidth: 120,
+    filter: publicFormatter('workshop')
   },
   {
-    prop: 'planAssignmentQuantity',
+    prop: 'planQuantity',
     label: '计划加工量',
     width: 100
   },
@@ -239,29 +231,29 @@ const tableProps = [
   },
   {
     prop: 'workers',
-    label: '负责人'
+    label: '负责人',
+    showOverflowtooltip: true
   },
   {
     prop: 'remark',
-    label: '备注'
+    label: '备注',
+    showOverflowtooltip: true
   }
 ]
-import { bomUseNum } from '@/api/base/orderManage'
 export default {
   name: 'orderGroupDetailData',
   data() {
     return {
       orderGroupId: '',
       tableProps,
-      list: [{remark: 111},{remark: 111},{remark: 111}],
+      orderMsg: [],
       tableH: this.tableHeight(510) / 2,
       // 查询参数
       queryParams: {
         pageNo: 1,
         pageSize: 500
       },
-      orderGroupMsg: {},
-      processFlowName: ''
+      orderGroupMsg: {}
     }
   },
   mounted() {
@@ -271,49 +263,17 @@ export default {
     this.orderGroupId = location.href.split('?')[1].split('=')[1]
     this.getMsg()
   },
-  watch: {
-    $route: 'initData'
-  },
   methods: {
-    initData(to) {
-      if (to.name === 'orderGroupDetailData') {
-        this.orderGroupId = location.href.split('?')[1].split('=')[1]
-        this.getMsg()
-      }
-    },
     getMsg() {
       orderGroupDetail({
         id: this.orderGroupId
       }).then(res => {
         this.orderGroupMsg = res.data
-        // this.list = res.data.coreWorkOrderRespVOS
-        // bomUseNum({
-        //   productId: this.orderGroupMsg.planProductId
-        // }).then(res2 => {
-        //   if (res2.data && res2.data.length > 0) {
-        //     let arr = res2.data
-        //     arr.map(item => {
-        //       if (item) {
-        //         let a = item.num * this.orderGroupMsg.remainingQuantity
-        //         item.num = !isNaN(parseFloat(a)) && isFinite(a) ? a : ''
-        //       }
-        //     })
-        //     this.list2 = arr
-        //   }else {
-        //     this.list2 = []
-        //   }
-        // })
-        // 工艺
-        getProcessFlowList().then(res => {
-          let arr = res.data || []
-          if (arr.length > 0) {
-            arr.map(item => {
-              if (item.id === this.orderGroupMsg.processFlowId) {
-                this.processFlowName = item.name
-              }
-            })
-          }
-        })
+        if ( res.data.orderIdNum && res.data.orderIdNum > 0) {
+          this.orderMsg = res.data.orderDetailVOS
+        }else{
+          this.orderMsg = []
+        }
       })
     },
     // 返回
@@ -344,6 +304,9 @@ export default {
       font-weight: 400;
       color: rgba(102,102,102,0.75);
       margin-bottom: 12px;
+      white-space: nowrap;
+      overflow: hidden;
+      text-overflow: ellipsis;
     }
   }
   .box2 {
diff --git a/src/views/order/base/orderManage/components/addWorkOrder.vue b/src/views/order/base/orderManage/components/addWorkOrder.vue
index d2a9465e..27420779 100644
--- a/src/views/order/base/orderManage/components/addWorkOrder.vue
+++ b/src/views/order/base/orderManage/components/addWorkOrder.vue
@@ -27,14 +27,19 @@
             <el-option
               v-for="item in productList"
               :key="item.id"
-              :label="item.name+' | '+item.specifications"
+              :label="item.name"
               :value="item.id">
-              <span style="float: left">{{ item.name }}</span>
-              <span style="float: right; color: #8492a6; font-size: 13px">{{ item.specifications }}</span>
             </el-option>
           </el-select>
         </el-form-item>
       </el-col>
+      <el-col :span='6'>
+        <el-form-item label="产品规格" prop="specifications">
+          <el-input v-model="form.specifications" disabled></el-input>
+        </el-form-item>
+      </el-col>
+    </el-row>
+    <el-row :gutter="20">
       <el-col :span='6'>
         <el-form-item label="计划开始时间">
           <el-date-picker
@@ -47,8 +52,6 @@
           </el-date-picker>
         </el-form-item>
       </el-col>
-    </el-row>
-    <el-row :gutter="20">
       <el-col :span='6'>
         <el-form-item label="计划完成时间">
           <el-date-picker
@@ -71,9 +74,11 @@
           <el-input-number v-model="form.planQuantity" :min="0" :max="9999999999999" :disabled="isBind" style="width: 100%;"></el-input-number>
         </el-form-item>
       </el-col>
+    </el-row>
+    <el-row :gutter="20">
       <el-col :span='6'>
         <el-form-item label="关联工艺" prop="processFlowId">
-          <el-select v-model="form.processFlowId" placeholder="请选择" disabled style="width: 100%;">
+          <el-select v-model="form.processFlowId" placeholder="请选择" :disabled="isBind" style="width: 100%;">
             <el-option
               v-for="item in processFlowList"
               :key="item.id"
@@ -83,11 +88,9 @@
           </el-select>
         </el-form-item>
       </el-col>
-    </el-row>
-    <el-row :gutter="20">
       <el-col :span='6'>
         <el-form-item label="物料计算方式" prop="materialMethod">
-          <el-select v-model="form.materialMethod" placeholder="请选择" style="width: 100%;" disabled>
+          <el-select v-model="form.materialMethod" placeholder="请选择" style="width: 100%;" :disabled="isBind" @change='selectMethod'>
             <el-option label="产品基础BOM" :value="1"></el-option>
             <el-option label="工艺扩展BOM" :value="2"></el-option>
           </el-select>
@@ -117,42 +120,42 @@
           </el-select>
         </el-form-item>
       </el-col>
-      <el-col :span='6'>
-        <el-form-item label="优先级" prop="priority">
-          <el-select v-model="form.priority" placeholder="请选择" style="width: 100%;" :disabled="isBind">
-            <el-option
-              v-for="item in getDictDatas(DICT_TYPE.WORK_SHOP)"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value">
-            </el-option>
-          </el-select>
-        </el-form-item>
-      </el-col>
     </el-row>
     <el-row :gutter="20">
       <el-col :span='6'>
-        <el-form-item label="关联产线" prop="productLineId">
-          <el-select v-model="form.productLineId" placeholder="请选择" multiple style="width: 100%;" :disabled="isBind">
-            <el-option
-              v-for="item in productLineList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id">
-            </el-option>
-          </el-select>
-        </el-form-item>
-      </el-col>
-      <el-col :span='6'>
-        <el-form-item label="负责人" prop="workers">
-          <el-input v-model="form.workers" :disabled="isBind"></el-input>
-        </el-form-item>
-      </el-col>
-      <el-col :span='6'>
-        <el-form-item label="计划分配订单量" prop="planAssignmentQuantity">
-          <el-input-number v-model="form.planAssignmentQuantity" :min="0" :max="9999999999999" style="width: 100%;"></el-input-number>
-        </el-form-item>
-      </el-col>
+      <el-form-item label="关联产线" prop="productLineId">
+        <el-select v-model="form.productLineId" placeholder="请选择" multiple style="width: 100%;" :disabled="isBind">
+          <el-option
+            v-for="item in productLineList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id">
+          </el-option>
+        </el-select>
+      </el-form-item>
+    </el-col>
+  <el-col :span='6'>
+      <el-form-item label="负责车间" prop="roomNameDict">
+        <el-select v-model="form.roomNameDict" placeholder="请选择" style="width: 100%;" :disabled="isBind">
+          <el-option
+            v-for="item in getDictDatas(DICT_TYPE.WORK_SHOP)"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value">
+          </el-option>
+        </el-select>
+      </el-form-item>
+    </el-col>
+    <el-col :span='6'>
+      <el-form-item label="负责人" prop="workers">
+        <el-input v-model="form.workers" :disabled="isBind"></el-input>
+      </el-form-item>
+    </el-col>
+    <el-col :span='6'>
+      <el-form-item label="计划分配订单量" prop="planAssignmentQuantity">
+        <el-input-number v-model="form.planAssignmentQuantity" :min="0" :max="9999999999999" style="width: 100%;"></el-input-number>
+      </el-form-item>
+    </el-col>
     </el-row>
   </el-form>
 </template>
@@ -171,6 +174,7 @@ export default {
         name: '',
         code: '',
         planProductId: '',
+        specifications: '',
         planStartTime: '',
         planFinishTime: '',
         planAssignQuantity: 0,
@@ -179,6 +183,7 @@ export default {
         materialMethod: 1,
         priority: '',
         productLineId: [],
+        roomNameDict: '',
         type: '',
         workers: '',
         planAssignmentQuantity: ''
@@ -188,7 +193,9 @@ export default {
         planProductId: [{ required: true, message: "产品名称不能为空", trigger: "change" }],
         planAssignQuantity: [{ required: true, message: "计划投入数量不能为空", trigger: "blur" }],
         planQuantity: [{ required: true, message: "计划生产数量不能为空", trigger: "blur" }],
+        materialMethod: [{ required: true, message: "物料计算方式不能为空", trigger: "change" }],
         productLineId: [{ required: true, message: "产线不能为空", trigger: "change" }],
+        roomNameDict: [{ required: true, message: "负责车间不能为空", trigger: "change" }],
         planAssignmentQuantity: [{ required: true, message: "计划分配订单量不能为空", trigger: "blur" }]
       },
       productList: [],
@@ -214,8 +221,8 @@ export default {
           this.form.code = res.data || ''
         })
         this.form.planProductId = data.planProductId
-        this.form.processFlowId = data.processFlowId
-        this.form.materialMethod = data.materialMethod
+        // this.form.processFlowId = data.processFlowId
+        // this.form.materialMethod = data.materialMethod
       }else{//绑定
         this.isBind = true
       }
@@ -224,6 +231,9 @@ export default {
       // 产品
       getProductAll().then(res => {
         this.productList = res.data || []
+        if (this.form.planProductId) {
+          this.getSpecifications(this.form.planProductId)
+        }
       })
       // 产线
       getLineAll().then(res => {
@@ -240,44 +250,60 @@ export default {
         this.workOrderList = res.data || []
       })
     },
+    // 物料变动
+    selectMethod(val) {
+      if (val === 2 && !this.form.processFlowId ) {
+        this.form.materialMethod = 1
+        this.$modal.msgError("请先选择关联工艺");
+      }else if (val === 1) {
+        this.form.processFlowId = ''
+      }
+    },
     addWorkOrderSubmit() {
-      this.$refs['addWorkOrder'].validate((valid) => {
-        if (valid) {
-          if (this.isBind) {
-            //绑定工单
-            orderIssue({
-              workOrderId: this.form.workOrderId,
-              orderId: this.form.orderId,
-              planAssignmentQuantity: this.form.planAssignmentQuantity
-             }).then((res) => {
-              if (res.code === 0) {
-                this.$modal.msgSuccess("操作成功")
-                this.$emit('addWorkOrderSubmit')
-              }
-            })
-          } else {
-            // 新增工单
-            let _this = this
-            _this.form.planStartTime = _this.planStartTime ? new Date(_this.planStartTime).valueOf() : ''
-            _this.form.planFinishTime = _this.planFinishTime ? new Date(_this.planFinishTime).valueOf() : ''
-            orderIssue({ ..._this.form }).then(res => {
-              if (res.code === 0) {
-                _this.$modal.msgSuccess("操作成功")
-                let name = this.form.name
-                _this.$emit('addWorkOrderSubmit')
-                // 询问是否添加预使用主原料
-                _this.$modal.confirm('是否添加预使用主原料信息?').then(function() {
-                    _this.$router.push({
-                      path: '/core/core-work-order?workOrderName='+encodeURI(name)
-                    })
-                  })
-              }
-            })
-          }
-        } else {
+      if (this.isBind) {//绑定工单
+        if (!this.form.workOrderId) {
+          this.$modal.msgError("工单名称不能为空");
           return false
         }
-      })
+        if (!this.form.planAssignmentQuantity) {
+          this.$modal.msgError("计划分配订单量不能为空");
+          return false
+        }
+        orderIssue({
+          workOrderId: this.form.workOrderId,
+          orderId: this.form.orderId,
+          planAssignmentQuantity: this.form.planAssignmentQuantity
+          }).then((res) => {
+          if (res.code === 0) {
+            this.$modal.msgSuccess("操作成功")
+            this.$emit('addWorkOrderSubmit')
+          }
+        })
+      }else{// 新增工单
+        this.$refs['addWorkOrder'].validate((valid) => {
+          if (valid) {
+              // 新增工单
+              let _this = this
+              _this.form.planStartTime = _this.planStartTime ? new Date(_this.planStartTime).valueOf() : ''
+              _this.form.planFinishTime = _this.planFinishTime ? new Date(_this.planFinishTime).valueOf() : ''
+              orderIssue({ ..._this.form }).then(res => {
+                if (res.code === 0) {
+                  _this.$modal.msgSuccess("操作成功")
+                  let name = this.form.name
+                  _this.$emit('addWorkOrderSubmit')
+                  // 询问是否添加预使用主原料
+                  _this.$modal.confirm('是否添加预使用主原料信息?').then(function() {
+                      _this.$router.push({
+                        path: '/core/core-work-order?workOrderName='+encodeURI(name)
+                      })
+                    })
+                }
+              })
+          } else {
+            return false
+          }
+        })
+      }
     },
     formClear() {
       this.$refs.addWorkOrder.resetFields()
@@ -307,9 +333,23 @@ export default {
             this.form.productLineId = res.data.productLineIds
             this.form.type = res.data.type
             this.form.workers = res.data.workers
+            this.form.roomNameDict = (res.data.roomNameDict || res.data.roomNameDict === 0) ? res.data.roomNameDict + '' : ''
+            setTimeout(() => {
+              this.getSpecifications(this.form.planProductId)
+            }, 300);
           }
         })
       }
+    },
+    // 获取产品规格
+    getSpecifications(val) {
+      for (let i of this.productList) {
+        if (i.id === val) {
+          this.form.specifications =  i.specifications
+          return
+        }
+      }
+      this.form.specifications = ''
     }
   }
 }
diff --git a/src/views/order/base/orderManage/components/orderAdd.vue b/src/views/order/base/orderManage/components/orderAdd.vue
index e027839c..df3a8fb2 100644
--- a/src/views/order/base/orderManage/components/orderAdd.vue
+++ b/src/views/order/base/orderManage/components/orderAdd.vue
@@ -7,7 +7,7 @@
         </el-form-item>
       </el-col>
       <el-col :span='6'>
-        <el-form-item label="订单号" prop="code">
+        <el-form-item label="订单编码" prop="code">
           <el-input v-model="form.code"></el-input>
         </el-form-item>
       </el-col>
@@ -36,17 +36,15 @@
             <el-option
               v-for="item in productList"
               :key="item.id"
-              :label="item.name+' | '+(item.specifications || '')"
+              :label="item.name"
               :value="item.id">
-              <span style="float: left">{{ item.name }}</span>
-              <span style="float: right; color: #8492a6; font-size: 13px">{{ item.specifications }}</span>
             </el-option>
           </el-select>
         </el-form-item>
       </el-col>
       <el-col :span='6'>
         <el-form-item label="产品规格" prop="specifications">
-          <el-input v-model="form.specifications"></el-input>
+          <el-input v-model="form.specifications" disabled></el-input>
         </el-form-item>
       </el-col>
       <el-col :span='6'>
@@ -126,9 +124,11 @@ export default {
             this.form.planProductId = res.data.planProductId
             this.form.priority = res.data.priority ? res.data.priority + '' : ''
             this.form.planStartTime = res.data.planStartTime ? res.data.planStartTime : null
-            this.getSpecifications(this.form.planProductId)
             this.form.planFinishTime = res.data.planFinishTime ? res.data.planFinishTime : null
             this.form.remark = res.data.remark
+            setTimeout(() => {
+              this.getSpecifications(this.form.planProductId)
+            }, 300);
           }
         })
       } else {
diff --git a/src/views/order/base/orderManage/components/topTab.vue b/src/views/order/base/orderManage/components/topTab.vue
new file mode 100644
index 00000000..9a3afecb
--- /dev/null
+++ b/src/views/order/base/orderManage/components/topTab.vue
@@ -0,0 +1,108 @@
+<template>
+  <div class="topTab">
+    <div class="arr leftArr" @click='toLeft'></div>
+    <div class="arr rightArr" @click='toRight'></div>
+    <el-scrollbar ref="groupTeamScroll" :vertical="false"  class="scrollTab">
+      <ul class="tabBox">
+        <li :class="{'active':orderId===item.id}" v-for="(item, index) in orderIdList" :key='index' @click='toggleName(item.id)'>{{item.name}}</li>
+      </ul>
+    </el-scrollbar>
+  </div>
+</template>
+<script>
+export default {
+  name: 'TopTab',
+  data() {
+    return {
+      
+    }
+  },
+  props:['orderIdList','orderId'],
+  computed: {
+    scrollWrapper() {
+      return this.$refs.groupTeamScroll.$refs.wrap
+    }
+  },
+  methods:{
+    toLeft() {
+      const container = this.scrollWrapper
+      container.scrollLeft-=100
+    },
+    toRight() {
+      const container = this.scrollWrapper
+      container.scrollLeft+=100
+    },
+    toggleName(val) {
+      this.$emit('emitFun',val)
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+.topTab {
+  height: 56px;
+  padding: 0px 48px 0px 56px;
+  position: relative;
+  .arr {
+    position: absolute;
+    width: 48px;
+    height: 48px;
+    line-height: 48px;
+    background-color: #fff;
+    border-radius: 8px;
+    cursor: pointer;
+  }
+  .leftArr{
+    left: 0;
+    padding-left: 10px;
+  }
+  .leftArr::before{
+    display: inline-block;
+    content: '';
+    width: 0;
+    height: 0;
+    border-width: 8px;
+    border-style: solid;
+    border-color: transparent #0B58FF transparent transparent;
+  }
+  .rightArr{
+    right: 0;
+    top:0;
+    padding-left: 22px;
+  }
+  .rightArr::before{
+    display: inline-block;
+    content: '';
+    width: 0;
+    height: 0;
+    border-width: 8px;
+    border-style: solid;
+    border-color: transparent transparent transparent #0B58FF;
+  }
+  .scrollTab{
+    white-space: nowrap;
+    overflow: hidden;
+    font-size: 16px;
+    width: 100%;
+    height: 100%;
+    ul,li{
+      list-style: none;
+      margin: 0;
+      padding: 0;
+    }
+    .tabBox >.active {
+      border-bottom: 4px solid #0B58FF;
+    }
+    .tabBox>li {
+      display: inline-block;
+      height: 48px;
+      line-height: 48px;
+      background: #FFFFFF;
+      border-radius: 8px;
+      padding: 0px 10px;
+      margin-right: 8px;
+      cursor: pointer;
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/views/order/base/orderManage/index.vue b/src/views/order/base/orderManage/index.vue
index 2031bfeb..4b46ebd9 100644
--- a/src/views/order/base/orderManage/index.vue
+++ b/src/views/order/base/orderManage/index.vue
@@ -70,17 +70,13 @@ const tableProps = [
   {
     prop: 'name',
     label: '订单名称',
-    minWidth: 120,
+    minWidth: 140,
     showOverflowtooltip: true
   },
   {
     prop: 'code',
     label: '订单编码',
-    minWidth: 180
-  },
-  {
-    prop: 'customerId',
-    label: '客户',
+    minWidth: 150,
     showOverflowtooltip: true
   },
   {
@@ -111,6 +107,7 @@ const tableProps = [
   {
     prop: 'productName',
     label: '产品',
+    width: 200,
     showOverflowtooltip: true
   },
   {
@@ -187,7 +184,7 @@ export default {
       },
       total: 0,
       tableProps,
-      list: [{name: '111111'}],
+      list: [],
       tableH: this.tableHeight(260),
       tableBtn: [
       this.$auth.hasPermi('base:order-manage:addWorkOrder')
@@ -195,26 +192,16 @@ export default {
               type: 'add',
               btnName: '新增',
               showTip: '新增工单',
-              // showParam: {
-              //   type: '|',
-              //   data: [
-              //     {
-              //       type: 'equal',
-              //       name: 'status',
-              //       value: 1
-              //     },
-              //     {
-              //       type: 'equal',
-              //       name: 'status',
-              //       value: 2
-              //     },
-              //     {
-              //       type: 'equal',
-              //       name: 'status',
-              //       value: 3
-              //     }
-              //   ]
-              // }
+              showParam: {
+                type: '&',
+                data: [
+                  {
+                    type: 'less',
+                    name: 'status',
+                    value: 3
+                  }
+                ]
+              }
             }
           : undefined,
       this.$auth.hasPermi('base:order-manage:bindWorkOrder')
@@ -222,41 +209,26 @@ export default {
               type: 'bind',
               btnName: '绑定',
               showTip: '绑定工单',
-              // showParam: {
-              //   type: '|',
-              //   data: [
-              //     {
-              //       type: 'equal',
-              //       name: 'status',
-              //       value: 1
-              //     },
-              //     {
-              //       type: 'equal',
-              //       name: 'status',
-              //       value: 2
-              //     },
-              //     {
-              //       type: 'equal',
-              //       name: 'status',
-              //       value: 3
-              //     }
-              //   ]
-              // }
+              showParam: {
+                type: '&',
+                data: [
+                  {
+                    type: 'less',
+                    name: 'status',
+                    value: 3
+                  }
+                ]
+              }
             }
           : undefined,
-      this.$auth.hasPermi('base:order-manage:bindWorkOrder')
+      this.$auth.hasPermi('base:order-manage:complete')
           ? {
               type: 'complete',
               btnName: '完成',
               showTip: '完成订单',
               showParam: {
-                type: '|',
+                type: '&',
                 data: [
-                  {
-                    type: 'equal',
-                    name: 'status',
-                    value: 2
-                  },
                   {
                     type: 'equal',
                     name: 'status',
@@ -266,16 +238,43 @@ export default {
               }
             }
           : undefined,
-      this.$auth.hasPermi('base:order-manage:detail')
+      this.$auth.hasPermi('base:order-manage:termination')
         ? {
             type: 'termination',
-            btnName: '终止'
+            btnName: '终止',
+            showTip: '终止',
+            showParam: {
+              type: '|',
+              data: [
+                {
+                  type: 'equal',
+                  name: 'status',
+                  value: 2
+                },
+                {
+                  type: 'equal',
+                  name: 'status',
+                  value: 3
+                }
+              ]
+            }
           }
         : undefined,
-      this.$auth.hasPermi('base:order-manage:detail')
+      this.$auth.hasPermi('base:order-manage:cancel')
         ? {
             type: 'cancel',
-            btnName: '作废'
+            btnName: '作废',
+            showTip: '作废',
+            showParam: {
+              type: '&',
+              data: [
+                {
+                  type: 'less',
+                  name: 'status',
+                  value: 2
+                }
+              ]
+            }
           }
         : undefined,
       this.$auth.hasPermi('base:order-manage:detail')
@@ -292,14 +291,9 @@ export default {
                 type: '&',
                 data: [
                   {
-                    type: 'equal',
-                    name: 'triggerOrigin',
-                    value: 1
-                  },
-                  {
-                    type: 'equal',
+                    type: 'less',
                     name: 'status',
-                    value: 1
+                    value: 3
                   }
                 ]
               }
@@ -319,7 +313,7 @@ export default {
     window.addEventListener('resize', () => {
       this.tableH = this.tableHeight(260)
     })
-    // this.getList()
+    this.getList()
   },
   methods: {
     getList() {
@@ -336,7 +330,7 @@ export default {
                     item.customerId = i.name
                   }
                 }
-                item.price = item.price.toFixed(2)
+                item.price =  item.price ? item.price.toFixed(2) : '0.00'
               })
               this.list = arr
             }
@@ -407,12 +401,38 @@ export default {
     },
     // 完成,终止，作废
     handleEditStatus(val, tip, status) {
-      this.$modal.confirm('是否确认'+tip+'"' + val.name + '"?').then(function() {
-        return orderStatusSet({ id: val.id })
+      console.log(val)
+      if (val.workOrderNum > 0) {//有下级工单
+        this.$confirm('是否将"'+tip+'"操作同步至下级工单?','确认信息', {
+          type: 'warning',
+          distinguishCancelAndClose: true,
+          confirmButtonText: '同步',
+          cancelButtonText: '不同步'
+        }).then(function() {
+          console.log('同步')
+          orderStatusSet({ id: val.id, status: status, isSync: true}).then(() => {
+            this.getList();
+            this.$modal.msgSuccess("操作成功");
+          })
+        }).catch(action => {
+          if (action === 'cancel') {
+            console.log('不同步')
+            orderStatusSet({ id: val.id, status: status, isSync: false}).then(() => {
+              this.getList();
+              this.$modal.msgSuccess("操作成功");
+            })
+          }else {
+            return console.log('关闭')
+          }
+        })
+      }else{// 无下级工单
+        this.$modal.confirm('是否确认"'+tip+'"厂务订单名称为"' + val.name + '"的数据项?').then(function() {
+          return orderStatusSet({ id: val.id, status: status})
         }).then(() => {
           this.getList();
           this.$modal.msgSuccess("操作成功");
         }).catch(() => {});
+      }
     },
     // 新增
     handleCancel() {
diff --git a/src/views/order/base/orderManage/orderDetailData.vue b/src/views/order/base/orderManage/orderDetailData.vue
index 033ca638..93ec49cd 100644
--- a/src/views/order/base/orderManage/orderDetailData.vue
+++ b/src/views/order/base/orderManage/orderDetailData.vue
@@ -1,11 +1,15 @@
 <template>
   <div class="orderDetailData">
+    <div v-show="!isSingle" style="position: relative;padding-right: 90px;">
+      <TopTab :orderIdList='orderIdList' :orderId="orderId"  @emitFun='toggleName'/>
+      <el-button type="primary" plain size="small" style="position: absolute;right: 0; top: 0;height: 48px;font-size: 14px;" @click="returnOrderManage"><svg-icon icon-class="return"/> 返回</el-button>
+    </div>
     <div class="box1">
       <div class="boxTitle">
         <span class="blueTitle"></span>
         <span>订单编码: {{orderMsg.code}}</span>
       </div>
-      <el-button type="primary" plain size="small" style="float: right;" @click="returnOrderManage"><svg-icon icon-class="return"/> 返回</el-button>
+      <el-button v-show="isSingle" type="primary" plain size="small" style="float: right;" @click="returnOrderManage"><svg-icon icon-class="return"/> 返回</el-button>
       <div style="padding-left: 14px;">
         <el-row>
           <el-col :span='4'>
@@ -70,7 +74,7 @@
           </el-col>
           <el-col :span='4'>
             <div class="blodTip">废片数量</div>
-            <div class="lightTip">{{orderMsg.nokQuantity}}</div>
+            <div class="lightTip">该字段未绑定</div>
           </el-col>
         </el-row>
       </div>
@@ -89,26 +93,13 @@
         :max-height="tableH"
       />
     </div>
-    <div class="box3">
-      <div class="boxTitle">
-        <span class="blueTitle"></span>
-        <span>预计用料信息</span>
-      </div>
-      <!-- 列表 -->
-      <base-table
-        :page="queryParams.pageNo"
-        :limit="queryParams.pageSize"
-        :table-props="tableProps2"
-        :table-data="list2"
-        :max-height="tableH"
-      />
-    </div>
   </div>
 </template>
 <script>
 import { parseTime } from '@/utils/ruoyi'
 import { publicFormatter } from '@/utils/dict'
 import { getProcessFlowList } from '@/api/base/orderManage'
+import TopTab from './components/topTab'
 const tableProps1 = [
   {
     prop: 'issueTime',
@@ -119,7 +110,7 @@ const tableProps1 = [
   {
     prop: 'name',
     label: '工单名',
-    minWidth: 100,
+    minWidth: 160,
     showOverflowtooltip: true
   },
   {
@@ -134,7 +125,7 @@ const tableProps1 = [
     filter: publicFormatter('workshop')
   },
   {
-    prop: 'planAssignmentQuantity',
+    prop: 'planQuantity', 
     label: '计划加工量',
     width: 100
   },
@@ -173,39 +164,26 @@ const tableProps1 = [
   },
   {
     prop: 'workers',
-    label: '负责人'
+    label: '负责人',
+    showOverflowtooltip: true
   },
   {
     prop: 'remark',
-    label: '备注'
+    label: '备注',
+    showOverflowtooltip: true
   }
 ]
-const tableProps2 = [
-  {
-    prop: 'materialName',
-    label: '物料名称'
-  },
-  {
-    prop: 'unit',
-    label: '单位',
-    filter: publicFormatter('unit_dict')
-  },
-  {
-    prop: 'num',
-    label: '剩余生产预计消耗'
-  }
-]
-import { orderDetail, bomUseNum } from '@/api/base/orderManage'
+import { orderDetail, getOrderList } from '@/api/base/orderManage'
 export default {
   name: 'OrderDetailData',
   data() {
     return {
       orderId: '',
+      orderIdList: [], //订单监控跳转过来
+      isSingle: true,//单个详情，false是多个详情
       tableProps1,
-      tableProps2,
       list1: [],
-      list2: [],
-      tableH: this.tableHeight(510) / 2,
+      tableH: this.tableHeight(420),
       // 查询参数
       queryParams: {
         pageNo: 1,
@@ -215,45 +193,38 @@ export default {
       processFlowName: ''
     }
   },
+  components:{ TopTab },
   mounted() {
     window.addEventListener('resize', () => {
       this.tableH = this.tableHeight(510) / 2
     })
-    this.orderId = location.href.split('?')[1].split('=')[1]
-    this.getMsg()
-  },
-  watch: {
-    $route: 'initData'
+    if (this.$route.query.orderIdString && this.$route.query.orderIdString!=='undefined') {
+      getOrderList({ids:this.$route.query.orderIdString}).then(res => {
+        this.orderIdList = res.data.map(item => {
+          return {
+            id: item.id,
+            name: item.name
+          }
+        })
+        this.orderId = this.orderIdList[0].id
+        this.getMsg()
+      })
+      this.isSingle = false
+      console.log('aaaaa')
+    }else{
+      this.orderId = this.$route.query.orderId
+      this.isSingle = true
+      this.getMsg()
+      console.log('bbbbbbbbbb')
+    }
   },
   methods: {
-    initData(to) {
-      if (to.name === 'OrderDetailData') {
-        this.orderId = location.href.split('?')[1].split('=')[1]
-        this.getMsg()
-      }
-    },
     getMsg() {
       orderDetail({
         id: this.orderId
       }).then(res => {
         this.orderMsg = res.data
         this.list1 = res.data.coreWorkOrderRespVOS
-        bomUseNum({
-          productId: this.orderMsg.planProductId
-        }).then(res2 => {
-          if (res2.data && res2.data.length > 0) {
-            let arr = res2.data
-            arr.map(item => {
-              if (item) {
-                let a = item.num * this.orderMsg.remainingQuantity
-                item.num = !isNaN(parseFloat(a)) && isFinite(a) ? a : ''
-              }
-            })
-            this.list2 = arr
-          }else {
-            this.list2 = []
-          }
-        })
         // 工艺
         getProcessFlowList().then(res => {
           let arr = res.data || []
@@ -269,7 +240,12 @@ export default {
     },
     // 返回
     returnOrderManage() {
-      this.$router.push({path: '/order/base/order-manage'})
+      this.$router.go(-1)
+    },
+    // 切换tab获取订单详情
+    toggleName(val) {
+      this.orderId = val
+      this.getMsg()
     }
   }
 }
@@ -277,14 +253,14 @@ export default {
 <style lang='scss' scoped>
 .orderDetailData {
   background-color: rgb(242, 244, 249);
-  .box1, .box2, .box3 {
+  .box1, .box2{
     background-color: #fff;
     border-radius: 9px;
   }
   .box2 {
-    height: calc((100vh - 360px) / 2);
+    height: calc(100vh - 351px);
     padding: 12px 16px 0;
-    margin: 8px 0;
+    margin-top: 8px;
   }
   .box1 {
     height: 215px;
@@ -304,10 +280,6 @@ export default {
       margin-bottom: 12px;
     }
   }
-  .box3 {
-    padding: 16px;
-    height: calc((100vh - 360px) / 2);
-    }
   .boxTitle {
     display: inline-block;
     font-size: 16px;
diff --git a/src/views/order/monitoring/components/monitoringRingCharts.vue b/src/views/order/monitoring/components/monitoringRingCharts.vue
index b3c39465..08f193a7 100644
--- a/src/views/order/monitoring/components/monitoringRingCharts.vue
+++ b/src/views/order/monitoring/components/monitoringRingCharts.vue
@@ -2,13 +2,13 @@
   <div>
     <div class="boxTitle">
       <span class="blueTitle"></span>
-      <span>各订单环形图</span>
+      <span>各集团订单环形图</span>
     </div>
     <div class="chartBox" id='orderChartBox' v-show='chartList.length'>
       <div class="chartItem" v-for="(item, index) in chartList" :key='index' :style="{width: 388*beilv+'px',height: 286*beilv+'px',padding:14*beilv+'px',marginRight:9*beilv+'px',marginBottom:9*beilv+'px'}">
         <div class="topTitle" :style="{fontSize: 14 * beilv + 'px'}">
           <svg-icon icon-class="order-monitoring" :style="{fontSize: 16*beilv+'px'}"/>
-          <span class="orderName" :style="{paddingRight:8*beilv+'px',marginRight:8*beilv+'px'}">{{item.orderName}}</span>
+          <span class="orderName" :style="{paddingRight:8*beilv+'px',marginRight:8*beilv+'px'}">{{item.orderGroupName}}</span>
           <span>订单计划数量{{item.num}}</span>
         </div>
         <div
@@ -16,7 +16,7 @@
           :style="{width: 166*beilv+'px',height: 166*beilv+'px',margin: 'auto'}"
         ></div>
         <div class="legend" :style="{height: 54 * beilv + 'px', marginTop: 10*beilv+'px'}">
-          <div class="legendItem" v-for="(subItem, i) in item.workOrder" :key='i' :style="{paddingRight:9*beilv+'px',marginRight:9*beilv+'px'}">
+          <div class="legendItem" v-for="(subItem, i) in item.order" :key='i' :style="{paddingRight:9*beilv+'px',marginRight:9*beilv+'px'}">
             <span class="itemNum" :style="{fontSize: 18 * beilv + 'px'}">{{subItem.value}}</span>
             <div>
               <span class="itemName" :style="{fontSize: 14 * beilv + 'px'}">
@@ -78,7 +78,7 @@ export default {
         var chartDom = document.getElementById(this.chartList[i].id);
         this.myChart[i] = echarts.init(chartDom);
         let colorList = []
-        this.chartList[i].workOrder.map(item => {
+        this.chartList[i].order.map(item => {
           colorList.push(item.color)
         })
         let percentage = (this.chartList[i].sunNum/this.chartList[i].num*100).toFixed(0)
@@ -118,7 +118,7 @@ export default {
               labelLine: {
                 show: false
               },
-              data: this.chartList[i].workOrder
+              data: this.chartList[i].order
             }
           ]
         };
diff --git a/src/views/order/monitoring/orderCompletionMonitoring/index.vue b/src/views/order/monitoring/orderCompletionMonitoring/index.vue
index 694560c0..f66a4322 100644
--- a/src/views/order/monitoring/orderCompletionMonitoring/index.vue
+++ b/src/views/order/monitoring/orderCompletionMonitoring/index.vue
@@ -13,13 +13,13 @@
     <!-- 表 -->
     <div v-if="activeName === 'dataList'">
       <base-table
-        :page="queryParams.pageNo"
-        :limit="queryParams.pageSize"
+        :page="1"
+        :limit="1000000000000"
         :table-props="tableProps"
         :table-data="list"
         :max-height="tableH"
         row-key="id"
-        :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
+        :tree-props="{children: 'orderMonitorVOS', hasChildren: 'hasChildren'}"
       >
         <method-btn
           v-if="tableBtn.length"
@@ -30,42 +30,33 @@
           @clickBtn="handleClick"
         />
       </base-table>
-      <!-- <el-table
-        :data="list"
-        style="width: 100%;margin-bottom: 20px;"
-        row-key="id"
-        border
-        default-expand-all
-        :tree-props="{children: 'children', hasChildren: 'hasChildren'}">
-        <el-table-column
-          v-for='item in tableProps'
-          :key='item.id'
-          :prop="item.prop"
-          :label="item.label"
-          :width="item.minWidth?item.minWidth:120">
-        </el-table-column>
-      </el-table> -->
     </div>
     <!-- 图 -->
     <monitoring-ring-charts ref='monitoringRingCharts' v-else :chart-list='chartList'/>
-    <pagination
+    <!-- <pagination
       :page.sync="queryParams.pageNo"
       :limit.sync="queryParams.pageSize"
       :total="total"
       @pagination="getPage"
-    />
+    /> -->
   </div>
 </template>
 <script>
 import { parseTime } from '@/utils/ruoyi'
 import { publicFormatter } from '@/utils/dict'
-import { orderMonitor, orderAssignmentList } from '@/api/base/orderManage'
+import { orderGroupMonitor } from '@/api/base/orderGroup'
 import MonitoringRingCharts from './../components/monitoringRingCharts'
 import moment from "moment"
 const tableProps = [
   {
     prop: 'name',
-    label: '订单名称'
+    label: '订单名称',
+    minWidth: 140,
+    showOverflowtooltip: true
+  },
+  {
+    prop: 'orderType',
+    label: '订单类型'
   },
   {
     prop: 'customerName',
@@ -73,7 +64,9 @@ const tableProps = [
   },
   {
     prop: 'productname',
-    label: '产品'
+    label: '产品',
+    minWidth: 200,
+    showOverflowtooltip: true
   },
   {
     prop: 'planStartTime',
@@ -104,6 +97,12 @@ const tableProps = [
     filter: parseTime,
     minWidth: 160
   },
+  {
+    prop: 'deliveTime',
+    label: '交货时间',
+    filter: parseTime,
+    minWidth: 160
+  },
   {
     prop: 'lineNames',
     label: '加工线',
@@ -126,8 +125,8 @@ const tableProps = [
     width: 100
   },
   {
-    prop: 'workOrderNum',
-    label: '关联工单数量',
+    prop: 'orderNum',
+    label: '关联订单/工单数量',
     width: 110
   }
 ]
@@ -138,7 +137,7 @@ export default {
       formConfig: [
         {
           type: 'input',
-          label: '订单名称',
+          label: '集团订单名称',
           param: 'name'
         },
         {
@@ -164,10 +163,8 @@ export default {
       activeName: 'dataList',
       // 查询参数
       queryParams: {
-        pageNo: 1,
-        pageSize: 20,
         name: null,
-        startProduceTime: []
+        deliveTime: []
       },
       tableProps,
       list: [],
@@ -177,14 +174,14 @@ export default {
       this.$auth.hasPermi('base:order-completion-monitoring:orderDet')
           ? {
               type: 'orderDetail',
-              btnName: '工单',
-              showTip: '工单详情',
+              btnName: '详情',
+              showTip: '订单/工单详情',
               showParam: {
                 type: '&',
                 data: [
                   {
                     type: 'more',
-                    name: 'workOrderNum',
+                    name: 'orderNum',
                     value: 1
                   }
                 ]
@@ -201,8 +198,13 @@ export default {
                 data: [
                   {
                     type: 'more',
-                    name: 'workOrderNum',
+                    name: 'orderNum',
                     value: 1
+                  },
+                  {
+                    type: 'unequal',
+                    name: 'woIdString',
+                    value: ''
                   }
                 ]
               }
@@ -237,141 +239,78 @@ export default {
     let start = moment().subtract(30, 'days').format('yyyy-MM-DD')
     let end = moment().format('yyyy-MM-DD')
     this.formConfig[1].defaultSelect = [start, end]
-    this.queryParams.startProduceTime[0] = start + ' 00:00:00'
-    this.queryParams.startProduceTime[1] = end + ' 23:59:59'
+    this.queryParams.deliveTime[0] = start + ' 00:00:00'
+    this.queryParams.deliveTime[1] = end + ' 23:59:59'
     this.getPage()
   },
   methods: {
     getPage() {
-      this.list = [
-        {
-          name: '11111',
-          id: '1',
-          finishProduceTime: '2023-11-11T12:12:12',
-          children:[
-            {name: '1-11111', id: '11',}
-          ]
-        },
-        {
-          name: '2222222',
-          id: '2',
-          finishProduceTime: '2023-11-11T12:12:12',
-          children:[
-            {name: '2-222222', id: '22'}
-          ]
-        },
-        {
-          name: '3333333',
-          id: '3',
-          finishProduceTime: '2023-11-11T12:12:12',
-          children:[
-            {name: '3-333333', id: '33'}
-          ]
-        },
-        {
-          name: '44444',
-          id: '4',
-          finishProduceTime: '2023-11-11T12:12:12',
-          children:[
-            {name: '4-44444', id: '44'}
-          ]
-        },
-        {
-          name: '555555',
-          id: '5',
-          finishProduceTime: '2023-11-11T12:12:12',
-          children:[
-            {name: '5-55555', id: '55'}
-          ]
-        },
-        {
-          name: '6',
-          id: '6',
-          finishProduceTime: '2023-11-11T12:12:12',
-          children:[
-            {name: '6-66666', id: '66'}
-          ]
-        },
-        {
-          name: '7777777',
-          id: '7',
-          finishProduceTime: '2023-11-11T12:12:12',
-          children:[
-            {name: '7-77777', id: '77'}
-          ]
-        },
-        {
-          name: '888888',
-          id: '8',
-          finishProduceTime: '2023-11-11T12:12:12',
-          children:[
-            {name: '8-888888', id: '88'}
-          ]
+      orderGroupMonitor({...this.queryParams}).then(res => {
+        let arr = res.data || []
+        if (arr.length > 0) {
+          let color = ['#7164FF','#288AFF','#63BDFF','#8EF0AB','#FFCE6A']
+          let arr2 = []
+          arr.map(item => {
+            item.orderType = '集团订单'//前端写死订单类型
+            let woIdString = ''//集团订单层添加工单str跳转质量用
+            //=========图数据
+            let arr3 = []
+            let obj = {}
+            obj.orderGroupName = item.name
+            obj.id = item.id
+            obj.num = item.planQuantity || 0
+            let sunNum = 0
+            if (item.orderMonitorVOS && item.orderMonitorVOS.length > 0) {
+              for(let i = 0; i < item.orderMonitorVOS.length; i++) {
+                item.orderMonitorVOS[i].orderType = '厂务订单'//前端写死订单类型
+                item.orderMonitorVOS[i].id = item.orderMonitorVOS[i].orderid
+                item.orderMonitorVOS[i].orderNum = item.orderMonitorVOS[i].workOrderNum
+                woIdString+=item.orderMonitorVOS[i].woIdString?item.orderMonitorVOS[i].woIdString:''
+                //==============图数据
+                let subObj = {}
+                subObj.value = item.orderMonitorVOS[i].actualquantity
+                subObj.name = item.orderMonitorVOS[i].name
+                if (i < 5) {
+                  subObj.color = color[i]
+                } else {
+                  subObj.color = color[i%5]
+                }
+                sunNum+=(item.orderMonitorVOS[i].actualquantity || 0)
+                arr3.push(subObj)
+              }
+            }
+            item.woIdString = woIdString
+            arr3.push({
+              value: item.planQuantity - sunNum > 0 ? item.planQuantity - sunNum : 0,
+              name: '未生产',
+              color: '#F5F5F5'
+            })
+            obj.sunNum = sunNum
+            obj.order = arr3
+            arr2.push(obj)
+          })
+          this.chartList = arr2
+          if (this.activeName === 'barChart' && this.chartList.length > 0) {
+            this.$nextTick(() => {
+              this.$refs.monitoringRingCharts.initChart()
+            })
+          }
+        }else{
+          // 显示无数据的图片
+          this.chartList = []
         }
-      ]
-      // // 表数据
-      // orderMonitor({...this.queryParams}).then(res => {
-      //   this.list = res.data.records || []
-      //   this.total = res.data.total || 0
-      //   if (this.list.length > 0) {
-      //     let orderIdList = []
-      //     this.list.map(item => {
-      //       orderIdList.push(item.orderid)
-      //     })
-      //     // 图的数据
-      //     orderAssignmentList({orderIdList:orderIdList}).then(res => {
-      //       let color = ['#7164FF','#288AFF','#63BDFF','#8EF0AB','#FFCE6A']
-      //       let tempArr = res.data || {}
-      //       let tempArr2 = []
-      //       for (let key in tempArr) {
-      //         let tempArr3 = []
-      //         let obj = {}
-      //         obj.orderName = tempArr[key][0].orderName
-      //         obj.id = key
-      //         obj.num = tempArr[key][0].planQuantity
-      //         let sunNum = 0
-      //         for (let i = 0; i < tempArr[key].length; i++) {
-      //           let subObj = {}
-      //           subObj.value = tempArr[key][i].actualAssignmentQuantity
-      //           subObj.name = tempArr[key][i].woName
-      //           if (i < 5) {
-      //             subObj.color = color[i]
-      //           } else {
-      //             subObj.color = color[i%5]
-      //           }
-      //           sunNum+=tempArr[key][i].actualAssignmentQuantity
-      //           tempArr3.push(subObj)
-      //         }
-      //         tempArr3.push({
-      //           value: tempArr[key][0].planQuantity - sunNum > 0 ? tempArr[key][0].planQuantity - sunNum : 0,
-      //           name: '未下发',
-      //           color: '#F5F5F5'
-      //         })
-      //         obj.sunNum = sunNum
-      //         obj.workOrder = tempArr3
-      //         tempArr2.push(obj)
-      //       }
-      //       this.chartList = tempArr2
-      //       if (this.activeName === 'barChart' && this.chartList.length > 0) {
-      //         this.$nextTick(() => {
-      //           this.$refs.monitoringRingCharts.initChart()
-      //         })
-      //       }
-      //     })
-      //   }else{
-      //     // 显示无数据的图片
-      //     this.chartList = []
-      //   }
-      // })
+        console.log(arr)
+        this.list = arr
+      })
     },
     // 查询
     buttonClick(val) {
       this.queryParams.name = val.name
       if (val.timeVal && val.timeVal.length > 0) {
-        this.queryParams.startProduceTime[0] = val.timeVal[0] + ' 00:00:00'
-        this.queryParams.startProduceTime[1] = val.timeVal[1] + ' 23:59:59'
+        this.queryParams.deliveTime[0] = val.timeVal[0] + ' 00:00:00'
+        this.queryParams.deliveTime[1] = val.timeVal[1] + ' 23:59:59'
       } else {
-        this.queryParams.startProduceTime = []
+        this.queryParams.deliveTime = []
       }
       this.getPage()
     },
@@ -379,9 +318,15 @@ export default {
       console.log(val)
       switch (val.type) {
         case 'orderDetail':
-          this.$router.push({
-            path: '/core/core-work-order-detail?woIdString='+val.data.woIdString
-          })
+          if (val.data.orderType === '集团订单') {
+            this.$router.push({// 去厂务订单详情
+              path: '/order/base/order-manage/order-detail-data?orderIdString='+ val.data.orderIds.join(',')
+            })
+          }else{
+            this.$router.push({// 去工单详情
+              path: '/core/core-work-order-detail?woIdString='+val.data.woIdString
+            })
+          }
           break
         case 'qualityDetail':
           this.$router.push({
@@ -389,9 +334,9 @@ export default {
           })
           break
         default:
-          this.$router.push({
-            path: '/delivery/delivery-log?orderId='+encodeURI(val.data.name)
-          })
+          // this.$router.push({
+          //   path: '/delivery/delivery-log?orderId='+encodeURI(val.data.name)
+          // })
         }
     },
     toggleTab() {

From 89e86c31bbaeaa98e4ea79f1ea2a3bb70c99b417 Mon Sep 17 00:00:00 2001
From: lb <liubin_9396@163.com>
Date: Fri, 23 Feb 2024 17:03:55 +0800
Subject: [PATCH 40/40] =?UTF-8?q?update=20=E5=B7=A1=E6=A3=80=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/specialEquipment/check/Config.vue   |   1 +
 .../specialEquipment/check/Record-add.vue     | 504 --------------
 .../specialEquipment/check/Record-detail.vue  | 636 ++++++++++++++++++
 src/views/specialEquipment/check/Record.vue   |  16 +-
 4 files changed, 649 insertions(+), 508 deletions(-)
 delete mode 100644 src/views/specialEquipment/check/Record-add.vue
 create mode 100644 src/views/specialEquipment/check/Record-detail.vue

diff --git a/src/views/specialEquipment/check/Config.vue b/src/views/specialEquipment/check/Config.vue
index aef4b49b..925cf71b 100644
--- a/src/views/specialEquipment/check/Config.vue
+++ b/src/views/specialEquipment/check/Config.vue
@@ -365,6 +365,7 @@ export default {
 							status: 0,
 							special: true,
 						},
+						responseType: 'blob',
 					});
 				})
 				.then((response) => {
diff --git a/src/views/specialEquipment/check/Record-add.vue b/src/views/specialEquipment/check/Record-add.vue
deleted file mode 100644
index 3da17625..00000000
--- a/src/views/specialEquipment/check/Record-add.vue
+++ /dev/null
@@ -1,504 +0,0 @@
-<!-- 
-    filename: dialogForm.vue
-    author: liubin
-    date: 2023-10-31 15:55:13
-    description: 
--->
-
-<template>
-	<el-drawer
-		ref="drawer"
-		:visible.sync="visible"
-		:show-close="false"
-		:wrapper-closable="isdetail"
-		class="drawer"
-		size="55%"
-		@closed="$emit('destroy')">
-		<small-title slot="title" :no-padding="true">
-			{{ isdetail ? '查看详情' : !dataForm.id ? '新增' : '编辑' }}
-		</small-title>
-
-		<el-form
-			ref="dataForm"
-			style="margin: 0 16px; padding: 0 16px"
-			:model="dataForm"
-			:rules="dataRule"
-			label-width="100px"
-			label-position="top"
-			v-loading="formLoading">
-			<el-row :gutter="20">
-				<el-col :span="8">
-					<el-form-item
-						label="设备大类"
-						prop="equipmentCategory"
-						:rules="[
-							{ required: true, message: '请选择设备大类', trigger: 'blur' },
-						]">
-						<el-select
-							v-model="dataForm.equipmentCategory"
-							:disabled="isdetail"
-							:placeholder="`请选择设备大类`"
-							filterable
-							@change="handleEqTypeChange">
-							<el-option
-								v-for="opt in equipmentTypeOptions"
-								:key="opt.value"
-								:label="opt.label"
-								:value="opt.value" />
-						</el-select>
-					</el-form-item>
-				</el-col>
-
-				<el-col :span="8">
-					<el-form-item
-						label="设备名称"
-						prop="equipmentId"
-						:rules="[
-							{ required: true, message: '设备不能为空', trigger: 'blur' },
-						]">
-						<el-select
-							v-model="dataForm.equipmentId"
-							filterable
-							clearable
-							:disabled="isdetail"
-							style="width: 100%"
-							placeholder="请选择设备名称"
-							@change="setConfig">
-							<el-option
-								v-for="dict in equipmentOptions"
-								:key="dict.value"
-								:label="dict.label"
-								:value="dict.value" />
-						</el-select>
-					</el-form-item>
-				</el-col>
-				<el-col :span="8">
-					<!-- <el-form-item label="物料名称" prop="name">
-						<el-input v-model="dataForm.name" :disabled="isdetail" clearable placeholder="请输入物料名称" />
-					</el-form-item> -->
-					<el-form-item
-						label="巡检配置名称"
-						prop="configId"
-						:rules="[
-							{ required: true, message: '巡检配置不能为空', trigger: 'blur' },
-						]">
-						<el-select
-							v-model="dataForm.configId"
-							filterable
-							clearable
-							:disabled="isdetail"
-							style="width: 100%"
-							placeholder="请选择巡检配置"
-							@change="setInspectionContet">
-							<el-option
-								v-for="dict in configList"
-								:key="dict.id"
-								:label="dict.name"
-								:value="dict.id" />
-						</el-select>
-					</el-form-item>
-				</el-col>
-				<el-col :span="8">
-					<el-form-item label="设备编码" prop="equipmentCode">
-						<el-input
-							v-model="dataForm.equipmentCode"
-							disabled
-							clearable
-							placeholder="请输入设备编码" />
-					</el-form-item>
-				</el-col>
-
-				<el-col :span="8">
-					<el-form-item label="巡检人" prop="responsible">
-						<el-input
-							v-model="dataForm.responsible"
-							:disabled="isdetail"
-							clearable
-							placeholder="请输入巡检人" />
-					</el-form-item>
-				</el-col>
-				<el-col :span="8">
-					<el-form-item label="巡检时间" prop="actualTime">
-						<el-date-picker
-							v-model="dataForm.actualTime"
-							type="datetime"
-							:disabled="isdetail"
-							format="yyyy-MM-dd HH:mm:ss"
-							value-format="timestamp"
-							placeholder="选择巡检时间" />
-					</el-form-item>
-				</el-col>
-				<el-col :span="8">
-					<el-form-item label="数据来源" prop="origin">
-						<el-select
-							v-model="dataForm.origin"
-							filterable
-							clearable
-							:disabled="isdetail"
-							style="width: 100%"
-							placeholder="请选择数据来源">
-							<el-option key="1" label="手动" :value="1" />
-							<el-option key="2" label="PDA" :value="2" />
-						</el-select>
-					</el-form-item>
-				</el-col>
-			</el-row>
-
-			<el-form-item label="巡检内容">
-				<base-table
-					:table-props="tableProps"
-					:page="listQuery.pageNo"
-					:limit="listQuery.pageSize"
-					:table-data="list" />
-			</el-form-item>
-			<el-form-item label="巡检详情" prop="description">
-				<editor
-					v-if="!isdetail"
-					v-model="dataForm.description"
-					:min-height="150" />
-				<div
-					v-else
-					v-html="dataForm.description"
-					style="padding: 5px; margin-left: 5px; border: 1px solid #dfdfdf" />
-			</el-form-item>
-			<el-form-item label="附件">
-				<FileUpload
-					v-model="file"
-					:limit="1"
-					:f-name="fileName"
-					:disabled="isdetail"
-					@name="setFileName" />
-			</el-form-item>
-		</el-form>
-
-		<div v-if="!isdetail" class="drawer-body__footer">
-			<el-button @click="goback()">取消</el-button>
-			<el-button type="primary" @click="dataFormSubmit()">确定</el-button>
-		</div>
-	</el-drawer>
-</template>
-
-<script>
-import SmallTitle from './SmallTitle.vue';
-import {
-	createCheckLog,
-	updateCheckLog,
-	getcheckConfigByEqList,
-	getEqCheckLog,
-} from '@/api/equipment/base/inspection/record';
-import { getEquipmentAll } from '@/api/base/equipment';
-import Editor from '@/components/Editor';
-import { getCheckDetPage } from '@/api/equipment/base/inspection/settings';
-// import FileUpload from "@/components/FileUpload";
-// import { parseTime } from '../../../../core/mixins/code-filter';
-// import attrAdd from './attr-add';
-import FileUpload from '@/components/FileUpload';
-
-const tableBtn = [
-	{
-		type: 'delete',
-		btnName: '删除',
-	},
-];
-
-const tableProps = [
-	{
-		prop: 'program',
-		label: '巡检项目',
-	},
-	{
-		prop: 'content',
-		label: '巡检内容',
-	},
-];
-
-export default {
-	name: 'AddRecord',
-	model: {
-		prop: 'dataForm',
-		event: 'update',
-	},
-	emits: ['update'],
-	components: { SmallTitle, Editor, FileUpload },
-	props: {
-		// dataForm: {
-		// 	type: Object,
-		// 	default: () => ({}),
-		// },
-		// disabled: {
-		// 	type: Boolean,
-		// 	default: false
-		// },
-	},
-	data() {
-		return {
-			tableBtn,
-			tableProps,
-			addOrUpdateVisible: false,
-			formLoading: true,
-			visible: false,
-			isdetail: false,
-			dataForm: {
-				id: undefined,
-				configId: undefined,
-				equipmentId: undefined,
-				actualTime: undefined,
-				responsible: undefined,
-				description: undefined,
-				equipmentCode: undefined,
-				equipmentCategory: undefined,
-				origin: 1,
-				files: [],
-			},
-			equipmentTypeOptions: [
-				{ label: '安全设备', value: 1 },
-				{ label: '消防设备', value: 2 },
-				{ label: '特种设备', value: 3 },
-			],
-			list: [],
-			eqList: [],
-			configList: [],
-			listQuery: {
-				pageSize: 10,
-				pageNo: 1,
-				total: 0,
-			},
-			file: '',
-			fileName: '',
-			dataRule: {
-				responsible: [
-					{ required: true, message: '巡检人不能为空', trigger: 'blur' },
-				],
-				actualTime: [
-					{ required: true, message: '巡检时间不能为空', trigger: 'blur' },
-				],
-			},
-		};
-	},
-	mounted() {
-		this.getDict();
-	},
-	methods: {
-		setFileName(val) {
-			this.fileName = val;
-		},
-		async getDict() {
-			const res = await getEquipmentAll();
-			this.eqList = res.data;
-			this.handleEqTypeChange();
-
-			const configres = await getcheckConfigByEqList();
-			this.configList = configres.data;
-		},
-		async setConfig() {
-			const configres = await getcheckConfigByEqList({
-				equipmentId: this.dataForm.equipmentId,
-			});
-			this.configList = configres.data;
-			this.dataForm.configId =
-				this.configList.filter((it) => {
-					return it.id === this.dataForm.configId;
-				})[0]?.id ?? undefined;
-			this.dataForm.equipmentCode =
-				this.eqList.filter((item) => {
-					return item.id === this.dataForm.equipmentId;
-				})[0]?.code ?? undefined;
-		},
-		goback() {
-			this.$emit('refreshDataList');
-			this.visible = false;
-		},
-		goEdit() {
-			this.isdetail = false;
-		},
-		/** 模拟透传 ref  */
-		validate(cb) {
-			return this.$refs.dataForm.validate(cb);
-		},
-		resetFields(args) {
-			return this.$refs.dataForm.resetFields(args);
-		},
-		initData() {
-			this.list = [];
-			this.file = '';
-			this.fileName = '';
-		},
-		init(id, isdetail) {
-			this.initData();
-			this.isdetail = isdetail || false;
-			this.dataForm.id = id || undefined;
-			this.visible = true;
-
-			// const scrollContainer = this.$refs.dataForm;
-			// const scrollPosition = scrollContainer.scrollTop;
-			// console.log('12', scrollPosition);
-
-			this.$nextTick(() => {
-				this.$refs['dataForm'].resetFields();
-
-				if (this.dataForm.id) {
-					// 获取巡检记录
-					getEqCheckLog(this.dataForm.id).then((response) => {
-						this.formLoading = false;
-						this.dataForm = response.data;
-						if (this.dataForm.files.length > 0) {
-							this.file = this.dataForm.files[0].fileUrl;
-							this.fileName = this.dataForm.files[0].fileName;
-						}
-						this.dataForm.description = this.dataForm.description || '无';
-						this.setConfig();
-						this.setInspectionContet();
-					});
-				} else {
-					// if (this.urlOptions.isGetCode) {
-					//   this.getCode()
-					// }
-				}
-			});
-			this.formLoading = false;
-		},
-		setInspectionContet() {
-			// 根据巡检配置名称获得巡检配置详细对应巡检内容
-			getCheckDetPage({
-				pageNo: 1,
-				pageSize: 99,
-				configId: this.dataForm.configId,
-			}).then((response) => {
-				this.list = response.data.list;
-				this.listQuery.total = response.data.total;
-			});
-		},
-		// 新增 / 修改
-		addNew(id) {
-			this.addOrUpdateVisible = true;
-			this.$nextTick(() => {
-				this.$refs.addOrUpdate.init(id);
-			});
-		},
-		handleEqTypeChange(type) {
-			this.dataForm.equipmentId = null;
-			this.dataForm.equipmentCode = null;
-			if (type) {
-				this.equipmentOptions = this.eqList
-					.filter((item) => item.special)
-					.filter((item) => item.specialType === type)
-					.map((item) => ({ label: item.name, value: item.id }));
-			} else
-				this.equipmentOptions = this.eqList
-					// .filter((item) => item.special)
-					.map((item) => ({
-						label: item.name,
-						value: item.id,
-					}));
-			// this.$emit('update', this.form)
-		},
-		// 表单提交
-		dataFormSubmit() {
-			this.$refs['dataForm'].validate((valid) => {
-				if (!valid) {
-					return false;
-				}
-				if (this.file) {
-					const temp = this.file.split(','); // 获取文件个数
-					let arry = [];
-					temp.forEach((item, index) => {
-						arry.push({
-							fileName: this.fileName,
-							fileType: 2,
-							fileUrl: item,
-						});
-					});
-					this.dataForm.files = arry;
-				} else {
-					this.dataForm.files = [];
-				}
-
-				// 修改的提交
-				if (this.dataForm.id) {
-					updateCheckLog(this.dataForm).then((response) => {
-						this.$modal.msgSuccess('修改成功');
-						this.visible = false;
-						this.$emit('refreshDataList');
-					});
-					return;
-				}
-				// 添加的提交
-				createCheckLog(this.dataForm).then((response) => {
-					this.$modal.msgSuccess('新增成功');
-					this.visible = false;
-					this.$emit('refreshDataList');
-				});
-			});
-		},
-	},
-};
-</script>
-
-<style scoped>
-.el-date-editor,
-.el-select {
-	width: 100%;
-}
-.drawer-body__footer {
-	display: flex;
-	justify-content: flex-end;
-	padding: 18px;
-}
-.action_btn {
-	float: right;
-	margin: 5px 15px;
-	font-size: 14px;
-}
-.add {
-	color: #0b58ff;
-}
-.drawer >>> .el-drawer {
-	border-radius: 8px 0 0 8px;
-	display: flex;
-	flex-direction: column;
-}
-
-.drawer >>> .el-form-item__label {
-	padding: 0;
-}
-
-.drawer >>> .el-drawer__header {
-	margin: 0;
-	padding: 32px 32px 24px;
-	border-bottom: 1px solid #dcdfe6;
-}
-.drawer >>> .el-drawer__body {
-	flex: 1;
-	height: 1px;
-	margin: 10px 0;
-	display: flex;
-	flex-direction: column;
-}
-
-.drawer >>> .content {
-	padding: 30px 24px;
-	flex: 1;
-	display: flex;
-	flex-direction: column;
-	/* height: 100%; */
-}
-
-.drawer >>> .visual-part {
-	flex: 1 auto;
-	max-height: 76vh;
-	overflow: hidden;
-	overflow-y: scroll;
-	padding-right: 10px; /* 调整滚动条样式 */
-}
-
-.drawer >>> .el-form,
-.drawer >>> .attr-list {
-	padding: 0 16px;
-}
-
-.drawer-body__footer {
-	display: flex;
-	justify-content: flex-end;
-	padding: 18px;
-}
-</style>
diff --git a/src/views/specialEquipment/check/Record-detail.vue b/src/views/specialEquipment/check/Record-detail.vue
new file mode 100644
index 00000000..833cc738
--- /dev/null
+++ b/src/views/specialEquipment/check/Record-detail.vue
@@ -0,0 +1,636 @@
+<!-- 
+    filename: Record-detail.vue
+    author: liubin
+    date: 2024-2-24 11:38:56
+    description: 
+-->
+
+<template>
+	<el-drawer
+		:visible="visible"
+		:show-close="false"
+		:wrapper-closable="false"
+		class="drawer"
+		custom-class="mes-drawer"
+		size="60%"
+		@closed="$emit('destroy')">
+		<SmallTitle slot="title">查看详情</SmallTitle>
+
+		<div class="drawer-body flex">
+			<div class="drawer-body__content">
+				<div class="form-part" style="margin-bottom: 32px">
+					<!-- <el-skeleton v-if="!showForm" animated /> -->
+					<el-form
+						class="equipment-info-form"
+						ref="form"
+						:model="form"
+						label-width="200px"
+						label-position="top"
+						v-loading="formLoading">
+						<el-row :gutter="20">
+							<el-col :span="8">
+								<el-form-item label="巡检单名称" prop="name">
+									{{ form.name }}
+								</el-form-item>
+							</el-col>
+
+							<el-col :span="8">
+								<el-form-item label="部门" prop="department">
+									{{ form.department }}
+								</el-form-item>
+							</el-col>
+
+							<el-col :span="8">
+								<el-form-item label="班次" prop="groupClass">
+									{{ form.groupClass }}
+								</el-form-item>
+							</el-col>
+
+							<el-col :span="8">
+								<el-form-item label="巡检人" prop="checkPerson">
+									{{ form.checkPerson }}
+								</el-form-item>
+							</el-col>
+
+							<el-col :span="8">
+								<el-form-item label="巡检时间" prop="planCheckTime">
+									{{ form.planCheckTime | parseTime }}
+								</el-form-item>
+							</el-col>
+
+							<el-col :span="8">
+								<el-form-item label="确认人" prop="confirmPerson">
+									{{ form.confirmPerson }}
+								</el-form-item>
+							</el-col>
+						</el-row>
+					</el-form>
+				</div>
+
+				<SmallTitle>巡检内容</SmallTitle>
+
+				<div style="margin-top: 12px; position: relative">
+					<!-- <SearchBar
+						:formConfigs="searchBarFormConfig"
+						ref="attr-search-bar"
+						@headBtnClick="handleSearchBarBtnClick" /> -->
+				</div>
+
+				<div style="margin-top: 12px; position: relative">
+					<div
+						v-if="!disableEdit"
+						style="position: absolute; top: -40px; right: 0">
+						<el-button @click="handleAddAttr" type="text">
+							<i class="el-icon-plus"></i>
+							添加内容
+						</el-button>
+					</div>
+					<base-table
+						v-loading="attrListLoading"
+						:table-props="attrTableProps"
+						:page="attrQuery?.params.pageNo || 1"
+						:limit="attrQuery?.params.pageSize || 10"
+						:table-data="attrList"
+						@emitFun="handleEmitFun">
+						<method-btn
+							slot="handleBtn"
+							label="操作"
+							v-if="!disableEdit"
+							:method-list="tableBtn"
+							@clickBtn="handleTableBtnClick" />
+					</base-table>
+
+					<!-- 分页组件 -->
+					<pagination
+						v-show="attrTotal > 0"
+						:total="attrTotal"
+						:page.sync="attrQuery.params.pageNo"
+						:limit.sync="attrQuery.params.pageSize"
+						@pagination="getAttrList" />
+				</div>
+			</div>
+
+			<div class="drawer-body__footer">
+				<el-button style="" @click="handleCancel">
+					{{ disableEdit ? '返回' : '取消' }}
+				</el-button>
+				<el-button
+					v-if="!disableEdit"
+					type="primary"
+					:loading="btnLoading"
+					@click="handleConfirm">
+					保存
+				</el-button>
+			</div>
+		</div>
+
+		<!-- 属性对话框 -->
+		<base-dialog
+			:dialogTitle="attrTitle"
+			:dialogVisible="attrFormVisible"
+			width="35%"
+			:append-to-body="true"
+			custom-class="baseDialog"
+			@close="closeAttrForm"
+			@cancel="closeAttrForm"
+			@confirm="submitAttrForm">
+			<DialogForm
+				v-if="attrFormVisible"
+				ref="attrForm"
+				v-model="attrForm"
+				:rows="attrRows" />
+		</base-dialog>
+	</el-drawer>
+</template>
+
+<script>
+import { parseTime } from '../../core/mixins/code-filter';
+import DialogForm from '../../../components/DialogForm/index.vue';
+
+const SmallTitle = {
+	name: 'SmallTitle',
+	props: ['size'],
+	components: {},
+	data() {
+		return {};
+	},
+	methods: {},
+	render: function (h) {
+		return h(
+			'span',
+			{
+				class: 'small-title',
+				style: {
+					fontSize: '18px',
+					lineHeight:
+						this.size == 'lg' ? '24px' : this.size == 'sm' ? '18px' : '20px',
+					fontWeight: 500,
+					fontFamily: '微软雅黑, Microsoft YaHei, Arial, Helvetica, sans-serif',
+				},
+			},
+			this.$slots.default
+		);
+	},
+};
+
+export default {
+	components: { SmallTitle, DialogForm },
+	props: ['dataId'], // dataId 作为一个通用的存放id的字段
+	filters: { parseTime },
+	data() {
+		return {
+			visible: false,
+			btnLoading: false,
+			form: {},
+			formLoading: false,
+			departmentList: [],
+			inspectorOptions: [],
+			attrTableProps: [
+				{
+					prop: 'equipmentName',
+					label: '设备名称',
+				},
+				{
+					prop: 'program',
+					label: '巡检项目',
+				},
+				{
+					prop: 'checkResult',
+					label: '巡检结果',
+				},
+			],
+			attrList: [],
+			attrTotal: 0,
+			attrTitle: '',
+			attrForm: {
+				id: null,
+				orderId: null,
+				program: null,
+				checkResult: null,
+				equipmentId: null,
+			},
+			attrFormVisible: false,
+			attrRows: [
+				[
+					{
+						select: true,
+						label: '设备名称',
+						prop: 'equipmentId',
+						url: '/base/core-equipment/page?pageNo=1&pageSize=100&special=true',
+						rules: [
+							{ required: true, message: '设备不能为空', trigger: 'blur' },
+						],
+					},
+				],
+				[
+					{
+						input: true,
+						label: '巡检项目',
+						prop: 'program',
+						rules: [
+							{ required: true, message: '巡检项目不能为空', trigger: 'blur' },
+						],
+					},
+				],
+				[
+					{
+						input: true,
+						label: '巡检结果',
+						prop: 'checkResult',
+						rules: [
+							{ required: true, message: '巡检结果不能为空', trigger: 'blur' },
+						],
+					},
+				],
+			],
+			attrQuery: {
+				params: {
+					pageNo: 1,
+					pageSize: 10,
+					equipmentName: null,
+				},
+			}, // 属性列表的请求
+			searchBarFormConfig: [
+				{
+					type: 'input',
+					label: '设备',
+					placeholder: '请输入设备名称',
+					param: 'equipmentName',
+				},
+				{
+					type: 'button',
+					btnName: '查询',
+					name: 'search',
+					color: 'primary',
+				},
+			],
+			attrFormSubmitting: false,
+			attrListLoading: false,
+			// syncFileListFlag: null,
+			tableBtn: [
+				{
+					type: 'edit',
+					btnName: '编辑',
+				},
+				{
+					type: 'delete',
+					btnName: '删除',
+				},
+			],
+			row: null,
+			groupOptions: [],
+			disableEdit: false,
+		};
+	},
+	computed: {
+		departmentOptions() {
+			return (this.departmentList || []).map((item) => ({
+				id: item.id,
+				label: item.name,
+				value: item.id,
+			}));
+		},
+	},
+	mounted() {
+		// this.formLoading = true;
+		// this.getList('department');
+		// this.getList('groupClass');
+		// this.getList('inspector');
+	},
+	methods: {
+		handleSearchBarBtnClick(btn) {
+			switch (btn.btnName) {
+				case 'search':
+					this.attrQuery.params.equipmentName = btn.equipmentName;
+					this.getAttrList();
+					break;
+			}
+		},
+		handleTableBtnClick({ type, data }) {
+			switch (type) {
+				case 'edit':
+					this.handleEditAttr(data.id);
+					break;
+				case 'delete':
+					this.handleDeleteAttr(data.id);
+					break;
+			}
+		},
+		async handleConfirm() {
+			this.btnLoading = true;
+			this.$nextTick(async () => {
+				const { code, data } = await this.$axios({
+					url: '/base/equipment-check-order/update',
+					method: 'put',
+					data: {
+						...this.form,
+						groupClass: this.form.groupClass.join(','),
+						checkPerson: this.form.checkPerson.join(','),
+					},
+				});
+				if (code == 0) {
+					this.$modal.msgSuccess('更新成功');
+				}
+				this.btnLoading = false;
+				this.$emit('refreshDataList');
+				this.handleCancel();
+			});
+		},
+
+		handleEmitFun(val) {
+			console.log('handleEmitFun', val);
+		},
+
+		init(row, detail) {
+			if (detail) this.disableEdit = true;
+			this.visible = true;
+			this.row = row;
+			this.getInfo(row);
+			this.getAttrList(row);
+		},
+
+		async getInfo(row) {
+			const res = await this.$axios(
+				'/base/equipment-check-order/get?id=' + row.id
+			);
+			if (res.code == 0) {
+				this.form = res.data;
+				// this.form.groupClass = res.data.groupClass.split(',');
+				// this.form.checkPerson = res.data.checkPerson?.split(',');
+				this.formLoading = false;
+			}
+			this.formLoading = false;
+		},
+
+		async getAttrList(row, condition = {}) {
+			if (!row) row = this.row;
+			this.attrListLoading = true;
+			const res = await this.$axios({
+				url: '/base/equipment-check-order-det/page',
+				method: 'get',
+				params: {
+					...this.attrQuery.params,
+					orderId: row.id,
+					...condition,
+				},
+			});
+			if (res.code == 0) {
+				this.attrList = res.data.list;
+				this.attrTotal = res.data.total;
+			}
+			this.attrListLoading = false;
+		},
+
+		async getList(source = 'department') {
+			const urls = [
+				'/base/core-department/listAll',
+				'/base/group-classes/listAll',
+			];
+			let res;
+			switch (source) {
+				case 'department':
+					res = await this.$axios(urls[0]);
+					this.departmentList = res.data || [];
+					break;
+				case 'inspector':
+					let inspectorList = [];
+					const userlist = await this.$axios({
+						url: '/system/user/page',
+						params: { pageNo: 1, pageSize: 100 },
+					});
+					if (userlist.code == 0) {
+						inspectorList = inspectorList.concat(
+							(userlist.data?.list || []).map((item) => ({
+								label: item.username,
+								value: item.id,
+							}))
+						);
+					}
+					const workerlist = await this.$axios('/base/core-worker/listAll');
+					if (workerlist.code == 0) {
+						inspectorList = inspectorList.concat(
+							workerlist.data.map((item) => ({
+								label: item.name,
+								value: item.id,
+							}))
+						);
+					}
+					this.inspectorOptions = inspectorList;
+					break;
+				case 'groupClass':
+					res = await this.$axios(urls[1]);
+					this.groupOptions = (res.data || []).map((item) => ({
+						label: item.name,
+						value: item.id,
+					}));
+					break;
+			}
+			this.formLoading = false;
+		},
+
+		// 保存表单
+		handleSave() {
+			this.$refs.form.validate(async (valid) => {
+				if (valid) {
+					await this.$axios({
+						url: '/urlupdate', //  this.sections[0][isEdit ? 'urlUpdate' : 'urlCreate'],
+						method: 'post', // isEdit ? 'put' : 'post',
+						data: this.form,
+					});
+					this.$modal.msgSuccess(`${isEdit ? '更新' : '创建'}成功`);
+					this.visible = false;
+					this.$emit('refreshDataList');
+				}
+			});
+		},
+
+		handleCancel() {
+			this.visible = false;
+		},
+
+		resetAttrform() {
+			this.attrForm = {
+				id: null,
+				orderId: null,
+				equipmentId: null,
+				program: null,
+				checkResult: null,
+			};
+		},
+
+		// 新增属性
+		handleAddAttr() {
+			if (!this.row.id) return this.$message.error('请先选中保养记录');
+			this.resetAttrform();
+			this.attrTitle = '添加设备属性';
+			this.attrFormVisible = true;
+		},
+
+		// 编辑属性
+		async handleEditAttr(attrId) {
+			const res = await this.$axios({
+				url: '/base/equipment-check-order-det/get',
+				method: 'get',
+				params: { id: attrId },
+			});
+			if (res.code == 0) {
+				this.attrForm = res.data;
+				this.attrTitle = '编辑巡检单详情';
+				this.attrFormVisible = true;
+			}
+		},
+
+		// 删除属性
+		handleDeleteAttr(attrId) {
+			this.$confirm('确定删除该巡检内容?', '提示', {
+				confirmButtonText: '确定',
+				cancelButtonText: '取消',
+				type: 'warning',
+			})
+				.then(async () => {
+					const res = await this.$axios({
+						url: '/base/equipment-check-order-det/delete?id=' + attrId,
+						method: 'delete',
+					});
+					if (res.code == 0) {
+						this.$message({
+							message: '删除成功',
+							type: 'success',
+							duration: 1500,
+							onClose: () => {
+								this.getAttrList();
+							},
+						});
+					}
+				})
+				.catch(() => {});
+		},
+
+		// 提交属性表
+		submitAttrForm() {
+			this.$refs['attrForm'].validate(async (valid) => {
+				if (!valid) {
+					return;
+				}
+
+				try {
+					const isEdit = this.attrForm.id != null;
+					this.attrFormSubmitting = true;
+					const res = await this.$axios({
+						url: isEdit
+							? '/base/equipment-check-order-det/update'
+							: '/base/equipment-check-order-det/create',
+						method: isEdit ? 'put' : 'post',
+						data: { ...this.attrForm, orderId: this.row.id },
+					});
+
+					if (res.code == 0) {
+						this.closeAttrForm();
+						this.$message({
+							message: `${isEdit ? '更新' : '创建'}成功`,
+							type: 'success',
+							duration: 1500,
+							onClose: () => {
+								this.getAttrList();
+							},
+						});
+					}
+					this.attrFormSubmitting = false;
+				} catch (err) {
+					this.$message({
+						message: err,
+						type: 'error',
+						duration: 1500,
+					});
+					this.attrFormSubmitting = false;
+				}
+			});
+		},
+
+		closeAttrForm() {
+			this.attrFormVisible = false;
+		},
+
+		handleClick(raw) {
+			if (raw.type === 'delete') {
+				this.$confirm(
+					`确定对${
+						raw.data.name
+							? '[名称=' + raw.data.name + ']'
+							: '[序号=' + raw.data._pageIndex + ']'
+					}进行删除操作?`,
+					'提示',
+					{
+						confirmButtonText: '确定',
+						cancelButtonText: '取消',
+						type: 'warning',
+					}
+				)
+					.then(() => {
+						deleteProductAttr(raw.data.id).then(({ data }) => {
+							this.$message({
+								message: '操作成功',
+								type: 'success',
+								duration: 1500,
+								onClose: () => {
+									this.getList();
+								},
+							});
+						});
+					})
+					.catch(() => {});
+			} else {
+				this.addNew(raw.data.id);
+			}
+		},
+	},
+};
+</script>
+
+<style scoped>
+.drawer >>> .el-drawer {
+	border-radius: 8px 0 0 8px;
+}
+
+.drawer >>> .el-date-editor,
+.drawer >>> .el-select {
+	width: 100%;
+}
+
+.drawer >>> .el-drawer__header {
+	margin: 0;
+	padding: 32px 32px 24px;
+	border-bottom: 1px solid #dcdfe6;
+	margin-bottom: 0px;
+}
+
+.small-title::before {
+	content: '';
+	display: inline-block;
+	vertical-align: top;
+	width: 4px;
+	height: 22px;
+	border-radius: 1px;
+	margin-right: 8px;
+	background-color: #0b58ff;
+}
+
+.drawer-body {
+	display: flex;
+	flex-direction: column;
+	height: 100%;
+}
+
+.drawer-body__content {
+	flex: 1;
+	/* background: #eee; */
+	padding: 20px 30px;
+	overflow-y: auto;
+}
+
+.drawer-body__footer {
+	display: flex;
+	justify-content: flex-end;
+	padding: 18px;
+}
+</style>
diff --git a/src/views/specialEquipment/check/Record.vue b/src/views/specialEquipment/check/Record.vue
index 54ed0c51..aa32bf39 100644
--- a/src/views/specialEquipment/check/Record.vue
+++ b/src/views/specialEquipment/check/Record.vue
@@ -36,19 +36,27 @@
 			:page.sync="queryParams.pageNo"
 			:limit.sync="queryParams.pageSize"
 			@pagination="getList" />
+
+		<RecordDetail
+			ref="record-detail"
+			v-if="detailOpen"
+			@refreshDataList="getList"
+			@destroy="detailOpen = false" />
 	</div>
 </template>
 
 <script>
 import basicPageMixin from '@/mixins/lb/basicPageMixin';
 import { parseTime } from '../../core/mixins/code-filter';
+import RecordDetail from './Record-detail.vue';
 
 export default {
 	name: 'SpecialEquipmentCheckRecord',
-	components: {},
+	components: { RecordDetail },
 	mixins: [basicPageMixin],
 	data() {
 		return {
+			detailOpen: false,
 			addOrUpdateVisible: false,
 			searchBarKeys: ['name', 'actualCheckTime'],
 			tableBtn: [
@@ -213,10 +221,10 @@ export default {
 			this.getList();
 		},
 
-		handleDetail({ id }) {
-			this.addOrUpdateVisible = true;
+		handleDetail(row) {
+			this.detailOpen = true;
 			this.$nextTick(() => {
-				this.$refs.addOrUpdate.init(id, true);
+				this.$refs['record-detail'].init(row, true);
 			});
 		},