mt-fe-group/yudao-dev
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'projects/mesxc-test' into projects/mesxc-zhp

Browse Source
This commit is contained in:
‘937886381’ 2024-04-15 09:29:29 +08:00
commit bfa17e422d
20 changed files with 334 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/base/coreWorkOrder/detail.vue
View File

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

4
src/views/base/materialProductBom/add-or-updata.vue
View File

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

2
src/views/energy/base/energyPlcConnect/components/energyPlcConnectAdd.vue
View File

@ -116,7 +116,7 @@ export default {
}, },
selectObj(val) { selectObj(val) {
this.form.bindObjectId = val[val.length - 1]; this.form.bindObjectId = val[val.length - 1];
this.form.bindObjectType = val.length - 1; this.form.bindObjectType = val.length;
}, },
submitForm() { submitForm() {
this.$refs['form'].validate((valid) => { this.$refs['form'].validate((valid) => {

5
src/views/energy/monitoring/energyLimit/components/energyLimitAdd.vue
View File

@ -216,10 +216,10 @@ export default {
getEnergyLimit(id).then((res) => { getEnergyLimit(id).then((res) => {
if (res.code === 0) { if (res.code === 0) {
this.form = res.data; this.form = res.data;
this.form.plcParamId = res.data.plcParamId || '';
this.form.tableName = this.form.tableName this.form.tableName = this.form.tableName
? this.form.tableName + '' ? this.form.tableName + ''
: ''; : '';
this.form.plcParamId = res.data.plcParamId || '';
this.form.method = this.form.method ? this.form.method + '' : ''; this.form.method = this.form.method ? this.form.method + '' : '';
this.form.limitType = this.form.limitType this.form.limitType = this.form.limitType
? this.form.limitType + '' ? this.form.limitType + ''
@ -231,6 +231,9 @@ export default {
if (this.form.type === 2) { if (this.form.type === 2) {
this.getDetailList(); this.getDetailList();
} }
if (this.form.energyTypeId) {
this.getTableNameList(this.form.energyTypeId);
}
} }
}); });
} else { } else {

1
src/views/energy/monitoring/energyStatistics/index.vue
View File

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

2
src/views/order/base/orderGroup/index.vue
View File

@ -280,7 +280,7 @@ export default {
}, },
} }
: undefined, : undefined,
this.$auth.hasPermi('base:order-group:update') this.$auth.hasPermi('base:order-group:query')
? { ? {
type: 'detail', type: 'detail',
btnName: '详情', btnName: '详情',

41
src/views/specialEquipment/basic/FireFighthing.vue
View File

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

32
src/views/specialEquipment/basic/Manage.vue
View File

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

33
src/views/specialEquipment/basic/Safety.vue
View File

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

44
src/views/specialEquipment/check/CheckOrderListTable.vue
View File

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

31
src/views/specialEquipment/check/Config.vue
View File

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

27
src/views/specialEquipment/check/Content.vue
View File

@ -155,10 +155,25 @@ export default {
color: 'primary', 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' ? 'button'
: '', : '',
btnName: '新增', btnName: '新增',
@ -167,18 +182,14 @@ export default {
color: 'success', color: 'success',
}, },
{ {
type: this.$auth.hasPermi('se:check-unconfirm:export') type: this.$auth.hasPermi('equipment:check:export') ? 'button' : '',
? 'button'
: '',
btnName: '导出', btnName: '导出',
name: 'export', name: 'export',
plain: true, plain: true,
color: 'warning', color: 'warning',
}, },
{ {
type: this.$auth.hasPermi('se:check-unconfirm:confirm-all') type: this.$auth.hasPermi('equipment:check:update') ? 'button' : '',
? 'button'
: '',
btnName: '批量确认', btnName: '批量确认',
name: 'batch-confirm', name: 'batch-confirm',
plain: true, plain: true,

6
src/views/specialEquipment/check/Record.vue
View File

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

14
src/views/specialEquipment/maintain/Monitor.vue
View File

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

36
src/views/specialEquipment/maintain/PlanConfig.vue
View File

@ -83,19 +83,31 @@ export default {
return { return {
searchBarKeys: ['planName'], searchBarKeys: ['planName'],
tableBtn: [ 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', type: 'addContent',
btnName: '添加内容', btnName: '添加内容',
} }
: undefined, : 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', type: 'edit',
btnName: '修改', btnName: '修改',
} }
: undefined, : undefined,
this.$auth.hasPermi('se:maintain:delete') this.$auth.hasPermi('equipment:plan-config:delete')
? { ? {
type: 'delete', type: 'delete',
btnName: '删除', btnName: '删除',
@ -166,10 +178,24 @@ export default {
color: 'primary', 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: '新增', btnName: '新增',
name: 'add', name: 'add',
plain: true, plain: true,

2
src/views/specialEquipment/maintain/Record--detail.vue
View File

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

54
src/views/specialEquipment/maintain/Record.vue
View File

@ -100,26 +100,26 @@ export default {
return { return {
recordDetailVisible: false, recordDetailVisible: false,
searchBarKeys: ['maintainPlanId', 'startTime', 'special'], 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: [ tableProps: [
{ {
prop: 'maintainOrderNumber', prop: 'maintainOrderNumber',
@ -182,14 +182,16 @@ export default {
filter: (val) => filter: (val) =>
val != null ? ['-', '计划型', '非计划型'][val] : '-', val != null ? ['-', '计划型', '非计划型'][val] : '-',
}, },
{ this.$auth.hasPermi('equipment:maintain-record:query')
? {
prop: '_detail', prop: '_detail',
label: '详情', label: '详情',
entryText: '详情', entryText: '详情',
minWidth: 60, minWidth: 60,
subcomponent: TableBtn, subcomponent: TableBtn,
}, }
], : '',
].filter((v) => v),
searchBarFormConfig: [ searchBarFormConfig: [
{ {
type: 'select', type: 'select',
@ -222,10 +224,12 @@ export default {
color: 'primary', 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' ? 'button'
: '', : '',
btnName: '导出', btnName: '导出',

26
src/views/specialEquipment/maintain/Repair.vue
View File

@ -88,19 +88,19 @@ export default {
'specialType', 'specialType',
], ],
tableBtn: [ tableBtn: [
this.$auth.hasPermi('se:repair:finish') this.$auth.hasPermi('equipment:repair:finish')
? { ? {
type: 'finish', type: 'finish',
btnName: '完成', btnName: '完成',
} }
: undefined, : undefined,
this.$auth.hasPermi('se:repair:update') this.$auth.hasPermi('equipment:repair:query')
? { ? {
type: 'detail', type: 'detail',
btnName: '详情', btnName: '详情',
} }
: undefined, : undefined,
this.$auth.hasPermi('se:repair:delete') this.$auth.hasPermi('equipment:repair:delete')
? { ? {
type: 'delete', type: 'delete',
btnName: '删除', btnName: '删除',
@ -212,17 +212,31 @@ export default {
color: 'primary', 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: '导出', btnName: '导出',
name: 'export', name: 'export',
plain: true, plain: true,
color: 'primary', 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: '新增', btnName: '新增',
name: 'add', name: 'add',
plain: true, plain: true,

23
src/views/specialEquipment/maintain/WaitingList.vue
View File

@ -147,10 +147,25 @@ export default {
color: 'primary', 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' ? 'button'
: '', : '',
btnName: '新增', btnName: '新增',
@ -159,7 +174,7 @@ export default {
color: 'success', color: 'success',
}, },
{ {
type: this.$auth.hasPermi('se:maintain-record-pre:confirm-all') type: this.$auth.hasPermi('equipment:maintain-record:update')
? 'button' ? 'button'
: '', : '',
btnName: '批量确认', btnName: '批量确认',
@ -168,7 +183,7 @@ export default {
plain: true, plain: true,
}, },
{ {
type: this.$auth.hasPermi('se:maintain-record-pre:export') type: this.$auth.hasPermi('equipment:maintain-record:export')
? 'button' ? 'button'
: '', : '',
btnName: '导出', btnName: '导出',

35
src/views/specialEquipment/maintain/WaitingListTable.vue
View File

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