src/views/base/coreWorkOrder/detail.vue

@@ -201,7 +201,7 @@
 					@pagination="getList" /> -->
 			</div>
 
-			<div v-if="$auth.hasPermiAnd(['base:material-product-bom-det:query', 'extend:process-flow:query'])">
+			<div v-if="this.$auth.hasPermiAnd(['base:material-product-bom-det:query', 'extend:process-flow:query'])">
 				<div class="card" style="padding-bottom: 16px;">
 					<div class="boxTitle">
 						<span class="blueTitle"></span>

src/views/base/materialProductBom/add-or-updata.vue

@@ -56,14 +56,14 @@
 					</el-row>
 				</el-form>
 			</div>
-			<div class="attr-list" v-if="idAttrShow && $auth.hasPermiAnd(['base:material-product-bom:query', 'base:material-product-bom-det:query'])">
+			<div class="attr-list" v-if="idAttrShow && this.$auth.hasPermiAnd(['base:material-product-bom:query', 'base:material-product-bom-det:query'])">
 				<small-title
 					style="margin: 16px 0; padding-left: 8px"
 					:no-padding="true">
 					BOM明细
 				</small-title>
 
-				<div v-if="!isdetail && $auth.hasPermi('base:material-product-bom:create')" class="action_btn">
+				<div v-if="!isdetail && this.$auth.hasPermi('base:material-product-bom:create')" class="action_btn">
           <template>
             <span style="display: inline-block;">
               <el-button type="text" @click="addNew()" icon="el-icon-plus">添加</el-button>

src/views/energy/monitoring/energyStatistics/index.vue

@@ -103,7 +103,6 @@ export default {
 					name: 'search',
 					color: 'primary',
 				},
