update 设备维修

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 style="" @click="cancel">返回</el-button>
-			<el-button v-if="mode == 'detail'" type="primary" @click="toggleEdit">
+			<!-- <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,

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 style="" @click="cancel">返回</el-button>
-			<el-button v-if="mode == 'detail'" type="primary" @click="toggleEdit">
+			<!-- <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,

src/views/specialEquipment/maintain/Repair.vue

@@ -110,72 +110,101 @@ export default {
 					: undefined,
 			].filter((v) => v),
 			tableProps: [
-				{
+				// {
-					prop: 'createTime',
+				// 	prop: 'createTime',
-					label: '添加时间',
+				// 	label: '添加时间',
-					fixed: true,
+				// 	fixed: true,
-					width: 150,
+				// 	width: 150,
-					filter: parseTime,
+				// 	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',
+					prop: 'maintenanceResult',
-					label: '维修状态',
+					label: '维修结果',
-					filter: (v) => (v != null ? ['未完成', '完成', '进行中'][v] : ''),
+					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: '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: [
 				{