+
添加
diff --git a/src/views/energy/monitoring/energyStatistics/index.vue b/src/views/energy/monitoring/energyStatistics/index.vue
index f1815c66..be2a990c 100644
--- a/src/views/energy/monitoring/energyStatistics/index.vue
+++ b/src/views/energy/monitoring/energyStatistics/index.vue
@@ -103,6 +103,7 @@ export default {
name: 'search',
color: 'primary',
},
+
{
type: this.$auth.hasPermi('monitoring:energy-statistics:create')
? 'separate'
diff --git a/src/views/specialEquipment/basic/FireFighthing.vue b/src/views/specialEquipment/basic/FireFighthing.vue
index fdee29af..f2dd2080 100644
--- a/src/views/specialEquipment/basic/FireFighthing.vue
+++ b/src/views/specialEquipment/basic/FireFighthing.vue
@@ -91,13 +91,13 @@
pageSize: 10,
},
tableBtn: [
- this.$auth.hasPermi('base:core-equipment-attr:update') // ('se:firefight-attr:update') // TODO 此处需用firefight-attr权限还是core-equipment-attr 权限?
+ this.$auth.hasPermi('base:core-equipment-attr:update')
? {
type: 'edit',
btnName: '修改',
}
: undefined,
- this.$auth.hasPermi('base:core-equipment-attr:delete') // ('se:firefight-attr:delete')
+ this.$auth.hasPermi('base:core-equipment-attr:delete')
? {
type: 'delete',
btnName: '删除',
@@ -142,19 +142,29 @@ export default {
return {
searchBarKeys: ['name', 'code'],
tableBtn: [
- this.$auth.hasPermi(`se:firefight:update`)
+ this.$auth.hasPermiAnd([
+ 'base:core-equipment:query',
+ 'base:core-equipment-attr:query',
+ ])
? {
type: 'detail',
btnName: '详情',
}
: undefined,
- this.$auth.hasPermi('se:firefight: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('se:firefight:delete')
+ this.$auth.hasPermi('base:core-equipment:delete')
? {
type: 'delete',
btnName: '删除',
@@ -205,17 +215,32 @@ export default {
color: 'primary',
},
{
- type: 'separate',
+ type:
+ this.$auth.hasPermi('base:core-equipment:export') ||
+ this.$auth.hasPermiAnd([
+ 'base:core-equipment:create',
+ 'base:core-worker:query',
+ ])
+ ? 'separate'
+ : '',
},
{
- type: this.$auth.hasPermi('se:firefight:export') ? 'button' : '',
+ type: this.$auth.hasPermi('base:core-equipment:export')
+ ? 'button'
+ : '',
btnName: '导出',
name: 'export',
plain: true,
color: 'primary',
},
+ //
{
- type: this.$auth.hasPermi('se:firefight:create') ? 'button' : '',
+ type: this.$auth.hasPermiAnd([
+ 'base:core-equipment:create',
+ 'base:core-worker:query',
+ ])
+ ? 'button'
+ : '',
btnName: '新增',
name: 'add',
plain: true,
diff --git a/src/views/specialEquipment/basic/Manage.vue b/src/views/specialEquipment/basic/Manage.vue
index ac915a88..285030a1 100644
--- a/src/views/specialEquipment/basic/Manage.vue
+++ b/src/views/specialEquipment/basic/Manage.vue
@@ -142,19 +142,29 @@ export default {
return {
searchBarKeys: ['name', 'code'],
tableBtn: [
- this.$auth.hasPermi(`se:manage:update`)
+ this.$auth.hasPermiAnd([
+ 'base:core-equipment:query',
+ 'base:core-equipment-attr:query',
+ ])
? {
type: 'detail',
btnName: '详情',
}
: undefined,
- this.$auth.hasPermi('se:manage: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('se:manage:delete')
+ this.$auth.hasPermi('base:core-equipment:delete')
? {
type: 'delete',
btnName: '删除',
@@ -204,10 +214,17 @@ export default {
color: 'primary',
},
{
- type: 'separate',
+ type:
+ this.$auth.hasPermi('base:core-equipment:export') ||
+ this.$auth.hasPermiAnd([
+ 'base:core-equipment:create',
+ 'base:core-worker:query',
+ ])
+ ? 'separate'
+ : '',
},
{
- type: this.$auth.hasPermi('se:manage:export')
+ type: this.$auth.hasPermi('base:core-equipment:export')
? 'button'
: '',
btnName: '导出',
@@ -216,7 +233,10 @@ export default {
color: 'primary',
},
{
- type: this.$auth.hasPermi('se:manage:create')
+ type: this.$auth.hasPermiAnd([
+ 'base:core-equipment:create',
+ 'base:core-worker:query',
+ ])
? 'button'
: '',
btnName: '新增',
diff --git a/src/views/specialEquipment/basic/Safety.vue b/src/views/specialEquipment/basic/Safety.vue
index ed27cda9..acb9e634 100644
--- a/src/views/specialEquipment/basic/Safety.vue
+++ b/src/views/specialEquipment/basic/Safety.vue
@@ -141,19 +141,30 @@ export default {
return {
searchBarKeys: ['name', 'code'],
tableBtn: [
- this.$auth.hasPermi(`se:safety:update`)
+ this.$auth.hasPermiAnd([
+ '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('se:safety:delete')
+ this.$auth.hasPermi('base:core-equipment:delete')
? {
type: 'delete',
btnName: '删除',
@@ -203,10 +214,17 @@ export default {
color: 'primary',
},
{
- type: 'separate',
+ type:
+ this.$auth.hasPermi('base:core-equipment:export') ||
+ this.$auth.hasPermiAnd([
+ 'base:core-equipment:create',
+ 'base:core-worker:query',
+ ])
+ ? 'separate'
+ : '',
},
{
- type: this.$auth.hasPermi('se:safety:export')
+ type: this.$auth.hasPermi('base:core-equipment:export')
? 'button'
: '',
btnName: '导出',
@@ -215,7 +233,10 @@ export default {
color: 'primary',
},
{
- type: this.$auth.hasPermi('se:safety:create')
+ type: this.$auth.hasPermiAnd([
+ 'base:core-equipment:create',
+ 'base:core-worker:query',
+ ])
? 'button'
: '',
btnName: '新增',
diff --git a/src/views/specialEquipment/check/CheckOrderListTable.vue b/src/views/specialEquipment/check/CheckOrderListTable.vue
index c231f6d8..26e9c619 100644
--- a/src/views/specialEquipment/check/CheckOrderListTable.vue
+++ b/src/views/specialEquipment/check/CheckOrderListTable.vue
@@ -103,6 +103,7 @@
label="操作">
- |
+
+ |
+
- |
+
+ |
+
- |
+
+ |
+
@@ -78,20 +78,29 @@ export default {
addOrEditTitle: '',
searchBarKeys: ['name'],
tableBtn: [
- this.$auth.hasPermi('se:check:add-item')
+ this.$auth.hasPermiAnd([
+ 'equipment:check:create',
+ 'equipment:check:query',
+ 'equipment:check:update',
+ 'equipment:check:delete',
+ ])
? {
type: 'add',
btnName: '添加',
showTip: '添加巡检',
}
: undefined,
- this.$auth.hasPermi('se:check:update')
+ this.$auth.hasPermiAnd([
+ 'equipment:check:update',
+ 'equipment:check:query',
+ 'base:core-department:query',
+ ])
? {
type: 'edit',
btnName: '修改',
}
: undefined,
- this.$auth.hasPermi('se:check:delete')
+ this.$auth.hasPermi('equipment:check:delete')
? {
type: 'delete',
btnName: '删除',
@@ -164,10 +173,20 @@ export default {
color: 'primary',
},
{
- type: 'separate',
+ type: this.$auth.hasPermiAnd([
+ 'equipment:check:create',
+ 'base:core-department:query',
+ ])
+ ? 'separate'
+ : '',
},
{
- type: this.$auth.hasPermi('se:check:create') ? 'button' : '',
+ type: this.$auth.hasPermiAnd([
+ 'equipment:check:create',
+ 'base:core-department:query',
+ ])
+ ? 'button'
+ : '',
btnName: '新增',
name: 'add',
plain: true,
diff --git a/src/views/specialEquipment/check/Content.vue b/src/views/specialEquipment/check/Content.vue
index bcc778c2..ba048c24 100644
--- a/src/views/specialEquipment/check/Content.vue
+++ b/src/views/specialEquipment/check/Content.vue
@@ -155,10 +155,25 @@ export default {
color: 'primary',
},
{
- type: 'separate',
+ type:
+ 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.hasPermi('se:check-unconfirm:create')
+ type: this.$auth.hasPermiAnd([
+ 'equipment:check:create',
+ 'base:core-worker:query',
+ 'base:group-classes:query',
+ 'base:core-department:query',
+ ])
? 'button'
: '',
btnName: '新增',
@@ -167,18 +182,14 @@ export default {
color: 'success',
},
{
- type: this.$auth.hasPermi('se:check-unconfirm:export')
- ? 'button'
- : '',
+ type: this.$auth.hasPermi('equipment:check:export') ? 'button' : '',
btnName: '导出',
name: 'export',
plain: true,
color: 'warning',
},
{
- type: this.$auth.hasPermi('se:check-unconfirm:confirm-all')
- ? 'button'
- : '',
+ type: this.$auth.hasPermi('equipment:check:update') ? 'button' : '',
btnName: '批量确认',
name: 'batch-confirm',
plain: true,
diff --git a/src/views/specialEquipment/check/Record.vue b/src/views/specialEquipment/check/Record.vue
index 45c72e5c..610a2d9f 100644
--- a/src/views/specialEquipment/check/Record.vue
+++ b/src/views/specialEquipment/check/Record.vue
@@ -71,7 +71,7 @@ export default {
addOrUpdateVisible: false,
searchBarKeys: ['name', 'actualCheckTime'],
tableBtn: [
- this.$auth.hasPermi('se:check-record:detail')
+ this.$auth.hasPermi('equipment:check:query')
? {
type: 'detail',
btnName: '详情',
@@ -147,10 +147,10 @@ export default {
color: 'primary',
},
{
- type: 'separate',
+ type: this.$auth.hasPermi('equipment:check:export') ? 'separate' : '',
},
{
- type: this.$auth.hasPermi('se:check-record:export') ? 'button' : '',
+ type: this.$auth.hasPermi('equipment:check:export') ? 'button' : '',
btnName: '导出',
name: 'export',
plain: true,
diff --git a/src/views/specialEquipment/maintain/Monitor.vue b/src/views/specialEquipment/maintain/Monitor.vue
index 90e1fe4f..4933c0df 100644
--- a/src/views/specialEquipment/maintain/Monitor.vue
+++ b/src/views/specialEquipment/maintain/Monitor.vue
@@ -122,20 +122,22 @@ export default {
minWidth: 158,
showOverflowtooltip: true,
},
- {
- prop: 'opt2',
- label: '保养内容',
- entryText: '详情',
- subcomponent: TableBtn,
- width: 100,
- },
+ 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',
@@ -151,10 +153,12 @@ export default {
color: 'primary',
},
{
- type: 'separate',
+ type: this.$auth.hasPermi('equipment:plan-config:export')
+ ? 'separate'
+ : '',
},
{
- type: this.$auth.hasPermi('se:maintain-plan:export')
+ type: this.$auth.hasPermi('equipment:plan-config:export')
? 'button'
: '',
btnName: '导出',
diff --git a/src/views/specialEquipment/maintain/PlanConfig.vue b/src/views/specialEquipment/maintain/PlanConfig.vue
index a7a0cc26..1f9247d9 100644
--- a/src/views/specialEquipment/maintain/PlanConfig.vue
+++ b/src/views/specialEquipment/maintain/PlanConfig.vue
@@ -83,19 +83,31 @@ export default {
return {
searchBarKeys: ['planName'],
tableBtn: [
- this.$auth.hasPermi('se:maintain:update')
+ this.$auth.hasPermiAnd([
+ '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.hasPermi('se:maintain:update')
+ this.$auth.hasPermiAnd([
+ '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('se:maintain:delete')
+ this.$auth.hasPermi('equipment:plan-config:delete')
? {
type: 'delete',
btnName: '删除',
@@ -166,10 +178,24 @@ export default {
color: 'primary',
},
{
- type: 'separate',
+ type: this.$auth.hasPermiAnd([
+ 'equipment:plan-config:create',
+ 'base:core-worker:query',
+ 'base:core-production-line:query',
+ 'base:core-department:query',
+ ])
+ ? 'separate'
+ : '',
},
{
- type: this.$auth.hasPermi('se:maintain:create') ? 'button' : '',
+ type: this.$auth.hasPermiAnd([
+ 'equipment:plan-config:create',
+ 'base:core-worker:query',
+ 'base:core-production-line:query',
+ 'base:core-department:query',
+ ])
+ ? 'button'
+ : '',
btnName: '新增',
name: 'add',
plain: true,
diff --git a/src/views/specialEquipment/maintain/Record--detail.vue b/src/views/specialEquipment/maintain/Record--detail.vue
index dbddf8ba..98baf152 100644
--- a/src/views/specialEquipment/maintain/Record--detail.vue
+++ b/src/views/specialEquipment/maintain/Record--detail.vue
@@ -212,7 +212,7 @@ export default {
},
computed: {},
mounted() {
- this.loadEquipments();
+ // this.loadEquipments();
},
methods: {
/** 确认是否关闭 */
diff --git a/src/views/specialEquipment/maintain/Record.vue b/src/views/specialEquipment/maintain/Record.vue
index 4c2c2ba1..f00a15aa 100644
--- a/src/views/specialEquipment/maintain/Record.vue
+++ b/src/views/specialEquipment/maintain/Record.vue
@@ -100,26 +100,26 @@ export default {
return {
recordDetailVisible: false,
searchBarKeys: ['maintainPlanId', 'startTime', 'special'],
- tableBtn: [
- this.$auth.hasPermi('se:maintain-record:update')
- ? {
- type: 'detail',
- btnName: '详情',
- }
- : undefined,
- this.$auth.hasPermi('se:maintain-record:update')
- ? {
- type: 'edit',
- btnName: '修改',
- }
- : undefined,
- this.$auth.hasPermi('se:maintain-record:delete')
- ? {
- type: 'delete',
- btnName: '删除',
- }
- : undefined,
- ].filter((v) => v),
+ // tableBtn: [
+ // this.$auth.hasPermi('se:maintain-record:update')
+ // ? {
+ // type: 'detail',
+ // btnName: '详情',
+ // }
+ // : undefined,
+ // this.$auth.hasPermi('se:maintain-record:update')
+ // ? {
+ // type: 'edit',
+ // btnName: '修改',
+ // }
+ // : undefined,
+ // this.$auth.hasPermi('se:maintain-record:delete')
+ // ? {
+ // type: 'delete',
+ // btnName: '删除',
+ // }
+ // : undefined,
+ // ].filter((v) => v),
tableProps: [
{
prop: 'maintainOrderNumber',
@@ -182,14 +182,16 @@ export default {
filter: (val) =>
val != null ? ['-', '计划型', '非计划型'][val] : '-',
},
- {
- prop: '_detail',
- label: '详情',
- entryText: '详情',
- minWidth: 60,
- subcomponent: TableBtn,
- },
- ],
+ this.$auth.hasPermi('equipment:maintain-record:query')
+ ? {
+ prop: '_detail',
+ label: '详情',
+ entryText: '详情',
+ minWidth: 60,
+ subcomponent: TableBtn,
+ }
+ : '',
+ ].filter((v) => v),
searchBarFormConfig: [
{
type: 'select',
@@ -222,10 +224,12 @@ export default {
color: 'primary',
},
{
- type: 'separate',
+ type: this.$auth.hasPermi('equipment:maintain-record:export')
+ ? 'separate'
+ : '',
},
{
- type: this.$auth.hasPermi('se:maintain-record:export')
+ type: this.$auth.hasPermi('equipment:maintain-record:export')
? 'button'
: '',
btnName: '导出',
diff --git a/src/views/specialEquipment/maintain/Repair.vue b/src/views/specialEquipment/maintain/Repair.vue
index f4867771..79e59b53 100644
--- a/src/views/specialEquipment/maintain/Repair.vue
+++ b/src/views/specialEquipment/maintain/Repair.vue
@@ -88,19 +88,19 @@ export default {
'specialType',
],
tableBtn: [
- this.$auth.hasPermi('se:repair:finish')
+ this.$auth.hasPermi('equipment:repair:finish')
? {
type: 'finish',
btnName: '完成',
}
: undefined,
- this.$auth.hasPermi('se:repair:update')
+ this.$auth.hasPermi('equipment:repair:query')
? {
type: 'detail',
btnName: '详情',
}
: undefined,
- this.$auth.hasPermi('se:repair:delete')
+ this.$auth.hasPermi('equipment:repair:delete')
? {
type: 'delete',
btnName: '删除',
@@ -212,17 +212,31 @@ export default {
color: 'primary',
},
{
- type: 'separate',
+ type:
+ this.$auth.hasPermi('equipment:repair:export') ||
+ this.$auth.hasPermiAnd([
+ 'equipment:repair:create',
+ 'base:core-worker:query',
+ 'system:user:list',
+ ])
+ ? 'separate'
+ : '',
},
{
- type: this.$auth.hasPermi('se:repair:export') ? 'button' : '',
+ type: this.$auth.hasPermi('equipment:repair:export') ? 'button' : '',
btnName: '导出',
name: 'export',
plain: true,
color: 'primary',
},
{
- type: this.$auth.hasPermi('se:repair:create') ? 'button' : '',
+ type: this.$auth.hasPermiAnd([
+ 'equipment:repair:create',
+ 'base:core-worker:query',
+ 'system:user:list',
+ ])
+ ? 'button'
+ : '',
btnName: '新增',
name: 'add',
plain: true,
diff --git a/src/views/specialEquipment/maintain/WaitingList.vue b/src/views/specialEquipment/maintain/WaitingList.vue
index c52ba25d..1e53ad51 100644
--- a/src/views/specialEquipment/maintain/WaitingList.vue
+++ b/src/views/specialEquipment/maintain/WaitingList.vue
@@ -147,10 +147,25 @@ export default {
color: 'primary',
},
{
- type: 'separate',
+ type:
+ 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.hasPermi('se:maintain-record-pre:create')
+ type: this.$auth.hasPermiAnd([
+ 'equipment:maintain-record:create',
+ 'base:core-worker:query',
+ 'base:core-production-line:query',
+ 'base:core-department:query',
+ ])
? 'button'
: '',
btnName: '新增',
@@ -159,7 +174,7 @@ export default {
color: 'success',
},
{
- type: this.$auth.hasPermi('se:maintain-record-pre:confirm-all')
+ type: this.$auth.hasPermi('equipment:maintain-record:update')
? 'button'
: '',
btnName: '批量确认',
@@ -168,7 +183,7 @@ export default {
plain: true,
},
{
- type: this.$auth.hasPermi('se:maintain-record-pre:export')
+ type: this.$auth.hasPermi('equipment:maintain-record:export')
? 'button'
: '',
btnName: '导出',
diff --git a/src/views/specialEquipment/maintain/WaitingListTable.vue b/src/views/specialEquipment/maintain/WaitingListTable.vue
index 3413df82..d278dcb7 100644
--- a/src/views/specialEquipment/maintain/WaitingListTable.vue
+++ b/src/views/specialEquipment/maintain/WaitingListTable.vue
@@ -144,7 +144,7 @@
label="操作">
+ v-if="$auth.hasPermi('equipment:maintain-record:query')">
|
+ v-if="
+ $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',
+ ])
+ ">
|
- |
+
+ |
+