-
 				{
 					type: this.$auth.hasPermi('monitoring:energy-statistics:create')
 						? 'separate'

src/views/specialEquipment/basic/FireFighthing.vue

@@ -91,13 +91,13 @@
 						pageSize: 10,
 					},
 					tableBtn: [
-						this.$auth.hasPermi('base:core-equipment-attr:update')
+						this.$auth.hasPermi('base:core-equipment-attr:update') // ('se:firefight-attr:update') // TODO 此处需用firefight-attr权限还是core-equipment-attr 权限？
 							? {
 									type: 'edit',
 									btnName: '修改',
 							  }
 							: undefined,
-						this.$auth.hasPermi('base:core-equipment-attr:delete')
+						this.$auth.hasPermi('base:core-equipment-attr:delete') // ('se:firefight-attr:delete')
 							? {
 									type: 'delete',
 									btnName: '删除',
@@ -142,29 +142,19 @@ export default {
 		return {
 			searchBarKeys: ['name', 'code'],
 			tableBtn: [
-				this.$auth.hasPermiAnd([
+				this.$auth.hasPermi(`se:firefight:update`)
-					'base:core-equipment:query',
-					'base:core-equipment-attr:query',
-				])
 					? {
 							type: 'detail',
 							btnName: '详情',
 					  }
 					: undefined,
-				this.$auth.hasPermiAnd([
+				this.$auth.hasPermi('se:firefight:update')
-					'base:core-equipment:update',
-					'base:core-worker:query',
-					'base:core-equipment:query',
-					'base:core-equipment-attr:create',
-					'base:core-equipment-attr:query',
-					'base:core-equipment-attr:delete',
-				])
 					? {
 							type: 'edit',
 							btnName: '修改',
 					  }
 					: undefined,
-				this.$auth.hasPermi('base:core-equipment:delete')
+				this.$auth.hasPermi('se:firefight:delete')
 					? {
 							type: 'delete',
 							btnName: '删除',
@@ -215,32 +205,17 @@ export default {
 					color: 'primary',
 				},
 				{
-					type:
+					type: 'separate',
-						this.$auth.hasPermi('base:core-equipment:export') ||
-						this.$auth.hasPermiAnd([
-							'base:core-equipment:create',
-							'base:core-worker:query',
-						])
-							? 'separate'
-							: '',
 				},
 				{
-					type: this.$auth.hasPermi('base:core-equipment:export')
+					type: this.$auth.hasPermi('se:firefight:export') ? 'button' : '',
-						? 'button'
-						: '',
 					btnName: '导出',
 					name: 'export',
 					plain: true,
 					color: 'primary',
 				},
-				//
 				{
-					type: this.$auth.hasPermiAnd([
+					type: this.$auth.hasPermi('se:firefight:create') ? 'button' : '',
-						'base:core-equipment:create',
-						'base:core-worker:query',
-					])
-						? 'button'
-						: '',
 					btnName: '新增',
 					name: 'add',
 					plain: true,

src/views/specialEquipment/basic/Manage.vue

@@ -142,29 +142,19 @@ export default {
 		return {
 			searchBarKeys: ['name', 'code'],
 			tableBtn: [
-				this.$auth.hasPermiAnd([
+				this.$auth.hasPermi(`se:manage:update`)
-					'base:core-equipment:query',
-					'base:core-equipment-attr:query',
-				])
 					? {
 							type: 'detail',
 							btnName: '详情',
 					  }
 					: undefined,
-				this.$auth.hasPermiAnd([
+				this.$auth.hasPermi('se:manage:update')
-					'base:core-equipment:update',
-					'base:core-worker:query',
-					'base:core-equipment:query',
-					'base:core-equipment-attr:create',
-					'base:core-equipment-attr:query',
-					'base:core-equipment-attr:delete',
-				])
 					? {
 							type: 'edit',
 							btnName: '修改',
 					  }
 					: undefined,
-				this.$auth.hasPermi('base:core-equipment:delete')
+				this.$auth.hasPermi('se:manage:delete')
 					? {
 							type: 'delete',
 							btnName: '删除',
@@ -214,17 +204,10 @@ export default {
 					color: 'primary',
 				},
 				{
-					type:
+					type: 'separate',
-						this.$auth.hasPermi('base:core-equipment:export') ||
-						this.$auth.hasPermiAnd([
-							'base:core-equipment:create',
-							'base:core-worker:query',
-						])
-							? 'separate'
-							: '',
 				},
 				{
-					type: this.$auth.hasPermi('base:core-equipment:export')
+					type: this.$auth.hasPermi('se:manage:export')
 						? 'button'
 						: '',
 					btnName: '导出',
@@ -233,10 +216,7 @@ export default {
 					color: 'primary',
 				},
 				{
-					type: this.$auth.hasPermiAnd([
+					type: this.$auth.hasPermi('se:manage:create')
-						'base:core-equipment:create',
-						'base:core-worker:query',
-					])
 						? 'button'
 						: '',
 					btnName: '新增',

src/views/specialEquipment/basic/Safety.vue

@@ -141,30 +141,19 @@ export default {
 		return {
 			searchBarKeys: ['name', 'code'],
 			tableBtn: [
-				this.$auth.hasPermiAnd([
+				this.$auth.hasPermi(`se:safety:update`)
-					'base:core-equipment:query',
-					'base:core-equipment-attr:query',
-				])
 					? {
 							type: 'detail',
 							btnName: '详情',
 					  }
 					: undefined,
-				//
+				this.$auth.hasPermi('se:safety:update')
-				this.$auth.hasPermiAnd([
-					'base:core-equipment:update',
-					'base:core-worker:query',
-					'base:core-equipment:query',
-					'base:core-equipment-attr:create',
-					'base:core-equipment-attr:query',
-					'base:core-equipment-attr:delete',
-				])
 					? {
 							type: 'edit',
 							btnName: '修改',
 					  }
 					: undefined,
-				this.$auth.hasPermi('base:core-equipment:delete')
+				this.$auth.hasPermi('se:safety:delete')
 					? {
 							type: 'delete',
 							btnName: '删除',
@@ -214,17 +203,10 @@ export default {
 					color: 'primary',
 				},
 				{
-					type:
+					type: 'separate',
-						this.$auth.hasPermi('base:core-equipment:export') ||
-						this.$auth.hasPermiAnd([
-							'base:core-equipment:create',
-							'base:core-worker:query',
-						])
-							? 'separate'
-							: '',
 				},
 				{
-					type: this.$auth.hasPermi('base:core-equipment:export')
+					type: this.$auth.hasPermi('se:safety:export')
 						? 'button'
 						: '',
 					btnName: '导出',
@@ -233,10 +215,7 @@ export default {
 					color: 'primary',
 				},
 				{
-					type: this.$auth.hasPermiAnd([
+					type: this.$auth.hasPermi('se:safety:create')
-						'base:core-equipment:create',
-						'base:core-worker:query',
-					])
 						? 'button'
 						: '',
 					btnName: '新增',

src/views/specialEquipment/check/CheckOrderListTable.vue

@@ -103,7 +103,6 @@
 			label="操作">
 			<template slot-scope="scope">
 				<el-tooltip
-					v-if="$auth.hasPermi('equipment:check:update')"
 					content="确认"
 					placement="top">
 					<el-button
@@ -115,13 +114,8 @@
 					</el-button>
 				</el-tooltip>
 				<!-- line  -->
-				<span
+				<span style="margin: 0 4px; font-size: 18px; color: #e5e7eb">|</span>
-					v-if="$auth.hasPermi('equipment:check:query')"
-					style="margin: 0 4px; font-size: 18px; color: #e5e7eb">
-					|
-				</span>
 				<el-tooltip
-					v-if="$auth.hasPermi('equipment:check:query')"
 					content="查看详情"
 					placement="top">
 					<el-button
@@ -132,35 +126,8 @@
 					</el-button>
 				</el-tooltip>
 				<!-- line  -->
-				<span
+				<span style="margin: 0 4px; font-size: 18px; color: #e5e7eb">|</span>
-					v-if="
-						$auth.hasPermiAnd([
-							'equipment:check:update',
-							'base:core-worker:query',
-							'base:group-classes:query',
-							'base:core-department:query',
-							'equipment:check:query',
-							'equipment:check:create',
-							'equipment:check:delete',
-							'base:core-equipment:query',
-						])
-					"
-					style="margin: 0 4px; font-size: 18px; color: #e5e7eb">
-					|
-				</span>
 				<el-tooltip
-					v-if="
-						$auth.hasPermiAnd([
-							'equipment:check:update',
-							'base:core-worker:query',
-							'base:group-classes:query',
-							'base:core-department:query',
-							'equipment:check:query',
-							'equipment:check:create',
-							'equipment:check:delete',
-							'base:core-equipment:query',
-						])
-					"
 					content="编辑"
 					placement="top">
 					<el-button
@@ -171,13 +138,8 @@
 					</el-button>
 				</el-tooltip>
 				<!-- line  -->
-				<span
+				<span style="margin: 0 4px; font-size: 18px; color: #e5e7eb">|</span>
-					v-if="$auth.hasPermi('equipment:check:delete')"
-					style="margin: 0 4px; font-size: 18px; color: #e5e7eb">
-					|
-				</span>
 				<el-tooltip
-					v-if="$auth.hasPermi('equipment:check:delete')"
 					content="删除"
 					placement="top">
 					<el-button

src/views/specialEquipment/check/Config.vue

@@ -26,7 +26,7 @@
 				v-if="tableBtn.length"
 				slot="handleBtn"
 				label="操作"
-				:width="128"
+				:width="180"
 				:method-list="tableBtn"
 				@clickBtn="handleTableBtnClick" />
 		</base-table>
@@ -78,29 +78,20 @@ export default {
 			addOrEditTitle: '',
 			searchBarKeys: ['name'],
 			tableBtn: [
-				this.$auth.hasPermiAnd([
+				this.$auth.hasPermi('se:check:add-item')
-					'equipment:check:create',
-					'equipment:check:query',
-					'equipment:check:update',
-					'equipment:check:delete',
-				])
 					? {
 							type: 'add',
 							btnName: '添加',
 							showTip: '添加巡检',
 					  }
 					: undefined,
-				this.$auth.hasPermiAnd([
+				this.$auth.hasPermi('se:check:update')
-					'equipment:check:update',
-					'equipment:check:query',
-					'base:core-department:query',
-				])
 					? {
 							type: 'edit',
 							btnName: '修改',
 					  }
 					: undefined,
-				this.$auth.hasPermi('equipment:check:delete')
+				this.$auth.hasPermi('se:check:delete')
 					? {
 							type: 'delete',
 							btnName: '删除',
@@ -173,20 +164,10 @@ export default {
 					color: 'primary',
 				},
 				{
-					type: this.$auth.hasPermiAnd([
+					type: 'separate',
-						'equipment:check:create',
-						'base:core-department:query',
-					])
-						? 'separate'
-						: '',
 				},
 				{
-					type: this.$auth.hasPermiAnd([
+					type: this.$auth.hasPermi('se:check:create') ? 'button' : '',
-						'equipment:check:create',
-						'base:core-department:query',
-					])
-						? 'button'
-						: '',
 					btnName: '新增',
 					name: 'add',
 					plain: true,

src/views/specialEquipment/check/Content.vue

@@ -155,25 +155,10 @@ export default {
 					color: 'primary',
 				},
 				{
-					type:
+					type: 'separate',
-						this.$auth.hasPermiAnd([
-							'equipment:check:create',
-							'base:core-worker:query',
-							'base:group-classes:query',
-							'base:core-department:query',
-						]) ||
-						this.$auth.hasPermi('equipment:check:export') ||
-						this.$auth.hasPermi('equipment:check:update')
-							? 'separate'
-							: '',
 				},
 				{
-					type: this.$auth.hasPermiAnd([
+					type: this.$auth.hasPermi('se:check-unconfirm:create')
-						'equipment:check:create',
-						'base:core-worker:query',
-						'base:group-classes:query',
-						'base:core-department:query',
-					])
 						? 'button'
 						: '',
 					btnName: '新增',
@@ -182,14 +167,18 @@ export default {
 					color: 'success',
 				},
 				{
-					type: this.$auth.hasPermi('equipment:check:export') ? 'button' : '',
+					type: this.$auth.hasPermi('se:check-unconfirm:export')
+						? 'button'
+						: '',
 					btnName: '导出',
 					name: 'export',
 					plain: true,
 					color: 'warning',
 				},
 				{
-					type: this.$auth.hasPermi('equipment:check:update') ? 'button' : '',
+					type: this.$auth.hasPermi('se:check-unconfirm:confirm-all')
+						? 'button'
+						: '',
 					btnName: '批量确认',
 					name: 'batch-confirm',
 					plain: true,

src/views/specialEquipment/check/Record.vue

@@ -71,7 +71,7 @@ export default {
 			addOrUpdateVisible: false,
 			searchBarKeys: ['name', 'actualCheckTime'],
 			tableBtn: [
-				this.$auth.hasPermi('equipment:check:query')
+				this.$auth.hasPermi('se:check-record:detail')
 					? {
 							type: 'detail',
 							btnName: '详情',
@@ -147,10 +147,10 @@ export default {
 					color: 'primary',
 				},
 				{
-					type: this.$auth.hasPermi('equipment:check:export') ? 'separate' : '',
+					type: 'separate',
 				},
 				{
-					type: this.$auth.hasPermi('equipment:check:export') ? 'button' : '',
+					type: this.$auth.hasPermi('se:check-record:export') ? 'button' : '',
 					btnName: '导出',
 					name: 'export',
 					plain: true,

src/views/specialEquipment/maintain/Monitor.vue

@@ -122,22 +122,20 @@ export default {
 					minWidth: 158,
 					showOverflowtooltip: true,
 				},
-				this.$auth.hasPermi('equipment:plan-config:query')
+				{
-					? {
 					prop: 'opt2',
 					label: '保养内容',
 					entryText: '详情',
 					subcomponent: TableBtn,
 					width: 100,
-					  }
+				},
-					: undefined,
 				{
 					prop: 'remainDays',
 					label: '距离下次保养剩余时间(天)',
 					subcomponent: RemainBox,
 					minWidth: 210,
 				},
-			].filter(v => v),
+			],
 			searchBarFormConfig: [
 				{
 					type: 'select',
@@ -153,12 +151,10 @@ export default {
 					color: 'primary',
 				},
 				{
-					type: this.$auth.hasPermi('equipment:plan-config:export')
+					type: 'separate',
-						? 'separate'
-						: '',
 				},
 				{
-					type: this.$auth.hasPermi('equipment:plan-config:export')
+					type: this.$auth.hasPermi('se:maintain-plan:export')
 						? 'button'
 						: '',
 					btnName: '导出',

src/views/specialEquipment/maintain/PlanConfig.vue

@@ -83,31 +83,19 @@ export default {
 		return {
 			searchBarKeys: ['planName'],
 			tableBtn: [
-				this.$auth.hasPermiAnd([
+				this.$auth.hasPermi('se:maintain:update')
-					'equipment:plan-config:query',
-					'equipment:plan-config:create',
-					'equipment:plan-config:update',
-					'equipment:plan-config:delete',
-					'base:core-equipment:query',
-				])
 					? {
 							type: 'addContent',
 							btnName: '添加内容',
 					  }
 					: undefined,
-				this.$auth.hasPermiAnd([
+				this.$auth.hasPermi('se:maintain:update')
-					'equipment:plan-config:update',
-					'equipment:plan-config:query',
-					'base:core-worker:query',
-					'base:core-production-line:query',
-					'base:core-department:query',
-				])
 					? {
 							type: 'edit',
 							btnName: '修改',
 					  }
 					: undefined,
-				this.$auth.hasPermi('equipment:plan-config:delete')
+				this.$auth.hasPermi('se:maintain:delete')
 					? {
 							type: 'delete',
 							btnName: '删除',
@@ -178,24 +166,10 @@ export default {
 					color: 'primary',
 				},
 				{
-					type: this.$auth.hasPermiAnd([
+					type: 'separate',
-						'equipment:plan-config:create',
-						'base:core-worker:query',
-						'base:core-production-line:query',
-						'base:core-department:query',
-					])
-						? 'separate'
-						: '',
 				},
 				{
-					type: this.$auth.hasPermiAnd([
+					type: this.$auth.hasPermi('se:maintain:create') ? 'button' : '',
-						'equipment:plan-config:create',
-						'base:core-worker:query',
-						'base:core-production-line:query',
-						'base:core-department:query',
-					])
-						? 'button'
-						: '',
 					btnName: '新增',
 					name: 'add',
 					plain: true,

src/views/specialEquipment/maintain/Record--detail.vue

@@ -212,7 +212,7 @@ export default {
 	},
 	computed: {},
 	mounted() {
-		// this.loadEquipments();
+		this.loadEquipments();
 	},
 	methods: {
 		/** 确认是否关闭 */

src/views/specialEquipment/maintain/Record.vue

@@ -100,26 +100,26 @@ export default {
 		return {
 			recordDetailVisible: false,
 			searchBarKeys: ['maintainPlanId', 'startTime', 'special'],
-			// tableBtn: [
+			tableBtn: [
-			// 	this.$auth.hasPermi('se:maintain-record:update')
+				this.$auth.hasPermi('se:maintain-record:update')
-			// 		? {
+					? {
-			// 				type: 'detail',
+							type: 'detail',
-			// 				btnName: '详情',
+							btnName: '详情',
-			// 		  }
+					  }
-			// 		: undefined,
+					: undefined,
-			// 	this.$auth.hasPermi('se:maintain-record:update')
+				this.$auth.hasPermi('se:maintain-record:update')
-			// 		? {
+					? {
-			// 				type: 'edit',
+							type: 'edit',
-			// 				btnName: '修改',
+							btnName: '修改',
-			// 		  }
+					  }
-			// 		: undefined,
+					: undefined,
-			// 	this.$auth.hasPermi('se:maintain-record:delete')
+				this.$auth.hasPermi('se:maintain-record:delete')
-			// 		? {
+					? {
-			// 				type: 'delete',
+							type: 'delete',
-			// 				btnName: '删除',
+							btnName: '删除',
-			// 		  }
+					  }
-			// 		: undefined,
+					: undefined,
-			// ].filter((v) => v),
+			].filter((v) => v),
 			tableProps: [
 				{
 					prop: 'maintainOrderNumber',
@@ -182,16 +182,14 @@ export default {
 					filter: (val) =>
 						val != null ? ['-', '计划型', '非计划型'][val] : '-',
 				},
-				this.$auth.hasPermi('equipment:maintain-record:query')
+				{
-					? {
 					prop: '_detail',
 					label: '详情',
 					entryText: '详情',
 					minWidth: 60,
 					subcomponent: TableBtn,
-					  }
+				},
-					: '',
+			],
-			].filter((v) => v),
 			searchBarFormConfig: [
 				{
 					type: 'select',
@@ -224,12 +222,10 @@ export default {
 					color: 'primary',
 				},
 				{
-					type: this.$auth.hasPermi('equipment:maintain-record:export')
+					type: 'separate',
-						? 'separate'
-						: '',
 				},
 				{
-					type: this.$auth.hasPermi('equipment:maintain-record:export')
+					type: this.$auth.hasPermi('se:maintain-record:export')
 						? 'button'
 						: '',
 					btnName: '导出',

src/views/specialEquipment/maintain/Repair.vue

@@ -88,19 +88,19 @@ export default {
 				'specialType',
 			],
 			tableBtn: [
-				this.$auth.hasPermi('equipment:repair:finish')
+				this.$auth.hasPermi('se:repair:finish')
 					? {
 							type: 'finish',
 							btnName: '完成',
 					  }
 					: undefined,
-				this.$auth.hasPermi('equipment:repair:query')
+				this.$auth.hasPermi('se:repair:update')
 					? {
 							type: 'detail',
 							btnName: '详情',
 					  }
 					: undefined,
-				this.$auth.hasPermi('equipment:repair:delete')
+				this.$auth.hasPermi('se:repair:delete')
 					? {
 							type: 'delete',
 							btnName: '删除',
@@ -212,31 +212,17 @@ export default {
 					color: 'primary',
 				},
 				{
-					type:
+					type: 'separate',
-						this.$auth.hasPermi('equipment:repair:export') ||
-						this.$auth.hasPermiAnd([
-							'equipment:repair:create',
-							'base:core-worker:query',
-							'system:user:list',
-						])
-							? 'separate'
-							: '',
 				},
 				{
-					type: this.$auth.hasPermi('equipment:repair:export') ? 'button' : '',
+					type: this.$auth.hasPermi('se:repair:export') ? 'button' : '',
 					btnName: '导出',
 					name: 'export',
 					plain: true,
 					color: 'primary',
 				},
 				{
-					type: this.$auth.hasPermiAnd([
+					type: this.$auth.hasPermi('se:repair:create') ? 'button' : '',
-						'equipment:repair:create',
-						'base:core-worker:query',
-						'system:user:list',
-					])
-						? 'button'
-						: '',
 					btnName: '新增',
 					name: 'add',
 					plain: true,

src/views/specialEquipment/maintain/WaitingList.vue

@@ -147,25 +147,10 @@ export default {
 					color: 'primary',
 				},
 				{
-					type:
+					type: 'separate',
-						this.$auth.hasPermiAnd([
-							'equipment:maintain-record:create',
-							'base:core-worker:query',
-							'base:core-production-line:query',
-							'base:core-department:query',
-						]) ||
-						this.$auth.hasPermi('equipment:maintain-record:update') ||
-						this.$auth.hasPermi('equipment:maintain-record:export')
-							? 'separate'
-							: '',
 				},
 				{
-					type: this.$auth.hasPermiAnd([
+					type: this.$auth.hasPermi('se:maintain-record-pre:create')
-						'equipment:maintain-record:create',
-						'base:core-worker:query',
-						'base:core-production-line:query',
-						'base:core-department:query',
-					])
 						? 'button'
 						: '',
 					btnName: '新增',
@@ -174,7 +159,7 @@ export default {
 					color: 'success',
 				},
 				{
-					type: this.$auth.hasPermi('equipment:maintain-record:update')
+					type: this.$auth.hasPermi('se:maintain-record-pre:confirm-all')
 						? 'button'
 						: '',
 					btnName: '批量确认',
@@ -183,7 +168,7 @@ export default {
 					plain: true,
 				},
 				{
-					type: this.$auth.hasPermi('equipment:maintain-record:export')
+					type: this.$auth.hasPermi('se:maintain-record-pre:export')
 						? 'button'
 						: '',
 					btnName: '导出',

src/views/specialEquipment/maintain/WaitingListTable.vue

@@ -144,7 +144,7 @@
 			label="操作">
 			<template slot-scope="scope">
 				<el-tooltip
-					v-if="$auth.hasPermi('equipment:maintain-record:update')"
+					v-if="$auth.hasPermi('se:maintain-record-pre:confirm')"
 					content="确认"
 					placement="top">
 					<el-button
@@ -158,11 +158,11 @@
 				<!-- line  -->
 				<span
 					style="margin: 0 4px; font-size: 18px; color: #e5e7eb"
-					v-if="$auth.hasPermi('equipment:maintain-record:query')">
+					v-if="$auth.hasPermi('se:maintain-record-pre:update')">
 					|
 				</span>
 				<el-tooltip
-					v-if="$auth.hasPermi('equipment:maintain-record:query')"
+					v-if="$auth.hasPermi('se:maintain-record-pre:update')"
 					content="查看详情"
 					placement="top">
 					<el-button
@@ -175,29 +175,11 @@
 				<!-- line  -->
 				<span
 					style="margin: 0 4px; font-size: 18px; color: #e5e7eb"
-					v-if="
+					v-if="$auth.hasPermi('se:maintain-record-pre:update')">
-						$auth.hasPermiAnd([
-							'equipment:maintain-record:update',
-							'base:core-production-line:query',
-							'base:core-department:query',
-							'equipment:maintain-record:create',
-							'equipment:maintain-record:query',
-							'equipment:maintain-record:delete',
-						])
-					">
 					|
 				</span>
 				<el-tooltip
-					v-if="
+					v-if="$auth.hasPermi('se:maintain-record-pre:update')"
-						$auth.hasPermiAnd([
-							'equipment:maintain-record:update',
-							'base:core-production-line:query',
-							'base:core-department:query',
-							'equipment:maintain-record:create',
-							'equipment:maintain-record:query',
-							'equipment:maintain-record:delete',
-						])
-					"
 					content="编辑"
 					placement="top">
 					<el-button
@@ -208,13 +190,8 @@
 					</el-button>
 				</el-tooltip>
 				<!-- line  -->
-				<span
+				<span style="margin: 0 4px; font-size: 18px; color: #e5e7eb">|</span>
-					v-if="$auth.hasPermi('equipment:maintain-record:delete')"
-					style="margin: 0 4px; font-size: 18px; color: #e5e7eb">
-					|
-				</span>
 				<el-tooltip
-					v-if="$auth.hasPermi('equipment:maintain-record:delete')"
 					content="删除"
 					placement="top">
 					<el-button