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,

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.http('/base/core-equipment/listAll', 'get').then(({ data }) => {
+			// 	this.allSpecialEquipments = data.filter((item) => item.special);
-				this.allSpecialEquipments = data.filter((item) => item.special);
+			// 	this.setSearchBarEquipmentList(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;

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

src/views/specialEquipment/maintain/WaitingListTable.vue

@@ -7,8 +7,8 @@
 
 <template>
 	<el-table
-		:data="tableData"
+		:data="tableDataWithIndex"
-		:border="false"
+		: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>